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

Jump to bottom

#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

merged 4 commits into from
Feb 26, 2022

Conversation

jmarrec
Copy link
Contributor

@jmarrec jmarrec commented Feb 22, 2022 •
edited by mjwitte
Loading

Pull request overview

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

  • Title of PR should be user-synopsis style (clearly understandable in a standalone changelog context)
  • Label the PR with at least one of: Defect, Refactoring, NewFeature, Performance, and/or DoNoPublish
  • Pull requests that impact EnergyPlus code must also include unit tests to cover enhancement or defect repair
  • Author should provide a "walkthrough" of relevant code changes using a GitHub code review comment process
  • If any diffs are expected, author must demonstrate they are justified using plots and descriptions
  • If changes fix a defect, the fix should be demonstrated in plots and descriptions
  • If any defect files are updated to a more recent version, upload new versions here or on DevSupport
  • If IDD requires transition, transition source, rules, ExpandObjects, and IDFs must be updated, and add IDDChange label
  • If structural output changes, add to output rules file and add OutputChange label
  • If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies

Reviewer

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • If branch is behind develop, merge develop and build locally to check for side effects of the merge
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified
  • Check that performance is not impacted (CI Linux results include performance check)
  • Run Unit Test(s) locally
  • Check any new function arguments for performance impacts
  • Verify IDF naming conventions and styles, memos and notes and defaults
  • If new idf included, locally check the err file and other outputs

@jmarrec jmarrec added Defect Includes code to repair a defect in EnergyPlus NotIDDChange Code does not impact IDD (can be merged after IO freeze) labels Feb 22, 2022
@jmarrec jmarrec requested a review from Myoldmopar February 22, 2022 20:36
@jmarrec jmarrec self-assigned this Feb 22, 2022
@jmarrec jmarrec force-pushed the 9228_OutputTableAnnual branch from dcd2f3a to 12f0d0f Compare February 22, 2022 20:37
jmarrec
jmarrec commented Feb 22, 2022
View reviewed changes
Copy link
Contributor Author

@jmarrec jmarrec left a comment

Choose a reason for hiding this comment

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

Checked the defect file on dev support before (didn't have tables), and confirmed it has eplustbl.htm after.

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;
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

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 ||
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

tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc
Comment on lines +88 to +90
EXPECT_FALSE(state->dataOutRptTab->WriteTabularFiles);
GetInputTabularAnnual(*state);
EXPECT_TRUE(state->dataOutRptTab->WriteTabularFiles);
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.

mjwitte
mjwitte approved these changes Feb 25, 2022
View reviewed changes
Copy link
Contributor

@mjwitte mjwitte left a comment

Choose a reason for hiding this comment

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

Nice fix, works as advertised. I've merged in develop, will wait for one CI result or so then merge this.

@mjwitte mjwitte merged commit 58b5b32 into develop Feb 26, 2022
@mjwitte mjwitte deleted the 9228_OutputTableAnnual branch February 26, 2022 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjwitte mjwitte mjwitte approved these changes

@Myoldmopar Myoldmopar Awaiting requested review from Myoldmopar

Assignees

@jmarrec jmarrec

Labels
Defect Includes code to repair a defect in EnergyPlus NotIDDChange Code does not impact IDD (can be merged after IO freeze)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Tabular file not generated with only Output:Table:Annual
6 participants
@jmarrec @mjwitte @nrel-bot @nrel-bot-3 @nrel-bot-2b @nrel-bot-2c