Skip to content

Commit

Permalink
Fix inconsistent group names (#1263)
Browse files Browse the repository at this point in the history 
PySAM file generation requires consistent group names in var table. Some variables use "solar_field" while others use "Solar_Field". Changed all to "Solar_Field" for consistency.
  • Loading branch information
@cpaulgilman
cpaulgilman authored Dec 10, 2024
1 parent bfca1ea commit 2daaee8
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 64 deletions.
66 changes: 33 additions & 33 deletions ssc/cmod_fresnel_physical.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ static var_info _cm_vtab_fresnel_physical[] = {
{ SSC_INPUT, SSC_NUMBER, "p_start", "Collector startup energy, per SCA", "kWhe", "", "Solar_Field", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "L_rnr_pb", "Length of runner pipe in power block", "m", "", "Solar_Field", "*", "", "" },

{ SSC_INPUT, SSC_NUMBER, "use_abs_or_rel_mdot_limit", "Use mass flow abs (0) or relative (1) limits", "", "", "solar_field", "?=0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "m_dot_htfmin", "Minimum loop HTF flow rate", "kg/s", "", "solar_field", "use_abs_or_rel_mdot_limit=0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "m_dot_htfmax", "Maximum loop HTF flow rate", "kg/s", "", "solar_field", "use_abs_or_rel_mdot_limit=0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "f_htfmin", "Minimum loop mass flow rate fraction of design", "", "", "solar_field", "use_abs_or_rel_mdot_limit=1", "", "" },
{ SSC_INPUT, SSC_NUMBER, "f_htfmax", "Maximum loop mass flow rate fraction of design", "", "", "solar_field", "use_abs_or_rel_mdot_limit=1", "", "" },
{ SSC_INPUT, SSC_NUMBER, "use_abs_or_rel_mdot_limit", "Use mass flow abs (0) or relative (1) limits", "", "", "Solar_Field", "?=0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "m_dot_htfmin", "Minimum loop HTF flow rate", "kg/s", "", "Solar_Field", "use_abs_or_rel_mdot_limit=0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "m_dot_htfmax", "Maximum loop HTF flow rate", "kg/s", "", "Solar_Field", "use_abs_or_rel_mdot_limit=0", "", "" },
{ SSC_INPUT, SSC_NUMBER, "f_htfmin", "Minimum loop mass flow rate fraction of design", "", "", "Solar_Field", "use_abs_or_rel_mdot_limit=1", "", "" },
{ SSC_INPUT, SSC_NUMBER, "f_htfmax", "Maximum loop mass flow rate fraction of design", "", "", "Solar_Field", "use_abs_or_rel_mdot_limit=1", "", "" },


// Collector and Receiver
Expand Down Expand Up @@ -340,10 +340,10 @@ static var_info _cm_vtab_fresnel_physical[] = {
{ SSC_OUTPUT, SSC_NUMBER, "q_field_des_actual", "Design-point thermal power from the solar field limited by mass flow", "MW", "", "Receiver", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "q_field_des_ideal", "Design-point thermal power from the solar field with no limit", "MW", "", "Receiver", "*", "", "" },

{ SSC_OUTPUT, SSC_NUMBER, "m_dot_htfmin_actual", "Actual minimum loop HTF flow rate", "kg/s", "", "solar_field", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "m_dot_htfmax_actual", "Actual maximum loop HTF flow rate", "kg/s", "", "solar_field", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "f_htfmin_actual", "Actual minimum loop mass flow rate fraction of design", "", "", "solar_field", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "f_htfmax_actual", "Actual maximum loop mass flow rate fraction of design", "", "", "solar_field", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "m_dot_htfmin_actual", "Actual minimum loop HTF flow rate", "kg/s", "", "Solar_Field", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "m_dot_htfmax_actual", "Actual maximum loop HTF flow rate", "kg/s", "", "Solar_Field", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "f_htfmin_actual", "Actual minimum loop mass flow rate fraction of design", "", "", "Solar_Field", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "f_htfmax_actual", "Actual maximum loop mass flow rate fraction of design", "", "", "Solar_Field", "*", "", "" },


{ SSC_OUTPUT, SSC_NUMBER, "field_area", "Solar field area", "acres", "", "Receiver", "*", "", "" },
Expand Down Expand Up @@ -472,31 +472,31 @@ static var_info _cm_vtab_fresnel_physical[] = {


// Solar Field (from Trough)
{ SSC_OUTPUT, SSC_ARRAY, "EqOpteff", "Field optical efficiency before defocus", "", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "SCAs_def", "Field fraction of focused SCAs", "", "", "solar_field", "sim_type=1", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "q_inc_sf_tot", "Field thermal power incident", "MWt", "", "solar_field", "*", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_rec_inc", "Receiver thermal power incident", "MWt", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_rec_thermal_loss", "Receiver thermal losses", "MWt", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_rec_abs", "Receiver thermal power absorbed", "MWt", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "rec_thermal_eff", "Receiver thermal efficiency", "", "", "solar_field", "sim_type=1", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "q_dot_piping_loss", "Field piping thermal losses", "MWt", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "e_dot_field_int_energy", "Field change in material/htf internal energy", "MWt", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_htf_sf_out", "Field thermal power leaving in HTF", "MWt", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_freeze_prot", "Field freeze protection required", "MWt", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "EqOpteff", "Field optical efficiency before defocus", "", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "SCAs_def", "Field fraction of focused SCAs", "", "", "Solar_Field", "sim_type=1", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "q_inc_sf_tot", "Field thermal power incident", "MWt", "", "Solar_Field", "*", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_rec_inc", "Receiver thermal power incident", "MWt", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_rec_thermal_loss", "Receiver thermal losses", "MWt", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_rec_abs", "Receiver thermal power absorbed", "MWt", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "rec_thermal_eff", "Receiver thermal efficiency", "", "", "Solar_Field", "sim_type=1", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "q_dot_piping_loss", "Field piping thermal losses", "MWt", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "e_dot_field_int_energy", "Field change in material/htf internal energy", "MWt", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_htf_sf_out", "Field thermal power leaving in HTF", "MWt", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "q_dot_freeze_prot", "Field freeze protection required", "MWt", "", "Solar_Field", "sim_type=1", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "m_dot_loop", "Receiver mass flow rate", "kg/s", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "m_dot_field_recirc", "Field total mass flow recirculated", "kg/s", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "m_dot_field_delivered", "Field total mass flow delivered", "kg/s", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_field_cold_in", "Field timestep-averaged inlet temperature", "C", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_rec_cold_in", "Loop timestep-averaged inlet temperature", "C", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_rec_hot_out", "Loop timestep-averaged outlet temperature", "C", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_field_hot_out", "Field timestep-averaged outlet temperature", "C", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "deltaP_field", "Field pressure drop", "bar", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "m_dot_loop", "Receiver mass flow rate", "kg/s", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "m_dot_field_recirc", "Field total mass flow recirculated", "kg/s", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "m_dot_field_delivered", "Field total mass flow delivered", "kg/s", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_field_cold_in", "Field timestep-averaged inlet temperature", "C", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_rec_cold_in", "Loop timestep-averaged inlet temperature", "C", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_rec_hot_out", "Loop timestep-averaged outlet temperature", "C", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "T_field_hot_out", "Field timestep-averaged outlet temperature", "C", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "deltaP_field", "Field pressure drop", "bar", "", "Solar_Field", "sim_type=1", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "W_dot_sca_track", "Field collector tracking power", "MWe", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "W_dot_field_pump", "Field htf pumping power", "MWe", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "W_dot_sca_track", "Field collector tracking power", "MWe", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "W_dot_field_pump", "Field htf pumping power", "MWe", "", "Solar_Field", "sim_type=1", "", "" },


// power block
Expand Down Expand Up @@ -604,7 +604,7 @@ static var_info _cm_vtab_fresnel_physical[] = {
//{ SSC_OUTPUT, SSC_NUMBER, "W_dot_par_tot_haf", "Adjusted parasitic power", "kWe", "", "system", "*", "", "" },
//{ SSC_OUTPUT, SSC_NUMBER, "q_dot_defocus_est", "Thermal energy intentionally lost by defocusing", "MWt", "", "system", "*", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "recirculating", "Field recirculating (bypass valve open)", "-", "", "solar_field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "recirculating", "Field recirculating (bypass valve open)", "-", "", "Solar_Field", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "pipe_tes_diams", "Pipe diameters in TES", "m", "", "TES", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "pipe_tes_wallthk", "Pipe wall thickness in TES", "m", "", "TES", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "pipe_tes_lengths", "Pipe lengths in TES", "m", "", "TES", "sim_type=1", "", "" },
Expand Down
Loading

0 comments on commit 2daaee8

Please sign in to comment.