Allow additional floor types

examples/audit.xml

@@ -98,7 +98,7 @@
               </Attic>
             </AtticType>
             <AttachedToRoof idref="roof1"/>
-            <AttachedToFrameFloor idref="attic-floor-0"/>
+            <AttachedToFloor idref="attic-floor-0"/>
           </Attic>
         </Attics>
         <Foundations>
@@ -110,7 +110,7 @@
                 <Conditioned>true</Conditioned>
               </Basement>
             </FoundationType>
-            <AttachedToFrameFloor idref="fnd1flr1"/>
+            <AttachedToFloor idref="fnd1flr1"/>
           </Foundation>
         </Foundations>
         <Roofs>
@@ -136,26 +136,26 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
+        <Floors>
+          <Floor>
             <SystemIdentifier id="attic-floor-0"/>
             <Insulation>
               <SystemIdentifier id="attic1ins"/>
               <Layer>
                 <NominalRValue>19</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
+          </Floor>
+          <Floor>
             <SystemIdentifier id="fnd1flr1"/>
             <Insulation>
               <SystemIdentifier id="fnd1flr1ins"/>
               <Layer>
                 <NominalRValue>0</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Doors>
           <Door>
             <SystemIdentifier id="frontdoor1"/>
@@ -354,7 +354,7 @@
               </Attic>
             </AtticType>
             <AttachedToRoof idref="roof1p"/>
-            <AttachedToFrameFloor idref="attic-floor-1"/>
+            <AttachedToFloor idref="attic-floor-1"/>
           </Attic>
         </Attics>
         <Foundations>
@@ -366,7 +366,7 @@
                 <Conditioned>true</Conditioned>
               </Basement>
             </FoundationType>
-            <AttachedToFrameFloor idref="fnd1flr1p"/>
+            <AttachedToFloor idref="fnd1flr1p"/>
           </Foundation>
         </Foundations>
         <Roofs>
@@ -392,26 +392,26 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
+        <Floors>
+          <Floor>
             <SystemIdentifier id="attic-floor-1"/>
             <Insulation>
               <SystemIdentifier id="attic1insp"/>
               <Layer>
                 <NominalRValue>49</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
+          </Floor>
+          <Floor>
             <SystemIdentifier id="fnd1flr1p" sameas="fnd1flr1"/>
             <Insulation>
               <SystemIdentifier id="fnd1flr1insp" sameas="fnd1flr1ins"/>
               <Layer>
                 <NominalRValue>0</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Doors>
           <Door>
             <SystemIdentifier id="frontdoor1p" sameas="frontdoor1"/>

examples/bpi2101.xml

@@ -54,7 +54,7 @@
               </Attic>
             </AtticType>
             <AttachedToRoof idref="roof1"/>
-            <AttachedToFrameFloor idref="attic-floor-0"/>
+            <AttachedToFloor idref="attic-floor-0"/>
           </Attic>
         </Attics>
         <Roofs>
@@ -87,8 +87,8 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
+        <Floors>
+          <Floor>
             <SystemIdentifier id="attic-floor-0"/>
             <Insulation>
               <SystemIdentifier id="attic1flrins"/>
@@ -99,8 +99,8 @@
                 <NominalRValue>19</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Windows>
           <Window>
             <SystemIdentifier id="windows"/>
@@ -243,7 +243,7 @@
               </Attic>
             </AtticType>
             <AttachedToRoof idref="roof1proposed"/>
-            <AttachedToFrameFloor idref="attic-floor-1"/>
+            <AttachedToFloor idref="attic-floor-1"/>
           </Attic>
         </Attics>
         <Roofs>
@@ -276,8 +276,8 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
+        <Floors>
+          <Floor>
             <SystemIdentifier id="attic-floor-1"/>
             <Insulation>
               <SystemIdentifier id="attic1flrinsproposed"/>
@@ -288,8 +288,8 @@
                 <NominalRValue>50</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Windows>
           <Window>
             <SystemIdentifier id="windowsproposed" sameas="windows"/>
@@ -441,7 +441,7 @@
               </Attic>
             </AtticType>
             <AttachedToRoof idref="roof1completion"/>
-            <AttachedToFrameFloor idref="attic-floor-2"/>
+            <AttachedToFloor idref="attic-floor-2"/>
           </Attic>
         </Attics>
         <Roofs>
@@ -474,8 +474,8 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
+        <Floors>
+          <Floor>
             <SystemIdentifier id="attic-floor-2"/>
             <Insulation>
               <SystemIdentifier id="attic1flrinscompletion"/>
@@ -486,8 +486,8 @@
                 <NominalRValue>49</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Windows>
           <Window>
             <SystemIdentifier id="windowscompletion" sameas="windows"/>

examples/upgrade.xml

@@ -94,7 +94,7 @@
               </Attic>
             </AtticType>
             <AttachedToRoof idref="roof1"/>
-            <AttachedToFrameFloor idref="attic-floor-0"/>
+            <AttachedToFloor idref="attic-floor-0"/>
           </Attic>
         </Attics>
         <Foundations>
@@ -105,7 +105,7 @@
                 <Conditioned>false</Conditioned>
               </Basement>
             </FoundationType>
-            <AttachedToFrameFloor idref="fnd1flr1"/>
+            <AttachedToFloor idref="fnd1flr1"/>
           </Foundation>
         </Foundations>
         <Roofs>
@@ -131,17 +131,17 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
+        <Floors>
+          <Floor>
             <SystemIdentifier id="attic-floor-0"/>
             <Insulation>
               <SystemIdentifier id="insul1"/>
               <Layer>
                 <NominalRValue>13.0</NominalRValue>
               </Layer>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
+          </Floor>
+          <Floor>
             <SystemIdentifier id="fnd1flr1"/>
             <Insulation>
               <SystemIdentifier id="fnd1flr1ins1"/>
@@ -154,8 +154,8 @@
                 <Thickness>2.0</Thickness>
               </Layer>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Windows>
           <Window>
             <SystemIdentifier id="window1"/>
@@ -334,7 +334,7 @@
               </Attic>
             </AtticType>
             <AttachedToRoof idref="roof1c"/>
-            <AttachedToFrameFloor idref="attic-floor-1"/>
+            <AttachedToFloor idref="attic-floor-1"/>
           </Attic>
         </Attics>
         <Foundations>
@@ -345,7 +345,7 @@
                 <Conditioned>false</Conditioned>
               </Basement>
             </FoundationType>
-            <AttachedToFrameFloor idref="fnd1cflr1c"/>
+            <AttachedToFloor idref="fnd1cflr1c"/>
           </Foundation>
         </Foundations>
         <Roofs>
@@ -381,8 +381,8 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
+        <Floors>
+          <Floor>
             <SystemIdentifier id="attic-floor-1"/>
             <Insulation>
               <SystemIdentifier id="insul1c" sameas="insul1"/>
@@ -395,8 +395,8 @@
                 <Thickness>1.0</Thickness>
               </Layer>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
+          </Floor>
+          <Floor>
             <SystemIdentifier id="fnd1cflr1c" sameas="fnd1flr1"/>
             <Insulation>
               <SystemIdentifier id="fnd1cflr1cins1c" sameas="fnd1flr1ins1"/>
@@ -409,8 +409,8 @@
                 <Thickness>2.0</Thickness>
               </Layer>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Windows>
           <Window>
             <SystemIdentifier id="window1c"/>

schemas/HPXMLBaseElements.xsd

@@ -727,7 +727,7 @@
 									</xs:element>
 									<xs:element minOccurs="0" name="AttachedToRoof" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element minOccurs="0" name="AttachedToWall" type="LocalReference" maxOccurs="unbounded"/>
-									<xs:element minOccurs="0" name="AttachedToFrameFloor" type="LocalReference" maxOccurs="unbounded"/>
+									<xs:element minOccurs="0" name="AttachedToFloor" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element name="AnnualEnergyUse" minOccurs="0">
 										<xs:complexType>
 											<xs:sequence>
@@ -767,7 +767,7 @@
 									<xs:element minOccurs="0" name="AttachedToRimJoist" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element minOccurs="0" name="AttachedToWall" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element minOccurs="0" name="AttachedToFoundationWall" type="LocalReference" maxOccurs="unbounded"/>
-									<xs:element minOccurs="0" name="AttachedToFrameFloor" type="LocalReference" maxOccurs="unbounded"/>
+									<xs:element minOccurs="0" name="AttachedToFloor" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element minOccurs="0" name="AttachedToSlab" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element name="AnnualEnergyUse" minOccurs="0">
 										<xs:complexType>
@@ -815,7 +815,7 @@
 									<xs:element minOccurs="0" name="AttachedToRoof" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element minOccurs="0" name="AttachedToWall" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element minOccurs="0" name="AttachedToFoundationWall" type="LocalReference" maxOccurs="unbounded"/>
-									<xs:element minOccurs="0" name="AttachedToFrameFloor" type="LocalReference" maxOccurs="unbounded"/>
+									<xs:element minOccurs="0" name="AttachedToFloor" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element minOccurs="0" name="AttachedToSlab" type="LocalReference" maxOccurs="unbounded"/>
 									<xs:element name="AnnualEnergyUse" minOccurs="0">
 										<xs:complexType>
@@ -1052,12 +1052,12 @@
 					<xs:attribute name="dataSource" type="DataSource"/>
 				</xs:complexType>
 			</xs:element>
-			<xs:element minOccurs="0" name="FrameFloors">
+			<xs:element minOccurs="0" name="Floors">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="FrameFloor" maxOccurs="unbounded" minOccurs="1">
+						<xs:element name="Floor" maxOccurs="unbounded" minOccurs="1">
 							<xs:annotation>
-								<xs:documentation>Use the FrameFloor element for all floors/ceilings. For example, living space ceilings/attic floors, floors above foundations, floors under bonus
+								<xs:documentation>Use the Floor element for all floors/ceilings. For example, living space ceilings/attic floors, floors above foundations, floors under bonus
 									rooms, cantilevered floors, etc.</xs:documentation>
 							</xs:annotation>
 							<xs:complexType>
@@ -1066,6 +1066,7 @@
 									<xs:element minOccurs="0" ref="AttachedToSpace"/>
 									<xs:element name="ExteriorAdjacentTo" type="AdjacentTo" minOccurs="0"/>
 									<xs:element minOccurs="0" name="InteriorAdjacentTo" type="AdjacentTo"/>
+									<xs:element name="FloorType" type="FloorType" minOccurs="0"/>
 									<xs:element minOccurs="0" name="FloorJoists" type="StudProperties"/>
 									<xs:element minOccurs="0" name="FloorTrusses" type="StudProperties"/>
 									<xs:element minOccurs="0" name="FloorCovering" type="FloorCovering"/>
@@ -5104,6 +5105,51 @@
 		</xs:choice>
 		<xs:attribute name="dataSource" type="DataSource"/>
 	</xs:complexType>
+	<xs:complexType name="FloorType">
+		<xs:choice>
+			<xs:element name="WoodFrame">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" ref="extension"/>
+					</xs:sequence>
+					<xs:attribute name="dataSource" type="DataSource"/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="StructurallyInsulatedPanel">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" ref="extension"/>
+					</xs:sequence>
+					<xs:attribute name="dataSource" type="DataSource"/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SteelFrame">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" ref="extension"/>
+					</xs:sequence>
+					<xs:attribute name="dataSource" type="DataSource"/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SolidConcrete">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" ref="extension"/>
+					</xs:sequence>
+					<xs:attribute name="dataSource" type="DataSource"/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Other">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element minOccurs="0" ref="extension"/>
+					</xs:sequence>
+					<xs:attribute name="dataSource" type="DataSource"/>
+				</xs:complexType>
+			</xs:element>
+		</xs:choice>
+		<xs:attribute name="dataSource" type="DataSource"/>
+	</xs:complexType>
 	<xs:complexType name="HVACControlType">
 		<xs:sequence>
 			<xs:group ref="SystemInfo"/>