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

HVAC Secondary Heating, try 2 #1093

Merged
merged 24 commits into from
Jul 17, 2023
Merged

HVAC Secondary Heating, try 2 #1093

merged 24 commits into from
Jul 17, 2023

Conversation

joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented Jun 26, 2023

Pull Request Description

Companion PR: https://github.com/NREL/resstock-estimation/pull/375

Support options sampled from HVAC Secondary Heating xxx. Update the ResStockArguments measure to adjust the primary system's fraction of heat load served such that the sum of fractions does not exceed 1.0, for the following:

  • when heating_system_type!=none
  • when heat_pump_type!=none

This PR also pulls in the develop branch of OS-HPXML containing related fixes in NREL/OpenStudio-HPXML#1414.

Checklist

Not all may apply:

  • Tests (and test files) have been updated
  • Documentation has been updated
    • If related to resstock-estimation, checklist includes data dictionary, source report, options_lookup
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected regression test changes on CI (checked comparison artifacts)

joseph-robertson and others added 10 commits June 16, 2023 09:15
…11036

12333b11036 Merge pull request #1414 from NREL/heating_system_2
0ac7de4c9fc Re-enable warning. [ci skip]
59035cc3392 Merge pull request #1415 from NREL/v170
e6eab0a1c1a Prep for v1.7.0
f798647d40f Latest results.
fb2fd345e3d Fix bugs related to hvac distribution assignment.
69937ba9750 Add sample file for shared boiler with secondary fireplace.
2cff2ae3ee6 Merge pull request #1405 from NREL/foundation_hpxmls
a2d07f76b2d Latest results.
6c6279b2450 Cleanup some HPXML files with respect to foundation inputs.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 12333b1103684714d91915631112633abf2f2f32
@joseph-robertson joseph-robertson self-assigned this Jun 26, 2023
@joseph-robertson joseph-robertson added this to the ResStock v3.2.0 milestone Jun 27, 2023
@joseph-robertson joseph-robertson marked this pull request as ready for review June 28, 2023 00:25
Copy link
Contributor

@rajeee rajeee left a comment

Choose a reason for hiding this comment

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

Looks good!

@joseph-robertson joseph-robertson merged commit 30044a0 into develop Jul 17, 2023
@joseph-robertson joseph-robertson deleted the hvac-secondary2 branch July 17, 2023 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants