Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Resilience metrics fix issue #8220 #8237

Merged
merged 5 commits into from
Sep 4, 2020
Merged

Conversation

xuanluo113
Copy link
Contributor

@xuanluo113 xuanluo113 commented Aug 26, 2020

Pull request overview

Fixes #8220

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

@xuanluo113 xuanluo113 added the Defect Includes code to repair a defect in EnergyPlus label Aug 26, 2020
@xuanluo113 xuanluo113 added this to the EnergyPlus 9.4.0 milestone Aug 26, 2020
@xuanluo113 xuanluo113 requested a review from Myoldmopar August 26, 2020 17:59
@xuanluo113 xuanluo113 self-assigned this Aug 26, 2020
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.

Code changes appear to cover the issues. I'll verify the built PDF for the include statement change, and CI would verify if there was anything wrong with the double/Real64 changes.

@@ -304,4 +304,6 @@

\input{src/special-modules-reporting/heat-emissions}

\input{src/special-modules-reporting/resilience-metrics}
Copy link
Member

Choose a reason for hiding this comment

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

Yep, that should do it. I'll check out the built version to verify.

std::vector<double> columnMax(columnNum, 0);
std::vector<double> columnMin(columnNum, 0);
std::vector<double> columnSum(columnNum, 0);
std::vector<Real64> columnMax(columnNum, 0);
Copy link
Member

Choose a reason for hiding this comment

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

👍

@Myoldmopar
Copy link
Member

@xuanluo113

There are many LaTeX errors that need to be fixed: https://nrel.github.io/EnergyPlusBuildResults/EnergyPlus-dd66a7411d98e462870b28a940b8722575ef49d1-x86_64-Linux-Ubuntu-18.04-gcc-7.5.html

You are using an unknown macro \degree. I can't recall where we landed on degrees in the LaTeX, and if we have a special macro already available, but it obviously doesn't like this one. I'd just look in the other LaTeX files and see if you can find what we do elsewhere.

@mjwitte
Copy link
Contributor

mjwitte commented Sep 3, 2020

Some info about units may be found here in the wiki. Not crystal clear, but it helps.

@xuanluo113
Copy link
Contributor Author

@Myoldmopar @Myoldmopar
Thanks. A few of the other files use °C/°F as plain text. Others use \si\celsius based on the siunitx package, but that's SI only. So I use \si\celsius and °F here. Hope that works for CI.

@Myoldmopar
Copy link
Member

Confirmed the fixed documentation, your section looks good, including the degree symbols. Thanks for this fix! Merging.

@Myoldmopar Myoldmopar merged commit e11e588 into develop Sep 4, 2020
@Myoldmopar Myoldmopar deleted the resilience-metrics-fix branch September 4, 2020 02:31
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Defect Includes code to repair a defect in EnergyPlus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Follow-up to Resilience Metrics PR
8 participants