Merge branch 'develop' into nsrdb-v4-api

NREL · Dec 4, 2024 · 68a54d3 · 68a54d3
2 parents e27f57f + 4fa438c
commit 68a54d3
Show file tree

Hide file tree

Showing 124 changed files with 3,338 additions and 365 deletions.
diff --git a/...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json b/...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json
diff --git a/...api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json b/...api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json
diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json
diff --git a/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
diff --git a/...library/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json b/...library/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json
@@ -381,6 +381,8 @@
 		},
 		"Revenue": {
 		},
+		"AdjustmentFactors": {
+		},
 		"ElectricityRates": {
 		},
 		"GridLimits": {

diff --git a/api/api_autogen/library/defaults/Battery_FuelCellCommercial.json b/api/api_autogen/library/defaults/Battery_FuelCellCommercial.json
diff --git a/api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json b/api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json
diff --git a/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json
diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json
@@ -377,6 +377,8 @@
 		},
 		"Revenue": {
 		},
+		"AdjustmentFactors": {
+		},
 		"ElectricityRates": {
 		},
 		"GridLimits": {

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridSingleOwner.json
@@ -381,6 +381,8 @@
 		},
 		"Revenue": {
 		},
+		"AdjustmentFactors": {
+		},
 		"ElectricityRates": {
 		},
 		"GridLimits": {

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -50,7 +50,7 @@
 			"LeadAcid_tn": 1,
 			"batt_C_rate": 0.2,
 			"batt_Cp": 1500,
-			"batt_Qexp": 0.04,
+			"batt_Qexp": 0.0400001,
 			"batt_Qfull": 2.25,
 			"batt_Qfull_flow": 2398.5,
 			"batt_Qnom": 2,
@@ -377,6 +377,8 @@
 		},
 		"Revenue": {
 		},
+		"AdjustmentFactors": {
+		},
 		"ElectricityRates": {
 		},
 		"GridLimits": {
@@ -388,7 +390,7 @@
 			"om_batt_nameplate": 1200.21,
 			"om_capacity_escal": 0,
 			"om_fixed_escal": 0,
-			"total_installed_cost": 890576
+			"total_installed_cost": 396879
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridSingleOwner.json
@@ -381,6 +381,8 @@
 		},
 		"Revenue": {
 		},
+		"AdjustmentFactors": {
+		},
 		"ElectricityRates": {
 		},
 		"GridLimits": {

diff --git a/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridHostDeveloper.json
@@ -377,6 +377,8 @@
 		},
 		"Revenue": {
 		},
+		"AdjustmentFactors": {
+		},
 		"ElectricityRates": {
 		},
 		"GridLimits": {

diff --git a/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridSingleOwner.json
@@ -381,6 +381,8 @@
 		},
 		"Revenue": {
 		},
+		"AdjustmentFactors": {
+		},
 		"ElectricityRates": {
 		},
 		"GridLimits": {

diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryAllEquityPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryCommercial.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryHostDeveloper.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryLeveragedPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryMerchantPlant.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryMerchantPlant.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryResidential.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryResidential.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatterySaleLeaseback.json b/api/api_autogen/library/defaults/Battery_StandaloneBatterySaleLeaseback.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_StandaloneBatterySingleOwner.json
diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryThirdParty.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryThirdParty.json
diff --git a/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryCommercial.json b/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryCommercial.json
diff --git a/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryHostDeveloper.json
diff --git a/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryResidential.json b/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryResidential.json
diff --git a/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryThirdParty.json b/api/api_autogen/library/defaults/Battwatts_PVWattsBatteryThirdParty.json
diff --git a/api/api_autogen/library/defaults/CashloanHeat_MSLFIPHCommercial.json b/api/api_autogen/library/defaults/CashloanHeat_MSLFIPHCommercial.json
@@ -0,0 +1,195 @@
+{
+	"defaults": {
+		"FinancialParameters": {
+			"analysis_period": 25,
+			"debt_fraction": 50,
+			"federal_tax_rate": [21.000000],
+			"inflation_rate": 2.5,
+			"insurance_rate": 0.5,
+			"loan_rate": 6,
+			"loan_term": 30,
+			"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
+		},
+		"SystemCosts": {
+			"om_capacity_escal": 0,
+			"om_capacity_heat": [66.000000],
+			"om_fixed": [0.000000],
+			"om_fixed_escal": 0,
+			"om_production_escal": 0,
+			"om_production_heat": [4.000000],
+			"total_installed_cost": 4.34851e+08
+		},
+		"LandLease": {
+		},
+		"Depreciation": {
+			"depr_fed_custom": [0.000000],
+			"depr_fed_sl_years": 7,
+			"depr_fed_type": 1,
+			"depr_sta_custom": [0.000000],
+			"depr_sta_sl_years": 7,
+			"depr_sta_type": 1
+		},
+		"TaxCreditIncentives": {
+			"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_deprbas_fed": 1,
+			"itc_fed_percent_deprbas_sta": 1,
+			"itc_fed_percent_maxvalue": [99999999999999997748809823456034029568.000000],
+			"itc_sta_amount": [0.000000],
+			"itc_sta_amount_deprbas_fed": 0,
+			"itc_sta_amount_deprbas_sta": 0,
+			"itc_sta_percent": [0.000000],
+			"itc_sta_percent_deprbas_fed": 0,
+			"itc_sta_percent_deprbas_sta": 0,
+			"itc_sta_percent_maxvalue": [99999999999999997748809823456034029568.000000],
+			"ptc_fed_amount_heat_btu": [0.000000],
+			"ptc_fed_escal": 0,
+			"ptc_fed_term": 10,
+			"ptc_sta_amount_heat_btu": [0.000000],
+			"ptc_sta_escal": 0,
+			"ptc_sta_term": 10
+		},
+		"PaymentIncentives": {
+			"cbi_fed_amount": 0,
+			"cbi_fed_amount_heat_btu": 0,
+			"cbi_fed_deprbas_fed": 0,
+			"cbi_fed_deprbas_sta": 0,
+			"cbi_fed_maxvalue": 1e+38,
+			"cbi_fed_tax_fed": 1,
+			"cbi_fed_tax_sta": 1,
+			"cbi_oth_amount": 0,
+			"cbi_oth_amount_heat_btu": 0,
+			"cbi_oth_deprbas_fed": 0,
+			"cbi_oth_deprbas_sta": 0,
+			"cbi_oth_maxvalue": 1e+38,
+			"cbi_oth_tax_fed": 1,
+			"cbi_oth_tax_sta": 1,
+			"cbi_sta_amount": 0,
+			"cbi_sta_amount_heat_btu": 0,
+			"cbi_sta_deprbas_fed": 0,
+			"cbi_sta_deprbas_sta": 0,
+			"cbi_sta_maxvalue": 1e+38,
+			"cbi_sta_tax_fed": 1,
+			"cbi_sta_tax_sta": 1,
+			"cbi_uti_amount": 0,
+			"cbi_uti_amount_heat_btu": 0,
+			"cbi_uti_deprbas_fed": 0,
+			"cbi_uti_deprbas_sta": 0,
+			"cbi_uti_maxvalue": 1e+38,
+			"cbi_uti_tax_fed": 1,
+			"cbi_uti_tax_sta": 1,
+			"ibi_fed_amount": 0,
+			"ibi_fed_amount_deprbas_fed": 0,
+			"ibi_fed_amount_deprbas_sta": 0,
+			"ibi_fed_amount_tax_fed": 1,
+			"ibi_fed_amount_tax_sta": 1,
+			"ibi_fed_percent": 0,
+			"ibi_fed_percent_deprbas_fed": 0,
+			"ibi_fed_percent_deprbas_sta": 0,
+			"ibi_fed_percent_maxvalue": 1e+38,
+			"ibi_fed_percent_tax_fed": 1,
+			"ibi_fed_percent_tax_sta": 1,
+			"ibi_oth_amount": 0,
+			"ibi_oth_amount_deprbas_fed": 0,
+			"ibi_oth_amount_deprbas_sta": 0,
+			"ibi_oth_amount_tax_fed": 1,
+			"ibi_oth_amount_tax_sta": 1,
+			"ibi_oth_percent": 0,
+			"ibi_oth_percent_deprbas_fed": 0,
+			"ibi_oth_percent_deprbas_sta": 0,
+			"ibi_oth_percent_maxvalue": 1e+38,
+			"ibi_oth_percent_tax_fed": 1,
+			"ibi_oth_percent_tax_sta": 1,
+			"ibi_sta_amount": 0,
+			"ibi_sta_amount_deprbas_fed": 0,
+			"ibi_sta_amount_deprbas_sta": 0,
+			"ibi_sta_amount_tax_fed": 1,
+			"ibi_sta_amount_tax_sta": 1,
+			"ibi_sta_percent": 0,
+			"ibi_sta_percent_deprbas_fed": 0,
+			"ibi_sta_percent_deprbas_sta": 0,
+			"ibi_sta_percent_maxvalue": 1e+38,
+			"ibi_sta_percent_tax_fed": 1,
+			"ibi_sta_percent_tax_sta": 1,
+			"ibi_uti_amount": 0,
+			"ibi_uti_amount_deprbas_fed": 0,
+			"ibi_uti_amount_deprbas_sta": 0,
+			"ibi_uti_amount_tax_fed": 1,
+			"ibi_uti_amount_tax_sta": 1,
+			"ibi_uti_percent": 0,
+			"ibi_uti_percent_deprbas_fed": 0,
+			"ibi_uti_percent_deprbas_sta": 0,
+			"ibi_uti_percent_maxvalue": 1e+38,
+			"ibi_uti_percent_tax_fed": 1,
+			"ibi_uti_percent_tax_sta": 1,
+			"pbi_fed_amount_heat_btu": [0.000000],
+			"pbi_fed_escal": 0,
+			"pbi_fed_tax_fed": 1,
+			"pbi_fed_tax_sta": 1,
+			"pbi_fed_term": 0,
+			"pbi_oth_amount_heat_btu": [0.000000],
+			"pbi_oth_escal": 0,
+			"pbi_oth_tax_fed": 1,
+			"pbi_oth_tax_sta": 1,
+			"pbi_oth_term": 0,
+			"pbi_sta_amount_heat_btu": [0.000000],
+			"pbi_sta_escal": 0,
+			"pbi_sta_tax_fed": 1,
+			"pbi_sta_tax_sta": 1,
+			"pbi_sta_term": 0,
+			"pbi_uti_amount_heat_btu": [0.000000],
+			"pbi_uti_escal": 0,
+			"pbi_uti_tax_fed": 1,
+			"pbi_uti_tax_sta": 1,
+			"pbi_uti_term": 0
+		},
+		"BatterySystem": {
+		},
+		"FuelCell": {
+		},
+		"ChargesByMonth": {
+			"charge_w_sys_dc_tou_ym": [
+[0]			],
+			"charge_w_sys_fixed_ym": [
+[0]			],
+			"net_billing_credits_ym": [
+[0]			],
+			"nm_dollars_applied_ym": [
+[0]			],
+			"utility_bill_w_sys": [0]
+		},
+		"Battery": {
+		},
+		"TimeSeries": {
+			"year1_hourly_dc_with_system": [0],
+			"year1_hourly_e_fromgrid": [0],
+			"year1_hourly_ec_with_system": [0]
+		},
+		"SystemOutput": {
+			"annual_energy_value": [0],
+			"degradation": [0.000000],
+			"gen": [0]
+		},
+		"Lifetime": {
+			"system_use_lifetime_output": 0
+		},
+		"ThirdPartyOwnership": {
+			"elec_cost_with_system": [0],
+			"elec_cost_without_system": [0]
+		},
+		"LCOS": {
+			"batt_salvage_percentage": 0
+		},
+		"ElectricityRates": {
+			"rate_escalation": [0.000000]
+		}
+	}
+}
diff --git a/api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json b/api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json
@@ -14,7 +14,7 @@
 			"real_discount_rate": 6.4,
 			"salvage_percentage": 0,
 			"state_tax_rate": [7.000000],
-			"system_capacity": 5190
+			"system_capacity": 5000
 		},
 		"SystemCosts": {
 			"om_capacity_escal": 0,
@@ -23,7 +23,7 @@
 			"om_fixed_escal": 0,
 			"om_production_escal": 0,
 			"om_production_heat": [2.000000],
-			"total_installed_cost": 9.92967e+06
+			"total_installed_cost": 1.33794e+07
 		},
 		"LandLease": {
 		},

diff --git a/...aults/CustomGeneration_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/...aults/CustomGeneration_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -5,7 +5,7 @@
 			"derate": 0,
 			"heat_rate": 0,
 			"spec_mode": 0,
-			"system_capacity": 969.565,
+			"system_capacity": 100770,
 			"user_capacity_factor": 0
 		},
 		"Lifetime": {
@@ -17,7 +17,7 @@
 			"om_capacity": [0],
 			"om_fixed": [0],
 			"om_production": [0],
-			"total_installed_cost": 2.91449e+07
+			"total_installed_cost": 1.87752e+06
 		}
 	}
 }