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-Elements #8625

Merged
merged 17 commits into from
Mar 17, 2021
Merged

Global-Elements #8625

merged 17 commits into from
Mar 17, 2021

Conversation

jmythms
Copy link
Contributor

@jmythms jmythms commented Mar 16, 2021

Pull request overview

Deglobalizes Elements.cpp, Elements.hpp. Waiting for CI results.

NOTE: ENHANCEMENTS MUST FOLLOW A SUBMISSION PROCESS INCLUDING A FEATURE PROPOSAL AND DESIGN DOCUMENT PRIOR TO SUBMITTING CODE

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

@jmythms jmythms added the Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring label Mar 16, 2021
@jmythms jmythms added this to the EnergyPlus 9.5.0 milestone Mar 16, 2021
@jmythms jmythms self-assigned this Mar 16, 2021
@Myoldmopar
Copy link
Member

@jmythms this may have conflicts after the merge from @mitchute's global branch. I also have a globals branch ready to go in sometime this evening. Are you planning any additional work here or is this ready if CI is happy?

@jmythms
Copy link
Contributor Author

jmythms commented Mar 16, 2021

@Myoldmopar Don't intend to do any more additional work on here. Can go in if CI is happy.

@jmythms
Copy link
Contributor Author

jmythms commented Mar 16, 2021

@Myoldmopar it seems to have some diffs. I will check them out and let you know if it is ready by tonight.

@jmythms
Copy link
Contributor Author

jmythms commented Mar 17, 2021

Everything except the EIO diffs went away after merging develop. Pushing fixed code now.

@Myoldmopar
Copy link
Member

Very nice! OK, I will build this branch locally now and see if I get all clean results and see if we can get this merged in. (I'll do a test build on Windows if I don't wait for CI, @mjwitte)

@jmythms jmythms marked this pull request as ready for review March 17, 2021 03:42
@jmythms
Copy link
Contributor Author

jmythms commented Mar 17, 2021

Does this look ok? I don't think the Windows CI build failure is something I did, please let me know if it is. The regression test failure in the Linux CI is SolarShadingTestGPU and integration failure is HospitalLowEnergy which are the common ones.

@Myoldmopar
Copy link
Member

@jmythms no you didn't cause the Windows failure. It snuck into develop but @mjwitte fixed it up quickly and develop is already clean again. I built this branch on my Windows laptop and it built successfully. Yes, this looks completely clean to me. Let me evaluate the PRs this morning and make sure I don't need to drop any others in first and then this will go in.

@jmythms
Copy link
Contributor Author

jmythms commented Mar 17, 2021

Thank you very much!

@Myoldmopar
Copy link
Member

OK, I pulled develop in and built it once again. Unit tests pass and I ran 100 regressions with zero diffs as expected. I think this is good to go in. Thanks @jmythms . Once again, I'll be ready to resolve conflicts in subsequent branches as we continue this globals/PRMerge frenzy.

@Myoldmopar Myoldmopar merged commit 192452c into develop Mar 17, 2021
@Myoldmopar Myoldmopar deleted the Global-Elements branch March 17, 2021 18:43
@jmythms
Copy link
Contributor Author

jmythms commented Mar 17, 2021

Thank you!

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