Update HVAC models per RESNET HVAC addendum

HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml

@@ -1752,16 +1752,19 @@
 
   <sch:pattern>
     <sch:title>[HeatingDetailedPerformanceDataPointWithCapacity]</sch:title>
-    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Systems/h:HVAC/h:HVACPlant/*/h:HeatingDetailedPerformanceData/h:PerformanceDataPoint/h:Capacity'>
-      <sch:assert role='ERROR' test='(number(../../../h:HeatingCapacity) = number(../../h:PerformanceDataPoint[h:OutdoorTemperature=47 and h:CapacityDescription="nominal"]/h:Capacity)) or not (../../../h:HeatingCapacity)'>Expected ../../../HeatingCapacity to be equal to ../../PerformanceDataPoint[OutdoorTemperature=47 and CapacityDescription="nominal"]/Capacity</sch:assert>
-      <sch:assert role='ERROR' test='(number(../../../h:HeatingCapacity17F) = number(../../h:PerformanceDataPoint[h:OutdoorTemperature=17 and h:CapacityDescription="nominal"]/h:Capacity)) or not (../../../h:HeatingCapacity17F)'>Expected ../../../HeatingCapacity17F to be equal to ../../PerformanceDataPoint[OutdoorTemperature=17 and CapacityDescription="nominal"]/Capacity</sch:assert>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Systems/h:HVAC/h:HVACPlant/*/h:HeatingDetailedPerformanceData/h:PerformanceDataPoint[number(h:OutdoorTemperature)=47 and h:CapacityDescription="nominal"]/h:Capacity'>
+      <sch:assert role='ERROR' test='(number(../../../h:HeatingCapacity) &gt;= 0.99 * number(../h:Capacity)) or not (../../../h:HeatingCapacity)'>Expected ../../../HeatingCapacity to be equal to ../Capacity</sch:assert>
+      <sch:assert role='ERROR' test='(number(../../../h:HeatingCapacity) &lt;= 1.01 * number(../h:Capacity)) or not (../../../h:HeatingCapacity)'>Expected ../../../HeatingCapacity to be equal to ../Capacity</sch:assert>
+      <sch:assert role='ERROR' test='(number(../../../h:HeatingCapacity17F) &gt;= 0.99 * number(../../h:PerformanceDataPoint[h:OutdoorTemperature=17 and h:CapacityDescription="nominal"]/h:Capacity)) or not (../../../h:HeatingCapacity17F)'>Expected ../../../HeatingCapacity17F to be equal to ../../PerformanceDataPoint[OutdoorTemperature=17 and CapacityDescription="nominal"]/Capacity</sch:assert>
+      <sch:assert role='ERROR' test='(number(../../../h:HeatingCapacity17F) &lt;= 1.01 * number(../../h:PerformanceDataPoint[h:OutdoorTemperature=17 and h:CapacityDescription="nominal"]/h:Capacity)) or not (../../../h:HeatingCapacity17F)'>Expected ../../../HeatingCapacity17F to be equal to ../../PerformanceDataPoint[OutdoorTemperature=17 and CapacityDescription="nominal"]/Capacity</sch:assert>
     </sch:rule>
   </sch:pattern>
 
   <sch:pattern>
     <sch:title>[CoolingDetailedPerformanceDataPointWithCapacity]</sch:title>
-    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Systems/h:HVAC/h:HVACPlant/*/h:CoolingDetailedPerformanceData/h:PerformanceDataPoint/h:Capacity'>
-      <sch:assert role='ERROR' test='(number(../../../h:CoolingCapacity) = number(../../h:PerformanceDataPoint[h:OutdoorTemperature=95 and h:CapacityDescription="nominal"]/h:Capacity)) or not (../../../h:CoolingCapacity)'>Expected ../../../CoolingCapacity to be equal to ../../PerformanceDataPoint[OutdoorTemperature=95 and CapacityDescription="nominal"]/Capacity</sch:assert>
+    <sch:rule context='/h:HPXML/h:Building/h:BuildingDetails/h:Systems/h:HVAC/h:HVACPlant/*/h:CoolingDetailedPerformanceData/h:PerformanceDataPoint[number(h:OutdoorTemperature)=95 and h:CapacityDescription="nominal"]/h:Capacity'>
+      <sch:assert role='ERROR' test='(number(../../../h:CoolingCapacity) &gt;= 0.99 * number(../h:Capacity)) or not (../../../h:CoolingCapacity)'>Expected ../../../CoolingCapacity to be equal to ../Capacity</sch:assert>
+      <sch:assert role='ERROR' test='(number(../../../h:CoolingCapacity) &lt;= 1.01 * number(../h:Capacity)) or not (../../../h:CoolingCapacity)'>Expected ../../../CoolingCapacity to be equal to ../Capacity</sch:assert>
     </sch:rule>
   </sch:pattern>
 

HPXMLtoOpenStudio/tests/test_validation.rb

@@ -1165,6 +1165,9 @@ def test_ruby_error_messages
                             'emissions-wrong-rows' => ['Emissions File has invalid number of rows'],
                             'geothermal-loop-multiple-attached-hps' => ["Multiple heat pumps found attached to geothermal loop 'GeothermalLoop1'."],
                             'heat-pump-backup-system-load-fraction' => ['Heat pump backup system cannot have a fraction heat load served specified.'],
+                            'hvac-detailed-performance-inconsistent-capacities' => ['Expected ../../../HeatingCapacity to be equal to ../Capacity',
+                                                                                    'Expected ../../../HeatingCapacity17F to be equal to ../../PerformanceDataPoint[OutdoorTemperature=17 and CapacityDescription="nominal"]/Capacity',
+                                                                                    'Expected ../../../CoolingCapacity to be equal to ../Capacity'],
                             'hvac-cooling-detailed-performance-incomplete-pair' => ['Cooling detailed performance data for outdoor temperature = 105.0 is incomplete; there must be exactly one minimum and one maximum capacity datapoint.'],
                             'hvac-cooling-detailed-performance-invalid-data' => ['Cooling detailed performance data for outdoor temperature = 82.0 is invalid; Power (capacity / COP) at minimum capacity must be less than power at maximum capacity.',
                                                                                  'Cooling detailed performance data for outdoor temperature = 95.0 is invalid; Maximum capacity must be greater than minimum capacity.'],
@@ -1357,6 +1360,11 @@ def test_ruby_error_messages
       when 'heat-pump-switchover-temp-elec-backup'
         hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
         hpxml_bldg.heat_pumps[0].backup_heating_switchover_temp = 35.0
+      when 'hvac-detailed-performance-inconsistent-capacities'
+        hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml')
+        hpxml_bldg.heat_pumps[0].heating_capacity = 10000
+        hpxml_bldg.heat_pumps[0].cooling_capacity = 10000
+        hpxml_bldg.heat_pumps[0].heating_capacity_17F = 1000
       when 'hvac-cooling-detailed-performance-incomplete-pair'
         hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml')
         hpxml_bldg.heat_pumps[0].cooling_detailed_performance_data.add(