From caba48a2a3e873191e79807858eb65de86b047b4 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Tue, 13 Jul 2021 09:04:44 -0600
Subject: [PATCH 1/2] Adds `UFactor` and `SHGC` elements for doors. Clarifies
 that UFactor/RValue elements include air films.

---
 schemas/BaseElements.xsd | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/schemas/BaseElements.xsd b/schemas/BaseElements.xsd
index 89401a6e..05bd9daa 100644
--- a/schemas/BaseElements.xsd
+++ b/schemas/BaseElements.xsd
@@ -1156,7 +1156,17 @@
 									<xs:element name="DoorMaterial" type="DoorMaterial" minOccurs="0"/>
 									<xs:element minOccurs="0" name="WeatherStripping" type="HPXMLBoolean"/>
 									<xs:element name="StormDoor" type="HPXMLBoolean" minOccurs="0"/>
-									<xs:element name="RValue" type="RValue" minOccurs="0"/>
+									<xs:element minOccurs="0" name="UFactor" type="UFactor">
+										<xs:annotation>
+											<xs:documentation>Including interior/exterior air films.</xs:documentation>
+										</xs:annotation>
+									</xs:element>
+									<xs:element minOccurs="0" name="SHGC" type="SHGC"/>
+									<xs:element name="RValue" type="RValue" minOccurs="0">
+										<xs:annotation>
+											<xs:documentation>Including interior/exterior air films.</xs:documentation>
+										</xs:annotation>
+									</xs:element>
 									<xs:element minOccurs="0" name="LeakinessDescription" type="BuildingLeakiness"/>
 									<xs:element minOccurs="0" name="PerformanceClass" type="PerformanceClass"/>
 									<xs:element maxOccurs="unbounded" minOccurs="0" name="ThirdPartyCertification" type="DoorThirdPartyCertifications"/>
@@ -4456,7 +4466,11 @@
 			<xs:element minOccurs="0" name="GlassType" type="GlassType"/>
 			<xs:element minOccurs="0" name="GasFill" type="GasFill"/>
 			<xs:element name="Condition" type="WindowCondition" minOccurs="0"/>
-			<xs:element name="UFactor" type="UFactor" minOccurs="0"/>
+			<xs:element name="UFactor" type="UFactor" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Including interior/exterior air films.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="SHGC" type="SHGC" minOccurs="0"/>
 			<xs:element minOccurs="0" name="VisibleTransmittance" type="Fraction"/>
 			<xs:element name="NFRCCertified" type="HPXMLBoolean" minOccurs="0"/>

From f3bd281b2c3d0c2d99d272537713bb760db97a16 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Tue, 13 Jul 2021 09:12:32 -0600
Subject: [PATCH 2/2] Add NFRC `DoorDescription` element.

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

diff --git a/schemas/BaseElements.xsd b/schemas/BaseElements.xsd
index 05bd9daa..7b8eb290 100644
--- a/schemas/BaseElements.xsd
+++ b/schemas/BaseElements.xsd
@@ -1153,6 +1153,7 @@
 									</xs:element>
 									<xs:element minOccurs="0" name="Orientation" type="OrientationType"/>
 									<xs:element minOccurs="0" name="DoorType" type="DoorType"/>
+									<xs:element minOccurs="0" name="DoorDescription" type="DoorDescription"/>
 									<xs:element name="DoorMaterial" type="DoorMaterial" minOccurs="0"/>
 									<xs:element minOccurs="0" name="WeatherStripping" type="HPXMLBoolean"/>
 									<xs:element name="StormDoor" type="HPXMLBoolean" minOccurs="0"/>
diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
index ddc84484..092389bc 100644
--- a/schemas/HPXMLDataTypes.xsd
+++ b/schemas/HPXMLDataTypes.xsd
@@ -4592,4 +4592,23 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="DoorDescription_simple">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="embossed"/>
+			<xs:enumeration value="flush"/>
+			<xs:enumeration value="full lite"/>
+			<xs:enumeration value="1/2 - lite"/>
+			<xs:enumeration value="1/4 - lite"/>
+			<xs:enumeration value="3/4 - lite"/>
+			<xs:enumeration value="raised panel"/>
+			<xs:enumeration value="other"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="DoorDescription">
+		<xs:simpleContent>
+			<xs:extension base="DoorDescription_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 </xs:schema>