Merge branch 'develop' of https://github.com/NREL/EnergyPlus into fix…

…-window-heat-emission
NREL · Feb 11, 2020 · 564fa46 · 564fa46
2 parents 2bf9b0b + e9decd1
commit 564fa46
Show file tree

Hide file tree

Showing 168 changed files with 2,907 additions and 2,384 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -302,3 +302,10 @@ mark_as_advanced(gtest_build_tests)
 mark_as_advanced(gtest_disable_pthreads)
 mark_as_advanced(gtest_force_shared_crt)
 mark_as_advanced(gtest_hide_internal_symbols)
+mark_as_advanced(FMT_CUDA_TEST)
+mark_as_advanced(FMT_DOC)
+mark_as_advanced(FMT_FUZZ)
+mark_as_advanced(FMT_INSTALL)
+mark_as_advanced(FMT_PEDANTIC)
+mark_as_advanced(FMT_TEST)
+mark_as_advanced(FMT_WERROR)
diff --git a/src/EnergyPlus/AirflowNetworkBalanceManager.cc b/src/EnergyPlus/AirflowNetworkBalanceManager.cc
@@ -92,6 +92,7 @@
 #include <EnergyPlus/MixedAir.hh>
 #include <EnergyPlus/NodeInputManager.hh>
 #include <EnergyPlus/OutAirNodeManager.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/Psychrometrics.hh>
 #include <EnergyPlus/RoomAirModelManager.hh>

diff --git a/src/EnergyPlus/AirflowNetworkBalanceManager.hh b/src/EnergyPlus/AirflowNetworkBalanceManager.hh
@@ -53,10 +53,10 @@
 #include <ObjexxFCL/Optional.hh>
 
 // EnergyPlus Headers
-#include "OutputFiles.hh"
 #include <EnergyPlus/EnergyPlus.hh>
 
 namespace EnergyPlus {
+    class OutputFiles;
 
 namespace AirflowNetworkBalanceManager {
 

diff --git a/src/EnergyPlus/ChillerElectricEIR.cc b/src/EnergyPlus/ChillerElectricEIR.cc
@@ -75,6 +75,7 @@
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
 #include <EnergyPlus/NodeInputManager.hh>
 #include <EnergyPlus/OutAirNodeManager.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/OutputReportPredefined.hh>
 #include <EnergyPlus/Plant/PlantLocation.hh>
@@ -1536,7 +1537,8 @@ namespace ChillerElectricEIR {
         if (DataPlant::PlantFinalSizesOkayToReport) {
             if (this->IPLVFlag) {
                 Real64 IPLV;
-                StandardRatings::CalcChillerIPLV(this->Name,
+                StandardRatings::CalcChillerIPLV(OutputFiles::getSingleton(),
+                                                 this->Name,
                                                  DataPlant::TypeOf_Chiller_ElectricEIR,
                                                  this->RefCap,
                                                  this->RefCOP,
@@ -1545,7 +1547,10 @@ namespace ChillerElectricEIR {
                                                  this->ChillerEIRFTIndex,
                                                  this->ChillerEIRFPLRIndex,
                                                  this->MinUnloadRat,
-                                                 IPLV);
+                                                 IPLV,
+                                                 Optional<const Real64>(),
+                                                 ObjexxFCL::Optional_int_const(),
+                                                 Optional<const Real64>());
                 this->IPLVFlag = false;
             }
             // create predefined report

diff --git a/src/EnergyPlus/ChillerReformulatedEIR.cc b/src/EnergyPlus/ChillerReformulatedEIR.cc
@@ -72,6 +72,7 @@
 #include <EnergyPlus/GlobalNames.hh>
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
 #include <EnergyPlus/NodeInputManager.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/OutputReportPredefined.hh>
 #include <EnergyPlus/Plant/PlantLocation.hh>
@@ -1311,7 +1312,8 @@ namespace ChillerReformulatedEIR {
         if (DataPlant::PlantFinalSizesOkayToReport) {
             if (this->MySizeFlag) {
                 Real64 IPLV;
-                StandardRatings::CalcChillerIPLV(this->Name,
+                StandardRatings::CalcChillerIPLV(OutputFiles::getSingleton(),
+                                                 this->Name,
                                                  DataPlant::TypeOf_Chiller_ElectricReformEIR,
                                                  this->RefCap,
                                                  this->RefCOP,

diff --git a/src/EnergyPlus/CommandLineInterface.cc b/src/EnergyPlus/CommandLineInterface.cc
@@ -59,6 +59,7 @@
 #include <EnergyPlus/DisplayRoutines.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 #include <EnergyPlus/FileSystem.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/OutputReportTabular.hh>
 #include <EnergyPlus/OutputReports.hh>
@@ -385,7 +386,7 @@ namespace CommandLineInterface {
         outputAuditFileName = outputFilePrefix + normalSuffix + ".audit";
         outputBndFileName = outputFilePrefix + normalSuffix + ".bnd";
         outputDxfFileName = outputFilePrefix + normalSuffix + ".dxf";
-        outputEioFileName = outputFilePrefix + normalSuffix + ".eio";
+        OutputFiles::getSingleton().eio.fileName = outputFilePrefix + normalSuffix + ".eio";
         outputEndFileName = outputFilePrefix + normalSuffix + ".end";
         outputErrFileName = outputFilePrefix + normalSuffix + ".err";
         outputEsoFileName = outputFilePrefix + normalSuffix + ".eso";

diff --git a/src/EnergyPlus/ConductionTransferFunctionCalc.cc b/src/EnergyPlus/ConductionTransferFunctionCalc.cc
@@ -2176,7 +2176,7 @@ namespace ConductionTransferFunctionCalc {
 
                 if (!Construct(ThisNum).IsUsedCTF) continue;
 
-                static constexpr auto Format_700{" Construction CTF,{},{:4},{:4},{:4},{:8.3F},{:15.4T},{:8.3F},{:8.3F},{:8.3F},{:8.3F},{}\n"};
+                static constexpr auto Format_700{" Construction CTF,{},{:4},{:4},{:4},{:8.3F},{:15.4N},{:8.3F},{:8.3F},{:8.3F},{:8.3F},{}\n"};
                 print(outputFiles.eio,
                       Format_700,
                       Construct(ThisNum).Name,
@@ -2196,10 +2196,10 @@ namespace ConductionTransferFunctionCalc {
                     {
                         auto const SELECT_CASE_var(Material(Layer).Group);
                         if (SELECT_CASE_var == Air) {
-                            static constexpr auto Format_702(" Material:Air,{},{:12.4T}\n");
+                            static constexpr auto Format_702(" Material:Air,{},{:12.4N}\n");
                             print(outputFiles.eio, Format_702, Material(Layer).Name, Material(Layer).Resistance);
                         } else {
-                            static constexpr auto Format_701(" Material CTF Summary,{},{:8.4F},{:14.3F},{:11.3F},{:13.3F},{:12.4T}\n");
+                            static constexpr auto Format_701(" Material CTF Summary,{},{:8.4F},{:14.3F},{:11.3F},{:13.3F},{:12.4N}\n");
                             print(outputFiles.eio,
                                   Format_701,
                                   Material(Layer).Name,
@@ -2214,7 +2214,7 @@ namespace ConductionTransferFunctionCalc {
 
                 for (I = Construct(ThisNum).NumCTFTerms; I >= 0; --I) {
                     if (I != 0) {
-                        static constexpr auto Format_703(" CTF,{:4},{:20.8T},{:20.8T},{:20.8T},{:20.8T}\n");
+                        static constexpr auto Format_703(" CTF,{:4},{:20.8N},{:20.8N},{:20.8N},{:20.8N}\n");
                         print(outputFiles.eio,
                               Format_703,
                               I,
@@ -2223,7 +2223,7 @@ namespace ConductionTransferFunctionCalc {
                               Construct(ThisNum).CTFInside(I),
                               Construct(ThisNum).CTFFlux(I));
                     } else {
-                        static constexpr auto Format_704(" CTF,{:4},{:20.8T},{:20.8T},{:20.8T}\n");
+                        static constexpr auto Format_704(" CTF,{:4},{:20.8N},{:20.8N},{:20.8N}\n");
                         print(outputFiles.eio,
                               Format_704,
                               I,
@@ -2236,12 +2236,12 @@ namespace ConductionTransferFunctionCalc {
                 if (Construct(ThisNum).SourceSinkPresent) {
                     // QTFs...
                     for (I = Construct(ThisNum).NumCTFTerms; I >= 0; --I) {
-                        static constexpr auto Format_705(" QTF,{:4},{:20.8T},{:20.8T}\n");
+                        static constexpr auto Format_705(" QTF,{:4},{:20.8N},{:20.8N}\n");
                         print(outputFiles.eio, Format_705, I, Construct(ThisNum).CTFSourceOut(I), Construct(ThisNum).CTFSourceIn(I));
                     }
                     // QTFs for source/sink location temperature calculation...
                     for (I = Construct(ThisNum).NumCTFTerms; I >= 0; --I) {
-                        static constexpr auto Format_706(" Source/Sink Loc Internal Temp QTF,{:4},{:20.8T},{:20.8T},{:20.8T}\n");
+                        static constexpr auto Format_706(" Source/Sink Loc Internal Temp QTF,{:4},{:20.8N},{:20.8N},{:20.8N}\n");
                         print(outputFiles.eio,
                               Format_706,
                               I,
@@ -2252,7 +2252,7 @@ namespace ConductionTransferFunctionCalc {
                     if (Construct(ThisNum).TempAfterLayer != 0) {
                         // QTFs for user specified interior temperature calculation...
                         for (I = Construct(ThisNum).NumCTFTerms; I >= 0; --I) {
-                            static constexpr auto Format_707(" User Loc Internal Temp QTF,{:4},{:20.8T},{:20.8T},{:20.8T}\n");
+                            static constexpr auto Format_707(" User Loc Internal Temp QTF,{:4},{:20.8N},{:20.8N},{:20.8N}\n");
                             print(outputFiles.eio,
                                   Format_707,
                                   I,

diff --git a/src/EnergyPlus/ConductionTransferFunctionCalc.hh b/src/EnergyPlus/ConductionTransferFunctionCalc.hh
@@ -54,10 +54,10 @@
 #include <ObjexxFCL/Array3D.hh>
 
 // EnergyPlus Headers
-#include "OutputFiles.hh"
 #include <EnergyPlus/EnergyPlus.hh>
 
 namespace EnergyPlus {
+    class OutputFiles;
 
 namespace ConductionTransferFunctionCalc {
 

diff --git a/src/EnergyPlus/ConvectionCoefficients.hh b/src/EnergyPlus/ConvectionCoefficients.hh
@@ -54,12 +54,12 @@
 #include <ObjexxFCL/Optional.hh>
 
 // EnergyPlus Headers
-#include "OutputFiles.hh"
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/DataVectorTypes.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 
 namespace EnergyPlus {
+    class OutputFiles;
 
 namespace ConvectionCoefficients {
 

diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc
@@ -7901,7 +7901,8 @@ namespace DXCoils {
         // Call routine that computes AHRI certified rating for single-speed DX Coils
         if ((DXCoil(DXCoilNum).DXCoilType_Num == CoilDX_CoolingSingleSpeed && DXCoil(DXCoilNum).CondenserType(1) == AirCooled) ||
             DXCoil(DXCoilNum).DXCoilType_Num == CoilDX_HeatingEmpirical) {
-            CalcDXCoilStandardRating(DXCoil(DXCoilNum).Name,
+            CalcDXCoilStandardRating(OutputFiles::getSingleton(),
+                                     DXCoil(DXCoilNum).Name,
                                      DXCoil(DXCoilNum).DXCoilType,
                                      DXCoil(DXCoilNum).DXCoilType_Num,
                                      1,
@@ -7923,7 +7924,8 @@ namespace DXCoils {
         }
         // Call routine that computes AHRI certified rating for multi-speed DX cooling Coils
         if (DXCoil(DXCoilNum).DXCoilType_Num == CoilDX_MultiSpeedCooling || DXCoil(DXCoilNum).DXCoilType_Num == CoilDX_MultiSpeedHeating) {
-            CalcDXCoilStandardRating(DXCoil(DXCoilNum).Name,
+            CalcDXCoilStandardRating(OutputFiles::getSingleton(),
+                                     DXCoil(DXCoilNum).Name,
                                      DXCoil(DXCoilNum).DXCoilType,
                                      DXCoil(DXCoilNum).DXCoilType_Num,
                                      DXCoil(DXCoilNum).NumOfSpeeds,
@@ -7940,7 +7942,8 @@ namespace DXCoils {
                                      DXCoil(DXCoilNum).MinOATCompressor,
                                      DXCoil(DXCoilNum).OATempCompressorOn,
                                      DXCoil(DXCoilNum).OATempCompressorOnOffBlank,
-                                     DXCoil(DXCoilNum).DefrostControl);
+                                     DXCoil(DXCoilNum).DefrostControl,
+                                     ObjexxFCL::Optional_bool_const());
         }
 
         // create predefined report entries

diff --git a/src/EnergyPlus/DataGlobals.cc b/src/EnergyPlus/DataGlobals.cc
@@ -203,8 +203,6 @@ namespace DataGlobals {
     int OutputStandardError(0);                      // Unit number for the standard error output file
     std::ostream *err_stream(nullptr);               // Internal stream used for err output (used for performance)
     int StdOutputRecordCount(0);                     // Count of Standard output records
-    int OutputFileInits(0);                          // Unit number for the standard Initialization output file
-    std::ostream *eio_stream(nullptr);               // Internal stream used for eio output (used for unit tests)
     int OutputFileDebug(0);                          // Unit number for debug outputs
     int OutputFileZoneSizing(0);                     // Unit number of zone sizing calc output file
     int OutputFileSysSizing(0);                      // Unit number of system sizing calc output file
@@ -307,7 +305,6 @@ namespace DataGlobals {
         OutputFileStandard = 0;
         OutputStandardError = 0;
         StdOutputRecordCount = 0;
-        OutputFileInits = 0;
         OutputFileDebug = 0;
         OutputFileZoneSizing = 0;
         OutputFileSysSizing = 0;
@@ -365,7 +362,6 @@ namespace DataGlobals {
         eso_stream = nullptr;
         mtr_stream = nullptr;
         err_stream = nullptr;
-        eio_stream = nullptr;
         delightin_stream = nullptr;
     }
 

diff --git a/src/EnergyPlus/DataReportingFlags.cc b/src/EnergyPlus/DataReportingFlags.cc
@@ -87,7 +87,7 @@ namespace DataReportingFlags {
     int NumOfWarmupDays(0); // reinitialized for each environment.
     std::string cWarmupDay;
     bool DisplayPerfSimulationFlag(false);        // True when "Performing Simulation" should be displayed
-    bool DoWeatherInitReporting(false);           // Init reporting -- items that go onto OutputFileInits
+    bool DoWeatherInitReporting(false);           // Init reporting -- items that go onto OutputFileInits (eio)
     bool PrintEndDataDictionary(false);           // Flag for printing "End of Data Dictionary" on output files
     bool IgnoreInteriorWindowTransmission(false); // True when section "IgnoreInteriorWindowTransmission" is entered
     bool MakeMirroredDetachedShading(true);       // True (default) when Detached Shading Surfaces should be "mirrored"

diff --git a/src/EnergyPlus/DataStringGlobals.in.cc b/src/EnergyPlus/DataStringGlobals.in.cc
@@ -122,7 +122,6 @@ namespace DataStringGlobals {
     std::string outputAuditFileName("eplusout.audit");
     std::string outputBndFileName("eplusout.bnd");
     std::string outputDxfFileName("eplusout.dxf");
-    std::string outputEioFileName("eplusout.eio");
     std::string outputEndFileName("eplusout.end");
     std::string outputErrFileName("eplusout.err");
     std::string outputEsoFileName("eplusout.eso");

diff --git a/src/EnergyPlus/DaylightingDevices.cc b/src/EnergyPlus/DaylightingDevices.cc
@@ -68,6 +68,7 @@
 #include <EnergyPlus/General.hh>
 #include <EnergyPlus/HeatBalanceInternalHeatGains.hh>
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/UtilityRoutines.hh>
 #include <EnergyPlus/Vectors.hh>

diff --git a/src/EnergyPlus/DaylightingDevices.hh b/src/EnergyPlus/DaylightingDevices.hh
@@ -52,10 +52,10 @@
 #include <ObjexxFCL/Array1A.hh>
 
 // EnergyPlus Headers
-#include "OutputFiles.hh"
 #include <EnergyPlus/EnergyPlus.hh>
 
 namespace EnergyPlus {
+    class OutputFiles;
 
 namespace DaylightingDevices {
 

diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc
@@ -84,6 +84,7 @@
 #include <EnergyPlus/General.hh>
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
 #include <EnergyPlus/InternalHeatGains.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/OutputReportPredefined.hh>
 #include <EnergyPlus/PierceSurface.hh>

diff --git a/src/EnergyPlus/DualDuct.cc b/src/EnergyPlus/DualDuct.cc
@@ -77,6 +77,7 @@
 #include <EnergyPlus/GlobalNames.hh>
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
 #include <EnergyPlus/NodeInputManager.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/Psychrometrics.hh>
 #include <EnergyPlus/ReportSizingManager.hh>

diff --git a/src/EnergyPlus/EnergyPlusPgm.cc b/src/EnergyPlus/EnergyPlusPgm.cc
@@ -210,6 +210,7 @@
 #include <EnergyPlus/InputProcessing/IdfParser.hh>
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
 #include <EnergyPlus/InputProcessing/InputValidation.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/Psychrometrics.hh>
 #include <EnergyPlus/ResultsSchema.hh>

diff --git a/src/EnergyPlus/FuelCellElectricGenerator.cc b/src/EnergyPlus/FuelCellElectricGenerator.cc
@@ -72,6 +72,7 @@
 #include <EnergyPlus/HeatBalanceInternalHeatGains.hh>
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
 #include <EnergyPlus/NodeInputManager.hh>
+#include <EnergyPlus/OutputFiles.hh>
 #include <EnergyPlus/OutputProcessor.hh>
 #include <EnergyPlus/PlantUtilities.hh>
 #include <EnergyPlus/ScheduleManager.hh>

diff --git a/src/EnergyPlus/GeneratorFuelSupply.cc b/src/EnergyPlus/GeneratorFuelSupply.cc
@@ -700,7 +700,7 @@ namespace GeneratorFuelSupply {
         // report Heating Values in EIO.
         print(outputFiles.eio, "! <Fuel Supply>, Fuel Supply Name, Lower Heating Value [J/kmol], Lower Heating Value [kJ/kg], Higher "
                                              "Heating Value [KJ/kg],  Molecular Weight [g/mol] \n");
-        static constexpr auto Format_501(" Fuel Supply, {},{:13.6T},{:13.6T},{:13.6T},{:13.6T}\n");
+        static constexpr auto Format_501(" Fuel Supply, {},{:13.6N},{:13.6N},{:13.6N},{:13.6N}\n");
         print(outputFiles.eio,
               Format_501,
               FuelSupply(FuelSupplyNum).Name,

diff --git a/src/EnergyPlus/GeneratorFuelSupply.hh b/src/EnergyPlus/GeneratorFuelSupply.hh
@@ -49,11 +49,10 @@
 #define GeneratorFuelSupply_hh_INCLUDED
 
 // EnergyPlus Headers
-#include "OutputFiles.hh"
 #include <EnergyPlus/EnergyPlus.hh>
 
 namespace EnergyPlus {
-
+    class OutputFiles;
 namespace GeneratorFuelSupply {
 
     // Data

diff --git a/src/EnergyPlus/GroundTemperatureModeling/BaseGroundTemperatureModel.hh b/src/EnergyPlus/GroundTemperatureModeling/BaseGroundTemperatureModel.hh
@@ -83,7 +83,7 @@ public:
     virtual Real64 getGroundTempAtTimeInMonths(Real64 const, int const) = 0;
 
 protected:
-    static void write_ground_temps(std::ostream &os, const std::string &name, const Array1D<Real64> &data)
+    static void write_ground_temps(OutputFiles::OutputFile &os, const std::string &name, const Array1D<Real64> &data)
     {
         print(os,
               "! <Site:GroundTemperature:{}>,Jan{{C}},Feb{{C}},Mar{{C}},Apr{{C}},May{{C}},Jun{{C}},Jul{{C}},Aug{{C}},Sep{{C}},Oct{{C}},Nov{{C}},Dec{{C}}\n", name);

diff --git a/src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc b/src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc
@@ -241,7 +241,7 @@ void FiniteDiffGroundTempsModel::getWeatherData()
     WeatherManager::Envrn = originalNumOfEnvn;
     Available = true;
     ErrorsFound = false;
-    GetNextEnvironment(Available, ErrorsFound);
+    GetNextEnvironment(OutputFiles::getSingleton(), Available, ErrorsFound);
     if (ErrorsFound) {
         ShowFatalError("Site:GroundTemperature:Undisturbed:FiniteDifference: error in reading weather file data");
     }

diff --git a/src/EnergyPlus/GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.hh b/src/EnergyPlus/GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.hh
@@ -57,9 +57,9 @@
 // EnergyPlus Headers
 #include <EnergyPlus/EnergyPlus.hh>
 #include <EnergyPlus/GroundTemperatureModeling/BaseGroundTemperatureModel.hh>
-#include <EnergyPlus/OutputFiles.hh>
 
 namespace EnergyPlus {
+    class OutputFiles;
 
 // Derived class for Site:GroundTemperature:BuildingSurface
 class SiteBuildingSurfaceGroundTemps : public BaseGroundTempsModel

diff --git a/src/EnergyPlus/GroundTemperatureModeling/SiteDeepGroundTemperatures.hh b/src/EnergyPlus/GroundTemperatureModeling/SiteDeepGroundTemperatures.hh
@@ -57,9 +57,9 @@
 // EnergyPlus Headers
 #include <EnergyPlus/EnergyPlus.hh>
 #include <EnergyPlus/GroundTemperatureModeling/BaseGroundTemperatureModel.hh>
-#include <EnergyPlus/OutputFiles.hh>
 
 namespace EnergyPlus {
+class OutputFiles;
 
 // Derived class for Site:GroundTemperature:Deep
 class SiteDeepGroundTemps : public BaseGroundTempsModel

diff --git a/src/EnergyPlus/GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.hh b/src/EnergyPlus/GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.hh
@@ -57,9 +57,9 @@
 // EnergyPlus Headers
 #include <EnergyPlus/EnergyPlus.hh>
 #include <EnergyPlus/GroundTemperatureModeling/BaseGroundTemperatureModel.hh>
-#include <EnergyPlus/OutputFiles.hh>
 
 namespace EnergyPlus {
+class OutputFiles;
 
 // Derived class for Site:GroundTemperature:FCFactorMethod
 class SiteFCFactorMethodGroundTemps : public BaseGroundTempsModel

diff --git a/src/EnergyPlus/GroundTemperatureModeling/SiteShallowGroundTemperatures.hh b/src/EnergyPlus/GroundTemperatureModeling/SiteShallowGroundTemperatures.hh
@@ -59,9 +59,9 @@
 // EnergyPlus Headers
 #include <EnergyPlus/EnergyPlus.hh>
 #include <EnergyPlus/GroundTemperatureModeling/BaseGroundTemperatureModel.hh>
-#include <EnergyPlus/OutputFiles.hh>
 
 namespace EnergyPlus {
+class OutputFiles;
 
 // Derived class for Site:GroundTemperature:Shallow
 class SiteShallowGroundTemps : public BaseGroundTempsModel