NREL · brtietz · Dec 13, 2024 · Oct 14, 2024 · Oct 15, 2024 · Oct 15, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
-Sandia/* linguist-vendored
-deploy/* linguist-vendored
+Sandia/** linguist-vendored=true
+deploy/** linguist-vendored=true
+samples/** linguist-vendored=true
 
 # Autodetect text files
 * text=auto
@@ -13,8 +14,12 @@ deploy/runtime/defaults/*.txt text eol=lf
 *.c text
 *.cpp text
 *.h text
+*.csv text
 *.lk text
+*.json text
+
 
 # Ensure those won't be messed up with
 *.jpg binary
 *.data binary
+
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/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,15 +6,10 @@
 
 cmake_minimum_required(VERSION 3.24)
 
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
 
 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}
@@ -224,21 +219,23 @@ endif()
 if (${CMAKE_PROJECT_NAME} STREQUAL system_advisor_model)
 	target_link_libraries(${SAM_EXE} lk wex ssc)
 else()
-	unset(WEX_LIB CACHE)
-	unset(LK_LIB CACHE)
-	unset(SSC_LIB CACHE)
-	find_library( WEX_LIB
-			NAMES wex.a wex.lib
-			PATHS $ENV{WEX_LIB} $ENV{WEXDIR}/build $ENV{WEXDIR}/build/Release)
-	find_library( LK_LIB
-			NAMES lk.a lk.lib
-			PATHS $ENV{LK_LIB} $ENV{LKDIR}/build $ENV{LKDIR}/build/Release)
-	find_library( SSC_LIB
-			NAMES ssc.dylib ssc.lib ssc.so
-			PATHS $ENV{SSC_LIB} $ENV{SSCDIR}/build/ssc $ENV{SSCDIR}/build/ssc/Release)
-	target_link_libraries(${SAM_EXE} optimized ${WEX_LIB} optimized ${SSC_LIB} optimized ${LK_LIB})
-
-	if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR MSVC)
+	if (CMAKE_BUILD_TYPE STREQUAL "Release" OR "Release" IN_LIST CMAKE_CONFIGURATION_TYPES)
+	    unset(WEX_LIB CACHE)
+	    unset(LK_LIB CACHE)
+	    unset(SSC_LIB CACHE)
+	    find_library( WEX_LIB
+			    NAMES wex.a wex.lib
+			    PATHS $ENV{WEX_LIB} $ENV{WEXDIR}/build $ENV{WEXDIR}/build/Release)
+	    find_library( LK_LIB
+			    NAMES lk.a lk.lib
+			    PATHS $ENV{LK_LIB} $ENV{LKDIR}/build $ENV{LKDIR}/build/Release)
+	    find_library( SSC_LIB
+			    NAMES ssc.dylib ssc.lib ssc.so
+			    PATHS $ENV{SSC_LIB} $ENV{SSCDIR}/build/ssc $ENV{SSCDIR}/build/ssc/Release)
+	    target_link_libraries(${SAM_EXE} optimized ${WEX_LIB} optimized ${SSC_LIB} optimized ${LK_LIB})
+    endif()
+
+	if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST CMAKE_CONFIGURATION_TYPES)
 		unset(LKD_LIB CACHE)
 		unset(WEXD_LIB CACHE)
 		unset(SSCD_LIB CACHE)
@@ -249,10 +246,27 @@ else()
 				NAMES lkd.a lkd.lib
 				PATHS $ENV{LKD_LIB} $ENV{LKDIR}/build $ENV{LKDIR}/build/Debug)
 		find_library( SSCD_LIB
-				NAMES sscd.dylib sscd.lib sscd.so
+				NAMES sscd.dylib sscd.lib sscd.so libssc.so
 				PATHS $ENV{SSCD_LIB} $ENV{SSCDIR}/build/ssc $ENV{SSCDIR}/build/ssc/Debug)
 		target_link_libraries(${SAM_EXE} debug ${SSCD_LIB} debug ${WEXD_LIB} debug ${LKD_LIB})
 	endif()
+
+    if (MSVC)
+        if ("Release" IN_LIST CMAKE_CONFIGURATION_TYPES)
+            unset(SHARED_LIB CACHE)
+            find_library( SHARED_LIB
+			    NAMES shared.lib
+			    PATHS $ENV{SSCDIR}/build/shared/Release)
+	        target_link_libraries(${SAM_EXE} optimized ${SHARED_LIB})
+        endif()
+        if ("Debug" IN_LIST CMAKE_CONFIGURATION_TYPES)
+            unset(SHAREDD_LIB CACHE)
+            find_library( SHAREDD_LIB
+			    NAMES sharedd.lib
+			    PATHS $ENV{SSCDIR}/build/shared/Debug)
+	        target_link_libraries(${SAM_EXE} debug ${SHAREDD_LIB})
+        endif()
+    endif()
 endif()
 
 target_link_libraries(${SAM_EXE} ${wxWidgets_LIBRARIES})
@@ -303,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
@@ -324,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
         )
@@ -388,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
@@ -1,8 +1,7 @@
 # System Advisor Model (SAM)
 ![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/Sandia/osx/lhs.bin b/Sandia/osx/lhs.bin
diff --git a/Sandia/osx/stepwise.bin b/Sandia/osx/stepwise.bin
diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
@@ -11,23 +11,18 @@ cmake_minimum_required(VERSION 3.24)
 # For CMake build option `SAMAPI_EXPORT` and `SAM_SKIP_AUTOGEN`, see ../CMakeLists.txt
 
 if(APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
     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)
@@ -69,7 +63,7 @@ else()
 endif()
 
 if(APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.15" )
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=12" )
 endif()
 
 
@@ -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
@@ -9,12 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 cmake_minimum_required(VERSION 3.24)
 
 if(APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" 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++)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
 endif()
 
 
@@ -24,7 +19,7 @@ endif()
 #
 #####################################################################################################################
 
-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/api_autogen/builder_C_API.cpp b/api/api_autogen/builder_C_API.cpp
@@ -29,8 +29,9 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
-
+// C++17 only - not in patch branch
+//#include <filesystem>
+#include <wx/file.h>
 #include <shared/lib_util.h>
 
 #include "builder_C_API.h"
@@ -39,8 +40,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 void builder_C_API::create_SAM_headers(const std::string &cmod, const std::string &file_dir, bool stateful) {
     std::string cmod_symbol = format_as_symbol(cmod);
 
+    if (cmod_symbol == "6parsolve")
+        cmod_symbol = "SixParsolve";
+    else if (cmod_symbol == "Tcsmslf")
+        cmod_symbol = "TcsMSLF";
+    else if (root->m_vardefs.find(cmod_symbol) != root->m_vardefs.end())
+        cmod_symbol += "Model";
+
+    std::string filename = file_dir + "/SAM_" + cmod_symbol + ".h";
+//    if (std::filesystem::exists(filename))
+    if (wxFileExists(filename))
+        return;
+
     std::ofstream fx_file;
-    fx_file.open(file_dir + "/SAM_" + cmod_symbol + ".h");
+    fx_file.open(filename);
     assert(fx_file.is_open());
 
     fx_file << "#ifndef SAM_" << util::upper_case(cmod_symbol)<< "_H_\n"
@@ -193,8 +206,20 @@ void builder_C_API::create_SAM_headers(const std::string &cmod, const std::strin
 void builder_C_API::create_SAM_definitions(const std::string &cmod, const std::string &file_dir, bool stateful) {
     std::string cmod_symbol = format_as_symbol(cmod);
 
+    if (cmod_symbol == "6parsolve")
+        cmod_symbol = "SixParsolve";
+    else if (cmod_symbol == "Tcsmslf")
+        cmod_symbol = "TcsMSLF";
+    else if (root->m_vardefs.find(cmod_symbol) != root->m_vardefs.end())
+        cmod_symbol += "Model";
+
+    std::string filename = file_dir + "/SAM_" + cmod_symbol + ".cpp";
+//    if (std::filesystem::exists(filename))
+    if (wxFileExists(filename))
+        return;
+
     std::ofstream fx_file;
-    fx_file.open(file_dir + "/SAM_" + cmod_symbol + ".cpp");
+    fx_file.open(filename);
     assert(fx_file.is_open());
 
     fx_file << "#include <string>\n"
@@ -228,6 +253,7 @@ void builder_C_API::create_SAM_definitions(const std::string &cmod, const std::s
 
         if (mm->first == "AdjustmentFactors")
             continue;
+
 
         for (auto & vardef : vardefs) {
             std::string var_symbol = vardef.first;
@@ -335,8 +361,6 @@ void builder_C_API::create_SAM_definitions(const std::string &cmod, const std::s
             else{
                 throw std::runtime_error(vd.type + " for " + var_name);
             }
-            fx_file << "\n\n";
-
         }
     }
     fx_file.close();