move extern'd dataConstruction to state

NREL · Oct 6, 2020 · 86ba9a5 · 86ba9a5 · nrel-bot-3 · Oct 6, 2020
1 parent 7072843
commit 86ba9a5
Show file tree

Hide file tree

Showing 88 changed files with 2,809 additions and 2,761 deletions.
diff --git a/src/EnergyPlus/AirflowNetworkBalanceManager.cc b/src/EnergyPlus/AirflowNetworkBalanceManager.cc
@@ -6872,7 +6872,7 @@ namespace AirflowNetworkBalanceManager {
                             Real64 TSurfj = TH(1, 1, ZoneSurfNum);
                             Real64 TSurfj_K = TSurfj + KelvinConv;
 
-                            Real64 ZoneSurfEmissivity = dataConstruction.Construct(Surface(ZoneSurfNum).Construction).InsideAbsorpThermal;
+                            Real64 ZoneSurfEmissivity = state.dataConstruction->Construct(Surface(ZoneSurfNum).Construction).InsideAbsorpThermal;
                             Real64 ZoneSurfArea = Surface(ZoneSurfNum).Area;
 
                             Real64 DuctEmissivity = VFObj.DuctEmittance;

diff --git a/src/EnergyPlus/Construction.cc b/src/EnergyPlus/Construction.cc
@@ -57,11 +57,9 @@
 
 namespace EnergyPlus {
 
-ConstructionData dataConstruction;
-
 namespace Construction {
 
-    void ConstructionProps::calculateTransferFunction(bool & ErrorsFound, bool & DoCTFErrorReport) {
+    void ConstructionProps::calculateTransferFunction(EnergyPlusData &state, bool & ErrorsFound, bool & DoCTFErrorReport) {
 
         // SUBROUTINE INFORMATION:
         //       AUTHOR         Russ Taylor
@@ -410,7 +408,7 @@ namespace Construction {
             // previously this loop would go from 1..currentConstructionIndex-1
             // instead of that, we'll loop through the list and stop when we get to the current construction
             // should be the same behavior, we're just checking it by address
-            for (auto & otherConstruction : dataConstruction.Construct) {
+            for (auto & otherConstruction : state.dataConstruction->Construct) {
                 if (&otherConstruction == this) break;
 
                 // If a source or sink is present in this construction, do not allow any

diff --git a/src/EnergyPlus/Construction.hh b/src/EnergyPlus/Construction.hh
@@ -60,7 +60,6 @@ namespace EnergyPlus {
 
 // Forward declarations
 struct EnergyPlusData;
-struct ConstructionData;
 
 namespace Construction {
 
@@ -312,7 +311,7 @@ namespace Construction {
             s0.allocate(3, 4);
         }
 
-        void calculateTransferFunction(bool & ErrorsFound, bool & DoCTFErrorReport);
+        void calculateTransferFunction(EnergyPlusData &state, bool & ErrorsFound, bool & DoCTFErrorReport);
 
         void calculateExponentialMatrix(); // Time step of the resulting CTFs
 
@@ -341,8 +340,6 @@ namespace Construction {
         }
     };
 
-extern ConstructionData dataConstruction;
-
 }   // namespace EnergyPlus
 
 #endif
diff --git a/src/EnergyPlus/ConvectionCoefficients.cc b/src/EnergyPlus/ConvectionCoefficients.cc
diff --git a/src/EnergyPlus/ConvectionCoefficients.hh b/src/EnergyPlus/ConvectionCoefficients.hh
@@ -450,7 +450,7 @@ namespace ConvectionCoefficients {
 
     void GetUserConvectionCoefficients(EnergyPlusData &state);
 
-    void ApplyConvectionValue(std::string const &SurfaceTypes, std::string const &ConvectionType, int Value);
+    void ApplyConvectionValue(EnergyPlusData &state, std::string const &SurfaceTypes, std::string const &ConvectionType, int Value);
 
     Real64 CalcASHRAESimpExtConvectCoeff(int Roughness,       // Integer index for roughness, relates to parameter array indices
                                          Real64 SurfWindSpeed // Current wind speed, m/s
@@ -485,20 +485,22 @@ namespace ConvectionCoefficients {
 
     Real64 CalcCeilingDiffuserACH(int ZoneNum);
 
-    Real64 CalcCeilingDiffuserIntConvCoeff(Real64 ACH,  // [1/hr] air system air change rate
+    Real64 CalcCeilingDiffuserIntConvCoeff(EnergyPlusData &state,
+                                           Real64 ACH,  // [1/hr] air system air change rate
                                            Real64 Tsurf,
                                            Real64 Tair,
                                            Real64 cosTilt,
                                            Real64 humRat,
                                            Real64 height,
                                            bool isWindow=false);
 
-    void CalcCeilingDiffuserIntConvCoeff(int ZoneNum, const Array1D<Real64> &SurfaceTemperatures); // zone number for which coefficients are being calculated
+    void CalcCeilingDiffuserIntConvCoeff(EnergyPlusData &state, int ZoneNum, const Array1D<Real64> &SurfaceTemperatures); // zone number for which coefficients are being calculated
 
     // CalcCeilingDiffuserInletCorr should replace CalcCeilingDiffuser (above), if ZoneTempPredictorCorrector can
     // ever be made to work correctly with the inlet air temperature.
 
-    void CalcCeilingDiffuserInletCorr(int ZoneNum,                        // Zone number
+    void CalcCeilingDiffuserInletCorr(EnergyPlusData &state,
+                                      int ZoneNum,                        // Zone number
                                       Array1D<Real64> &SurfaceTemperatures // For CalcASHRAEDetailed, if called
     );
 

diff --git a/src/EnergyPlus/CostEstimateManager.cc b/src/EnergyPlus/CostEstimateManager.cc
@@ -277,7 +277,7 @@ namespace CostEstimateManager {
                     }
 
                     ThisConstructStr = state.dataCostEstimateManager->CostLineItem(Item).ParentObjName;
-                    ThisConstructID = UtilityRoutines::FindItem(ThisConstructStr, dataConstruction.Construct);
+                    ThisConstructID = UtilityRoutines::FindItem(ThisConstructStr, state.dataConstruction->Construct);
                     if (ThisConstructID == 0) { // do any surfaces have the specified construction? If not issue warning.
                         ShowWarningError("ComponentCost:LineItem: \"" + state.dataCostEstimateManager->CostLineItem(Item).LineName + "\" Construction=\"" +
                                          state.dataCostEstimateManager->CostLineItem(Item).ParentObjName + "\", no surfaces have the Construction specified");
@@ -540,7 +540,7 @@ namespace CostEstimateManager {
                 } else if (SELECT_CASE_var == "CONSTRUCTION") {
 
                     ThisConstructStr = state.dataCostEstimateManager->CostLineItem(Item).ParentObjName;
-                    ThisConstructID = UtilityRoutines::FindItem(ThisConstructStr, dataConstruction.Construct);
+                    ThisConstructID = UtilityRoutines::FindItem(ThisConstructStr, state.dataConstruction->Construct);
                     // need to determine unique surfacs... some surfaces are shared by zones and hence doubled
                     uniqueSurfMask.dimension(TotSurfaces, true); // init to true and change duplicates to false
                     SurfMultipleARR.dimension(TotSurfaces, 1.0);

diff --git a/src/EnergyPlus/DElightManagerF.cc b/src/EnergyPlus/DElightManagerF.cc
@@ -334,7 +334,7 @@ namespace DElightManagerF {
                             // Is this Surface exposed to the exterior?
                             if (surf.ExtSolar) {
                                 // Get the index for the outside (i.e., 1st) Material Layer for this Construction
-                                iMatlLayer = dataConstruction.Construct(iconstruct).LayerPoint(1);
+                                iMatlLayer = state.dataConstruction->Construct(iconstruct).LayerPoint(1);
                                 // Get the outside visible reflectance of this material layer
                                 // (since Construct(iconstruct)%ReflectVisDiffFront always appears to == 0.0)
                                 rExtVisRefl = 1.0 - dataMaterial.Material(iMatlLayer).AbsorpVisible;
@@ -349,7 +349,7 @@ namespace DElightManagerF {
                                   cNameWOBlanks,
                                   surf.Azimuth,
                                   surf.Tilt,
-                                  dataConstruction.Construct(iconstruct).ReflectVisDiffBack,
+                                  state.dataConstruction->Construct(iconstruct).ReflectVisDiffBack,
                                   rExtVisRefl,
                                   surf.Sides);
 
@@ -650,14 +650,14 @@ namespace DElightManagerF {
             print(delightInFile,
                   Format_921,
                   iWndoConstIndexes(iconst) + 10000,
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).TransDiffVis,
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).ReflectVisDiffBack,
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(1),
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(2),
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(3),
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(4),
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(5),
-                  dataConstruction.Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(6));
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).TransDiffVis,
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).ReflectVisDiffBack,
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(1),
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(2),
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(3),
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(4),
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(5),
+                  state.dataConstruction->Construct(iWndoConstIndexes(iconst)).TransVisBeamCoef(6));
 
         } // Glass Type loop
 

diff --git a/src/EnergyPlus/Data/CommonIncludes.hh b/src/EnergyPlus/Data/CommonIncludes.hh
@@ -69,6 +69,7 @@
 #include <EnergyPlus/ChillerIndirectAbsorption.hh>
 #include <EnergyPlus/ChillerReformulatedEIR.hh>
 #include <EnergyPlus/CondenserLoopTowers.hh>
+#include <EnergyPlus/Construction.hh>
 #include <EnergyPlus/ConvectionCoefficients.hh>
 #include <EnergyPlus/CoolTower.hh>
 #include <EnergyPlus/CostEstimateManager.hh>

diff --git a/src/EnergyPlus/Data/EnergyPlusData.cc b/src/EnergyPlus/Data/EnergyPlusData.cc
@@ -72,6 +72,7 @@ namespace EnergyPlus {
         this->dataChillerIndirectAbsorption = std::unique_ptr<ChillerIndirectAbsoprtionData>(new ChillerIndirectAbsoprtionData);
         this->dataChillerReformulatedEIR = std::unique_ptr<ChillerReformulatedEIRData>(new ChillerReformulatedEIRData);
         this->dataCondenserLoopTowers = std::unique_ptr<CondenserLoopTowersData>(new CondenserLoopTowersData);
+        this->dataConstruction = std::unique_ptr<ConstructionData>(new ConstructionData);
         this->dataConvectionCoefficient = std::unique_ptr<ConvectionCoefficientsData>(new ConvectionCoefficientsData);
         this->dataCoolTower = std::unique_ptr<CoolTowerData>(new CoolTowerData);
         this->dataCostEstimateManager = std::unique_ptr<CostEstimateManagerData>(new CostEstimateManagerData);
@@ -120,6 +121,7 @@ namespace EnergyPlus {
         this->dataChillerIndirectAbsorption->clear_state();
         this->dataChillerReformulatedEIR->clear_state();
         this->dataCondenserLoopTowers->clear_state();
+        this->dataConstruction->clear_state();
         this->dataConvectionCoefficient->clear_state();
         this->dataCoolTower->clear_state();
         this->dataCostEstimateManager->clear_state();

diff --git a/src/EnergyPlus/Data/EnergyPlusData.hh b/src/EnergyPlus/Data/EnergyPlusData.hh
@@ -80,6 +80,7 @@ struct ChillerGasAbsorptionData;
 struct ChillerIndirectAbsoprtionData;
 struct ChillerReformulatedEIRData;
 struct CondenserLoopTowersData;
+struct ConstructionData;
 struct ConvectionCoefficientsData;
 struct CoolTowerData;
 struct CostEstimateManagerData;
@@ -131,6 +132,7 @@ struct EnergyPlusData : BaseGlobalStruct {
     std::unique_ptr<ChillerIndirectAbsoprtionData> dataChillerIndirectAbsorption;
     std::unique_ptr<ChillerReformulatedEIRData> dataChillerReformulatedEIR;
     std::unique_ptr<CondenserLoopTowersData> dataCondenserLoopTowers;
+    std::unique_ptr<ConstructionData> dataConstruction;
     std::unique_ptr<ConvectionCoefficientsData> dataConvectionCoefficient;
     std::unique_ptr<CoolTowerData> dataCoolTower;
     std::unique_ptr<CostEstimateManagerData> dataCostEstimateManager;