WIP: Refactor variables

NREL · Aug 9, 2024 · 4546331 · 4546331
1 parent ee3317f
commit 4546331
Show file tree

Hide file tree

Showing 9 changed files with 266 additions and 232 deletions.
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -15,6 +15,7 @@ find_package(Boost)
 # Normally, we would use conan to pull in spdlog, but the conan build
 # is unaware of fmt provided by EnergyPlus
 set(SPDLOG_FMT_EXTERNAL ON)
+set(SPDLOG_BUILD_PIC ON)
 add_subdirectory(spdlog)
 
 # Provides the cmake macro, `catch_discover_tests`

diff --git a/energyplus_coroutine/CMakeLists.txt b/energyplus_coroutine/CMakeLists.txt
@@ -22,6 +22,9 @@ add_library(
   variables.hpp
   variables.cpp
 
+  energyplus_helpers.hpp
+  energyplus_helpers.cpp
+
   warmup_manager.hpp
   warmup_manager.cpp
 

diff --git a/energyplus_coroutine/energyplus_helpers.cpp b/energyplus_coroutine/energyplus_helpers.cpp
@@ -40,7 +40,7 @@ double ZoneSums::QConSenFlow() const
 
 int ZoneNum(EnergyPlus::EnergyPlusData &energyplus_data, const std::string_view zone_name)
 {
-  auto upper_zone_name = zone_name;
+  std::string upper_zone_name(zone_name);
   std::transform(zone_name.begin(), zone_name.end(), upper_zone_name.begin(), ::toupper);
 
   for (int i = 0; i < energyplus_data.dataGlobal->NumOfZones; ++i) {

diff --git a/energyplus_coroutine/spawn.cpp b/energyplus_coroutine/spawn.cpp
@@ -2,6 +2,7 @@
 #include "../util/config.hpp"
 #include "../util/conversion.hpp"
 #include "../util/math.hpp"
+#include "energyplus_helpers.hpp"
 #include "idf_to_json.hpp"
 #include "idfprep.hpp"
 #include "input/user_config.hpp"
@@ -382,7 +383,7 @@ void Spawn::updateZoneConditions(bool skipConnectedZones)
         continue;
       }
 
-      const auto zonenum = zoneNum(zone.idfname);
+      const auto zonenum = energyplus::ZoneNum(sim_state, zone.idfname);
       updateZoneTemperature(zonenum, dt);
       updateZoneHumidityRatio(zonenum, dt);
     }