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.

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

Fix incorrect "other" row ABUPS end-used by subcategory table #7794

Merged
merged 28 commits into from
Feb 20, 2020

Conversation

JasonGlazer
Copy link
Contributor

@JasonGlazer JasonGlazer commented Feb 19, 2020

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

@JasonGlazer JasonGlazer added Defect Includes code to repair a defect in EnergyPlus OutputChange Code changes output in such a way that it cannot be merged after IO freeze labels Feb 19, 2020
@JasonGlazer JasonGlazer added this to the EnergyPlus 9.3.0 milestone Feb 19, 2020
@JasonGlazer JasonGlazer self-assigned this Feb 19, 2020
@JasonGlazer
Copy link
Contributor Author

Note: the branch for this pull request was copied from another branch to rectify some GitHub weirdness. The original PR was #7693

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.

Tested defect file and confirmed fix. Ran unit tests locally.
Merged in develop and resolved yet another conflict.
Will wait for CI results before merging - want to confirm that the extra meters are slowing things down.

@JasonGlazer
Copy link
Contributor Author

The same three files are "failing" which are as expected.

@mjwitte
Copy link
Contributor

mjwitte commented Feb 20, 2020

@JasonGlazer Thanks. I'm waiting on a full set of CI results before merging. Primarily to be sure the extra meters aren't causing a slowdown in performance.

@Myoldmopar
Copy link
Member

Very small performance penalty, I'm not sure it's worth investigating at the moment. You can open up a ticket to follow-up on this and try to optimize some code to balance the penalty back out after freeze if you want.

@mjwitte
Copy link
Contributor

mjwitte commented Feb 20, 2020

And it looks like the format checker errors are all from the coil refactor? Nor related to this PR.

@mjwitte mjwitte merged commit e82cd87 into develop Feb 20, 2020
@mjwitte mjwitte deleted the 7556c-ThirdTry-other-end-use branch February 20, 2020 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Defect Includes code to repair a defect in EnergyPlus OutputChange Code changes output in such a way that it cannot be merged after IO freeze
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Other" heating subcategory appears (incorrectly)
8 participants