Skip to content
Merged
Show file tree
Hide file tree
Changes from 103 commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
100e02a
added test files, create coil object with placeholders
yzhou601 Nov 8, 2024
6c0629b
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Nov 25, 2024
f41d4f1
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Dec 19, 2024
74e100c
fix issues, add heating coil object
yzhou601 Dec 19, 2024
0788320
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Dec 26, 2024
346d8c9
added performance curves for two speed gshp, more assumptions and inp…
yzhou601 Dec 27, 2024
2182a8f
updated performance curves, capacity ratios, cfm/tons based on E+ rat…
yzhou601 Dec 28, 2024
cba4f31
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Jan 9, 2025
4615f89
hvac sizing cleanups for two speed GSHP, added rated cop ratios at ea…
yzhou601 Jan 9, 2025
c883e62
bugfix
yzhou601 Jan 9, 2025
ed642d8
Added temperature max/min values to curves, fixed airflow and water f…
yzhou601 Jan 9, 2025
58e8142
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Jan 9, 2025
7facd88
bugfixes, installation quality program(haven't finished yet)
yzhou601 Jan 10, 2025
b1512e2
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Jan 10, 2025
d1d0cc8
oops, remove debugging statements
yzhou601 Jan 10, 2025
ab22fcc
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Jan 16, 2025
1010b16
fix sizing unit test
yzhou601 Jan 17, 2025
7cabcbc
iq ems
yzhou601 Jan 17, 2025
302d4a8
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Jan 17, 2025
ec12831
fix test validation
yzhou601 Jan 30, 2025
f7b74a3
Latest results.
Jan 30, 2025
00aa08d
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Feb 27, 2025
130e448
Latest results.
Feb 27, 2025
af35ded
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Mar 10, 2025
52aa253
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Mar 11, 2025
35cce9a
change the ghp efficiencies
yzhou601 Mar 11, 2025
05243cd
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 11, 2025
941a059
For two speed, set water flow curves to constant 1.0 values
jmaguire1 Mar 12, 2025
fecc695
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Mar 12, 2025
c8ef094
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 12, 2025
fbf72b3
require compressortype inputs, fix unit tests, add docs and changelog
yzhou601 Mar 12, 2025
77ef6e7
buildHPXML
yzhou601 Mar 12, 2025
e282f37
revert making compressor type required in BuildHPXML,
yzhou601 Mar 12, 2025
9d717ad
add compressor type to one more gshp test file
yzhou601 Mar 12, 2025
8db9551
add var speed system
yzhou601 Mar 12, 2025
80ef26b
one more test file with compressor type
yzhou601 Mar 12, 2025
5fb94c5
Latest results.
Mar 12, 2025
c15161d
remove exclusion of hvac sizing test for var speed system
yzhou601 Mar 12, 2025
ddc61f9
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 12, 2025
7f10ef2
hers unit test
yzhou601 Mar 13, 2025
6c6e2da
Latest results.
Mar 13, 2025
a837c44
update varspeed performance curves, change pump control type to conti…
yzhou601 Mar 14, 2025
cf7afd9
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 14, 2025
f4aa3f9
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Mar 14, 2025
cc43622
Latest results.
Mar 14, 2025
0344237
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Mar 26, 2025
7338de9
first cut to add optional geothermal model type input
yzhou601 Mar 26, 2025
132ff8c
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 26, 2025
62b06d4
iq test file using advanced for two speed system
yzhou601 Mar 26, 2025
f9588c1
fix argument error
yzhou601 Mar 26, 2025
e533401
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Mar 26, 2025
de35c39
Latest results.
Mar 26, 2025
e14dd0a
using net shr for now
yzhou601 Mar 27, 2025
08c871a
pump power bugfix using coil speed level, speed ratio, part load rati…
yzhou601 Mar 27, 2025
2a608ec
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 27, 2025
aaee229
Latest results.
Mar 28, 2025
dce75ee
fix unit issue in hvac sizing, draft pump mfr EMS(not passing yet)
yzhou601 Mar 28, 2025
05282c1
update measures
yzhou601 Mar 28, 2025
deb758b
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 28, 2025
34176f3
Latest results.
Mar 28, 2025
0d8e13d
Use predicted load for pump mfr EMS to partially workaround the tempe…
yzhou601 Mar 28, 2025
4217da2
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Mar 28, 2025
0e19763
fix ci failure?
yzhou601 Mar 31, 2025
fded433
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Mar 31, 2025
a3e59be
Pass hpxml_header through.
joseph-robertson Mar 31, 2025
99a13f7
Latest results.
Mar 31, 2025
613c7e3
fix a typo
yzhou601 Apr 1, 2025
a3d7eb0
Latest results.
Apr 1, 2025
6e5ed41
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Apr 3, 2025
5b7b3aa
replace performance curves and assumptions based on waterfurnace data
yzhou601 Apr 3, 2025
ef4b73c
Latest results.
Apr 4, 2025
56ee01a
update re-normalized fwf curves, add plffplr curves, temporarily remo…
yzhou601 Apr 7, 2025
8301e02
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 7, 2025
155845f
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Apr 7, 2025
bd7f742
fix min_y, max_y
yzhou601 Apr 7, 2025
6ccb063
Latest results.
Apr 7, 2025
1644310
update fplr curve for cooling as well
yzhou601 Apr 8, 2025
e6cce37
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 8, 2025
c060c49
Latest results.
Apr 8, 2025
7b2d4f6
update pump mfr ems
yzhou601 Apr 8, 2025
acb4b24
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 8, 2025
0d91612
Latest results.
Apr 8, 2025
0734e1f
fix EMS vfr/mfr, set limits to fwf curves so it doesn't go below the …
yzhou601 Apr 8, 2025
907f02e
revert the gshp test file efficiencies
yzhou601 Apr 8, 2025
f5bb934
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 8, 2025
38bcadb
unit test revert
yzhou601 Apr 9, 2025
bbeafed
hvac sizing unit test
yzhou601 Apr 9, 2025
775a55a
update measures
yzhou601 Apr 9, 2025
eeb59b8
Latest results.
Apr 9, 2025
ef80cc1
remove 75% adjustment for advanced ghp models
yzhou601 Apr 9, 2025
2a322f1
Latest results.
Apr 9, 2025
1aa9adc
ghp unit tests
yzhou601 Apr 9, 2025
da825c1
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 9, 2025
feb0257
fixmes and todos
yzhou601 Apr 9, 2025
c915c0c
more tests and docs changes
yzhou601 Apr 10, 2025
00ae4b4
Latest results.
Apr 10, 2025
9b2695e
address comments
yzhou601 Apr 11, 2025
7733fcf
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 11, 2025
3b9abd8
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Apr 11, 2025
d32ed72
remove print statement
yzhou601 Apr 11, 2025
6b80019
update plr curves for var speed and simple models
yzhou601 Apr 17, 2025
eca9abb
fix curve type
yzhou601 Apr 17, 2025
b14485c
Latest results.
Apr 17, 2025
b33da16
Update docs/source/workflow_inputs.rst
yzhou601 Apr 21, 2025
fb59140
Update Changelog.md
yzhou601 Apr 21, 2025
1485a60
Address comments
yzhou601 Apr 21, 2025
ae37284
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 21, 2025
b09b416
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Apr 21, 2025
682c4f5
clean up hvac sizing, revert plr curve for simple model and advanced …
yzhou601 Apr 24, 2025
8cf2c44
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Apr 24, 2025
db6c22d
Latest results.
Apr 24, 2025
3f6adad
Super tiny cleanup of a few things. [ci skip]
shorowit Apr 24, 2025
a75b331
address comments
yzhou601 Apr 25, 2025
749b76e
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 25, 2025
bb50cf7
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Apr 25, 2025
135100a
Latest results.
Apr 25, 2025
a4994f0
intermittent pump for all
yzhou601 Apr 25, 2025
113cb84
Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/Ope…
yzhou601 Apr 25, 2025
22917ab
rename simple to standard, fix unit test
yzhou601 Apr 25, 2025
70b5f0c
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 Apr 25, 2025
279ba39
Just a few minor things.
shorowit Apr 25, 2025
263e4c7
Couldn't help myself, just a little code simplification.
shorowit Apr 25, 2025
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
17 changes: 15 additions & 2 deletions BuildResidentialHPXML/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,19 @@ Research feature to select the type of defrost model. Use standard for default E

<br/>

**Simulation Control: Geothermal Model Type**

Research feature to select the type of geothermal model. Use simple for simple E+ geothermal coil modeling. Use advanced for an improved model that better accounts for coil staging; using advanced may impact simulation runtime. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#hpxml-simulation-control'>HPXML Simulation Control</a>) is used.

- **Name:** ``simulation_control_geothermal_model_type``
- **Type:** ``Choice``

- **Required:** ``false``

- **Choices:** `simple`, `advanced`

<br/>

**Simulation Control: HVAC On-Off Thermostat Deadband**

Research feature to model on-off thermostat deadband and start-up degradation for single or two speed AC/ASHP systems, and realistic time-based staging for two speed AC/ASHP systems. Currently only supported with 1 min timestep.
Expand Down Expand Up @@ -2048,7 +2061,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 and mini-split. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#central-air-conditioner'>Central Air Conditioner</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#mini-split-air-conditioner'>Mini-Split Air Conditioner</a>) is used.
The compressor type of the cooling system. Only applies to central air conditioner and mini-split.

- **Name:** ``cooling_system_cooling_compressor_type``
- **Type:** ``Choice``
Expand Down Expand Up @@ -2287,7 +2300,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 and mini-split. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#air-to-air-heat-pump'>Air-to-Air Heat Pump</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#mini-split-heat-pump'>Mini-Split Heat Pump</a>) is used.
The compressor type of the heat pump. Only applies to air-to-air, mini-split and ground-to-air.

- **Name:** ``heat_pump_cooling_compressor_type``
- **Type:** ``Choice``
Expand Down
21 changes: 18 additions & 3 deletions BuildResidentialHPXML/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg.setDescription("Research feature to select the type of defrost model. Use #{HPXML::AdvancedResearchDefrostModelTypeStandard} for default E+ defrost setting. Use #{HPXML::AdvancedResearchDefrostModelTypeAdvanced} for an improved model that better accounts for load and energy use during defrost; using #{HPXML::AdvancedResearchDefrostModelTypeAdvanced} may impact simulation runtime. If not provided, the OS-HPXML default (see <a href='#{docs_base_url}#hpxml-simulation-control'>HPXML Simulation Control</a>) is used.")
args << arg

geothermal_model_type_choices = OpenStudio::StringVector.new
geothermal_model_type_choices << HPXML::AdvancedResearchGeothermalModelTypeSimple
geothermal_model_type_choices << HPXML::AdvancedResearchGeothermalModelTypeAdvanced
arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('simulation_control_geothermal_model_type', geothermal_model_type_choices, false)
arg.setDisplayName('Simulation Control: Geothermal Model Type')
arg.setDescription("Research feature to select the type of geothermal model. Use #{HPXML::AdvancedResearchGeothermalModelTypeSimple} for simple E+ geothermal coil modeling. Use #{HPXML::AdvancedResearchGeothermalModelTypeAdvanced} for an improved model that better accounts for coil staging; using #{HPXML::AdvancedResearchGeothermalModelTypeAdvanced} may impact simulation runtime. If not provided, the OS-HPXML default (see <a href='#{docs_base_url}#hpxml-simulation-control'>HPXML Simulation Control</a>) is used.")
args << arg

arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('simulation_control_onoff_thermostat_deadband', false)
arg.setDisplayName('Simulation Control: HVAC On-Off Thermostat Deadband')
arg.setDescription('Research feature to model on-off thermostat deadband and start-up degradation for single or two speed AC/ASHP systems, and realistic time-based staging for two speed AC/ASHP systems. Currently only supported with 1 min timestep.')
Expand Down Expand Up @@ -1278,7 +1286,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} and #{HPXML::HVACTypeMiniSplitAirConditioner}. If not provided, the OS-HPXML default (see <a href='#{docs_base_url}#central-air-conditioner'>Central Air Conditioner</a>, <a href='#{docs_base_url}#mini-split-air-conditioner'>Mini-Split Air Conditioner</a>) is used.")
arg.setDescription("The compressor type of the cooling system. Only applies to #{HPXML::HVACTypeCentralAirConditioner} and #{HPXML::HVACTypeMiniSplitAirConditioner}.")
args << arg

arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('cooling_system_cooling_sensible_heat_fraction', false)
Expand Down Expand Up @@ -1423,7 +1431,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} and #{HPXML::HVACTypeHeatPumpMiniSplit}. If not provided, the OS-HPXML default (see <a href='#{docs_base_url}#air-to-air-heat-pump'>Air-to-Air Heat Pump</a>, <a href='#{docs_base_url}#mini-split-heat-pump'>Mini-Split Heat Pump</a>) is used.")
arg.setDescription("The compressor type of the heat pump. Only applies to #{HPXML::HVACTypeHeatPumpAirToAir}, #{HPXML::HVACTypeHeatPumpMiniSplit} and #{HPXML::HVACTypeHeatPumpGroundToAir}.")
args << arg

arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_cooling_sensible_heat_fraction', false)
Expand Down Expand Up @@ -4306,6 +4314,13 @@ def self.set_header(runner, hpxml, args)
hpxml.header.defrost_model_type = args[:simulation_control_defrost_model_type]
end

if not args[:simulation_control_geothermal_model_type].nil?
if (not hpxml.header.geothermal_model_type.nil?) && (hpxml.header.geothermal_model_type != args[:simulation_control_geothermal_model_type])
errors << "'Simulation Control: Geothermal Model Type' cannot vary across dwelling units."
end
hpxml.header.geothermal_model_type = args[:simulation_control_geothermal_model_type]
end

if not args[:simulation_control_onoff_thermostat_deadband].nil?
if (not hpxml.header.hvac_onoff_thermostat_deadband.nil?) && (hpxml.header.hvac_onoff_thermostat_deadband != args[:simulation_control_onoff_thermostat_deadband])
errors << "'Simulation Control: HVAC On-Off Thermostat Deadband' cannot vary across dwelling units."
Expand Down Expand Up @@ -5838,7 +5853,7 @@ def self.set_heat_pumps(hpxml_bldg, args)
end
end

if [HPXML::HVACTypeHeatPumpAirToAir, HPXML::HVACTypeHeatPumpMiniSplit].include? heat_pump_type
if [HPXML::HVACTypeHeatPumpAirToAir, HPXML::HVACTypeHeatPumpMiniSplit, HPXML::HVACTypeHeatPumpGroundToAir].include? heat_pump_type
compressor_type = args[:heat_pump_cooling_compressor_type]
end

Expand Down
30 changes: 24 additions & 6 deletions 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>a7c704f4-4cc1-4365-8496-fc3fb3c37566</version_id>
<version_modified>2025-03-28T22:12:04Z</version_modified>
<version_id>73e45dca-72a8-4377-ad9e-df7023eb81a7</version_id>
<version_modified>2025-03-31T18:58:36Z</version_modified>
<xml_checksum>2C38F48B</xml_checksum>
<class_name>BuildResidentialHPXML</class_name>
<display_name>HPXML Builder</display_name>
Expand Down Expand Up @@ -171,6 +171,24 @@
</choice>
</choices>
</argument>
<argument>
<name>simulation_control_geothermal_model_type</name>
<display_name>Simulation Control: Geothermal Model Type</display_name>
<description>Research feature to select the type of geothermal model. Use simple for simple E+ geothermal coil modeling. Use advanced for an improved model that better accounts for coil staging; using advanced may impact simulation runtime. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#hpxml-simulation-control'&gt;HPXML Simulation Control&lt;/a&gt;) is used.</description>
<type>Choice</type>
<required>false</required>
<model_dependent>false</model_dependent>
<choices>
<choice>
<value>simple</value>
<display_name>simple</display_name>
</choice>
<choice>
<value>advanced</value>
<display_name>advanced</display_name>
</choice>
</choices>
</argument>
<argument>
<name>simulation_control_onoff_thermostat_deadband</name>
<display_name>Simulation Control: HVAC On-Off Thermostat Deadband</display_name>
Expand Down Expand Up @@ -2633,7 +2651,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 and mini-split. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#central-air-conditioner'&gt;Central Air Conditioner&lt;/a&gt;, &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#mini-split-air-conditioner'&gt;Mini-Split Air Conditioner&lt;/a&gt;) is used.</description>
<description>The compressor type of the cooling system. Only applies to central air conditioner and mini-split.</description>
<type>Choice</type>
<required>false</required>
<model_dependent>false</model_dependent>
Expand Down Expand Up @@ -2914,7 +2932,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 and mini-split. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#air-to-air-heat-pump'&gt;Air-to-Air Heat Pump&lt;/a&gt;, &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.10.0/workflow_inputs.html#mini-split-heat-pump'&gt;Mini-Split Heat Pump&lt;/a&gt;) is used.</description>
<description>The compressor type of the heat pump. Only applies to air-to-air, mini-split and ground-to-air.</description>
<type>Choice</type>
<required>false</required>
<model_dependent>false</model_dependent>
Expand Down Expand Up @@ -7664,7 +7682,7 @@
<filename>README.md</filename>
<filetype>md</filetype>
<usage_type>readme</usage_type>
<checksum>F4222EA2</checksum>
<checksum>402FE34E</checksum>
</file>
<file>
<filename>README.md.erb</filename>
Expand All @@ -7681,7 +7699,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>9D0AE8A8</checksum>
<checksum>942CB7D2</checksum>
</file>
<file>
<filename>constants.rb</filename>
Expand Down
4 changes: 3 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
__New Features__
- HVAC modeling updates:
- **Breaking Change**: `CompressorType` required for central and mini-split air conditioners and heat pumps.
- Allows modeling two-speed and variable-speed geothermal heat pumps with `CompressorType` to be "two stage" or "variable speed".
- Optional input `h:SimulationControl/AdvancedResearchFeatures/GeothermalModelType` to choose the "simple" or "advanced" geothermal heat pump models, "advanced" geothermal model uses E+ variable speed coils.
- Electric vehicle enhancements:
- Allows detailed modeling of electric vehicles (batteries and charging/discharging) using `Vehicles` as an alternative to the simple EV charging `PlugLoad`.
- Adds EV driving unmet hours output.
Expand Down Expand Up @@ -183,7 +185,7 @@ __New Features__
- Adds new optional arguments for registering (with the OpenStudio runner) annual or monthly utility bills.
- Advanced research features:
- **Breaking change**: Replaces `SimulationControl/TemperatureCapacitanceMultiplier` with `SimulationControl/AdvancedResearchFeatures/TemperatureCapacitanceMultiplier`.
- Allows an optional boolean input `SimulationControl/AdvancedResearchFeatures/DefrostModelType` for heat pump advanced defrost model.
- Allows an optional input `SimulationControl/AdvancedResearchFeatures/DefrostModelType` for heat pump advanced defrost model.
- Adds maximum power ratio detailed schedule for variable-speed HVAC systems to model shedding controls per [AHRI 1380](https://www.ahrinet.org/search-standards/ahri-1380-i-p-demand-response-through-variable-capacity-hvac-systems-residential-and-small).

__Bugfixes__
Expand Down
38 changes: 25 additions & 13 deletions HPXMLtoOpenStudio/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>hpxm_lto_openstudio</name>
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
<version_id>3fee514e-82e1-4c56-a9b8-165b08a34988</version_id>
<version_modified>2025-04-11T17:17:29Z</version_modified>
<version_id>3e0544f9-14dc-4d80-90e9-38540c8da440</version_id>
<version_modified>2025-04-17T21:22:14Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -333,13 +333,13 @@
<filename>defaults.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>63F848DF</checksum>
<checksum>E8DE7FF4</checksum>
</file>
<file>
<filename>energyplus.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>071927F3</checksum>
<checksum>B85422F4</checksum>
</file>
<file>
<filename>generator.rb</filename>
Expand All @@ -363,7 +363,7 @@
<filename>hpxml.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>12014DE1</checksum>
<checksum>62B7E3B6</checksum>
</file>
<file>
<filename>hpxml_schema/HPXML.xsd</filename>
Expand All @@ -381,7 +381,7 @@
<filename>hpxml_schematron/EPvalidator.xml</filename>
<filetype>xml</filetype>
<usage_type>resource</usage_type>
<checksum>3749B48F</checksum>
<checksum>72AADB6A</checksum>
</file>
<file>
<filename>hpxml_schematron/iso-schematron.xsd</filename>
Expand All @@ -393,13 +393,25 @@
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>FB9ACEF1</checksum>
<checksum>1FCCD669</checksum>
</file>
<file>
<filename>hvac.rb.bak</filename>
<filetype>bak</filetype>
<usage_type>resource</usage_type>
<checksum>E97906D0</checksum>
</file>
<file>
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>A079BB8E</checksum>
<checksum>AED29027</checksum>
</file>
<file>
<filename>hvac_sizing.rb.bak</filename>
<filetype>bak</filetype>
<usage_type>resource</usage_type>
<checksum>5C5B18CE</checksum>
</file>
<file>
<filename>internal_gains.rb</filename>
Expand Down Expand Up @@ -453,7 +465,7 @@
<filename>model.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>F0F4648E</checksum>
<checksum>A57C8FAE</checksum>
</file>
<file>
<filename>output.rb</filename>
Expand Down Expand Up @@ -735,13 +747,13 @@
<filename>test_hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>E30F0328</checksum>
<checksum>C57D23EB</checksum>
</file>
<file>
<filename>test_hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>DF5913B9</checksum>
<checksum>9FFCC607</checksum>
</file>
<file>
<filename>test_lighting.rb</filename>
Expand Down Expand Up @@ -783,7 +795,7 @@
<filename>test_validation.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>F55AEAC1</checksum>
<checksum>0C825287</checksum>
</file>
<file>
<filename>test_vehicle.rb</filename>
Expand All @@ -795,7 +807,7 @@
<filename>test_water_heater.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>60CD4A1F</checksum>
<checksum>906475AB</checksum>
</file>
<file>
<filename>test_weather.rb</filename>
Expand Down
Loading