Merge branch 'patch' into iph_heat_sink

NREL · Jan 8, 2025 · 430e31d · 430e31d
2 parents 27b6df0 + 6bb9338
commit 430e31d
Show file tree

Hide file tree

Showing 637 changed files with 110,847 additions and 56,666 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
-  DEFAULT_BRANCH: develop
+  DEFAULT_BRANCH: patch
   WX_VERSION: '3.2.6'
 
 jobs:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -317,6 +317,7 @@ if (UNIX)
             COMMAND mkdir -p ${SAM_APP}/Contents/runtime
             COMMAND mkdir -p ${SAM_APP}/Contents/runtime/bin
             COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/osx/lhs.bin ${SAM_APP}/Contents/runtime/bin
+            COMMAND cp $ENV{SSCDIR}/ssc/sscapi.h ${SAM_APP}/Contents/runtime
             COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/osx/stepwise.bin ${SAM_APP}/Contents/runtime/bin
             COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/build_resources/Info-${SAM_NAME}.plist ${SAM_APP}/Contents/Info.plist
             COMMAND mkdir -p ${SAM_APP}/Contents/Frameworks
@@ -338,6 +339,7 @@ if (UNIX)
                 COMMAND rsync -a -v ${CMAKE_CURRENT_SOURCE_DIR}/deploy/* ${SAM_APP}
                 COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/linux/lhs.bin ${SAM_APP}/runtime/bin
                 COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/Sandia/linux/stepwise.bin ${SAM_APP}/runtime/bin
+                COMMAND cp $ENV{SSCDIR}/ssc/sscapi.h ${SAM_APP}/runtime
 #                COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/build_linux/GtkTheme ${SAM_APP}/linux_64
                 COMMAND cp ${SSC_SO} ${SAM_APP}/linux_64
         )
@@ -402,5 +404,11 @@ else()
         COMMAND ${CMAKE_COMMAND}
         ARGS -E copy ${SSC_DLL} ${SSC_LIB} ${SAMEXE_DIR}
     )
+    add_custom_command(
+        TARGET ${SAM_EXE}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS -E copy $ENV{SSCDIR}/ssc/sscapi.h ${CMAKE_CURRENT_SOURCE_DIR}/deploy/runtime
+    )
 endif()
 
diff --git a/README.md b/README.md
@@ -48,4 +48,4 @@ The stepwise and LHS [LGPL](https://www.gnu.org/licenses/lgpl-3.0.en.html) licen
 
 # Citing this package
 
-System Advisor Model Version 2023.12.17 (2023). SAM source code. National Renewable Energy Laboratory. Golden, CO. Accessed December 18, 2023. https://github.com/NREL/SAM
+System Advisor Model Version 2024.12.12 (2024). SAM source code. National Renewable Energy Laboratory. Golden, CO. Accessed December 13, 2024. https://github.com/NREL/SAM
diff --git a/...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json b/...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 60000.1,
 			"batt_power_discharge_max_kwac": 57600.1,
 			"batt_power_discharge_max_kwdc": 60000.1,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 18000,
@@ -49,7 +49,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": 479617,
 			"batt_Qnom": 2,
@@ -336,7 +336,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [323.000000],
+			"om_batt_replacement_cost": [252.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_CustomGenerationBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 130.023,
 			"batt_power_discharge_max_kwac": 124.822,
 			"batt_power_discharge_max_kwdc": 130.023,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 90.0157,
@@ -55,7 +55,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,
@@ -300,9 +300,9 @@
 			"batt_target_power_monthly": [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_btm_discharge_to_grid": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"dispatch_manual_charge": [1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
-			"dispatch_manual_discharge": [0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000],
+			"dispatch_manual_discharge": [0.000000, 1.000000, 1.000000, 1.000000, 0.000000, 0.000000],
 			"dispatch_manual_gridcharge": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
-			"dispatch_manual_percent_discharge": [25.000000, 0.000000],
+			"dispatch_manual_percent_discharge": [25.000000, 25.000000, 25.000000, 0.000000],
 			"dispatch_manual_percent_gridcharge": [0.000000],
 			"dispatch_manual_sched": [
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 3.000000, 3.000000, 3.000000, 3.000000, 3.000000, 1.000000, 1.000000, 1.000000, 1.000000],
@@ -335,7 +335,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [225.060000],
+			"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
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 130.023,
 			"batt_power_discharge_max_kwac": 124.822,
 			"batt_power_discharge_max_kwdc": 130.023,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 90.0157,
@@ -55,7 +55,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,
@@ -300,9 +300,9 @@
 			"batt_target_power_monthly": [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_btm_discharge_to_grid": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
 			"dispatch_manual_charge": [1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
-			"dispatch_manual_discharge": [0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000],
+			"dispatch_manual_discharge": [0.000000, 1.000000, 1.000000, 1.000000, 0.000000, 0.000000],
 			"dispatch_manual_gridcharge": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
-			"dispatch_manual_percent_discharge": [25.000000, 0.000000],
+			"dispatch_manual_percent_discharge": [25.000000, 25.000000, 25.000000, 0.000000],
 			"dispatch_manual_percent_gridcharge": [0.000000],
 			"dispatch_manual_sched": [
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 3.000000, 3.000000, 3.000000, 3.000000, 3.000000, 1.000000, 1.000000, 1.000000, 1.000000],
@@ -335,7 +335,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [282.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_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json b/...api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 60000.1,
 			"batt_power_discharge_max_kwac": 57600.1,
 			"batt_power_discharge_max_kwdc": 60000.1,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 18000,
@@ -49,7 +49,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": 479617,
 			"batt_Qnom": 2,
@@ -336,7 +336,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [323.000000],
+			"om_batt_replacement_cost": [252.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_CustomGenerationBatteryMerchantPlant.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 60000.1,
 			"batt_power_discharge_max_kwac": 57600.1,
 			"batt_power_discharge_max_kwdc": 60000.1,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 18000,
@@ -49,7 +49,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": 479617,
 			"batt_Qnom": 2,
@@ -336,7 +336,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [323.000000],
+			"om_batt_replacement_cost": [252.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_CustomGenerationBatteryResidential.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 4.9896,
 			"batt_power_discharge_max_kwac": 4.79002,
 			"batt_power_discharge_max_kwdc": 4.9896,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 1.7098,
@@ -55,7 +55,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": 247.5,
 			"batt_Qnom": 2,
@@ -335,7 +335,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [273.520000],
+			"om_batt_replacement_cost": [434.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_CustomGenerationBatterySaleLeaseback.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 60000.1,
 			"batt_power_discharge_max_kwac": 57600.1,
 			"batt_power_discharge_max_kwdc": 60000.1,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 18000,
@@ -49,7 +49,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": 479617,
 			"batt_Qnom": 2,
@@ -336,7 +336,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [323.000000],
+			"om_batt_replacement_cost": [252.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_CustomGenerationBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 60000.1,
 			"batt_power_discharge_max_kwac": 57600.1,
 			"batt_power_discharge_max_kwdc": 60000.1,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 18000,
@@ -49,7 +49,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": 479617,
 			"batt_Qnom": 2,
@@ -336,7 +336,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [0.000000],
+			"om_batt_replacement_cost": [252.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_CustomGenerationBatteryThirdParty.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json
@@ -30,7 +30,7 @@
 			"batt_power_charge_max_kwdc": 2.81475,
 			"batt_power_discharge_max_kwac": 2.70216,
 			"batt_power_discharge_max_kwdc": 2.81475,
-			"batt_replacement_capacity": 50,
+			"batt_replacement_capacity": 70,
 			"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],
 			"batt_surface_area": 1.00598,
@@ -55,7 +55,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": 11.25,
 			"batt_Qnom": 2,

diff --git a/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -29,7 +29,7 @@
 			"batt_power_charge_max_kwdc": 300.052,
 			"batt_power_discharge_max_kwac": 288.05,
 			"batt_power_discharge_max_kwdc": 300.052,
-			"batt_replacement_capacity": 0,
+			"batt_replacement_capacity": 70,
 			"batt_replacement_option": 1,
 			"batt_replacement_schedule_percent": [0.000000],
 			"batt_surface_area": 90.0157,
@@ -334,7 +334,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [225.060000],
+			"om_batt_replacement_cost": [280.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0
@@ -386,12 +386,12 @@
 		},
 		"HybridCosts": {
 			"add_om_num_types": 1,
-			"om_batt_capacity_cost": [6.280000],
+			"om_batt_capacity_cost": [5.250000],
 			"om_batt_fixed_cost": [0.000000],
 			"om_batt_nameplate": 1200.21,
 			"om_capacity_escal": 0,
 			"om_fixed_escal": 0,
-			"total_installed_cost": 391808
+			"total_installed_cost": 420973
 		}
 	}
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,4 +48,4 @@ The stepwise and LHS [LGPL](https://www.gnu.org/licenses/lgpl-3.0.en.html) licen

		# Citing this package

		System Advisor Model Version 2023.12.17 (2023). SAM source code. National Renewable Energy Laboratory. Golden, CO. Accessed December 18, 2023. https://github.com/NREL/SAM
		System Advisor Model Version 2024.12.12 (2024). SAM source code. National Renewable Energy Laboratory. Golden, CO. Accessed December 13, 2024. https://github.com/NREL/SAM