From 43ef89bb62218250419e94ff9b201dfd27d83643 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Fri, 5 Aug 2022 11:50:09 -0600
Subject: [PATCH 1/5] Adds ability to specify different units for StandbyLoss.

---
 schemas/HPXMLBaseElements.xsd | 18 ++++++++++++++----
 schemas/HPXMLDataTypes.xsd    | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index 6f633889..7647654b 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://hpxmlonline.com/2019/10" targetNamespace="http://hpxmlonline.com/2019/10" elementFormDefault="qualified" version="3.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://hpxmlonline.com/2019/10" targetNamespace="http://hpxmlonline.com/2019/10" elementFormDefault="qualified" version="3.1">
 	<xs:include schemaLocation="HPXMLDataTypes.xsd"/>
 	<xs:element name="XMLTransactionHeaderInformation">
 		<xs:annotation>
@@ -1609,9 +1608,9 @@
 											<xs:attribute name="dataSource" type="DataSource"/>
 										</xs:complexType>
 									</xs:element>
-									<xs:element minOccurs="0" name="StandbyLoss" type="HPXMLDouble">
+									<xs:element minOccurs="0" name="StandbyLoss" type="StandbyLossType">
 										<xs:annotation>
-											<xs:documentation>[degF/hr] The standby heat loss rate for, e.g., indirect water heaters in degrees per hour. Published in the AHRI Consumer’s Directory of Certified Efficiency Ratings.</xs:documentation>
+											<xs:documentation>The standby heat loss rate for, e.g., indirect or commercial water heaters. Published in the AHRI Consumer’s Directory of Certified Efficiency Ratings.</xs:documentation>
 										</xs:annotation>
 									</xs:element>
 									<xs:element name="MeetsACCA5QIHVACSpecification" type="HPXMLBoolean" minOccurs="0"/>
@@ -3494,6 +3493,17 @@
 		</xs:sequence>
 		<xs:attribute name="dataSource" type="DataSource"/>
 	</xs:complexType>
+	<xs:complexType name="StandbyLossType">
+		<xs:sequence>
+			<xs:element name="Units" type="StandbyLossUnits">
+				<xs:annotation>
+					<xs:documentation>For %/hr enter values as a percent, i.e. 1.20%/hr = 1.20 and 0.68%/hr = 0.68.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Value" type="Efficiency"/>
+		</xs:sequence>
+		<xs:attribute name="dataSource" type="DataSource"/>
+	</xs:complexType>
 	<xs:complexType name="HydronicDistributionInfo">
 		<xs:sequence>
 			<xs:element name="FractionHydronicPipeInsulated" type="Fraction" minOccurs="0"/>
diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
index 9ddde70d..c5bcd9d9 100644
--- a/schemas/HPXMLDataTypes.xsd
+++ b/schemas/HPXMLDataTypes.xsd
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://hpxmlonline.com/2019/10" targetNamespace="http://hpxmlonline.com/2019/10" elementFormDefault="qualified" version="3.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://hpxmlonline.com/2019/10" targetNamespace="http://hpxmlonline.com/2019/10" elementFormDefault="qualified" version="3.1">
 	<xs:simpleType name="DataSource">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="user"/>
@@ -1840,6 +1839,20 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="StandbyLossUnits_simple">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="F/hr"/>
+			<xs:enumeration value="%/hr"/>
+			<xs:enumeration value="Btu/hr"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="StandbyLossUnits">
+		<xs:simpleContent>
+			<xs:extension base="StandbyLossUnits_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 	<xs:simpleType name="DistrictSteamType_simple">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="1-pipe"/>

From 6cc1c91149260e2aea8efb452758367d77108f6f Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Fri, 5 Aug 2022 17:39:50 -0600
Subject: [PATCH 2/5] Add HeatingCOP for commercial heat pump water heaters.

---
 schemas/HPXMLBaseElements.xsd | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index 7647654b..ec51c35a 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -1543,6 +1543,11 @@
 												430, Subpart B, Appendix E.</xs:documentation>
 										</xs:annotation>
 									</xs:element>
+									<xs:element minOccurs="0" name="HeatingCOP" type="Efficiency">
+										<xs:annotation>
+											<xs:documentation>The dimensionless coefficient of performance, used to measure the efficiency of a commercial heat pump water heater.</xs:documentation>
+										</xs:annotation>
+									</xs:element>
 									<xs:element minOccurs="0" name="FirstHourRating" type="Volume">
 										<xs:annotation>
 											<xs:documentation>[gal per hour] An estimate of the maximum volume of hot water in gallons that a storage water heater can supply within an hour that begins

From 17b5f7840c1a28392ed00ce52195249d45860ddd Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Fri, 5 Aug 2022 18:03:24 -0600
Subject: [PATCH 3/5] Rename to HeatPumpCOP

---
 schemas/HPXMLBaseElements.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index ec51c35a..ccf66d27 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -1543,7 +1543,7 @@
 												430, Subpart B, Appendix E.</xs:documentation>
 										</xs:annotation>
 									</xs:element>
-									<xs:element minOccurs="0" name="HeatingCOP" type="Efficiency">
+									<xs:element minOccurs="0" name="HeatPumpCOP" type="Efficiency">
 										<xs:annotation>
 											<xs:documentation>The dimensionless coefficient of performance, used to measure the efficiency of a commercial heat pump water heater.</xs:documentation>
 										</xs:annotation>

From ad4cb708f9c4b8114fe200965314e4061a05ee91 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Tue, 9 Aug 2022 16:57:52 -0600
Subject: [PATCH 4/5] Change documentation to fraction.

---
 schemas/HPXMLBaseElements.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index ccf66d27..ec4399ce 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -3502,7 +3502,7 @@
 		<xs:sequence>
 			<xs:element name="Units" type="StandbyLossUnits">
 				<xs:annotation>
-					<xs:documentation>For %/hr enter values as a percent, i.e. 1.20%/hr = 1.20 and 0.68%/hr = 0.68.</xs:documentation>
+					<xs:documentation>For %/hr enter values as a fraction, i.e. 1.20%/hr = 0.0120 and 0.68%/hr = 0.0068.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="Value" type="Efficiency"/>

From 38eeb237ec4cf871bc84ff2dc874bc80f01d24fc Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Tue, 9 Aug 2022 17:11:31 -0600
Subject: [PATCH 5/5] Revert to previous type (HPXMLDouble) to allow zero.

---
 schemas/HPXMLBaseElements.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
index ec4399ce..2947c4a2 100644
--- a/schemas/HPXMLBaseElements.xsd
+++ b/schemas/HPXMLBaseElements.xsd
@@ -3505,7 +3505,7 @@
 					<xs:documentation>For %/hr enter values as a fraction, i.e. 1.20%/hr = 0.0120 and 0.68%/hr = 0.0068.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Value" type="Efficiency"/>
+			<xs:element name="Value" type="HPXMLDouble"/>
 		</xs:sequence>
 		<xs:attribute name="dataSource" type="DataSource"/>
 	</xs:complexType>