"elec_cost_" to "utility_bill_" in SSC test files

NREL · Feb 5, 2025 · 20e175d · 20e175d
1 parent 0123dab
commit 20e175d
Show file tree

Hide file tree

Showing 47 changed files with 155 additions and 155 deletions.
diff --git a/test/input_cases/general_data/cashloan_discounted_payback.json b/test/input_cases/general_data/cashloan_discounted_payback.json
@@ -211,9 +211,9 @@
 	"metric_3_label" : "Levelized COE (nominal)",
 	"metric_4" : "lcoe_real",
 	"metric_4_label" : "Levelized COE (real)",
-	"metric_5" : "elec_cost_without_system_year1",
+	"metric_5" : "utility_bill_wo_sys_year1",
 	"metric_5_label" : "Electricity bill without system (year 1)",
-	"metric_6" : "elec_cost_with_system_year1",
+	"metric_6" : "utility_bill_w_sys_year1",
 	"metric_6_label" : "Electricity bill with system (year 1)",
 	"metric_7" : "savings_year1",
 	"metric_7_label" : "Net savings with system (year 1)",

diff --git a/test/input_cases/swh_common.h b/test/input_cases/swh_common.h
@@ -321,12 +321,12 @@ void swh_common(ssc_data_t &data) {
 	ssc_number_t lcoe_real;
 	ssc_data_get_number(data, "lcoe_real", &lcoe_real);
 	printf("%s = %.17g\n", "Levelized COE (real)", (double)lcoe_real);
-	ssc_number_t elec_cost_without_system_year1;
-	ssc_data_get_number(data, "elec_cost_without_system_year1", &elec_cost_without_system_year1);
-	printf("%s = %.17g\n", "Electricity bill without system (year 1)", (double)elec_cost_without_system_year1);
-	ssc_number_t elec_cost_with_system_year1;
-	ssc_data_get_number(data, "elec_cost_with_system_year1", &elec_cost_with_system_year1);
-	printf("%s = %.17g\n", "Electricity bill with system (year 1)", (double)elec_cost_with_system_year1);
+	ssc_number_t utility_bill_wo_sys_year1;
+	ssc_data_get_number(data, "utility_bill_wo_sys_year1", &utility_bill_wo_sys_system_year1);
+	printf("%s = %.17g\n", "Electricity bill without system (year 1)", (double)utility_bill_wo_sys_year1);
+	ssc_number_t utility_bill_w_sys_year1;
+	ssc_data_get_number(data, "utility_bill_w_sys_year1", &utility_bill_w_sys_year1);
+	printf("%s = %.17g\n", "Electricity bill with system (year 1)", (double)utility_bill_w_sys_year1);
 	ssc_number_t savings_year1;
 	ssc_data_get_number(data, "savings_year1", &savings_year1);
 	printf("%s = %.17g\n", "Net savings with system (year 1)", (double)savings_year1);

diff --git a/...son/FinancialModels/cashloan/2022.08.08_develop_branch_DSLF_Commercial_cmod_cashloan.json b/...son/FinancialModels/cashloan/2022.08.08_develop_branch_DSLF_Commercial_cmod_cashloan.json
diff --git a/...lModels/cashloan/2022.08.08_develop_branch_Empirical_Trough_Commercial_cmod_cashloan.json b/...lModels/cashloan/2022.08.08_develop_branch_Empirical_Trough_Commercial_cmod_cashloan.json
diff --git a/...cialModels/cashloan/2022.08.08_develop_branch_Flat_Plate_PV_Commercial_cmod_cashloan.json b/...cialModels/cashloan/2022.08.08_develop_branch_Flat_Plate_PV_Commercial_cmod_cashloan.json
diff --git a/...ialModels/cashloan/2022.08.08_develop_branch_Flat_Plate_PV_Residential_cmod_cashloan.json b/...ialModels/cashloan/2022.08.08_develop_branch_Flat_Plate_PV_Residential_cmod_cashloan.json
diff --git a/...inancialModels/cashloan/2022.08.08_develop_branch_Fuel_Cell_Commercial_cmod_cashloan.json b/...inancialModels/cashloan/2022.08.08_develop_branch_Fuel_Cell_Commercial_cmod_cashloan.json
diff --git a/...alModels/cashloan/2022.08.08_develop_branch_Generic_Battery_Commercial_cmod_cashloan.json b/...alModels/cashloan/2022.08.08_develop_branch_Generic_Battery_Commercial_cmod_cashloan.json
diff --git a/...lModels/cashloan/2022.08.08_develop_branch_Generic_Battery_Residential_cmod_cashloan.json b/...lModels/cashloan/2022.08.08_develop_branch_Generic_Battery_Residential_cmod_cashloan.json
diff --git a/...odels/cashloan/2022.08.08_develop_branch_Generic_CSP_System_Commercial_cmod_cashloan.json b/...odels/cashloan/2022.08.08_develop_branch_Generic_CSP_System_Commercial_cmod_cashloan.json
diff --git a/...ialModels/cashloan/2022.08.08_develop_branch_Generic_System_Commercial_cmod_cashloan.json b/...ialModels/cashloan/2022.08.08_develop_branch_Generic_System_Commercial_cmod_cashloan.json
diff --git a/...alModels/cashloan/2022.08.08_develop_branch_Generic_System_Residential_cmod_cashloan.json b/...alModels/cashloan/2022.08.08_develop_branch_Generic_System_Residential_cmod_cashloan.json
diff --git a/...son/FinancialModels/cashloan/2022.08.08_develop_branch_MSLF_Commercial_cmod_cashloan.json b/...son/FinancialModels/cashloan/2022.08.08_develop_branch_MSLF_Commercial_cmod_cashloan.json
diff --git a/...alModels/cashloan/2022.08.08_develop_branch_PVWatts_Battery_Commercial_cmod_cashloan.json b/...alModels/cashloan/2022.08.08_develop_branch_PVWatts_Battery_Commercial_cmod_cashloan.json
diff --git a/...lModels/cashloan/2022.08.08_develop_branch_PVWatts_Battery_Residential_cmod_cashloan.json b/...lModels/cashloan/2022.08.08_develop_branch_PVWatts_Battery_Residential_cmod_cashloan.json
diff --git a/.../FinancialModels/cashloan/2022.08.08_develop_branch_PVWatts_Commercial_cmod_cashloan.json b/.../FinancialModels/cashloan/2022.08.08_develop_branch_PVWatts_Commercial_cmod_cashloan.json
diff --git a/...FinancialModels/cashloan/2022.08.08_develop_branch_PVWatts_Residential_cmod_cashloan.json b/...FinancialModels/cashloan/2022.08.08_develop_branch_PVWatts_Residential_cmod_cashloan.json
diff --git a/...nancialModels/cashloan/2022.08.08_develop_branch_PV_Battery_Commercial_cmod_cashloan.json b/...nancialModels/cashloan/2022.08.08_develop_branch_PV_Battery_Commercial_cmod_cashloan.json
diff --git a/...ancialModels/cashloan/2022.08.08_develop_branch_PV_Battery_Residential_cmod_cashloan.json b/...ancialModels/cashloan/2022.08.08_develop_branch_PV_Battery_Residential_cmod_cashloan.json
diff --git a/...dels/cashloan/2022.08.08_develop_branch_Solar_Water_Heating_Commercial_cmod_cashloan.json b/...dels/cashloan/2022.08.08_develop_branch_Solar_Water_Heating_Commercial_cmod_cashloan.json
diff --git a/...els/cashloan/2022.08.08_develop_branch_Solar_Water_Heating_Residential_cmod_cashloan.json b/...els/cashloan/2022.08.08_develop_branch_Solar_Water_Heating_Residential_cmod_cashloan.json
diff --git a/...odels/cashloan/2022.08.08_develop_branch_Standalone_Battery_Commercial_cmod_cashloan.json b/...odels/cashloan/2022.08.08_develop_branch_Standalone_Battery_Commercial_cmod_cashloan.json
diff --git a/...dels/cashloan/2022.08.08_develop_branch_Standalone_Battery_Residential_cmod_cashloan.json b/...dels/cashloan/2022.08.08_develop_branch_Standalone_Battery_Residential_cmod_cashloan.json
diff --git a/...nancialModels/cashloan/2022.08.08_develop_branch_Wind_Power_Commercial_cmod_cashloan.json b/...nancialModels/cashloan/2022.08.08_develop_branch_Wind_Power_Commercial_cmod_cashloan.json
diff --git a/...ancialModels/cashloan/2022.08.08_develop_branch_Wind_Power_Residential_cmod_cashloan.json b/...ancialModels/cashloan/2022.08.08_develop_branch_Wind_Power_Residential_cmod_cashloan.json
diff --git a/...per/2023.10.27_om-expense-cash-flow_Flat_Plate_PV_Host_Developer_cmod_host_developer.json b/...per/2023.10.27_om-expense-cash-flow_Flat_Plate_PV_Host_Developer_cmod_host_developer.json
diff --git a/...r/2023.10.27_om-expense-cash-flow_Generic_Battery_Host_Developer_cmod_host_developer.json b/...r/2023.10.27_om-expense-cash-flow_Generic_Battery_Host_Developer_cmod_host_developer.json
diff --git a/...er/2023.10.27_om-expense-cash-flow_Generic_System_Host_Developer_cmod_host_developer.json b/...er/2023.10.27_om-expense-cash-flow_Generic_System_Host_Developer_cmod_host_developer.json
diff --git a/...r/2023.10.27_om-expense-cash-flow_PVWatts_Battery_Host_Developer_cmod_host_developer.json b/...r/2023.10.27_om-expense-cash-flow_PVWatts_Battery_Host_Developer_cmod_host_developer.json