Merge remote-tracking branch 'origin/develop' into 8312_build_warning…

…s_v2
NREL · Nov 26, 2020 · d58a263 · d58a263 · nrel-bot-3 · Nov 26, 2020
2 parents 2db34ed + 7a650ed
commit d58a263
Show file tree

Hide file tree

Showing 78 changed files with 1,964 additions and 2,557 deletions.
diff --git a/src/EnergyPlus/AirflowNetworkBalanceManager.cc b/src/EnergyPlus/AirflowNetworkBalanceManager.cc
diff --git a/src/EnergyPlus/CMakeLists.txt b/src/EnergyPlus/CMakeLists.txt
@@ -140,13 +140,10 @@ SET( SRC
   DataAirLoop.hh
   DataAirSystems.cc
   DataAirSystems.hh
-  DataBSDFWindow.cc
   DataBSDFWindow.hh
   DataBranchAirLoopPlant.hh
-        DataBranchNodeConnections.hh
-  DataComplexFenestration.cc
+  DataBranchNodeConnections.hh
   DataComplexFenestration.hh
-  DataContaminantBalance.cc
   DataContaminantBalance.hh
   DataConvergParams.cc
   DataConvergParams.hh

diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc
@@ -364,7 +364,7 @@ namespace DXCoils {
         }
 
         // Update the unit outlet nodes
-        UpdateDXCoil(DXCoilNum);
+        UpdateDXCoil(state, DXCoilNum);
 
         // Report the result of the simulation
         ReportDXCoil(state, DXCoilNum);
@@ -484,7 +484,7 @@ namespace DXCoils {
         }
 
         // Update the unit outlet nodes
-        UpdateDXCoil(DXCoilNum);
+        UpdateDXCoil(state, DXCoilNum);
 
         // Report the result of the simulation
         ReportDXCoil(state, DXCoilNum);
@@ -817,7 +817,7 @@ namespace DXCoils {
         }
 
         // Update the unit outlet nodes
-        UpdateDXCoil(DXCoilNum);
+        UpdateDXCoil(state, DXCoilNum);
 
         // Report the result of the simulation
         ReportDXCoil(state, DXCoilNum);
@@ -13421,7 +13421,7 @@ namespace DXCoils {
         }
     }
 
-    void UpdateDXCoil(int const DXCoilNum) // number of the current fan coil unit being simulated
+    void UpdateDXCoil(EnergyPlusData &state, int const DXCoilNum) // number of the current fan coil unit being simulated
     {
 
         // SUBROUTINE INFORMATION:
@@ -13431,9 +13431,6 @@ namespace DXCoils {
         // PURPOSE OF THIS SUBROUTINE:
         // This subroutine is for passing results to the outlet air node.
 
-        // Using/Aliasing
-        using DataContaminantBalance::Contaminant;
-
         // SUBROUTINE LOCAL VARIABLE DECLARATIONS:
         int AirOutletNode; // air outlet node number
         int AirInletNode;  // air inlet node number
@@ -13453,10 +13450,10 @@ namespace DXCoils {
         Node(AirOutletNode).MassFlowRateMinAvail = Node(AirInletNode).MassFlowRateMinAvail;
         Node(AirOutletNode).MassFlowRateMaxAvail = Node(AirInletNode).MassFlowRateMaxAvail;
 
-        if (Contaminant.CO2Simulation) {
+        if (state.dataContaminantBalance->Contaminant.CO2Simulation) {
             Node(AirOutletNode).CO2 = Node(AirInletNode).CO2;
         }
-        if (Contaminant.GenericContamSimulation) {
+        if (state.dataContaminantBalance->Contaminant.GenericContamSimulation) {
             Node(AirOutletNode).GenContam = Node(AirInletNode).GenContam;
         }
     }

diff --git a/src/EnergyPlus/DXCoils.hh b/src/EnergyPlus/DXCoils.hh
@@ -744,7 +744,7 @@ namespace DXCoils {
                                      int const SingleMode     // Single mode operation Yes/No; 1=Yes, 0=No
     );
 
-    void UpdateDXCoil(int const DXCoilNum); // number of the current fan coil unit being simulated
+    void UpdateDXCoil(EnergyPlusData &state, int const DXCoilNum); // number of the current fan coil unit being simulated
 
     void ReportDXCoil(EnergyPlusData &state, int const DXCoilNum); // number of the current fan coil unit being simulated
 

diff --git a/src/EnergyPlus/Data/CommonIncludes.hh b/src/EnergyPlus/Data/CommonIncludes.hh
@@ -80,6 +80,8 @@
 #include <EnergyPlus/DataAirSystems.hh>
 #include <EnergyPlus/DataBranchAirLoopPlant.hh>
 #include <EnergyPlus/DataBranchNodeConnections.hh>
+#include <EnergyPlus/DataBSDFWindow.hh>
+#include <EnergyPlus/DataContaminantBalance.hh>
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/DataWater.hh>
 #include <EnergyPlus/DataTimings.hh>

diff --git a/src/EnergyPlus/Data/EnergyPlusData.cc b/src/EnergyPlus/Data/EnergyPlusData.cc
@@ -67,6 +67,7 @@ namespace EnergyPlus {
         this->dataBranchAirLoopPlant = std::make_unique<DataBranchAirLoopPlantData>();
         this->dataBranchInputManager = std::make_unique<BranchInputManagerData>();
         this->dataBranchNodeConnections = std::make_unique<BranchNodeConnectionsData>();
+        this->dataBSDFWindow = std::make_unique<BSDFWindowData>();
         this->dataChilledCeilingPanelSimple = std::make_unique<ChilledCeilingPanelSimpleData>();
         this->dataChillerAbsorber = std::make_unique<ChillerAbsorberData>();
         this->dataChillerElectricEIR = std::make_unique<ChillerElectricEIRData>();
@@ -76,6 +77,7 @@ namespace EnergyPlus {
         this->dataChillerReformulatedEIR = std::make_unique<ChillerReformulatedEIRData>();
         this->dataCondenserLoopTowers = std::make_unique<CondenserLoopTowersData>();
         this->dataConstruction = std::make_unique<ConstructionData>();
+        this->dataContaminantBalance = std::make_unique<ContaminantBalanceData>();
         this->dataConvectionCoefficient = std::make_unique<ConvectionCoefficientsData>();
         this->dataCoolTower = std::make_unique<CoolTowerData>();
         this->dataCostEstimateManager = std::make_unique<CostEstimateManagerData>();
@@ -148,6 +150,7 @@ namespace EnergyPlus {
         this->dataBranchAirLoopPlant->clear_state();
         this->dataBranchInputManager->clear_state();
         this->dataBranchNodeConnections->clear_state();
+        this->dataBSDFWindow->clear_state();
         this->dataChilledCeilingPanelSimple->clear_state();
         this->dataChillerAbsorber->clear_state();
         this->dataChillerElectricEIR->clear_state();
@@ -157,6 +160,7 @@ namespace EnergyPlus {
         this->dataChillerReformulatedEIR->clear_state();
         this->dataCondenserLoopTowers->clear_state();
         this->dataConstruction->clear_state();
+        this->dataContaminantBalance->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
@@ -74,6 +74,7 @@ struct BoilersData;
 struct BoilerSteamData;
 struct BranchInputManagerData;
 struct BranchNodeConnectionsData;
+struct BSDFWindowData;
 struct ChilledCeilingPanelSimpleData;
 struct ChillerAbsorberData;
 struct ChillerElectricEIRData;
@@ -83,6 +84,7 @@ struct ChillerIndirectAbsoprtionData;
 struct ChillerReformulatedEIRData;
 struct CondenserLoopTowersData;
 struct ConstructionData;
+struct ContaminantBalanceData;
 struct ConvectionCoefficientsData;
 struct CoolTowerData;
 struct CostEstimateManagerData;
@@ -157,6 +159,7 @@ struct EnergyPlusData : BaseGlobalStruct {
     std::unique_ptr<BoilersData> dataBoilers;
     std::unique_ptr<BoilerSteamData> dataBoilerSteam;
     std::unique_ptr<BranchNodeConnectionsData> dataBranchNodeConnections;
+    std::unique_ptr<BSDFWindowData> dataBSDFWindow;
     std::unique_ptr<DataBranchAirLoopPlantData> dataBranchAirLoopPlant;
     std::unique_ptr<BranchInputManagerData> dataBranchInputManager;
     std::unique_ptr<ChilledCeilingPanelSimpleData> dataChilledCeilingPanelSimple;
@@ -168,6 +171,7 @@ struct EnergyPlusData : BaseGlobalStruct {
     std::unique_ptr<ChillerReformulatedEIRData> dataChillerReformulatedEIR;
     std::unique_ptr<CondenserLoopTowersData> dataCondenserLoopTowers;
     std::unique_ptr<ConstructionData> dataConstruction;
+    std::unique_ptr<ContaminantBalanceData> dataContaminantBalance;
     std::unique_ptr<ConvectionCoefficientsData> dataConvectionCoefficient;
     std::unique_ptr<CoolTowerData> dataCoolTower;
     std::unique_ptr<CostEstimateManagerData> dataCostEstimateManager;

diff --git a/src/EnergyPlus/DataBSDFWindow.cc b/src/EnergyPlus/DataBSDFWindow.cc