From b4709daa69208cd71aacb1048342f4f3236a20d9 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 Mar 2021 08:36:22 -0600 Subject: [PATCH 1/5] move OutputReportTabularAnnual to state --- src/EnergyPlus/EarthTube.cc | 7 ++--- src/EnergyPlus/OutputReportTabular.cc | 4 +-- src/EnergyPlus/OutputReportTabularAnnual.cc | 30 +++++++------------ src/EnergyPlus/OutputReportTabularAnnual.hh | 12 ++++---- src/EnergyPlus/StateManagement.cc | 4 --- .../unit/OutputReportTabularAnnual.unit.cc | 20 ++++++------- 6 files changed, 30 insertions(+), 47 deletions(-) diff --git a/src/EnergyPlus/EarthTube.cc b/src/EnergyPlus/EarthTube.cc index 98dc8305c82..3083c950ae9 100644 --- a/src/EnergyPlus/EarthTube.cc +++ b/src/EnergyPlus/EarthTube.cc @@ -85,13 +85,10 @@ namespace EnergyPlus::EarthTube { // Using/Aliasing using namespace DataEnvironment; using namespace DataHeatBalFanSys; - using namespace DataHeatBalance; // This is the heat balance super block data module + using namespace DataHeatBalance; using namespace DataSurfaces; using namespace Psychrometrics; - // MODULE VARIABLES DECLARATIONS: - static std::string const BlankString; - void ManageEarthTube(EnergyPlusData &state) { @@ -231,7 +228,7 @@ namespace EnergyPlus::EarthTube { state.dataEarthTube->EarthTubeSys(Loop).FanType = EarthTubeVentilation::Exhaust; } else if (SELECT_CASE_var == "INTAKE") { state.dataEarthTube->EarthTubeSys(Loop).FanType = EarthTubeVentilation::Intake; - } else if ((SELECT_CASE_var == "NATURAL") || (SELECT_CASE_var == "NONE") || (SELECT_CASE_var == BlankString)) { + } else if ((SELECT_CASE_var == "NATURAL") || (SELECT_CASE_var == "NONE") || (SELECT_CASE_var.empty())) { state.dataEarthTube->EarthTubeSys(Loop).FanType = EarthTubeVentilation::Natural; } else { ShowSevereError(state, cCurrentModuleObject + ": " + cAlphaFieldNames(1) + '=' + cAlphaArgs(1) + ", " + cAlphaFieldNames(3) + diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index e52e8f8899f..c3eeb7184fd 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -3316,7 +3316,7 @@ namespace EnergyPlus::OutputReportTabular { } } } - OutputReportTabularAnnual::AddAnnualTableOfContents(tbl_stream); + OutputReportTabularAnnual::AddAnnualTableOfContents(state, tbl_stream); } // add entries specifically added using AddTOCEntry for (iEntry = 1; iEntry <= ort->TOCEntriesCount; ++iEntry) { @@ -15594,7 +15594,7 @@ namespace EnergyPlus::OutputReportTabular { // so that only last year is reported in tabular reports state.dataOutRptTab->gatherElapsedTimeBEPS = 0.0; ResetMonthlyGathering(state); - OutputReportTabularAnnual::ResetAnnualGathering(); + OutputReportTabularAnnual::ResetAnnualGathering(state); ResetBinGathering(state); ResetBEPSGathering(state); ResetSourceEnergyEndUseGathering(state); diff --git a/src/EnergyPlus/OutputReportTabularAnnual.cc b/src/EnergyPlus/OutputReportTabularAnnual.cc index 3826c328ee1..7af8834e91b 100644 --- a/src/EnergyPlus/OutputReportTabularAnnual.cc +++ b/src/EnergyPlus/OutputReportTabularAnnual.cc @@ -74,11 +74,7 @@ #include #include -namespace EnergyPlus { - -namespace OutputReportTabularAnnual { - - std::vector annualTables; +namespace EnergyPlus::OutputReportTabularAnnual { void GetInputTabularAnnual(EnergyPlusData &state) { @@ -107,6 +103,8 @@ namespace OutputReportTabularAnnual { int curNumDgts(2); AnnualFieldSet::AggregationKind curAgg(AnnualFieldSet::AggregationKind::sumOrAvg); + auto &annualTables(state.dataOutputReportTabularAnnual->annualTables); + objCount = inputProcessor->getNumObjectsFound(state, currentModuleObject); if (objCount > 0) { // if not a run period using weather do not create reports @@ -246,6 +244,7 @@ namespace OutputReportTabularAnnual { { std::vector::iterator annualTableIt; bool invalidAggregationOrderFound = false; + auto &annualTables(state.dataOutputReportTabularAnnual->annualTables); if (!state.dataGlobal->DoWeathSim) { // if no weather simulation than no reading of MonthlyInput array return; } @@ -309,6 +308,7 @@ namespace OutputReportTabularAnnual { // This function is not part of the class but acts as an interface between procedural code and the class by // gathering data for each of the AnnualTable objects std::vector::iterator annualTableIt; + auto &annualTables(state.dataOutputReportTabularAnnual->annualTables); for (annualTableIt = annualTables.begin(); annualTableIt != annualTables.end(); ++annualTableIt) { annualTableIt->gatherForTimestep(state, kindOfTimeStep); } @@ -566,12 +566,13 @@ namespace OutputReportTabularAnnual { } } - void ResetAnnualGathering() + void ResetAnnualGathering(EnergyPlusData &state) { // Jason Glazer, October 2015 // This function is not part of the class but acts as an interface between procedural code and the class by - // reseting data for each of the AnnualTable objects + // resetting data for each of the AnnualTable objects std::vector::iterator annualTableIt; + auto &annualTables(state.dataOutputReportTabularAnnual->annualTables); for (annualTableIt = annualTables.begin(); annualTableIt != annualTables.end(); ++annualTableIt) { annualTableIt->resetGathering(); } @@ -624,6 +625,7 @@ namespace OutputReportTabularAnnual { void WriteAnnualTables(EnergyPlusData &state) { + auto &annualTables(state.dataOutputReportTabularAnnual->annualTables); for (int iUnitSystem = 0; iUnitSystem <= 1; iUnitSystem++) { OutputReportTabular::iUnitsStyle unitsStyle_cur = state.dataOutRptTab->unitsStyle; bool produceTabular = true; @@ -1170,12 +1172,13 @@ namespace OutputReportTabularAnnual { return str.substr(strBegin, strRange); } - void AddAnnualTableOfContents(std::ostream &nameOfStream) + void AddAnnualTableOfContents(EnergyPlusData &state, std::ostream &nameOfStream) { // Jason Glazer, August 2015 // This function is not part of the class but acts as an interface between procedural code and the class by // invoking the writeTable member function for each of the AnnualTable objects std::vector::iterator annualTableIt; + auto &annualTables(state.dataOutputReportTabularAnnual->annualTables); for (annualTableIt = annualTables.begin(); annualTableIt != annualTables.end(); ++annualTableIt) { annualTableIt->addTableOfContents(nameOfStream); } @@ -1374,15 +1377,6 @@ namespace OutputReportTabularAnnual { } } - void clear_state() - { // for unit tests - std::vector::iterator annualTableIt; - for (annualTableIt = annualTables.begin(); annualTableIt != annualTables.end(); ++annualTableIt) { - annualTableIt->clearTable(); - } - annualTables.clear(); - } - void AnnualTable::clearTable() { m_name = ""; @@ -1444,6 +1438,4 @@ namespace OutputReportTabularAnnual { return ret; } -} // namespace OutputReportTabularAnnual - } // namespace EnergyPlus diff --git a/src/EnergyPlus/OutputReportTabularAnnual.hh b/src/EnergyPlus/OutputReportTabularAnnual.hh index 271c331028b..80c30b08d18 100644 --- a/src/EnergyPlus/OutputReportTabularAnnual.hh +++ b/src/EnergyPlus/OutputReportTabularAnnual.hh @@ -81,16 +81,14 @@ namespace OutputReportTabularAnnual { void GatherAnnualResultsForTimeStep(EnergyPlusData &state, OutputProcessor::TimeStepType kindOfTypeStep); - void ResetAnnualGathering(); + void ResetAnnualGathering(EnergyPlusData &state); void WriteAnnualTables(EnergyPlusData &state); - void AddAnnualTableOfContents(std::ostream &); + void AddAnnualTableOfContents(EnergyPlusData &state, std::ostream &); AnnualFieldSet::AggregationKind stringToAggKind(EnergyPlusData &state, std::string inString); - void clear_state(); // for unit tests - class AnnualTable { public: @@ -177,15 +175,15 @@ namespace OutputReportTabularAnnual { }; // class AnnualTable - extern std::vector annualTables; - } // namespace OutputReportTabularAnnual struct OutputReportTabularAnnualData : BaseGlobalStruct { + std::vector annualTables; + void clear_state() override { - + this->annualTables.clear(); } }; diff --git a/src/EnergyPlus/StateManagement.cc b/src/EnergyPlus/StateManagement.cc index 10487b9ce90..1d3ac9bf644 100644 --- a/src/EnergyPlus/StateManagement.cc +++ b/src/EnergyPlus/StateManagement.cc @@ -68,7 +68,6 @@ #include #include #include -#include #include #include #include @@ -97,7 +96,6 @@ #include #include #include -#include #include #include #include @@ -106,7 +104,6 @@ #include #include #include -#include #include #include #include @@ -160,7 +157,6 @@ void EnergyPlus::clearAllStates(EnergyPlusData &state) HysteresisPhaseChange::clear_state(); LowTempRadiantSystem::clear_state(); OutputReportTabular::clear_state(state); - OutputReportTabularAnnual::clear_state(); PackagedThermalStorageCoil::clear_state(); Photovoltaics::clear_state(); PhotovoltaicThermalCollectors::clear_state(); diff --git a/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc b/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc index 64123e36d6a..d16022f16b4 100644 --- a/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc +++ b/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc @@ -86,9 +86,9 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_GetInput) GetInputTabularAnnual(*state); - EXPECT_EQ(OutputReportTabularAnnual::annualTables.size(), 1u); + EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u); - std::vector::iterator firstTable = OutputReportTabularAnnual::annualTables.begin(); + std::vector::iterator firstTable = state->dataOutputReportTabularAnnual->annualTables.begin(); std::vector tableParams = firstTable->inspectTable(); @@ -167,9 +167,9 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_SetupGathering) state->dataGlobal->DoWeathSim = true; GetInputTabularAnnual(*state); // this also calls setupGathering - EXPECT_EQ(OutputReportTabularAnnual::annualTables.size(), 1u); + EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u); - std::vector::iterator firstTable = OutputReportTabularAnnual::annualTables.begin(); + std::vector::iterator firstTable = state->dataOutputReportTabularAnnual->annualTables.begin(); std::vector fieldSetParams = firstTable->inspectTableFieldSets(0); EXPECT_EQ(fieldSetParams[0], "EXTERIOR LIGHTS ELECTRIC ENERGY"); @@ -239,7 +239,7 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_GatherResults) state->dataGlobal->TimeStepZone = 0.25; GetInputTabularAnnual(*state); - EXPECT_EQ(OutputReportTabularAnnual::annualTables.size(), 1u); + EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u); extLitPow = 2.01; extLitUse = 1.01; @@ -249,7 +249,7 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_GatherResults) // STOPPPED HERE. NOT SEEING THE POWER VARIABLE SHOWING UP - std::vector::iterator firstTable = OutputReportTabularAnnual::annualTables.begin(); + std::vector::iterator firstTable = state->dataOutputReportTabularAnnual->annualTables.begin(); std::vector fieldSetParams = firstTable->inspectTableFieldSets(0); } @@ -349,9 +349,9 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_columnHeadersToTitleCase) OutputReportTabularAnnual::GetInputTabularAnnual(*state); - EXPECT_EQ(OutputReportTabularAnnual::annualTables.size(), 1u); + EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u); - std::vector::iterator firstTable = OutputReportTabularAnnual::annualTables.begin(); + std::vector::iterator firstTable = state->dataOutputReportTabularAnnual->annualTables.begin(); firstTable->columnHeadersToTitleCase(*state); @@ -406,9 +406,9 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_invalidAggregationOrder) OutputReportTabularAnnual::GetInputTabularAnnual(*state); - EXPECT_EQ(OutputReportTabularAnnual::annualTables.size(), 1u); + EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u); - std::vector::iterator firstTable = OutputReportTabularAnnual::annualTables.begin(); + std::vector::iterator firstTable = state->dataOutputReportTabularAnnual->annualTables.begin(); EXPECT_TRUE(firstTable->invalidAggregationOrder(*state)); } From 90e46722cdb0aab432d663f1e22e2dda3d74daa4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 Mar 2021 09:18:55 -0600 Subject: [PATCH 2/5] move PVWatts to state --- src/EnergyPlus/PVWatts.cc | 12 ++++-------- src/EnergyPlus/PVWatts.hh | 10 ++++------ src/EnergyPlus/StateManagement.cc | 2 -- tst/EnergyPlus/unit/PVWatts.unit.cc | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/EnergyPlus/PVWatts.cc b/src/EnergyPlus/PVWatts.cc index 170fc11e5c9..589fd4d7d00 100644 --- a/src/EnergyPlus/PVWatts.cc +++ b/src/EnergyPlus/PVWatts.cc @@ -75,8 +75,6 @@ namespace EnergyPlus { namespace PVWatts { - std::map PVWattsGenerators; - PVWattsGenerator::PVWattsGenerator(EnergyPlusData &state, const std::string &name, const Real64 dcSystemCapacity, @@ -339,7 +337,7 @@ namespace PVWatts { return m_groundCoverageRatio; } - Real64 PVWattsGenerator::getCellTempearture() + Real64 PVWattsGenerator::getCellTemperature() { return m_cellTemperature; } @@ -458,6 +456,9 @@ namespace PVWatts { if (ObjNum == 0) { ShowFatalError(state, "Cannot find Generator:PVWatts " + GeneratorName); } + + auto & PVWattsGenerators(state.dataPVWatts->PVWattsGenerators); + auto it = PVWattsGenerators.find(ObjNum); if (it == PVWattsGenerators.end()) { // It's not in the map, add it. @@ -470,11 +471,6 @@ namespace PVWatts { } } - void clear_state() - { - PVWattsGenerators.clear(); - } - } // namespace PVWatts } // namespace EnergyPlus diff --git a/src/EnergyPlus/PVWatts.hh b/src/EnergyPlus/PVWatts.hh index 2d84ace882f..1aeb7887cbc 100644 --- a/src/EnergyPlus/PVWatts.hh +++ b/src/EnergyPlus/PVWatts.hh @@ -196,7 +196,7 @@ namespace PVWatts { DataSurfaces::SurfaceData &getSurface(EnergyPlusData &state); Real64 getGroundCoverageRatio(); - Real64 getCellTempearture(); + Real64 getCellTemperature(); Real64 getPlaneOfArrayIrradiance(); void setCellTemperature(Real64 cellTemp); void setPlaneOfArrayIrradiance(Real64 poa); @@ -209,19 +209,17 @@ namespace PVWatts { void getResults(Real64 &GeneratorPower, Real64 &GeneratorEnergy, Real64 &ThermalPower, Real64 &ThermalEnergy); }; - extern std::map PVWattsGenerators; - PVWattsGenerator &GetOrCreatePVWattsGenerator(EnergyPlusData &state, std::string const &GeneratorName); - void clear_state(); - } // namespace PVWatts struct PVWattsData : BaseGlobalStruct { + std::map PVWattsGenerators; + void clear_state() override { - + this->PVWattsGenerators.clear(); } }; diff --git a/src/EnergyPlus/StateManagement.cc b/src/EnergyPlus/StateManagement.cc index 1d3ac9bf644..295574f9909 100644 --- a/src/EnergyPlus/StateManagement.cc +++ b/src/EnergyPlus/StateManagement.cc @@ -97,7 +97,6 @@ #include #include #include -#include #include #include #include @@ -162,7 +161,6 @@ void EnergyPlus::clearAllStates(EnergyPlusData &state) PhotovoltaicThermalCollectors::clear_state(); PollutionModule::clear_state(); Psychrometrics::clear_state(); - PVWatts::clear_state(); RoomAirModelAirflowNetwork::clear_state(); RoomAirModelUserTempPattern::clear_state(); ScheduleManager::clear_state(); diff --git a/tst/EnergyPlus/unit/PVWatts.unit.cc b/tst/EnergyPlus/unit/PVWatts.unit.cc index a0ef20c06c6..db7d1f0a456 100644 --- a/tst/EnergyPlus/unit/PVWatts.unit.cc +++ b/tst/EnergyPlus/unit/PVWatts.unit.cc @@ -139,7 +139,7 @@ TEST_F(EnergyPlusFixture, PVWattsGenerator_GetInputs) EXPECT_DOUBLE_EQ(175.0, pvw3.getAzimuth()); EXPECT_DOUBLE_EQ(21.0, pvw3.getTilt()); EXPECT_DOUBLE_EQ(0.5, pvw3.getGroundCoverageRatio()); - EXPECT_EQ(static_cast(PVWattsGenerators.size()), 3); + EXPECT_EQ(static_cast(state->dataPVWatts->PVWattsGenerators.size()), 3); } TEST_F(EnergyPlusFixture, PVWattsGenerator_GetInputsFailure) From 3a82984a61fde9b1432b0c4b8edaaefa3a68f3b5 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 Mar 2021 09:21:27 -0600 Subject: [PATCH 3/5] move DXFEarClipping to state --- src/EnergyPlus/DXFEarClipping.cc | 12 +----------- src/EnergyPlus/DXFEarClipping.hh | 4 +++- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/EnergyPlus/DXFEarClipping.cc b/src/EnergyPlus/DXFEarClipping.cc index dced25469d1..4be0ce6f13d 100644 --- a/src/EnergyPlus/DXFEarClipping.cc +++ b/src/EnergyPlus/DXFEarClipping.cc @@ -77,16 +77,6 @@ namespace DXFEarClipping { // Methodology employed: // Ear clipping has turned out to be the simplest, most robust technique. - // Using/Aliasing - using namespace DataVectorTypes; - - bool trackit(false); - // Subroutine specifications for module : - - // rest of routines are private. - - // Functions - bool InPolygon(Vector const &point, Array1D &poly, int const nsides) { // this routine is not used in the current scheme @@ -578,7 +568,7 @@ namespace DXFEarClipping { earvert(2) = mvert; earvert(3) = evert; } - if (trackit) { + if (state.dataDXFEarClipping->trackit) { print(state.files.debug, "ear={} triangle={:12}{:12}{:12}\n", nears, svert, mvert, evert); } } diff --git a/src/EnergyPlus/DXFEarClipping.hh b/src/EnergyPlus/DXFEarClipping.hh index 13537884854..241aa6e15a6 100644 --- a/src/EnergyPlus/DXFEarClipping.hh +++ b/src/EnergyPlus/DXFEarClipping.hh @@ -140,9 +140,11 @@ namespace DXFEarClipping { struct DXFEarClippingData : BaseGlobalStruct { + bool trackit = false; + void clear_state() override { - + this->trackit = false; } }; From d2f4e79a2333803662d6a7f3c67244794983ef90 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 Mar 2021 10:58:33 -0600 Subject: [PATCH 4/5] minor cleanup to OutputReportTabular clear_state --- src/EnergyPlus/OutputReportTabular.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index c3eeb7184fd..bce4e687fa8 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -15592,7 +15592,6 @@ namespace EnergyPlus::OutputReportTabular { // Jason Glazer - October 2015 // Reset all gathering arrays to zero for multi-year simulations // so that only last year is reported in tabular reports - state.dataOutRptTab->gatherElapsedTimeBEPS = 0.0; ResetMonthlyGathering(state); OutputReportTabularAnnual::ResetAnnualGathering(state); ResetBinGathering(state); @@ -15604,7 +15603,6 @@ namespace EnergyPlus::OutputReportTabular { ThermalComfort::ResetThermalComfortSimpleASH55(state); ThermalComfort::ResetSetPointMet(state); ResetAdaptiveComfort(state); - state.dataOutputProcessor->isFinalYear = true; } void ResetMonthlyGathering(EnergyPlusData &state) From 9348e0bce505cce980081ccf3ae681a8b2d68725 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 Mar 2021 15:32:15 -0600 Subject: [PATCH 5/5] move OutputReportTabular to state --- src/EnergyPlus/OutputReportTabular.cc | 8 ++------ src/EnergyPlus/OutputReportTabular.hh | 1 - src/EnergyPlus/StateManagement.cc | 2 -- tst/EnergyPlus/unit/OutputReportTabular.unit.cc | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index bce4e687fa8..70e999f5255 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -170,12 +170,6 @@ namespace EnergyPlus::OutputReportTabular { using namespace DataHeatBalance; using namespace HybridModel; - // Functions - void clear_state(EnergyPlusData &state) - { - OutputReportTabular::ResetTabularReports(state); - } - std::ofstream & open_tbl_stream(EnergyPlusData &state, int const iStyle, std::string const & filename, bool output_to_file) { std::ofstream &tbl_stream(*state.dataOutRptTab->TabularOutputFile(iStyle)); @@ -15592,6 +15586,7 @@ namespace EnergyPlus::OutputReportTabular { // Jason Glazer - October 2015 // Reset all gathering arrays to zero for multi-year simulations // so that only last year is reported in tabular reports + state.dataOutRptTab->gatherElapsedTimeBEPS = 0.0; ResetMonthlyGathering(state); OutputReportTabularAnnual::ResetAnnualGathering(state); ResetBinGathering(state); @@ -15603,6 +15598,7 @@ namespace EnergyPlus::OutputReportTabular { ThermalComfort::ResetThermalComfortSimpleASH55(state); ThermalComfort::ResetSetPointMet(state); ResetAdaptiveComfort(state); + state.dataOutputProcessor->isFinalYear = true; } void ResetMonthlyGathering(EnergyPlusData &state) diff --git a/src/EnergyPlus/OutputReportTabular.hh b/src/EnergyPlus/OutputReportTabular.hh index 4188b853448..a40410a19e7 100644 --- a/src/EnergyPlus/OutputReportTabular.hh +++ b/src/EnergyPlus/OutputReportTabular.hh @@ -470,7 +470,6 @@ namespace OutputReportTabular { }; // Functions - void clear_state(EnergyPlusData &state); std::ofstream & open_tbl_stream(EnergyPlusData &state, int const iStyle, std::string const & filename, bool output_to_file = true); diff --git a/src/EnergyPlus/StateManagement.cc b/src/EnergyPlus/StateManagement.cc index 295574f9909..0af382a3343 100644 --- a/src/EnergyPlus/StateManagement.cc +++ b/src/EnergyPlus/StateManagement.cc @@ -95,7 +95,6 @@ #include #include #include -#include #include #include #include @@ -155,7 +154,6 @@ void EnergyPlus::clearAllStates(EnergyPlusData &state) HybridModel::clear_state(); HysteresisPhaseChange::clear_state(); LowTempRadiantSystem::clear_state(); - OutputReportTabular::clear_state(state); PackagedThermalStorageCoil::clear_state(); Photovoltaics::clear_state(); PhotovoltaicThermalCollectors::clear_state(); diff --git a/tst/EnergyPlus/unit/OutputReportTabular.unit.cc b/tst/EnergyPlus/unit/OutputReportTabular.unit.cc index a8c2367805d..ea20fc6954c 100644 --- a/tst/EnergyPlus/unit/OutputReportTabular.unit.cc +++ b/tst/EnergyPlus/unit/OutputReportTabular.unit.cc @@ -8294,7 +8294,6 @@ TEST_F(EnergyPlusFixture, OutputReportTabularTest_ConfirmConversionFactors) TEST_F(EnergyPlusFixture, OutputReportTabular_GatherHeatGainReport) { - OutputReportTabular::clear_state(*state); state->dataGlobal->DoWeathSim = true; state->dataOutRptPredefined->pdrSensibleGain = 1;