From d9c9bddff740d66deefb9c989c15b3fbcc73bbf5 Mon Sep 17 00:00:00 2001 From: Paul Gilman Date: Fri, 25 Oct 2024 17:02:01 -0700 Subject: [PATCH 1/2] Consistent naming for energy variables * `monthly_energy` "Monthly AC energy in Year 1" * `annual_energy` "Annual AC energy in Year 1" * Fix capitalization as convenient * Don't change labels for SWH, and for some CSP models that have long labels, or for Marine Energy, etc. --- ssc/cmod_battery.cpp | 2 +- ssc/cmod_biomass.cpp | 4 ++-- ssc/cmod_fresnel_physical.cpp | 6 +++--- ssc/cmod_fresnel_physical_iph.cpp | 6 +++--- ssc/cmod_fuelcell.cpp | 2 +- ssc/cmod_generic_system.cpp | 10 +++++----- ssc/cmod_geothermal.cpp | 8 ++++---- ssc/cmod_grid.cpp | 4 ++-- ssc/cmod_hcpv.cpp | 4 ++-- ssc/cmod_linear_fresnel_dsg_iph.cpp | 8 ++++---- ssc/cmod_mhk_tidal.cpp | 2 +- ssc/cmod_mhk_wave.cpp | 2 +- ssc/cmod_mspt_iph.cpp | 4 ++-- ssc/cmod_pvsamv1.cpp | 6 +++--- ssc/cmod_pvwattsv8.cpp | 10 +++++----- ssc/cmod_snowmodel.cpp | 4 ++-- ssc/cmod_tcsdish.cpp | 4 ++-- ssc/cmod_tcsgeneric_solar.cpp | 4 ++-- ssc/cmod_tcslinear_fresnel.cpp | 4 ++-- ssc/cmod_tcsmslf.cpp | 4 ++-- ssc/cmod_tcstrough_empirical.cpp | 4 ++-- ssc/cmod_tcstrough_physical.cpp | 4 ++-- ssc/cmod_trough_physical.cpp | 4 ++-- ssc/cmod_trough_physical_iph.cpp | 6 +++--- ssc/cmod_windpower.cpp | 6 +++--- ssc/common.cpp | 2 +- 26 files changed, 62 insertions(+), 62 deletions(-) diff --git a/ssc/cmod_battery.cpp b/ssc/cmod_battery.cpp index 4f7503480..fa73d837a 100644 --- a/ssc/cmod_battery.cpp +++ b/ssc/cmod_battery.cpp @@ -2258,7 +2258,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 }; diff --git a/ssc/cmod_biomass.cpp b/ssc/cmod_biomass.cpp index 3ef108cc1..63f647891 100644 --- a/ssc/cmod_biomass.cpp +++ b/ssc/cmod_biomass.cpp @@ -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", "" }, @@ -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", "*", "", "" }, diff --git a/ssc/cmod_fresnel_physical.cpp b/ssc/cmod_fresnel_physical.cpp index 500aa8612..e20032876 100644 --- a/ssc/cmod_fresnel_physical.cpp +++ b/ssc/cmod_fresnel_physical.cpp @@ -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", "", "" }, diff --git a/ssc/cmod_fresnel_physical_iph.cpp b/ssc/cmod_fresnel_physical_iph.cpp index 477c302b7..c8bfd6064 100644 --- a/ssc/cmod_fresnel_physical_iph.cpp +++ b/ssc/cmod_fresnel_physical_iph.cpp @@ -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", "", "" }, diff --git a/ssc/cmod_fuelcell.cpp b/ssc/cmod_fuelcell.cpp index 34dc7326f..38cf2396e 100644 --- a/ssc/cmod_fuelcell.cpp +++ b/ssc/cmod_fuelcell.cpp @@ -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 }; diff --git a/ssc/cmod_generic_system.cpp b/ssc/cmod_generic_system.cpp index c3d827a42..80be197ff 100644 --- a/ssc/cmod_generic_system.cpp +++ b/ssc/cmod_generic_system.cpp @@ -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", "*", "", "" }, diff --git a/ssc/cmod_geothermal.cpp b/ssc/cmod_geothermal.cpp index 58d5acd71..fd48acd60 100644 --- a/ssc/cmod_geothermal.cpp +++ b/ssc/cmod_geothermal.cpp @@ -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", "", "" }, @@ -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", "", "", "", "*", "", "" }, diff --git a/ssc/cmod_grid.cpp b/ssc/cmod_grid.cpp index ea98e0494..8f8e69790 100644 --- a/ssc/cmod_grid.cpp +++ b/ssc/cmod_grid.cpp @@ -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 }; @@ -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", "", "", "", "", "" }, diff --git a/ssc/cmod_hcpv.cpp b/ssc/cmod_hcpv.cpp index 6908cc943..e792822ac 100644 --- a/ssc/cmod_hcpv.cpp +++ b/ssc/cmod_hcpv.cpp @@ -144,14 +144,14 @@ static var_info _cm_vtab_hcpv[] = { // { SSC_OUTPUT, SSC_ARRAY, "hourly_energy", "Hourly Energy", "kWh", "", "Hourly", "*", "LENGTH=8760", "" }, // monthly outputs - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "kWh", "", "Monthly", "*", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Monthly", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_beam", "Beam irradiance", "kW/m2", "", "Monthly", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_input_radiation", "Input radiation", "kWh", "", "Monthly", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_dc_net", "DC net", "kWh", "", "Monthly", "*", "LENGTH=12", "" }, // annual outputs - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "Annual", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Annual", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_beam", "Beam irradiance", "kW/m2", "", "Annual", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_input_radiation", "Input radiation", "kWh", "", "Annual", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_dc", "DC gross", "kWh", "", "Annual", "*", "", "" }, diff --git a/ssc/cmod_linear_fresnel_dsg_iph.cpp b/ssc/cmod_linear_fresnel_dsg_iph.cpp index 24aec2c77..ccf7e0a7e 100644 --- a/ssc/cmod_linear_fresnel_dsg_iph.cpp +++ b/ssc/cmod_linear_fresnel_dsg_iph.cpp @@ -187,11 +187,11 @@ static var_info _cm_vtab_linear_fresnel_dsg_iph[] = { { SSC_OUTPUT, SSC_ARRAY, "op_mode_3", "3rd op. mode, if applicable", "", "", "Controller", "*", "", "" }, // Annual Outputs - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Net Thermal Energy Production w/ avail derate", "kWt-hr", "", "Post-process", "*", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_field_energy", "Annual Gross Thermal Energy Production w/ avail derate", "kWt-hr", "", "Post-process", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual net thermal energy production with availability derate", "kWt-hr", "", "Post-process", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_field_energy", "Annual gross thermal energy production with availability derate", "kWt-hr", "", "Post-process", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_thermal_consumption", "Annual thermal freeze protection required", "kWt-hr", "", "Post-process", "*", "", "" }, - { 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", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_electricity_consumption", "Annual electricity consumption with availability derate", "kWe-hr", "", "Post-process", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_total_water_use", "Total annual water usage", "m^3", "", "Post-process", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "Post-process", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "kwh_per_kw", "First year kWh/kW", "kWht/kWt", "", "Post-process", "*", "", "" }, diff --git a/ssc/cmod_mhk_tidal.cpp b/ssc/cmod_mhk_tidal.cpp index d34384d90..46383b359 100644 --- a/ssc/cmod_mhk_tidal.cpp +++ b/ssc/cmod_mhk_tidal.cpp @@ -61,7 +61,7 @@ static var_info _cm_vtab_mhk_tidal[] = { // { SSC_OUTPUT, SSC_NUMBER, "device_rated_capacity", "Rated capacity of device", "kW", "", "MHKTidal", "calculate_capacity=0", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "device_rated_capacity", "Rated capacity of device", "kW", "", "MHKTidal", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "device_average_power", "Average power production of a single device", "kW", "", "MHKTidal", "*", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual energy production of array", "kWh", "", "MHKTidal", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy production of array in Year 1", "kWh", "", "MHKTidal", "*", "", "" }, { SSC_OUTPUT, SSC_ARRAY, "gen", "System power generated", "kW", "", "MHKTidal", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "MHKTidal", "*", "", "" }, diff --git a/ssc/cmod_mhk_wave.cpp b/ssc/cmod_mhk_wave.cpp index bc05ec6f7..fad19d7c0 100644 --- a/ssc/cmod_mhk_wave.cpp +++ b/ssc/cmod_mhk_wave.cpp @@ -83,7 +83,7 @@ static var_info _cm_vtab_mhk_wave[] = { { SSC_OUTPUT, SSC_NUMBER, "device_average_power", "Average power production of a single device", "kW", "", "MHKWave", "*", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual energy production of array", "kWh", "", "MHKWave", "", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy production of array in Year 1", "kWh", "", "MHKWave", "", "", "" }, { SSC_OUTPUT, SSC_ARRAY, "energy_hourly_kWh", "Energy production of array", "kWh", "", "Time Series", "wave_resource_model_choice=1", "", "" }, { SSC_OUTPUT, SSC_ARRAY, "energy_hourly_kW", "Power output of array", "kW", "", "Time Series", "wave_resource_model_choice=1", "", "" }, diff --git a/ssc/cmod_mspt_iph.cpp b/ssc/cmod_mspt_iph.cpp index b0bcf4660..c9bb4dd42 100644 --- a/ssc/cmod_mspt_iph.cpp +++ b/ssc/cmod_mspt_iph.cpp @@ -606,11 +606,11 @@ static var_info _cm_vtab_mspt_iph[] = { { SSC_OUTPUT, SSC_ARRAY, "gen", "Total thermal power to heat sink with available derate", "kWt", "", "", "sim_type=1", "", ""}, // Annual single-value outputs -{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Thermal Energy to Heat Sink w/ avail derate", "kWt-hr", "", "Post-process", "sim_type=1", "", ""}, +{ SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual thermal energy to heat sink with availability derate", "kWt-hr", "", "Post-process", "sim_type=1", "", ""}, { SSC_OUTPUT, SSC_NUMBER, "annual_q_rec_htf", "Annual receiver power delivered to HTF", "MWt-hr", "", "Tower and Receiver", "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, "capacity_factor", "Capacity factor", "%", "", "Post-process", "sim_type=1", "", ""}, { SSC_OUTPUT, SSC_NUMBER, "kwh_per_kw", "First year kWh/kW", "kWth/kWt", "", "Post-process", "sim_type=1", "", ""}, diff --git a/ssc/cmod_pvsamv1.cpp b/ssc/cmod_pvsamv1.cpp index 3f74ca32d..f9f52f6ac 100644 --- a/ssc/cmod_pvsamv1.cpp +++ b/ssc/cmod_pvsamv1.cpp @@ -839,7 +839,7 @@ static var_info _cm_vtab_pvsamv1[] = { // monthly and annual outputs - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy", "kWh", "", "Annual (Year 1)", "", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Annual (Year 1)", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_dc_invmppt_loss", "Inverter clipping loss DC MPPT voltage limits", "kWh/yr", "", "Annual (Year 1)", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_inv_cliploss", "Inverter clipping loss AC power limit", "kWh/yr", "", "Annual (Year 1)", "", "", "" }, @@ -863,8 +863,8 @@ static var_info _cm_vtab_pvsamv1[] = { { SSC_OUTPUT, SSC_ARRAY, "monthly_poa_eff", "POA irradiance total after shading and soiling", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_poa_beam_eff", "POA front-side irradiance beam after shading and soiling", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" }, - { SSC_OUTPUT, SSC_ARRAY, "monthly_dc", "DC energy", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" }, - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "AC energy gross", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_dc", "Monthly DC energy in Year 1", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh/mo", "", "Monthly", "", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_gh", "Annual GHI", "Wh/m2/yr", "", "Annual (Year 1)", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_poa_nom", "POA front-side irradiance total nominal", "kWh/yr", "", "Annual (Year 1)", "", "", "" }, diff --git a/ssc/cmod_pvwattsv8.cpp b/ssc/cmod_pvwattsv8.cpp index 5a357b1ac..3994a7140 100644 --- a/ssc/cmod_pvwattsv8.cpp +++ b/ssc/cmod_pvwattsv8.cpp @@ -203,16 +203,16 @@ static var_info _cm_vtab_pvwattsv8[] = { { SSC_OUTPUT, SSC_ARRAY, "poa_monthly", "Plane of array irradiance", "kWh/m2", "", "Monthly", "", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "solrad_monthly", "Daily average solar irradiance", "kWh/m2/day","", "Monthly", "", "LENGTH=12", "" }, - { SSC_OUTPUT, SSC_ARRAY, "dc_monthly", "DC output", "kWh", "", "Monthly", "", "LENGTH=12", "" }, - { SSC_OUTPUT, SSC_ARRAY, "ac_monthly", "AC output", "kWh", "", "Monthly", "", "LENGTH=12", "" }, - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly energy", "kWh", "", "Monthly", "", "LENGTH=12", "" }, - { SSC_OUTPUT, SSC_MATRIX, "annual_energy_distribution_time","Annual energy production as function of Time", "", "", "Heatmaps", "", "", "" }, + { SSC_OUTPUT, SSC_ARRAY, "dc_monthly", "Monthly DC energy", "kWh", "", "Monthly", "", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "ac_monthly", "Monthly AC energy", "kWh", "", "Monthly", "", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Monthly", "", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_MATRIX, "annual_energy_distribution_time","Annual energy production as function of time", "", "", "Heatmaps", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "solrad_annual", "Daily average solar irradiance", "kWh/m2/day","", "Annual", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "ac_annual", "Annual AC output", "kWh", "", "Annual", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "ac_annual_pre_adjust", "Annual AC output before system availability", "kWh", "", "Annual", "", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual energy", "kWh", "", "Annual", "", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Annual", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor based on nameplate DC capacity", "%", "", "Annual", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "capacity_factor_ac", "Capacity factor based on total AC capacity", "%", "", "Annual", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "kwh_per_kw", "Energy yield", "kWh/kW", "", "Annual", "", "", "" }, diff --git a/ssc/cmod_snowmodel.cpp b/ssc/cmod_snowmodel.cpp index a38630a58..f61948a9c 100644 --- a/ssc/cmod_snowmodel.cpp +++ b/ssc/cmod_snowmodel.cpp @@ -78,8 +78,8 @@ static var_info _cm_vtab_snowmodel[] = //{ SSC_OUTPUT, SSC_ARRAY, "snow_loss", "PV loss due to snow", "", "", "PV Snow Model", "*", "", "" }, //{ SSC_OUTPUT, SSC_ARRAY, "snow_fall_flag", "Snow Fall Flag", "", "", "PV Snow Model", "*", "", "" }, { SSC_OUTPUT, SSC_ARRAY, "hourly_gen", "Hourly Energy", "kwh", "", "Time Series", "*", "", "" }, - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy", "kwh", "", "Monthly", "*", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kwh", "", "Annual", "*", "", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kwh", "", "Monthly", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kwh", "", "Annual", "*", "", "" }, //{ SSC_OUTPUT, SSC_ARRAY, "smout", "Hourly Energy", "kwh", "", "Time Series", "*", "", "" }, diff --git a/ssc/cmod_tcsdish.cpp b/ssc/cmod_tcsdish.cpp index 07ab59a06..c381f597c 100644 --- a/ssc/cmod_tcsdish.cpp +++ b/ssc/cmod_tcsdish.cpp @@ -234,7 +234,7 @@ static var_info _cm_vtab_tcsdish[] = { // { SSC_OUTPUT, SSC_ARRAY, "hourly_energy", "Hourly Energy", "kWe", "", "Outputs", "*", "LENGTH=8760", "" }, // annual outputs - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "Outputs", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Outputs", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_Power_in_collector","Power incident on the collector", "MWh", "", "Outputs", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_Power_out_col", "Total power from the collector dish", "MWh", "", "Outputs", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_Power_in_rec", "Power entering the receiver from the collector", "MWh", "", "Outputs", "*", "", "" }, @@ -245,7 +245,7 @@ static var_info _cm_vtab_tcsdish[] = { { SSC_OUTPUT, SSC_NUMBER, "annual_Q_rec_losses", "Receiver thermal losses", "MWh", "", "Outputs", "*", "", "" }, // monthly outputs - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy", "kWh", "", "Outputs", "*", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Outputs", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_Power_in_collector","Power incident on the collector", "MWh", "", "Outputs", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_Power_out_col", "Total power from the collector dish", "MWh", "", "Outputs", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_Power_in_rec", "Power entering the receiver from the collector", "MWh", "", "Outputs", "*", "LENGTH=12", "" }, diff --git a/ssc/cmod_tcsgeneric_solar.cpp b/ssc/cmod_tcsgeneric_solar.cpp index 008b8f21d..6c78946ef 100644 --- a/ssc/cmod_tcsgeneric_solar.cpp +++ b/ssc/cmod_tcsgeneric_solar.cpp @@ -180,7 +180,7 @@ static var_info _cm_vtab_tcsgeneric_solar[] = { // { SSC_OUTPUT, SSC_ARRAY, "hourly_energy", "Hourly Energy", "kWh", "", "Outputs", "*", "LENGTH=8760", "" }, // monthly outputs - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "kWh", "", "Generic CSP", "*", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Generic CSP", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_w_gr", "Total gross power production", "kWh", "", "Generic CSP", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_q_sf", "Solar field delivered thermal power", "MWt", "", "Generic CSP", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_q_to_pb", "Thermal energy to the power conversion system", "MWt", "", "Generic CSP", "*", "LENGTH=12", "" }, @@ -194,7 +194,7 @@ static var_info _cm_vtab_tcsgeneric_solar[] = { // annual outputs - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "Generic CSP", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Generic CSP", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_w_gr", "Total gross power production", "kWh", "", "Generic CSP", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_q_sf", "Solar field delivered thermal power", "MWht", "", "Generic CSP", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_q_to_pb", "Thermal energy to the power conversion system", "MWht", "", "Generic CSP", "*", "", "" }, diff --git a/ssc/cmod_tcslinear_fresnel.cpp b/ssc/cmod_tcslinear_fresnel.cpp index c2ca347bc..85374d64c 100644 --- a/ssc/cmod_tcslinear_fresnel.cpp +++ b/ssc/cmod_tcslinear_fresnel.cpp @@ -275,11 +275,11 @@ static var_info _cm_vtab_tcslinear_fresnel[] = { // { SSC_OUTPUT, SSC_ARRAY, "hourly_energy", "Hourly Energy", "kWh", "", "Outputs", "*", "LENGTH=8760", "" }, // monthly values - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "kWh", "", "Linear Fresnel", "*", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Linear Fresnel", "*", "LENGTH=12", "" }, // single values - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "Linear Fresnel", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Linear Fresnel", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_W_cycle_gross", "Electrical source - Power cycle gross output", "kWh", "", "Linear Fresnel", "*", "", "" }, //{ SSC_OUTPUT, SSC_NUMBER, "system_use_lifetime_output", "Use lifetime output", "0/1", "", "Linear Fresnel", "*", "INTEGER", "" }, diff --git a/ssc/cmod_tcsmslf.cpp b/ssc/cmod_tcsmslf.cpp index cc5ea87a6..615dc78a3 100644 --- a/ssc/cmod_tcsmslf.cpp +++ b/ssc/cmod_tcsmslf.cpp @@ -357,10 +357,10 @@ static var_info _cm_vtab_tcsmslf[] = { // { SSC_OUTPUT, SSC_ARRAY, "hourly_energy", "Hourly Energy", "kWh", "", "Calculated", "*", "LENGTH=8760", ""}, // monthly values - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "kWh", "", "mslf", "*", "LENGTH=12", ""}, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "mslf", "*", "LENGTH=12", ""}, // single values - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "mslf", "*", "", ""}, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "mslf", "*", "", ""}, { SSC_OUTPUT, SSC_NUMBER, "annual_W_cycle_gross", "Electrical source - Power cycle gross output", "kWh", "", "mslf", "*", "", ""}, { SSC_OUTPUT, SSC_NUMBER, "conversion_factor", "Gross to Net Conversion Factor", "%", "", "Calculated", "*", "", ""}, { SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "", "*", "", ""}, diff --git a/ssc/cmod_tcstrough_empirical.cpp b/ssc/cmod_tcstrough_empirical.cpp index 4022f12bd..c10999225 100644 --- a/ssc/cmod_tcstrough_empirical.cpp +++ b/ssc/cmod_tcstrough_empirical.cpp @@ -271,8 +271,8 @@ static var_info _cm_vtab_tcstrough_empirical[] = { // { SSC_OUTPUT, SSC_ARRAY, "hourly_energy", "Hourly energy", "kWh", "", "tcs_trough_empirical", "*", "LENGTH=8760", "" }, - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly energy gross", "kWh", "", "tcs_trough_empirical", "*", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual energy", "kWh", "", "tcs_trough_empirical", "*", "", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "tcs_trough_empirical", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "tcs_trough_empirical", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_W_cycle_gross", "Electrical source - Power cycle gross output", "kWh", "", "tcs_trough_empirical", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "conversion_factor", "Gross to Net Conversion Factor", "%", "", "Calculated", "*", "", "" }, diff --git a/ssc/cmod_tcstrough_physical.cpp b/ssc/cmod_tcstrough_physical.cpp index f4debf99b..df79319c4 100644 --- a/ssc/cmod_tcstrough_physical.cpp +++ b/ssc/cmod_tcstrough_physical.cpp @@ -408,7 +408,7 @@ static var_info _cm_vtab_tcstrough_physical[] = { { SSC_OUTPUT, SSC_ARRAY, "Q_par_tes_fp", "Parasitic thermal TES freeze protection", "MWt", "", "SumCalc", "*", "", "" }, // Monthly Outputs - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "kWh", "", "Net_E_Calc", "*", "LENGTH=12", "" }, + { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Net_E_Calc", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_W_cycle_gross", "Electrical source - Power cycle gross output", "MWhe", "", "Net_E_Calc", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_q_inc_sf_tot", "Total power incident on the field", "MWht", "", "Type250", "*", "LENGTH=12", "" }, { SSC_OUTPUT, SSC_ARRAY, "monthly_q_abs_tot", "Total absorbed energy", "MWht", "", "Type250", "*", "LENGTH=12", "" }, @@ -420,7 +420,7 @@ static var_info _cm_vtab_tcstrough_physical[] = { { SSC_OUTPUT, SSC_ARRAY, "monthly_q_to_tes", "Thermal energy into storage", "MWht", "", "Type251", "*", "LENGTH=12", "" }, // Annual Outputs - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual Energy", "kWh", "", "Net_E_Calc", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "Net_E_Calc", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_W_cycle_gross", "Electrical source - Power cycle gross output", "MWhe", "", "Net_E_Calc", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_q_inc_sf_tot", "Total power incident on the field", "MWht", "", "Type250", "*", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "annual_q_abs_tot", "Total absorbed energy", "MWht", "", "Type250", "*", "", "" }, diff --git a/ssc/cmod_trough_physical.cpp b/ssc/cmod_trough_physical.cpp index 098030939..aa38fef44 100644 --- a/ssc/cmod_trough_physical.cpp +++ b/ssc/cmod_trough_physical.cpp @@ -607,10 +607,10 @@ static var_info _cm_vtab_trough_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 Gross", "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 electrical energy 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_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", "", "" }, diff --git a/ssc/cmod_trough_physical_iph.cpp b/ssc/cmod_trough_physical_iph.cpp index 4a51fde4c..fc408eba1 100644 --- a/ssc/cmod_trough_physical_iph.cpp +++ b/ssc/cmod_trough_physical_iph.cpp @@ -586,13 +586,13 @@ static var_info _cm_vtab_trough_physical_iph[] = { { SSC_OUTPUT, SSC_ARRAY, "q_balance", "Relative energy balance error", "", "", "solver", "sim_type=1", "", "" }, // Monthly Outputs - { SSC_OUTPUT, SSC_ARRAY, "monthly_energy", "Monthly Energy Gross", "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 electrical energy 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 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", "", "" }, diff --git a/ssc/cmod_windpower.cpp b/ssc/cmod_windpower.cpp index bb24bec6b..f28755667 100644 --- a/ssc/cmod_windpower.cpp +++ b/ssc/cmod_windpower.cpp @@ -119,9 +119,9 @@ static var_info _cm_vtab_windpower[] = { { SSC_OUTPUT , SSC_ARRAY , "wake_loss_internal_percent" , "Internal wake loss percent" , "%" ,"" , "Time Series" , "" , "" , "" } , // monthly and annual outputs - { 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_NUMBER , "annual_gross_energy" , "Annual Gross 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_gross_energy" , "Annual gross AC energy in Year 1" , "kWh" ,"" , "Annual" , "*" , "" , "" } , { SSC_OUTPUT , SSC_NUMBER , "capacity_factor" , "Capacity factor" , "%" ,"" , "Annual" , "*" , "" , "" } , { SSC_OUTPUT , SSC_NUMBER , "kwh_per_kw" , "First year kWh/kW" , "kWh/kW" ,"" , "Annual" , "*" , "" , "" } , { SSC_OUTPUT , SSC_NUMBER , "wind_speed_average" , "Average Wind speed" , "m/s" ,"" , "Annual" , "" , "" , "" } , diff --git a/ssc/common.cpp b/ssc/common.cpp index a91aeb586..31ae145eb 100644 --- a/ssc/common.cpp +++ b/ssc/common.cpp @@ -990,7 +990,7 @@ var_info vtab_hybrid_fin_om[] = { /* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/ { SSC_INPUT, SSC_NUMBER, "is_hybrid", "hybrid configuration", "0/1", "0=singletech,1=hybrid", "HybridFin", "?=0", "", "" }, { SSC_INPUT, SSC_ARRAY, "cf_hybrid_om_sum", "Hybrid O&M costs", "$", "", "HybridFin", "", "", "" }, - { SSC_INOUT, SSC_ARRAY, "monthly_energy", "Monthly energy", "kWh", "", "Monthly", "", "LENGTH = 12", "" }, + { SSC_INOUT, SSC_ARRAY, "monthly_energy", "Monthly AC energy in Year 1", "kWh", "", "Monthly", "", "LENGTH = 12", "" }, var_info_invalid }; From f030f56df8e22e6a51545f6a247368eba78a463a Mon Sep 17 00:00:00 2001 From: Paul Gilman Date: Mon, 4 Nov 2024 15:17:51 -0800 Subject: [PATCH 2/2] Marine energy annual energy labels --- ssc/cmod_mhk_tidal.cpp | 2 +- ssc/cmod_mhk_wave.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ssc/cmod_mhk_tidal.cpp b/ssc/cmod_mhk_tidal.cpp index 6239a5bd0..789b7d9d4 100644 --- a/ssc/cmod_mhk_tidal.cpp +++ b/ssc/cmod_mhk_tidal.cpp @@ -61,7 +61,7 @@ static var_info _cm_vtab_mhk_tidal[] = { // { SSC_OUTPUT, SSC_NUMBER, "device_rated_capacity", "Rated capacity of device", "kW", "", "MHKTidal", "calculate_capacity=0", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "device_rated_capacity", "Rated capacity of device", "kW", "", "MHKTidal", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "device_average_power", "Average power production of a single device", "kW", "", "MHKTidal", "*", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy production of array in Year 1", "kWh", "", "MHKTidal", "*", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "MHKTidal", "*", "", "" }, { SSC_OUTPUT, SSC_ARRAY, "gen", "System power generated", "kW", "", "MHKTidal", "", "", "" }, { SSC_OUTPUT, SSC_NUMBER, "capacity_factor", "Capacity factor", "%", "", "MHKTidal", "*", "", "" }, diff --git a/ssc/cmod_mhk_wave.cpp b/ssc/cmod_mhk_wave.cpp index 38e5af32c..85ab2a65b 100644 --- a/ssc/cmod_mhk_wave.cpp +++ b/ssc/cmod_mhk_wave.cpp @@ -78,7 +78,7 @@ static var_info _cm_vtab_mhk_wave[] = { { SSC_OUTPUT, SSC_NUMBER, "device_average_power", "Average power production of a single device", "kW", "", "MHKWave", "*", "", "" }, - { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy production of array in Year 1", "kWh", "", "MHKWave", "", "", "" }, + { SSC_OUTPUT, SSC_NUMBER, "annual_energy", "Annual AC energy in Year 1", "kWh", "", "MHKWave", "", "", "" }, { SSC_OUTPUT, SSC_ARRAY, "energy_hourly_kWh", "Energy production of array", "kWh", "", "Time Series", "wave_resource_model_choice=1", "", "" }, { SSC_OUTPUT, SSC_ARRAY, "energy_hourly_kW", "Power output of array", "kW", "", "Time Series", "wave_resource_model_choice=1", "", "" },