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

Heat pump detailed performance inputs #1150

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions measures/UpgradeCosts/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>upgrade_costs</name>
<uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
<version_id>d457649e-12c9-4d7b-be6a-d4459d1fc7e6</version_id>
<version_modified>2023-11-01T17:32:43Z</version_modified>
<version_id>fa5f475d-4b0a-4017-9b93-1b80a64a4b64</version_id>
<version_modified>2023-11-06T16:18:11Z</version_modified>
<xml_checksum>9BF1E6AC</xml_checksum>
<class_name>UpgradeCosts</class_name>
<display_name>Upgrade Costs</display_name>
Expand Down Expand Up @@ -117,7 +117,7 @@
<filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw</filename>
<filetype>osw</filetype>
<usage_type>test</usage_type>
<checksum>B0949BD7</checksum>
<checksum>5D7AA5D2</checksum>
</file>
<file>
<filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"heat_pump_heating_capacity_retention_fraction": 0.25,
"heat_pump_heating_capacity_retention_temp": -5,
"heat_pump_cooling_capacity": 60000.0,
"heat_pump_cooling_compressor_type": "single stage",
"heat_pump_cooling_compressor_type": "variable speed",
"heat_pump_cooling_efficiency_type": "SEER",
"heat_pump_cooling_efficiency": 13.0,
"heat_pump_cooling_sensible_heat_fraction": 0.73,
Expand Down
4 changes: 2 additions & 2 deletions resources/hpxml-measures/.github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ PR Author: Check these when they're done. Not all may apply. ~~strikethrough~~ a
PR Reviewer: Verify each has been completed.

- [ ] Schematron validator (`EPvalidator.xml`) has been updated
- [ ] Sample files have been added/updated (via `tasks.rb`)
- [ ] Tests have been added/updated (e.g., `HPXMLtoOpenStudio/tests` and/or `workflow/tests/hpxml_translator_test.rb`)
- [ ] 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
Expand Down
31 changes: 27 additions & 4 deletions resources/hpxml-measures/.github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
name: documentation
path: docs/_build/html/

run-workflow-tests:
run-workflow1-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0-rc1
Expand All @@ -75,7 +75,30 @@ jobs:

- name: Run workflow tests
run: |
bundle exec rake test_workflow
bundle exec rake test_workflow1

- name: Store results
uses: actions/upload-artifact@v3
with:
path: workflow/tests/results
name: results

run-workflow2-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0-rc1
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Install software
run: |
rm -f Gemfile.lock && bundle install

- name: Run workflow tests
run: |
bundle exec rake test_workflow2

- name: Store results
uses: actions/upload-artifact@v3
Expand All @@ -101,7 +124,7 @@ jobs:
compare-results:
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
needs: [run-workflow-tests, run-unit-tests]
needs: [run-workflow1-tests, run-workflow2-tests, run-unit-tests]
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -153,7 +176,7 @@ jobs:

update-results:
runs-on: ubuntu-latest
needs: [run-workflow-tests, run-unit-tests]
needs: [run-workflow1-tests, run-workflow2-tests, run-unit-tests]
steps:
- uses: actions/checkout@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions resources/hpxml-measures/BuildResidentialHPXML/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,7 @@ The rated efficiency value of the cooling system. Ignored for evaporative cooler

**Cooling System: Cooling Compressor Type**

The compressor type of the cooling system. Only applies to central air conditioner. If not provided, the OS-HPXML default is used.
The compressor type of the cooling system. Only applies to central air conditioner and mini-split. If not provided, the OS-HPXML default is used.

- **Name:** ``cooling_system_cooling_compressor_type``
- **Type:** ``Choice``
Expand Down Expand Up @@ -2009,7 +2009,7 @@ The rated cooling efficiency value of the heat pump.

**Heat Pump: Cooling Compressor Type**

The compressor type of the heat pump. Only applies to air-to-air. If not provided, the OS-HPXML default is used.
The compressor type of the heat pump. Only applies to air-to-air and mini-split. If not provided, the OS-HPXML default is used.

- **Name:** ``heat_pump_cooling_compressor_type``
- **Type:** ``Choice``
Expand Down
41 changes: 0 additions & 41 deletions resources/hpxml-measures/BuildResidentialHPXML/README.md.erb

This file was deleted.

8 changes: 4 additions & 4 deletions resources/hpxml-measures/BuildResidentialHPXML/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument

arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('cooling_system_cooling_compressor_type', compressor_type_choices, false)
arg.setDisplayName('Cooling System: Cooling Compressor Type')
arg.setDescription("The compressor type of the cooling system. Only applies to #{HPXML::HVACTypeCentralAirConditioner}. If not provided, the OS-HPXML default is used.")
arg.setDescription("The compressor type of the cooling system. Only applies to #{HPXML::HVACTypeCentralAirConditioner} and #{HPXML::HVACTypeMiniSplitAirConditioner}. If not provided, the OS-HPXML default is used.")
args << arg

arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('cooling_system_cooling_sensible_heat_fraction', false)
Expand Down Expand Up @@ -1246,7 +1246,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument

arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('heat_pump_cooling_compressor_type', compressor_type_choices, false)
arg.setDisplayName('Heat Pump: Cooling Compressor Type')
arg.setDescription("The compressor type of the heat pump. Only applies to #{HPXML::HVACTypeHeatPumpAirToAir}. If not provided, the OS-HPXML default is used.")
arg.setDescription("The compressor type of the heat pump. Only applies to #{HPXML::HVACTypeHeatPumpAirToAir} and #{HPXML::HVACTypeHeatPumpMiniSplit}. If not provided, the OS-HPXML default is used.")
args << arg

arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_cooling_sensible_heat_fraction', false)
Expand Down Expand Up @@ -4891,7 +4891,7 @@ def self.set_cooling_systems(hpxml_bldg, args)
end

if args[:cooling_system_cooling_compressor_type].is_initialized
if cooling_system_type == HPXML::HVACTypeCentralAirConditioner
if [HPXML::HVACTypeCentralAirConditioner, HPXML::HVACTypeMiniSplitAirConditioner].include? cooling_system_type
compressor_type = args[:cooling_system_cooling_compressor_type].get
end
end
Expand Down Expand Up @@ -5030,7 +5030,7 @@ def self.set_heat_pumps(hpxml_bldg, args)
end

if args[:heat_pump_cooling_compressor_type].is_initialized
if [HPXML::HVACTypeHeatPumpAirToAir].include? heat_pump_type
if [HPXML::HVACTypeHeatPumpAirToAir, HPXML::HVACTypeHeatPumpMiniSplit].include? heat_pump_type
compressor_type = args[:heat_pump_cooling_compressor_type].get
end
end
Expand Down
16 changes: 8 additions & 8 deletions resources/hpxml-measures/BuildResidentialHPXML/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>build_residential_hpxml</name>
<uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
<version_id>d77dae30-70b5-4522-90fe-fb58f53cc600</version_id>
<version_modified>2023-11-01T02:43:51Z</version_modified>
<version_id>0e00a4fc-bbc2-4ff7-bfff-6759d8c434c0</version_id>
<version_modified>2023-11-06T15:15:57Z</version_modified>
<xml_checksum>2C38F48B</xml_checksum>
<class_name>BuildResidentialHPXML</class_name>
<display_name>HPXML Builder</display_name>
Expand Down Expand Up @@ -2286,7 +2286,7 @@
<argument>
<name>cooling_system_cooling_compressor_type</name>
<display_name>Cooling System: Cooling Compressor Type</display_name>
<description>The compressor type of the cooling system. Only applies to central air conditioner. If not provided, the OS-HPXML default is used.</description>
<description>The compressor type of the cooling system. Only applies to central air conditioner and mini-split. If not provided, the OS-HPXML default is used.</description>
<type>Choice</type>
<required>false</required>
<model_dependent>false</model_dependent>
Expand Down Expand Up @@ -2550,7 +2550,7 @@
<argument>
<name>heat_pump_cooling_compressor_type</name>
<display_name>Heat Pump: Cooling Compressor Type</display_name>
<description>The compressor type of the heat pump. Only applies to air-to-air. If not provided, the OS-HPXML default is used.</description>
<description>The compressor type of the heat pump. Only applies to air-to-air and mini-split. If not provided, the OS-HPXML default is used.</description>
<type>Choice</type>
<required>false</required>
<model_dependent>false</model_dependent>
Expand Down Expand Up @@ -6751,7 +6751,7 @@
<filename>README.md</filename>
<filetype>md</filetype>
<usage_type>readme</usage_type>
<checksum>28DA31D7</checksum>
<checksum>078C3F36</checksum>
</file>
<file>
<filename>README.md.erb</filename>
Expand All @@ -6768,7 +6768,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>266F1E06</checksum>
<checksum>C9451D13</checksum>
</file>
<file>
<filename>geometry.rb</filename>
Expand All @@ -6777,10 +6777,10 @@
<checksum>84CB0D65</checksum>
</file>
<file>
<filename>build_residential_hpxml_test.rb</filename>
<filename>test_build_residential_hpxml.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>F24631AD</checksum>
<checksum>5018D51F</checksum>
</file>
</files>
</measure>
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@ def _set_measure_argument_values(hpxml_file, args)
args['heating_system_type'] = 'none'
args['cooling_system_type'] = 'none'
args['heat_pump_type'] = HPXML::HVACTypeHeatPumpMiniSplit
args.delete('heat_pump_cooling_compressor_type')
args['heat_pump_heating_efficiency'] = 10.0
args['heat_pump_cooling_efficiency'] = 19.0
args['heat_pump_heating_capacity'] = 48000.0
Expand Down Expand Up @@ -1111,6 +1112,7 @@ def _set_measure_argument_values(hpxml_file, args)
args['heating_system_type'] = 'none'
args['cooling_system_type'] = 'none'
args['heat_pump_type'] = HPXML::HVACTypeHeatPumpMiniSplit
args.delete('heat_pump_cooling_compressor_type')
args['heat_pump_is_ducted'] = true
args['heat_pump_backup_type'] = HPXML::HeatPumpBackupTypeSeparate
args['heating_system_2_type'] = HPXML::HVACTypeFurnace
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>build_residential_schedule_file</name>
<uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
<version_id>2c589b36-e096-4d7b-bccd-3880fb9624fe</version_id>
<version_modified>2023-10-31T23:05:37Z</version_modified>
<version_id>48439a72-2880-4934-b216-38a24bf684b7</version_id>
<version_modified>2023-11-02T14:39:58Z</version_modified>
<xml_checksum>03F02484</xml_checksum>
<class_name>BuildResidentialScheduleFile</class_name>
<display_name>Schedule File Builder</display_name>
Expand Down Expand Up @@ -909,7 +909,7 @@
<checksum>5FC694CF</checksum>
</file>
<file>
<filename>build_residential_schedule_file_test.rb</filename>
<filename>test_build_residential_schedule_file.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>BF7A1992</checksum>
Expand Down
3 changes: 2 additions & 1 deletion resources/hpxml-measures/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ __New Features__
- Always validate the HPXML file before applying defaults and only optionally validate the final HPXML file.
- Battery losses now split between charging and discharging.
- Interior/exterior window shading multipliers are now modeled using the EnergyPlus incident solar multiplier.
- Updates ground temperatures using a correlation based on L. Xing's simplified design model (2014).
- Updates deep ground temperatures (used for modeling ground-source heat pumps) using L. Xing's simplified design model (2014).
- Improvements to HERS & MaxLoad heat pump sizing methodologies.
- Allows `WaterFixture/FlowRate` as an alternative to `LowFlow`; hot water credit is now calculated based on fraction of low flow fixtures.
- Added README.md documentation for all OpenStudio measures.
Expand All @@ -53,6 +53,7 @@ __Bugfixes__
- Fixes ReportSimulationOutput outputs for the Parametric Analysis Tool (PAT).
- Fixes missing radiation exchange between window and sky when an interior/exterior window shading multiplier less than 1 exists.
- Fixes AC/HP cooling bug when applying cooling equipment adjustment.
- Fixes monthly shallow ground temperatures (used primarily in HVAC autosizing) for the southern hemisphere.
- BuildResidentialHPXML measure: Fixes air distribution CFA served when there is not a central system that meets 100% of the load.

## OpenStudio-HPXML v1.6.0
Expand Down
41 changes: 0 additions & 41 deletions resources/hpxml-measures/HPXMLtoOpenStudio/README.md.erb

This file was deleted.

Loading
Loading