Skip to content

Rename ui_tech_capacity variables to om_tech_nameplate #593

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

Merged
mjprilliman merged 3 commits into from
Aug 13, 2021
Merged

Rename ui_tech_capacity variables to om_tech_nameplate #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
259ce9d
Replace ui_capacity syntax with om_nameplate for battery and fuelcell
mjprilliman Jul 16, 2021
00f2e7c
Merge branch 'develop' into om_nameplate_varname_fix
mjprilliman Aug 12, 2021
14d2825
Fix merge conflicts with host developer and battery capacity definitions
mjprilliman Aug 12, 2021
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
18 changes: 9 additions & 9 deletions ssc/cmod_cashloan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,18 +506,18 @@ class cm_cashloan : public compute_module
escal_or_annual(CF_om_fixed1_expense, nyears, "om_batt_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production1_expense, nyears, "om_batt_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01); //$/MWh
escal_or_annual(CF_om_capacity1_expense, nyears, "om_batt_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate1 = as_number("ui_batt_capacity");
nameplate1 = as_number("om_batt_nameplate");
if (as_integer("en_batt") == 1)
battery_discharged = as_vector_double("batt_annual_discharge_energy");
}
if (add_om_num_types > 1) // PV Battery Fuel Cell
{
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate2 = as_number("ui_fuelcell_capacity");
}
if (add_om_num_types > 1)
{
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal")*0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal")*0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal")*0.01);
nameplate2 = as_number("om_fuelcell_nameplate");
fuelcell_discharged = as_vector_double("fuelcell_annual_energy_discharged");
}
}

// battery cost - replacement from lifetime analysis
if ((as_integer("en_batt") == 1) && (as_integer("batt_replacement_option") > 0))
Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_equpartflip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ class cm_equpartflip : public compute_module
escal_or_annual(CF_om_fixed1_expense, nyears, "om_batt_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production1_expense, nyears, "om_batt_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01); //$/MWh
escal_or_annual(CF_om_capacity1_expense, nyears, "om_batt_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate1 = as_number("ui_batt_capacity");
nameplate1 = as_number("om_batt_nameplate");
if (as_integer("en_batt") == 1)
battery_discharged = as_vector_double("batt_annual_discharge_energy");
}
Expand All @@ -1025,7 +1025,7 @@ class cm_equpartflip : public compute_module
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate2 = as_number("ui_fuelcell_capacity");
nameplate2 = as_number("om_fuelcell_nameplate");
fuelcell_discharged = as_vector_double("fuelcell_annual_energy_discharged");
}

Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_host_developer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ class cm_host_developer : public compute_module
escal_or_annual(CF_om_fixed1_expense, nyears, "om_batt_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production1_expense, nyears, "om_batt_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01); //$/MWh
escal_or_annual(CF_om_capacity1_expense, nyears, "om_batt_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate1 = as_number("ui_batt_capacity");
nameplate1 = as_number("om_batt_nameplate");
if (as_integer("en_batt") == 1)
battery_discharged = as_vector_double("batt_annual_discharge_energy");
}
Expand All @@ -1008,7 +1008,7 @@ class cm_host_developer : public compute_module
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate2 = as_number("ui_fuelcell_capacity");
nameplate2 = as_number("om_fuelcell_nameplate");
fuelcell_discharged = as_vector_double("fuelcell_annual_energy_discharged");
}

Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_levpartflip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ class cm_levpartflip : public compute_module
escal_or_annual(CF_om_fixed1_expense, nyears, "om_batt_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production1_expense, nyears, "om_batt_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01); //$/MWh
escal_or_annual(CF_om_capacity1_expense, nyears, "om_batt_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate1 = as_number("ui_batt_capacity");
nameplate1 = as_number("om_batt_nameplate");
if (as_integer("en_batt") == 1)
battery_discharged = as_vector_double("batt_annual_discharge_energy");
}
Expand All @@ -1045,7 +1045,7 @@ class cm_levpartflip : public compute_module
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate2 = as_number("ui_fuelcell_capacity");
nameplate2 = as_number("om_fuelcell_nameplate");
fuelcell_discharged = as_vector_double("fuelcell_annual_energy_discharged");
}

Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_merchantplant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ class cm_merchantplant : public compute_module
escal_or_annual(CF_om_fixed1_expense, nyears, "om_batt_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production1_expense, nyears, "om_batt_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01); //$/MWh
escal_or_annual(CF_om_capacity1_expense, nyears, "om_batt_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate1 = as_number("ui_batt_capacity");
nameplate1 = as_number("om_batt_nameplate");
if (as_integer("en_batt") == 1)
battery_discharged = as_vector_double("batt_annual_discharge_energy");
}
Expand All @@ -1062,7 +1062,7 @@ class cm_merchantplant : public compute_module
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate2 = as_number("ui_fuelcell_capacity");
nameplate2 = as_number("om_fuelcell_nameplate");
fuelcell_discharged = as_vector_double("fuelcell_annual_energy_discharged");
}

Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_saleleaseback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ class cm_saleleaseback : public compute_module
escal_or_annual(CF_om_fixed1_expense, nyears, "om_batt_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production1_expense, nyears, "om_batt_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01); //$/MWh
escal_or_annual(CF_om_capacity1_expense, nyears, "om_batt_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate1 = as_number("ui_batt_capacity");
nameplate1 = as_number("om_batt_nameplate");
if (as_integer("en_batt") == 1)
battery_discharged = as_vector_double("batt_annual_discharge_energy");
}
Expand All @@ -1054,7 +1054,7 @@ class cm_saleleaseback : public compute_module
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal") * 0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal") * 0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal") * 0.01);
nameplate2 = as_number("ui_fuelcell_capacity");
nameplate2 = as_number("om_fuelcell_nameplate");
fuelcell_discharged = as_vector_double("fuelcell_annual_energy_discharged");
}

Expand Down
4 changes: 2 additions & 2 deletions ssc/cmod_singleowner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ class cm_singleowner : public compute_module
escal_or_annual(CF_om_fixed1_expense, nyears, "om_batt_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal")*0.01);
escal_or_annual(CF_om_production1_expense, nyears, "om_batt_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal")*0.01); //$/MWh
escal_or_annual(CF_om_capacity1_expense, nyears, "om_batt_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal")*0.01);
nameplate1 = as_number("ui_batt_capacity");
nameplate1 = as_number("om_batt_nameplate");
if (as_integer("en_batt") == 1)
battery_discharged = as_vector_double("batt_annual_discharge_energy");
}
Expand All @@ -1075,7 +1075,7 @@ class cm_singleowner : public compute_module
escal_or_annual(CF_om_fixed2_expense, nyears, "om_fuelcell_fixed_cost", inflation_rate, 1.0, false, as_double("om_fixed_escal")*0.01);
escal_or_annual(CF_om_production2_expense, nyears, "om_fuelcell_variable_cost", inflation_rate, 0.001, false, as_double("om_production_escal")*0.01);
escal_or_annual(CF_om_capacity2_expense, nyears, "om_fuelcell_capacity_cost", inflation_rate, 1.0, false, as_double("om_capacity_escal")*0.01);
nameplate2 = as_number("ui_fuelcell_capacity");
nameplate2 = as_number("om_fuelcell_nameplate");
fuelcell_discharged = as_vector_double("fuelcell_annual_energy_discharged");
}

Expand Down
4 changes: 2 additions & 2 deletions ssc/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ var_info vtab_oandm[] = {

// optional additional base o and m types
{ SSC_INPUT,SSC_NUMBER , "add_om_num_types" , "Number of O and M types" , "" , "" , "System Costs" , "?=0" , "INTEGER,MIN=0,MAX=2" , ""},
{ SSC_INPUT,SSC_NUMBER , "ui_batt_capacity" , "Battery capacity for System Costs values" , "kW" , "" , "System Costs" , "?=0" , "" , ""},
{ SSC_INPUT,SSC_NUMBER , "om_batt_nameplate" , "Battery capacity for System Costs values" , "kW" , "" , "System Costs" , "?=0" , "" , ""},
{ SSC_INPUT,SSC_ARRAY , "om_production1_values" , "Battery production for System Costs values" , "kWh" , "" , "System Costs" , "?=0" , "" , ""},

{ SSC_INPUT,SSC_ARRAY , "om_batt_fixed_cost" , "Battery fixed System Costs annual amount" , "$/year" , "" , "System Costs" , "?=0.0" , "" , ""},
{ SSC_INPUT,SSC_ARRAY , "om_batt_variable_cost" , "Battery production-based System Costs amount" , "$/MWh" , "" , "System Costs" , "?=0.0" , "" , ""},
{ SSC_INPUT,SSC_ARRAY , "om_batt_capacity_cost" , "Battery capacity-based System Costs amount" , "$/kWcap" , "" , "System Costs" , "?=0.0" , "" , ""},

{ SSC_INPUT,SSC_NUMBER , "ui_fuelcell_capacity" , "Fuel cell capacity for System Costs values" , "kW" , "" , "System Costs" , "?=0" , "" , ""},
{ SSC_INPUT,SSC_NUMBER , "om_fuelcell_nameplate" , "Fuel cell capacity for System Costs values" , "kW" , "" , "System Costs" , "?=0" , "" , ""},
{ SSC_INPUT,SSC_ARRAY , "om_production2_values" , "Fuel cell production for System Costs values" , "kWh" , "" , "System Costs" , "?=0" , "" , ""},

{ SSC_INPUT,SSC_ARRAY , "om_fuelcell_fixed_cost" , "Fuel cell fixed System Costs annual amount" , "$/year" , "" , "System Costs" , "?=0.0" , "" , ""},
Expand Down