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

Refrigeration Components Plant Component Refactor #7662

Merged
merged 31 commits into from
Jan 8, 2020
Merged

Refrigeration Components Plant Component Refactor #7662

merged 31 commits into from
Jan 8, 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 Dec 31, 2019
@mitchute mitchute added this to the EnergyPlus Future milestone Dec 31, 2019
@mitchute mitchute self-assigned this Dec 31, 2019
mitchute added 19 commits January 2, 2020 08:33
@mitchute
step 4 - partial cleanup statics
8492ff3
@mitchute
step 4 - partial cleanup statics
3a8155e
@mitchute
step 4 - partial cleanup statics
4f7e33a
@mitchute
step 4 - partial cleanup statics
f0cda49
@mitchute
step 4 - partial cleanup statics
78e65e7
@mitchute
step 4 - partial cleanup statics
b675d81
@mitchute
step 4 - partial cleanup statics
9b2b8d4
@mitchute
adding clear_state, cleaning up some mod vars, cleaning up unused ext…
0848a99 
…erns in header
@mitchute
step 9 - cleanup local vars. This should be most of them, but there's…
c1243b7 
… probably a few missed
@mitchute
step 10 - partial functions to members
8fb0fe8
@mitchute
step 10 - partial functions to members
ce33c40
@mitchute
step 10 - partial functions to members
b5bae62
@mitchute
step 4 - partial funcitons to members
38064d7
@mitchute
step 4 - partial funcitons to members
8b18cce
@mitchute
minor cleanups
09d0bb8
@mitchute
breakup sim funcion by type before inheriting PlantComponent
00fda90
@mitchute
repeated if-else logic cleanups
3e36352
@mitchute
step 12 - inherit PlantComp for refrig rack
e6e5ba6
@mitchute
cleanup local mirrored vars
e3ea7ef
@mitchute
Copy link
Collaborator Author

mitchute commented Jan 7, 2020

@Myoldmopar I addressed the bug causing the single-file failure from the work yesterday. If CI comes back OK, I believe this one is ready.

@Myoldmopar
Copy link
Member

CI is very happy with this, I'll review now.

Myoldmopar
Myoldmopar approved these changes Jan 8, 2020
View reviewed changes
Copy link
Member

@Myoldmopar Myoldmopar left a comment

Choose a reason for hiding this comment

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

No problems here, this is good stuff.

src/EnergyPlus/RefrigeratedCase.hh

namespace EnergyPlus {

namespace RefrigeratedCase {

// Using/Aliasing
Copy link
Member

Choose a reason for hiding this comment

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

So these were all in the header but none were needed. That is awesome. Good cleanup!

src/EnergyPlus/PlantLoopEquip.cc
if (InitLoopEquip) {
sim_component.CompNum = EquipNum;
}
sim_component.compPtr->simulate(sim_component_location, FirstHVACIteration, CurLoad, RunFlag);
Copy link
Member

Choose a reason for hiding this comment

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

Makes good sense 😉

src/EnergyPlus/Plant/PlantManager.cc
@@ -1433,10 +1434,12 @@ namespace EnergyPlus {
this_comp.TypeOf_Num = TypeOf_RefrigSystemWaterCondenser;
this_comp.GeneralEquipType = GenEquipTypes_Refrigeration;
this_comp.CurOpSchemeType = DemandOpSchemeType;
this_comp.compPtr = RefrigeratedCase::RefrigCondenserData::factory(CompNames(CompNum));
Copy link
Member

Choose a reason for hiding this comment

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

Standard, good.

tst/EnergyPlus/unit/Fixtures/EnergyPlusFixture.cc
@@ -444,6 +445,7 @@ void EnergyPlusFixture::clear_all_states()
Pumps::clear_state();
PurchasedAirManager::clear_state();
PVWatts::clear_state();
RefrigeratedCase::clear_state();
Copy link
Member

Choose a reason for hiding this comment

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

And another clear_state; great!

@Myoldmopar
Copy link
Member

Thanks @mitchute; merging this now.

@Myoldmopar Myoldmopar merged commit 5d48105 into develop Jan 8, 2020
@Myoldmopar Myoldmopar deleted the refrigCaseRefactor branch January 8, 2020 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Myoldmopar Myoldmopar Myoldmopar approved these changes

Assignees

@mitchute mitchute

Labels
Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring
Projects
None yet
Milestone
EnergyPlus 9.3.0
Development

Successfully merging this pull request may close these issues.
7 participants
@mitchute @Myoldmopar @nrel-bot @nrel-bot-2 @nrel-bot-3 @nrel-bot-2b @nrel-bot-2c