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

Chiller Electric Reformulated EIR Plant Component Refactor #7683

Merged
merged 32 commits into from
Jan 23, 2020

Conversation

mitchute
Copy link
Collaborator

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

@mitchute mitchute added the Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring label Jan 15, 2020
@mitchute mitchute added this to the EnergyPlus 9.3.0 milestone Jan 15, 2020
@mitchute mitchute self-assigned this Jan 15, 2020
@mitchute mitchute changed the title Chiller Electric Reformed EIR Refactor Chiller Electric Reformulated EIR Refactor Jan 15, 2020
@mitchute mitchute changed the title Chiller Electric Reformulated EIR Refactor Chiller Electric Reformulated EIR Plant Component Refactor Jan 15, 2020
@Myoldmopar
Copy link
Member

Yep, back to purely text-diffs. Feel free to commit the CondOutletTemp change again now so CI will demonstrate the diffs and we can clearly point the finger at that one variable change. Then we'll all feel better understanding that it's just a bug-fix.

@@ -229,7 +225,7 @@ namespace ChillerReformulatedEIR {
this->CondOutletNodeNum,
this->QCondenser,
this->CondInletTemp,
RefEIRReport(this->myIdx).CondOutletTemp,
this->CondOutletTemp,
Copy link
Member

Choose a reason for hiding this comment

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

It looks like there are a couple things going on that could cause the diff. Is it due to the removal of the RefEIRReport instance? Or the module level variable? Are you able to split out which is the root cause? It could make it even easier to digest the diff and verify we understand the implications. I feel like in the end it's going to be found that the root problem was that a temp was not properly updated on every return path, but I'd like to see if we can nail down the exact line or code path that is causing it. It may even help resolve #7680

@Myoldmopar
Copy link
Member

Deleted the results to re-run Windows on that last commit.

@mitchute
Copy link
Collaborator Author

The most recent commits are comment- or style-only changes. The results from the most recent CI runs should be valid.

@Myoldmopar
Copy link
Member

Thanks @mitchute. I am only like 99.8% confident in the automagic of clang-format, so I'll let CI have a pass over it to be sure. Then I'll merge this in.

@Myoldmopar
Copy link
Member

OK, @nrel-bot is taking forever, but this is good enough for me. The last commit was cleanup only so I really just needed to see one platform. Anyway, merging this in; thanks for all the effort on the plant refactor, @mitchute !

@Myoldmopar Myoldmopar merged commit cc65a0f into develop Jan 23, 2020
@Myoldmopar Myoldmopar deleted the chillerReformEIRrefactor branch January 23, 2020 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants