Merge pull request #8166 from NREL/global_water_use

Global water use
NREL · Jul 20, 2020 · 490d6ec · 490d6ec · nrel-bot-3 · Jul 20, 2020
2 parents 52c0be4 + dd781e3
commit 490d6ec
Show file tree

Hide file tree

Showing 15 changed files with 211 additions and 205 deletions.
diff --git a/src/EnergyPlus/Data/EnergyPlusData.hh b/src/EnergyPlus/Data/EnergyPlusData.hh
@@ -80,6 +80,7 @@
 #include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/Pipes.hh>
 #include <EnergyPlus/PlantChillers.hh>
+#include <EnergyPlus/WaterUse.hh>
 #include <EnergyPlus/WindowAC.hh>
 #include <EnergyPlus/WindowComplexManager.hh>
 #include <EnergyPlus/WindowEquivalentLayer.hh>
@@ -132,6 +133,7 @@ namespace EnergyPlus {
         // after we've plumbed enough of the functions to allow
         OutputFiles outputFiles;
 
+        WaterUseData dataWaterUse;
         WindowACData dataWindowAC;
         WindowComplexManagerData dataWindowComplexManager;
         WindowEquivalentLayerData dataWindowEquivalentLayer;
@@ -180,6 +182,7 @@ namespace EnergyPlus {
             //outputReportTabular.clear_state();
             pipes.clear_state();
             dataPlantChillers.clear_state();
+            dataWaterUse.clear_state();
             dataWindowAC.clear_state();
             dataWindowComplexManager.clear_state();
             dataWindowEquivalentLayer.clear_state();

diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc
@@ -5524,7 +5524,7 @@ namespace InternalHeatGains {
 
         CalcWaterThermalTankZoneGains(state);
         PipeHeatTransfer::PipeHTData::CalcZonePipesHeatGain();
-        CalcWaterUseZoneGains();
+        CalcWaterUseZoneGains(state.dataWaterUse);
         FigureFuelCellZoneGains();
         FigureMicroCHPZoneGains();
         initializeElectricPowerServiceZoneGains();

diff --git a/src/EnergyPlus/NonZoneEquipmentManager.cc b/src/EnergyPlus/NonZoneEquipmentManager.cc
@@ -122,7 +122,7 @@ namespace NonZoneEquipmentManager {
             CountNonZoneEquip = false;
         }
 
-        SimulateWaterUse(state.dataBranchInputManager, FirstHVACIteration); // simulate non-plant loop water use.
+        SimulateWaterUse(state.dataBranchInputManager, state.dataWaterUse, FirstHVACIteration); // simulate non-plant loop water use.
 
         if (!ZoneSizingCalc) {
             for (WaterHeaterNum = 1; WaterHeaterNum <= NumOfWaterHeater; ++WaterHeaterNum) {

diff --git a/src/EnergyPlus/Plant/PlantManager.cc b/src/EnergyPlus/Plant/PlantManager.cc
@@ -974,7 +974,7 @@ namespace EnergyPlus {
                             } else if (UtilityRoutines::SameString(this_comp_type, "WaterUse:Connections")) {
                                 this_comp.TypeOf_Num = TypeOf_WaterUseConnection;
                                 this_comp.CurOpSchemeType = DemandOpSchemeType;
-                                this_comp.compPtr = WaterUse::WaterConnectionsType::factory(CompNames(CompNum));
+                                this_comp.compPtr = WaterUse::WaterConnectionsType::factory(state.dataWaterUse, CompNames(CompNum));
                             } else if (UtilityRoutines::SameString(this_comp_type, "Coil:Cooling:Water")) {
                                 this_comp.TypeOf_Num = TypeOf_CoilWaterCooling;
                                 this_comp.CurOpSchemeType = DemandOpSchemeType;

diff --git a/src/EnergyPlus/StateManagement.cc b/src/EnergyPlus/StateManagement.cc
@@ -214,7 +214,6 @@
 #include <EnergyPlus/WaterManager.hh>
 #include <EnergyPlus/WaterThermalTanks.hh>
 #include <EnergyPlus/WaterToAirHeatPumpSimple.hh>
-#include <EnergyPlus/WaterUse.hh>
 #include <EnergyPlus/WeatherManager.hh>
 
 void EnergyPlus::clearThisState(EnergyPlusData &state)
@@ -388,7 +387,6 @@ void EnergyPlus::clearAllStates(OutputFiles &outputFiles)
     WaterThermalTanks::clear_state();
     WaterToAirHeatPumpSimple::clear_state();
     EIRPlantLoopHeatPumps::EIRPlantLoopHeatPump::clear_state();
-    WaterUse::clear_state();
     WeatherManager::clear_state();
     ResultsFramework::clear_state();
 }
diff --git a/src/EnergyPlus/WaterUse.cc b/src/EnergyPlus/WaterUse.cc
diff --git a/src/EnergyPlus/WaterUse.hh b/src/EnergyPlus/WaterUse.hh
@@ -52,6 +52,7 @@
 #include <ObjexxFCL/Array1D.hh>
 
 // EnergyPlus Headers
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 #include <EnergyPlus/PlantComponent.hh>
@@ -61,6 +62,7 @@ namespace EnergyPlus {
 // Forward declarations
 struct EnergyPlusData;
 struct BranchInputManagerData;
+struct WaterUseData;
 
 namespace WaterUse {
 
@@ -78,10 +80,6 @@ namespace WaterUse {
         PlantAndEquip
     };
 
-    extern bool getWaterUseInputFlag;
-
-    extern Array1D_bool CheckEquipName;
-
     struct WaterEquipmentType
     {
         std::string Name; // Name of DHW
@@ -144,11 +142,11 @@ namespace WaterUse {
             DrainTemp = 0.0;
         }
 
-        void CalcEquipmentFlowRates();
+        void CalcEquipmentFlowRates(WaterUseData &dataWaterUse);
 
         void CalcEquipmentDrainTemp();
 
-        void setupOutputVars();
+        void setupOutputVars(WaterUseData &dataWaterUse);
     };
 
     struct WaterConnectionsType : PlantComponent
@@ -229,40 +227,59 @@ namespace WaterUse {
         {
         }
 
-        static PlantComponent *factory(std::string const &objectName);
+        static PlantComponent *factory(WaterUseData &dataWaterUse, std::string const &objectName);
 
         void simulate(EnergyPlusData &EP_UNUSED(state), const PlantLocation &calledFromLocation, bool FirstHVACIteration, Real64 &CurLoad, bool RunFlag) override;
 
-        void InitConnections(BranchInputManagerData &state);
+        void InitConnections(BranchInputManagerData &dataBranchInputManager, WaterUseData &dataWaterUse);
 
-        void CalcConnectionsFlowRates(bool FirstHVACIteration);
+        void CalcConnectionsFlowRates(WaterUseData &dataWaterUse, bool FirstHVACIteration);
 
-        void CalcConnectionsDrainTemp();
+        void CalcConnectionsDrainTemp(WaterUseData &dataWaterUse);
 
         void CalcConnectionsHeatRecovery();
 
         void UpdateWaterConnections();
 
-        void ReportWaterUse();
+        void ReportWaterUse(WaterUseData &dataWaterUse);
 
-        void setupOutputVars();
+        void setupOutputVars(WaterUseData &EP_UNUSED(dataWaterUse));
     };
 
-    void clear_state();
+    void SimulateWaterUse(BranchInputManagerData &dataBranchInputManager, WaterUseData &dataWaterUse, bool FirstHVACIteration);
 
-    void SimulateWaterUse(BranchInputManagerData &dataBranchInputManager, bool FirstHVACIteration);
+    void GetWaterUseInput(WaterUseData &dataWaterUse);
 
-    void GetWaterUseInput();
+    void ReportStandAloneWaterUse(WaterUseData &dataWaterUse);
 
-    void ReportStandAloneWaterUse();
+    void CalcWaterUseZoneGains(WaterUseData &dataWaterUse);
 
-    void CalcWaterUseZoneGains();
+} // namespace WaterUse
 
-    extern Array1D<WaterEquipmentType> WaterEquipment;
+    struct WaterUseData : BaseGlobalStruct {
 
-    extern Array1D<WaterConnectionsType> WaterConnections;
+        int numWaterEquipment;
+        int numWaterConnections;
+        bool getWaterUseInputFlag;
+        Array1D_bool CheckEquipName;
+        Array1D<WaterUse::WaterEquipmentType> WaterEquipment;
+        Array1D<WaterUse::WaterConnectionsType> WaterConnections;
 
-} // namespace WaterUse
+        void clear_state() override
+        {
+            numWaterEquipment = 0;
+            numWaterConnections = 0;
+            getWaterUseInputFlag = true;
+            CheckEquipName.deallocate();
+            WaterEquipment.deallocate();
+            WaterConnections.deallocate();
+        }
+
+        // Default Constructor
+        WaterUseData() : numWaterEquipment(0), numWaterConnections(0), getWaterUseInputFlag(true)
+        {
+        }
+    };
 
 } // namespace EnergyPlus
 

diff --git a/src/EnergyPlus/WindTurbine.hh b/src/EnergyPlus/WindTurbine.hh
@@ -52,6 +52,7 @@
 #include <ObjexxFCL/Array1D.hh>
 
 // EnergyPlus Headers
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 

diff --git a/src/EnergyPlus/WindowAC.hh b/src/EnergyPlus/WindowAC.hh
@@ -52,6 +52,7 @@
 #include <ObjexxFCL/Array1D.hh>
 
 // EnergyPlus Headers
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 

diff --git a/src/EnergyPlus/WindowComplexManager.hh b/src/EnergyPlus/WindowComplexManager.hh
@@ -53,6 +53,7 @@
 #include <ObjexxFCL/Array2D.hh>
 
 // EnergyPlus Headers
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/DataBSDFWindow.hh>
 #include <EnergyPlus/DataVectorTypes.hh>
 #include <EnergyPlus/EnergyPlus.hh>

diff --git a/src/EnergyPlus/WindowEquivalentLayer.hh b/src/EnergyPlus/WindowEquivalentLayer.hh
@@ -59,6 +59,7 @@
 #include <ObjexxFCL/Optional.hh>
 
 // EnergyPlus Headers
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/DataWindowEquivalentLayer.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 

diff --git a/src/EnergyPlus/WindowManagerExteriorData.hh b/src/EnergyPlus/WindowManagerExteriorData.hh
@@ -54,6 +54,8 @@
 #include <vector>
 
 // EnergyPlus Headers
+#include <EnergyPlus/EnergyPlus.hh>
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/Material.hh>
 #include <EnergyPlus/Vectors.hh>
 

diff --git a/src/EnergyPlus/ZoneAirLoopEquipmentManager.hh b/src/EnergyPlus/ZoneAirLoopEquipmentManager.hh
@@ -52,6 +52,7 @@
 #include <string>
 
 // EnergyPlus Headers
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 
 namespace EnergyPlus {

diff --git a/src/EnergyPlus/ZoneContaminantPredictorCorrector.hh b/src/EnergyPlus/ZoneContaminantPredictorCorrector.hh
@@ -49,6 +49,7 @@
 #define ZoneContaminantPredictorCorrector_hh_INCLUDED
 
 // EnergyPlus Headers
+#include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/DataContaminantBalance.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 

diff --git a/src/EnergyPlus/ZoneTempPredictorCorrector.hh b/src/EnergyPlus/ZoneTempPredictorCorrector.hh
@@ -64,7 +64,6 @@
 
 namespace EnergyPlus {
     // Forward declarations
-    struct EnergyPlusData;
     class OutputFiles;
 
     // Forward declarations