Merge remote-tracking branch 'origin/global_Ss' into global_utility_r…

…outines
NREL · Oct 20, 2020 · 26bd975 · 26bd975 · nrel-bot-3 · Oct 20, 2020
2 parents 155981b + d742d68
commit 26bd975
Show file tree

Hide file tree

Showing 31 changed files with 2,020 additions and 2,150 deletions.
diff --git a/src/EnergyPlus/ConvectionCoefficients.cc b/src/EnergyPlus/ConvectionCoefficients.cc
diff --git a/src/EnergyPlus/ConvectionCoefficients.hh b/src/EnergyPlus/ConvectionCoefficients.hh
@@ -458,14 +458,14 @@ namespace ConvectionCoefficients {
 
     Real64 CalcASHRAESimpleIntConvCoeff(Real64 Tsurf, Real64 Tamb, Real64 cosTilt);
 
-    void CalcASHRAESimpleIntConvCoeff(int SurfNum,                  // surface number for which coefficients are being calculated
+    void CalcASHRAESimpleIntConvCoeff(EnergyPlusData &state, int SurfNum,                  // surface number for which coefficients are being calculated
                                       Real64 SurfaceTemperature,    // Temperature of surface for evaluation of HcIn
                                       Real64 ZoneMeanAirTemperature // Mean Air Temperature of Zone
     );
 
     Real64 CalcASHRAETARPNatural(Real64 Tsurf, Real64 Tamb, Real64 cosTilt);
 
-    void CalcASHRAEDetailedIntConvCoeff(int SurfNum,                  // surface number for which coefficients are being calculated
+    void CalcASHRAEDetailedIntConvCoeff(EnergyPlusData &state, int SurfNum,                  // surface number for which coefficients are being calculated
                                         Real64 SurfaceTemperature,    // Temperature of surface for evaluation of HcIn
                                         Real64 ZoneMeanAirTemperature // Mean Air Temperature of Zone
     );
@@ -504,7 +504,7 @@ namespace ConvectionCoefficients {
                                       Array1D<Real64> &SurfaceTemperatures // For CalcASHRAEDetailed, if called
     );
 
-    void CalcTrombeWallIntConvCoeff(int ZoneNum,                        // Zone number for which coefficients are being calculated
+    void CalcTrombeWallIntConvCoeff(EnergyPlusData &state, int ZoneNum,                        // Zone number for which coefficients are being calculated
                                     const Array1D<Real64> &SurfaceTemperatures // Temperature of surfaces for evaluation of HcIn
     );
 
@@ -553,7 +553,7 @@ namespace ConvectionCoefficients {
 
     void EvaluateExtHcModels(EnergyPlusData &state, int SurfNum, int NaturalConvModelEqNum, int ForcedConvModelEqNum, Real64 &Hc);
 
-    void DynamicExtConvSurfaceClassification(int SurfNum); // surface number
+    void DynamicExtConvSurfaceClassification(EnergyPlusData &state, int SurfNum); // surface number
 
     void MapExtConvClassificationToHcModels(EnergyPlusData &state, int SurfNum); // surface number
 

diff --git a/src/EnergyPlus/Data/CommonIncludes.hh b/src/EnergyPlus/Data/CommonIncludes.hh
@@ -88,6 +88,7 @@
 #include <EnergyPlus/SplitterComponent.hh>
 #include <EnergyPlus/SteamBaseboardRadiator.hh>
 #include <EnergyPlus/SteamCoils.hh>
+#include <EnergyPlus/SurfaceGeometry.hh>
 #include <EnergyPlus/SurfaceGroundHeatExchanger.hh>
 #include <EnergyPlus/SwimmingPool.hh>
 #include <EnergyPlus/SystemAvailabilityManager.hh>

diff --git a/src/EnergyPlus/Data/EnergyPlusData.cc b/src/EnergyPlus/Data/EnergyPlusData.cc
@@ -90,6 +90,7 @@ namespace EnergyPlus {
         this->dataSplitterComponent = std::unique_ptr<SplitterComponentData>(new SplitterComponentData);
         this->dataSteamBaseboardRadiator = std::unique_ptr<SteamBaseboardRadiatorData>(new SteamBaseboardRadiatorData);
         this->dataSteamCoils = std::unique_ptr<SteamCoilsData>(new SteamCoilsData);
+        this->dataSurfaceGeometry = std::unique_ptr<SurfaceGeometryData>(new SurfaceGeometryData);
         this->dataSurfaceGroundHeatExchangers = std::unique_ptr<SurfaceGroundHeatExchangersData>(new SurfaceGroundHeatExchangersData);
         this->dataSwimmingPools = std::unique_ptr<SwimmingPoolsData>(new SwimmingPoolsData);
         this->dataSystemAvailabilityManager = std::unique_ptr<SystemAvailabilityManagerData>(new SystemAvailabilityManagerData);
@@ -158,6 +159,7 @@ namespace EnergyPlus {
         this->dataSplitterComponent->clear_state();
         this->dataSteamBaseboardRadiator->clear_state();
         this->dataSteamCoils->clear_state();
+        this->dataSurfaceGeometry->clear_state();
         this->dataSurfaceGroundHeatExchangers->clear_state();
         this->dataSwimmingPools->clear_state();
         this->dataSystemAvailabilityManager->clear_state();

diff --git a/src/EnergyPlus/Data/EnergyPlusData.hh b/src/EnergyPlus/Data/EnergyPlusData.hh
@@ -99,6 +99,7 @@ struct SolarShadingData;
 struct SplitterComponentData;
 struct SteamBaseboardRadiatorData;
 struct SteamCoilsData;
+struct SurfaceGeometryData;
 struct SurfaceGroundHeatExchangersData;
 struct SwimmingPoolsData;
 struct SystemAvailabilityManagerData;
@@ -171,6 +172,7 @@ struct EnergyPlusData : BaseGlobalStruct {
     std::unique_ptr<SplitterComponentData> dataSplitterComponent;
     std::unique_ptr<SteamBaseboardRadiatorData> dataSteamBaseboardRadiator;
     std::unique_ptr<SteamCoilsData> dataSteamCoils;
+    std::unique_ptr<SurfaceGeometryData> dataSurfaceGeometry;
     std::unique_ptr<SurfaceGroundHeatExchangersData> dataSurfaceGroundHeatExchangers;
     std::unique_ptr<SwimmingPoolsData> dataSwimmingPools;
     std::unique_ptr<SystemAvailabilityManagerData> dataSystemAvailabilityManager;

diff --git a/src/EnergyPlus/HeatBalanceKivaManager.cc b/src/EnergyPlus/HeatBalanceKivaManager.cc
@@ -681,7 +681,7 @@ namespace HeatBalanceKivaManager {
                 bool useDetailedExposedPerimeter = false;
                 Real64 exposedFraction = 0.0;
 
-                auto &expPerimMap = SurfaceGeometry::exposedFoundationPerimeter.surfaceMap;
+                auto &expPerimMap = state.dataSurfaceGeometry->exposedFoundationPerimeter.surfaceMap;
                 if (expPerimMap.count(surfNum) == 1) {
                     userSetExposedPerimeter = true;
                     useDetailedExposedPerimeter = expPerimMap[surfNum].useDetailedExposedPerimeter;
@@ -1091,7 +1091,7 @@ namespace HeatBalanceKivaManager {
             // Start with steady-state solution
             kv.initGround(state, kivaWeather);
         }
-        calcKivaSurfaceResults();
+        calcKivaSurfaceResults(state);
     }
 
     void KivaManager::calcKivaInstances(EnergyPlusData &state)
@@ -1106,7 +1106,7 @@ namespace HeatBalanceKivaManager {
             }
         }
 
-        calcKivaSurfaceResults();
+        calcKivaSurfaceResults(state);
     }
 
     void KivaInstanceMap::plotDomain()
@@ -1192,14 +1192,14 @@ namespace HeatBalanceKivaManager {
 #endif
     }
 
-    void KivaManager::calcKivaSurfaceResults()
+    void KivaManager::calcKivaSurfaceResults(EnergyPlusData &state)
     {
         for (int surfNum = 1; surfNum <= (int)DataSurfaces::Surface.size(); ++surfNum) {
             if (DataSurfaces::Surface(surfNum).ExtBoundCond == DataSurfaces::KivaFoundation) {
                 std::string contextStr = "Surface=\"" + DataSurfaces::Surface(surfNum).Name + "\"";
                 Kiva::setMessageCallback(kivaErrorCallback, &contextStr);
                 surfaceMap[surfNum].calc_weighted_results();
-                DataHeatBalance::HConvIn(surfNum) = SurfaceGeometry::kivaManager.surfaceMap[surfNum].results.hconv;
+                DataHeatBalance::HConvIn(surfNum) = state.dataSurfaceGeometry->kivaManager.surfaceMap[surfNum].results.hconv;
             }
         }
         Kiva::setMessageCallback(kivaErrorCallback, nullptr);

diff --git a/src/EnergyPlus/HeatBalanceKivaManager.hh b/src/EnergyPlus/HeatBalanceKivaManager.hh
@@ -136,7 +136,7 @@ namespace HeatBalanceKivaManager {
         void defineDefaultFoundation();
         void addDefaultFoundation();
         int findFoundation(std::string const &name);
-        void calcKivaSurfaceResults();
+        void calcKivaSurfaceResults(EnergyPlusData &state);
 
         KivaWeatherData kivaWeather;
         FoundationKiva defaultFoundation;

diff --git a/src/EnergyPlus/HeatBalanceSurfaceManager.cc b/src/EnergyPlus/HeatBalanceSurfaceManager.cc
@@ -2268,9 +2268,9 @@ namespace HeatBalanceSurfaceManager {
 
             // Initialize Kiva convection algorithms
             if (Surface(SurfNum).ExtBoundCond == DataSurfaces::KivaFoundation) {
-                SurfaceGeometry::kivaManager.surfaceConvMap[SurfNum].in = KIVA_CONST_CONV(3.076);
-                SurfaceGeometry::kivaManager.surfaceConvMap[SurfNum].f = KIVA_HF_DEF;
-                SurfaceGeometry::kivaManager.surfaceConvMap[SurfNum].out = KIVA_CONST_CONV(0.0);
+                state.dataSurfaceGeometry->kivaManager.surfaceConvMap[SurfNum].in = KIVA_CONST_CONV(3.076);
+                state.dataSurfaceGeometry->kivaManager.surfaceConvMap[SurfNum].f = KIVA_HF_DEF;
+                state.dataSurfaceGeometry->kivaManager.surfaceConvMap[SurfNum].out = KIVA_CONST_CONV(0.0);
             }
 
             // Initialize the flux histories
@@ -6311,7 +6311,7 @@ namespace HeatBalanceSurfaceManager {
 
             // Initialize Kiva instances ground temperatures
             if (DataHeatBalance::AnyKiva) {
-                SurfaceGeometry::kivaManager.initKivaInstances(state);
+                state.dataSurfaceGeometry->kivaManager.initKivaInstances(state);
             }
         }
         if (!state.dataGlobal->BeginEnvrnFlag) {
@@ -6508,10 +6508,10 @@ namespace HeatBalanceSurfaceManager {
 
         // Calculate Kiva instances
         if (DataHeatBalance::AnyKiva) {
-            if (((SurfaceGeometry::kivaManager.settings.timestepType == HeatBalanceKivaManager::KivaManager::Settings::HOURLY && TimeStep == 1) ||
-                 SurfaceGeometry::kivaManager.settings.timestepType == HeatBalanceKivaManager::KivaManager::Settings::TIMESTEP) &&
+            if (((state.dataSurfaceGeometry->kivaManager.settings.timestepType == HeatBalanceKivaManager::KivaManager::Settings::HOURLY && TimeStep == 1) ||
+                 state.dataSurfaceGeometry->kivaManager.settings.timestepType == HeatBalanceKivaManager::KivaManager::Settings::TIMESTEP) &&
                 !WarmupFlag) {
-                SurfaceGeometry::kivaManager.calcKivaInstances(state);
+                state.dataSurfaceGeometry->kivaManager.calcKivaInstances(state);
             }
         }
 
@@ -6521,7 +6521,7 @@ namespace HeatBalanceSurfaceManager {
             TempInsOld = TempSurfIn; // Keep track of last iteration's temperature values
 
             if (DataHeatBalance::AnyKiva) {
-                for (auto &kivaSurf : SurfaceGeometry::kivaManager.surfaceMap) {
+                for (auto &kivaSurf : state.dataSurfaceGeometry->kivaManager.surfaceMap) {
                     TempSurfIn(kivaSurf.first) = kivaSurf.second.results.Tavg - DataGlobalConstants::KelvinConv(); // TODO: Use average radiant temp? Trad?
                 }
             }
@@ -6530,7 +6530,7 @@ namespace HeatBalanceSurfaceManager {
                 state, TempSurfIn, InsideSurfIterations, SurfNetLWRadToSurf, ZoneToResimulate, Inside); // Update the radiation balance
 
             if (DataHeatBalance::AnyKiva) {
-                for (auto &kivaSurf : SurfaceGeometry::kivaManager.surfaceMap) {
+                for (auto &kivaSurf : state.dataSurfaceGeometry->kivaManager.surfaceMap) {
                     TempSurfIn(kivaSurf.first) = TempInsOld(kivaSurf.first);
                 }
             }
@@ -6813,8 +6813,8 @@ namespace HeatBalanceSurfaceManager {
 
                         } else if (surface.HeatTransferAlgorithm == HeatTransferModel_Kiva) {
                             // Read Kiva results for each surface
-                            TempSurfInTmp(SurfNum) = SurfaceGeometry::kivaManager.surfaceMap[SurfNum].results.Tconv - DataGlobalConstants::KelvinConv();
-                            SurfOpaqInsFaceConductionFlux(SurfNum) = SurfaceGeometry::kivaManager.surfaceMap[SurfNum].results.qtot;
+                            TempSurfInTmp(SurfNum) = state.dataSurfaceGeometry->kivaManager.surfaceMap[SurfNum].results.Tconv - DataGlobalConstants::KelvinConv();
+                            SurfOpaqInsFaceConductionFlux(SurfNum) = state.dataSurfaceGeometry->kivaManager.surfaceMap[SurfNum].results.qtot;
                             SurfOpaqInsFaceConduction(SurfNum) = SurfOpaqInsFaceConductionFlux(SurfNum) * DataSurfaces::Surface(SurfNum).Area;
 
                             TH11 = 0.0;

diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc
@@ -605,7 +605,7 @@ namespace SimulationManager {
 
                         if (DataEnvironment::varyingLocationSchedIndexLat > 0 || DataEnvironment::varyingLocationSchedIndexLong > 0 ||
                             DataEnvironment::varyingOrientationSchedIndex > 0) {
-                            WeatherManager::UpdateLocationAndOrientation();
+                            WeatherManager::UpdateLocationAndOrientation(state);
                         }
 
                         state.dataGlobal->BeginTimeStepFlag = true;

diff --git a/src/EnergyPlus/StateManagement.cc b/src/EnergyPlus/StateManagement.cc
@@ -208,6 +208,10 @@
 #include <EnergyPlus/SingleDuct.hh>
 #include <EnergyPlus/SizingAnalysisObjects.hh>
 #include <EnergyPlus/SizingManager.hh>
+#include <EnergyPlus/SolarCollectors.hh>
+#include <EnergyPlus/SolarShading.hh>
+#include <EnergyPlus/SplitterComponent.hh>
+#include <EnergyPlus/SteamCoils.hh>
 #include <EnergyPlus/SurfaceGeometry.hh>
 
 void EnergyPlus::clearAllStates(EnergyPlusData &state)