Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistent monthly and annual energy labels #1236

Merged
merged 4 commits into from
Nov 6, 2024
Merged

Consistent monthly and annual energy labels #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9c9bdd
Consistent naming for energy variables
cpaulgilman Oct 26, 2024
6e8c859
Merge branch 'develop' into sam-1876-monthly-annual-energy-labels
cpaulgilman Nov 4, 2024
f030f56
Marine energy annual energy labels
cpaulgilman Nov 4, 2024
882dac4
Merge branch 'develop' into sam-1876-monthly-annual-energy-labels
cpaulgilman Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ssc/cmod_battery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2267,7 +2267,7 @@ static var_info _cm_vtab_battery[] = {
{ SSC_INOUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "System Output", "", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "capacity_factor_sales", "Capacity factor based on AC electricity to grid", "%", "", "System Output", "", "", "" },

{ SSC_INOUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "System Output", "?=0", "", "" },
{ SSC_INOUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "System Output", "?=0", "", "" },

// other variables come from battstor common table
var_info_invalid };
Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_biomass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static var_info _cm_vtab_biomass[] = {
{ SSC_OUTPUT, SSC_ARRAY, "hourly_pbeta", "Power Block Efficiency", "", "", "biomass", "*", "LENGTH=8760", "" },

// monthly
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "kWh", "", "biomass", "*", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1)", "kWh", "", "biomass", "*", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_q_to_pb", "Q To Power Block", "kWh", "", "biomass", "*", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_pb_eta", "Power Block Effiency", "%", "", "biomass", "*", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_boiler_eff", "Total Boiler Efficiency - HHV (%)", "%", "", "biomass", "*", "LENGTH=12", "" },
Expand All @@ -192,7 +192,7 @@ static var_info _cm_vtab_biomass[] = {


// single values
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "biomass", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "biomass", "*", "", "" },
/*
{ SSC_OUTPUT, SSC_NUMBER, "om_opt_fuel_1_usage", "Annual biomass used", "dry tons/year", "", "biomass", "*", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "om_opt_fuel_1_cost", "Annual biomass fuel cost", "$", "", "biomass", "*", "", "" },
Expand Down
6 changes: 3 additions & 3 deletions ssc/cmod_fresnel_physical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,14 +544,14 @@ 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 Energy", "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 Production w/ avail derate", "kWe-hr", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual net electricity production 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_total_water_use", "Total Annual Water Usage", "m^3", "", "Post-process", "sim_type=1", "", "" },
{ 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", "", "" },

Expand Down
6 changes: 3 additions & 3 deletions ssc/cmod_fresnel_physical_iph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,12 +566,12 @@ static var_info _cm_vtab_fresnel_physical_iph[] = {
{ SSC_OUTPUT, SSC_ARRAY, "gen", "Total thermal power to heat sink with available derate", "kWe", "", "system", "sim_type=1", "", "" },

// Monthly Outputs
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy", "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 Production w/ avail derate", "kWe-hr", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual net electricity production with availability derate", "kWe-hr", "", "Post-process", "sim_type=1", "", "" },
{ 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 consumption w/ avail derate", "kWe-hr", "", "Post-process", "sim_type=1", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_electricity_consumption", "Annual electricity consumption with availability derate", "kWe-hr", "", "Post-process", "sim_type=1", "", "" },
{ 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", "", "" },
Expand Down
2 changes: 1 addition & 1 deletion ssc/cmod_fuelcell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ var_info vtab_fuelcell_input[] = {
{ SSC_INPUT, SSC_MATRIX, "dispatch_manual_fuelcell_sched_weekend", "Dispatch schedule for weekend", "", "", "Fuel Cell", "", "", "" },

{ SSC_INOUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "", "?=0", "", "" },
{ SSC_INOUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "", "?=0", "", "" },
{ SSC_INOUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "", "?=0", "", "" },

var_info_invalid };

Expand Down
10 changes: 5 additions & 5 deletions ssc/cmod_generic_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ static var_info _cm_vtab_generic_system[] = {
// OUTPUTS ----------------------------------------------------------------------------
// VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS
// { SSC_OUTPUT, SSC_ARRAY, "hourly_energy", "Hourly Energy", "kWh", "", "Time Series", "*", "LENGTH=8760", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "kWh", "", "Monthly", "*", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "Annual", "*", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Monthly", "*", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Annual", "*", "", "" },

{ SSC_OUTPUT, SSC_NUMBER, "annual_fuel_usage", "Annual Fuel Usage", "kWht", "", "Annual", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "water_usage", "Annual Water Usage", "", "", "Annual", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "system_heat_rate", "Heat Rate Conversion Factor", "MMBTUs/MWhe", "", "Annual", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_fuel_usage", "Annual fuel usage", "kWht", "", "Annual", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "water_usage", "Annual water usage", "", "", "Annual", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "system_heat_rate", "Heat rate conversion factor", "MMBTUs/MWhe", "", "Annual", "*", "", "" },

{ SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "Annual", "*", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "kwh_per_kw", "First year kWh/kW", "kWh/kW", "", "Annual", "*", "", "" },
Expand Down
8 changes: 4 additions & 4 deletions ssc/cmod_geothermal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static var_info _cm_vtab_geothermal[] = {

{ SSC_OUTPUT, SSC_ARRAY, "monthly_resource_temperature", "Monthly avg resource temperature", "C", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_power", "Monthly power", "kW", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "AC energy (year 1)", "kWh/mo", "", "GeoHourly", "", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh/mo", "", "GeoHourly", "", "LENGTH=12", "" },
{ SSC_OUTPUT, SSC_ARRAY, "monthly_energy_lifetime", "Monthly energy before performance adjustments", "kWh", "", "GeoHourly", "ui_calculations_only=0", "", "" },

{ SSC_OUTPUT, SSC_ARRAY, "timestep_resource_temperature", "Resource temperature", "C", "", "GeoHourly", "ui_calculations_only=0", "", "" },
Expand All @@ -208,9 +208,9 @@ static var_info _cm_vtab_geothermal[] = {
{ SSC_OUTPUT, SSC_ARRAY, "timestep_dry_bulb", "Dry bulb temperature", "C", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_ARRAY, "timestep_wet_bulb", "Wet bulb temperature", "C", "", "GeoHourly", "ui_calculations_only=0", "", "" },

{ SSC_OUTPUT, SSC_NUMBER, "lifetime_output", "Lifetime Output", "kWh", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "first_year_output", "First Year Output", "kWh", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "lifetime_output", "Lifetime output", "kWh", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "first_year_output", "First year output", "kWh", "", "GeoHourly", "ui_calculations_only=0", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "GeoHourly", "ui_calculations_only=0", "", "" },


{ SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "", "", "", "*", "", "" },
Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_grid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var_info vtab_grid_input[] = {
{ SSC_INPUT, SSC_ARRAY, "crit_load", "Critical electricity load (year 1)", "kW", "", "Load", "", "", "" },
{ SSC_INOUT, SSC_ARRAY, "grid_outage", "Grid outage in this time step", "0/1", "0=GridAvailable,1=GridUnavailable,Length=load", "Load", "", "", "" },
{ SSC_INPUT, SSC_ARRAY, "load_escalation", "Annual load escalation", "%/year", "", "Load", "?=0", "", "" },
{ SSC_INOUT, SSC_ARRAY, "monthly_energy", "AC energy (year 1)", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" },
{ SSC_INOUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" },


var_info_invalid };
Expand All @@ -64,7 +64,7 @@ var_info vtab_grid_output[] = {
{ SSC_OUTPUT, SSC_ARRAY, "system_pre_interconnect_kwac", "System power before grid interconnect", "kW", "Lifetime system generation" "", "", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "capacity_factor_interconnect_ac", "Capacity factor based on AC interconnection limit", "%", "", "", "", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_energy_pre_interconnect_ac", "Annual Energy AC pre-interconnection (year 1)", "kWh", "", "", "", "", "" },
{ SSC_INOUT, SSC_NUMBER, "annual_energy", "Annual Energy AC (year 1)", "kWh", "", "System Output", "", "", "" },
{ SSC_INOUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "System Output", "", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_ac_interconnect_loss_percent","Annual Energy loss from interconnection limit (year 1)", "%", "", "", "", "", "" },
{ SSC_OUTPUT, SSC_NUMBER, "annual_ac_interconnect_loss_kwh", "Annual Energy loss from interconnection limit (year 1)", "kWh", "", "", "", "", "" },

Expand Down
Loading