Skip to content

Commit

Permalink
Shorten CSP generation vartable labels.
Browse files Browse the repository at this point in the history 
Synchronize watt-hr labels.
  • Loading branch information
@taylorbrown75
taylorbrown75 committed Nov 12, 2024
1 parent cb70a18 commit bdf8233
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 91 deletions.
32 changes: 16 additions & 16 deletions ssc/cmod_fresnel_physical.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static var_info _cm_vtab_fresnel_physical[] = {
{ SSC_INPUT, SSC_NUMBER, "T_startup", "Power block startup temperature", "C", "", "Solar_Field", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "rec_su_delay", "Fixed startup delay time for the receiver", "hr", "", "Solar_Field", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "rec_qf_delay", "Energy-based receiver startup delay (fraction of rated thermal power)", "-", "", "Solar_Field", "*", "", "" },
{ SSC_INPUT, SSC_NUMBER, "p_start", "Collector startup energy, per SCA", "kWe-hr", "", "Solar_Field", "*", "", "" },
{ 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", "", "" },
Expand Down Expand Up @@ -231,7 +231,7 @@ static var_info _cm_vtab_fresnel_physical[] = {
{ SSC_INPUT, SSC_NUMBER, "disp_spec_scaling", "Dispatch optimization scaling heuristic", "-", "", "tou", "?=-1", "", "SIMULATION_PARAMETER" },
{ SSC_INPUT, SSC_NUMBER, "disp_inventory_incentive", "Dispatch storage terminal inventory incentive multiplier", "", "", "System Control", "?=0.0", "", "SIMULATION_PARAMETER" },
{ SSC_INPUT, SSC_NUMBER, "q_rec_standby", "Receiver standby energy consumption", "kWt", "", "tou", "?=9e99", "", "SIMULATION_PARAMETER" },
{ SSC_INPUT, SSC_NUMBER, "q_rec_heattrace", "Receiver heat trace energy consumption during startup", "kWe-hr", "", "tou", "?=0.0", "", "SIMULATION_PARAMETER" },
{ SSC_INPUT, SSC_NUMBER, "q_rec_heattrace", "Receiver heat trace energy consumption during startup", "kWhe", "", "tou", "?=0.0", "", "SIMULATION_PARAMETER" },



Expand Down Expand Up @@ -539,16 +539,16 @@ static var_info _cm_vtab_fresnel_physical[] = {
{ SSC_OUTPUT, SSC_ARRAY, "q_balance", "Relative energy balance error", "", "", "solver", "sim_type=1", "", "" },

// Monthly Outputs
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Post-process", "sim_type=1", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Post-process", "sim_type=1", "LENGTH=12", "" },

// Annual Outputs
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual net electrical energy generated with availability derate", "kWe-hr", "", "Post-process", "sim_type=1", "", "" },
//{ SSC_OUTPUT, SSC_NUMBER, "annual_gross_energy", "Annual Gross Electrical Energy Production w/ avail derate", "kWe-hr", "", "Post-process", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_thermal_consumption", "Annual thermal freeze protection required", "kWt-hr", "", "Post-process", "sim_type=1", "", "" },
//{ SSC_OUTPUT, SSC_NUMBER, "annual_electricity_consumption", "Annual electricity consumptoin w/ avail derate", "kWe-hr", "", "Post-process", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual net electrical energy w/ avail. derate", "kWhe", "", "Post-process", "sim_type=1", "", "" },
//{ SSC_OUTPUT, SSC_NUMBER, "annual_gross_energy", "Annual Gross Electrical Energy Production w/ avail derate", "kWhe", "", "Post-process", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_thermal_consumption", "Annual thermal freeze protection required", "kWht", "", "Post-process", "sim_type=1", "", "" },
//{ SSC_OUTPUT, SSC_NUMBER, "annual_electricity_consumption", "Annual electricity consumptoin w/ avail derate", "kWhe", "", "Post-process", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_total_water_use", "Total annual water usage", "m^3", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_field_freeze_protection", "Annual thermal power for field freeze protection", "kWt-hr", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_tes_freeze_protection", "Annual thermal power for TES freeze protection", "kWt-hr", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_field_freeze_protection", "Annual thermal power for field freeze protection", "kWht", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_tes_freeze_protection", "Annual thermal power for TES freeze protection", "kWht", "", "Post-process", "sim_type=1", "", "" },

// Newly added
{ SSC_OUTPUT, SSC_ARRAY, "n_op_modes", "Operating modes in reporting timestep", "", "", "solver", "sim_type=1", "", "" },
Expand Down Expand Up @@ -594,8 +594,8 @@ static var_info _cm_vtab_fresnel_physical[] = {
{ SSC_OUTPUT, SSC_ARRAY, "P_fixed", "Parasitic power fixed load", "MWe", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "P_plant_balance_tot", "Parasitic power generation-dependent load", "MWe", "", "system", "sim_type=1", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "P_out_net", "System net electric power generated", "MWe", "", "system", "*", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen", "System net electric power generated with availability derate", "kWe", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "P_out_net", "System net electrical power", "MWe", "", "system", "*", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen", "System net electrical power w/ avail. derate", "kWe", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_W_cycle_gross", "Electrical source - Power cycle gross output", "kWhe", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "conversion_factor", "Gross to Net Conversion Factor", "%", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "system", "sim_type=1", "", "" },
Expand Down Expand Up @@ -1881,8 +1881,8 @@ class cm_fresnel_physical : public compute_module

// Annual outputs
accumulate_annual_for_year("gen", "annual_energy", sim_setup.m_report_step / 3600.0, steps_per_hour, 1, n_steps_fixed / steps_per_hour);
accumulate_annual_for_year("P_cycle", "annual_W_cycle_gross", 1000.0 * sim_setup.m_report_step / 3600.0, steps_per_hour, 1, n_steps_fixed / steps_per_hour); //[kWe-hr]
//accumulate_annual_for_year("W_dot_par_tot_haf", "annual_electricity_consumption", sim_setup.m_report_step/3600.0, steps_per_hour); //[kWe-hr]
accumulate_annual_for_year("P_cycle", "annual_W_cycle_gross", 1000.0 * sim_setup.m_report_step / 3600.0, steps_per_hour, 1, n_steps_fixed / steps_per_hour); //[kWhe]
//accumulate_annual_for_year("W_dot_par_tot_haf", "annual_electricity_consumption", sim_setup.m_report_step/3600.0, steps_per_hour); //[kWhe]
accumulate_annual_for_year("disp_objective", "disp_objective_ann", 1000.0 * sim_setup.m_report_step / 3600.0, steps_per_hour, 1, n_steps_fixed / steps_per_hour);
accumulate_annual_for_year("disp_solve_iter", "disp_iter_ann", 1000.0 * sim_setup.m_report_step / 3600.0, steps_per_hour, 1, n_steps_fixed / steps_per_hour);
accumulate_annual_for_year("disp_presolve_nconstr", "disp_presolve_nconstr_ann", sim_setup.m_report_step / 3600.0 / as_double("disp_frequency"), steps_per_hour, 1, n_steps_fixed / steps_per_hour);
Expand All @@ -1892,10 +1892,10 @@ class cm_fresnel_physical : public compute_module
accumulate_annual_for_year("q_ch_tes", "annual_q_ch_tes", sim_setup.m_report_step / 3600.0, steps_per_hour, 1, n_steps_fixed / steps_per_hour);


ssc_number_t annual_field_fp = accumulate_annual_for_year("q_dot_freeze_prot", "annual_field_freeze_protection", sim_setup.m_report_step / 3600.0 * 1.E3, steps_per_hour); //[kWt-hr]
ssc_number_t annual_tes_fp = accumulate_annual_for_year("q_tes_heater", "annual_tes_freeze_protection", sim_setup.m_report_step / 3600.0 * 1.E3, steps_per_hour); //[kWt-hr]
ssc_number_t annual_field_fp = accumulate_annual_for_year("q_dot_freeze_prot", "annual_field_freeze_protection", sim_setup.m_report_step / 3600.0 * 1.E3, steps_per_hour); //[kWht]
ssc_number_t annual_tes_fp = accumulate_annual_for_year("q_tes_heater", "annual_tes_freeze_protection", sim_setup.m_report_step / 3600.0 * 1.E3, steps_per_hour); //[kWht]

ssc_number_t annual_thermal_consumption = annual_field_fp + annual_tes_fp; //[kWt-hr]
ssc_number_t annual_thermal_consumption = annual_field_fp + annual_tes_fp; //[kWht]
assign("annual_thermal_consumption", annual_thermal_consumption);

// Reporting dispatch solution counts
Expand Down
10 changes: 5 additions & 5 deletions ssc/cmod_fresnel_physical_iph.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,9 +562,9 @@ static var_info _cm_vtab_fresnel_physical_iph[] = {
{ SSC_OUTPUT, SSC_ARRAY, "operating_modes_a", "First 3 operating modes tried", "", "", "solver", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "operating_modes_b", "Next 3 operating modes tried", "", "", "solver", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "operating_modes_c", "Final 3 operating modes tried", "", "", "solver", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen_heat", "System net thermal power generated with availability derate", "kWt", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen", "System net electric power generated with availability derate", "kWe", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen_heat_btu", "System net thermal power generated with availability derate in MMBtu/hr","MMBtu/hr", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen_heat", "System net thermal power w/ avail. derate", "kWt", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen", "System net electrical power w/ avail. derate", "kWe", "", "system", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "gen_heat_btu", "System net thermal power w/ avail. derate", "MMBtu/hr", "", "system", "sim_type=1", "", "" },


// Monthly Outputs
Expand All @@ -573,8 +573,8 @@ static var_info _cm_vtab_fresnel_physical_iph[] = {


// Annual Outputs
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual net thermal energy generated with availability derate", "kWhe", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy_heat_btu", "Annual net thermal energy generated with availability derate in MMBtu","MMBtu", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual net thermal energy w/ avail. derate", "kWhe", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy_heat_btu", "Annual net thermal energy w/ avail. derate", "MMBtu", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_thermal_consumption", "Annual thermal freeze protection required", "kWht", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_electricity_consumption", "Annual electricity consumption w/ avail derate", "kWhe", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_total_water_use", "Total Annual Water Usage", "m^3", "", "Post-process", "sim_type=1", "", "" },
Expand Down
Loading

0 comments on commit bdf8233

Please sign in to comment.