Merge branch 'patch' into tidal-turbine-cf

NREL · Aug 1, 2024 · 3e0a4bb · 3e0a4bb
2 parents e316edb + 5f9d9f2
commit 3e0a4bb
Show file tree

Hide file tree

Showing 80 changed files with 2,498 additions and 1,363 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 ![Build](https://github.com/NREL/SAM/actions/workflows/ci.yml/badge.svg)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FNREL%2FSAM.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FNREL%2FSAM?ref=badge_shield)
 
-The SAM Open Source Project repository contains the source code, tools, and instructions to build a desktop version of the National Renewable Energy Laboratory's System Advisor Model (SAM). SAM is a simulation program for electricity generation projects. It has models for different kinds of renewable energy systems and financial models for residential, commercial, and utility-scale projects. For more details about SAM's capabilities, see the SAM website at [https://sam.nrel.gov/](https://sam.nrel.gov/).
+The SAM Open Source Project repository contains the source code, tools, and instructions to build a desktop version of the National Renewable Energy Laboratory's System Advisor Model™ (SAM™). SAM is a simulation program for electricity generation projects. It has models for different kinds of renewable energy systems and financial models for residential, commercial, and utility-scale projects. For more details about SAM's capabilities, see the SAM website at [https://sam.nrel.gov/](https://sam.nrel.gov/).
 
 For a short video describing the SAM repositories, see https://youtu.be/E5z1iiZfZ3M.
 

diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_GenericBatteryAllEquityPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_GenericBatteryCommercial.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_GenericBatteryHostDeveloper.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_GenericBatteryLeveragedPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryMerchantPlant.json b/api/api_autogen/library/defaults/Battery_GenericBatteryMerchantPlant.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryResidential.json b/api/api_autogen/library/defaults/Battery_GenericBatteryResidential.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatterySaleLeaseback.json b/api/api_autogen/library/defaults/Battery_GenericBatterySaleLeaseback.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_GenericBatterySingleOwner.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryThirdParty.json b/api/api_autogen/library/defaults/Battery_GenericBatteryThirdParty.json
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/Cashloan_GenericBatteryCommercial.json b/api/api_autogen/library/defaults/Cashloan_GenericBatteryCommercial.json
@@ -20,7 +20,7 @@
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [6.280000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 1199.36,
+			"om_batt_nameplate": 1200.21,
 			"om_batt_replacement_cost": [225.060000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [16.000000],
@@ -32,7 +32,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 2.55344e+06
+			"total_installed_cost": 2.55375e+06
 		},
 		"LandLease": {
 		},
@@ -157,7 +157,7 @@
 			"pbi_uti_term": 0
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 1199.36,
+			"batt_computed_bank_capacity": 1200.21,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 225.06,
@@ -199,7 +199,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 477727
+			"battery_total_cost_lcos": 477967
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

diff --git a/api/api_autogen/library/defaults/Cashloan_GenericBatteryResidential.json b/api/api_autogen/library/defaults/Cashloan_GenericBatteryResidential.json
@@ -22,7 +22,7 @@
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [9.680000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 12.8102,
+			"om_batt_nameplate": 12.474,
 			"om_batt_replacement_cost": [273.520000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [10.000000],
@@ -34,7 +34,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 52086.5
+			"total_installed_cost": 51691.6
 		},
 		"LandLease": {
 		},
@@ -153,7 +153,7 @@
 			"pbi_uti_term": 0
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 12.8102,
+			"batt_computed_bank_capacity": 12.474,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 706.24,
@@ -195,7 +195,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 14356.3
+			"battery_total_cost_lcos": 14035
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

diff --git a/api/api_autogen/library/defaults/Cashloan_PVBatteryCommercial.json b/api/api_autogen/library/defaults/Cashloan_PVBatteryCommercial.json
@@ -20,7 +20,7 @@
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [6.280000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 1199.36,
+			"om_batt_nameplate": 1200.21,
 			"om_batt_replacement_cost": [225.060000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [22.000000],
@@ -30,7 +30,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 1.3098e+06
+			"total_installed_cost": 1.3101e+06
 		},
 		"LandLease": {
 		},
@@ -155,7 +155,7 @@
 			"pbi_uti_term": 0
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 1199.36,
+			"batt_computed_bank_capacity": 1200.21,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 225.06,
@@ -197,7 +197,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 449293
+			"battery_total_cost_lcos": 449584
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

diff --git a/api/api_autogen/library/defaults/Cashloan_PVBatteryResidential.json b/api/api_autogen/library/defaults/Cashloan_PVBatteryResidential.json
@@ -22,7 +22,7 @@
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [9.680000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 12.8102,
+			"om_batt_nameplate": 12.474,
 			"om_batt_replacement_cost": [273.520000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [28.780000],
@@ -32,7 +32,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 38632.2
+			"total_installed_cost": 38458.6
 		},
 		"LandLease": {
 		},
@@ -151,7 +151,7 @@
 			"pbi_uti_term": 0
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 12.8102,
+			"batt_computed_bank_capacity": 12.474,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 273.52,
@@ -193,7 +193,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 8331.49
+			"battery_total_cost_lcos": 8157.89
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

diff --git a/api/api_autogen/library/defaults/Cashloan_StandaloneBatteryCommercial.json b/api/api_autogen/library/defaults/Cashloan_StandaloneBatteryCommercial.json
@@ -14,20 +14,20 @@
 			"real_discount_rate": 6.4,
 			"salvage_percentage": 0,
 			"state_tax_rate": [7.000000],
-			"system_capacity": 287.846
+			"system_capacity": 288.05
 		},
 		"SystemCosts": {
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [15.000000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 1199.36,
+			"om_batt_nameplate": 1200.21,
 			"om_batt_replacement_cost": [260.280000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity_escal": 0,
 			"om_fixed_escal": 0,
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 662984
+			"total_installed_cost": 663455
 		},
 		"LandLease": {
 		},
@@ -152,7 +152,7 @@
 			"pbi_uti_term": 0
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 1199.36,
+			"batt_computed_bank_capacity": 1200.21,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 260.28,
@@ -193,7 +193,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 662984
+			"battery_total_cost_lcos": 663455
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

diff --git a/api/api_autogen/library/defaults/Cashloan_StandaloneBatteryResidential.json b/api/api_autogen/library/defaults/Cashloan_StandaloneBatteryResidential.json
@@ -16,20 +16,20 @@
 			"real_discount_rate": 6.4,
 			"salvage_percentage": 0,
 			"state_tax_rate": [7.000000],
-			"system_capacity": 4.91913
+			"system_capacity": 4.79002
 		},
 		"SystemCosts": {
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [15.000000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 12.8102,
+			"om_batt_nameplate": 12.474,
 			"om_batt_replacement_cost": [590.760000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity_escal": 0,
 			"om_fixed_escal": 0,
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 19152.9
+			"total_installed_cost": 18849
 		},
 		"LandLease": {
 		},
@@ -148,7 +148,7 @@
 			"pbi_uti_term": 0
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 12.8102,
+			"batt_computed_bank_capacity": 12.474,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 590.76,
@@ -189,7 +189,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 19152.9
+			"battery_total_cost_lcos": 18849
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

diff --git a/api/api_autogen/library/defaults/Equpartflip_GenericBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Equpartflip_GenericBatteryAllEquityPartnershipFlip.json
@@ -274,7 +274,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 9.16799e+07
+			"battery_total_cost_lcos": 9.16801e+07
 		},
 		"ChargesByMonth": {
 		},

diff --git a/api/api_autogen/library/defaults/Equpartflip_PVBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Equpartflip_PVBatteryAllEquityPartnershipFlip.json
@@ -73,10 +73,10 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 2.19386e+08
+			"total_installed_cost": 2.19387e+08
 		},
 		"LandLease": {
-			"land_area": 649.75,
+			"land_area": 433.167,
 			"om_land_lease": [0.000000],
 			"om_land_lease_escal": 0
 		},
@@ -251,7 +251,7 @@
 		"UtilityBill": {
 		},
 		"ConstructionFinancing": {
-			"construction_financing_cost": 5.75889e+06
+			"construction_financing_cost": 5.7589e+06
 		},
 		"OtherCapitalCosts": {
 			"cost_dev_fee_percent": 3,
@@ -275,7 +275,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 9.8464e+07
+			"battery_total_cost_lcos": 9.84641e+07
 		},
 		"ChargesByMonth": {
 		},

diff --git a/api/api_autogen/library/defaults/Equpartflip_StandaloneBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Equpartflip_StandaloneBatteryAllEquityPartnershipFlip.json
@@ -57,7 +57,7 @@
 			"reserves_interest": 1.75,
 			"salvage_percentage": 0,
 			"state_tax_rate": [7.000000],
-			"system_capacity": 57600
+			"system_capacity": 57600.1
 		},
 		"SystemCosts": {
 			"add_om_num_types": 1,
@@ -231,7 +231,7 @@
 		"SystemOutput": {
 			"degradation": [0.000000],
 			"gen": [0],
-			"system_capacity": 57600
+			"system_capacity": 57600.1
 		},
 		"ElectricityRates": {
 			"en_electricity_rates": 0,

diff --git a/api/api_autogen/library/defaults/HostDeveloper_GenericBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_GenericBatteryHostDeveloper.json
@@ -78,7 +78,7 @@
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [6.280000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 1199.36,
+			"om_batt_nameplate": 1200.21,
 			"om_batt_replacement_cost": [282.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [16.000000],
@@ -90,7 +90,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 868141
+			"total_installed_cost": 868471
 		},
 		"LandLease": {
 		},
@@ -289,10 +289,10 @@
 			"system_use_lifetime_output": 1
 		},
 		"ConstructionFinancing": {
-			"construction_financing_cost": 22788.7
+			"construction_financing_cost": 22797.4
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 1199.36,
+			"batt_computed_bank_capacity": 1200.21,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 225.06,
@@ -302,7 +302,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 422809
+			"battery_total_cost_lcos": 423051
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVBatteryHostDeveloper.json
@@ -78,7 +78,7 @@
 			"add_om_num_types": 1,
 			"om_batt_capacity_cost": [6.280000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 1199.36,
+			"om_batt_nameplate": 1200.21,
 			"om_batt_replacement_cost": [225.060000],
 			"om_batt_variable_cost": [0.000000],
 			"om_capacity": [22.000000],
@@ -88,7 +88,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 1.3098e+06
+			"total_installed_cost": 1.3101e+06
 		},
 		"LandLease": {
 		},
@@ -287,10 +287,10 @@
 			"system_use_lifetime_output": 1
 		},
 		"ConstructionFinancing": {
-			"construction_financing_cost": 34382.2
+			"construction_financing_cost": 34390.2
 		},
 		"BatterySystem": {
-			"batt_computed_bank_capacity": 1199.36,
+			"batt_computed_bank_capacity": 1200.21,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"battery_per_kWh": 225.06,
@@ -300,7 +300,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 449293
+			"battery_total_cost_lcos": 449584
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]