From cbfff2f8f821804977da2454ac79986d78d523e6 Mon Sep 17 00:00:00 2001
From: Matthew Dahlhausen <matthew.dahlhausen@gmail.com>
Date: Wed, 3 Jan 2024 11:34:37 -0700
Subject: [PATCH] change PVAV coil type

change 'PVAV with gas heat with electric reheat' to use a gas coil instead of a hot water coil with a boiler
add 'PVAV with gas coil heat with electric reheat', which is another name for the setup.
add 'PVAV with gas boiler heat with electric reheat' for the option with a hot water coil with a boiler
---
 .../measure.rb                                   |  2 ++
 .../measure.xml                                  | 16 ++++++++++++----
 .../resources/Model.hvac.rb                      |  6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/resources/measures/create_typical_building_from_model/measure.rb b/resources/measures/create_typical_building_from_model/measure.rb
index ffc407187..a1f1fcdc2 100644
--- a/resources/measures/create_typical_building_from_model/measure.rb
+++ b/resources/measures/create_typical_building_from_model/measure.rb
@@ -176,6 +176,8 @@ def arguments(model)
     hvac_chs << 'PVAV with district hot water reheat'
     hvac_chs << 'PVAV with PFP boxes'
     hvac_chs << 'PVAV with gas heat with electric reheat'
+    hvac_chs << 'PVAV with gas coil heat with electric reheat'
+    hvac_chs << 'PVAV with gas boiler heat with electric reheat'
     hvac_chs << 'Residential AC with baseboard electric'
     hvac_chs << 'Residential AC with baseboard gas boiler'
     hvac_chs << 'Residential AC with baseboard central air source heat pump'
diff --git a/resources/measures/create_typical_building_from_model/measure.xml b/resources/measures/create_typical_building_from_model/measure.xml
index c7b7be039..9b580b876 100644
--- a/resources/measures/create_typical_building_from_model/measure.xml
+++ b/resources/measures/create_typical_building_from_model/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>create_typical_building_from_model</name>
   <uid>339a2e3a-273c-4494-bb50-bfe586a0647c</uid>
-  <version_id>e0d7a67d-835a-43a5-9698-36b20ceda38f</version_id>
-  <version_modified>2024-01-02T15:25:32Z</version_modified>
+  <version_id>5815cc73-0b2b-46bc-9ae2-7ead558f15ce</version_id>
+  <version_modified>2024-01-03T18:32:46Z</version_modified>
   <xml_checksum>EE13F09F</xml_checksum>
   <class_name>CreateTypicalBuildingFromModel</class_name>
   <display_name>Create Typical Building from Model</display_name>
@@ -545,6 +545,14 @@
           <value>PVAV with gas heat with electric reheat</value>
           <display_name>PVAV with gas heat with electric reheat</display_name>
         </choice>
+        <choice>
+          <value>PVAV with gas coil heat with electric reheat</value>
+          <display_name>PVAV with gas coil heat with electric reheat</display_name>
+        </choice>
+        <choice>
+          <value>PVAV with gas boiler heat with electric reheat</value>
+          <display_name>PVAV with gas boiler heat with electric reheat</display_name>
+        </choice>
         <choice>
           <value>Residential AC with baseboard electric</value>
           <display_name>Residential AC with baseboard electric</display_name>
@@ -1451,13 +1459,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E7221B07</checksum>
+      <checksum>FF7CA5B1</checksum>
     </file>
     <file>
       <filename>Model.hvac.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>48B87A43</checksum>
+      <checksum>C6E68B0D</checksum>
     </file>
     <file>
       <filename>deer_vintages.rb</filename>
diff --git a/resources/measures/create_typical_building_from_model/resources/Model.hvac.rb b/resources/measures/create_typical_building_from_model/resources/Model.hvac.rb
index 35fcaf25b..ffd3862d7 100644
--- a/resources/measures/create_typical_building_from_model/resources/Model.hvac.rb
+++ b/resources/measures/create_typical_building_from_model/resources/Model.hvac.rb
@@ -463,7 +463,11 @@ def add_cbecs_hvac_system(standard, system_type, zones)
     when 'PVAV with PFP boxes'
       standard.model_add_hvac_system(self, 'PVAV PFP Boxes', ht = 'Electricity', znht = 'Electricity', cl = 'Electricity', zones)
 
-    when 'PVAV with gas heat with electric reheat'
+    when 'PVAV with gas heat with electric reheat', 'PVAV with gas coil heat with electric reheat'
+      standard.model_add_hvac_system(self, 'PVAV Reheat', ht = 'Gas', znht = 'Electricity', cl = 'Electricity', zones,
+                                     air_loop_heating_type = 'Gas')
+
+    when 'PVAV with gas boiler heat with electric reheat'
       standard.model_add_hvac_system(self, 'PVAV Reheat', ht = 'Gas', znht = 'Electricity', cl = 'Electricity', zones)
 
     # all residential systems do not have ventilation