Skip to content

Commit

Permalink
Merge pull request #1854 from NREL/fix_delete
Browse files Browse the repository at this point in the history
Fix `HeatingPerformanceDataPoint.delete` method
  • Loading branch information
shorowit authored Oct 11, 2024
2 parents afdd388 + 1556a63 commit 73460f9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 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>1424b04d-aae3-4360-9d50-3324d0babb33</version_id>
<version_modified>2024-10-05T18:13:33Z</version_modified>
<version_id>16835647-9a13-44b7-b907-a57abf30a8d4</version_id>
<version_modified>2024-10-11T14:51:15Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -357,7 +357,7 @@
<filename>hpxml.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>278B0E8F</checksum>
<checksum>AF9C179B</checksum>
</file>
<file>
<filename>hpxml_schema/HPXML.xsd</filename>
Expand Down
2 changes: 1 addition & 1 deletion HPXMLtoOpenStudio/resources/hpxml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11132,7 +11132,7 @@ class HeatingPerformanceDataPoint < BaseElement
# @return [nil]
def delete
(@parent_object.heating_systems + @parent_object.heat_pumps).each do |heating_system|
heating_system.cooling_detailed_performance_data.delete(self)
heating_system.heating_detailed_performance_data.delete(self)
end
end

Expand Down
4 changes: 1 addition & 3 deletions docs/source/workflow_inputs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3977,9 +3977,7 @@ Each conventional storage water heater is entered as a ``/HPXML/Building/Buildin
If neither UsageBin nor FirstHourRating provided, UsageBin defaults to "medium".
If FirstHourRating provided and UsageBin not provided, UsageBin is determined based on the FirstHourRating value.
.. [#] RecoveryEfficiency must also be greater than the EnergyFactor (or UniformEnergyFactor).
.. [#] If RecoveryEfficiency not provided, defaults as follows based on a regression analysis of `AHRI certified water heaters <https://www.ahridirectory.org/NewSearch?programId=24&searchTypeId=3>`_:
\- **Electric**: 0.98
.. [#] If RecoveryEfficiency not provided, defaults to 0.98 if the fuel type is electric, otherwise based on a regression analysis of `AHRI certified water heaters <https://www.ahridirectory.org/NewSearch?programId=24&searchTypeId=3>`_:
\- **Non-electric, EnergyFactor < 0.75**: 0.252 * EnergyFactor + 0.608
Expand Down

0 comments on commit 73460f9

Please sign in to comment.