Merge pull request #8368 from NREL/global_dataTimings

Global DataTiming
NREL · Nov 6, 2020 · 6015b8d · 6015b8d · nrel-bot-3 · Nov 6, 2020
2 parents 649ab48 + 40518b1
commit 6015b8d
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 237 deletions.
diff --git a/src/EnergyPlus/Data/CommonIncludes.hh b/src/EnergyPlus/Data/CommonIncludes.hh
@@ -79,6 +79,7 @@
 #include <EnergyPlus/DataAirLoop.hh>
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/DataWater.hh>
+#include <EnergyPlus/DataTimings.hh>
 #include <EnergyPlus/ExteriorEnergyUse.hh>
 #include <EnergyPlus/Fans.hh>
 #include <EnergyPlus/Pipes.hh>

diff --git a/src/EnergyPlus/Data/EnergyPlusData.cc b/src/EnergyPlus/Data/EnergyPlusData.cc
@@ -96,6 +96,7 @@ namespace EnergyPlus {
         this->dataThermalChimneys = std::unique_ptr<ThermalChimneysData>(new ThermalChimneysData);
         this->dataThermalComforts = std::unique_ptr<ThermalComfortsData>(new ThermalComfortsData);
         this->dataTranspiredCollector = std::unique_ptr<TranspiredCollectorData>(new TranspiredCollectorData);
+        this->dataTimingsData = std::unique_ptr<DataTimingsData>(new DataTimingsData);
         this->dataUFADManager = std::unique_ptr<UFADManagerData>(new UFADManagerData);
         this->dataUnitarySystems = std::unique_ptr<UnitarySystemsData>(new UnitarySystemsData);
         this->dataUnitHeaters = std::unique_ptr<UnitHeatersData>(new UnitHeatersData);
@@ -161,6 +162,7 @@ namespace EnergyPlus {
         this->dataSurfaceGroundHeatExchangers->clear_state();
         this->dataSwimmingPools->clear_state();
         this->dataSystemAvailabilityManager->clear_state();
+        this->dataTimingsData->clear_state();
         this->dataThermalChimneys->clear_state();
         this->dataThermalComforts->clear_state();
         this->dataTranspiredCollector->clear_state();

diff --git a/src/EnergyPlus/Data/EnergyPlusData.hh b/src/EnergyPlus/Data/EnergyPlusData.hh
@@ -89,6 +89,7 @@ struct CTElectricGeneratorData;
 struct CurveManagerData;
 struct DataAirLoopData;
 struct DataGlobal;
+struct DataTimingsData;
 struct DataWaterData;
 struct ExteriorEnergyUseData;
 struct FansData;
@@ -178,6 +179,7 @@ struct EnergyPlusData : BaseGlobalStruct {
     std::unique_ptr<ThermalChimneysData> dataThermalChimneys;
     std::unique_ptr<ThermalComfortsData> dataThermalComforts;
     std::unique_ptr<TranspiredCollectorData> dataTranspiredCollector;
+    std::unique_ptr<DataTimingsData> dataTimingsData;
     std::unique_ptr<UFADManagerData> dataUFADManager;
     std::unique_ptr<UnitarySystemsData> dataUnitarySystems;
     std::unique_ptr<UnitHeatersData> dataUnitHeaters;

diff --git a/src/EnergyPlus/DataSystemVariables.hh b/src/EnergyPlus/DataSystemVariables.hh
@@ -69,7 +69,6 @@ namespace DataSystemVariables {
     extern int const iASCII_CR;    // endline value when just CR instead of CR/LF
     extern int const iUnicode_end; // endline value when Unicode file
     extern char const tabchar;
-    extern int const MaxTimingStringLength; // string length for timing string array
 
     extern std::string const DDOnlyEnvVar;             // Only run design days
     extern std::string const ReverseDDEnvVar;          // Reverse DD during run