Merge branch 'develop' into particle_gen3_csp

NREL · Nov 14, 2024 · 337b0a6 · 337b0a6
2 parents 689fa90 + ea128b9
commit 337b0a6
Show file tree

Hide file tree

Showing 152 changed files with 256,833 additions and 79,941 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -14,7 +14,8 @@ Please delete options that are not relevant.
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] This change requires a documentation update
-- [ ] This change modifies variables in existing compute modules. Please see [Checking for PySAM Incompatible API Changes](https://github.com/NREL/SAM/wiki/Checking-for-PySAM-Incompatible-API-Changes).
+- [ ] This change modifies variables in existing compute modules. Please see [Checking for PySAM Incompatible API Changes](https://github.com/NREL/SAM/wiki/PySAM-Incompatible-API-Changes-&-Regenerating-PySAM-Files).
+- [ ] This change requires updating the PySAM files via export_config. Please see [When do the PySAM files need to be regenerated?](https://github.com/NREL/SAM/wiki/PySAM-Incompatible-API-Changes-&-Regenerating-PySAM-Files#when-do-the-pysam-files-need-to-be-regenerated-via-export_config)
 
 
 ## Checklist:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,11 +10,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment versi
 
 set(CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "-o linker-signed")
 
-if (UNIX AND NOT CMAKE_C_COMPILER)
-	set(CMAKE_C_COMPILER gcc)
-	set(CMAKE_CXX_COMPILER g++)
-endif()
-
 
 #####################################################################################################################
 #
@@ -26,7 +21,7 @@ option(SAMAPI_EXPORT "Export of ssc binaries to the SAM_api directory; for Unix,
 
 option(SAM_SKIP_AUTOGEN "Skips the automatic regeneration of SAMAPI files from export_config" ON)
 
-Project(samos)
+Project(samos LANGUAGES CXX C)
 
 if (SAMAPI_EXPORT)
 	add_subdirectory(api)
@@ -95,7 +90,6 @@ set(SAM_SRC src/private.h
 #
 #####################################################################################################################
 
-set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(MSVC)
@@ -183,6 +177,7 @@ else() # if Release or if MSVC multigenerator
 			${SAM_ICON})
 	set(SAM_EXE SAMOS)
 endif()
+target_compile_features(${SAM_EXE} PUBLIC cxx_std_11)
 
 if (MSVC)
 	set_target_properties(${SAM_EXE}

diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
@@ -15,19 +15,14 @@ if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)
 endif()
 
-if (UNIX AND NOT CMAKE_C_COMPILER)
-    set(CMAKE_C_COMPILER gcc)
-    set(CMAKE_CXX_COMPILER g++)
-endif()
-
 
 #####################################################################################################################
 #
 # Project Settings
 #
 #####################################################################################################################
 
-Project(SAM_API)
+Project(SAM_API LANGUAGES CXX C)
 
 if (NOT SAM_SKIP_AUTOGEN)
     add_subdirectory(api_autogen)
@@ -49,7 +44,6 @@ file(GLOB SAM_API_MODULES ${PROJECT_SOURCE_DIR}/modules/*.cpp ${PROJECT_SOURCE_D
 #
 #####################################################################################################################
 
-set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(MSVC)
@@ -81,6 +75,7 @@ endif()
 #####################################################################################################################
 
 add_library(SAM_api SHARED ${SAM_API_SRC} ${SAM_API_MODULES})
+target_compile_features(SAM_api PUBLIC cxx_std_11)
 
 target_include_directories(SAM_api PRIVATE include src $ENV{SSCDIR} $ENV{SSCDIR}/ssc $ENV{SSCDIR}/shared)
 

diff --git a/api/api_autogen/CMakeLists.txt b/api/api_autogen/CMakeLists.txt
@@ -12,19 +12,14 @@ if(APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
 endif()
 
-if (UNIX AND NOT CMAKE_C_COMPILER)
-    set(CMAKE_C_COMPILER gcc)
-    set(CMAKE_CXX_COMPILER g++)
-endif()
-
 
 #####################################################################################################################
 #
 # Project Settings
 #
 #####################################################################################################################
 
-Project(EXPORT_SAM_UI)
+Project(EXPORT_SAM_UI LANGUAGES CXX C)
 
 set(SAM_SOURCES
         ../../src/variables.cpp
@@ -39,7 +34,6 @@ file(TO_CMAKE_PATH ../../../ssc/shared/lib_util.cpp SSC_SOURCES)
 #
 #####################################################################################################################
 
-set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(MSVC)
@@ -116,6 +110,8 @@ set_target_properties(export_config
     DEBUG_POSTFIX "d"
     PREFIX ""
     )
+target_compile_features(export_config PUBLIC cxx_std_11)
+
 if (MSVC)
     set_target_properties(export_config
         PROPERTIES

diff --git a/...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json b/...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json
@@ -275,6 +275,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json
@@ -283,6 +283,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json
@@ -283,6 +283,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/...api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json b/...api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json
@@ -275,6 +275,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json
@@ -275,6 +275,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 1,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,
@@ -366,15 +367,19 @@
 			]
 		},
 		"Revenue": {
+			"mp_ancserv1_percent_gen": 0,
 			"mp_ancserv1_revenue_single": [
 				[0.000000]
 			],
+			"mp_ancserv2_percent_gen": 0,
 			"mp_ancserv2_revenue_single": [
 				[0.000000]
 			],
+			"mp_ancserv3_percent_gen": 0,
 			"mp_ancserv3_revenue_single": [
 				[0.000000]
 			],
+			"mp_ancserv4_percent_gen": 0,
 			"mp_ancserv4_revenue_single": [
 				[0.000000]
 			],
@@ -219384,7 +219389,8 @@
 				[38.730000],
 				[38.570000],
 				[5.350000]
-			]
+			],
+			"mp_market_percent_gen": 100
 		},
 		"ElectricityRates": {
 			"en_electricity_rates": 0,

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json
@@ -283,6 +283,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json
@@ -275,6 +275,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json
@@ -275,6 +275,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json b/api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json
@@ -283,6 +283,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -282,6 +282,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/...library/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json b/...library/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json
@@ -277,6 +277,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_FuelCellCommercial.json b/api/api_autogen/library/defaults/Battery_FuelCellCommercial.json
@@ -34,7 +34,8 @@
 			"batt_replacement_option": 0,
 			"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,
-			"en_batt": 1
+			"en_batt": 1,
+			"en_standalone_batt": 0
 		},
 		"SystemOutput": {
 		},
@@ -278,6 +279,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json b/api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json
@@ -34,7 +34,8 @@
 			"batt_replacement_option": 0,
 			"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,
-			"en_batt": 1
+			"en_batt": 1,
+			"en_standalone_batt": 0
 		},
 		"SystemOutput": {
 		},
@@ -270,6 +271,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 1,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 0,

diff --git a/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json
@@ -277,6 +277,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 1,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json
@@ -282,6 +282,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridSingleOwner.json
@@ -277,6 +277,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -282,6 +282,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Battery_PVWattsWindFuelCellBatteryHybridSingleOwner.json
@@ -277,6 +277,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridHostDeveloper.json
@@ -282,6 +282,7 @@
 			"batt_dispatch_auto_btm_can_discharge_to_grid": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_charge_only_system_exceeds_load": 1,

diff --git a/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridSingleOwner.json b/api/api_autogen/library/defaults/Battery_PhotovoltaicWindBatteryHybridSingleOwner.json
@@ -277,6 +277,7 @@
 			"batt_cycle_cost_choice": 0,
 			"batt_dispatch_auto_can_charge": 1,
 			"batt_dispatch_auto_can_clipcharge": 0,
+			"batt_dispatch_auto_can_curtailcharge": 0,
 			"batt_dispatch_auto_can_fuelcellcharge": 0,
 			"batt_dispatch_auto_can_gridcharge": 0,
 			"batt_dispatch_choice": 3,

diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryAllEquityPartnershipFlip.json
@@ -1,6 +1,7 @@
 {
 	"defaults": {
 		"Simulation": {
+			"timestep_minutes": 60
 		},
 		"Lifetime": {
 			"analysis_period": 25,

diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryCommercial.json
@@ -1,6 +1,7 @@
 {
 	"defaults": {
 		"Simulation": {
+			"timestep_minutes": 60
 		},
 		"Lifetime": {
 			"analysis_period": 25,

diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryHostDeveloper.json
@@ -1,6 +1,7 @@
 {
 	"defaults": {
 		"Simulation": {
+			"timestep_minutes": 60
 		},
 		"Lifetime": {
 			"analysis_period": 25,

diff --git a/api/api_autogen/library/defaults/Battery_StandaloneBatteryLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_StandaloneBatteryLeveragedPartnershipFlip.json
@@ -1,6 +1,7 @@
 {
 	"defaults": {
 		"Simulation": {
+			"timestep_minutes": 60
 		},
 		"Lifetime": {
 			"analysis_period": 25,