Merge branch 'develop' into 8376_FileSystem_Move

jmarrec · Mar 1, 2021 · 95183b7 · 95183b7
2 parents a59e75d + 171ad02
commit 95183b7
Show file tree

Hide file tree

Showing 9 changed files with 1,489 additions and 1,569 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -227,6 +227,9 @@ target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third
 target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/Windows-CalcEngine/src/Tarcog/include)
 target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/Windows-CalcEngine/src/Viewer/include)
 target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/ssc)
+set(SAM_SKIP_TOOLS ON FORCE)
+set(SAM_SKIP_TESTS ON FORCE)
+set(SAMAPI_EXPORT OFF FORCE)
 if(OPENGL_FOUND)
   target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/penumbra/include)
 endif()

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
@@ -109,7 +109,7 @@ if(BUILD_FORTRAN)
 endif()
 
 # Need to install the ssc lib...
-install(TARGETS ssc DESTINATION ./)
+# install(TARGETS ssc DESTINATION ./)
 
 set(CPACK_PACKAGE_VENDOR "US Department of Energy")
 set(CPACK_IFW_PACKAGE_PUBLISHER "${CPACK_PACKAGE_VENDOR}")

diff --git a/cmake/PythonFixUpOnMac.cmake b/cmake/PythonFixUpOnMac.cmake
@@ -45,11 +45,6 @@ execute_process(COMMAND "chmod" "+w" "${LOCAL_PYTHON_LIBRARY}")
 # then we set the ID on the Python dylib; # TODO: Try without this...
 execute_process(COMMAND "install_name_tool" -id "@executable_path/${PYTHON_LIB_FILENAME}" "${LOCAL_PYTHON_LIBRARY}")
 
-# With the addition of the SSC lib, a couple more things need fixing up, but they are easy
-# Both the EnergyPlus binary and the shared library depend on @rpath/ssc.dylib, and should be @loader_path/ssc.dylib
-execute_process(COMMAND "install_name_tool" -change "@rpath/ssc.dylib" "@loader_path/ssc.dylib" "${EXECUTABLE_PATH}")
-execute_process(COMMAND "install_name_tool" -change "@rpath/ssc.dylib" "@loader_path/ssc.dylib" "${ENERGYPLUS_API_PATH}")
-
 # for the energyplus executable, just find the python dynamic library right next to it for sure
 get_prerequisites("${EXECUTABLE_PATH}" PREREQUISITES 1 1 "" "")
 foreach(PREREQ IN LISTS PREREQUISITES)

diff --git a/src/EnergyPlus/HeatBalanceSurfaceManager.cc b/src/EnergyPlus/HeatBalanceSurfaceManager.cc
@@ -4546,7 +4546,7 @@ namespace HeatBalanceSurfaceManager {
         bool SwimmingPoolOn;      // true if a pool is present (running)
 
 
-        UpdateRadSysSourceValAvg(LowTempRadSysOn);
+        UpdateRadSysSourceValAvg(state, LowTempRadSysOn);
         UpdateHTRadSourceValAvg(state, HighTempRadSysOn);
         UpdateBBRadSourceValAvg(state, HWBaseboardSysOn);
         UpdateBBSteamRadSourceValAvg(state, SteamBaseboardSysOn);

diff --git a/src/EnergyPlus/LowTempRadiantSystem.cc b/src/EnergyPlus/LowTempRadiantSystem.cc
diff --git a/src/EnergyPlus/LowTempRadiantSystem.hh b/src/EnergyPlus/LowTempRadiantSystem.hh
diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc
@@ -4571,12 +4571,6 @@ namespace EnergyPlus::OutputReportTabular {
         using DataHVACGlobals::TimeStepSys;
         using General::DetermineMinuteForReporting;
         using General::EncodeMonDayHrMin;
-        using LowTempRadiantSystem::CFloRadSys;
-        using LowTempRadiantSystem::ElecRadSys;
-        using LowTempRadiantSystem::HydrRadSys;
-        using LowTempRadiantSystem::NumOfCFloLowTempRadSys;
-        using LowTempRadiantSystem::NumOfElecLowTempRadSys;
-        using LowTempRadiantSystem::NumOfHydrLowTempRadSys;
 
         static int iZone(0);
         static int iRadiant(0);
@@ -4694,32 +4688,32 @@ namespace EnergyPlus::OutputReportTabular {
                 radiantCool(curZone) = -state.dataVentilatedSlab->VentSlab(iRadiant).RadCoolingPower * mult;
             }
         }
-        for (iRadiant = 1; iRadiant <= NumOfHydrLowTempRadSys; ++iRadiant) {
-            curZone = HydrRadSys(iRadiant).ZonePtr;
+        for (iRadiant = 1; iRadiant <= state.dataLowTempRadSys->NumOfHydrLowTempRadSys; ++iRadiant) {
+            curZone = state.dataLowTempRadSys->HydrRadSys(iRadiant).ZonePtr;
             mult = Zone(curZone).Multiplier * Zone(curZone).ListMultiplier;
             if ((curZone > 0) && (curZone <= state.dataGlobal->NumOfZones)) {
-                ZonePreDefRep(curZone).SHGSAnSurfHt += HydrRadSys(iRadiant).HeatEnergy * mult;
-                ZonePreDefRep(curZone).SHGSAnSurfCl -= HydrRadSys(iRadiant).CoolEnergy * mult;
-                radiantHeat(curZone) += HydrRadSys(iRadiant).HeatPower * mult;
-                radiantCool(curZone) -= HydrRadSys(iRadiant).CoolPower * mult;
+                ZonePreDefRep(curZone).SHGSAnSurfHt += state.dataLowTempRadSys->HydrRadSys(iRadiant).HeatEnergy * mult;
+                ZonePreDefRep(curZone).SHGSAnSurfCl -= state.dataLowTempRadSys->HydrRadSys(iRadiant).CoolEnergy * mult;
+                radiantHeat(curZone) += state.dataLowTempRadSys->HydrRadSys(iRadiant).HeatPower * mult;
+                radiantCool(curZone) -= state.dataLowTempRadSys->HydrRadSys(iRadiant).CoolPower * mult;
             }
         }
-        for (iRadiant = 1; iRadiant <= NumOfCFloLowTempRadSys; ++iRadiant) {
-            curZone = CFloRadSys(iRadiant).ZonePtr;
+        for (iRadiant = 1; iRadiant <= state.dataLowTempRadSys->NumOfCFloLowTempRadSys; ++iRadiant) {
+            curZone = state.dataLowTempRadSys->CFloRadSys(iRadiant).ZonePtr;
             mult = Zone(curZone).Multiplier * Zone(curZone).ListMultiplier;
             if ((curZone > 0) && (curZone <= state.dataGlobal->NumOfZones)) {
-                ZonePreDefRep(curZone).SHGSAnSurfHt += CFloRadSys(iRadiant).HeatEnergy * mult;
-                ZonePreDefRep(curZone).SHGSAnSurfCl -= CFloRadSys(iRadiant).CoolEnergy * mult;
-                radiantHeat(curZone) += CFloRadSys(iRadiant).HeatPower * mult;
-                radiantCool(curZone) -= CFloRadSys(iRadiant).CoolPower * mult;
+                ZonePreDefRep(curZone).SHGSAnSurfHt += state.dataLowTempRadSys->CFloRadSys(iRadiant).HeatEnergy * mult;
+                ZonePreDefRep(curZone).SHGSAnSurfCl -= state.dataLowTempRadSys->CFloRadSys(iRadiant).CoolEnergy * mult;
+                radiantHeat(curZone) += state.dataLowTempRadSys->CFloRadSys(iRadiant).HeatPower * mult;
+                radiantCool(curZone) -= state.dataLowTempRadSys->CFloRadSys(iRadiant).CoolPower * mult;
             }
         }
-        for (iRadiant = 1; iRadiant <= NumOfElecLowTempRadSys; ++iRadiant) {
-            curZone = ElecRadSys(iRadiant).ZonePtr;
+        for (iRadiant = 1; iRadiant <= state.dataLowTempRadSys->NumOfElecLowTempRadSys; ++iRadiant) {
+            curZone = state.dataLowTempRadSys->ElecRadSys(iRadiant).ZonePtr;
             mult = Zone(curZone).Multiplier * Zone(curZone).ListMultiplier;
             if ((curZone > 0) && (curZone <= state.dataGlobal->NumOfZones)) {
-                ZonePreDefRep(curZone).SHGSAnSurfHt += ElecRadSys(iRadiant).HeatEnergy * mult;
-                radiantHeat(curZone) += ElecRadSys(iRadiant).HeatPower * mult;
+                ZonePreDefRep(curZone).SHGSAnSurfHt += state.dataLowTempRadSys->ElecRadSys(iRadiant).HeatEnergy * mult;
+                radiantHeat(curZone) += state.dataLowTempRadSys->ElecRadSys(iRadiant).HeatPower * mult;
             }
         }
         // Opaque Surface Conduction and Other Heat Addition

diff --git a/third_party/ssc/ssc/CMakeLists.txt b/third_party/ssc/ssc/CMakeLists.txt
@@ -157,7 +157,7 @@ endif(MSVC)
 #
 #####################################################################################################################
 
-add_library(ssc SHARED ${SSC_SRC})
+add_library(ssc STATIC ${SSC_SRC})
 set_target_properties(ssc
     PROPERTIES
     PREFIX ""
@@ -183,17 +183,17 @@ else()
     set_source_files_properties(${SRC_UNUSED_VARS} PROPERTIES COMPILE_FLAGS -Wno-unused-variable)
 endif()
 
-# dltest executable for checking ssc library
-if(UNIX AND NOT SAMAPI_EXPORT)
-	add_executable(dltest ../build_resources/dltest.c)
-	if (NOT APPLE)
-		target_link_libraries(dltest -ldl -Wl,--no-as-needed)
-	endif()
-	add_custom_command(
-		TARGET ssc
-		POST_BUILD
-		COMMAND dltest $<TARGET_FILE:ssc>)
-endif()
+## # dltest executable for checking ssc library
+## if(UNIX AND NOT SAMAPI_EXPORT)
+## 	add_executable(dltest ../build_resources/dltest.c)
+## 	if (NOT APPLE)
+## 		target_link_libraries(dltest -ldl -Wl,--no-as-needed)
+## 	endif()
+## 	add_custom_command(
+## 		TARGET ssc
+## 		POST_BUILD
+## 		COMMAND dltest $<TARGET_FILE:ssc>)
+## endif()
 
 # libssc for PySAM
 if(UNIX)