merge in develop and generate all api files and rerun defaults

NREL · Dec 6, 2024 · b6bfd07 · b6bfd07
1 parent 8e34a13
commit b6bfd07
Show file tree

Hide file tree

Showing 73 changed files with 963 additions and 307 deletions.
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json
@@ -335,7 +335,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json
@@ -335,7 +335,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -334,7 +334,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json
@@ -250,7 +250,7 @@
 			"batt_minimum_SOC": 30,
 			"batt_minimum_modetime": 10,
 			"batt_resistance": 0.001155,
-			"batt_room_temperature_celsius": [20.000000],
+			"batt_room_temperature_celsius": [25.000000],
 			"batt_voltage_choice": 0,
 			"batt_voltage_matrix": [
 				[0.000000, 1.200000],

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json
@@ -331,10 +331,10 @@
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000]
 			],
-			"dispatch_manual_system_charge_first": 1
+			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -334,7 +334,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridHostDeveloper.json
@@ -334,7 +334,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryCommercial.json
@@ -329,7 +329,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryHostDeveloper.json
@@ -329,7 +329,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/api/api_autogen/library/defaults/CashloanHeat_MSLFIPHCommercial.json b/api/api_autogen/library/defaults/CashloanHeat_MSLFIPHCommercial.json
@@ -2,28 +2,28 @@
 	"defaults": {
 		"FinancialParameters": {
 			"analysis_period": 25,
-			"debt_fraction": 50,
+			"debt_fraction": 60,
 			"federal_tax_rate": [21.000000],
 			"inflation_rate": 2.5,
 			"insurance_rate": 0.5,
-			"loan_rate": 6,
-			"loan_term": 30,
+			"loan_rate": 7,
+			"loan_term": 25,
 			"prop_tax_assessed_decline": 0,
 			"prop_tax_cost_assessed_percent": 100,
 			"property_tax_rate": 0,
 			"real_discount_rate": 6.4,
 			"salvage_percentage": 0,
 			"state_tax_rate": [7.000000],
-			"system_capacity": 279880
+			"system_capacity": 5000
 		},
 		"SystemCosts": {
 			"om_capacity_escal": 0,
-			"om_capacity_heat": [66.000000],
+			"om_capacity_heat": [33.000000],
 			"om_fixed": [0.000000],
 			"om_fixed_escal": 0,
 			"om_production_escal": 0,
 			"om_production_heat": [4.000000],
-			"total_installed_cost": 4.34851e+08
+			"total_installed_cost": 6.3373e+06
 		},
 		"LandLease": {
 		},
@@ -39,7 +39,7 @@
 			"itc_fed_amount": [0.000000],
 			"itc_fed_amount_deprbas_fed": 1,
 			"itc_fed_amount_deprbas_sta": 1,
-			"itc_fed_percent": [30.000000],
+			"itc_fed_percent": [0.000000],
 			"itc_fed_percent_deprbas_fed": 1,
 			"itc_fed_percent_deprbas_sta": 1,
 			"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],

diff --git a/api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json b/api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json
@@ -39,7 +39,7 @@
 			"itc_fed_amount": [0.000000],
 			"itc_fed_amount_deprbas_fed": 1,
 			"itc_fed_amount_deprbas_sta": 1,
-			"itc_fed_percent": [30.000000],
+			"itc_fed_percent": [0.000000],
 			"itc_fed_percent_deprbas_fed": 1,
 			"itc_fed_percent_deprbas_sta": 1,
 			"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],

diff --git a/api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryCommercial.json b/api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryCommercial.json
@@ -21,7 +21,7 @@
 			"om_batt_capacity_cost": [5.250000],
 			"om_batt_fixed_cost": [0.000000],
 			"om_batt_nameplate": 1200.21,
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [25.000000],
 			"om_capacity_escal": 0,

diff --git a/api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryResidential.json b/api/api_autogen/library/defaults/Cashloan_CustomGenerationBatteryResidential.json
@@ -20,7 +20,7 @@
 		},
 		"SystemCosts": {
 			"add_om_num_types": 1,
-			"om_batt_capacity_cost": [14.810000],
+			"om_batt_capacity_cost": [15.000000],
 			"om_batt_fixed_cost": [0.000000],
 			"om_batt_nameplate": 12.474,
 			"om_batt_replacement_cost": [434.000000],

diff --git a/api/api_autogen/library/defaults/Cashloan_PVBatteryCommercial.json b/api/api_autogen/library/defaults/Cashloan_PVBatteryCommercial.json
@@ -21,7 +21,7 @@
 			"om_batt_capacity_cost": [5.250000],
 			"om_batt_fixed_cost": [0.000000],
 			"om_batt_nameplate": 1200.21,
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [22.000000],
 			"om_capacity_escal": 0,

diff --git a/api/api_autogen/library/defaults/Cashloan_PVBatteryResidential.json b/api/api_autogen/library/defaults/Cashloan_PVBatteryResidential.json
@@ -20,7 +20,7 @@
 		},
 		"SystemCosts": {
 			"add_om_num_types": 1,
-			"om_batt_capacity_cost": [14.810000],
+			"om_batt_capacity_cost": [15.000000],
 			"om_batt_fixed_cost": [0.000000],
 			"om_batt_nameplate": 12.474,
 			"om_batt_replacement_cost": [434.000000],

diff --git a/api/api_autogen/library/defaults/Cashloan_StandaloneBatteryCommercial.json b/api/api_autogen/library/defaults/Cashloan_StandaloneBatteryCommercial.json
@@ -21,7 +21,7 @@
 			"om_batt_capacity_cost": [12.000000],
 			"om_batt_fixed_cost": [0.000000],
 			"om_batt_nameplate": 1200.21,
-			"om_batt_replacement_cost": [184.000000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity_escal": 0,
 			"om_fixed_escal": 0,

diff --git a/api/api_autogen/library/defaults/Communitysolar_PVWattsCommunitySolar.json b/api/api_autogen/library/defaults/Communitysolar_PVWattsCommunitySolar.json
@@ -2,7 +2,7 @@
 	"defaults": {
 		"FinancialParameters": {
 			"analysis_period": 25,
-			"construction_financing_cost": 119189,
+			"construction_financing_cost": 118611,
 			"cost_debt_closing": 0,
 			"cost_debt_fee": 2.75,
 			"cost_other_financing": 0,
@@ -45,7 +45,7 @@
 			"om_fixed_escal": 0,
 			"om_production": [0.000000],
 			"om_production_escal": 0,
-			"total_installed_cost": 4.54052e+06
+			"total_installed_cost": 4.51851e+06
 		},
 		"LandLease": {
 			"land_area": 13.0055,