Skip to content

Commit

Permalink
Merge pull request #198 from NREL/v3_enclosure
Browse files Browse the repository at this point in the history 
Improved Enclosure inputs
  • Loading branch information
@shorowit
shorowit authored May 31, 2019
2 parents 8644ca6 + 912dd44 commit 744e24b
Show file tree
Hide file tree
Showing 569 changed files with 50,925 additions and 58,406 deletions.
722 changes: 314 additions & 408 deletions Rakefile
View file

Large diffs are not rendered by default.

843 changes: 364 additions & 479 deletions measures/301EnergyRatingIndexRuleset/resources/301.rb
View file

Large diffs are not rendered by default.

204 changes: 39 additions & 165 deletions measures/301EnergyRatingIndexRuleset/resources/301validator.rb
View file

Large diffs are not rendered by default.

369 changes: 345 additions & 24 deletions measures/301EnergyRatingIndexRuleset/tests/test_enclosure.rb
View file

Large diffs are not rendered by default.

951 changes: 443 additions & 508 deletions measures/HPXMLtoOpenStudio/Rakefile
View file

Large diffs are not rendered by default.

839 changes: 334 additions & 505 deletions measures/HPXMLtoOpenStudio/hpxml_schemas/BaseElements.xsd
View file

Large diffs are not rendered by default.

28 changes: 15 additions & 13 deletions measures/HPXMLtoOpenStudio/hpxml_schemas/HPXMLDataTypes.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -979,8 +979,10 @@
<xs:enumeration value="water-to-air"/>
<xs:enumeration value="water-to-water"/>
<xs:enumeration value="air-to-air"/>
<xs:enumeration value="air-to-water"/>
<xs:enumeration value="mini-split"/>
<xs:enumeration value="ground-to-air"/>
<xs:enumeration value="ground-to-water"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="VentSystem">
Expand Down Expand Up @@ -1705,13 +1707,6 @@
<xs:minInclusive value="0"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="AtticWallType">
<xs:restriction base="xs:string">
<xs:enumeration value="gable"/>
<xs:enumeration value="knee wall"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="ImprovementStatusType">
<xs:restriction base="xs:string">
<xs:enumeration value="Installed"/>
Expand Down Expand Up @@ -2157,17 +2152,24 @@
<xs:minInclusive value="0"/>
<xs:maxInclusive value="1"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="SpecificLeakageAreaType">
<xs:annotation>
<xs:documentation>Specific Leakage Area (SLA) is defined as the Effective Leakage Area (ELA) divided by the floor area.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:double"/>
</xs:simpleType>
<xs:simpleType name="AtticWallType">
<xs:restriction base="xs:string">
<xs:enumeration value="gable"/>
<xs:enumeration value="knee wall"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="MinutesPerDay">
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
<xs:maxInclusive value="1440"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="VentilationUnit">
<xs:restriction base="xs:string">
<xs:enumeration value="SLA"/>
<xs:enumeration value="ACHnatural"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
1,427 changes: 492 additions & 935 deletions measures/HPXMLtoOpenStudio/measure.rb
View file

Large diffs are not rendered by default.

204 changes: 39 additions & 165 deletions measures/HPXMLtoOpenStudio/resources/EPvalidator.rb
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions measures/HPXMLtoOpenStudio/resources/airflow.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ def self.apply(model, runner, infil, mech_vent, nat_vent, duct_systems,

obj.remove
end

return true
end

def self.get_default_shelter_coefficient()
Expand Down
626 changes: 158 additions & 468 deletions measures/HPXMLtoOpenStudio/resources/hpxml.rb
View file

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,10 @@ def self.process_duct_loads_heating(runner, hvac_final_values, weather, hvac, in
dse_Fregains = {}
hvac.Ducts.each do |duct|
dse_Fregains[duct.LocationSpace] = get_duct_regain_factor(runner, duct)
return nil if dse_Fregains[duct.LocationSpace].nil?
if dse_Fregains[duct.LocationSpace].nil?
runner.registerError("Unexpected duct location '#{duct.LocationSpace.name}'.")
return nil
end
end
fregain_values = { Constants.DuctSideSupply => dse_Fregains, Constants.DuctSideReturn => dse_Fregains }
dse_Fregain_s, dse_Fregain_r = calc_ducts_area_weighted_average(hvac.Ducts, fregain_values)
Expand Down Expand Up @@ -3600,7 +3603,10 @@ def self.get_foundation_walls_ceilings_insulated(runner, space)

ceiling_ufactor = self.get_surface_ufactor(runner, surface, surface.surfaceType, true)
end
return nil if ceiling_ufactor.nil?
if ceiling_ufactor.nil?
runner.registerError("Unable to identify the foundation ceiling.")
return nil
end

ceiling_rvalue = 1.0 / UnitConversions.convert(ceiling_ufactor, 'm^2*k/w', 'hr*ft^2*f/btu')
if ceiling_rvalue >= 3.0
Expand Down
205 changes: 96 additions & 109 deletions measures/HPXMLtoOpenStudio/tests/base-addenda-exclude-g-e-a.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,118 +57,29 @@
<InfiltrationVolume>21600.0</InfiltrationVolume>
</AirInfiltrationMeasurement>
</AirInfiltration>
<Attics>
<Attic>
<SystemIdentifier id='Attic'/>
<AtticType>
<Attic>
<Vented>false</Vented>
</Attic>
</AtticType>
<Roofs>
<Roof>
<SystemIdentifier id='AtticRoof'/>
<Area>1510.0</Area>
<SolarAbsorptance>0.75</SolarAbsorptance>
<Emittance>0.9</Emittance>
<Pitch>6.0</Pitch>
<RadiantBarrier>false</RadiantBarrier>
<Insulation>
<SystemIdentifier id='AtticRoofInsulation'/>
<AssemblyEffectiveRValue>2.3</AssemblyEffectiveRValue>
</Insulation>
</Roof>
</Roofs>
<Floors>
<Floor>
<SystemIdentifier id='AtticFloor'/>
<AdjacentTo>living space</AdjacentTo>
<Area>1350.0</Area>
<Insulation>
<SystemIdentifier id='AtticFloorInsulation'/>
<AssemblyEffectiveRValue>39.3</AssemblyEffectiveRValue>
</Insulation>
</Floor>
</Floors>
<Walls>
<Wall>
<SystemIdentifier id='AtticGable'/>
<AdjacentTo>outside</AdjacentTo>
<WallType>
<WoodStud/>
</WallType>
<Area>290.0</Area>
<SolarAbsorptance>0.75</SolarAbsorptance>
<Emittance>0.9</Emittance>
<Insulation>
<SystemIdentifier id='AtticGableInsulation'/>
<AssemblyEffectiveRValue>4.0</AssemblyEffectiveRValue>
</Insulation>
</Wall>
</Walls>
</Attic>
</Attics>
<Foundations>
<Foundation>
<SystemIdentifier id='Foundation'/>
<FoundationType>
<Basement>
<Conditioned>true</Conditioned>
</Basement>
</FoundationType>
<FoundationWall>
<SystemIdentifier id='FoundationWall'/>
<Height>8.0</Height>
<Area>1200.0</Area>
<Thickness>8.0</Thickness>
<DepthBelowGrade>7.0</DepthBelowGrade>
<AdjacentTo>ground</AdjacentTo>
<InsulationHeight>8.0</InsulationHeight>
<Insulation>
<SystemIdentifier id='FoundationWallInsulation'/>
<Layer>
<InstallationType>continuous</InstallationType>
<NominalRValue>8.9</NominalRValue>
</Layer>
</Insulation>
</FoundationWall>
<Slab>
<SystemIdentifier id='FoundationSlab'/>
<Area>1350.0</Area>
<Thickness>4.0</Thickness>
<ExposedPerimeter>150.0</ExposedPerimeter>
<PerimeterInsulationDepth>0.0</PerimeterInsulationDepth>
<UnderSlabInsulationWidth>0.0</UnderSlabInsulationWidth>
<DepthBelowGrade>7.0</DepthBelowGrade>
<PerimeterInsulation>
<SystemIdentifier id='FoundationSlabPerimeterInsulation'/>
<Layer>
<InstallationType>continuous</InstallationType>
<NominalRValue>0.0</NominalRValue>
</Layer>
</PerimeterInsulation>
<UnderSlabInsulation>
<SystemIdentifier id='FoundationSlabUnderSlabInsulation'/>
<Layer>
<InstallationType>continuous</InstallationType>
<NominalRValue>0.0</NominalRValue>
</Layer>
</UnderSlabInsulation>
<extension>
<CarpetFraction>0.0</CarpetFraction>
<CarpetRValue>0.0</CarpetRValue>
</extension>
</Slab>
</Foundation>
</Foundations>
<Roofs>
<Roof>
<SystemIdentifier id='Roof'/>
<InteriorAdjacentTo>attic - unvented</InteriorAdjacentTo>
<Area>1510.0</Area>
<SolarAbsorptance>0.7</SolarAbsorptance>
<Emittance>0.92</Emittance>
<Pitch>6.0</Pitch>
<RadiantBarrier>false</RadiantBarrier>
<Insulation>
<SystemIdentifier id='RoofInsulation'/>
<AssemblyEffectiveRValue>2.3</AssemblyEffectiveRValue>
</Insulation>
</Roof>
</Roofs>
<RimJoists>
<RimJoist>
<SystemIdentifier id='RimJoistFoundation'/>
<ExteriorAdjacentTo>outside</ExteriorAdjacentTo>
<InteriorAdjacentTo>living space</InteriorAdjacentTo>
<InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
<Area>116.0</Area>
<SolarAbsorptance>0.75</SolarAbsorptance>
<Emittance>0.9</Emittance>
<SolarAbsorptance>0.7</SolarAbsorptance>
<Emittance>0.92</Emittance>
<Insulation>
<SystemIdentifier id='RimJoistFoundationInsulation'/>
<AssemblyEffectiveRValue>23.0</AssemblyEffectiveRValue>
Expand All @@ -184,14 +95,90 @@
<WoodStud/>
</WallType>
<Area>1200.0</Area>
<SolarAbsorptance>0.75</SolarAbsorptance>
<Emittance>0.9</Emittance>
<SolarAbsorptance>0.7</SolarAbsorptance>
<Emittance>0.92</Emittance>
<Insulation>
<SystemIdentifier id='WallInsulation'/>
<AssemblyEffectiveRValue>23.0</AssemblyEffectiveRValue>
</Insulation>
</Wall>
<Wall>
<SystemIdentifier id='WallAtticGable'/>
<ExteriorAdjacentTo>outside</ExteriorAdjacentTo>
<InteriorAdjacentTo>attic - unvented</InteriorAdjacentTo>
<WallType>
<WoodStud/>
</WallType>
<Area>290.0</Area>
<SolarAbsorptance>0.7</SolarAbsorptance>
<Emittance>0.92</Emittance>
<Insulation>
<SystemIdentifier id='WallAtticGableInsulation'/>
<AssemblyEffectiveRValue>4.0</AssemblyEffectiveRValue>
</Insulation>
</Wall>
</Walls>
<FoundationWalls>
<FoundationWall>
<SystemIdentifier id='FoundationWall'/>
<ExteriorAdjacentTo>ground</ExteriorAdjacentTo>
<InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
<Height>8.0</Height>
<Area>1200.0</Area>
<Thickness>8.0</Thickness>
<DepthBelowGrade>7.0</DepthBelowGrade>
<InsulationHeight>8.0</InsulationHeight>
<Insulation>
<SystemIdentifier id='FoundationWallInsulation'/>
<Layer>
<InstallationType>continuous</InstallationType>
<NominalRValue>8.9</NominalRValue>
</Layer>
</Insulation>
</FoundationWall>
</FoundationWalls>
<Floors>
<Floor>
<SystemIdentifier id='FloorBelowAttic'/>
<ExteriorAdjacentTo>attic - unvented</ExteriorAdjacentTo>
<InteriorAdjacentTo>living space</InteriorAdjacentTo>
<Area>1350.0</Area>
<Insulation>
<SystemIdentifier id='FloorBelowAtticInsulation'/>
<AssemblyEffectiveRValue>39.3</AssemblyEffectiveRValue>
</Insulation>
</Floor>
</Floors>
<Slabs>
<Slab>
<SystemIdentifier id='Slab'/>
<InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
<Area>1350.0</Area>
<Thickness>4.0</Thickness>
<ExposedPerimeter>150.0</ExposedPerimeter>
<PerimeterInsulationDepth>0.0</PerimeterInsulationDepth>
<UnderSlabInsulationWidth>0.0</UnderSlabInsulationWidth>
<DepthBelowGrade>7.0</DepthBelowGrade>
<PerimeterInsulation>
<SystemIdentifier id='SlabPerimeterInsulation'/>
<Layer>
<InstallationType>continuous</InstallationType>
<NominalRValue>0.0</NominalRValue>
</Layer>
</PerimeterInsulation>
<UnderSlabInsulation>
<SystemIdentifier id='SlabUnderSlabInsulation'/>
<Layer>
<InstallationType>continuous</InstallationType>
<NominalRValue>0.0</NominalRValue>
</Layer>
</UnderSlabInsulation>
<extension>
<CarpetFraction>0.0</CarpetFraction>
<CarpetRValue>0.0</CarpetRValue>
</extension>
</Slab>
</Slabs>
<Windows>
<Window>
<SystemIdentifier id='WindowNorth'/>
Expand Down
Loading

0 comments on commit 744e24b

Please sign in to comment.