Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#9228 - Tabular file not generated with only Output:Table:Annual #9296

Merged
merged 4 commits into from
Feb 26, 2022
Merged

#9228 - Tabular file not generated with only Output:Table:Annual #9296

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3060820
Add a test for #9228
jmarrec Feb 22, 2022
b7b14eb
Fix #9228 - Write tabular files if only Output:Table:Annual was reque…
jmarrec Feb 20, 2022
12f0d0f
Outside of #9228's scope, but don't warn in CheckForRequestedReportin…
jmarrec Feb 20, 2022
872443d
Merge remote-tracking branch 'remotes/origin/develop' into 9228_Outpu…
mjwitte Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/EnergyPlus/OutputReportTabularAnnual.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ void GetInputTabularAnnual(EnergyPlusData &state)

objCount = state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, currentModuleObject);
if (objCount > 0) {

state.dataOutRptTab->WriteTabularFiles = true;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actual fix


// if not a run period using weather do not create reports
if (!state.dataGlobal->DoWeathSim) {
ShowWarningError(state,
Expand Down
1 change: 1 addition & 0 deletions src/EnergyPlus/SimulationManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't warn about "no output requested" if you requested an Output:Table:Annual

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 ||
Expand Down
2 changes: 2 additions & 0 deletions tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Comment on lines +88 to +90
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minimal test.


EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u);

Expand Down