Merge commit '3c53afcaecc5d9eec7ea9677cf2a020f499316a6' into heat_pum…

…p_detailed_performance

resources/hpxml-measures/BuildResidentialHPXML/measure.rb

@@ -1106,7 +1106,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
 
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('cooling_system_cooling_compressor_type', compressor_type_choices, false)
     arg.setDisplayName('Cooling System: Cooling Compressor Type')
-    arg.setDescription("The compressor type of the cooling system. Only applies to #{HPXML::HVACTypeCentralAirConditioner}. If not provided, the OS-HPXML default is used.")
+    arg.setDescription("The compressor type of the cooling system. Only applies to #{HPXML::HVACTypeCentralAirConditioner} and #{HPXML::HVACTypeMiniSplitAirConditioner}. If not provided, the OS-HPXML default is used.")
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('cooling_system_cooling_sensible_heat_fraction', false)
@@ -1236,7 +1236,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
 
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('heat_pump_cooling_compressor_type', compressor_type_choices, false)
     arg.setDisplayName('Heat Pump: Cooling Compressor Type')
-    arg.setDescription("The compressor type of the heat pump. Only applies to #{HPXML::HVACTypeHeatPumpAirToAir}. If not provided, the OS-HPXML default is used.")
+    arg.setDescription("The compressor type of the heat pump. Only applies to #{HPXML::HVACTypeHeatPumpAirToAir} and #{HPXML::HVACTypeHeatPumpMiniSplit}. If not provided, the OS-HPXML default is used.")
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_cooling_sensible_heat_fraction', false)
@@ -4717,7 +4717,7 @@ def self.set_cooling_systems(hpxml, args)
     end
 
     if args[:cooling_system_cooling_compressor_type].is_initialized
-      if cooling_system_type == HPXML::HVACTypeCentralAirConditioner
+      if [HPXML::HVACTypeCentralAirConditioner, HPXML::HVACTypeMiniSplitAirConditioner].include? cooling_system_type
         compressor_type = args[:cooling_system_cooling_compressor_type].get
       end
     end
@@ -4856,7 +4856,7 @@ def self.set_heat_pumps(hpxml, args)
     end
 
     if args[:heat_pump_cooling_compressor_type].is_initialized
-      if [HPXML::HVACTypeHeatPumpAirToAir].include? heat_pump_type
+      if [HPXML::HVACTypeHeatPumpAirToAir, HPXML::HVACTypeHeatPumpMiniSplit].include? heat_pump_type
         compressor_type = args[:heat_pump_cooling_compressor_type].get
       end
     end

resources/hpxml-measures/BuildResidentialHPXML/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>93c1361d-ce33-4609-ba76-21245e0ee0d7</version_id>
-  <version_modified>2023-10-23T16:23:38Z</version_modified>
+  <version_id>f01aed40-4afe-444f-aedb-ff18ba423b46</version_id>
+  <version_modified>2023-09-28T22:11:32Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -2270,7 +2270,7 @@
     <argument>
       <name>cooling_system_cooling_compressor_type</name>
       <display_name>Cooling System: Cooling Compressor Type</display_name>
-      <description>The compressor type of the cooling system. Only applies to central air conditioner. If not provided, the OS-HPXML default is used.</description>
+      <description>The compressor type of the cooling system. Only applies to central air conditioner and mini-split. If not provided, the OS-HPXML default is used.</description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -2534,7 +2534,7 @@
     <argument>
       <name>heat_pump_cooling_compressor_type</name>
       <display_name>Heat Pump: Cooling Compressor Type</display_name>
-      <description>The compressor type of the heat pump. Only applies to air-to-air. If not provided, the OS-HPXML default is used.</description>
+      <description>The compressor type of the heat pump. Only applies to air-to-air and mini-split. If not provided, the OS-HPXML default is used.</description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -6731,18 +6731,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>02398DA0</checksum>
-    </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>513F28E9</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -6752,7 +6740,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>D0F900F0</checksum>
+      <checksum>343A0E56</checksum>
     </file>
     <file>
       <filename>geometry.rb</filename>
@@ -6764,7 +6752,7 @@
       <filename>build_residential_hpxml_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>09CBC38A</checksum>
+      <checksum>595D0CA1</checksum>
     </file>
   </files>
 </measure>

resources/hpxml-measures/BuildResidentialHPXML/tests/build_residential_hpxml_test.rb

@@ -718,6 +718,7 @@ def _set_measure_argument_values(hpxml_file, args)
       args['heating_system_type'] = 'none'
       args['cooling_system_type'] = 'none'
       args['heat_pump_type'] = HPXML::HVACTypeHeatPumpMiniSplit
+      args.delete('heat_pump_cooling_compressor_type')
       args['heat_pump_heating_efficiency'] = 10.0
       args['heat_pump_cooling_efficiency'] = 19.0
       args['heat_pump_heating_capacity'] = 48000.0
@@ -1048,6 +1049,7 @@ def _set_measure_argument_values(hpxml_file, args)
       args['heating_system_type'] = 'none'
       args['cooling_system_type'] = 'none'
       args['heat_pump_type'] = HPXML::HVACTypeHeatPumpMiniSplit
+      args.delete('heat_pump_cooling_compressor_type')
       args['heat_pump_is_ducted'] = true
       args['heat_pump_backup_type'] = HPXML::HeatPumpBackupTypeSeparate
       args['heating_system_2_type'] = HPXML::HVACTypeFurnace

resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_schedule_file</name>
   <uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
-  <version_id>6ffac26f-845e-43f7-be19-85319df0ee76</version_id>
-  <version_modified>2023-10-23T16:23:40Z</version_modified>
+  <version_id>d6668365-a78e-4e88-afa1-514e180dc8e2</version_id>
+  <version_modified>2023-09-19T22:23:01Z</version_modified>
   <xml_checksum>03F02484</xml_checksum>
   <class_name>BuildResidentialScheduleFile</class_name>
   <display_name>Schedule File Builder</display_name>
@@ -85,18 +85,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>D4DEE065</checksum>
-    </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>513F28E9</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>

resources/hpxml-measures/Changelog.md

@@ -22,7 +22,6 @@ __New Features__
 - Battery losses now split between charging and discharging.
 - Interior/exterior window shading multipliers are now modeled using the EnergyPlus incident solar multiplier.
 - Improvements to HERS & MaxLoad heat pump sizing methodologies.
-- Added README.md documentation for all OpenStudio measures.
 
 __Bugfixes__
 - Fixes battery resilience output to properly incorporate battery losses.