Skip to content

Commit

Permalink
Merge branch 'develop' into ortools
Browse files Browse the repository at this point in the history
  • Loading branch information
@dguittet
dguittet committed Apr 3, 2024
2 parents 242ad56 + af06594 commit 6f3cfe3
Show file tree
Hide file tree
Showing 25 changed files with 1,250 additions and 288 deletions.
10 changes: 5 additions & 5 deletions ssc/cmod_fresnel_physical.cpp
View file
Expand Up @@ -58,9 +58,9 @@ static var_info _cm_vtab_fresnel_physical[] = {

// System Design

/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_in", "Solar multiple Input", "", "", "System_Design", "", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "total_Ap_in", "Field aperture Input", "m3", "", "System_Design", "", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_or_Ap", "Design using specified solar mult or field aperture", "m3", "", "System_Design", "", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_in", "Solar multiple Input", "", "", "System_Design", "*", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "total_Ap_in", "Field aperture Input", "m3", "", "System_Design", "*", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_or_Ap", "Design using specified solar mult or field aperture", "m3", "", "System_Design", "*", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "T_loop_in_des", "Design loop inlet temperature", "C", "", "System_Design", "*", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "T_loop_out", "Target loop outlet temperature", "C", "", "System_Design", "*", "", "" },
/*X*/ /*System Design*/{ SSC_INPUT, SSC_NUMBER, "I_bn_des", "Solar irradiation at design", "W/m2", "", "System_Design", "*", "", "" },
Expand Down Expand Up @@ -158,7 +158,7 @@ static var_info _cm_vtab_fresnel_physical[] = {
/*X*/ /*Power Cycle*/{ SSC_INPUT, SSC_NUMBER, "pb_pump_coef", "Pumping power to move 1kg of HTF through PB loop", "kW/kg", "", "Powerblock", "*", "", "" },
/*X*/ /*Power Cycle*/{ SSC_INPUT, SSC_NUMBER, "cycle_max_frac", "Maximum turbine over design operation fraction", "", "", "Powerblock", "*", "", "" },
/*X*/ /*Power Cycle*/{ SSC_INPUT, SSC_NUMBER, "cycle_cutoff_frac", "Minimum turbine operation fraction before shutdown", "", "", "Powerblock", "*", "", "" },
/*X*/ /*startup script*/{ SSC_INPUT, SSC_NUMBER, "pc_config", "0: Steam Rankine (224), 1: user defined", "-", "", "Powerblock", "", "INTEGER", "" },
/*X*/ /*startup script*/{ SSC_INPUT, SSC_NUMBER, "pc_config", "0: Steam Rankine (224), 1: user defined", "-", "", "Powerblock", "*", "INTEGER", "" },



Expand Down Expand Up @@ -210,7 +210,7 @@ static var_info _cm_vtab_fresnel_physical[] = {

/*Sys Control*/{ SSC_INPUT, SSC_NUMBER, "is_dispatch", "Allow dispatch optimization?", /*TRUE=1*/ "-", "", "Sys_Control", "?=0", "", "" },
/*Sys Control*/{ SSC_INPUT, SSC_NUMBER, "is_dispatch_series", "Use time-series dispatch factors", "", "", "Sys_Control", "?=1", "", "" },
/*Sys Control*/{ SSC_INPUT, SSC_ARRAY, "dispatch_series", "Time series dispatch factors", "", "", "Sys_Control", "", "", "" },
/*Sys Control*/{ SSC_INPUT, SSC_ARRAY, "dispatch_series", "Time series dispatch factors", "", "", "Sys_Control", "*", "", "" },
/*Sys Control*/{ SSC_INPUT, SSC_NUMBER, "disp_frequency", "Frequency for dispatch optimization calculations", "hour", "", "Sys_Control", "is_dispatch=1", "", "" },
/*Sys Control*/{ SSC_INPUT, SSC_NUMBER, "disp_horizon", "Time horizon for dispatch optimization", "hour", "", "Sys_Control", "is_dispatch=1", "", "" },
/*Sys Control*/{ SSC_INPUT, SSC_NUMBER, "disp_max_iter", "Max. no. dispatch optimization iterations", "-", "", "Sys_Control", "is_dispatch=1", "", "" },
Expand Down
6 changes: 3 additions & 3 deletions ssc/cmod_fresnel_physical_iph.cpp
View file
Expand Up @@ -57,9 +57,9 @@ static var_info _cm_vtab_fresnel_physical_iph[] = {

// System Design

/*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_in", "Solar multiple Input", "", "", "System_Design", "", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "total_Ap_in", "Field aperture Input", "m3", "", "System_Design", "", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_or_Ap", "Design using specified solar mult or field aperture", "m3", "", "System_Design", "", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_in", "Solar multiple Input", "", "", "System_Design", "*", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "total_Ap_in", "Field aperture Input", "m3", "", "System_Design", "*", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "solar_mult_or_Ap", "Design using specified solar mult or field aperture", "m3", "", "System_Design", "*", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "T_loop_in_des", "Design loop inlet temperature", "C", "", "System_Design", "*", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "T_loop_out", "Target loop outlet temperature", "C", "", "System_Design", "*", "", "" },
/*System Design*/{ SSC_INPUT, SSC_NUMBER, "I_bn_des", "Solar irradiation at design", "W/m2", "", "System_Design", "*", "", "" },
Expand Down
2 changes: 1 addition & 1 deletion ssc/cmod_solarpilot.cpp
View file
Expand Up @@ -119,7 +119,7 @@ static var_info _cm_vtab_solarpilot[] = {
{ SSC_INPUT, SSC_NUMBER, "contingency_rate", "Contingency for cost overrun", "%", "", "SolarPILOT", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "sales_tax_rate", "Sales tax rate", "%", "", "SolarPILOT", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "sales_tax_frac", "Percent of cost to which sales tax applies", "%", "", "SolarPILOT", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "cost_sf_fixed", "Soalr field fixed cost", "$", "", "SolarPILOT", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "cost_sf_fixed", "Solar field fixed cost", "$", "", "SolarPILOT", "*", "", "" },

{ SSC_INPUT, SSC_NUMBER, "is_optimize", "Do SolarPILOT optimization", "", "", "SolarPILOT", "?=0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "flux_max", "Maximum allowable flux", "", "", "SolarPILOT", "?=1000", "", "" },
Expand Down

0 comments on commit 6f3cfe3

Please sign in to comment.