From 6213c969c80fcf371d0fb2af8c7ade8c92abfa60 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Tue, 8 Nov 2022 09:29:17 -0700
Subject: [PATCH 1/2] Add Floor/SubfloorType element.

---
 schemas/HPXMLBaseElements.xsd |  1 +
 schemas/HPXMLDataTypes.xsd    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index 097f2912..9408ece5 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -1155,6 +1155,7 @@
 									<xs:element minOccurs="0" name="FloorType" type="FloorType"/>
 									<xs:element minOccurs="0" name="FloorJoists" type="StudProperties"/>
 									<xs:element minOccurs="0" name="FloorTrusses" type="StudProperties"/>
+									<xs:element minOccurs="0" name="SubfloorType" type="SubfloorType"/>
 									<xs:element minOccurs="0" name="FloorCovering" type="FloorCovering"/>
 									<xs:element minOccurs="0" name="Area" type="SurfaceArea">
 										<xs:annotation>
diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
index c1014d87..e81c50db 100644
--- a/schemas/HPXMLDataTypes.xsd
+++ b/schemas/HPXMLDataTypes.xsd
@@ -4781,4 +4781,22 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="SubfloorType_simple">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none"/>
+			<xs:enumeration value="plywood"/>
+			<xs:enumeration value="osb"/>
+			<xs:enumeration value="wood"/>
+			<xs:enumeration value="concrete"/>
+			<xs:enumeration value="gypcrete"/>
+			<xs:enumeration value="other"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="SubfloorType">
+		<xs:simpleContent>
+			<xs:extension base="SubfloorType_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 </xs:schema>

From 409c0a25f3e0e3eef33687434c9720d80fe2c7f5 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Tue, 8 Nov 2022 09:38:27 -0700
Subject: [PATCH 2/2] Expand flexibility, allow thickness.

---
 schemas/HPXMLBaseElements.xsd | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index 9408ece5..afb4bdb8 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -1155,7 +1155,20 @@
 									<xs:element minOccurs="0" name="FloorType" type="FloorType"/>
 									<xs:element minOccurs="0" name="FloorJoists" type="StudProperties"/>
 									<xs:element minOccurs="0" name="FloorTrusses" type="StudProperties"/>
-									<xs:element minOccurs="0" name="SubfloorType" type="SubfloorType"/>
+									<xs:element minOccurs="0" name="Subfloor">
+										<xs:complexType>
+											<xs:sequence>
+												<xs:element minOccurs="0" name="Material" type="SubfloorType"/>
+												<xs:element minOccurs="0" name="Thickness" type="HPXMLDouble">
+													<xs:annotation>
+														<xs:documentation>[in]</xs:documentation>
+													</xs:annotation>
+												</xs:element>
+												<xs:element ref="extension" minOccurs="0"/>
+											</xs:sequence>
+											<xs:attribute name="dataSource" type="DataSource"/>
+										</xs:complexType>
+									</xs:element>
 									<xs:element minOccurs="0" name="FloorCovering" type="FloorCovering"/>
 									<xs:element minOccurs="0" name="Area" type="SurfaceArea">
 										<xs:annotation>