From 1d0c4dec02cb8a190249427bcf03dc1d899800c0 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 19 Apr 2023 14:23:58 -0600
Subject: [PATCH 01/11] Stub out schematron, HPXML classes, sample file.

---
 HPXMLtoOpenStudio/resources/hpxml.rb          | 147 +++++
 .../resources/hpxml_schema/HPXML.xsd          | 129 ++++
 .../hpxml_schematron/EPvalidator.xml          |  35 +-
 tasks.rb                                      |  38 +-
 workflow/hpxml_inputs.tsv                     |   1 +
 .../base-enclosure-detailed-constructions.xml | 607 ++++++++++++++++++
 6 files changed, 952 insertions(+), 5 deletions(-)
 create mode 100644 workflow/sample_files/base-enclosure-detailed-constructions.xml

diff --git a/HPXMLtoOpenStudio/resources/hpxml.rb b/HPXMLtoOpenStudio/resources/hpxml.rb
index 58988151b8..184ad34c71 100644
--- a/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -2195,6 +2195,10 @@ def from_oga(hpxml)
   end
 
   class Roof < BaseElement
+    def initialize(hpxml_object, *args)
+      @detailed_construction = DetailedConstruction.new(hpxml_object)
+      super(hpxml_object, *args)
+    end
     ATTRS = [:id, :interior_adjacent_to, :area, :azimuth, :orientation, :roof_type,
              :roof_color, :solar_absorptance, :emittance, :pitch, :radiant_barrier,
              :insulation_id, :insulation_assembly_r_value, :insulation_cavity_r_value,
@@ -2202,6 +2206,7 @@ class Roof < BaseElement
              :interior_finish_type, :interior_finish_thickness, :framing_factor,
              :framing_size, :framing_spacing]
     attr_accessor(*ATTRS)
+    attr_reader(:detailed_construction)
 
     def skylights
       return @hpxml_object.skylights.select { |skylight| skylight.roof_idref == @id }
@@ -2257,6 +2262,7 @@ def delete
     def check_for_errors
       errors = []
       begin; net_area; rescue StandardError => e; errors << e.message; end
+      errors += @detailed_construction.check_for_errors
       return errors
     end
 
@@ -2308,6 +2314,7 @@ def to_oga(doc)
         XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
         XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
       end
+      @detailed_construction.to_oga(roof)
     end
 
     def from_oga(roof)
@@ -2341,6 +2348,7 @@ def from_oga(roof)
         @insulation_cavity_r_value = XMLHelper.get_value(insulation, "Layer[InstallationType='cavity']/NominalRValue", :float)
         @insulation_continuous_r_value = XMLHelper.get_value(insulation, "Layer[InstallationType='continuous']/NominalRValue", :float)
       end
+      @detailed_construction.from_oga(XMLHelper.get_element(roof, 'DetailedConstruction'))
     end
   end
 
@@ -2359,10 +2367,15 @@ def from_oga(hpxml)
   end
 
   class RimJoist < BaseElement
+    def initialize(hpxml_object, *args)
+      @detailed_construction = DetailedConstruction.new(hpxml_object)
+      super(hpxml_object, *args)
+    end
     ATTRS = [:id, :exterior_adjacent_to, :interior_adjacent_to, :area, :orientation, :azimuth, :siding,
              :color, :solar_absorptance, :emittance, :insulation_id, :insulation_assembly_r_value,
              :insulation_cavity_r_value, :insulation_continuous_r_value, :framing_size]
     attr_accessor(*ATTRS)
+    attr_reader(:detailed_construction)
 
     def is_exterior
       if @exterior_adjacent_to == LocationOutside
@@ -2401,6 +2414,7 @@ def delete
 
     def check_for_errors
       errors = []
+      errors += @detailed_construction.check_for_errors
       return errors
     end
 
@@ -2442,6 +2456,7 @@ def to_oga(doc)
         floor_joists = XMLHelper.add_element(rim_joist, 'FloorJoists')
         XMLHelper.add_element(floor_joists, 'Size', @framing_size, :string) unless @framing_size.nil?
       end
+      @detailed_construction.to_oga(rim_joist)
     end
 
     def from_oga(rim_joist)
@@ -2465,6 +2480,7 @@ def from_oga(rim_joist)
         @insulation_continuous_r_value = XMLHelper.get_value(insulation, "Layer[InstallationType='continuous']/NominalRValue", :float)
       end
       @framing_size = XMLHelper.get_value(rim_joist, 'FloorJoists/Size', :string)
+      @detailed_construction.from_oga(XMLHelper.get_element(rim_joist, 'DetailedConstruction'))
     end
   end
 
@@ -2483,12 +2499,17 @@ def from_oga(hpxml)
   end
 
   class Wall < BaseElement
+    def initialize(hpxml_object, *args)
+      @detailed_construction = DetailedConstruction.new(hpxml_object)
+      super(hpxml_object, *args)
+    end
     ATTRS = [:id, :exterior_adjacent_to, :interior_adjacent_to, :wall_type, :optimum_value_engineering,
              :area, :orientation, :azimuth, :siding, :color, :solar_absorptance, :emittance, :insulation_id,
              :insulation_assembly_r_value, :insulation_cavity_r_value, :insulation_continuous_r_value,
              :interior_finish_type, :interior_finish_thickness, :attic_wall_type, :framing_factor,
              :framing_size, :framing_spacing, :insulation_grade]
     attr_accessor(*ATTRS)
+    attr_reader(:detailed_construction)
 
     def windows
       return @hpxml_object.windows.select { |window| window.wall_idref == @id }
@@ -2558,6 +2579,7 @@ def delete
     def check_for_errors
       errors = []
       begin; net_area; rescue StandardError => e; errors << e.message; end
+      errors += @detailed_construction.check_for_errors
       return errors
     end
 
@@ -2615,6 +2637,7 @@ def to_oga(doc)
         XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
         XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
       end
+      @detailed_construction.to_oga(wall)
     end
 
     def from_oga(wall)
@@ -2651,6 +2674,7 @@ def from_oga(wall)
         @insulation_cavity_r_value = XMLHelper.get_value(insulation, "Layer[InstallationType='cavity']/NominalRValue", :float)
         @insulation_continuous_r_value = XMLHelper.get_value(insulation, "Layer[InstallationType='continuous']/NominalRValue", :float)
       end
+      @detailed_construction.from_oga(XMLHelper.get_element(wall, 'DetailedConstruction'))
     end
   end
 
@@ -2842,11 +2866,16 @@ def from_oga(hpxml)
   end
 
   class Floor < BaseElement
+    def initialize(hpxml_object, *args)
+      @detailed_construction = DetailedConstruction.new(hpxml_object)
+      super(hpxml_object, *args)
+    end
     ATTRS = [:id, :exterior_adjacent_to, :interior_adjacent_to, :floor_type, :area, :insulation_id,
              :insulation_assembly_r_value, :insulation_cavity_r_value, :insulation_continuous_r_value,
              :floor_or_ceiling, :interior_finish_type, :interior_finish_thickness, :insulation_grade,
              :framing_factor, :framing_size, :framing_spacing]
     attr_accessor(*ATTRS)
+    attr_reader(:detailed_construction)
 
     def is_ceiling
       # From the perspective of the living space
@@ -2911,6 +2940,7 @@ def delete
 
     def check_for_errors
       errors = []
+      errors += @detailed_construction.check_for_errors
       return errors
     end
 
@@ -2959,6 +2989,7 @@ def to_oga(doc)
         XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
         XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
       end
+      @detailed_construction.to_oga(floor)
     end
 
     def from_oga(floor)
@@ -2986,6 +3017,7 @@ def from_oga(floor)
         @insulation_cavity_r_value = XMLHelper.get_value(insulation, "Layer[InstallationType='cavity']/NominalRValue", :float)
         @insulation_continuous_r_value = XMLHelper.get_value(insulation, "Layer[InstallationType='continuous']/NominalRValue", :float)
       end
+      @detailed_construction.from_oga(XMLHelper.get_element(floor, 'DetailedConstruction'))
     end
   end
 
@@ -3496,6 +3528,121 @@ def from_oga(door)
     end
   end
 
+  class DetailedConstruction < BaseElement
+    def initialize(hpxml_object, *args)
+      @construction_layers = DetailedConstructionLayers.new(hpxml_object)
+      super(hpxml_object, *args)
+    end
+    ATTRS = [:id, :construction_layers]
+    attr_accessor(*ATTRS)
+
+    def check_for_errors
+      errors = []
+      return errors
+    end
+
+    def to_oga(surface)
+      return if surface.nil?
+      return if @construction_layers.empty?
+
+      detailed_construction = XMLHelper.add_element(surface, 'DetailedConstruction')
+      sys_id = XMLHelper.add_element(detailed_construction, 'SystemIdentifier')
+      XMLHelper.add_attribute(sys_id, 'id', @id)
+
+      @construction_layers.to_oga(detailed_construction)
+    end
+
+    def from_oga(detailed_construction)
+      return if detailed_construction.nil?
+
+      @id = HPXML::get_id(detailed_construction)
+      @construction_layers.from_oga(detailed_construction)
+    end
+  end
+
+  class DetailedConstructionLayers < BaseArrayElement
+    def add(**kwargs)
+      self << DetailedConstructionLayer.new(@hpxml_object, **kwargs)
+    end
+
+    def from_oga(detailed_construction)
+      return if detailed_construction.nil?
+
+      XMLHelper.get_elements(detailed_construction, 'ConstructionLayer').each do |construction_layer|
+        self << DetailedConstructionLayer.new(@hpxml_object, construction_layer)
+      end
+    end
+  end
+
+  class DetailedConstructionLayer < BaseElement
+    def initialize(hpxml_object, *args)
+      @layer_materials = DetailedConstructionLayerMaterials.new(hpxml_object)
+      super(hpxml_object, *args)
+    end
+    ATTRS = [:layer_type, :layer_materials]
+    attr_accessor(*ATTRS)
+
+    def to_oga(detailed_construction)
+      return if detailed_construction.nil?
+
+      construction_layer = XMLHelper.add_element(detailed_construction, 'ConstructionLayer')
+      XMLHelper.add_element(construction_layer, 'LayerType', @layer_type, :string) unless @layer_type.nil?
+
+      return if @layer_materials.empty?
+
+      @layer_materials.to_oga(construction_layer)
+    end
+
+    def from_oga(construction_layer)
+      return if construction_layer.nil?
+
+      @layer_type = XMLHelper.get_value(construction_layer, 'LayerType', :string)
+      @layer_materials.from_oga(construction_layer)
+    end
+  end
+
+  class DetailedConstructionLayerMaterials < BaseArrayElement
+    def add(**kwargs)
+      self << DetailedConstructionLayerMaterial.new(@hpxml_object, **kwargs)
+    end
+
+    def from_oga(construction_layer)
+      XMLHelper.get_elements(construction_layer, 'LayerMaterial').each do |layer_material|
+        self << DetailedConstructionLayerMaterial.new(@hpxml_object, layer_material)
+      end
+    end
+  end
+
+  class DetailedConstructionLayerMaterial < BaseElement
+    ATTRS = [:area_fraction, :material_type, :thickness, :conductivity, :density, :specific_heat, :r_value]
+    attr_accessor(*ATTRS)
+
+    def to_oga(construction_layer)
+      return if construction_layer.nil?
+
+      layer_material = XMLHelper.add_element(construction_layer, 'LayerMaterial')
+      XMLHelper.add_element(layer_material, 'AreaFraction', @area_fraction, :float) unless @area_fraction.nil?
+      XMLHelper.add_element(layer_material, 'MaterialType', @material_type, :string) unless @material_type.nil?
+      XMLHelper.add_element(layer_material, 'Thickness', @thickness, :float) unless @thickness.nil?
+      XMLHelper.add_element(layer_material, 'Conductivity', @conductivity, :float) unless @conductivity.nil?
+      XMLHelper.add_element(layer_material, 'Density', @density, :float) unless @density.nil?
+      XMLHelper.add_element(layer_material, 'SpecificHeat', @specific_heat, :float) unless @specific_heat.nil?
+      XMLHelper.add_element(layer_material, 'RValue', @r_value, :float) unless @r_value.nil?
+    end
+
+    def from_oga(layer_material)
+      return if layer_material.nil?
+
+      @area_fraction = XMLHelper.get_value(layer_material, 'AreaFraction', :float)
+      @material_type = XMLHelper.get_value(layer_material, 'MaterialType', :string)
+      @thickness = XMLHelper.get_value(layer_material, 'Thickness', :float)
+      @conductivity = XMLHelper.get_value(layer_material, 'Conductivity', :float)
+      @density = XMLHelper.get_value(layer_material, 'Density', :float)
+      @specific_heat = XMLHelper.get_value(layer_material, 'SpecificHeat', :float)
+      @r_value = XMLHelper.get_value(layer_material, 'RValue', :float)
+    end
+  end
+
   class PartitionWallMass < BaseElement
     ATTRS = [:area_fraction, :interior_finish_type, :interior_finish_thickness]
     attr_accessor(*ATTRS)
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd b/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd
index 43f97d950c..69bbcc385f 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd
+++ b/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd
@@ -200,6 +200,65 @@
 		</xs:sequence>
 		<xs:attribute name="dataSource" type="DataSource"/>
 	</xs:complexType>
+	<xs:complexType name="DetailedConstruction">
+		<xs:annotation>
+			<xs:documentation>Can be used to describe properties for each individual material in the construction</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:group ref="SystemInfo"/>
+			<xs:element maxOccurs="unbounded" name="ConstructionLayer">
+				<xs:annotation>
+					<xs:documentation>Layers should be ordered from exterior to interior. Do not include air films.</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" name="LayerType" type="ConstructionLayerType"/>
+						<xs:element maxOccurs="unbounded" name="LayerMaterial">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element minOccurs="0" name="AreaFraction" type="FractionGreaterThanZero">
+										<xs:annotation>
+											<xs:documentation>Fraction of the layer's area defined by this material. Values across all materials in a layer should sum to 1.</xs:documentation>
+										</xs:annotation>
+									</xs:element>
+									<xs:element minOccurs="0" name="MaterialType" type="xs:string">
+										<xs:annotation>
+											<xs:documentation>E.g., "wood", "concrete", "drywall", etc.</xs:documentation>
+										</xs:annotation>
+									</xs:element>
+									<xs:element minOccurs="0" name="Thickness" type="LengthMeasurement">
+										<xs:annotation>
+											<xs:documentation>[in]</xs:documentation>
+										</xs:annotation>
+									</xs:element>
+									<xs:element minOccurs="0" name="Conductivity" type="HPXMLDoubleGreaterThanZero">
+										<xs:annotation>
+											<xs:documentation>[Btu/hr-ft-F]</xs:documentation>
+										</xs:annotation>
+									</xs:element>
+									<xs:element minOccurs="0" name="Density" type="HPXMLDoubleGreaterThanZero">
+										<xs:annotation>
+											<xs:documentation>[lb/ft3]</xs:documentation>
+										</xs:annotation>
+									</xs:element>
+									<xs:element minOccurs="0" name="SpecificHeat" type="HPXMLDoubleGreaterThanZero">
+										<xs:annotation>
+											<xs:documentation>[Btu/lb-F]</xs:documentation>
+										</xs:annotation>
+									</xs:element>
+									<xs:element minOccurs="0" name="RValue" type="RValue"/>
+									<xs:element ref="extension" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element ref="extension" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element ref="extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="dataSource" type="DataSource"/>
+	</xs:complexType>
 	<xs:complexType name="InsulationMaterial">
 		<xs:choice>
 			<xs:element name="Batt" type="InsulationBattType"/>
@@ -989,6 +1048,7 @@
 									<xs:element name="RadiantBarrierLocation" type="RadiantBarrierLocation" minOccurs="0"/>
 									<xs:element name="RadiantBarrierGrade" type="InsulationGrade" minOccurs="0"/>
 									<xs:element minOccurs="0" name="Insulation" type="InsulationInfo"/>
+									<xs:element minOccurs="0" name="DetailedConstruction" type="DetailedConstruction"/>
 									<xs:element ref="extension" minOccurs="0"/>
 								</xs:sequence>
 								<xs:attribute name="dataSource" type="DataSource"/>
@@ -1029,6 +1089,7 @@
 									<xs:element minOccurs="0" name="SolarAbsorptance" type="SolarAbsorptance"/>
 									<xs:element minOccurs="0" name="Emittance" type="Emittance"/>
 									<xs:element minOccurs="0" name="Insulation" type="InsulationInfo"/>
+									<xs:element minOccurs="0" name="DetailedConstruction" type="DetailedConstruction"/>
 									<xs:element minOccurs="0" name="FloorJoists" type="StudProperties"/>
 									<xs:element name="AnnualEnergyUse" minOccurs="0">
 										<xs:complexType>
@@ -1082,6 +1143,7 @@
 									<xs:element minOccurs="0" name="Emittance" type="Emittance"/>
 									<xs:element minOccurs="0" name="InteriorFinish" type="InteriorFinishInfo"/>
 									<xs:element minOccurs="0" maxOccurs="1" name="Insulation" type="InsulationInfo"/>
+									<xs:element minOccurs="0" name="DetailedConstruction" type="DetailedConstruction"/>
 									<xs:element name="AnnualEnergyUse" minOccurs="0">
 										<xs:complexType>
 											<xs:sequence>
@@ -1149,6 +1211,7 @@
 									<xs:element minOccurs="0" name="InteriorStuds" type="StudProperties"/>
 									<xs:element minOccurs="0" name="InteriorFinish" type="InteriorFinishInfo"/>
 									<xs:element maxOccurs="1" minOccurs="0" name="Insulation" type="FoundationWallInsulationInfo"/>
+									<xs:element minOccurs="0" name="DetailedConstruction" type="DetailedConstruction"/>
 									<xs:element minOccurs="0" ref="extension"/>
 								</xs:sequence>
 								<xs:attribute name="dataSource" type="DataSource"/>
@@ -1188,6 +1251,7 @@
 									</xs:element>
 									<xs:element minOccurs="0" name="InteriorFinish" type="InteriorFinishInfo"/>
 									<xs:element minOccurs="0" maxOccurs="1" name="Insulation" type="InsulationInfo"/>
+									<xs:element minOccurs="0" name="DetailedConstruction" type="DetailedConstruction"/>
 									<xs:element minOccurs="0" name="MobileHomeBellyOrWing" type="MobileHomeBellyOrWing">
 										<xs:annotation>
 											<xs:documentation>Indicate whether the floor section is a mobile home belly or wing section. Omit if not applicable. For a mobile home, if the foundation type is a belly and wing, ExteriorAdjacentTo should be set to 'outside'.</xs:documentation>
@@ -1247,6 +1311,7 @@
 									<xs:element minOccurs="0" name="FloorCovering" type="FloorCovering"/>
 									<xs:element maxOccurs="1" minOccurs="0" name="PerimeterInsulation" type="SlabPerimeterInsulationInfo"/>
 									<xs:element minOccurs="0" name="UnderSlabInsulation" type="UnderSlabInsulationInfo"/>
+									<xs:element minOccurs="0" name="DetailedConstruction" type="DetailedConstruction"/>
 									<xs:element minOccurs="0" ref="extension"/>
 								</xs:sequence>
 								<xs:attribute name="dataSource" type="DataSource"/>
@@ -4136,6 +4201,11 @@
 							</xs:annotation>
 						</xs:element>
 						<xs:element minOccurs="0" name="DuctInsulationCondition" type="InsulationCondition"/>
+						<xs:element minOccurs="0" name="DuctBuriedInsulationLevel" type="DuctBuriedInsulationLevel">
+							<xs:annotation>
+								<xs:documentation>Describes ducts buried in, e.g., attic loose-fill insulation. Partially buried ducts have insulation that does not cover the top of the ducts. Fully buried ducts have insulation that just covers the top of the ducts. Deeply buried ducts have insulation that continues above the top of the ducts. See https://basc.pnnl.gov/resource-guides/ducts-buried-attic-insulation for more information.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
 						<xs:element name="DuctLocation" type="DuctLocation" minOccurs="0"/>
 						<xs:element minOccurs="0" name="FractionDuctArea" type="Fraction">
 							<xs:annotation>
@@ -6403,6 +6473,18 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="HPXMLDoubleGreaterThanZero_simple">
+		<xs:restriction base="xs:double">
+			<xs:minExclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="HPXMLDoubleGreaterThanZero">
+		<xs:simpleContent>
+			<xs:extension base="HPXMLDoubleGreaterThanZero_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 	<xs:complexType name="HPXMLDecimal">
 		<xs:simpleContent>
 			<xs:extension base="xs:decimal">
@@ -8357,6 +8439,21 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="DuctBuriedInsulationLevel_simple">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="not buried"/>
+			<xs:enumeration value="partially buried"/>
+			<xs:enumeration value="fully buried"/>
+			<xs:enumeration value="deeply buried"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="DuctBuriedInsulationLevel">
+		<xs:simpleContent>
+			<xs:extension base="DuctBuriedInsulationLevel_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 	<xs:simpleType name="DuctLocation_simple">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="attic"/>
@@ -9707,6 +9804,19 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="FractionGreaterThanZero_simple">
+		<xs:annotation>
+			<xs:documentation>A fraction that has to be between 0 (exclusive) and 1 (inclusive)</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:double"/>
+	</xs:simpleType>
+	<xs:complexType name="FractionGreaterThanZero">
+		<xs:simpleContent>
+			<xs:extension base="FractionGreaterThanOne_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 	<xs:simpleType name="FractionExcludingZero_simple">
 		<xs:restriction base="xs:double">
 			<xs:minExclusive value="0"/>
@@ -11375,4 +11485,23 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="ConstructionLayerType_simple">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="exterior finish"/>
+			<xs:enumeration value="sheathing"/>
+			<xs:enumeration value="continuous insulation"/>
+			<xs:enumeration value="framing/cavity insulation"/>
+			<xs:enumeration value="structural core"/>
+			<xs:enumeration value="interior finish"/>
+			<xs:enumeration value="subfloor"/>
+			<xs:enumeration value="other"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ConstructionLayerType">
+		<xs:simpleContent>
+			<xs:extension base="ConstructionLayerType_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 </xs:schema>
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
index 22221baaea..ade9646442 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
+++ b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
@@ -422,7 +422,7 @@
       <sch:assert role='ERROR' test='count(h:InteriorFinish/h:Thickness) &lt;= 1'>Expected 0 or 1 element(s) for xpath: InteriorFinish/Thickness</sch:assert>
       <sch:assert role='ERROR' test='count(h:Pitch) = 1'>Expected 1 element(s) for xpath: Pitch</sch:assert>
       <sch:assert role='ERROR' test='count(h:RadiantBarrier) &lt;= 1'>Expected 0 or 1 element(s) for xpath: RadiantBarrier</sch:assert> <!-- See [RadiantBarrier] -->
-      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) = 1'>Expected 1 element(s) for xpath: Insulation/AssemblyEffectiveRValue</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) + count(h:DetailedConstruction) &gt;= 1'>Expected 1 or more element(s) for xpath: Insulation/AssemblyEffectiveRValue | DetailedConstruction</sch:assert> <!-- See [DetailedConstruction] -->
     </sch:rule>
   </sch:pattern>
 
@@ -453,7 +453,7 @@
       <sch:assert role='ERROR' test='h:Siding[text()="wood siding" or text()="vinyl siding" or text()="stucco" or text()="fiber cement siding" or text()="brick veneer" or text()="aluminum siding" or text()="masonite siding" or text()="composite shingle siding" or text()="asbestos siding" or text()="synthetic stucco" or text()="none"] or not(h:Siding)'>Expected Siding to be 'wood siding' or 'vinyl siding' or 'stucco' or 'fiber cement siding' or 'brick veneer' or 'aluminum siding' or 'masonite siding' or 'composite shingle siding' or 'asbestos siding' or 'synthetic stucco' or 'none'</sch:assert>
       <sch:assert role='ERROR' test='count(h:Color) + count(h:SolarAbsorptance) &gt;= 0'>Expected 0 or more element(s) for xpath: Color | SolarAbsorptance</sch:assert>
       <sch:assert role='ERROR' test='count(h:Emittance) &lt;= 1'>Expected 0 or 1 element(s) for xpath: Emittance</sch:assert>
-      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) = 1'>Expected 1 element(s) for xpath: Insulation/AssemblyEffectiveRValue</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) + count(h:DetailedConstruction) &gt;= 1'>Expected 1 or more element(s) for xpath: Insulation/AssemblyEffectiveRValue | DetailedConstruction</sch:assert> <!-- See [DetailedConstruction] -->
     </sch:rule>
   </sch:pattern>
 
@@ -474,7 +474,7 @@
       <sch:assert role='ERROR' test='count(h:InteriorFinish/h:Type) &lt;= 1'>Expected 0 or 1 element(s) for xpath: InteriorFinish/Type</sch:assert>
       <sch:assert role='ERROR' test='h:InteriorFinish/h:Type[text()="gypsum board" or text()="gypsum composite board" or text()="plaster" or text()="wood" or text()="none"] or not(h:InteriorFinish/h:Type)'>Expected InteriorFinish/Type to be 'gypsum board' or 'gypsum composite board' or 'plaster' or 'wood' or 'none'</sch:assert>
       <sch:assert role='ERROR' test='count(h:InteriorFinish/h:Thickness) &lt;= 1'>Expected 0 or 1 element(s) for xpath: InteriorFinish/Thickness</sch:assert>
-      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) = 1'>Expected 1 element(s) for xpath: Insulation/AssemblyEffectiveRValue</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) + count(h:DetailedConstruction) &gt;= 1'>Expected 1 or more element(s) for xpath: Insulation/AssemblyEffectiveRValue | DetailedConstruction</sch:assert> <!-- See [DetailedConstruction] -->
     </sch:rule>
   </sch:pattern>
 
@@ -498,6 +498,7 @@
       <sch:assert role='ERROR' test='count(h:DepthBelowGrade) = 1'>Expected 1 element(s) for xpath: DepthBelowGrade</sch:assert>
       <sch:assert role='ERROR' test='number(h:DepthBelowGrade) &lt;= number(h:Height) or not(h:DepthBelowGrade) or not(h:Height)'>Expected DepthBelowGrade to be less than or equal to Height</sch:assert>
       <!-- Insulation: either specify interior and exterior layers OR assembly R-value: -->
+      <!-- FIXME: Allow DetailedConstruction here too -->
       <sch:assert role='ERROR' test='count(h:Insulation/h:Layer[h:InstallationType[text()="continuous - interior"]]) + count(h:Insulation/h:AssemblyEffectiveRValue) = 1'>Expected 1 element(s) for xpath: Insulation/Layer[InstallationType[text()="continuous - interior"]] | Insulation/AssemblyEffectiveRValue</sch:assert> <!-- See [FoundationWallInsulationLayer] -->
       <sch:assert role='ERROR' test='count(h:Insulation/h:Layer[h:InstallationType[text()="continuous - exterior"]]) + count(h:Insulation/h:AssemblyEffectiveRValue) = 1'>Expected 1 element(s) for xpath: Insulation/Layer[InstallationType[text()="continuous - exterior"]] | Insulation/AssemblyEffectiveRValue</sch:assert> <!-- See [FoundationWallInsulationLayer] -->
       <!-- Warnings -->
@@ -536,7 +537,7 @@
       <sch:assert role='ERROR' test='count(h:InteriorFinish/h:Type) &lt;= 1'>Expected 0 or 1 element(s) for xpath: InteriorFinish/Type</sch:assert>
       <sch:assert role='ERROR' test='h:InteriorFinish/h:Type[text()="gypsum board" or text()="gypsum composite board" or text()="plaster" or text()="wood" or text()="none"] or not(h:InteriorFinish/h:Type)'>Expected InteriorFinish/Type to be 'gypsum board' or 'gypsum composite board' or 'plaster' or 'wood' or 'none'</sch:assert>
       <sch:assert role='ERROR' test='count(h:InteriorFinish/h:Thickness) &lt;= 1'>Expected 0 or 1 element(s) for xpath: InteriorFinish/Thickness</sch:assert>
-      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) = 1'>Expected 1 element(s) for xpath: Insulation/AssemblyEffectiveRValue</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Insulation/h:AssemblyEffectiveRValue) + count(h:DetailedConstruction) &gt;= 1'>Expected 1 or more element(s) for xpath: Insulation/AssemblyEffectiveRValue | DetailedConstruction</sch:assert> <!-- See [DetailedConstruction] -->
     </sch:rule>
   </sch:pattern>
 
@@ -687,6 +688,32 @@
     </sch:rule>
   </sch:pattern>
   
+  <sch:pattern>
+    <sch:title>[DetailedConstruction]</sch:title>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction'>
+      <sch:assert role='ERROR' test='count(h:ConstructionLayer) &gt;= 1'>Expected 1 or more element(s) for xpath: ConstructionLayer</sch:assert> <!-- See [DetailedConstructionLayer] -->
+    </sch:rule>
+  </sch:pattern>  
+  
+  <sch:pattern>
+    <sch:title>[DetailedConstructionLayer]</sch:title>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction/h:ConstructionLayer'>
+      <sch:assert role='ERROR' test='count(h:LayerMaterial) &gt;= 1'>Expected 1 or more element(s) for xpath: LayerMaterial</sch:assert> <!-- See [DetailedConstructionLayerMaterial] -->
+      <sch:assert role='ERROR' test='sum(h:LayerMaterial/h:AreaFraction) &lt;= 1.01 and sum(h:LayerMaterial/h:AreaFraction) &gt;= 0.99'>Expected sum(LayerMaterial/AreaFraction) to be 1</sch:assert>
+    </sch:rule>
+  </sch:pattern>  
+
+  <sch:pattern>
+    <sch:title>[DetailedConstructionLayerMaterial]</sch:title>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction/h:ConstructionLayer/h:LayerMaterial'>
+      <sch:assert role='ERROR' test='count(h:AreaFraction) = 1'>Expected 1 element(s) for xpath: AreaFraction</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Thickness) = 1'>Expected 1 element(s) for xpath: Thickness</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Conductivity) + count(h:RValue) &gt;= 1'>Expected 1 or more element(s) for xpath: Conductivity | RValue</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Density) = 1'>Expected 1 element(s) for xpath: Density</sch:assert>
+      <sch:assert role='ERROR' test='count(h:SpecificHeat) = 1'>Expected 1 element(s) for xpath: SpecificHeat</sch:assert>
+    </sch:rule>
+  </sch:pattern>  
+
   <sch:pattern>
     <sch:title>[PartitionWallMass]</sch:title>
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/h:extension/h:PartitionWallMass'>
diff --git a/tasks.rb b/tasks.rb
index 82b0eb4227..7bbccaab64 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -36,7 +36,6 @@ def create_hpxmls
 
     measures = {}
     measures['BuildResidentialHPXML'] = [csv_row]
-    # measures['BuildResidentialScheduleFile'] = [sch_args] if !sch_args.empty?
 
     measures_dir = File.dirname(__FILE__)
     model = OpenStudio::Model::Model.new
@@ -1144,6 +1143,43 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                     azimuth: 180,
                     r_value: 4.4)
   end
+  if ['base-enclosure-detailed-constructions.xml'].include? hpxml_file
+    hpxml.walls[0].detailed_construction.id = hpxml.walls[0].id.gsub('Wall', 'WallConstruction')
+    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                                     material_type: 'vinyl siding',
+                                                                                     thickness: 0.375,
+                                                                                     conductivity: 0.052,
+                                                                                     density: 11.1,
+                                                                                     specific_heat: 0.25)
+    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                                     material_type: 'osb',
+                                                                                     thickness: 0.5,
+                                                                                     conductivity: 0.067,
+                                                                                     density: 32.0,
+                                                                                     specific_heat: 0.29)
+    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.25,
+                                                                                     material_type: 'wood stud',
+                                                                                     thickness: 3.5,
+                                                                                     conductivity: 0.067,
+                                                                                     density: 32.0,
+                                                                                     specific_heat: 0.29)
+    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.75,
+                                                                                     material_type: 'fiberglass batt',
+                                                                                     thickness: 3.5,
+                                                                                     conductivity: 0.022,
+                                                                                     density: 2.85,
+                                                                                     specific_heat: 0.25)
+    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                                     material_type: 'drywall',
+                                                                                     thickness: 0.5,
+                                                                                     conductivity: 0.093,
+                                                                                     density: 50.0,
+                                                                                     specific_heat: 0.2)
+  end
 
   # ---------- #
   # HPXML HVAC #
diff --git a/workflow/hpxml_inputs.tsv b/workflow/hpxml_inputs.tsv
index d668fef48d..a910773f76 100644
--- a/workflow/hpxml_inputs.tsv
+++ b/workflow/hpxml_inputs.tsv
@@ -157,6 +157,7 @@ base-enclosure-beds-2.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver
 base-enclosure-beds-4.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver.Intl.AP.725650_TMY3.epw		single-family detached					1	2700	1.5	180	4	2	4		8	0	20	0	Right	ConditionedBasement	8	1	9.25	UnventedAttic	gable	6:12	0		0	0	0	0					0	0	WoodFrame		8	8.9		0	8		23	0	0	0	0	4	0	0	39.3	asphalt or fiberglass shingles	medium	2.3	FALSE		WoodStud	wood siding	medium	23	0	0	0	0	108	108	72	72	1.333	0.67		0.33	0.45	0.85	0.7					0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.33	0.45		40	4.4	ACH	50	3		Furnace	natural gas	0.92	36000	1			central air conditioner	SEER	13	single stage	0.73	24000	1								none	HSPF	0	SEER	0		0				0	0		none	electricity	0							none	electricity	0		0	68	68	78	78			CFM25	75	25	attic - unvented	4	150	attic - unvented	0	50		none			Unadjusted	0	0		0								none	0	0	Unadjusted	0	0	0	0					0					FALSE			storage water heater	electricity	living space	40	EnergyFactor	0.95			18767		0	125	1				Standard	50					0	none			TRUE	FALSE		none	0	liquid indirect	single glazing black	0	0	0	0		0	FALSE				0	0	0				FALSE				0	0	0	FALSE						TRUE	0.4	0.1	0.25		0.4	0.1	0.25		0.4	0.1	0.25		FALSE			none	EnergyFactor	0	0	0	0	TRUE	living space	IntegratedModifiedEnergyFactor	1.21	380	0.12	1.09	27	6	3.2		TRUE	living space	electricity	CombinedEnergyFactor	3.73	150		TRUE	living space	RatedAnnualkWh	307	0.12	1.09	22.32	4	12		TRUE	living space	650		FALSE				FALSE				TRUE	living space	electricity	FALSE	FALSE		FALSE				TRUE	689		2457	0.855	0.045		FALSE			FALSE			FALSE	natural gas			FALSE	natural gas			FALSE	natural gas					FALSE			none				FALSE			none																					Bills																							TRUE
 base-enclosure-beds-5.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver.Intl.AP.725650_TMY3.epw		single-family detached					1	2700	1.5	180	5	3	5		8	0	20	0	Right	ConditionedBasement	8	1	9.25	UnventedAttic	gable	6:12	0		0	0	0	0					0	0	WoodFrame		8	8.9		0	8		23	0	0	0	0	4	0	0	39.3	asphalt or fiberglass shingles	medium	2.3	FALSE		WoodStud	wood siding	medium	23	0	0	0	0	108	108	72	72	1.333	0.67		0.33	0.45	0.85	0.7					0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.33	0.45		40	4.4	ACH	50	3		Furnace	natural gas	0.92	36000	1			central air conditioner	SEER	13	single stage	0.73	24000	1								none	HSPF	0	SEER	0		0				0	0		none	electricity	0							none	electricity	0		0	68	68	78	78			CFM25	75	25	attic - unvented	4	150	attic - unvented	0	50		none			Unadjusted	0	0		0								none	0	0	Unadjusted	0	0	0	0					0					FALSE			storage water heater	electricity	living space	40	EnergyFactor	0.95			18767		0	125	1				Standard	50					0	none			TRUE	FALSE		none	0	liquid indirect	single glazing black	0	0	0	0		0	FALSE				0	0	0				FALSE				0	0	0	FALSE						TRUE	0.4	0.1	0.25		0.4	0.1	0.25		0.4	0.1	0.25		FALSE			none	EnergyFactor	0	0	0	0	TRUE	living space	IntegratedModifiedEnergyFactor	1.21	380	0.12	1.09	27	6	3.2		TRUE	living space	electricity	CombinedEnergyFactor	3.73	150		TRUE	living space	RatedAnnualkWh	307	0.12	1.09	22.32	4	12		TRUE	living space	650		FALSE				FALSE				TRUE	living space	electricity	FALSE	FALSE		FALSE				TRUE	758		2457	0.855	0.045		FALSE			FALSE			FALSE	natural gas			FALSE	natural gas			FALSE	natural gas					FALSE			none				FALSE			none																					Bills																							TRUE
 base-enclosure-ceilingtypes.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver.Intl.AP.725650_TMY3.epw		single-family detached					1	2700	1.5	180	3	2	3		8	0	20	0	Right	ConditionedBasement	8	1	9.25	UnventedAttic	gable	6:12	0		0	0	0	0					0	0	WoodFrame		8	8.9		0	8		23	0	0	0	0	4	0	0	39.3	asphalt or fiberglass shingles	medium	2.3	FALSE		WoodStud	wood siding	medium	23	0	0	0	0	108	108	72	72	1.333	0.67		0.33	0.45	0.85	0.7					0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.33	0.45		40	4.4	ACH	50	3		Furnace	natural gas	0.92	36000	1			central air conditioner	SEER	13	single stage	0.73	24000	1								none	HSPF	0	SEER	0		0				0	0		none	electricity	0							none	electricity	0		0	68	68	78	78			CFM25	75	25	attic - unvented	4	150	attic - unvented	0	50		none			Unadjusted	0	0		0								none	0	0	Unadjusted	0	0	0	0					0					FALSE			storage water heater	electricity	living space	40	EnergyFactor	0.95			18767		0	125	1				Standard	50					0	none			TRUE	FALSE		none	0	liquid indirect	single glazing black	0	0	0	0		0	FALSE				0	0	0				FALSE				0	0	0	FALSE						TRUE	0.4	0.1	0.25		0.4	0.1	0.25		0.4	0.1	0.25		FALSE			none	EnergyFactor	0	0	0	0	TRUE	living space	IntegratedModifiedEnergyFactor	1.21	380	0.12	1.09	27	6	3.2		TRUE	living space	electricity	CombinedEnergyFactor	3.73	150		TRUE	living space	RatedAnnualkWh	307	0.12	1.09	22.32	4	12		TRUE	living space	650		FALSE				FALSE				TRUE	living space	electricity	FALSE	FALSE		FALSE				TRUE	620		2457	0.855	0.045		FALSE			FALSE			FALSE	natural gas			FALSE	natural gas			FALSE	natural gas					FALSE			none				FALSE			none																					Bills																							TRUE
+base-enclosure-detailed-constructions.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver.Intl.AP.725650_TMY3.epw		single-family detached					1	2700	1.5	180	3	2	3		8	0	20	0	Right	ConditionedBasement	8	1	9.25	UnventedAttic	gable	6:12	0		0	0	0	0					0	0	WoodFrame		8	8.9		0	8		23	0	0	0	0	4	0	0	39.3	asphalt or fiberglass shingles	medium	2.3	FALSE		WoodStud	wood siding	medium	23	0	0	0	0	108	108	72	72	1.333	0.67		0.33	0.45	0.85	0.7					0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.33	0.45		40	4.4	ACH	50	3		Furnace	natural gas	0.92	36000	1			central air conditioner	SEER	13	single stage	0.73	24000	1								none	HSPF	0	SEER	0		0				0	0		none	electricity	0							none	electricity	0		0	68	68	78	78			CFM25	75	25	attic - unvented	4	150	attic - unvented	0	50		none			Unadjusted	0	0		0								none	0	0	Unadjusted	0	0	0	0					0					FALSE			storage water heater	electricity	living space	40	EnergyFactor	0.95			18767		0	125	1				Standard	50					0	none			TRUE	FALSE		none	0	liquid indirect	single glazing black	0	0	0	0		0	FALSE				0	0	0				FALSE				0	0	0	FALSE						TRUE	0.4	0.1	0.25		0.4	0.1	0.25		0.4	0.1	0.25		FALSE			none	EnergyFactor	0	0	0	0	TRUE	living space	IntegratedModifiedEnergyFactor	1.21	380	0.12	1.09	27	6	3.2		TRUE	living space	electricity	CombinedEnergyFactor	3.73	150		TRUE	living space	RatedAnnualkWh	307	0.12	1.09	22.32	4	12		TRUE	living space	650		FALSE				FALSE				TRUE	living space	electricity	FALSE	FALSE		FALSE				TRUE	620		2457	0.855	0.045		FALSE			FALSE			FALSE	natural gas			FALSE	natural gas			FALSE	natural gas					FALSE			none				FALSE			none																					Bills																							TRUE
 base-enclosure-floortypes.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver.Intl.AP.725650_TMY3.epw		single-family detached					1	1350	1.5	180	3	2	3		8	0	20	0	Right	Ambient	8	1		UnventedAttic	gable	6:12	0		0	0	0	0					18.7	0	WoodFrame		8	8.9		0	8			0	0	0	0	4	0	0	39.3	asphalt or fiberglass shingles	medium	2.3	FALSE		WoodStud	wood siding	medium	23	0	0	0	0	108	108	72	72	1.333	0.67		0.33	0.45	0.85	0.7					0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.33	0.45		40	4.4	ACH	50	3		Furnace	natural gas	0.92	36000	1			central air conditioner	SEER	13	single stage	0.73	24000	1								none	HSPF	0	SEER	0		0				0	0		none	electricity	0							none	electricity	0		0	68	68	78	78			CFM25	75	25	attic - unvented	4	150	attic - unvented	0	50		none			Unadjusted	0	0		0								none	0	0	Unadjusted	0	0	0	0					0					FALSE			storage water heater	electricity	living space	40	EnergyFactor	0.95			18767		0	125	1				Standard	50					0	none			TRUE	FALSE		none	0	liquid indirect	single glazing black	0	0	0	0		0	FALSE				0	0	0				FALSE				0	0	0	FALSE						TRUE	0.4	0.1	0.25		0.4	0.1	0.25		0.4	0.1	0.25		FALSE			none	EnergyFactor	0	0	0	0	TRUE	living space	IntegratedModifiedEnergyFactor	1.21	380	0.12	1.09	27	6	3.2		TRUE	living space	electricity	CombinedEnergyFactor	3.73	150		TRUE	living space	RatedAnnualkWh	307	0.12	1.09	22.32	4	12		TRUE	living space	650		FALSE				FALSE				TRUE	living space	electricity	FALSE	FALSE		FALSE				TRUE	620		1228.5	0.855	0.045		FALSE			FALSE			FALSE	natural gas			FALSE	natural gas			FALSE	natural gas					FALSE			none				FALSE			none																					Bills																							TRUE
 base-enclosure-garage.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver.Intl.AP.725650_TMY3.epw		single-family detached					1	2700	1.5	180	3	2	3		8	30	20	1	Right	ConditionedBasement	8	1	9.25	UnventedAttic	gable	6:12	0		0	0	0	0					0	0	WoodFrame		8	8.9		0	8		23	0	0	0	0	4	0	0	39.3	asphalt or fiberglass shingles	medium	2.3	FALSE		WoodStud	wood siding	medium	23	0	0	0	0	12	108	72	72	3.333	0.67		0.33	0.45	0.85	0.7					0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.33	0.45		40	4.4	ACH	50	3		Furnace	natural gas	0.92	36000	1			central air conditioner	SEER	13	single stage	0.73	24000	1								none	HSPF	0	SEER	0		0				0	0		none	electricity	0							none	electricity	0		0	68	68	78	78			CFM25	75	25	garage	4	150	garage	0	50		none			Unadjusted	0	0		0								none	0	0	Unadjusted	0	0	0	0					0					FALSE			storage water heater	electricity	garage	40	EnergyFactor	0.95			18767		0	125	1				Standard	50					0	none			TRUE	FALSE		none	0	liquid indirect	single glazing black	0	0	0	0		0	FALSE				0	0	0				FALSE				0	0	0	FALSE						TRUE	0.4	0.1	0.25		0.4	0.1	0.25		0.4	0.1	0.25		FALSE			none	EnergyFactor	0	0	0	0	TRUE	garage	IntegratedModifiedEnergyFactor	1.21	380	0.12	1.09	27	6	3.2		TRUE	garage	electricity	CombinedEnergyFactor	3.73	150		TRUE	garage	RatedAnnualkWh	307	0.12	1.09	22.32	4	12		TRUE	garage	650		FALSE				FALSE				TRUE	garage	electricity	FALSE	FALSE		FALSE				TRUE	620		2457	0.855	0.045		FALSE			FALSE			FALSE	natural gas			FALSE	natural gas			FALSE	natural gas					FALSE			none				FALSE			none																					Bills																							TRUE
 base-enclosure-infil-ach-house-pressure.xml	sample_files	60							suburban				5B	CO		USA_CO_Denver.Intl.AP.725650_TMY3.epw		single-family detached					1	2700	1.5	180	3	2	3		8	0	20	0	Right	ConditionedBasement	8	1	9.25	UnventedAttic	gable	6:12	0		0	0	0	0					0	0	WoodFrame		8	8.9		0	8		23	0	0	0	0	4	0	0	39.3	asphalt or fiberglass shingles	medium	2.3	FALSE		WoodStud	wood siding	medium	23	0	0	0	0	108	108	72	72	1.333	0.67		0.33	0.45	0.85	0.7					0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.33	0.45		40	4.4	ACH	45	2.8		Furnace	natural gas	0.92	36000	1			central air conditioner	SEER	13	single stage	0.73	24000	1								none	HSPF	0	SEER	0		0				0	0		none	electricity	0							none	electricity	0		0	68	68	78	78			CFM25	75	25	attic - unvented	4	150	attic - unvented	0	50		none			Unadjusted	0	0		0								none	0	0	Unadjusted	0	0	0	0					0					FALSE			storage water heater	electricity	living space	40	EnergyFactor	0.95			18767		0	125	1				Standard	50					0	none			TRUE	FALSE		none	0	liquid indirect	single glazing black	0	0	0	0		0	FALSE				0	0	0				FALSE				0	0	0	FALSE						TRUE	0.4	0.1	0.25		0.4	0.1	0.25		0.4	0.1	0.25		FALSE			none	EnergyFactor	0	0	0	0	TRUE	living space	IntegratedModifiedEnergyFactor	1.21	380	0.12	1.09	27	6	3.2		TRUE	living space	electricity	CombinedEnergyFactor	3.73	150		TRUE	living space	RatedAnnualkWh	307	0.12	1.09	22.32	4	12		TRUE	living space	650		FALSE				FALSE				TRUE	living space	electricity	FALSE	FALSE		FALSE				TRUE	620		2457	0.855	0.045		FALSE			FALSE			FALSE	natural gas			FALSE	natural gas			FALSE	natural gas					FALSE			none				FALSE			none																					Bills																							TRUE
diff --git a/workflow/sample_files/base-enclosure-detailed-constructions.xml b/workflow/sample_files/base-enclosure-detailed-constructions.xml
new file mode 100644
index 0000000000..c1b61c2fbd
--- /dev/null
+++ b/workflow/sample_files/base-enclosure-detailed-constructions.xml
@@ -0,0 +1,607 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<HPXML xmlns='http://hpxmlonline.com/2019/10' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://hpxmlonline.com/2019/10' schemaVersion='4.0'>
+  <XMLTransactionHeaderInformation>
+    <XMLType>HPXML</XMLType>
+    <XMLGeneratedBy>tasks.rb</XMLGeneratedBy>
+    <CreatedDateAndTime>2000-01-01T00:00:00-07:00</CreatedDateAndTime>
+    <Transaction>create</Transaction>
+  </XMLTransactionHeaderInformation>
+  <SoftwareInfo>
+    <extension>
+      <SimulationControl>
+        <Timestep>60</Timestep>
+      </SimulationControl>
+      <UtilityBillScenarios>
+        <UtilityBillScenario>
+          <Name>Bills</Name>
+        </UtilityBillScenario>
+      </UtilityBillScenarios>
+    </extension>
+  </SoftwareInfo>
+  <Building>
+    <BuildingID id='MyBuilding'/>
+    <Site>
+      <SiteID id='SiteID'/>
+      <Address>
+        <StateCode>CO</StateCode>
+      </Address>
+    </Site>
+    <ProjectStatus>
+      <EventType>proposed workscope</EventType>
+    </ProjectStatus>
+    <BuildingDetails>
+      <BuildingSummary>
+        <Site>
+          <SiteType>suburban</SiteType>
+          <Surroundings>stand-alone</Surroundings>
+          <VerticalSurroundings>no units above or below</VerticalSurroundings>
+          <AzimuthOfFrontOfHome>180</AzimuthOfFrontOfHome>
+          <FuelTypesAvailable>
+            <Fuel>electricity</Fuel>
+            <Fuel>natural gas</Fuel>
+          </FuelTypesAvailable>
+        </Site>
+        <BuildingOccupancy>
+          <NumberofResidents>3.0</NumberofResidents>
+        </BuildingOccupancy>
+        <BuildingConstruction>
+          <ResidentialFacilityType>single-family detached</ResidentialFacilityType>
+          <NumberofConditionedFloors>2.0</NumberofConditionedFloors>
+          <NumberofConditionedFloorsAboveGrade>1.0</NumberofConditionedFloorsAboveGrade>
+          <AverageCeilingHeight>8.0</AverageCeilingHeight>
+          <NumberofBedrooms>3</NumberofBedrooms>
+          <NumberofBathrooms>2</NumberofBathrooms>
+          <ConditionedFloorArea>2700.0</ConditionedFloorArea>
+          <ConditionedBuildingVolume>21600.0</ConditionedBuildingVolume>
+        </BuildingConstruction>
+      </BuildingSummary>
+      <ClimateandRiskZones>
+        <ClimateZoneIECC>
+          <Year>2006</Year>
+          <ClimateZone>5B</ClimateZone>
+        </ClimateZoneIECC>
+        <WeatherStation>
+          <SystemIdentifier id='WeatherStation'/>
+          <Name>USA_CO_Denver.Intl.AP.725650_TMY3</Name>
+          <extension>
+            <EPWFilePath>USA_CO_Denver.Intl.AP.725650_TMY3.epw</EPWFilePath>
+          </extension>
+        </WeatherStation>
+      </ClimateandRiskZones>
+      <Enclosure>
+        <AirInfiltration>
+          <AirInfiltrationMeasurement>
+            <SystemIdentifier id='AirInfiltrationMeasurement1'/>
+            <HousePressure>50.0</HousePressure>
+            <BuildingAirLeakage>
+              <UnitofMeasure>ACH</UnitofMeasure>
+              <AirLeakage>3.0</AirLeakage>
+            </BuildingAirLeakage>
+            <InfiltrationVolume>21600.0</InfiltrationVolume>
+          </AirInfiltrationMeasurement>
+        </AirInfiltration>
+        <Attics>
+          <Attic>
+            <SystemIdentifier id='Attic1'/>
+            <AtticType>
+              <Attic>
+                <Vented>false</Vented>
+              </Attic>
+            </AtticType>
+            <WithinInfiltrationVolume>false</WithinInfiltrationVolume>
+            <AttachedToRoof idref='Roof1'/>
+            <AttachedToWall idref='Wall2'/>
+            <AttachedToFloor idref='Floor1'/>
+          </Attic>
+        </Attics>
+        <Foundations>
+          <Foundation>
+            <SystemIdentifier id='Foundation1'/>
+            <FoundationType>
+              <Basement>
+                <Conditioned>true</Conditioned>
+              </Basement>
+            </FoundationType>
+            <AttachedToRimJoist idref='RimJoist1'/>
+            <AttachedToFoundationWall idref='FoundationWall1'/>
+            <AttachedToSlab idref='Slab1'/>
+          </Foundation>
+        </Foundations>
+        <Roofs>
+          <Roof>
+            <SystemIdentifier id='Roof1'/>
+            <InteriorAdjacentTo>attic - unvented</InteriorAdjacentTo>
+            <Area>1509.3</Area>
+            <RoofType>asphalt or fiberglass shingles</RoofType>
+            <SolarAbsorptance>0.7</SolarAbsorptance>
+            <Emittance>0.92</Emittance>
+            <Pitch>6.0</Pitch>
+            <RadiantBarrier>false</RadiantBarrier>
+            <Insulation>
+              <SystemIdentifier id='Roof1Insulation'/>
+              <AssemblyEffectiveRValue>2.3</AssemblyEffectiveRValue>
+            </Insulation>
+          </Roof>
+        </Roofs>
+        <RimJoists>
+          <RimJoist>
+            <SystemIdentifier id='RimJoist1'/>
+            <ExteriorAdjacentTo>outside</ExteriorAdjacentTo>
+            <InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
+            <Area>115.6</Area>
+            <Siding>wood siding</Siding>
+            <SolarAbsorptance>0.7</SolarAbsorptance>
+            <Emittance>0.92</Emittance>
+            <Insulation>
+              <SystemIdentifier id='RimJoist1Insulation'/>
+              <AssemblyEffectiveRValue>23.0</AssemblyEffectiveRValue>
+            </Insulation>
+          </RimJoist>
+        </RimJoists>
+        <Walls>
+          <Wall>
+            <SystemIdentifier id='Wall1'/>
+            <ExteriorAdjacentTo>outside</ExteriorAdjacentTo>
+            <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <WallType>
+              <WoodStud/>
+            </WallType>
+            <Area>1200.0</Area>
+            <Siding>wood siding</Siding>
+            <SolarAbsorptance>0.7</SolarAbsorptance>
+            <Emittance>0.92</Emittance>
+            <InteriorFinish>
+              <Type>gypsum board</Type>
+            </InteriorFinish>
+            <Insulation>
+              <SystemIdentifier id='Wall1Insulation'/>
+              <AssemblyEffectiveRValue>23.0</AssemblyEffectiveRValue>
+            </Insulation>
+            <DetailedConstruction>
+              <SystemIdentifier id='WallConstruction1'/>
+              <ConstructionLayer>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>vinyl siding</MaterialType>
+                  <Thickness>0.375</Thickness>
+                  <Conductivity>0.052</Conductivity>
+                  <Density>11.1</Density>
+                  <SpecificHeat>0.25</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>osb</MaterialType>
+                  <Thickness>0.5</Thickness>
+                  <Conductivity>0.067</Conductivity>
+                  <Density>32.0</Density>
+                  <SpecificHeat>0.29</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerMaterial>
+                  <AreaFraction>0.25</AreaFraction>
+                  <MaterialType>wood stud</MaterialType>
+                  <Thickness>3.5</Thickness>
+                  <Conductivity>0.067</Conductivity>
+                  <Density>32.0</Density>
+                  <SpecificHeat>0.29</SpecificHeat>
+                </LayerMaterial>
+                <LayerMaterial>
+                  <AreaFraction>0.75</AreaFraction>
+                  <MaterialType>fiberglass batt</MaterialType>
+                  <Thickness>3.5</Thickness>
+                  <Conductivity>0.022</Conductivity>
+                  <Density>2.85</Density>
+                  <SpecificHeat>0.25</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>drywall</MaterialType>
+                  <Thickness>0.5</Thickness>
+                  <Conductivity>0.093</Conductivity>
+                  <Density>50.0</Density>
+                  <SpecificHeat>0.2</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+            </DetailedConstruction>
+          </Wall>
+          <Wall>
+            <SystemIdentifier id='Wall2'/>
+            <ExteriorAdjacentTo>outside</ExteriorAdjacentTo>
+            <InteriorAdjacentTo>attic - unvented</InteriorAdjacentTo>
+            <AtticWallType>gable</AtticWallType>
+            <WallType>
+              <WoodStud/>
+            </WallType>
+            <Area>225.0</Area>
+            <Siding>wood siding</Siding>
+            <SolarAbsorptance>0.7</SolarAbsorptance>
+            <Emittance>0.92</Emittance>
+            <Insulation>
+              <SystemIdentifier id='Wall2Insulation'/>
+              <AssemblyEffectiveRValue>4.0</AssemblyEffectiveRValue>
+            </Insulation>
+          </Wall>
+        </Walls>
+        <FoundationWalls>
+          <FoundationWall>
+            <SystemIdentifier id='FoundationWall1'/>
+            <ExteriorAdjacentTo>ground</ExteriorAdjacentTo>
+            <InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
+            <Height>8.0</Height>
+            <Area>1200.0</Area>
+            <Thickness>8.0</Thickness>
+            <DepthBelowGrade>7.0</DepthBelowGrade>
+            <InteriorFinish>
+              <Type>gypsum board</Type>
+            </InteriorFinish>
+            <Insulation>
+              <SystemIdentifier id='FoundationWall1Insulation'/>
+              <Layer>
+                <InstallationType>continuous - exterior</InstallationType>
+                <NominalRValue>8.9</NominalRValue>
+                <DistanceToTopOfInsulation>0.0</DistanceToTopOfInsulation>
+                <DistanceToBottomOfInsulation>8.0</DistanceToBottomOfInsulation>
+              </Layer>
+              <Layer>
+                <InstallationType>continuous - interior</InstallationType>
+                <NominalRValue>0.0</NominalRValue>
+              </Layer>
+            </Insulation>
+          </FoundationWall>
+        </FoundationWalls>
+        <Floors>
+          <Floor>
+            <SystemIdentifier id='Floor1'/>
+            <ExteriorAdjacentTo>attic - unvented</ExteriorAdjacentTo>
+            <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorOrCeiling>ceiling</FloorOrCeiling>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
+            <Area>1350.0</Area>
+            <InteriorFinish>
+              <Type>gypsum board</Type>
+            </InteriorFinish>
+            <Insulation>
+              <SystemIdentifier id='Floor1Insulation'/>
+              <AssemblyEffectiveRValue>39.3</AssemblyEffectiveRValue>
+            </Insulation>
+          </Floor>
+        </Floors>
+        <Slabs>
+          <Slab>
+            <SystemIdentifier id='Slab1'/>
+            <InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
+            <Area>1350.0</Area>
+            <Thickness>4.0</Thickness>
+            <ExposedPerimeter>150.0</ExposedPerimeter>
+            <PerimeterInsulation>
+              <SystemIdentifier id='Slab1PerimeterInsulation'/>
+              <Layer>
+                <NominalRValue>0.0</NominalRValue>
+                <InsulationDepth>0.0</InsulationDepth>
+              </Layer>
+            </PerimeterInsulation>
+            <UnderSlabInsulation>
+              <SystemIdentifier id='Slab1UnderSlabInsulation'/>
+              <Layer>
+                <NominalRValue>0.0</NominalRValue>
+                <InsulationWidth>0.0</InsulationWidth>
+              </Layer>
+            </UnderSlabInsulation>
+            <extension>
+              <CarpetFraction>0.0</CarpetFraction>
+              <CarpetRValue>0.0</CarpetRValue>
+            </extension>
+          </Slab>
+        </Slabs>
+        <Windows>
+          <Window>
+            <SystemIdentifier id='Window1'/>
+            <Area>108.0</Area>
+            <Azimuth>0</Azimuth>
+            <UFactor>0.33</UFactor>
+            <SHGC>0.45</SHGC>
+            <InteriorShading>
+              <SystemIdentifier id='Window1InteriorShading'/>
+              <SummerShadingCoefficient>0.7</SummerShadingCoefficient>
+              <WinterShadingCoefficient>0.85</WinterShadingCoefficient>
+            </InteriorShading>
+            <FractionOperable>0.67</FractionOperable>
+            <AttachedToWall idref='Wall1'/>
+          </Window>
+          <Window>
+            <SystemIdentifier id='Window2'/>
+            <Area>72.0</Area>
+            <Azimuth>90</Azimuth>
+            <UFactor>0.33</UFactor>
+            <SHGC>0.45</SHGC>
+            <InteriorShading>
+              <SystemIdentifier id='Window2InteriorShading'/>
+              <SummerShadingCoefficient>0.7</SummerShadingCoefficient>
+              <WinterShadingCoefficient>0.85</WinterShadingCoefficient>
+            </InteriorShading>
+            <FractionOperable>0.67</FractionOperable>
+            <AttachedToWall idref='Wall1'/>
+          </Window>
+          <Window>
+            <SystemIdentifier id='Window3'/>
+            <Area>108.0</Area>
+            <Azimuth>180</Azimuth>
+            <UFactor>0.33</UFactor>
+            <SHGC>0.45</SHGC>
+            <InteriorShading>
+              <SystemIdentifier id='Window3InteriorShading'/>
+              <SummerShadingCoefficient>0.7</SummerShadingCoefficient>
+              <WinterShadingCoefficient>0.85</WinterShadingCoefficient>
+            </InteriorShading>
+            <FractionOperable>0.67</FractionOperable>
+            <AttachedToWall idref='Wall1'/>
+          </Window>
+          <Window>
+            <SystemIdentifier id='Window4'/>
+            <Area>72.0</Area>
+            <Azimuth>270</Azimuth>
+            <UFactor>0.33</UFactor>
+            <SHGC>0.45</SHGC>
+            <InteriorShading>
+              <SystemIdentifier id='Window4InteriorShading'/>
+              <SummerShadingCoefficient>0.7</SummerShadingCoefficient>
+              <WinterShadingCoefficient>0.85</WinterShadingCoefficient>
+            </InteriorShading>
+            <FractionOperable>0.67</FractionOperable>
+            <AttachedToWall idref='Wall1'/>
+          </Window>
+        </Windows>
+        <Doors>
+          <Door>
+            <SystemIdentifier id='Door1'/>
+            <AttachedToWall idref='Wall1'/>
+            <Area>40.0</Area>
+            <Azimuth>180</Azimuth>
+            <RValue>4.4</RValue>
+          </Door>
+        </Doors>
+      </Enclosure>
+      <Systems>
+        <HVAC>
+          <HVACPlant>
+            <PrimarySystems>
+              <PrimaryHeatingSystem idref='HeatingSystem1'/>
+              <PrimaryCoolingSystem idref='CoolingSystem1'/>
+            </PrimarySystems>
+            <HeatingSystem>
+              <SystemIdentifier id='HeatingSystem1'/>
+              <DistributionSystem idref='HVACDistribution1'/>
+              <HeatingSystemType>
+                <Furnace/>
+              </HeatingSystemType>
+              <HeatingSystemFuel>natural gas</HeatingSystemFuel>
+              <HeatingCapacity>36000.0</HeatingCapacity>
+              <AnnualHeatingEfficiency>
+                <Units>AFUE</Units>
+                <Value>0.92</Value>
+              </AnnualHeatingEfficiency>
+              <FractionHeatLoadServed>1.0</FractionHeatLoadServed>
+            </HeatingSystem>
+            <CoolingSystem>
+              <SystemIdentifier id='CoolingSystem1'/>
+              <DistributionSystem idref='HVACDistribution1'/>
+              <CoolingSystemType>central air conditioner</CoolingSystemType>
+              <CoolingSystemFuel>electricity</CoolingSystemFuel>
+              <CoolingCapacity>24000.0</CoolingCapacity>
+              <CompressorType>single stage</CompressorType>
+              <FractionCoolLoadServed>1.0</FractionCoolLoadServed>
+              <AnnualCoolingEfficiency>
+                <Units>SEER</Units>
+                <Value>13.0</Value>
+              </AnnualCoolingEfficiency>
+              <SensibleHeatFraction>0.73</SensibleHeatFraction>
+            </CoolingSystem>
+          </HVACPlant>
+          <HVACControl>
+            <SystemIdentifier id='HVACControl1'/>
+            <SetpointTempHeatingSeason>68.0</SetpointTempHeatingSeason>
+            <SetpointTempCoolingSeason>78.0</SetpointTempCoolingSeason>
+          </HVACControl>
+          <HVACDistribution>
+            <SystemIdentifier id='HVACDistribution1'/>
+            <DistributionSystemType>
+              <AirDistribution>
+                <AirDistributionType>regular velocity</AirDistributionType>
+                <DuctLeakageMeasurement>
+                  <DuctType>supply</DuctType>
+                  <DuctLeakage>
+                    <Units>CFM25</Units>
+                    <Value>75.0</Value>
+                    <TotalOrToOutside>to outside</TotalOrToOutside>
+                  </DuctLeakage>
+                </DuctLeakageMeasurement>
+                <DuctLeakageMeasurement>
+                  <DuctType>return</DuctType>
+                  <DuctLeakage>
+                    <Units>CFM25</Units>
+                    <Value>25.0</Value>
+                    <TotalOrToOutside>to outside</TotalOrToOutside>
+                  </DuctLeakage>
+                </DuctLeakageMeasurement>
+                <Ducts>
+                  <SystemIdentifier id='Ducts1'/>
+                  <DuctType>supply</DuctType>
+                  <DuctInsulationRValue>4.0</DuctInsulationRValue>
+                  <DuctLocation>attic - unvented</DuctLocation>
+                  <DuctSurfaceArea>150.0</DuctSurfaceArea>
+                </Ducts>
+                <Ducts>
+                  <SystemIdentifier id='Ducts2'/>
+                  <DuctType>return</DuctType>
+                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctLocation>attic - unvented</DuctLocation>
+                  <DuctSurfaceArea>50.0</DuctSurfaceArea>
+                </Ducts>
+              </AirDistribution>
+            </DistributionSystemType>
+          </HVACDistribution>
+        </HVAC>
+        <WaterHeating>
+          <WaterHeatingSystem>
+            <SystemIdentifier id='WaterHeatingSystem1'/>
+            <FuelType>electricity</FuelType>
+            <WaterHeaterType>storage water heater</WaterHeaterType>
+            <Location>living space</Location>
+            <TankVolume>40.0</TankVolume>
+            <FractionDHWLoadServed>1.0</FractionDHWLoadServed>
+            <HeatingCapacity>18767.0</HeatingCapacity>
+            <EnergyFactor>0.95</EnergyFactor>
+            <HotWaterTemperature>125.0</HotWaterTemperature>
+          </WaterHeatingSystem>
+          <HotWaterDistribution>
+            <SystemIdentifier id='HotWaterDistribution1'/>
+            <SystemType>
+              <Standard>
+                <PipingLength>50.0</PipingLength>
+              </Standard>
+            </SystemType>
+            <PipeInsulation>
+              <PipeRValue>0.0</PipeRValue>
+            </PipeInsulation>
+          </HotWaterDistribution>
+          <WaterFixture>
+            <SystemIdentifier id='WaterFixture1'/>
+            <WaterFixtureType>shower head</WaterFixtureType>
+            <LowFlow>true</LowFlow>
+          </WaterFixture>
+          <WaterFixture>
+            <SystemIdentifier id='WaterFixture2'/>
+            <WaterFixtureType>faucet</WaterFixtureType>
+            <LowFlow>false</LowFlow>
+          </WaterFixture>
+        </WaterHeating>
+      </Systems>
+      <Appliances>
+        <ClothesWasher>
+          <SystemIdentifier id='ClothesWasher1'/>
+          <Location>living space</Location>
+          <IntegratedModifiedEnergyFactor>1.21</IntegratedModifiedEnergyFactor>
+          <RatedAnnualkWh>380.0</RatedAnnualkWh>
+          <LabelElectricRate>0.12</LabelElectricRate>
+          <LabelGasRate>1.09</LabelGasRate>
+          <LabelAnnualGasCost>27.0</LabelAnnualGasCost>
+          <LabelUsage>6.0</LabelUsage>
+          <Capacity>3.2</Capacity>
+        </ClothesWasher>
+        <ClothesDryer>
+          <SystemIdentifier id='ClothesDryer1'/>
+          <Location>living space</Location>
+          <FuelType>electricity</FuelType>
+          <CombinedEnergyFactor>3.73</CombinedEnergyFactor>
+          <Vented>true</Vented>
+          <VentedFlowRate>150.0</VentedFlowRate>
+        </ClothesDryer>
+        <Dishwasher>
+          <SystemIdentifier id='Dishwasher1'/>
+          <Location>living space</Location>
+          <RatedAnnualkWh>307.0</RatedAnnualkWh>
+          <PlaceSettingCapacity>12</PlaceSettingCapacity>
+          <LabelElectricRate>0.12</LabelElectricRate>
+          <LabelGasRate>1.09</LabelGasRate>
+          <LabelAnnualGasCost>22.32</LabelAnnualGasCost>
+          <LabelUsage>4.0</LabelUsage>
+        </Dishwasher>
+        <Refrigerator>
+          <SystemIdentifier id='Refrigerator1'/>
+          <Location>living space</Location>
+          <RatedAnnualkWh>650.0</RatedAnnualkWh>
+          <PrimaryIndicator>true</PrimaryIndicator>
+        </Refrigerator>
+        <CookingRange>
+          <SystemIdentifier id='CookingRange1'/>
+          <Location>living space</Location>
+          <FuelType>electricity</FuelType>
+          <IsInduction>false</IsInduction>
+        </CookingRange>
+        <Oven>
+          <SystemIdentifier id='Oven1'/>
+          <IsConvection>false</IsConvection>
+        </Oven>
+      </Appliances>
+      <Lighting>
+        <LightingGroup>
+          <SystemIdentifier id='LightingGroup1'/>
+          <Location>interior</Location>
+          <FractionofUnitsInLocation>0.4</FractionofUnitsInLocation>
+          <LightingType>
+            <CompactFluorescent/>
+          </LightingType>
+        </LightingGroup>
+        <LightingGroup>
+          <SystemIdentifier id='LightingGroup2'/>
+          <Location>interior</Location>
+          <FractionofUnitsInLocation>0.1</FractionofUnitsInLocation>
+          <LightingType>
+            <FluorescentTube/>
+          </LightingType>
+        </LightingGroup>
+        <LightingGroup>
+          <SystemIdentifier id='LightingGroup3'/>
+          <Location>interior</Location>
+          <FractionofUnitsInLocation>0.25</FractionofUnitsInLocation>
+          <LightingType>
+            <LightEmittingDiode/>
+          </LightingType>
+        </LightingGroup>
+        <LightingGroup>
+          <SystemIdentifier id='LightingGroup4'/>
+          <Location>exterior</Location>
+          <FractionofUnitsInLocation>0.4</FractionofUnitsInLocation>
+          <LightingType>
+            <CompactFluorescent/>
+          </LightingType>
+        </LightingGroup>
+        <LightingGroup>
+          <SystemIdentifier id='LightingGroup5'/>
+          <Location>exterior</Location>
+          <FractionofUnitsInLocation>0.1</FractionofUnitsInLocation>
+          <LightingType>
+            <FluorescentTube/>
+          </LightingType>
+        </LightingGroup>
+        <LightingGroup>
+          <SystemIdentifier id='LightingGroup6'/>
+          <Location>exterior</Location>
+          <FractionofUnitsInLocation>0.25</FractionofUnitsInLocation>
+          <LightingType>
+            <LightEmittingDiode/>
+          </LightingType>
+        </LightingGroup>
+      </Lighting>
+      <MiscLoads>
+        <PlugLoad>
+          <SystemIdentifier id='PlugLoad1'/>
+          <PlugLoadType>TV other</PlugLoadType>
+          <Load>
+            <Units>kWh/year</Units>
+            <Value>620.0</Value>
+          </Load>
+        </PlugLoad>
+        <PlugLoad>
+          <SystemIdentifier id='PlugLoad2'/>
+          <PlugLoadType>other</PlugLoadType>
+          <Load>
+            <Units>kWh/year</Units>
+            <Value>2457.0</Value>
+          </Load>
+          <extension>
+            <FracSensible>0.855</FracSensible>
+            <FracLatent>0.045</FracLatent>
+          </extension>
+        </PlugLoad>
+      </MiscLoads>
+    </BuildingDetails>
+  </Building>
+</HPXML>
\ No newline at end of file

From 5b826ced188a91d705740a4a5b20229b40e1d1ee Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 19 Apr 2023 14:50:04 -0600
Subject: [PATCH 02/11] Move thickness up a level; should apply to an entire
 construction layer, not each material.

---
 HPXMLtoOpenStudio/measure.xml                 | 32 +++++++++----------
 HPXMLtoOpenStudio/resources/hpxml.rb          |  9 ++----
 .../resources/hpxml_schema/HPXML.xsd          | 10 +++---
 .../hpxml_schematron/EPvalidator.xml          |  2 +-
 tasks.rb                                      | 13 +++-----
 .../base-enclosure-detailed-constructions.xml |  9 +++---
 6 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index acc40b49c1..6f430d4500 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>e0fba5c5-1914-4822-827e-6189b7336d8a</version_id>
-  <version_modified>20230417T174553Z</version_modified>
+  <version_id>50147f05-5d73-4611-8663-f9c5c0417c35</version_id>
+  <version_modified>20230419T204912Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -540,12 +540,6 @@
       <usage_type>script</usage_type>
       <checksum>78A52FFE</checksum>
     </file>
-    <file>
-      <filename>hpxml_schema/HPXML.xsd</filename>
-      <filetype>xsd</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>75097E83</checksum>
-    </file>
     <file>
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
@@ -565,22 +559,28 @@
       <checksum>FC3D4871</checksum>
     </file>
     <file>
-      <filename>hpxml_schematron/EPvalidator.xml</filename>
-      <filetype>xml</filetype>
+      <filename>airflow.rb</filename>
+      <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>19FA8820</checksum>
+      <checksum>5765F0E3</checksum>
     </file>
     <file>
-      <filename>hpxml.rb</filename>
-      <filetype>rb</filetype>
+      <filename>hpxml_schema/HPXML.xsd</filename>
+      <filetype>xsd</filetype>
       <usage_type>resource</usage_type>
-      <checksum>512A552D</checksum>
+      <checksum>CA905BB5</checksum>
     </file>
     <file>
-      <filename>airflow.rb</filename>
+      <filename>hpxml_schematron/EPvalidator.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>61E77C81</checksum>
+    </file>
+    <file>
+      <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>5765F0E3</checksum>
+      <checksum>482C5575</checksum>
     </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/resources/hpxml.rb b/HPXMLtoOpenStudio/resources/hpxml.rb
index 184ad34c71..0d2f8446d6 100644
--- a/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -3579,7 +3579,7 @@ def initialize(hpxml_object, *args)
       @layer_materials = DetailedConstructionLayerMaterials.new(hpxml_object)
       super(hpxml_object, *args)
     end
-    ATTRS = [:layer_type, :layer_materials]
+    ATTRS = [:layer_type, :layer_thickness, :layer_materials]
     attr_accessor(*ATTRS)
 
     def to_oga(detailed_construction)
@@ -3587,8 +3587,7 @@ def to_oga(detailed_construction)
 
       construction_layer = XMLHelper.add_element(detailed_construction, 'ConstructionLayer')
       XMLHelper.add_element(construction_layer, 'LayerType', @layer_type, :string) unless @layer_type.nil?
-
-      return if @layer_materials.empty?
+      XMLHelper.add_element(construction_layer, 'LayerThickness', @layer_thickness, :string) unless @layer_thickness.nil?
 
       @layer_materials.to_oga(construction_layer)
     end
@@ -3614,7 +3613,7 @@ def from_oga(construction_layer)
   end
 
   class DetailedConstructionLayerMaterial < BaseElement
-    ATTRS = [:area_fraction, :material_type, :thickness, :conductivity, :density, :specific_heat, :r_value]
+    ATTRS = [:area_fraction, :material_type, :conductivity, :density, :specific_heat, :r_value]
     attr_accessor(*ATTRS)
 
     def to_oga(construction_layer)
@@ -3623,7 +3622,6 @@ def to_oga(construction_layer)
       layer_material = XMLHelper.add_element(construction_layer, 'LayerMaterial')
       XMLHelper.add_element(layer_material, 'AreaFraction', @area_fraction, :float) unless @area_fraction.nil?
       XMLHelper.add_element(layer_material, 'MaterialType', @material_type, :string) unless @material_type.nil?
-      XMLHelper.add_element(layer_material, 'Thickness', @thickness, :float) unless @thickness.nil?
       XMLHelper.add_element(layer_material, 'Conductivity', @conductivity, :float) unless @conductivity.nil?
       XMLHelper.add_element(layer_material, 'Density', @density, :float) unless @density.nil?
       XMLHelper.add_element(layer_material, 'SpecificHeat', @specific_heat, :float) unless @specific_heat.nil?
@@ -3635,7 +3633,6 @@ def from_oga(layer_material)
 
       @area_fraction = XMLHelper.get_value(layer_material, 'AreaFraction', :float)
       @material_type = XMLHelper.get_value(layer_material, 'MaterialType', :string)
-      @thickness = XMLHelper.get_value(layer_material, 'Thickness', :float)
       @conductivity = XMLHelper.get_value(layer_material, 'Conductivity', :float)
       @density = XMLHelper.get_value(layer_material, 'Density', :float)
       @specific_heat = XMLHelper.get_value(layer_material, 'SpecificHeat', :float)
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd b/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd
index 69bbcc385f..1bd1ca7d51 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd
+++ b/HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd
@@ -213,6 +213,11 @@
 				<xs:complexType>
 					<xs:sequence>
 						<xs:element minOccurs="0" name="LayerType" type="ConstructionLayerType"/>
+						<xs:element minOccurs="0" name="LayerThickness" type="LengthMeasurement">
+							<xs:annotation>
+								<xs:documentation>[in]</xs:documentation>
+							</xs:annotation>
+						</xs:element>
 						<xs:element maxOccurs="unbounded" name="LayerMaterial">
 							<xs:complexType>
 								<xs:sequence>
@@ -226,11 +231,6 @@
 											<xs:documentation>E.g., "wood", "concrete", "drywall", etc.</xs:documentation>
 										</xs:annotation>
 									</xs:element>
-									<xs:element minOccurs="0" name="Thickness" type="LengthMeasurement">
-										<xs:annotation>
-											<xs:documentation>[in]</xs:documentation>
-										</xs:annotation>
-									</xs:element>
 									<xs:element minOccurs="0" name="Conductivity" type="HPXMLDoubleGreaterThanZero">
 										<xs:annotation>
 											<xs:documentation>[Btu/hr-ft-F]</xs:documentation>
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
index ade9646442..295e9647e5 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
+++ b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
@@ -698,6 +698,7 @@
   <sch:pattern>
     <sch:title>[DetailedConstructionLayer]</sch:title>
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction/h:ConstructionLayer'>
+      <sch:assert role='ERROR' test='count(h:LayerThickness) = 1'>Expected 1 element(s) for xpath: LayerThickness</sch:assert>
       <sch:assert role='ERROR' test='count(h:LayerMaterial) &gt;= 1'>Expected 1 or more element(s) for xpath: LayerMaterial</sch:assert> <!-- See [DetailedConstructionLayerMaterial] -->
       <sch:assert role='ERROR' test='sum(h:LayerMaterial/h:AreaFraction) &lt;= 1.01 and sum(h:LayerMaterial/h:AreaFraction) &gt;= 0.99'>Expected sum(LayerMaterial/AreaFraction) to be 1</sch:assert>
     </sch:rule>
@@ -707,7 +708,6 @@
     <sch:title>[DetailedConstructionLayerMaterial]</sch:title>
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction/h:ConstructionLayer/h:LayerMaterial'>
       <sch:assert role='ERROR' test='count(h:AreaFraction) = 1'>Expected 1 element(s) for xpath: AreaFraction</sch:assert>
-      <sch:assert role='ERROR' test='count(h:Thickness) = 1'>Expected 1 element(s) for xpath: Thickness</sch:assert>
       <sch:assert role='ERROR' test='count(h:Conductivity) + count(h:RValue) &gt;= 1'>Expected 1 or more element(s) for xpath: Conductivity | RValue</sch:assert>
       <sch:assert role='ERROR' test='count(h:Density) = 1'>Expected 1 element(s) for xpath: Density</sch:assert>
       <sch:assert role='ERROR' test='count(h:SpecificHeat) = 1'>Expected 1 element(s) for xpath: SpecificHeat</sch:assert>
diff --git a/tasks.rb b/tasks.rb
index 7bbccaab64..cc9d5f3172 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -1145,37 +1145,32 @@ def apply_hpxml_modification(hpxml_file, hpxml)
   end
   if ['base-enclosure-detailed-constructions.xml'].include? hpxml_file
     hpxml.walls[0].detailed_construction.id = hpxml.walls[0].id.gsub('Wall', 'WallConstruction')
-    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 0.375)
     hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
                                                                                      material_type: 'vinyl siding',
-                                                                                     thickness: 0.375,
                                                                                      conductivity: 0.052,
                                                                                      density: 11.1,
                                                                                      specific_heat: 0.25)
-    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 0.5)
     hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
                                                                                      material_type: 'osb',
-                                                                                     thickness: 0.5,
                                                                                      conductivity: 0.067,
                                                                                      density: 32.0,
                                                                                      specific_heat: 0.29)
-    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 3.5)
     hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.25,
                                                                                      material_type: 'wood stud',
-                                                                                     thickness: 3.5,
                                                                                      conductivity: 0.067,
                                                                                      density: 32.0,
                                                                                      specific_heat: 0.29)
     hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.75,
                                                                                      material_type: 'fiberglass batt',
-                                                                                     thickness: 3.5,
                                                                                      conductivity: 0.022,
                                                                                      density: 2.85,
                                                                                      specific_heat: 0.25)
-    hpxml.walls[0].detailed_construction.construction_layers.add()
+    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 0.5)
     hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
                                                                                      material_type: 'drywall',
-                                                                                     thickness: 0.5,
                                                                                      conductivity: 0.093,
                                                                                      density: 50.0,
                                                                                      specific_heat: 0.2)
diff --git a/workflow/sample_files/base-enclosure-detailed-constructions.xml b/workflow/sample_files/base-enclosure-detailed-constructions.xml
index c1b61c2fbd..01c6aac8ce 100644
--- a/workflow/sample_files/base-enclosure-detailed-constructions.xml
+++ b/workflow/sample_files/base-enclosure-detailed-constructions.xml
@@ -160,30 +160,30 @@
             <DetailedConstruction>
               <SystemIdentifier id='WallConstruction1'/>
               <ConstructionLayer>
+                <LayerThickness>0.375</LayerThickness>
                 <LayerMaterial>
                   <AreaFraction>1.0</AreaFraction>
                   <MaterialType>vinyl siding</MaterialType>
-                  <Thickness>0.375</Thickness>
                   <Conductivity>0.052</Conductivity>
                   <Density>11.1</Density>
                   <SpecificHeat>0.25</SpecificHeat>
                 </LayerMaterial>
               </ConstructionLayer>
               <ConstructionLayer>
+                <LayerThickness>0.5</LayerThickness>
                 <LayerMaterial>
                   <AreaFraction>1.0</AreaFraction>
                   <MaterialType>osb</MaterialType>
-                  <Thickness>0.5</Thickness>
                   <Conductivity>0.067</Conductivity>
                   <Density>32.0</Density>
                   <SpecificHeat>0.29</SpecificHeat>
                 </LayerMaterial>
               </ConstructionLayer>
               <ConstructionLayer>
+                <LayerThickness>3.5</LayerThickness>
                 <LayerMaterial>
                   <AreaFraction>0.25</AreaFraction>
                   <MaterialType>wood stud</MaterialType>
-                  <Thickness>3.5</Thickness>
                   <Conductivity>0.067</Conductivity>
                   <Density>32.0</Density>
                   <SpecificHeat>0.29</SpecificHeat>
@@ -191,17 +191,16 @@
                 <LayerMaterial>
                   <AreaFraction>0.75</AreaFraction>
                   <MaterialType>fiberglass batt</MaterialType>
-                  <Thickness>3.5</Thickness>
                   <Conductivity>0.022</Conductivity>
                   <Density>2.85</Density>
                   <SpecificHeat>0.25</SpecificHeat>
                 </LayerMaterial>
               </ConstructionLayer>
               <ConstructionLayer>
+                <LayerThickness>0.5</LayerThickness>
                 <LayerMaterial>
                   <AreaFraction>1.0</AreaFraction>
                   <MaterialType>drywall</MaterialType>
-                  <Thickness>0.5</Thickness>
                   <Conductivity>0.093</Conductivity>
                   <Density>50.0</Density>
                   <SpecificHeat>0.2</SpecificHeat>

From 0be851644afb82b248719df90b2d8926ae19ef3e Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Wed, 19 Apr 2023 22:14:44 +0000
Subject: [PATCH 03/11] Latest results.

---
 workflow/tests/base_results/results.csv       | 1 +
 workflow/tests/base_results/results_bills.csv | 1 +
 2 files changed, 2 insertions(+)

diff --git a/workflow/tests/base_results/results.csv b/workflow/tests/base_results/results.csv
index 8f8aa6e0f7..4a961c2d23 100644
--- a/workflow/tests/base_results/results.csv
+++ b/workflow/tests/base_results/results.csv
@@ -130,6 +130,7 @@ base-enclosure-beds-2.xml,57.09,57.09,33.258,33.258,23.832,0.0,0.0,0.0,0.0,0.0,0
 base-enclosure-beds-4.xml,60.372,60.372,38.533,38.533,21.839,0.0,0.0,0.0,0.0,0.0,0.0,0.36,0.0,0.0,4.432,0.862,10.889,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.376,0.421,1.744,1.661,0.0,2.35,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.839,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.452,0.0,14.56,11.089,0.614,0.0,0.0,0.0,0.0,2192.9,3501.7,22.758,18.225,0.0,3.555,3.64,0.512,7.518,0.629,10.513,-12.551,0.0,0.0,0.0,8.286,-0.06,4.805,0.0,0.729,0.0,4.742,-9.713,-2.498,0.0,-0.061,-0.469,-0.053,2.662,-0.028,-1.969,11.732,0.0,0.0,0.0,-6.384,-0.056,-1.182,-3.147,-0.167,0.0,3.185,8.666,2.012,1562.4,1177.9,13955.4,2960.3,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,19030.0,5341.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3550.0,160.0,0.0,-840.0,1000.0
 base-enclosure-beds-5.xml,61.997,61.997,41.137,41.137,20.859,0.0,0.0,0.0,0.0,0.0,0.0,0.344,0.0,0.0,4.596,0.902,12.591,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.434,0.477,1.976,1.794,0.0,2.585,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.859,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.534,0.0,15.156,12.918,0.613,0.0,0.0,0.0,0.0,2561.6,3797.8,22.461,18.551,0.0,3.566,3.644,0.513,7.535,0.63,10.529,-12.537,0.0,0.0,0.0,8.301,-0.063,4.808,0.0,0.731,0.0,4.545,-10.52,-2.496,0.0,-0.08,-0.484,-0.055,2.615,-0.032,-2.014,11.746,0.0,0.0,0.0,-6.454,-0.059,-1.197,-3.228,-0.169,0.0,3.274,9.46,2.013,1770.0,1358.2,16511.3,3258.4,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,19257.0,5338.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3780.0,360.0,0.0,-840.0,1200.0
 base-enclosure-ceilingtypes.xml,74.877,74.877,36.44,36.44,38.437,0.0,0.0,0.0,0.0,0.0,0.0,0.634,0.0,0.0,4.485,0.877,9.168,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,38.437,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.991,0.0,14.849,9.233,0.618,0.0,0.0,0.0,0.0,2163.1,3369.0,29.367,18.642,0.0,17.257,3.59,0.505,7.246,0.62,10.388,-12.681,0.0,0.0,0.0,7.733,-0.076,4.851,0.0,0.734,0.0,7.068,-9.079,-2.545,0.0,0.155,-0.318,-0.031,2.91,0.01,-1.499,11.603,0.0,0.0,0.0,-6.072,-0.066,-1.008,-2.883,-0.139,0.0,2.725,7.703,1.964,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,44054.0,8851.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,14165.0,4597.0,30006.0,5442.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,13116.0,619.0,3320.0,0.0,0.0,0.0,0.0
+base-enclosure-detailed-constructions.xml,58.744,58.744,35.913,35.913,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.377,0.0,0.0,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,0.0,13.978,9.233,0.614,0.0,0.0,0.0,0.0,2115.4,3297.3,23.056,17.898,0.0,3.542,3.634,0.511,7.499,0.628,10.505,-12.551,0.0,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-8.907,-2.499,0.0,-0.043,-0.455,-0.051,2.706,-0.024,-1.916,11.732,0.0,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,18786.0,5328.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-enclosure-floortypes.xml,64.413,64.413,29.406,29.406,35.008,0.0,0.0,0.0,0.0,0.0,0.0,0.578,0.0,0.0,3.665,0.666,9.366,0.0,0.0,2.647,0.0,0.238,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,4.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.008,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.788,0.0,11.166,9.342,0.619,0.0,0.0,0.0,0.0,1757.2,3480.6,27.934,20.789,0.0,3.519,3.647,0.0,0.0,0.654,9.893,-12.804,0.0,0.0,26.42,0.0,-0.18,2.047,0.0,0.786,0.0,7.347,-7.418,-1.565,0.0,0.393,-0.069,0.0,0.0,0.096,0.25,11.037,0.0,0.0,-7.529,0.0,-0.176,-0.275,-1.935,-0.093,0.0,2.755,5.786,1.082,1354.8,997.6,11399.5,2808.9,36000.0,24000.0,0.0,6.8,91.76,37636.0,8721.0,7508.0,0.0,575.0,2198.0,0.0,14165.0,0.0,2171.0,2299.0,19985.0,5355.0,7037.0,0.0,207.0,232.0,0.0,1515.0,0.0,2010.0,310.0,3320.0,380.0,0.0,-420.0,800.0
 base-enclosure-garage.xml,59.052,59.052,34.589,34.589,24.463,0.0,0.0,0.0,0.0,0.0,0.0,0.404,0.0,0.0,2.98,0.521,9.266,0.0,0.0,4.51,0.142,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.463,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.904,0.0,8.709,9.233,0.724,0.0,0.0,0.0,0.0,2122.9,2825.0,18.052,10.754,0.0,3.524,3.783,0.502,5.84,0.613,8.595,-6.603,0.0,0.0,0.0,6.558,-0.041,5.37,0.0,0.0,0.0,3.839,-6.765,-2.508,0.0,0.112,-0.273,-0.035,2.444,0.002,-1.643,8.266,0.0,0.0,0.0,-5.628,-0.038,-1.216,-2.073,0.0,0.0,1.265,5.681,2.001,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,29361.0,8026.0,5506.0,0.0,575.0,6537.0,0.0,0.0,1949.0,2171.0,4597.0,15521.0,3263.0,5579.0,0.0,207.0,523.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-enclosure-infil-ach-house-pressure.xml,58.728,58.728,35.913,35.913,22.815,0.0,0.0,0.0,0.0,0.0,0.0,0.376,0.0,0.0,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.815,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.366,0.0,13.979,9.233,0.614,0.0,0.0,0.0,0.0,2115.3,3297.1,23.045,17.895,0.0,3.542,3.634,0.511,7.499,0.628,10.506,-12.551,0.0,0.0,0.0,8.272,-0.063,4.792,0.0,0.728,0.0,4.937,-8.907,-2.499,0.0,-0.043,-0.455,-0.051,2.706,-0.024,-1.917,11.732,0.0,0.0,0.0,-6.315,-0.059,-1.163,-3.064,-0.165,0.0,3.097,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31789.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4595.0,18786.0,5328.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_bills.csv b/workflow/tests/base_results/results_bills.csv
index e811b56607..08978acf46 100644
--- a/workflow/tests/base_results/results_bills.csv
+++ b/workflow/tests/base_results/results_bills.csv
@@ -130,6 +130,7 @@ base-enclosure-beds-2.xml,1566.38,144.0,1107.5,0.0,1251.5,144.0,170.88,314.88,0.
 base-enclosure-beds-4.xml,1727.78,144.0,1283.19,0.0,1427.19,144.0,156.59,300.59,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-beds-5.xml,1807.47,144.0,1369.91,0.0,1513.91,144.0,149.56,293.56,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-ceilingtypes.xml,1777.08,144.0,1213.49,0.0,1357.49,144.0,275.59,419.59,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-enclosure-detailed-constructions.xml,1647.63,144.0,1195.93,0.0,1339.93,144.0,163.7,307.7,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-floortypes.xml,1518.24,144.0,979.24,0.0,1123.24,144.0,251.0,395.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-garage.xml,1615.24,144.0,1151.84,0.0,1295.84,144.0,175.4,319.4,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-infil-ach-house-pressure.xml,1647.51,144.0,1195.93,0.0,1339.93,144.0,163.58,307.58,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

From 88ffada09d0d09d410b031299a56352f64a1556b Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 19 Apr 2023 17:48:42 -0600
Subject: [PATCH 04/11] First pass on implementation; handles above-grade walls
 and rim joists.

---
 HPXMLtoOpenStudio/measure.rb                  |  94 ++++----
 HPXMLtoOpenStudio/measure.xml                 |  66 +++---
 HPXMLtoOpenStudio/resources/constructions.rb  |  97 ++++++++
 HPXMLtoOpenStudio/resources/hpxml.rb          | 213 ++++++++++--------
 HPXMLtoOpenStudio/resources/hpxml_defaults.rb |  50 +++-
 .../hpxml_schematron/EPvalidator.xml          |   6 +-
 HPXMLtoOpenStudio/resources/hvac_sizing.rb    |  17 +-
 tasks.rb                                      |  72 +++---
 .../base-enclosure-detailed-constructions.xml |  93 ++++++--
 9 files changed, 474 insertions(+), 234 deletions(-)

diff --git a/HPXMLtoOpenStudio/measure.rb b/HPXMLtoOpenStudio/measure.rb
index 86154a5c6a..85909e44ab 100644
--- a/HPXMLtoOpenStudio/measure.rb
+++ b/HPXMLtoOpenStudio/measure.rb
@@ -511,26 +511,31 @@ def self.add_walls(runner, model, spaces)
       next if surfaces.empty?
 
       # Apply construction
-      # The code below constructs a reasonable wall construction based on the
-      # wall type while ensuring the correct assembly R-value.
 
-      inside_film = Material.AirFilmVertical
-      if wall.is_exterior
-        outside_film = Material.AirFilmOutside
-        mat_ext_finish = Material.ExteriorFinishMaterial(wall.siding)
+      inside_film = wall.additional_properties.inside_film
+      outside_film = wall.additional_properties.outside_film
+
+      if wall.has_detailed_construction
+        # Layer-by-layer construction
+
+        Constructions.apply_detailed_construction(model, surfaces, wall.detailed_construction, inside_film,
+                                                  outside_film, wall.solar_absorptance, wall.emittance)
       else
-        outside_film = Material.AirFilmVertical
-        mat_ext_finish = nil
-      end
-      if @apply_ashrae140_assumptions
-        inside_film = Material.AirFilmVerticalASHRAE140
-        outside_film = Material.AirFilmOutsideASHRAE140
-      end
-      mat_int_finish = Material.InteriorFinishMaterial(wall.interior_finish_type, wall.interior_finish_thickness)
+        # Assembly R-value
+        # The code below constructs a reasonable wall construction based on the
+        # wall type while ensuring the correct assembly R-value.
+
+        if wall.is_exterior
+          mat_ext_finish = Material.ExteriorFinishMaterial(wall.siding)
+        else
+          mat_ext_finish = nil
+        end
+        mat_int_finish = Material.InteriorFinishMaterial(wall.interior_finish_type, wall.interior_finish_thickness)
 
-      Constructions.apply_wall_construction(runner, model, surfaces, wall.id, wall.wall_type, wall.insulation_assembly_r_value,
-                                            mat_int_finish, inside_film, outside_film, mat_ext_finish, wall.solar_absorptance,
-                                            wall.emittance)
+        Constructions.apply_wall_construction(runner, model, surfaces, wall.id, wall.wall_type, wall.insulation_assembly_r_value,
+                                              mat_int_finish, inside_film, outside_film, mat_ext_finish, wall.solar_absorptance,
+                                              wall.emittance)
+      end
     end
   end
 
@@ -576,33 +581,42 @@ def self.add_rim_joists(runner, model, spaces)
 
       # Apply construction
 
-      inside_film = Material.AirFilmVertical
-      if rim_joist.is_exterior
-        outside_film = Material.AirFilmOutside
-        mat_ext_finish = Material.ExteriorFinishMaterial(rim_joist.siding)
+      inside_film = rim_joist.additional_properties.inside_film
+      outside_film = rim_joist.additional_properties.outside_film
+
+      if rim_joist.has_detailed_construction
+        # Layer-by-layer construction
+
+        Constructions.apply_detailed_construction(model, surfaces, rim_joist.detailed_construction, inside_film,
+                                                  outside_film, rim_joist.solar_absorptance, rim_joist.emittance)
       else
-        outside_film = Material.AirFilmVertical
-        mat_ext_finish = nil
-      end
+        # Assembly R-value
+
+        if rim_joist.is_exterior
+          mat_ext_finish = Material.ExteriorFinishMaterial(rim_joist.siding)
+        else
+          mat_ext_finish = nil
+        end
 
-      assembly_r = rim_joist.insulation_assembly_r_value
+        assembly_r = rim_joist.insulation_assembly_r_value
 
-      constr_sets = [
-        WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.17, 20.0, 2.0, nil, mat_ext_finish),  # 2x4 + R20
-        WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.17, 10.0, 2.0, nil, mat_ext_finish),  # 2x4 + R10
-        WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.17, 0.0, 2.0, nil, mat_ext_finish),   # 2x4
-        WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.01, 0.0, 0.0, nil, mat_ext_finish),   # Fallback
-      ]
-      match, constr_set, cavity_r = Constructions.pick_wood_stud_construction_set(assembly_r, constr_sets, inside_film, outside_film)
-      install_grade = 1
+        constr_sets = [
+          WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.17, 20.0, 2.0, nil, mat_ext_finish),  # 2x4 + R20
+          WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.17, 10.0, 2.0, nil, mat_ext_finish),  # 2x4 + R10
+          WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.17, 0.0, 2.0, nil, mat_ext_finish),   # 2x4
+          WoodStudConstructionSet.new(Material.Stud2x(2.0), 0.01, 0.0, 0.0, nil, mat_ext_finish),   # Fallback
+        ]
+        match, constr_set, cavity_r = Constructions.pick_wood_stud_construction_set(assembly_r, constr_sets, inside_film, outside_film)
+        install_grade = 1
 
-      Constructions.apply_rim_joist(model, surfaces, "#{rim_joist.id} construction",
-                                    cavity_r, install_grade, constr_set.framing_factor,
-                                    constr_set.mat_int_finish, constr_set.osb_thick_in,
-                                    constr_set.rigid_r, constr_set.mat_ext_finish,
-                                    inside_film, outside_film, rim_joist.solar_absorptance,
-                                    rim_joist.emittance)
-      Constructions.check_surface_assembly_rvalue(runner, surfaces, inside_film, outside_film, assembly_r, match)
+        Constructions.apply_rim_joist(model, surfaces, "#{rim_joist.id} construction",
+                                      cavity_r, install_grade, constr_set.framing_factor,
+                                      constr_set.mat_int_finish, constr_set.osb_thick_in,
+                                      constr_set.rigid_r, constr_set.mat_ext_finish,
+                                      inside_film, outside_film, rim_joist.solar_absorptance,
+                                      rim_joist.emittance)
+        Constructions.check_surface_assembly_rvalue(runner, surfaces, inside_film, outside_film, assembly_r, match)
+      end
     end
   end
 
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index 6f430d4500..b28f3e0d19 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>50147f05-5d73-4611-8663-f9c5c0417c35</version_id>
-  <version_modified>20230419T204912Z</version_modified>
+  <version_id>9cce078e-e36c-4623-ab71-99e9ab044646</version_id>
+  <version_modified>20230419T234707Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -409,12 +409,6 @@
       <usage_type>resource</usage_type>
       <checksum>9E02B1C4</checksum>
     </file>
-    <file>
-      <filename>constructions.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>F6E89CBA</checksum>
-    </file>
     <file>
       <filename>geometry.rb</filename>
       <filetype>rb</filetype>
@@ -499,12 +493,6 @@
       <usage_type>test</usage_type>
       <checksum>FD132EA0</checksum>
     </file>
-    <file>
-      <filename>hvac_sizing.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>56F8274B</checksum>
-    </file>
     <file>
       <filename>test_schedules.rb</filename>
       <filetype>rb</filetype>
@@ -529,17 +517,6 @@
       <usage_type>resource</usage_type>
       <checksum>7DB288B0</checksum>
     </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>3.3.0</identifier>
-        <min_compatible>3.3.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>78A52FFE</checksum>
-    </file>
     <file>
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
@@ -552,12 +529,6 @@
       <usage_type>test</usage_type>
       <checksum>1CBB4D41</checksum>
     </file>
-    <file>
-      <filename>hpxml_defaults.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>FC3D4871</checksum>
-    </file>
     <file>
       <filename>airflow.rb</filename>
       <filetype>rb</filetype>
@@ -570,17 +541,46 @@
       <usage_type>resource</usage_type>
       <checksum>CA905BB5</checksum>
     </file>
+    <file>
+      <filename>hvac_sizing.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>6B7F6E84</checksum>
+    </file>
+    <file>
+      <filename>hpxml_defaults.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>68FDCFF2</checksum>
+    </file>
     <file>
       <filename>hpxml_schematron/EPvalidator.xml</filename>
       <filetype>xml</filetype>
       <usage_type>resource</usage_type>
-      <checksum>61E77C81</checksum>
+      <checksum>37C4E003</checksum>
     </file>
     <file>
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>482C5575</checksum>
+      <checksum>499AD1D2</checksum>
+    </file>
+    <file>
+      <filename>constructions.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>B6318566</checksum>
+    </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>3.3.0</identifier>
+        <min_compatible>3.3.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>D82C0BA0</checksum>
     </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/resources/constructions.rb b/HPXMLtoOpenStudio/resources/constructions.rb
index f7b2259c0a..0d0cc5cf38 100644
--- a/HPXMLtoOpenStudio/resources/constructions.rb
+++ b/HPXMLtoOpenStudio/resources/constructions.rb
@@ -3,6 +3,103 @@
 class Constructions
   # Container class for walls, floors/ceilings, roofs, etc.
 
+  # Generic layer-by-layer construction from an HPXML DetailedConstruction element
+  def self.apply_detailed_construction(model, surfaces, detailed_construction,
+                                       inside_film, outside_film, solar_absorptance, emittance)
+
+    return if surfaces.empty?
+
+    # Define construction
+    constr = create_from_detailed_construction(detailed_construction, inside_film, outside_film)
+
+    constr.set_exterior_material_properties(solar_absorptance, emittance)
+    constr.set_interior_material_properties()
+
+    # Create and assign construction to surfaces
+    constr.create_and_assign_constructions(surfaces, model)
+  end
+
+  def self.create_from_detailed_construction(detailed_construction, inside_film, outside_film)
+    # FIXME: Need to re-normalize area_fractions to sum to 1
+
+    # Define materials
+    mats = {}
+    detailed_construction.construction_layers.each_with_index do |layer, i|
+      layer.layer_materials.each_with_index do |material, j|
+        if material.material_type.nil?
+          material_name = "#{detailed_construction.id} - Layer #{i + 1}, Material #{j + 1}"
+        else
+          material_name = "#{detailed_construction.id} - #{material.material_type}"
+        end
+        if not material.conductivity.nil?
+          k_in = UnitConversions.convert(material.conductivity, 'ft', 'in')
+        else
+          k_in = layer.layer_thickness / material.r_value
+        end
+        mat = Material.new(name: material_name, thick_in: layer.layer_thickness, k_in: k_in, rho: material.density, cp: material.specific_heat)
+        mats[[i, j]] = mat
+      end
+    end
+
+    # Determine unique paths
+    cumulative_area_fracs = []
+    detailed_construction.construction_layers.each do |layer|
+      layer_area_fracs = []
+      frac = 0.0
+      layer.layer_materials.each do |material|
+        frac += material.area_fraction
+        layer_area_fracs << frac
+      end
+      cumulative_area_fracs << layer_area_fracs
+    end
+    cumulative_area_fracs = cumulative_area_fracs.flatten.uniq.sort
+    path_fracs = []
+    cumulative_area_fracs.each_with_index do |area_frac, i|
+      if i == 0
+        path_fracs << area_frac
+      else
+        path_fracs << area_frac - cumulative_area_fracs[0..i - 1].sum
+      end
+    end
+
+    # Define construction
+    constr = Construction.new(detailed_construction.id, path_fracs)
+    constr.add_layer(outside_film)
+    detailed_construction.construction_layers.each_with_index do |layer, i|
+      if layer.layer_type.nil?
+        material_names = layer.layer_materials.map { |m| m.material_type }
+        if material_names.any? { |m| m.nil? }
+          layer_name = "#{detailed_construction.id} - Layer #{i + 1}"
+        else
+          layer_name = "#{detailed_construction.id} - #{material_names.join('|')}"
+        end
+      else
+        layer_name = "#{detailed_construction.id} - #{layer.layer_type}"
+      end
+      if layer.layer_materials.size == 1
+        # Single material for entire layer
+        constr.add_layer(mats[[i, 0]], layer_name)
+      else
+        # Create array of materials that align with path_fracs
+        layer_mats = []
+        path_fracs.each do |area_frac|
+          frac = 0.0
+          mat = nil
+          layer.layer_materials.each_with_index do |material, j|
+            frac += material.area_fraction
+            mat = mats[[i, j]]
+            break if frac >= area_frac
+          end
+          layer_mats << mat
+        end
+        constr.add_layer(layer_mats, layer_name)
+      end
+    end
+    constr.add_layer(inside_film)
+
+    return constr
+  end
+
   def self.apply_wood_stud_wall(model, surfaces, constr_name,
                                 cavity_r, install_grade, cavity_depth_in, cavity_filled,
                                 framing_factor, mat_int_finish, osb_thick_in,
diff --git a/HPXMLtoOpenStudio/resources/hpxml.rb b/HPXMLtoOpenStudio/resources/hpxml.rb
index 0d2f8446d6..015c2c56b7 100644
--- a/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -2249,6 +2249,10 @@ def is_conditioned
       return HPXML::is_conditioned(self)
     end
 
+    def has_detailed_construction
+      return !@detailed_construction.construction_layers.empty?
+    end
+
     def delete
       @hpxml_object.roofs.delete(self)
       skylights.reverse_each do |skylight|
@@ -2295,24 +2299,26 @@ def to_oga(doc)
       XMLHelper.add_element(roof, 'Pitch', @pitch, :float) unless @pitch.nil?
       XMLHelper.add_element(roof, 'RadiantBarrier', @radiant_barrier, :boolean, @radiant_barrier_isdefaulted) unless @radiant_barrier.nil?
       XMLHelper.add_element(roof, 'RadiantBarrierGrade', @radiant_barrier_grade, :integer, @radiant_barrier_grade_isdefaulted) unless @radiant_barrier_grade.nil?
-      insulation = XMLHelper.add_element(roof, 'Insulation')
-      sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
-      if not @insulation_id.nil?
-        XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
-      else
-        XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
-      end
-      XMLHelper.add_element(insulation, 'InsulationGrade', @insulation_grade, :integer) unless @insulation_grade.nil?
-      XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float) unless @insulation_assembly_r_value.nil?
-      if not @insulation_cavity_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
-      end
-      if not @insulation_continuous_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+      if (not @insulation_assembly_r_value.nil?) || (not @insulation_cavity_r_value.nil?) || (not @insulation_continuous_r_value.nil?)
+        insulation = XMLHelper.add_element(roof, 'Insulation')
+        sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
+        if not @insulation_id.nil?
+          XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
+        else
+          XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
+        end
+        XMLHelper.add_element(insulation, 'InsulationGrade', @insulation_grade, :integer) unless @insulation_grade.nil?
+        XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float, @insulation_assembly_r_value_isdefaulted) unless @insulation_assembly_r_value.nil?
+        if not @insulation_cavity_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
+        end
+        if not @insulation_continuous_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+        end
       end
       @detailed_construction.to_oga(roof)
     end
@@ -2405,6 +2411,10 @@ def is_conditioned
       return HPXML::is_conditioned(self)
     end
 
+    def has_detailed_construction
+      return !@detailed_construction.construction_layers.empty?
+    end
+
     def delete
       @hpxml_object.rim_joists.delete(self)
       @hpxml_object.foundations.each do |foundation|
@@ -2434,23 +2444,25 @@ def to_oga(doc)
       XMLHelper.add_element(rim_joist, 'Color', @color, :string, @color_isdefaulted) unless @color.nil?
       XMLHelper.add_element(rim_joist, 'SolarAbsorptance', @solar_absorptance, :float, @solar_absorptance_isdefaulted) unless @solar_absorptance.nil?
       XMLHelper.add_element(rim_joist, 'Emittance', @emittance, :float, @emittance_isdefaulted) unless @emittance.nil?
-      insulation = XMLHelper.add_element(rim_joist, 'Insulation')
-      sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
-      if not @insulation_id.nil?
-        XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
-      else
-        XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
-      end
-      XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float) unless @insulation_assembly_r_value.nil?
-      if not @insulation_cavity_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
-      end
-      if not @insulation_continuous_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+      if (not @insulation_assembly_r_value.nil?) || (not @insulation_cavity_r_value.nil?) || (not @insulation_continuous_r_value.nil?)
+        insulation = XMLHelper.add_element(rim_joist, 'Insulation')
+        sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
+        if not @insulation_id.nil?
+          XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
+        else
+          XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
+        end
+        XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float, @insulation_assembly_r_value_isdefaulted) unless @insulation_assembly_r_value.nil?
+        if not @insulation_cavity_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
+        end
+        if not @insulation_continuous_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+        end
       end
       if not @framing_size.nil?
         floor_joists = XMLHelper.add_element(rim_joist, 'FloorJoists')
@@ -2560,6 +2572,10 @@ def is_conditioned
       return HPXML::is_conditioned(self)
     end
 
+    def has_detailed_construction
+      return !@detailed_construction.construction_layers.empty?
+    end
+
     def delete
       @hpxml_object.walls.delete(self)
       windows.reverse_each do |window|
@@ -2618,24 +2634,26 @@ def to_oga(doc)
         XMLHelper.add_element(interior_finish, 'Type', @interior_finish_type, :string, @interior_finish_type_isdefaulted) unless @interior_finish_type.nil?
         XMLHelper.add_element(interior_finish, 'Thickness', @interior_finish_thickness, :float, @interior_finish_thickness_isdefaulted) unless @interior_finish_thickness.nil?
       end
-      insulation = XMLHelper.add_element(wall, 'Insulation')
-      sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
-      if not @insulation_id.nil?
-        XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
-      else
-        XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
-      end
-      XMLHelper.add_element(insulation, 'InsulationGrade', @insulation_grade, :integer) unless @insulation_grade.nil?
-      XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float) unless @insulation_assembly_r_value.nil?
-      if not @insulation_cavity_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
-      end
-      if not @insulation_continuous_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+      if (not @insulation_assembly_r_value.nil?) || (not @insulation_cavity_r_value.nil?) || (not @insulation_continuous_r_value.nil?)
+        insulation = XMLHelper.add_element(wall, 'Insulation')
+        sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
+        if not @insulation_id.nil?
+          XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
+        else
+          XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
+        end
+        XMLHelper.add_element(insulation, 'InsulationGrade', @insulation_grade, :integer) unless @insulation_grade.nil?
+        XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float, @insulation_assembly_r_value_isdefaulted) unless @insulation_assembly_r_value.nil?
+        if not @insulation_cavity_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
+        end
+        if not @insulation_continuous_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+        end
       end
       @detailed_construction.to_oga(wall)
     end
@@ -2793,27 +2811,29 @@ def to_oga(doc)
         XMLHelper.add_element(interior_finish, 'Type', @interior_finish_type, :string, @interior_finish_type_isdefaulted) unless @interior_finish_type.nil?
         XMLHelper.add_element(interior_finish, 'Thickness', @interior_finish_thickness, :float, @interior_finish_thickness_isdefaulted) unless @interior_finish_thickness.nil?
       end
-      insulation = XMLHelper.add_element(foundation_wall, 'Insulation')
-      sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
-      if not @insulation_id.nil?
-        XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
-      else
-        XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
-      end
-      XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float) unless @insulation_assembly_r_value.nil?
-      if not @insulation_exterior_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'continuous - exterior', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_exterior_r_value, :float)
-        XMLHelper.add_element(layer, 'DistanceToTopOfInsulation', @insulation_exterior_distance_to_top, :float, @insulation_exterior_distance_to_top_isdefaulted) unless @insulation_exterior_distance_to_top.nil?
-        XMLHelper.add_element(layer, 'DistanceToBottomOfInsulation', @insulation_exterior_distance_to_bottom, :float, @insulation_exterior_distance_to_bottom_isdefaulted) unless @insulation_exterior_distance_to_bottom.nil?
-      end
-      if not @insulation_interior_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'continuous - interior', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_interior_r_value, :float)
-        XMLHelper.add_element(layer, 'DistanceToTopOfInsulation', @insulation_interior_distance_to_top, :float, @insulation_interior_distance_to_top_isdefaulted) unless @insulation_interior_distance_to_top.nil?
-        XMLHelper.add_element(layer, 'DistanceToBottomOfInsulation', @insulation_interior_distance_to_bottom, :float, @insulation_interior_distance_to_bottom_isdefaulted) unless @insulation_interior_distance_to_bottom.nil?
+      if (not @insulation_assembly_r_value.nil?) || (not @insulation_exterior_r_value.nil?) || (not @insulation_interior_r_value.nil?)
+        insulation = XMLHelper.add_element(foundation_wall, 'Insulation')
+        sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
+        if not @insulation_id.nil?
+          XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
+        else
+          XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
+        end
+        XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float, @insulation_assembly_r_value_isdefaulted) unless @insulation_assembly_r_value.nil?
+        if not @insulation_exterior_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'continuous - exterior', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_exterior_r_value, :float)
+          XMLHelper.add_element(layer, 'DistanceToTopOfInsulation', @insulation_exterior_distance_to_top, :float, @insulation_exterior_distance_to_top_isdefaulted) unless @insulation_exterior_distance_to_top.nil?
+          XMLHelper.add_element(layer, 'DistanceToBottomOfInsulation', @insulation_exterior_distance_to_bottom, :float, @insulation_exterior_distance_to_bottom_isdefaulted) unless @insulation_exterior_distance_to_bottom.nil?
+        end
+        if not @insulation_interior_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'continuous - interior', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_interior_r_value, :float)
+          XMLHelper.add_element(layer, 'DistanceToTopOfInsulation', @insulation_interior_distance_to_top, :float, @insulation_interior_distance_to_top_isdefaulted) unless @insulation_interior_distance_to_top.nil?
+          XMLHelper.add_element(layer, 'DistanceToBottomOfInsulation', @insulation_interior_distance_to_bottom, :float, @insulation_interior_distance_to_bottom_isdefaulted) unless @insulation_interior_distance_to_bottom.nil?
+        end
       end
     end
 
@@ -2925,6 +2945,10 @@ def is_conditioned
       return HPXML::is_conditioned(self)
     end
 
+    def has_detailed_construction
+      return !@detailed_construction.construction_layers.empty?
+    end
+
     def delete
       @hpxml_object.floors.delete(self)
       @hpxml_object.attics.each do |attic|
@@ -2970,24 +2994,26 @@ def to_oga(doc)
         XMLHelper.add_element(interior_finish, 'Type', @interior_finish_type, :string, @interior_finish_type_isdefaulted) unless @interior_finish_type.nil?
         XMLHelper.add_element(interior_finish, 'Thickness', @interior_finish_thickness, :float, @interior_finish_thickness_isdefaulted) unless @interior_finish_thickness.nil?
       end
-      insulation = XMLHelper.add_element(floor, 'Insulation')
-      sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
-      if not @insulation_id.nil?
-        XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
-      else
-        XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
-      end
-      XMLHelper.add_element(insulation, 'InsulationGrade', @insulation_grade, :integer) unless @insulation_grade.nil?
-      XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float) unless @insulation_assembly_r_value.nil?
-      if not @insulation_cavity_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
-      end
-      if not @insulation_continuous_r_value.nil?
-        layer = XMLHelper.add_element(insulation, 'Layer')
-        XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
-        XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+      if (not @insulation_assembly_r_value.nil?) || (not @insulation_cavity_r_value.nil?) || (not @insulation_continuous_r_value.nil?)
+        insulation = XMLHelper.add_element(floor, 'Insulation')
+        sys_id = XMLHelper.add_element(insulation, 'SystemIdentifier')
+        if not @insulation_id.nil?
+          XMLHelper.add_attribute(sys_id, 'id', @insulation_id)
+        else
+          XMLHelper.add_attribute(sys_id, 'id', @id + 'Insulation')
+        end
+        XMLHelper.add_element(insulation, 'InsulationGrade', @insulation_grade, :integer) unless @insulation_grade.nil?
+        XMLHelper.add_element(insulation, 'AssemblyEffectiveRValue', @insulation_assembly_r_value, :float, @insulation_assembly_r_value_isdefaulted) unless @insulation_assembly_r_value.nil?
+        if not @insulation_cavity_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'cavity', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_cavity_r_value, :float)
+        end
+        if not @insulation_continuous_r_value.nil?
+          layer = XMLHelper.add_element(insulation, 'Layer')
+          XMLHelper.add_element(layer, 'InstallationType', 'continuous', :string)
+          XMLHelper.add_element(layer, 'NominalRValue', @insulation_continuous_r_value, :float)
+        end
       end
       @detailed_construction.to_oga(floor)
     end
@@ -3587,7 +3613,7 @@ def to_oga(detailed_construction)
 
       construction_layer = XMLHelper.add_element(detailed_construction, 'ConstructionLayer')
       XMLHelper.add_element(construction_layer, 'LayerType', @layer_type, :string) unless @layer_type.nil?
-      XMLHelper.add_element(construction_layer, 'LayerThickness', @layer_thickness, :string) unless @layer_thickness.nil?
+      XMLHelper.add_element(construction_layer, 'LayerThickness', @layer_thickness, :float) unless @layer_thickness.nil?
 
       @layer_materials.to_oga(construction_layer)
     end
@@ -3596,6 +3622,7 @@ def from_oga(construction_layer)
       return if construction_layer.nil?
 
       @layer_type = XMLHelper.get_value(construction_layer, 'LayerType', :string)
+      @layer_thickness = XMLHelper.get_value(construction_layer, 'LayerThickness', :float)
       @layer_materials.from_oga(construction_layer)
     end
   end
diff --git a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
index 30b175fb37..3e44ccda62 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
@@ -13,6 +13,8 @@ def self.apply(runner, hpxml, eri_version, weather, epw_file: nil, schedules_fil
     ncfl_ag = hpxml.building_construction.number_of_conditioned_floors_above_grade
     has_uncond_bsmnt = hpxml.has_location(HPXML::LocationBasementUnconditioned)
     infil_measurement = Airflow.get_infiltration_measurement_of_interest(hpxml.air_infiltration_measurements)
+    apply_ashrae140_assumptions = hpxml.header.apply_ashrae140_assumptions # Hidden feature
+    apply_ashrae140_assumptions = false if apply_ashrae140_assumptions.nil?
 
     # Check for presence of fuels once
     has_fuel = {}
@@ -35,7 +37,7 @@ def self.apply(runner, hpxml, eri_version, weather, epw_file: nil, schedules_fil
     apply_foundations(hpxml)
     apply_roofs(hpxml)
     apply_rim_joists(hpxml)
-    apply_walls(hpxml)
+    apply_walls(hpxml, apply_ashrae140_assumptions)
     apply_foundation_walls(hpxml)
     apply_floors(hpxml)
     apply_slabs(hpxml)
@@ -714,13 +716,25 @@ def self.apply_rim_joists(hpxml)
         rim_joist.orientation_isdefaulted = true
       end
 
+      rim_joist.additional_properties.inside_film = Material.AirFilmVertical
+      if rim_joist.is_exterior
+        rim_joist.additional_properties.outside_film = Material.AirFilmOutside
+      else
+        rim_joist.additional_properties.outside_film = Material.AirFilmVertical
+      end
+
+      if rim_joist.insulation_assembly_r_value.nil?
+        rim_joist.insulation_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(rim_joist)
+        rim_joist.insulation_assembly_r_value_isdefaulted = true
+      end
+
       next unless rim_joist.is_exterior
 
       if rim_joist.emittance.nil?
         rim_joist.emittance = 0.90
         rim_joist.emittance_isdefaulted = true
       end
-      if rim_joist.siding.nil?
+      if rim_joist.siding.nil? && !rim_joist.has_detailed_construction
         rim_joist.siding = HPXML::SidingTypeWood
         rim_joist.siding_isdefaulted = true
       end
@@ -738,7 +752,7 @@ def self.apply_rim_joists(hpxml)
     end
   end
 
-  def self.apply_walls(hpxml)
+  def self.apply_walls(hpxml, apply_ashrae140_assumptions)
     hpxml.walls.each do |wall|
       if wall.azimuth.nil?
         wall.azimuth = get_azimuth_from_orientation(wall.orientation)
@@ -749,12 +763,28 @@ def self.apply_walls(hpxml)
         wall.orientation_isdefaulted = true
       end
 
+      wall.additional_properties.inside_film = Material.AirFilmVertical
+      if wall.is_exterior
+        wall.additional_properties.outside_film = Material.AirFilmOutside
+      else
+        wall.additional_properties.outside_film = Material.AirFilmVertical
+      end
+      if apply_ashrae140_assumptions
+        wall.additional_properties.inside_film = Material.AirFilmVerticalASHRAE140
+        wall.additional_properties.outside_film = Material.AirFilmOutsideASHRAE140
+      end
+
+      if wall.insulation_assembly_r_value.nil?
+        wall.insulation_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(wall)
+        wall.insulation_assembly_r_value_isdefaulted = true
+      end
+
       if wall.is_exterior
         if wall.emittance.nil?
           wall.emittance = 0.90
           wall.emittance_isdefaulted = true
         end
-        if wall.siding.nil?
+        if wall.siding.nil? && !wall.has_detailed_construction
           wall.siding = HPXML::SidingTypeWood
           wall.siding_isdefaulted = true
         end
@@ -770,7 +800,8 @@ def self.apply_walls(hpxml)
           wall.solar_absorptance_isdefaulted = true
         end
       end
-      if wall.interior_finish_type.nil?
+
+      if wall.interior_finish_type.nil? && !wall.has_detailed_construction
         if HPXML::conditioned_finished_locations.include? wall.interior_adjacent_to
           wall.interior_finish_type = HPXML::InteriorFinishGypsumBoard
         else
@@ -780,7 +811,7 @@ def self.apply_walls(hpxml)
       end
       next unless wall.interior_finish_thickness.nil?
 
-      if wall.interior_finish_type != HPXML::InteriorFinishNone
+      if wall.interior_finish_type != HPXML::InteriorFinishNone && !wall.has_detailed_construction
         wall.interior_finish_thickness = 0.5
         wall.interior_finish_thickness_isdefaulted = true
       end
@@ -2907,4 +2938,11 @@ def self.get_nbeds_adjusted_for_operational_calculation(hpxml)
       end
     end
   end
+
+  def self.calculate_assembly_r_value_from_detailed_construction(surface)
+    constr = Constructions.create_from_detailed_construction(surface.detailed_construction,
+                                                             surface.additional_properties.inside_film,
+                                                             surface.additional_properties.outside_film)
+    return constr.assembly_rvalue.round(1)
+  end
 end
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
index 295e9647e5..37a75a2f87 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
+++ b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
@@ -690,14 +690,14 @@
   
   <sch:pattern>
     <sch:title>[DetailedConstruction]</sch:title>
-    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction'>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/*/h:DetailedConstruction'>
       <sch:assert role='ERROR' test='count(h:ConstructionLayer) &gt;= 1'>Expected 1 or more element(s) for xpath: ConstructionLayer</sch:assert> <!-- See [DetailedConstructionLayer] -->
     </sch:rule>
   </sch:pattern>  
   
   <sch:pattern>
     <sch:title>[DetailedConstructionLayer]</sch:title>
-    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction/h:ConstructionLayer'>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/*/h:DetailedConstruction/h:ConstructionLayer'>
       <sch:assert role='ERROR' test='count(h:LayerThickness) = 1'>Expected 1 element(s) for xpath: LayerThickness</sch:assert>
       <sch:assert role='ERROR' test='count(h:LayerMaterial) &gt;= 1'>Expected 1 or more element(s) for xpath: LayerMaterial</sch:assert> <!-- See [DetailedConstructionLayerMaterial] -->
       <sch:assert role='ERROR' test='sum(h:LayerMaterial/h:AreaFraction) &lt;= 1.01 and sum(h:LayerMaterial/h:AreaFraction) &gt;= 0.99'>Expected sum(LayerMaterial/AreaFraction) to be 1</sch:assert>
@@ -706,7 +706,7 @@
 
   <sch:pattern>
     <sch:title>[DetailedConstructionLayerMaterial]</sch:title>
-    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/h:DetailedConstruction/h:ConstructionLayer/h:LayerMaterial'>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/*/h:DetailedConstruction/h:ConstructionLayer/h:LayerMaterial'>
       <sch:assert role='ERROR' test='count(h:AreaFraction) = 1'>Expected 1 element(s) for xpath: AreaFraction</sch:assert>
       <sch:assert role='ERROR' test='count(h:Conductivity) + count(h:RValue) &gt;= 1'>Expected 1 or more element(s) for xpath: Conductivity | RValue</sch:assert>
       <sch:assert role='ERROR' test='count(h:Density) = 1'>Expected 1 element(s) for xpath: Density</sch:assert>
diff --git a/HPXMLtoOpenStudio/resources/hvac_sizing.rb b/HPXMLtoOpenStudio/resources/hvac_sizing.rb
index 3e9af3df6b..41ff050640 100644
--- a/HPXMLtoOpenStudio/resources/hvac_sizing.rb
+++ b/HPXMLtoOpenStudio/resources/hvac_sizing.rb
@@ -2740,10 +2740,17 @@ def self.get_wall_group(wall)
     end
 
     wall_ufactor = 1.0 / wall.insulation_assembly_r_value
+    if not wall.siding.nil?
+      wall_siding_is_brick = (wall.siding == HPXML::SidingTypeBrick)
+    else
+      # Assume brick if at least 50% of the outermost construction layer is very high density
+      exterior_layer = wall.detailed_construction.construction_layers[0]
+      wall_siding_is_brick = exterior_layer.layer_materials.any? { |m| m.area_fraction >= 0.5 && m.density >= 100.0 }
+    end
 
     # The following correlations were estimated by analyzing MJ8 construction tables.
     if wall_type == HPXML::WallTypeWoodStud
-      if wall.siding == HPXML::SidingTypeBrick
+      if wall_siding_is_brick
         if wall_ufactor <= 0.070
           wall_group = 11 # K
         elsif wall_ufactor <= 0.083
@@ -2784,7 +2791,7 @@ def self.get_wall_group(wall)
       end
 
     elsif wall_type == HPXML::WallTypeSteelStud
-      if wall.siding == HPXML::SidingTypeBrick
+      if wall_siding_is_brick
         if wall_ufactor <= 0.090
           wall_group = 11 # K
         elsif wall_ufactor <= 0.105
@@ -2826,20 +2833,20 @@ def self.get_wall_group(wall)
 
     elsif wall_type == HPXML::WallTypeDoubleWoodStud
       wall_group = 10 # J (assumed since MJ8 does not include double stud constructions)
-      if wall.siding == HPXML::SidingTypeBrick
+      if wall_siding_is_brick
         wall_group = 11 # K
       end
 
     elsif wall_type == HPXML::WallTypeSIP
       # Manual J refers to SIPs as Structural Foam Panel (SFP)
       if wall_ufactor >= (0.072 + 0.050) / 2
-        if wall.siding == HPXML::SidingTypeBrick
+        if wall_siding_is_brick
           wall_group = 10 # J
         else
           wall_group = 7 # G
         end
       elsif wall_ufactor >= 0.050
-        if wall.siding == HPXML::SidingTypeBrick
+        if wall_siding_is_brick
           wall_group = 11 # K
         else
           wall_group = 9 # I
diff --git a/tasks.rb b/tasks.rb
index cc9d5f3172..a72fdebb6e 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -1144,36 +1144,48 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                     r_value: 4.4)
   end
   if ['base-enclosure-detailed-constructions.xml'].include? hpxml_file
-    hpxml.walls[0].detailed_construction.id = hpxml.walls[0].id.gsub('Wall', 'WallConstruction')
-    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 0.375)
-    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
-                                                                                     material_type: 'vinyl siding',
-                                                                                     conductivity: 0.052,
-                                                                                     density: 11.1,
-                                                                                     specific_heat: 0.25)
-    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 0.5)
-    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
-                                                                                     material_type: 'osb',
-                                                                                     conductivity: 0.067,
-                                                                                     density: 32.0,
-                                                                                     specific_heat: 0.29)
-    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 3.5)
-    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.25,
-                                                                                     material_type: 'wood stud',
-                                                                                     conductivity: 0.067,
-                                                                                     density: 32.0,
-                                                                                     specific_heat: 0.29)
-    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.75,
-                                                                                     material_type: 'fiberglass batt',
-                                                                                     conductivity: 0.022,
-                                                                                     density: 2.85,
-                                                                                     specific_heat: 0.25)
-    hpxml.walls[0].detailed_construction.construction_layers.add(layer_thickness: 0.5)
-    hpxml.walls[0].detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
-                                                                                     material_type: 'drywall',
-                                                                                     conductivity: 0.093,
-                                                                                     density: 50.0,
-                                                                                     specific_heat: 0.2)
+    (hpxml.walls + hpxml.rim_joists).each_with_index do |surface, i|
+      # Wall 1 (exterior): R-36 Closed Cell Spray Foam, 2x6, 24 in o.c.
+      # Wall 2 (attic gable): Uninsulated, 2x6, 24 in o.c.
+      # RimJoist 1: Same as Wall 1
+      surface.insulation_assembly_r_value = nil
+      surface.siding = nil
+      surface.interior_finish_type = nil if surface.is_a? HPXML::Wall
+      surface.detailed_construction.id = surface.id.gsub('Wall', 'WallConstruction').gsub('RimJoist', 'RimJoistConstruction')
+      surface.detailed_construction.construction_layers.add(layer_thickness: 0.375)
+      surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                                material_type: 'vinyl siding',
+                                                                                conductivity: 0.052,
+                                                                                density: 11.1,
+                                                                                specific_heat: 0.25)
+      surface.detailed_construction.construction_layers.add(layer_thickness: 0.5)
+      surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                                material_type: 'osb',
+                                                                                conductivity: 0.067,
+                                                                                density: 32.0,
+                                                                                specific_heat: 0.29)
+      if (i == 0) || (i == 2)
+        surface.detailed_construction.construction_layers.add(layer_thickness: 5.5)
+        surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.22,
+                                                                                  material_type: 'wood stud',
+                                                                                  conductivity: 0.067,
+                                                                                  density: 32.0,
+                                                                                  specific_heat: 0.29)
+        surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 0.78,
+                                                                                  material_type: 'spray foam',
+                                                                                  r_value: 36.0,
+                                                                                  density: 2.85,
+                                                                                  specific_heat: 0.25)
+      end
+      next unless i == 0
+
+      surface.detailed_construction.construction_layers.add(layer_thickness: 0.5)
+      surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                                material_type: 'gypsum board',
+                                                                                conductivity: 0.093,
+                                                                                density: 50.0,
+                                                                                specific_heat: 0.2)
+    end
   end
 
   # ---------- #
diff --git a/workflow/sample_files/base-enclosure-detailed-constructions.xml b/workflow/sample_files/base-enclosure-detailed-constructions.xml
index 01c6aac8ce..746472a073 100644
--- a/workflow/sample_files/base-enclosure-detailed-constructions.xml
+++ b/workflow/sample_files/base-enclosure-detailed-constructions.xml
@@ -129,13 +129,48 @@
             <ExteriorAdjacentTo>outside</ExteriorAdjacentTo>
             <InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
             <Area>115.6</Area>
-            <Siding>wood siding</Siding>
             <SolarAbsorptance>0.7</SolarAbsorptance>
             <Emittance>0.92</Emittance>
-            <Insulation>
-              <SystemIdentifier id='RimJoist1Insulation'/>
-              <AssemblyEffectiveRValue>23.0</AssemblyEffectiveRValue>
-            </Insulation>
+            <DetailedConstruction>
+              <SystemIdentifier id='RimJoistConstruction1'/>
+              <ConstructionLayer>
+                <LayerThickness>0.375</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>vinyl siding</MaterialType>
+                  <Conductivity>0.052</Conductivity>
+                  <Density>11.1</Density>
+                  <SpecificHeat>0.25</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerThickness>0.5</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>osb</MaterialType>
+                  <Conductivity>0.067</Conductivity>
+                  <Density>32.0</Density>
+                  <SpecificHeat>0.29</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerThickness>5.5</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>0.22</AreaFraction>
+                  <MaterialType>wood stud</MaterialType>
+                  <Conductivity>0.067</Conductivity>
+                  <Density>32.0</Density>
+                  <SpecificHeat>0.29</SpecificHeat>
+                </LayerMaterial>
+                <LayerMaterial>
+                  <AreaFraction>0.78</AreaFraction>
+                  <MaterialType>spray foam</MaterialType>
+                  <Density>2.85</Density>
+                  <SpecificHeat>0.25</SpecificHeat>
+                  <RValue>36.0</RValue>
+                </LayerMaterial>
+              </ConstructionLayer>
+            </DetailedConstruction>
           </RimJoist>
         </RimJoists>
         <Walls>
@@ -147,16 +182,8 @@
               <WoodStud/>
             </WallType>
             <Area>1200.0</Area>
-            <Siding>wood siding</Siding>
             <SolarAbsorptance>0.7</SolarAbsorptance>
             <Emittance>0.92</Emittance>
-            <InteriorFinish>
-              <Type>gypsum board</Type>
-            </InteriorFinish>
-            <Insulation>
-              <SystemIdentifier id='Wall1Insulation'/>
-              <AssemblyEffectiveRValue>23.0</AssemblyEffectiveRValue>
-            </Insulation>
             <DetailedConstruction>
               <SystemIdentifier id='WallConstruction1'/>
               <ConstructionLayer>
@@ -180,27 +207,27 @@
                 </LayerMaterial>
               </ConstructionLayer>
               <ConstructionLayer>
-                <LayerThickness>3.5</LayerThickness>
+                <LayerThickness>5.5</LayerThickness>
                 <LayerMaterial>
-                  <AreaFraction>0.25</AreaFraction>
+                  <AreaFraction>0.22</AreaFraction>
                   <MaterialType>wood stud</MaterialType>
                   <Conductivity>0.067</Conductivity>
                   <Density>32.0</Density>
                   <SpecificHeat>0.29</SpecificHeat>
                 </LayerMaterial>
                 <LayerMaterial>
-                  <AreaFraction>0.75</AreaFraction>
-                  <MaterialType>fiberglass batt</MaterialType>
-                  <Conductivity>0.022</Conductivity>
+                  <AreaFraction>0.78</AreaFraction>
+                  <MaterialType>spray foam</MaterialType>
                   <Density>2.85</Density>
                   <SpecificHeat>0.25</SpecificHeat>
+                  <RValue>36.0</RValue>
                 </LayerMaterial>
               </ConstructionLayer>
               <ConstructionLayer>
                 <LayerThickness>0.5</LayerThickness>
                 <LayerMaterial>
                   <AreaFraction>1.0</AreaFraction>
-                  <MaterialType>drywall</MaterialType>
+                  <MaterialType>gypsum board</MaterialType>
                   <Conductivity>0.093</Conductivity>
                   <Density>50.0</Density>
                   <SpecificHeat>0.2</SpecificHeat>
@@ -217,13 +244,31 @@
               <WoodStud/>
             </WallType>
             <Area>225.0</Area>
-            <Siding>wood siding</Siding>
             <SolarAbsorptance>0.7</SolarAbsorptance>
             <Emittance>0.92</Emittance>
-            <Insulation>
-              <SystemIdentifier id='Wall2Insulation'/>
-              <AssemblyEffectiveRValue>4.0</AssemblyEffectiveRValue>
-            </Insulation>
+            <DetailedConstruction>
+              <SystemIdentifier id='WallConstruction2'/>
+              <ConstructionLayer>
+                <LayerThickness>0.375</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>vinyl siding</MaterialType>
+                  <Conductivity>0.052</Conductivity>
+                  <Density>11.1</Density>
+                  <SpecificHeat>0.25</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerThickness>0.5</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>osb</MaterialType>
+                  <Conductivity>0.067</Conductivity>
+                  <Density>32.0</Density>
+                  <SpecificHeat>0.29</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+            </DetailedConstruction>
           </Wall>
         </Walls>
         <FoundationWalls>

From 9943cd942393bc7ff96ba8483de38c76f573f801 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 19 Apr 2023 19:16:30 -0600
Subject: [PATCH 05/11] Bugfix.

---
 HPXMLtoOpenStudio/measure.xml              | 16 ++++++++--------
 HPXMLtoOpenStudio/resources/hvac_sizing.rb |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index b28f3e0d19..d4fd3cbde3 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>9cce078e-e36c-4623-ab71-99e9ab044646</version_id>
-  <version_modified>20230419T234707Z</version_modified>
+  <version_id>0cec72a6-5ae7-4193-82d0-1ea29b24fcc9</version_id>
+  <version_modified>20230420T011621Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -541,12 +541,6 @@
       <usage_type>resource</usage_type>
       <checksum>CA905BB5</checksum>
     </file>
-    <file>
-      <filename>hvac_sizing.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>6B7F6E84</checksum>
-    </file>
     <file>
       <filename>hpxml_defaults.rb</filename>
       <filetype>rb</filetype>
@@ -582,5 +576,11 @@
       <usage_type>script</usage_type>
       <checksum>D82C0BA0</checksum>
     </file>
+    <file>
+      <filename>hvac_sizing.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>E0149C54</checksum>
+    </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/resources/hvac_sizing.rb b/HPXMLtoOpenStudio/resources/hvac_sizing.rb
index 41ff050640..704e430782 100644
--- a/HPXMLtoOpenStudio/resources/hvac_sizing.rb
+++ b/HPXMLtoOpenStudio/resources/hvac_sizing.rb
@@ -2742,10 +2742,12 @@ def self.get_wall_group(wall)
     wall_ufactor = 1.0 / wall.insulation_assembly_r_value
     if not wall.siding.nil?
       wall_siding_is_brick = (wall.siding == HPXML::SidingTypeBrick)
-    else
+    elsif wall.has_detailed_construction
       # Assume brick if at least 50% of the outermost construction layer is very high density
       exterior_layer = wall.detailed_construction.construction_layers[0]
       wall_siding_is_brick = exterior_layer.layer_materials.any? { |m| m.area_fraction >= 0.5 && m.density >= 100.0 }
+    else
+      wall_siding_is_brick = false
     end
 
     # The following correlations were estimated by analyzing MJ8 construction tables.

From 14c593c399539485d1044d9f8b51cefae4d38db6 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Thu, 20 Apr 2023 02:00:29 +0000
Subject: [PATCH 06/11] Latest results.

---
 workflow/tests/base_results/results.csv       | 2 +-
 workflow/tests/base_results/results_bills.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/tests/base_results/results.csv b/workflow/tests/base_results/results.csv
index 4a961c2d23..d3f6de8ee7 100644
--- a/workflow/tests/base_results/results.csv
+++ b/workflow/tests/base_results/results.csv
@@ -130,7 +130,7 @@ base-enclosure-beds-2.xml,57.09,57.09,33.258,33.258,23.832,0.0,0.0,0.0,0.0,0.0,0
 base-enclosure-beds-4.xml,60.372,60.372,38.533,38.533,21.839,0.0,0.0,0.0,0.0,0.0,0.0,0.36,0.0,0.0,4.432,0.862,10.889,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.376,0.421,1.744,1.661,0.0,2.35,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.839,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.452,0.0,14.56,11.089,0.614,0.0,0.0,0.0,0.0,2192.9,3501.7,22.758,18.225,0.0,3.555,3.64,0.512,7.518,0.629,10.513,-12.551,0.0,0.0,0.0,8.286,-0.06,4.805,0.0,0.729,0.0,4.742,-9.713,-2.498,0.0,-0.061,-0.469,-0.053,2.662,-0.028,-1.969,11.732,0.0,0.0,0.0,-6.384,-0.056,-1.182,-3.147,-0.167,0.0,3.185,8.666,2.012,1562.4,1177.9,13955.4,2960.3,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,19030.0,5341.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3550.0,160.0,0.0,-840.0,1000.0
 base-enclosure-beds-5.xml,61.997,61.997,41.137,41.137,20.859,0.0,0.0,0.0,0.0,0.0,0.0,0.344,0.0,0.0,4.596,0.902,12.591,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.434,0.477,1.976,1.794,0.0,2.585,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.859,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.534,0.0,15.156,12.918,0.613,0.0,0.0,0.0,0.0,2561.6,3797.8,22.461,18.551,0.0,3.566,3.644,0.513,7.535,0.63,10.529,-12.537,0.0,0.0,0.0,8.301,-0.063,4.808,0.0,0.731,0.0,4.545,-10.52,-2.496,0.0,-0.08,-0.484,-0.055,2.615,-0.032,-2.014,11.746,0.0,0.0,0.0,-6.454,-0.059,-1.197,-3.228,-0.169,0.0,3.274,9.46,2.013,1770.0,1358.2,16511.3,3258.4,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,19257.0,5338.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3780.0,360.0,0.0,-840.0,1200.0
 base-enclosure-ceilingtypes.xml,74.877,74.877,36.44,36.44,38.437,0.0,0.0,0.0,0.0,0.0,0.0,0.634,0.0,0.0,4.485,0.877,9.168,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,38.437,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.991,0.0,14.849,9.233,0.618,0.0,0.0,0.0,0.0,2163.1,3369.0,29.367,18.642,0.0,17.257,3.59,0.505,7.246,0.62,10.388,-12.681,0.0,0.0,0.0,7.733,-0.076,4.851,0.0,0.734,0.0,7.068,-9.079,-2.545,0.0,0.155,-0.318,-0.031,2.91,0.01,-1.499,11.603,0.0,0.0,0.0,-6.072,-0.066,-1.008,-2.883,-0.139,0.0,2.725,7.703,1.964,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,44054.0,8851.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,14165.0,4597.0,30006.0,5442.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,13116.0,619.0,3320.0,0.0,0.0,0.0,0.0
-base-enclosure-detailed-constructions.xml,58.744,58.744,35.913,35.913,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.377,0.0,0.0,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,0.0,13.978,9.233,0.614,0.0,0.0,0.0,0.0,2115.4,3297.3,23.056,17.898,0.0,3.542,3.634,0.511,7.499,0.628,10.505,-12.551,0.0,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-8.907,-2.499,0.0,-0.043,-0.455,-0.051,2.706,-0.024,-1.916,11.732,0.0,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,18786.0,5328.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
+base-enclosure-detailed-constructions.xml,58.96,58.96,35.95,35.95,23.009,0.0,0.0,0.0,0.0,0.0,0.0,0.38,0.0,0.0,4.302,0.829,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.009,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.548,0.0,14.07,9.233,0.614,0.0,0.0,0.0,0.0,2114.8,3360.4,23.345,18.449,0.0,3.557,3.663,0.533,7.506,0.629,10.513,-12.551,0.0,0.0,0.0,8.287,-0.065,4.807,0.0,0.728,0.0,5.002,-8.907,-2.499,0.0,-0.063,-0.441,-0.049,2.713,-0.023,-1.91,11.732,0.0,0.0,0.0,-6.303,-0.061,-1.163,-3.048,-0.165,0.0,3.139,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31813.0,8583.0,7508.0,0.0,575.0,6430.0,0.0,0.0,1949.0,2171.0,4597.0,18788.0,5328.0,7037.0,0.0,207.0,267.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-enclosure-floortypes.xml,64.413,64.413,29.406,29.406,35.008,0.0,0.0,0.0,0.0,0.0,0.0,0.578,0.0,0.0,3.665,0.666,9.366,0.0,0.0,2.647,0.0,0.238,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,4.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.008,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.788,0.0,11.166,9.342,0.619,0.0,0.0,0.0,0.0,1757.2,3480.6,27.934,20.789,0.0,3.519,3.647,0.0,0.0,0.654,9.893,-12.804,0.0,0.0,26.42,0.0,-0.18,2.047,0.0,0.786,0.0,7.347,-7.418,-1.565,0.0,0.393,-0.069,0.0,0.0,0.096,0.25,11.037,0.0,0.0,-7.529,0.0,-0.176,-0.275,-1.935,-0.093,0.0,2.755,5.786,1.082,1354.8,997.6,11399.5,2808.9,36000.0,24000.0,0.0,6.8,91.76,37636.0,8721.0,7508.0,0.0,575.0,2198.0,0.0,14165.0,0.0,2171.0,2299.0,19985.0,5355.0,7037.0,0.0,207.0,232.0,0.0,1515.0,0.0,2010.0,310.0,3320.0,380.0,0.0,-420.0,800.0
 base-enclosure-garage.xml,59.052,59.052,34.589,34.589,24.463,0.0,0.0,0.0,0.0,0.0,0.0,0.404,0.0,0.0,2.98,0.521,9.266,0.0,0.0,4.51,0.142,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.463,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.904,0.0,8.709,9.233,0.724,0.0,0.0,0.0,0.0,2122.9,2825.0,18.052,10.754,0.0,3.524,3.783,0.502,5.84,0.613,8.595,-6.603,0.0,0.0,0.0,6.558,-0.041,5.37,0.0,0.0,0.0,3.839,-6.765,-2.508,0.0,0.112,-0.273,-0.035,2.444,0.002,-1.643,8.266,0.0,0.0,0.0,-5.628,-0.038,-1.216,-2.073,0.0,0.0,1.265,5.681,2.001,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,29361.0,8026.0,5506.0,0.0,575.0,6537.0,0.0,0.0,1949.0,2171.0,4597.0,15521.0,3263.0,5579.0,0.0,207.0,523.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-enclosure-infil-ach-house-pressure.xml,58.728,58.728,35.913,35.913,22.815,0.0,0.0,0.0,0.0,0.0,0.0,0.376,0.0,0.0,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.815,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.366,0.0,13.979,9.233,0.614,0.0,0.0,0.0,0.0,2115.3,3297.1,23.045,17.895,0.0,3.542,3.634,0.511,7.499,0.628,10.506,-12.551,0.0,0.0,0.0,8.272,-0.063,4.792,0.0,0.728,0.0,4.937,-8.907,-2.499,0.0,-0.043,-0.455,-0.051,2.706,-0.024,-1.917,11.732,0.0,0.0,0.0,-6.315,-0.059,-1.163,-3.064,-0.165,0.0,3.097,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31789.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4595.0,18786.0,5328.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_bills.csv b/workflow/tests/base_results/results_bills.csv
index 08978acf46..d05c01eaa4 100644
--- a/workflow/tests/base_results/results_bills.csv
+++ b/workflow/tests/base_results/results_bills.csv
@@ -130,7 +130,7 @@ base-enclosure-beds-2.xml,1566.38,144.0,1107.5,0.0,1251.5,144.0,170.88,314.88,0.
 base-enclosure-beds-4.xml,1727.78,144.0,1283.19,0.0,1427.19,144.0,156.59,300.59,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-beds-5.xml,1807.47,144.0,1369.91,0.0,1513.91,144.0,149.56,293.56,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-ceilingtypes.xml,1777.08,144.0,1213.49,0.0,1357.49,144.0,275.59,419.59,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-base-enclosure-detailed-constructions.xml,1647.63,144.0,1195.93,0.0,1339.93,144.0,163.7,307.7,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-enclosure-detailed-constructions.xml,1650.15,144.0,1197.17,0.0,1341.17,144.0,164.98,308.98,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-floortypes.xml,1518.24,144.0,979.24,0.0,1123.24,144.0,251.0,395.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-garage.xml,1615.24,144.0,1151.84,0.0,1295.84,144.0,175.4,319.4,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-infil-ach-house-pressure.xml,1647.51,144.0,1195.93,0.0,1339.93,144.0,163.58,307.58,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

From d202946574c803458fe2b98c6e3916e20781cda7 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Thu, 20 Apr 2023 13:59:56 -0600
Subject: [PATCH 07/11] Add warning (and test) if provided assembly R-value is
 not close to calculated value.

---
 HPXMLtoOpenStudio/measure.xml                 | 28 ++++++-------
 HPXMLtoOpenStudio/resources/hpxml_defaults.rb | 40 ++++++++++++++-----
 HPXMLtoOpenStudio/tests/test_validation.rb    |  6 +++
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index d4fd3cbde3..acd07fa0c7 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>0cec72a6-5ae7-4193-82d0-1ea29b24fcc9</version_id>
-  <version_modified>20230420T011621Z</version_modified>
+  <version_id>d6ed34bb-e63b-495d-8f39-016b11e1bef0</version_id>
+  <version_modified>20230420T195945Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -517,12 +517,6 @@
       <usage_type>resource</usage_type>
       <checksum>7DB288B0</checksum>
     </file>
-    <file>
-      <filename>test_validation.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>F4CE1E69</checksum>
-    </file>
     <file>
       <filename>test_defaults.rb</filename>
       <filetype>rb</filetype>
@@ -541,12 +535,6 @@
       <usage_type>resource</usage_type>
       <checksum>CA905BB5</checksum>
     </file>
-    <file>
-      <filename>hpxml_defaults.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>68FDCFF2</checksum>
-    </file>
     <file>
       <filename>hpxml_schematron/EPvalidator.xml</filename>
       <filetype>xml</filetype>
@@ -582,5 +570,17 @@
       <usage_type>resource</usage_type>
       <checksum>E0149C54</checksum>
     </file>
+    <file>
+      <filename>test_validation.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B2D9CF83</checksum>
+    </file>
+    <file>
+      <filename>hpxml_defaults.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>AD38F94E</checksum>
+    </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
index 3e44ccda62..05279fa107 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
@@ -36,8 +36,8 @@ def self.apply(runner, hpxml, eri_version, weather, epw_file: nil, schedules_fil
     apply_attics(hpxml)
     apply_foundations(hpxml)
     apply_roofs(hpxml)
-    apply_rim_joists(hpxml)
-    apply_walls(hpxml, apply_ashrae140_assumptions)
+    apply_rim_joists(runner, hpxml)
+    apply_walls(runner, hpxml, apply_ashrae140_assumptions)
     apply_foundation_walls(hpxml)
     apply_floors(hpxml)
     apply_slabs(hpxml)
@@ -705,7 +705,7 @@ def self.apply_roofs(hpxml)
     end
   end
 
-  def self.apply_rim_joists(hpxml)
+  def self.apply_rim_joists(runner, hpxml)
     hpxml.rim_joists.each do |rim_joist|
       if rim_joist.azimuth.nil?
         rim_joist.azimuth = get_azimuth_from_orientation(rim_joist.orientation)
@@ -723,9 +723,19 @@ def self.apply_rim_joists(hpxml)
         rim_joist.additional_properties.outside_film = Material.AirFilmVertical
       end
 
-      if rim_joist.insulation_assembly_r_value.nil?
-        rim_joist.insulation_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(rim_joist)
-        rim_joist.insulation_assembly_r_value_isdefaulted = true
+      if rim_joist.has_detailed_construction
+        detailed_construction_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(rim_joist)
+        if rim_joist.insulation_assembly_r_value.nil?
+          rim_joist.insulation_assembly_r_value = detailed_construction_assembly_r_value
+          rim_joist.insulation_assembly_r_value_isdefaulted = true
+        elsif (detailed_construction_assembly_r_value - rim_joist.insulation_assembly_r_value).abs > 1
+          # Detailed construction is more than R-1 different from user-specified assembly R-value
+          if not runner.nil?
+            runner.registerWarning("For rim joist '#{rim_joist.id}', assembly R-value calculated from detailed construction (#{detailed_construction_assembly_r_value}) differs from AssemblyEffectiveRValue (#{rim_joist.insulation_assembly_r_value}). The latter will be overridden.")
+          end
+          rim_joist.insulation_assembly_r_value = detailed_construction_assembly_r_value
+          rim_joist.insulation_assembly_r_value_isdefaulted = true
+        end
       end
 
       next unless rim_joist.is_exterior
@@ -752,7 +762,7 @@ def self.apply_rim_joists(hpxml)
     end
   end
 
-  def self.apply_walls(hpxml, apply_ashrae140_assumptions)
+  def self.apply_walls(runner, hpxml, apply_ashrae140_assumptions)
     hpxml.walls.each do |wall|
       if wall.azimuth.nil?
         wall.azimuth = get_azimuth_from_orientation(wall.orientation)
@@ -774,9 +784,19 @@ def self.apply_walls(hpxml, apply_ashrae140_assumptions)
         wall.additional_properties.outside_film = Material.AirFilmOutsideASHRAE140
       end
 
-      if wall.insulation_assembly_r_value.nil?
-        wall.insulation_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(wall)
-        wall.insulation_assembly_r_value_isdefaulted = true
+      if wall.has_detailed_construction
+        detailed_construction_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(wall)
+        if wall.insulation_assembly_r_value.nil?
+          wall.insulation_assembly_r_value = detailed_construction_assembly_r_value
+          wall.insulation_assembly_r_value_isdefaulted = true
+        elsif (detailed_construction_assembly_r_value - wall.insulation_assembly_r_value).abs > 1
+          # Detailed construction is more than R-1 different from user-specified assembly R-value
+          if not runner.nil?
+            runner.registerWarning("For wall '#{wall.id}', assembly R-value calculated from detailed construction (#{detailed_construction_assembly_r_value}) differs from AssemblyEffectiveRValue (#{wall.insulation_assembly_r_value}). The latter will be overridden.")
+          end
+          wall.insulation_assembly_r_value = detailed_construction_assembly_r_value
+          wall.insulation_assembly_r_value_isdefaulted = true
+        end
       end
 
       if wall.is_exterior
diff --git a/HPXMLtoOpenStudio/tests/test_validation.rb b/HPXMLtoOpenStudio/tests/test_validation.rb
index aaad0a2dac..7a9fe28a71 100644
--- a/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -1221,6 +1221,8 @@ def test_ruby_error_messages
   def test_ruby_warning_messages
     # Test case => Error message
     all_expected_warnings = { 'cfis-undersized-supplemental-fan' => ["CFIS supplemental fan 'VentilationFan2' is undersized (90.0 cfm) compared to the target hourly ventilation rate (110.0 cfm)."],
+                              'detailed-construction-assembly-rvalue' => ["For rim joist 'RimJoist1', assembly R-value calculated from detailed construction (22.2) differs from AssemblyEffectiveRValue (10.0). The latter will be overridden.",
+                                                                          "For wall 'Wall1', assembly R-value calculated from detailed construction (22.9) differs from AssemblyEffectiveRValue (10.0). The latter will be overridden."],
                               'hvac-setpoint-adjustments' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
                               'hvac-setpoint-adjustments-daily-setbacks' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
                               'hvac-setpoint-adjustments-daily-schedules' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
@@ -1302,6 +1304,10 @@ def test_ruby_warning_messages
         hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-mechvent-cfis-supplemental-fan-exhaust.xml'))
         suppl_fan = hpxml.ventilation_fans.find { |f| f.is_cfis_supplemental_fan? }
         suppl_fan.tested_flow_rate = 90.0
+      elsif ['detailed-construction-assembly-rvalue'].include? warning_case
+        hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-detailed-constructions.xml'))
+        hpxml.walls[0].insulation_assembly_r_value = 10
+        hpxml.rim_joists[0].insulation_assembly_r_value = 10
       elsif ['hvac-setpoint-adjustments'].include? warning_case
         hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
         hpxml.hvac_controls[0].heating_setpoint_temp = 76.0

From e16283f559e449614b24f9669e048dce563f522b Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Fri, 21 Apr 2023 10:54:44 -0600
Subject: [PATCH 08/11] Allow resistance-only layers. Implement code for roofs.

---
 BuildResidentialHPXML/measure.xml             |  16 +-
 BuildResidentialHPXML/resources/geometry.rb   |   2 +-
 HPXMLtoOpenStudio/measure.rb                  | 128 ++++++-----
 HPXMLtoOpenStudio/measure.xml                 |  40 ++--
 HPXMLtoOpenStudio/resources/constructions.rb  |  61 +++--
 HPXMLtoOpenStudio/resources/hpxml_defaults.rb | 217 ++++++++++--------
 .../hpxml_schematron/EPvalidator.xml          |  10 +-
 HPXMLtoOpenStudio/resources/hvac_sizing.rb    |  13 +-
 HPXMLtoOpenStudio/resources/materials.rb      |  15 ++
 HPXMLtoOpenStudio/tests/test_validation.rb    |   6 +-
 tasks.rb                                      |  28 ++-
 .../base-enclosure-detailed-constructions.xml |  54 +++--
 12 files changed, 358 insertions(+), 232 deletions(-)

diff --git a/BuildResidentialHPXML/measure.xml b/BuildResidentialHPXML/measure.xml
index 7bfc2f80ad..ee8aa1f954 100644
--- a/BuildResidentialHPXML/measure.xml
+++ b/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>1806b6bb-e9cb-4319-bbde-077b03651e98</version_id>
-  <version_modified>20230411T234612Z</version_modified>
+  <version_id>6820be6b-f3ad-451d-8352-9c875e6aa39d</version_id>
+  <version_modified>20230421T160515Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -6601,12 +6601,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>geometry.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>D9E75C2E</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -6624,5 +6618,11 @@
       <usage_type>test</usage_type>
       <checksum>7F6A3D85</checksum>
     </file>
+    <file>
+      <filename>geometry.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>5184329E</checksum>
+    </file>
   </files>
 </measure>
diff --git a/BuildResidentialHPXML/resources/geometry.rb b/BuildResidentialHPXML/resources/geometry.rb
index e9b35673ba..b10393ee8d 100644
--- a/BuildResidentialHPXML/resources/geometry.rb
+++ b/BuildResidentialHPXML/resources/geometry.rb
@@ -19,7 +19,7 @@ def self.get_abs_azimuth(relative_azimuth, building_orientation)
   def self.get_absolute_tilt(tilt_str, roof_pitch, epw_file)
     tilt_str = tilt_str.downcase
     if tilt_str.start_with? 'roofpitch'
-      roof_angle = Math.atan(roof_pitch / 12.0) * 180.0 / Math::PI
+      roof_angle = UnitConversions.convert(Math.atan(roof_pitch / 12.0), 'rad', 'deg')
       return Float(eval(tilt_str.gsub('roofpitch', roof_angle.to_s)))
     elsif tilt_str.start_with? 'latitude'
       return Float(eval(tilt_str.gsub('latitude', epw_file.latitude.to_s)))
diff --git a/HPXMLtoOpenStudio/measure.rb b/HPXMLtoOpenStudio/measure.rb
index 85909e44ab..0028ac2df2 100644
--- a/HPXMLtoOpenStudio/measure.rb
+++ b/HPXMLtoOpenStudio/measure.rb
@@ -397,72 +397,80 @@ def self.add_roofs(runner, model, spaces)
       next if surfaces.empty?
 
       # Apply construction
-      has_radiant_barrier = roof.radiant_barrier
-      if has_radiant_barrier
-        radiant_barrier_grade = roof.radiant_barrier_grade
-      end
-      # FUTURE: Create Constructions.get_air_film(surface) method; use in measure.rb and hpxml_translator_test.rb
-      inside_film = Material.AirFilmRoof(Geometry.get_roof_pitch([surfaces[0]]))
-      outside_film = Material.AirFilmOutside
-      mat_roofing = Material.RoofMaterial(roof.roof_type)
-      if @apply_ashrae140_assumptions
-        inside_film = Material.AirFilmRoofASHRAE140
-        outside_film = Material.AirFilmOutsideASHRAE140
-      end
-      mat_int_finish = Material.InteriorFinishMaterial(roof.interior_finish_type, roof.interior_finish_thickness)
-      if mat_int_finish.nil?
-        fallback_mat_int_finish = nil
-      else
-        fallback_mat_int_finish = Material.InteriorFinishMaterial(mat_int_finish.name, 0.1) # Try thin material
-      end
 
-      install_grade = 1
-      assembly_r = roof.insulation_assembly_r_value
+      inside_film = roof.additional_properties.inside_film
+      outside_film = roof.additional_properties.outside_film
 
-      if not mat_int_finish.nil?
-        # Closed cavity
-        constr_sets = [
-          WoodStudConstructionSet.new(Material.Stud2x(8.0), 0.07, 20.0, 0.75, mat_int_finish, mat_roofing),    # 2x8, 24" o.c. + R20
-          WoodStudConstructionSet.new(Material.Stud2x(8.0), 0.07, 10.0, 0.75, mat_int_finish, mat_roofing),    # 2x8, 24" o.c. + R10
-          WoodStudConstructionSet.new(Material.Stud2x(8.0), 0.07, 0.0, 0.75, mat_int_finish, mat_roofing),     # 2x8, 24" o.c.
-          WoodStudConstructionSet.new(Material.Stud2x6, 0.07, 0.0, 0.75, mat_int_finish, mat_roofing),         # 2x6, 24" o.c.
-          WoodStudConstructionSet.new(Material.Stud2x4, 0.07, 0.0, 0.5, mat_int_finish, mat_roofing),          # 2x4, 16" o.c.
-          WoodStudConstructionSet.new(Material.Stud2x4, 0.01, 0.0, 0.0, fallback_mat_int_finish, mat_roofing), # Fallback
-        ]
-        match, constr_set, cavity_r = Constructions.pick_wood_stud_construction_set(assembly_r, constr_sets, inside_film, outside_film)
+      if roof.has_detailed_construction
+        # Layer-by-layer construction
+
+        Constructions.apply_detailed_construction(model, surfaces, roof.detailed_construction, inside_film,
+                                                  outside_film, roof.solar_absorptance, roof.emittance)
+
+      else
+        # Assembly R-value
 
-        Constructions.apply_closed_cavity_roof(model, surfaces, "#{roof.id} construction",
-                                               cavity_r, install_grade,
-                                               constr_set.stud.thick_in,
-                                               true, constr_set.framing_factor,
-                                               constr_set.mat_int_finish,
-                                               constr_set.osb_thick_in, constr_set.rigid_r,
+        has_radiant_barrier = roof.radiant_barrier
+        if has_radiant_barrier
+          radiant_barrier_grade = roof.radiant_barrier_grade
+        end
+        # FUTURE: Create Constructions.get_air_film(surface) method; use in measure.rb and hpxml_translator_test.rb
+        mat_roofing = Material.RoofMaterial(roof.roof_type)
+        mat_int_finish = Material.InteriorFinishMaterial(roof.interior_finish_type, roof.interior_finish_thickness)
+        if mat_int_finish.nil?
+          fallback_mat_int_finish = nil
+        else
+          fallback_mat_int_finish = Material.InteriorFinishMaterial(mat_int_finish.name, 0.1) # Try thin material
+        end
+
+        install_grade = 1
+        assembly_r = roof.insulation_assembly_r_value
+
+        if not mat_int_finish.nil?
+          # Closed cavity
+          constr_sets = [
+            WoodStudConstructionSet.new(Material.Stud2x(8.0), 0.07, 20.0, 0.75, mat_int_finish, mat_roofing),    # 2x8, 24" o.c. + R20
+            WoodStudConstructionSet.new(Material.Stud2x(8.0), 0.07, 10.0, 0.75, mat_int_finish, mat_roofing),    # 2x8, 24" o.c. + R10
+            WoodStudConstructionSet.new(Material.Stud2x(8.0), 0.07, 0.0, 0.75, mat_int_finish, mat_roofing),     # 2x8, 24" o.c.
+            WoodStudConstructionSet.new(Material.Stud2x6, 0.07, 0.0, 0.75, mat_int_finish, mat_roofing),         # 2x6, 24" o.c.
+            WoodStudConstructionSet.new(Material.Stud2x4, 0.07, 0.0, 0.5, mat_int_finish, mat_roofing),          # 2x4, 16" o.c.
+            WoodStudConstructionSet.new(Material.Stud2x4, 0.01, 0.0, 0.0, fallback_mat_int_finish, mat_roofing), # Fallback
+          ]
+          match, constr_set, cavity_r = Constructions.pick_wood_stud_construction_set(assembly_r, constr_sets, inside_film, outside_film)
+
+          Constructions.apply_closed_cavity_roof(model, surfaces, "#{roof.id} construction",
+                                                 cavity_r, install_grade,
+                                                 constr_set.stud.thick_in,
+                                                 true, constr_set.framing_factor,
+                                                 constr_set.mat_int_finish,
+                                                 constr_set.osb_thick_in, constr_set.rigid_r,
+                                                 constr_set.mat_ext_finish, has_radiant_barrier,
+                                                 inside_film, outside_film, radiant_barrier_grade,
+                                                 roof.solar_absorptance, roof.emittance)
+        else
+          # Open cavity
+          constr_sets = [
+            GenericConstructionSet.new(10.0, 0.5, nil, mat_roofing), # w/R-10 rigid
+            GenericConstructionSet.new(0.0, 0.5, nil, mat_roofing),  # Standard
+            GenericConstructionSet.new(0.0, 0.0, nil, mat_roofing),  # Fallback
+          ]
+          match, constr_set, layer_r = Constructions.pick_generic_construction_set(assembly_r, constr_sets, inside_film, outside_film)
+
+          cavity_r = 0
+          cavity_ins_thick_in = 0
+          framing_factor = 0
+          framing_thick_in = 0
+
+          Constructions.apply_open_cavity_roof(model, surfaces, "#{roof.id} construction",
+                                               cavity_r, install_grade, cavity_ins_thick_in,
+                                               framing_factor, framing_thick_in,
+                                               constr_set.osb_thick_in, layer_r + constr_set.rigid_r,
                                                constr_set.mat_ext_finish, has_radiant_barrier,
                                                inside_film, outside_film, radiant_barrier_grade,
                                                roof.solar_absorptance, roof.emittance)
-      else
-        # Open cavity
-        constr_sets = [
-          GenericConstructionSet.new(10.0, 0.5, nil, mat_roofing), # w/R-10 rigid
-          GenericConstructionSet.new(0.0, 0.5, nil, mat_roofing),  # Standard
-          GenericConstructionSet.new(0.0, 0.0, nil, mat_roofing),  # Fallback
-        ]
-        match, constr_set, layer_r = Constructions.pick_generic_construction_set(assembly_r, constr_sets, inside_film, outside_film)
-
-        cavity_r = 0
-        cavity_ins_thick_in = 0
-        framing_factor = 0
-        framing_thick_in = 0
-
-        Constructions.apply_open_cavity_roof(model, surfaces, "#{roof.id} construction",
-                                             cavity_r, install_grade, cavity_ins_thick_in,
-                                             framing_factor, framing_thick_in,
-                                             constr_set.osb_thick_in, layer_r + constr_set.rigid_r,
-                                             constr_set.mat_ext_finish, has_radiant_barrier,
-                                             inside_film, outside_film, radiant_barrier_grade,
-                                             roof.solar_absorptance, roof.emittance)
-      end
-      Constructions.check_surface_assembly_rvalue(runner, surfaces, inside_film, outside_film, assembly_r, match)
+        end
+        Constructions.check_surface_assembly_rvalue(runner, surfaces, inside_film, outside_film, assembly_r, match)
+      end
     end
   end
 
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index acd07fa0c7..975739bd04 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>d6ed34bb-e63b-495d-8f39-016b11e1bef0</version_id>
-  <version_modified>20230420T195945Z</version_modified>
+  <version_id>1df8f125-8fab-4ae0-ae40-88f23f1e51a5</version_id>
+  <version_modified>20230421T165351Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -265,12 +265,6 @@
       <usage_type>test</usage_type>
       <checksum>B0CF4C83</checksum>
     </file>
-    <file>
-      <filename>materials.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>24DCB986</checksum>
-    </file>
     <file>
       <filename>test_simcontrols.rb</filename>
       <filetype>rb</filetype>
@@ -535,12 +529,6 @@
       <usage_type>resource</usage_type>
       <checksum>CA905BB5</checksum>
     </file>
-    <file>
-      <filename>hpxml_schematron/EPvalidator.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>37C4E003</checksum>
-    </file>
     <file>
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
@@ -548,10 +536,16 @@
       <checksum>499AD1D2</checksum>
     </file>
     <file>
-      <filename>constructions.rb</filename>
+      <filename>hpxml_schematron/EPvalidator.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>433F44E9</checksum>
+    </file>
+    <file>
+      <filename>materials.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>B6318566</checksum>
+      <checksum>49C655B4</checksum>
     </file>
     <file>
       <version>
@@ -562,25 +556,31 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>D82C0BA0</checksum>
+      <checksum>5D282B98</checksum>
+    </file>
+    <file>
+      <filename>constructions.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>0C36E521</checksum>
     </file>
     <file>
       <filename>hvac_sizing.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E0149C54</checksum>
+      <checksum>03B9DA68</checksum>
     </file>
     <file>
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>B2D9CF83</checksum>
+      <checksum>F976248C</checksum>
     </file>
     <file>
       <filename>hpxml_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>AD38F94E</checksum>
+      <checksum>4E449B9A</checksum>
     </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/resources/constructions.rb b/HPXMLtoOpenStudio/resources/constructions.rb
index 0d0cc5cf38..033a424e28 100644
--- a/HPXMLtoOpenStudio/resources/constructions.rb
+++ b/HPXMLtoOpenStudio/resources/constructions.rb
@@ -33,10 +33,14 @@ def self.create_from_detailed_construction(detailed_construction, inside_film, o
         end
         if not material.conductivity.nil?
           k_in = UnitConversions.convert(material.conductivity, 'ft', 'in')
-        else
+        elsif not layer.layer_thickness.nil?
           k_in = layer.layer_thickness / material.r_value
         end
-        mat = Material.new(name: material_name, thick_in: layer.layer_thickness, k_in: k_in, rho: material.density, cp: material.specific_heat)
+        if not k_in.nil?
+          mat = Material.new(name: material_name, thick_in: layer.layer_thickness, k_in: k_in, rho: material.density, cp: material.specific_heat)
+        else
+          mat = NoMassMaterial.new(name: material_name, rvalue: material.r_value)
+        end
         mats[[i, j]] = mat
       end
     end
@@ -2562,8 +2566,8 @@ def validate
     # Check for valid object types
     @layers_materials.each do |layer_materials|
       layer_materials.each do |mat|
-        if (not mat.is_a? Material)
-          fail 'Invalid construction: Materials must be instances of Material classes.'
+        if (not mat.is_a? Material) && (not mat.is_a? NoMassMaterial)
+          fail 'Invalid construction: Materials must be instances of Material or NoMassMaterial classes.'
         end
       end
     end
@@ -2637,27 +2641,44 @@ def self.create_os_material(model, material)
       mat.setSolarHeatGainCoefficient(material.shgc)
     else
       # Material already exists?
-      model.getStandardOpaqueMaterials.each do |mat|
-        next if !mat.name.to_s.start_with?(material.name)
-        next if mat.roughness.downcase.to_s != 'rough'
-        next if (mat.thickness - UnitConversions.convert(material.thick_in, 'in', 'm')).abs > tolerance
-        next if (mat.conductivity - UnitConversions.convert(material.k, 'Btu/(hr*ft*R)', 'W/(m*K)')).abs > tolerance
-        next if (mat.density - UnitConversions.convert(material.rho, 'lbm/ft^3', 'kg/m^3')).abs > tolerance
-        next if (mat.specificHeat - UnitConversions.convert(material.cp, 'Btu/(lbm*R)', 'J/(kg*K)')).abs > tolerance
-        next if (mat.thermalAbsorptance - material.tAbs.to_f).abs > tolerance
-        next if (mat.solarAbsorptance - material.sAbs.to_f).abs > tolerance
-
-        return mat
+      if material.is_a? Material
+        model.getStandardOpaqueMaterials.each do |mat|
+          next if !mat.name.to_s.start_with?(material.name)
+          next if mat.roughness.downcase.to_s != 'rough'
+          next if (mat.thickness - UnitConversions.convert(material.thick_in, 'in', 'm')).abs > tolerance
+          next if (mat.conductivity - UnitConversions.convert(material.k, 'Btu/(hr*ft*R)', 'W/(m*K)')).abs > tolerance
+          next if (mat.density - UnitConversions.convert(material.rho, 'lbm/ft^3', 'kg/m^3')).abs > tolerance
+          next if (mat.specificHeat - UnitConversions.convert(material.cp, 'Btu/(lbm*R)', 'J/(kg*K)')).abs > tolerance
+          next if (mat.thermalAbsorptance - material.tAbs.to_f).abs > tolerance
+          next if (mat.solarAbsorptance - material.sAbs.to_f).abs > tolerance
+
+          return mat
+        end
+      elsif material.is_a? NoMassMaterial
+        model.getMasslessOpaqueMaterials.each do |mat|
+          next if !mat.name.to_s.start_with?(material.name)
+          next if mat.roughness.downcase.to_s != 'rough'
+          next if (mat.thermalResistance - UnitConversions.convert(material.rvalue, 'hr*ft^2*F/Btu', 'm^2*K/W')).abs > tolerance
+          next if (mat.thermalAbsorptance - material.tAbs.to_f).abs > tolerance
+          next if (mat.solarAbsorptance - material.sAbs.to_f).abs > tolerance
+
+          return mat
+        end
       end
 
       # New material
-      mat = OpenStudio::Model::StandardOpaqueMaterial.new(model)
+      if material.is_a? Material
+        mat = OpenStudio::Model::StandardOpaqueMaterial.new(model)
+        mat.setThickness(UnitConversions.convert(material.thick_in, 'in', 'm'))
+        mat.setConductivity(UnitConversions.convert(material.k, 'Btu/(hr*ft*R)', 'W/(m*K)'))
+        mat.setDensity(UnitConversions.convert(material.rho, 'lbm/ft^3', 'kg/m^3'))
+        mat.setSpecificHeat(UnitConversions.convert(material.cp, 'Btu/(lbm*R)', 'J/(kg*K)'))
+      elsif material.is_a? NoMassMaterial
+        mat = OpenStudio::Model::MasslessOpaqueMaterial.new(model)
+        mat.setThermalResistance(UnitConversions.convert(material.rvalue, 'hr*ft^2*F/Btu', 'm^2*K/W'))
+      end
       mat.setName(name)
       mat.setRoughness('Rough')
-      mat.setThickness(UnitConversions.convert(material.thick_in, 'in', 'm'))
-      mat.setConductivity(UnitConversions.convert(material.k, 'Btu/(hr*ft*R)', 'W/(m*K)'))
-      mat.setDensity(UnitConversions.convert(material.rho, 'lbm/ft^3', 'kg/m^3'))
-      mat.setSpecificHeat(UnitConversions.convert(material.cp, 'Btu/(lbm*R)', 'J/(kg*K)'))
       if not material.tAbs.nil?
         mat.setThermalAbsorptance(material.tAbs)
       end
diff --git a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
index 05279fa107..5f0b7edb70 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
@@ -35,7 +35,7 @@ def self.apply(runner, hpxml, eri_version, weather, epw_file: nil, schedules_fil
     apply_infiltration(hpxml, infil_measurement)
     apply_attics(hpxml)
     apply_foundations(hpxml)
-    apply_roofs(hpxml)
+    apply_roofs(runner, hpxml, apply_ashrae140_assumptions)
     apply_rim_joists(runner, hpxml)
     apply_walls(runner, hpxml, apply_ashrae140_assumptions)
     apply_foundation_walls(hpxml)
@@ -651,7 +651,7 @@ def self.apply_foundations(hpxml)
     end
   end
 
-  def self.apply_roofs(hpxml)
+  def self.apply_roofs(runner, hpxml, apply_ashrae140_assumptions)
     hpxml.roofs.each do |roof|
       if roof.azimuth.nil?
         roof.azimuth = get_azimuth_from_orientation(roof.orientation)
@@ -661,46 +661,70 @@ def self.apply_roofs(hpxml)
         roof.orientation = get_orientation_from_azimuth(roof.azimuth)
         roof.orientation_isdefaulted = true
       end
-      if roof.roof_type.nil?
-        roof.roof_type = HPXML::RoofTypeAsphaltShingles
-        roof.roof_type_isdefaulted = true
-      end
-      if roof.emittance.nil?
-        roof.emittance = 0.90
-        roof.emittance_isdefaulted = true
-      end
-      if roof.radiant_barrier.nil?
-        roof.radiant_barrier = false
-        roof.radiant_barrier_isdefaulted = true
-      end
-      if roof.radiant_barrier && roof.radiant_barrier_grade.nil?
-        roof.radiant_barrier_grade = 1
-        roof.radiant_barrier_grade_isdefaulted = true
-      end
-      if roof.roof_color.nil? && roof.solar_absorptance.nil?
-        roof.roof_color = HPXML::ColorMedium
-        roof.roof_color_isdefaulted = true
-      end
-      if roof.roof_color.nil?
-        roof.roof_color = Constructions.get_default_roof_color(roof.roof_type, roof.solar_absorptance)
-        roof.roof_color_isdefaulted = true
-      elsif roof.solar_absorptance.nil?
-        roof.solar_absorptance = Constructions.get_default_roof_solar_absorptance(roof.roof_type, roof.roof_color)
-        roof.solar_absorptance_isdefaulted = true
-      end
-      if roof.interior_finish_type.nil?
-        if HPXML::conditioned_finished_locations.include? roof.interior_adjacent_to
-          roof.interior_finish_type = HPXML::InteriorFinishGypsumBoard
-        else
-          roof.interior_finish_type = HPXML::InteriorFinishNone
-        end
-        roof.interior_finish_type_isdefaulted = true
+
+      roof_pitch_in_deg = UnitConversions.convert(Math.atan(roof.pitch / 12.0), 'rad', 'deg')
+      roof.additional_properties.inside_film = Material.AirFilmRoof(roof_pitch_in_deg)
+      roof.additional_properties.outside_film = Material.AirFilmOutside
+      if apply_ashrae140_assumptions
+        roof.additional_properties.inside_film = Material.AirFilmRoofASHRAE140
+        roof.additional_properties.outside_film = Material.AirFilmOutsideASHRAE140
       end
-      next unless roof.interior_finish_thickness.nil?
 
-      if roof.interior_finish_type != HPXML::InteriorFinishNone
-        roof.interior_finish_thickness = 0.5
-        roof.interior_finish_thickness_isdefaulted = true
+      if roof.has_detailed_construction
+        # Detailed construction inputs
+        detailed_construction_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(roof)
+        if roof.insulation_assembly_r_value.nil?
+          roof.insulation_assembly_r_value = detailed_construction_assembly_r_value
+          roof.insulation_assembly_r_value_isdefaulted = true
+        elsif (detailed_construction_assembly_r_value - roof.insulation_assembly_r_value).abs > 1
+          # Detailed construction is more than R-1 different from user-specified assembly R-value
+          if not runner.nil?
+            runner.registerWarning("For roof '#{roof.id}', assembly R-value calculated from detailed construction (#{detailed_construction_assembly_r_value}) differs from AssemblyEffectiveRValue (#{roof.insulation_assembly_r_value}). The latter will be overridden.")
+          end
+          roof.insulation_assembly_r_value = detailed_construction_assembly_r_value
+          roof.insulation_assembly_r_value_isdefaulted = true
+        end
+      else
+        # Simple inputs
+        if roof.roof_type.nil?
+          roof.roof_type = HPXML::RoofTypeAsphaltShingles
+          roof.roof_type_isdefaulted = true
+        end
+        if roof.emittance.nil?
+          roof.emittance = 0.90
+          roof.emittance_isdefaulted = true
+        end
+        if roof.radiant_barrier.nil?
+          roof.radiant_barrier = false
+          roof.radiant_barrier_isdefaulted = true
+        end
+        if roof.radiant_barrier && roof.radiant_barrier_grade.nil?
+          roof.radiant_barrier_grade = 1
+          roof.radiant_barrier_grade_isdefaulted = true
+        end
+        if roof.roof_color.nil? && roof.solar_absorptance.nil?
+          roof.roof_color = HPXML::ColorMedium
+          roof.roof_color_isdefaulted = true
+        end
+        if roof.roof_color.nil?
+          roof.roof_color = Constructions.get_default_roof_color(roof.roof_type, roof.solar_absorptance)
+          roof.roof_color_isdefaulted = true
+        elsif roof.solar_absorptance.nil?
+          roof.solar_absorptance = Constructions.get_default_roof_solar_absorptance(roof.roof_type, roof.roof_color)
+          roof.solar_absorptance_isdefaulted = true
+        end
+        if roof.interior_finish_type.nil?
+          if HPXML::conditioned_finished_locations.include? roof.interior_adjacent_to
+            roof.interior_finish_type = HPXML::InteriorFinishGypsumBoard
+          else
+            roof.interior_finish_type = HPXML::InteriorFinishNone
+          end
+          roof.interior_finish_type_isdefaulted = true
+        end
+        if roof.interior_finish_thickness.nil? && roof.interior_finish_type != HPXML::InteriorFinishNone
+          roof.interior_finish_thickness = 0.5
+          roof.interior_finish_thickness_isdefaulted = true
+        end
       end
     end
   end
@@ -724,6 +748,7 @@ def self.apply_rim_joists(runner, hpxml)
       end
 
       if rim_joist.has_detailed_construction
+        # Detailed construction inputs
         detailed_construction_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(rim_joist)
         if rim_joist.insulation_assembly_r_value.nil?
           rim_joist.insulation_assembly_r_value = detailed_construction_assembly_r_value
@@ -736,28 +761,29 @@ def self.apply_rim_joists(runner, hpxml)
           rim_joist.insulation_assembly_r_value = detailed_construction_assembly_r_value
           rim_joist.insulation_assembly_r_value_isdefaulted = true
         end
-      end
-
-      next unless rim_joist.is_exterior
-
-      if rim_joist.emittance.nil?
-        rim_joist.emittance = 0.90
-        rim_joist.emittance_isdefaulted = true
-      end
-      if rim_joist.siding.nil? && !rim_joist.has_detailed_construction
-        rim_joist.siding = HPXML::SidingTypeWood
-        rim_joist.siding_isdefaulted = true
-      end
-      if rim_joist.color.nil? && rim_joist.solar_absorptance.nil?
-        rim_joist.color = HPXML::ColorMedium
-        rim_joist.color_isdefaulted = true
-      end
-      if rim_joist.color.nil?
-        rim_joist.color = Constructions.get_default_wall_color(rim_joist.solar_absorptance)
-        rim_joist.color_isdefaulted = true
-      elsif rim_joist.solar_absorptance.nil?
-        rim_joist.solar_absorptance = Constructions.get_default_wall_solar_absorptance(rim_joist.color)
-        rim_joist.solar_absorptance_isdefaulted = true
+      else
+        # Simple inputs
+        if rim_joist.is_exterior
+          if rim_joist.emittance.nil?
+            rim_joist.emittance = 0.90
+            rim_joist.emittance_isdefaulted = true
+          end
+          if rim_joist.siding.nil?
+            rim_joist.siding = HPXML::SidingTypeWood
+            rim_joist.siding_isdefaulted = true
+          end
+          if rim_joist.color.nil? && rim_joist.solar_absorptance.nil?
+            rim_joist.color = HPXML::ColorMedium
+            rim_joist.color_isdefaulted = true
+          end
+          if rim_joist.color.nil?
+            rim_joist.color = Constructions.get_default_wall_color(rim_joist.solar_absorptance)
+            rim_joist.color_isdefaulted = true
+          elsif rim_joist.solar_absorptance.nil?
+            rim_joist.solar_absorptance = Constructions.get_default_wall_solar_absorptance(rim_joist.color)
+            rim_joist.solar_absorptance_isdefaulted = true
+          end
+        end
       end
     end
   end
@@ -785,6 +811,7 @@ def self.apply_walls(runner, hpxml, apply_ashrae140_assumptions)
       end
 
       if wall.has_detailed_construction
+        # Detailed construction inputs
         detailed_construction_assembly_r_value = calculate_assembly_r_value_from_detailed_construction(wall)
         if wall.insulation_assembly_r_value.nil?
           wall.insulation_assembly_r_value = detailed_construction_assembly_r_value
@@ -797,43 +824,41 @@ def self.apply_walls(runner, hpxml, apply_ashrae140_assumptions)
           wall.insulation_assembly_r_value = detailed_construction_assembly_r_value
           wall.insulation_assembly_r_value_isdefaulted = true
         end
-      end
-
-      if wall.is_exterior
-        if wall.emittance.nil?
-          wall.emittance = 0.90
-          wall.emittance_isdefaulted = true
-        end
-        if wall.siding.nil? && !wall.has_detailed_construction
-          wall.siding = HPXML::SidingTypeWood
-          wall.siding_isdefaulted = true
-        end
-        if wall.color.nil? && wall.solar_absorptance.nil?
-          wall.color = HPXML::ColorMedium
-          wall.color_isdefaulted = true
+      else
+        # Simple inputs
+        if wall.is_exterior
+          if wall.emittance.nil?
+            wall.emittance = 0.90
+            wall.emittance_isdefaulted = true
+          end
+          if wall.siding.nil?
+            wall.siding = HPXML::SidingTypeWood
+            wall.siding_isdefaulted = true
+          end
+          if wall.color.nil?
+            wall.color = HPXML::ColorMedium
+            wall.color_isdefaulted = true
+          end
+          if wall.color.nil?
+            wall.color = Constructions.get_default_wall_color(wall.solar_absorptance)
+            wall.color_isdefaulted = true
+          elsif wall.solar_absorptance.nil?
+            wall.solar_absorptance = Constructions.get_default_wall_solar_absorptance(wall.color)
+            wall.solar_absorptance_isdefaulted = true
+          end
         end
-        if wall.color.nil?
-          wall.color = Constructions.get_default_wall_color(wall.solar_absorptance)
-          wall.color_isdefaulted = true
-        elsif wall.solar_absorptance.nil?
-          wall.solar_absorptance = Constructions.get_default_wall_solar_absorptance(wall.color)
-          wall.solar_absorptance_isdefaulted = true
+        if wall.interior_finish_type.nil?
+          if HPXML::conditioned_finished_locations.include? wall.interior_adjacent_to
+            wall.interior_finish_type = HPXML::InteriorFinishGypsumBoard
+          else
+            wall.interior_finish_type = HPXML::InteriorFinishNone
+          end
+          wall.interior_finish_type_isdefaulted = true
         end
-      end
-
-      if wall.interior_finish_type.nil? && !wall.has_detailed_construction
-        if HPXML::conditioned_finished_locations.include? wall.interior_adjacent_to
-          wall.interior_finish_type = HPXML::InteriorFinishGypsumBoard
-        else
-          wall.interior_finish_type = HPXML::InteriorFinishNone
+        if wall.interior_finish_thickness.nil? && wall.interior_finish_type != HPXML::InteriorFinishNone
+          wall.interior_finish_thickness = 0.5
+          wall.interior_finish_thickness_isdefaulted = true
         end
-        wall.interior_finish_type_isdefaulted = true
-      end
-      next unless wall.interior_finish_thickness.nil?
-
-      if wall.interior_finish_type != HPXML::InteriorFinishNone && !wall.has_detailed_construction
-        wall.interior_finish_thickness = 0.5
-        wall.interior_finish_thickness_isdefaulted = true
       end
     end
   end
diff --git a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
index 37a75a2f87..01c93ec246 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
+++ b/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
@@ -698,7 +698,6 @@
   <sch:pattern>
     <sch:title>[DetailedConstructionLayer]</sch:title>
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/*/h:DetailedConstruction/h:ConstructionLayer'>
-      <sch:assert role='ERROR' test='count(h:LayerThickness) = 1'>Expected 1 element(s) for xpath: LayerThickness</sch:assert>
       <sch:assert role='ERROR' test='count(h:LayerMaterial) &gt;= 1'>Expected 1 or more element(s) for xpath: LayerMaterial</sch:assert> <!-- See [DetailedConstructionLayerMaterial] -->
       <sch:assert role='ERROR' test='sum(h:LayerMaterial/h:AreaFraction) &lt;= 1.01 and sum(h:LayerMaterial/h:AreaFraction) &gt;= 0.99'>Expected sum(LayerMaterial/AreaFraction) to be 1</sch:assert>
     </sch:rule>
@@ -708,7 +707,14 @@
     <sch:title>[DetailedConstructionLayerMaterial]</sch:title>
     <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/*/h:DetailedConstruction/h:ConstructionLayer/h:LayerMaterial'>
       <sch:assert role='ERROR' test='count(h:AreaFraction) = 1'>Expected 1 element(s) for xpath: AreaFraction</sch:assert>
-      <sch:assert role='ERROR' test='count(h:Conductivity) + count(h:RValue) &gt;= 1'>Expected 1 or more element(s) for xpath: Conductivity | RValue</sch:assert>
+      <sch:assert role='ERROR' test='count(h:Conductivity) + count(h:RValue) &gt;= 1'>Expected 1 or more element(s) for xpath: Conductivity | RValue</sch:assert> <!-- See [DetailedConstructionLayerMaterial=Detailed] -->
+    </sch:rule>
+  </sch:pattern>  
+
+  <sch:pattern>
+    <sch:title>[DetailedConstructionLayerMaterial=Detailed]</sch:title>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Enclosure/*/*/h:DetailedConstruction/h:ConstructionLayer/h:LayerMaterial[h:Conductivity and not(h:RValue)]'>
+      <sch:assert role='ERROR' test='count(../h:LayerThickness) = 1'>Expected 1 element(s) for xpath: ../LayerThickness</sch:assert>
       <sch:assert role='ERROR' test='count(h:Density) = 1'>Expected 1 element(s) for xpath: Density</sch:assert>
       <sch:assert role='ERROR' test='count(h:SpecificHeat) = 1'>Expected 1 element(s) for xpath: SpecificHeat</sch:assert>
     </sch:rule>
diff --git a/HPXMLtoOpenStudio/resources/hvac_sizing.rb b/HPXMLtoOpenStudio/resources/hvac_sizing.rb
index 704e430782..0e4e7cd254 100644
--- a/HPXMLtoOpenStudio/resources/hvac_sizing.rb
+++ b/HPXMLtoOpenStudio/resources/hvac_sizing.rb
@@ -742,14 +742,19 @@ def self.process_load_walls(bldg_design_loads)
         wall_area = wall.net_area
       end
 
+      solar_absorptance = wall.solar_absorptance
+      if solar_absorptance.nil?
+        solar_absorptance = 0.9 # FIXME: Temporary
+      end
+
       azimuths.each do |azimuth|
         if wall.is_exterior
 
           # Adjust base Cooling Load Temperature Difference (CLTD)
           # Assume absorptivity for light walls < 0.5, medium walls <= 0.75, dark walls > 0.75 (based on MJ8 Table 4B Notes)
-          if wall.solar_absorptance <= 0.5
+          if solar_absorptance <= 0.5
             colorMultiplier = 0.65      # MJ8 Table 4B Notes, pg 348
-          elsif wall.solar_absorptance <= 0.75
+          elsif solar_absorptance <= 0.75
             colorMultiplier = 0.83      # MJ8 Appendix 12, pg 519
           else
             colorMultiplier = 1.0
@@ -3457,10 +3462,10 @@ def initial
 
 class Numeric
   def deg2rad
-    self * Math::PI / 180
+    self * UnitConversions.convert(1.0, 'deg', 'rad')
   end
 
   def rad2deg
-    self * 180 / Math::PI
+    self * UnitConversions.convert(1.0, 'rad', 'deg')
   end
 end
diff --git a/HPXMLtoOpenStudio/resources/materials.rb b/HPXMLtoOpenStudio/resources/materials.rb
index 012f0d774e..8aba8363ed 100644
--- a/HPXMLtoOpenStudio/resources/materials.rb
+++ b/HPXMLtoOpenStudio/resources/materials.rb
@@ -424,6 +424,21 @@ def self.StrawBale
   end
 end
 
+class NoMassMaterial
+  # name - NoMassMaterial name
+  # rvalue - R-value (h-ft^2-F/Btu)
+  # tAbs - thermal absorptance (emittance); 0.9 is EnergyPlus default
+  # sAbs - solar absorptance; 0.7 is EnergyPlus default
+  def initialize(name: nil, rvalue:, tAbs: 0.9, sAbs: 0.7)
+    @name = name
+    @rvalue = rvalue
+    @tAbs = tAbs
+    @sAbs = sAbs
+  end
+
+  attr_accessor :name, :rvalue, :tAbs, :sAbs
+end
+
 class GlazingMaterial
   def initialize(name:, ufactor:, shgc:)
     @name = name
diff --git a/HPXMLtoOpenStudio/tests/test_validation.rb b/HPXMLtoOpenStudio/tests/test_validation.rb
index 7a9fe28a71..80ba0e45ba 100644
--- a/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -1221,8 +1221,9 @@ def test_ruby_error_messages
   def test_ruby_warning_messages
     # Test case => Error message
     all_expected_warnings = { 'cfis-undersized-supplemental-fan' => ["CFIS supplemental fan 'VentilationFan2' is undersized (90.0 cfm) compared to the target hourly ventilation rate (110.0 cfm)."],
-                              'detailed-construction-assembly-rvalue' => ["For rim joist 'RimJoist1', assembly R-value calculated from detailed construction (22.2) differs from AssemblyEffectiveRValue (10.0). The latter will be overridden.",
-                                                                          "For wall 'Wall1', assembly R-value calculated from detailed construction (22.9) differs from AssemblyEffectiveRValue (10.0). The latter will be overridden."],
+                              'detailed-construction-assembly-rvalue' => ["For rim joist 'RimJoist1', assembly R-value calculated from detailed construction (22.9) differs from AssemblyEffectiveRValue (10.0). The latter will be overridden.",
+                                                                          "For wall 'Wall1', assembly R-value calculated from detailed construction (22.9) differs from AssemblyEffectiveRValue (10.0). The latter will be overridden.",
+                                                                          "For roof 'Roof1', assembly R-value calculated from detailed construction (2.3) differs from AssemblyEffectiveRValue (10.0). The latter will be overridden."],
                               'hvac-setpoint-adjustments' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
                               'hvac-setpoint-adjustments-daily-setbacks' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
                               'hvac-setpoint-adjustments-daily-schedules' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
@@ -1308,6 +1309,7 @@ def test_ruby_warning_messages
         hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-enclosure-detailed-constructions.xml'))
         hpxml.walls[0].insulation_assembly_r_value = 10
         hpxml.rim_joists[0].insulation_assembly_r_value = 10
+        hpxml.roofs[0].insulation_assembly_r_value = 10
       elsif ['hvac-setpoint-adjustments'].include? warning_case
         hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
         hpxml.hvac_controls[0].heating_setpoint_temp = 76.0
diff --git a/tasks.rb b/tasks.rb
index a72fdebb6e..5add4598bf 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -1144,12 +1144,14 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                     r_value: 4.4)
   end
   if ['base-enclosure-detailed-constructions.xml'].include? hpxml_file
+    # Wall 1 (exterior): R-36 Closed Cell Spray Foam, 2x6, 24 in o.c.
+    # Wall 2 (attic gable): Uninsulated, 2x6, 24 in o.c., open cavity
+    # RimJoist 1: Same as Wall 1
     (hpxml.walls + hpxml.rim_joists).each_with_index do |surface, i|
-      # Wall 1 (exterior): R-36 Closed Cell Spray Foam, 2x6, 24 in o.c.
-      # Wall 2 (attic gable): Uninsulated, 2x6, 24 in o.c.
-      # RimJoist 1: Same as Wall 1
       surface.insulation_assembly_r_value = nil
       surface.siding = nil
+      surface.solar_absorptance = nil
+      surface.emittance = nil
       surface.interior_finish_type = nil if surface.is_a? HPXML::Wall
       surface.detailed_construction.id = surface.id.gsub('Wall', 'WallConstruction').gsub('RimJoist', 'RimJoistConstruction')
       surface.detailed_construction.construction_layers.add(layer_thickness: 0.375)
@@ -1177,8 +1179,6 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                                                                   density: 2.85,
                                                                                   specific_heat: 0.25)
       end
-      next unless i == 0
-
       surface.detailed_construction.construction_layers.add(layer_thickness: 0.5)
       surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
                                                                                 material_type: 'gypsum board',
@@ -1186,6 +1186,24 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                                                                 density: 50.0,
                                                                                 specific_heat: 0.2)
     end
+    # Roof: Uninsulated, asphalt shingles
+    surface = hpxml.roofs[0]
+    surface.insulation_assembly_r_value = nil
+    surface.roof_type = nil
+    surface.solar_absorptance = nil
+    surface.emittance = nil
+    surface.radiant_barrier = nil
+    surface.detailed_construction.id = surface.id.gsub('Roof', 'RoofConstruction')
+    surface.detailed_construction.construction_layers.add()
+    surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                              material_type: 'asphalt shingles',
+                                                                              r_value: 0.44)
+    surface.detailed_construction.construction_layers.add(layer_thickness: 0.75)
+    surface.detailed_construction.construction_layers[-1].layer_materials.add(area_fraction: 1.0,
+                                                                              material_type: 'osb',
+                                                                              conductivity: 0.067,
+                                                                              density: 32.0,
+                                                                              specific_heat: 0.29)
   end
 
   # ---------- #
diff --git a/workflow/sample_files/base-enclosure-detailed-constructions.xml b/workflow/sample_files/base-enclosure-detailed-constructions.xml
index 746472a073..5f1a22d2d2 100644
--- a/workflow/sample_files/base-enclosure-detailed-constructions.xml
+++ b/workflow/sample_files/base-enclosure-detailed-constructions.xml
@@ -112,15 +112,27 @@
             <SystemIdentifier id='Roof1'/>
             <InteriorAdjacentTo>attic - unvented</InteriorAdjacentTo>
             <Area>1509.3</Area>
-            <RoofType>asphalt or fiberglass shingles</RoofType>
-            <SolarAbsorptance>0.7</SolarAbsorptance>
-            <Emittance>0.92</Emittance>
             <Pitch>6.0</Pitch>
-            <RadiantBarrier>false</RadiantBarrier>
-            <Insulation>
-              <SystemIdentifier id='Roof1Insulation'/>
-              <AssemblyEffectiveRValue>2.3</AssemblyEffectiveRValue>
-            </Insulation>
+            <DetailedConstruction>
+              <SystemIdentifier id='RoofConstruction1'/>
+              <ConstructionLayer>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>asphalt shingles</MaterialType>
+                  <RValue>0.44</RValue>
+                </LayerMaterial>
+              </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerThickness>0.75</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>osb</MaterialType>
+                  <Conductivity>0.067</Conductivity>
+                  <Density>32.0</Density>
+                  <SpecificHeat>0.29</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
+            </DetailedConstruction>
           </Roof>
         </Roofs>
         <RimJoists>
@@ -129,8 +141,6 @@
             <ExteriorAdjacentTo>outside</ExteriorAdjacentTo>
             <InteriorAdjacentTo>basement - conditioned</InteriorAdjacentTo>
             <Area>115.6</Area>
-            <SolarAbsorptance>0.7</SolarAbsorptance>
-            <Emittance>0.92</Emittance>
             <DetailedConstruction>
               <SystemIdentifier id='RimJoistConstruction1'/>
               <ConstructionLayer>
@@ -170,6 +180,16 @@
                   <RValue>36.0</RValue>
                 </LayerMaterial>
               </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerThickness>0.5</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>gypsum board</MaterialType>
+                  <Conductivity>0.093</Conductivity>
+                  <Density>50.0</Density>
+                  <SpecificHeat>0.2</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
             </DetailedConstruction>
           </RimJoist>
         </RimJoists>
@@ -182,8 +202,6 @@
               <WoodStud/>
             </WallType>
             <Area>1200.0</Area>
-            <SolarAbsorptance>0.7</SolarAbsorptance>
-            <Emittance>0.92</Emittance>
             <DetailedConstruction>
               <SystemIdentifier id='WallConstruction1'/>
               <ConstructionLayer>
@@ -244,8 +262,6 @@
               <WoodStud/>
             </WallType>
             <Area>225.0</Area>
-            <SolarAbsorptance>0.7</SolarAbsorptance>
-            <Emittance>0.92</Emittance>
             <DetailedConstruction>
               <SystemIdentifier id='WallConstruction2'/>
               <ConstructionLayer>
@@ -268,6 +284,16 @@
                   <SpecificHeat>0.29</SpecificHeat>
                 </LayerMaterial>
               </ConstructionLayer>
+              <ConstructionLayer>
+                <LayerThickness>0.5</LayerThickness>
+                <LayerMaterial>
+                  <AreaFraction>1.0</AreaFraction>
+                  <MaterialType>gypsum board</MaterialType>
+                  <Conductivity>0.093</Conductivity>
+                  <Density>50.0</Density>
+                  <SpecificHeat>0.2</SpecificHeat>
+                </LayerMaterial>
+              </ConstructionLayer>
             </DetailedConstruction>
           </Wall>
         </Walls>

From 388206c6477ec644a87cf22d41addd740a0e2555 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Fri, 21 Apr 2023 12:54:31 -0600
Subject: [PATCH 09/11] Fix CI tests

---
 HPXMLtoOpenStudio/measure.xml                 | 18 +++++++++---------
 HPXMLtoOpenStudio/resources/hpxml_defaults.rb |  2 +-
 workflow/tests/hpxml_translator_test.rb       | 10 ++++++----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index 975739bd04..f7101775ed 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>1df8f125-8fab-4ae0-ae40-88f23f1e51a5</version_id>
-  <version_modified>20230421T165351Z</version_modified>
+  <version_id>6ada1714-e75e-47f8-975a-93d1ff86c4d9</version_id>
+  <version_modified>20230421T185421Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -511,12 +511,6 @@
       <usage_type>resource</usage_type>
       <checksum>7DB288B0</checksum>
     </file>
-    <file>
-      <filename>test_defaults.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>1CBB4D41</checksum>
-    </file>
     <file>
       <filename>airflow.rb</filename>
       <filetype>rb</filetype>
@@ -580,7 +574,13 @@
       <filename>hpxml_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>4E449B9A</checksum>
+      <checksum>7FE92603</checksum>
+    </file>
+    <file>
+      <filename>test_defaults.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1CBB4D41</checksum>
     </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
index 5f0b7edb70..87040fc98b 100644
--- a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
+++ b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb
@@ -835,7 +835,7 @@ def self.apply_walls(runner, hpxml, apply_ashrae140_assumptions)
             wall.siding = HPXML::SidingTypeWood
             wall.siding_isdefaulted = true
           end
-          if wall.color.nil?
+          if wall.color.nil? && wall.solar_absorptance.nil?
             wall.color = HPXML::ColorMedium
             wall.color_isdefaulted = true
           end
diff --git a/workflow/tests/hpxml_translator_test.rb b/workflow/tests/hpxml_translator_test.rb
index 54c418b700..ecb190995f 100644
--- a/workflow/tests/hpxml_translator_test.rb
+++ b/workflow/tests/hpxml_translator_test.rb
@@ -667,10 +667,12 @@ def _verify_outputs(rundir, hpxml_path, results, hpxml)
       assert_in_epsilon(hpxml_value, sql_value, 0.1)
 
       # Solar absorptance
-      hpxml_value = roof.solar_absorptance
-      query = "SELECT AVG(Value) FROM TabularDataWithStrings WHERE ReportName='EnvelopeSummary' AND ReportForString='Entire Facility' AND TableName='Opaque Exterior' AND (RowName='#{roof_id}' OR RowName LIKE '#{roof_id}:%') AND ColumnName='Reflectance'"
-      sql_value = 1.0 - sqlFile.execAndReturnFirstDouble(query).get
-      assert_in_epsilon(hpxml_value, sql_value, 0.01)
+      if not roof.solar_absorptance.nil?
+        hpxml_value = roof.solar_absorptance
+        query = "SELECT AVG(Value) FROM TabularDataWithStrings WHERE ReportName='EnvelopeSummary' AND ReportForString='Entire Facility' AND TableName='Opaque Exterior' AND (RowName='#{roof_id}' OR RowName LIKE '#{roof_id}:%') AND ColumnName='Reflectance'"
+        sql_value = 1.0 - sqlFile.execAndReturnFirstDouble(query).get
+        assert_in_epsilon(hpxml_value, sql_value, 0.01)
+      end
 
       # Tilt
       hpxml_value = UnitConversions.convert(Math.atan(roof.pitch / 12.0), 'rad', 'deg')

From bb919e4a5c2c5c94cd6d50775212462cdf3d8f0e Mon Sep 17 00:00:00 2001
From: GitHub Action <github-action@users.noreply.github.com>
Date: Fri, 21 Apr 2023 19:39:02 +0000
Subject: [PATCH 10/11] Latest results.

---
 workflow/tests/base_results/results.csv       | 2 +-
 workflow/tests/base_results/results_bills.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/tests/base_results/results.csv b/workflow/tests/base_results/results.csv
index d3f6de8ee7..fa2296dd2f 100644
--- a/workflow/tests/base_results/results.csv
+++ b/workflow/tests/base_results/results.csv
@@ -130,7 +130,7 @@ base-enclosure-beds-2.xml,57.09,57.09,33.258,33.258,23.832,0.0,0.0,0.0,0.0,0.0,0
 base-enclosure-beds-4.xml,60.372,60.372,38.533,38.533,21.839,0.0,0.0,0.0,0.0,0.0,0.0,0.36,0.0,0.0,4.432,0.862,10.889,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.376,0.421,1.744,1.661,0.0,2.35,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.839,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.452,0.0,14.56,11.089,0.614,0.0,0.0,0.0,0.0,2192.9,3501.7,22.758,18.225,0.0,3.555,3.64,0.512,7.518,0.629,10.513,-12.551,0.0,0.0,0.0,8.286,-0.06,4.805,0.0,0.729,0.0,4.742,-9.713,-2.498,0.0,-0.061,-0.469,-0.053,2.662,-0.028,-1.969,11.732,0.0,0.0,0.0,-6.384,-0.056,-1.182,-3.147,-0.167,0.0,3.185,8.666,2.012,1562.4,1177.9,13955.4,2960.3,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,19030.0,5341.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3550.0,160.0,0.0,-840.0,1000.0
 base-enclosure-beds-5.xml,61.997,61.997,41.137,41.137,20.859,0.0,0.0,0.0,0.0,0.0,0.0,0.344,0.0,0.0,4.596,0.902,12.591,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.434,0.477,1.976,1.794,0.0,2.585,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.859,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.534,0.0,15.156,12.918,0.613,0.0,0.0,0.0,0.0,2561.6,3797.8,22.461,18.551,0.0,3.566,3.644,0.513,7.535,0.63,10.529,-12.537,0.0,0.0,0.0,8.301,-0.063,4.808,0.0,0.731,0.0,4.545,-10.52,-2.496,0.0,-0.08,-0.484,-0.055,2.615,-0.032,-2.014,11.746,0.0,0.0,0.0,-6.454,-0.059,-1.197,-3.228,-0.169,0.0,3.274,9.46,2.013,1770.0,1358.2,16511.3,3258.4,36000.0,24000.0,0.0,6.8,91.76,31792.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4597.0,19257.0,5338.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3780.0,360.0,0.0,-840.0,1200.0
 base-enclosure-ceilingtypes.xml,74.877,74.877,36.44,36.44,38.437,0.0,0.0,0.0,0.0,0.0,0.0,0.634,0.0,0.0,4.485,0.877,9.168,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,38.437,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.991,0.0,14.849,9.233,0.618,0.0,0.0,0.0,0.0,2163.1,3369.0,29.367,18.642,0.0,17.257,3.59,0.505,7.246,0.62,10.388,-12.681,0.0,0.0,0.0,7.733,-0.076,4.851,0.0,0.734,0.0,7.068,-9.079,-2.545,0.0,0.155,-0.318,-0.031,2.91,0.01,-1.499,11.603,0.0,0.0,0.0,-6.072,-0.066,-1.008,-2.883,-0.139,0.0,2.725,7.703,1.964,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,44054.0,8851.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,14165.0,4597.0,30006.0,5442.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,13116.0,619.0,3320.0,0.0,0.0,0.0,0.0
-base-enclosure-detailed-constructions.xml,58.96,58.96,35.95,35.95,23.009,0.0,0.0,0.0,0.0,0.0,0.0,0.38,0.0,0.0,4.302,0.829,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.009,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.548,0.0,14.07,9.233,0.614,0.0,0.0,0.0,0.0,2114.8,3360.4,23.345,18.449,0.0,3.557,3.663,0.533,7.506,0.629,10.513,-12.551,0.0,0.0,0.0,8.287,-0.065,4.807,0.0,0.728,0.0,5.002,-8.907,-2.499,0.0,-0.063,-0.441,-0.049,2.713,-0.023,-1.91,11.732,0.0,0.0,0.0,-6.303,-0.061,-1.163,-3.048,-0.165,0.0,3.139,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31813.0,8583.0,7508.0,0.0,575.0,6430.0,0.0,0.0,1949.0,2171.0,4597.0,18788.0,5328.0,7037.0,0.0,207.0,267.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
+base-enclosure-detailed-constructions.xml,58.893,58.893,35.974,35.974,22.92,0.0,0.0,0.0,0.0,0.0,0.0,0.378,0.0,0.0,4.322,0.834,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.92,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.464,0.0,14.157,9.233,0.614,0.0,0.0,0.0,0.0,2132.0,3374.2,23.308,18.57,0.0,3.533,3.646,0.513,7.507,0.629,10.515,-12.551,0.0,0.0,0.0,8.288,-0.066,4.807,0.0,0.728,0.0,4.975,-8.907,-2.499,0.0,-0.02,-0.421,-0.045,2.709,-0.024,-1.915,11.732,0.0,0.0,0.0,-6.31,-0.061,-1.164,-3.055,-0.165,0.0,3.184,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31803.0,8583.0,7508.0,0.0,575.0,6420.0,0.0,0.0,1949.0,2171.0,4597.0,18911.0,5330.0,7037.0,0.0,207.0,388.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-enclosure-floortypes.xml,64.413,64.413,29.406,29.406,35.008,0.0,0.0,0.0,0.0,0.0,0.0,0.578,0.0,0.0,3.665,0.666,9.366,0.0,0.0,2.647,0.0,0.238,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,4.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,35.008,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.788,0.0,11.166,9.342,0.619,0.0,0.0,0.0,0.0,1757.2,3480.6,27.934,20.789,0.0,3.519,3.647,0.0,0.0,0.654,9.893,-12.804,0.0,0.0,26.42,0.0,-0.18,2.047,0.0,0.786,0.0,7.347,-7.418,-1.565,0.0,0.393,-0.069,0.0,0.0,0.096,0.25,11.037,0.0,0.0,-7.529,0.0,-0.176,-0.275,-1.935,-0.093,0.0,2.755,5.786,1.082,1354.8,997.6,11399.5,2808.9,36000.0,24000.0,0.0,6.8,91.76,37636.0,8721.0,7508.0,0.0,575.0,2198.0,0.0,14165.0,0.0,2171.0,2299.0,19985.0,5355.0,7037.0,0.0,207.0,232.0,0.0,1515.0,0.0,2010.0,310.0,3320.0,380.0,0.0,-420.0,800.0
 base-enclosure-garage.xml,59.052,59.052,34.589,34.589,24.463,0.0,0.0,0.0,0.0,0.0,0.0,0.404,0.0,0.0,2.98,0.521,9.266,0.0,0.0,4.51,0.142,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.463,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.904,0.0,8.709,9.233,0.724,0.0,0.0,0.0,0.0,2122.9,2825.0,18.052,10.754,0.0,3.524,3.783,0.502,5.84,0.613,8.595,-6.603,0.0,0.0,0.0,6.558,-0.041,5.37,0.0,0.0,0.0,3.839,-6.765,-2.508,0.0,0.112,-0.273,-0.035,2.444,0.002,-1.643,8.266,0.0,0.0,0.0,-5.628,-0.038,-1.216,-2.073,0.0,0.0,1.265,5.681,2.001,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,29361.0,8026.0,5506.0,0.0,575.0,6537.0,0.0,0.0,1949.0,2171.0,4597.0,15521.0,3263.0,5579.0,0.0,207.0,523.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-enclosure-infil-ach-house-pressure.xml,58.728,58.728,35.913,35.913,22.815,0.0,0.0,0.0,0.0,0.0,0.0,0.376,0.0,0.0,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.815,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.366,0.0,13.979,9.233,0.614,0.0,0.0,0.0,0.0,2115.3,3297.1,23.045,17.895,0.0,3.542,3.634,0.511,7.499,0.628,10.506,-12.551,0.0,0.0,0.0,8.272,-0.063,4.792,0.0,0.728,0.0,4.937,-8.907,-2.499,0.0,-0.043,-0.455,-0.051,2.706,-0.024,-1.917,11.732,0.0,0.0,0.0,-6.315,-0.059,-1.163,-3.064,-0.165,0.0,3.097,7.871,2.01,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,31789.0,8583.0,7508.0,0.0,575.0,6409.0,0.0,0.0,1949.0,2171.0,4595.0,18786.0,5328.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_bills.csv b/workflow/tests/base_results/results_bills.csv
index d05c01eaa4..2baffe92f9 100644
--- a/workflow/tests/base_results/results_bills.csv
+++ b/workflow/tests/base_results/results_bills.csv
@@ -130,7 +130,7 @@ base-enclosure-beds-2.xml,1566.38,144.0,1107.5,0.0,1251.5,144.0,170.88,314.88,0.
 base-enclosure-beds-4.xml,1727.78,144.0,1283.19,0.0,1427.19,144.0,156.59,300.59,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-beds-5.xml,1807.47,144.0,1369.91,0.0,1513.91,144.0,149.56,293.56,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-ceilingtypes.xml,1777.08,144.0,1213.49,0.0,1357.49,144.0,275.59,419.59,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-base-enclosure-detailed-constructions.xml,1650.15,144.0,1197.17,0.0,1341.17,144.0,164.98,308.98,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+base-enclosure-detailed-constructions.xml,1650.28,144.0,1197.95,0.0,1341.95,144.0,164.33,308.33,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-floortypes.xml,1518.24,144.0,979.24,0.0,1123.24,144.0,251.0,395.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-garage.xml,1615.24,144.0,1151.84,0.0,1295.84,144.0,175.4,319.4,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 base-enclosure-infil-ach-house-pressure.xml,1647.51,144.0,1195.93,0.0,1339.93,144.0,163.58,307.58,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

From 9f4182b5658b5789668beb4e0485f6fe2aa1d85e Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Wed, 3 May 2023 16:17:55 -0600
Subject: [PATCH 11/11] Update XMLs

---
 BuildResidentialHPXML/measure.xml | 28 +++---------
 HPXMLtoOpenStudio/measure.xml     | 74 +++++++++++++++----------------
 2 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/BuildResidentialHPXML/measure.xml b/BuildResidentialHPXML/measure.xml
index 4bad849c1e..e412739e6e 100644
--- a/BuildResidentialHPXML/measure.xml
+++ b/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>6c694559-9338-4659-8db5-15405a90eff3</version_id>
-  <version_modified>20230501T223703Z</version_modified>
+  <version_id>7e14b99a-8028-4045-a389-bc04982c8bdf</version_id>
+  <version_modified>20230503T221424Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -35,24 +35,6 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
-    <argument>
-      <name>occupancy_calculation_type</name>
-      <display_name>Occupancy Calculation Type</display_name>
-      <description>The type of occupancy calculation type. If 'asset' is chosen, various end uses (e.g., clothes washer) are calculated using number of bedrooms and/or conditioned floor area. If 'operational' is chosen, end uses based on number of bedrooms are adjusted for the number of occupants. If not provided, the OS-HPXML default is used.</description>
-      <type>Choice</type>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-      <choices>
-        <choice>
-          <value>asset</value>
-          <display_name>asset</display_name>
-        </choice>
-        <choice>
-          <value>operational</value>
-          <display_name>operational</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>schedules_filepaths</name>
       <display_name>Schedules: CSV File Paths</display_name>
@@ -692,7 +674,7 @@
     <argument>
       <name>geometry_unit_num_bedrooms</name>
       <display_name>Geometry: Unit Number of Bedrooms</display_name>
-      <description>The number of bedrooms in the unit. Used to determine the energy usage of appliances and plug loads, hot water usage, etc.</description>
+      <description>The number of bedrooms in the unit.</description>
       <type>Integer</type>
       <units>#</units>
       <required>true</required>
@@ -711,7 +693,7 @@
     <argument>
       <name>geometry_unit_num_occupants</name>
       <display_name>Geometry: Unit Number of Occupants</display_name>
-      <description>The number of occupants in the unit. If not provided, the OS-HPXML default is used. Required if Occupancy Calculation Type is 'operational'.</description>
+      <description>The number of occupants in the unit. If not provided, an *asset* calculation is performed assuming standard occupancy, in which various end use defaults (e.g., plug loads, appliances, and hot water usage) are calculated based on Number of Bedrooms and Conditioned Floor Area per ANSI/RESNET/ICC 301-2019. If provided, an *operational* calculation is instead performed in which the end use defaults are adjusted using the relationship between Number of Bedrooms and Number of Occupants from RECS 2015.</description>
       <type>Double</type>
       <units>#</units>
       <required>false</required>
@@ -6622,7 +6604,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>8D2542F2</checksum>
+      <checksum>85C5A15B</checksum>
     </file>
   </files>
 </measure>
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index aa66a8b4ea..09e9e57754 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>57303791-442c-47d8-8d97-8f9c36c671ca</version_id>
-  <version_modified>20230501T223707Z</version_modified>
+  <version_id>9ceb2d4d-cab8-437a-88c0-99e65f1bbff0</version_id>
+  <version_modified>20230503T221427Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -259,12 +259,6 @@
       <usage_type>test</usage_type>
       <checksum>03FE784E</checksum>
     </file>
-    <file>
-      <filename>test_miscloads.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>B0CF4C83</checksum>
-    </file>
     <file>
       <filename>test_simcontrols.rb</filename>
       <filetype>rb</filetype>
@@ -289,12 +283,6 @@
       <usage_type>resource</usage_type>
       <checksum>0215CBB7</checksum>
     </file>
-    <file>
-      <filename>test_hotwater_appliance.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>5D630C64</checksum>
-    </file>
     <file>
       <filename>utility_bills.rb</filename>
       <filetype>rb</filetype>
@@ -415,12 +403,6 @@
       <usage_type>resource</usage_type>
       <checksum>0DC3194E</checksum>
     </file>
-    <file>
-      <filename>hotwater_appliances.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>C6060772</checksum>
-    </file>
     <file>
       <filename>data/unavailable_periods.csv</filename>
       <filetype>csv</filetype>
@@ -505,12 +487,6 @@
       <usage_type>resource</usage_type>
       <checksum>0C36E521</checksum>
     </file>
-    <file>
-      <filename>hpxml_defaults.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>7FE92603</checksum>
-    </file>
     <file>
       <filename>xmlvalidator.rb</filename>
       <filetype>rb</filetype>
@@ -541,17 +517,47 @@
       <usage_type>resource</usage_type>
       <checksum>A56E2EDD</checksum>
     </file>
+    <file>
+      <filename>hvac_sizing.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>218EA20F</checksum>
+    </file>
+    <file>
+      <filename>test_miscloads.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>5C446C35</checksum>
+    </file>
+    <file>
+      <filename>test_hotwater_appliance.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F36FD60C</checksum>
+    </file>
+    <file>
+      <filename>hotwater_appliances.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>EA5F3E1B</checksum>
+    </file>
+    <file>
+      <filename>hpxml_defaults.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>811F4F08</checksum>
+    </file>
     <file>
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>18639225</checksum>
+      <checksum>3104449F</checksum>
     </file>
     <file>
       <filename>hpxml_schematron/EPvalidator.xml</filename>
       <filetype>xml</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E37A81BA</checksum>
+      <checksum>69B938B4</checksum>
     </file>
     <file>
       <version>
@@ -562,25 +568,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>05BAF7E9</checksum>
-    </file>
-    <file>
-      <filename>hvac_sizing.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>218EA20F</checksum>
+      <checksum>BD97DFD4</checksum>
     </file>
     <file>
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3A6E138</checksum>
+      <checksum>8D65BD7F</checksum>
     </file>
     <file>
       <filename>test_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>159A1CE7</checksum>
+      <checksum>F1FEF43F</checksum>
     </file>
   </files>
 </measure>