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

Allow optional EER/EER2 inputs #1897

Merged
merged 11 commits into from
Dec 17, 2024
Merged

Allow optional EER/EER2 inputs #1897

merged 11 commits into from
Dec 17, 2024

Conversation

shorowit
Copy link
Contributor

@shorowit shorowit commented Dec 13, 2024 •
edited
Loading

Pull Request Description

Branches off of #1879. Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits. Addresses #1871.

Checklist

Not all may apply:

  • Schematron validator (EPvalidator.xml) has been updated
  • Sample files have been added/updated (openstudio tasks.rb update_hpxmls)
  • Tests have been added/updated (e.g., HPXMLtoOpenStudio/tests/test*.rb and/or workflow/tests/test*.rb)
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected changes to simulation results of sample files

@shorowit
Allows optional EER or EER2 inputs for central air conditioners/heat …
f0fe87e 
…pumps and mini-splits.
@shorowit
Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio…
32d32c9 
…-HPXML into eer_inputs

# Conflicts:
#	HPXMLtoOpenStudio/measure.xml
#	HPXMLtoOpenStudio/tests/test_defaults.rb
@shorowit shorowit added the enhancement New feature or request label Dec 13, 2024
@shorowit shorowit self-assigned this Dec 13, 2024
@shorowit
Copy link
Contributor Author

shorowit commented Dec 16, 2024 •
edited
Loading

@yzhou601 There are very minor diffs due to rounding (we now round the EER/EER2 because they are exposed in the defaulted in.xml file). The tests are failing because they are failing in the parent branch. Do you want to review and get this merged into your branch?

@shorowit shorowit requested a review from yzhou601 December 16, 2024 17:12
shorowit
shorowit commented Dec 16, 2024
View reviewed changes
Copy link
Contributor Author

@shorowit shorowit left a comment

Choose a reason for hiding this comment

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

Quick code walk-thru

HPXMLtoOpenStudio/resources/defaults.rb Show resolved Hide resolved
HPXMLtoOpenStudio/resources/defaults.rb Show resolved Hide resolved
HPXMLtoOpenStudio/resources/hvac.rb Outdated Show resolved Hide resolved
HPXMLtoOpenStudio/resources/hvac.rb Show resolved Hide resolved
docs/source/workflow_inputs.rst Show resolved Hide resolved
@shorowit shorowit marked this pull request as ready for review December 16, 2024 17:17
@shorowit shorowit mentioned this pull request Dec 16, 2024
Open
12 tasks
yzhou601
yzhou601 approved these changes Dec 16, 2024
View reviewed changes
Copy link
Collaborator

@yzhou601 yzhou601 left a comment

Choose a reason for hiding this comment

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

The changes here look good to me. Some fixme needs to be addressed on parent branch.

@shorowit
Copy link
Contributor Author

@yzhou601 Looks like there is an additional unit test failing -- the parent branch has 5 failures and this branch now has 6.

@shorowit shorowit merged commit 1a574b7 into resnet_heat_pump Dec 17, 2024
6 of 7 checks passed
@shorowit shorowit deleted the eer_inputs branch December 17, 2024 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yzhou601 yzhou601 yzhou601 approved these changes

Assignees

@shorowit shorowit

Labels
enhancement New feature or request
Projects
OpenStudio-HPXML
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shorowit @yzhou601