Merge pull request #9296 from NREL/9228_OutputTableAnnual

#9228 - Tabular file not generated with only Output:Table:Annual
NREL · Feb 26, 2022 · 58b5b32 · 58b5b32 · nrel-bot-2c · Feb 26, 2022
2 parents 4fa778e + 872443d
commit 58b5b32
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/EnergyPlus/OutputReportTabularAnnual.cc b/src/EnergyPlus/OutputReportTabularAnnual.cc
@@ -107,6 +107,9 @@ void GetInputTabularAnnual(EnergyPlusData &state)
 
     objCount = state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, currentModuleObject);
     if (objCount > 0) {
+
+        state.dataOutRptTab->WriteTabularFiles = true;
+
         // if not a run period using weather do not create reports
         if (!state.dataGlobal->DoWeathSim) {
             ShowWarningError(state,

diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc
@@ -1653,6 +1653,7 @@ namespace SimulationManager {
             ReportingRequested = (state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Output:Table:SummaryReports") > 0 ||
                                   state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Output:Table:TimeBins") > 0 ||
                                   state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Output:Table:Monthly") > 0 ||
+                                  state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Output:Table:Annual") > 0 ||
                                   state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Output:Variable") > 0 ||
                                   state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Output:Meter") > 0 ||
                                   state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Output:Meter:MeterFileOnly") > 0 ||

diff --git a/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc b/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc
@@ -85,7 +85,9 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_GetInput)
 
     state->dataGlobal->DoWeathSim = true;
 
+    EXPECT_FALSE(state->dataOutRptTab->WriteTabularFiles);
     GetInputTabularAnnual(*state);
+    EXPECT_TRUE(state->dataOutRptTab->WriteTabularFiles);
 
     EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u);