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

Global DataHeatBalance #8534

Merged
merged 39 commits into from
Mar 2, 2021

Conversation

mitchute
Copy link
Collaborator

Pull request overview

  • Moves DataHeatBalance to state.

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 Feb 12, 2021
@mitchute mitchute added this to the EnergyPlus 9.5.0 milestone Feb 12, 2021
@mitchute mitchute self-assigned this Feb 12, 2021
@mitchute
Copy link
Collaborator Author

@Myoldmopar eccef7b is probably worth a review for this PR.

Some of the arrays in the ctor for ConstructionProps (

BlAbsDiffBack(DataSurfaces::MaxSlatAngs, DataHeatBalance::MaxSolidWinLayers, 0.0), AbsDiffShade(0.0),
) were dimensioned based on DataHeatBalance::MaxSolidWinLayers. However, now that both Construct (which is the array of ConstructionProps) and MaxSolidWinLayers are both parts of the state of EnergyPlus, there was no way continue with these arrays in the ctor. I've moved them out into a standalone member method for ConstructionProps and added a call everywhere these arrays needed to be setup.

@mitchute
Copy link
Collaborator Author

@Myoldmopar assuming CI says so, this is ready. We could probably reduce a decent number of line changes here if we make a pass through replacing state.dataHeatBal->Blah with auto &Blah(state.dataHeatBal->Blah) where it makes sense. We should probably make a pass through the code anyway and make these replacements for the rest of the globals that have already been merged, but that can happen later.

@mitchute
Copy link
Collaborator Author

And I spoke too soon, there are merge conflicts again. I'm not in a hurry on this, so I'll just wait on this until other PRs have merged then I'll deal with those along with whatever cleanups you want to see.

@mitchute mitchute mentioned this pull request Feb 23, 2021
20 tasks
@Myoldmopar
Copy link
Member

OK, built locally and ran a few regressions. Although I had a stray table-only diff in one case, I believe it to be an anomaly. Dozens of other files sampled showed no diffs at all. I'm going to merge this.

This will likely cause some conflicts in branches, but that's OK. We are prepared to help resolve conflicts as needed during this period.

Thanks for bearing with us on this @mitchute. I think it was worth a few extra conflict-resolution commits in this branch to get the number of open PRs way down and reduce the widespread conflicts.

@Myoldmopar Myoldmopar merged commit c9fa4f0 into NREL:develop Mar 2, 2021
@Myoldmopar Myoldmopar deleted the global-state-dataHeatBalance branch March 2, 2021 21:43
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.

8 participants