Merge pull request #2152 from NatLabRockies/ortools_cmake_debug_build

sjanzou · web-flow · commit 2b0ddd022a52 · 2026-03-20T00:47:07.000-06:00
Fix debug build for Windows and ortools per email 3/16/2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -145,8 +145,41 @@ if (UNIX)
 	    find_package(wxWidgets QUIET  REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base )
     endif()
 else()
+#    set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+#    find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Debug and Release Builds Configured" FORCE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20")
+    # for linking to Release build of ortools 
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
+    # Get the current debug flags and remove the /D_DEBUG option.
+    string(REPLACE "/D_DEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    # following does not force release libraries for wxWidgets using find_package
+    #set(CMAKE_MAP_IMPORTED_CONFIG_DEBUG RELEASE)
+
     set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-    find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+    find_package(wxWidgets QUIET  REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+
+    # message("All wxWidgets: " ${wxWidgets_LIBRARIES})
+    set(FOUND "false")
+    foreach(lib ${wxWidgets_LIBRARIES})
+        string(FIND ${lib} "optimized" INDEX)
+        string(FIND ${lib} "debug" INDEX2)
+        string(FIND ${lib} "wxWidgets" INDEX3)
+        if (INDEX GREATER_EQUAL 0) # skip once
+            set(FOUND "true")
+            continue()
+        elseif((INDEX2 LESS 0) AND (INDEX3 LESS 0))
+            set(FOUND "true")
+        endif()
+        if (${FOUND} STREQUAL "true")
+            set(FOUND "false")
+            message("lib: ${lib}")
+            list(APPEND WX_LIBS_LIST ${lib})
+        endif()
+    endforeach()
+
+    list(JOIN WX_LIBS_LIST ";" wxWidgets_LIBRARIES)
+    # message("Link Libraries for wxWidgets: ${wxWidgets_LIBRARIES}")
 endif()
 
 if (wxWidgets_FOUND)
diff --git a/api/api_autogen/CMakeLists.txt b/api/api_autogen/CMakeLists.txt
@@ -70,8 +70,42 @@ if (UNIX)
         find_package(wxWidgets QUIET  REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
     endif ()
 else()
+#    set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+#    find_package(wxWidgets QUIET  COMPONENTS qa webview aui richtext html propgrid adv net stc core base scintilla REQUIRED)
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Debug and Release Builds Configured" FORCE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20")
+    # for linking to Release build of ortools 
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
+    # Get the current debug flags and remove the /D_DEBUG option.
+    string(REPLACE "/D_DEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    # following does not force release libraries for wxWidgets using find_package
+    #set(CMAKE_MAP_IMPORTED_CONFIG_DEBUG RELEASE)
+
     set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-    find_package(wxWidgets QUIET  COMPONENTS qa webview aui richtext html propgrid adv net stc core base scintilla REQUIRED)
+    find_package(wxWidgets QUIET  REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+
+    # message("All wxWidgets: " ${wxWidgets_LIBRARIES})
+    set(FOUND "false")
+    foreach(lib ${wxWidgets_LIBRARIES})
+        string(FIND ${lib} "optimized" INDEX)
+        string(FIND ${lib} "debug" INDEX2)
+        string(FIND ${lib} "wxWidgets" INDEX3)
+        if (INDEX GREATER_EQUAL 0) # skip once
+            set(FOUND "true")
+            continue()
+        elseif((INDEX2 LESS 0) AND (INDEX3 LESS 0))
+            set(FOUND "true")
+        endif()
+        if (${FOUND} STREQUAL "true")
+            set(FOUND "false")
+            message("lib: ${lib}")
+            list(APPEND WX_LIBS_LIST ${lib})
+        endif()
+    endforeach()
+
+    list(JOIN WX_LIBS_LIST ";" wxWidgets_LIBRARIES)
+    # message("Link Libraries for wxWidgets: ${wxWidgets_LIBRARIES}")
+
 endif()
 
 include(${wxWidgets_USE_FILE})
diff --git a/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationBatteryHostDeveloper.json
@@ -271,7 +271,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"degradation": [0.000000],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -259,7 +259,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"gen": [0],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationProfileHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_CustomGenerationProfileHostDeveloper.json
@@ -264,7 +264,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"degradation": [0.000000],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_FlatPlatePVHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_FlatPlatePVHostDeveloper.json
@@ -262,7 +262,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"degradation": [0.000000],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVBatteryHostDeveloper.json
@@ -269,7 +269,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"degradation": [0.000000],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVWattsBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVWattsBatteryHostDeveloper.json
@@ -262,7 +262,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"degradation": [0.000000],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVWattsHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVWattsHostDeveloper.json
@@ -262,7 +262,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"degradation": [0.500000],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVWattsWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVWattsWindBatteryHybridHostDeveloper.json
@@ -259,7 +259,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"gen": [0],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -259,7 +259,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"gen": [0],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PhotovoltaicWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PhotovoltaicWindBatteryHybridHostDeveloper.json
@@ -259,7 +259,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"gen": [0],
diff --git a/api/api_autogen/library/defaults/HostDeveloper_StandaloneBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_StandaloneBatteryHostDeveloper.json
@@ -266,7 +266,8 @@
 [0]			],
 			"nm_dollars_applied_ym": [
 [0]			],
-			"utility_bill_w_sys": [0]
+			"utility_bill_w_sys": [0],
+			"utility_bill_wo_sys": [0]
 		},
 		"SystemOutput": {
 			"degradation": [0.000000],
diff --git a/api/include/SAM_HostDeveloper.h b/api/include/SAM_HostDeveloper.h
@@ -2060,6 +2060,14 @@ extern "C"
 	 */
 	SAM_EXPORT void SAM_HostDeveloper_ChargesByMonth_utility_bill_w_sys_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
 
+	/**
+	 * Set utility_bill_wo_sys: Electricity bill without system [$]
+	 * options: None
+	 * constraints: None
+	 * required if: *
+	 */
+	SAM_EXPORT void SAM_HostDeveloper_ChargesByMonth_utility_bill_wo_sys_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
+
 
 	//
 	// SystemOutput parameters
@@ -3026,6 +3034,8 @@ extern "C"
 
 	SAM_EXPORT double* SAM_HostDeveloper_ChargesByMonth_utility_bill_w_sys_aget(SAM_table ptr, int* length, SAM_error *err);
 
+	SAM_EXPORT double* SAM_HostDeveloper_ChargesByMonth_utility_bill_wo_sys_aget(SAM_table ptr, int* length, SAM_error *err);
+
 
 	/**
 	 * SystemOutput Getters
diff --git a/api/modules/SAM_HostDeveloper.cpp b/api/modules/SAM_HostDeveloper.cpp
@@ -1502,6 +1502,12 @@ SAM_EXPORT void SAM_HostDeveloper_ChargesByMonth_utility_bill_w_sys_aset(SAM_tab
 	});
 }
 
+SAM_EXPORT void SAM_HostDeveloper_ChargesByMonth_utility_bill_wo_sys_aset(SAM_table ptr, double* arr, int length, SAM_error *err){
+	translateExceptions(err, [&]{
+		ssc_data_set_array(ptr, "utility_bill_wo_sys", arr, length);
+	});
+}
+
 SAM_EXPORT void SAM_HostDeveloper_SystemOutput_annual_thermal_value_aset(SAM_table ptr, double* arr, int length, SAM_error *err){
 	translateExceptions(err, [&]{
 		ssc_data_set_array(ptr, "annual_thermal_value", arr, length);
@@ -4053,6 +4059,16 @@ SAM_EXPORT double* SAM_HostDeveloper_ChargesByMonth_utility_bill_w_sys_aget(SAM_
 	return result;
 }
 
+SAM_EXPORT double* SAM_HostDeveloper_ChargesByMonth_utility_bill_wo_sys_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "utility_bill_wo_sys", length);
+	if (!result)
+		make_access_error("SAM_HostDeveloper", "utility_bill_wo_sys");
+	});
+	return result;
+}
+
 SAM_EXPORT double* SAM_HostDeveloper_SystemOutput_annual_thermal_value_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{
