Skip to content

Commit

Permalink
Backport two bugfixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
shorowit committed Aug 10, 2023
1 parent f0e24f6 commit df2d94e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
6 changes: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## OpenStudio-ERI v1.6.1

__Bugfixes__
- Fixes ZERH Single Family v2 mechanical ventilation fan efficiency to use ASRE instead of SRE.
- Fixes error if describing a wall with `WallType/StructuralInsulatedPanel`.

## OpenStudio-ERI v1.6.0

__New Features__
Expand Down
3 changes: 2 additions & 1 deletion rulesets/data/zerh_sf_2_0_lookup.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,6 @@ infil_air_leakage_ach50 single-family attached 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
infil_air_leakage_ach50 apartment unit 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
infil_air_leakage_cfm50_per_sqft
mechanical_ventilation_fan_type supply only supply only supply only supply only supply only supply only supply only supply only supply only supply only supply only heat recovery ventilator heat recovery ventilator heat recovery ventilator heat recovery ventilator heat recovery ventilator heat recovery ventilator heat recovery ventilator heat recovery ventilator heat recovery ventilator
mechanical_ventilation_fan_sre 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65
mechanical_ventilation_fan_sre
mechanical_ventilation_fan_asre 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65
mechanical_ventilation_fan_cfm_per_w 2.9 2.9 2.9 2.9 2.9 2.9 2.9 2.9 2.9 2.9 2.9 1.2 1.2 1.2 1.2 1.2 1.2 1.2 1.2 1.2
2 changes: 1 addition & 1 deletion rulesets/resources/301validator.xml
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ Temporarily disabled until RESNET allows this.
<sch:assert role='ERROR' test='h:ExteriorAdjacentTo[text()="outside" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage" or text()="other housing unit" or text()="other heated space" or text()="other multifamily buffer space" or text()="other non-freezing space"] or not(h:ExteriorAdjacentTo)'>Expected ExteriorAdjacentTo to be 'outside' or 'attic - vented' or 'attic - unvented' or 'basement - conditioned' or 'basement - unconditioned' or 'crawlspace - vented' or 'crawlspace - unvented' or 'garage' or 'other housing unit' or 'other heated space' or 'other multifamily buffer space' or 'other non-freezing space'</sch:assert>
<sch:assert role='ERROR' test='count(h:InteriorAdjacentTo) = 1'>Expected 1 element(s) for xpath: InteriorAdjacentTo</sch:assert>
<sch:assert role='ERROR' test='h:InteriorAdjacentTo[text()="living space" or text()="attic - vented" or text()="attic - unvented" or text()="basement - conditioned" or text()="basement - unconditioned" or text()="crawlspace - vented" or text()="crawlspace - unvented" or text()="garage"] or not(h:InteriorAdjacentTo)'>Expected InteriorAdjacentTo to be 'living space' or 'attic - vented' or 'attic - unvented' or 'basement - conditioned' or 'basement - unconditioned' or 'crawlspace - vented' or 'crawlspace - unvented' or 'garage'</sch:assert>
<sch:assert role='ERROR' test='count(h:WallType[h:WoodStud | h:DoubleWoodStud | h:ConcreteMasonryUnit | h:StructurallyInsulatedPanel | h:InsulatedConcreteForms | h:SteelFrame | h:SolidConcrete | h:StructuralBrick | h:StrawBale | h:Stone | h:LogWall | h:Adobe]) = 1'>Expected 1 element(s) for xpath: WallType[WoodStud | DoubleWoodStud | ConcreteMasonryUnit | StructurallyInsulatedPanel | InsulatedConcreteForms | SteelFrame | SolidConcrete | StructuralBrick | StrawBale | Stone | LogWall | Adobe]</sch:assert>
<sch:assert role='ERROR' test='count(h:WallType[h:WoodStud | h:DoubleWoodStud | h:ConcreteMasonryUnit | h:StructuralInsulatedPanel | h:InsulatedConcreteForms | h:SteelFrame | h:SolidConcrete | h:StructuralBrick | h:StrawBale | h:Stone | h:LogWall | h:Adobe]) = 1'>Expected 1 element(s) for xpath: WallType[WoodStud | DoubleWoodStud | ConcreteMasonryUnit | StructuralInsulatedPanel | InsulatedConcreteForms | SteelFrame | SolidConcrete | StructuralBrick | StrawBale | Stone | LogWall | Adobe]</sch:assert>
<sch:assert role='ERROR' test='count(h:Area) = 1'>Expected 1 element(s) for xpath: Area</sch:assert>
<sch:assert role='ERROR' test='count(h:Azimuth) &lt;= 1'>Expected 0 or 1 element(s) for xpath: Azimuth</sch:assert>
<sch:assert role='ERROR' test='count(h:SolarAbsorptance) = 1'>Expected 1 element(s) for xpath: SolarAbsorptance</sch:assert>
Expand Down
2 changes: 2 additions & 0 deletions rulesets/resources/ES_ZERHruleset.rb
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,7 @@ def self.set_systems_mechanical_ventilation_reference(new_hpxml)
fan_type = lookup_reference_value('mechanical_ventilation_fan_type')
fan_cfm_per_w = lookup_reference_value('mechanical_ventilation_fan_cfm_per_w')
fan_sre = lookup_reference_value('mechanical_ventilation_fan_sre')
fan_asre = lookup_reference_value('mechanical_ventilation_fan_asre')
fan_power_w = fan_cfm / fan_cfm_per_w

new_hpxml.ventilation_fans.add(id: 'TargetVentilationFan',
Expand All @@ -805,6 +806,7 @@ def self.set_systems_mechanical_ventilation_reference(new_hpxml)
hours_in_operation: 24,
fan_power: fan_power_w.round(3),
sensible_recovery_efficiency: fan_sre,
sensible_recovery_efficiency_adjusted: fan_asre,
used_for_whole_building_ventilation: true)
end

Expand Down

0 comments on commit df2d94e

Please sign in to comment.