Skip to content

Commit

Permalink
Merge commit '05ef53ee96569107803416ec7f23210d4486ae4a' into ansi_301…
Browse files Browse the repository at this point in the history
…_2022_airflow
  • Loading branch information
shorowit committed Mar 8, 2024
2 parents 6de7432 + 05ef53e commit 11420ba
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
8 changes: 4 additions & 4 deletions hpxml-measures/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>cee6e318-93c8-4149-8e52-91941db9e34d</version_id>
<version_modified>2024-03-08T15:59:29Z</version_modified>
<version_id>22c911f3-d05a-43bb-808d-95fb95f4746d</version_id>
<version_modified>2024-03-08T16:29:32Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -310,7 +310,7 @@
<filename>hpxml_defaults.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>B2ADBD5F</checksum>
<checksum>628A6E9C</checksum>
</file>
<file>
<filename>hpxml_schema/HPXML.xsd</filename>
Expand Down Expand Up @@ -598,7 +598,7 @@
<filename>test_defaults.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>6AB95336</checksum>
<checksum>5963F79E</checksum>
</file>
<file>
<filename>test_enclosure.rb</filename>
Expand Down
3 changes: 2 additions & 1 deletion hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,8 @@ def self.apply_building_occupancy(hpxml_bldg, schedules_file)
def self.apply_building_construction(hpxml_bldg, cfa, nbeds)
cond_crawl_volume = hpxml_bldg.inferred_conditioned_crawlspace_volume()
if hpxml_bldg.building_construction.average_ceiling_height.nil?
hpxml_bldg.building_construction.average_ceiling_height = 8.0
# ASHRAE 62.2 default for average floor to ceiling height
hpxml_bldg.building_construction.average_ceiling_height = 8.2
hpxml_bldg.building_construction.average_ceiling_height_isdefaulted = true
end
if hpxml_bldg.building_construction.conditioned_building_volume.nil?
Expand Down
6 changes: 3 additions & 3 deletions hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ def test_building_construction
hpxml_bldg.building_construction.number_of_units = 3
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
_test_default_building_construction_values(default_hpxml_bldg, 20000, 7, 4, 3)
_test_default_building_construction_values(default_hpxml_bldg, 20000, 7.0, 4, 3)

# Test defaults
hpxml_bldg.building_construction.conditioned_building_volume = nil
Expand All @@ -446,14 +446,14 @@ def test_building_construction
hpxml_bldg.building_construction.number_of_units = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
_test_default_building_construction_values(default_hpxml_bldg, 21600, 8, 2, 1)
_test_default_building_construction_values(default_hpxml_bldg, 22140, 8.2, 2, 1)

# Test defaults w/ conditioned crawlspace
hpxml, hpxml_bldg = _create_hpxml('base-foundation-conditioned-crawlspace.xml')
hpxml_bldg.building_construction.conditioned_building_volume = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
_test_default_building_construction_values(default_hpxml_bldg, 16200, 8, 2, 1)
_test_default_building_construction_values(default_hpxml_bldg, 16200, 8.0, 2, 1)
end

def test_climate_and_risk_zones
Expand Down
2 changes: 1 addition & 1 deletion hpxml-measures/docs/source/workflow_inputs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ Building construction is entered in ``/HPXML/Building/BuildingDetails/BuildingSu
``NumberofUnits`` integer >= 1 No 1 Unit multiplier [#]_
``NumberofConditionedFloors`` double > 0 Yes Number of conditioned floors (including a conditioned basement; excluding a conditioned crawlspace)
``NumberofConditionedFloorsAboveGrade`` double > 0, <= NumberofConditionedFloors Yes Number of conditioned floors above grade (including a walkout basement)
``AverageCeilingHeight`` double ft > 0 No 8.0 Ceiling height within conditioned space
``AverageCeilingHeight`` double ft > 0 No 8.2 Floor to ceiling height within conditioned space
``NumberofBedrooms`` integer >= 0 Yes Number of bedrooms
``NumberofBathrooms`` integer > 0 No See [#]_ Number of bathrooms
``ConditionedFloorArea`` double ft2 > 0 Yes Floor area within conditioned space boundary (excluding conditioned crawlspace floor area)
Expand Down

0 comments on commit 11420ba

Please sign in to comment.