openstudio-ee 0.12.0 → 0.12.4

data/lib/measures/fan_assist_night_ventilation/measure.rb

@@ -12,17 +12,17 @@
 class FanAssistNightVentilation < OpenStudio::Measure::ModelMeasure
   # human readable name
   def name
-    return 'Fan Assist Night Ventilation'
+    'Fan Assist Night Ventilation'
   end
 
   # human readable description
   def description
-    return "This measure is meant to roughly model the impact of fan assisted night ventilation. The user needs to have a ventilation schedule in the model, operable windows where natural ventilation is desired, and air walls or interior operable windows in walls and floors to define the path of air through the building. The user specified flow rate is proportionally split up based on the area of exterior operable windows. The size of interior air walls and windows doesn't matter."
+    "This measure is meant to roughly model the impact of fan assisted night ventilation. The user needs to have a ventilation schedule in the model, operable windows where natural ventilation is desired, and air walls or interior operable windows in walls and floors to define the path of air through the building. The user specified flow rate is proportionally split up based on the area of exterior operable windows. The size of interior air walls and windows doesn't matter."
   end
 
   # human readable description of modeling approach
   def modeler_description
-    return "It's up to the modeler to choose a flow rate that is approriate for the fenestration and interior openings within the building. Each zone with operable windows will get a zone ventilation object. The measure will first look for a celing opening to find a connection for zone a zone mixing object. If a ceiling isn't found, then it looks for a wall. Don't provide more than one ceiling paths or more than one wall path. The end result is zone ventilation object followed by a path of zone mixing objects. The fan consumption is modeled in the zone ventilation object, but no heat is brought in from the fan. There is no zone ventilation object at the end of the path of zones. In addition to schedule, the zone ventilation is controlled by a minimum outdoor temperature.
+    "It's up to the modeler to choose a flow rate that is approriate for the fenestration and interior openings within the building. Each zone with operable windows will get a zone ventilation object. The measure will first look for a celing opening to find a connection for zone a zone mixing object. If a ceiling isn't found, then it looks for a wall. Don't provide more than one ceiling paths or more than one wall path. The end result is zone ventilation object followed by a path of zone mixing objects. The fan consumption is modeled in the zone ventilation object, but no heat is brought in from the fan. There is no zone ventilation object at the end of the path of zones. In addition to schedule, the zone ventilation is controlled by a minimum outdoor temperature.
 
 The measure was developed for use in un-conditioned models. Has not been tested in conjunction with mechanical systems.
 
@@ -71,6 +71,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
     # looping through sorted hash of schedules to find air velocity schedules
     schedule_args_hash.sort.map do |key, value|
       next if value.scheduleTypeLimits.empty?
+
       if value.scheduleTypeLimits.get.unitType == 'Dimensionless'
         ventilation_schedule_handles << value.handle.to_s
         ventilation_schedule_display_names << key
@@ -78,7 +79,8 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
     end
 
     # make a choice argument for Air Velocity Schedule Name
-    ventilation_schedule = OpenStudio::Measure::OSArgument.makeChoiceArgument('ventilation_schedule', ventilation_schedule_handles, ventilation_schedule_display_names, true)
+    ventilation_schedule = OpenStudio::Measure::OSArgument.makeChoiceArgument('ventilation_schedule',
+                                                                              ventilation_schedule_handles, ventilation_schedule_display_names, true)
     ventilation_schedule.setDisplayName('Choose a Ventilation Schedule.')
     args << ventilation_schedule
 
@@ -89,7 +91,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
     min_outdoor_temp.setDefaultValue(55.0)
     args << min_outdoor_temp
 
-    return args
+    args
   end
 
   def inspect_airflow_surfaces(zone)
@@ -97,8 +99,9 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
     zone.spaces.each do |space|
       space.surfaces.each do |surface|
         next if surface.adjacentSurface.is_initialized != true
-        next if !surface.adjacentSurface.get.space.is_initialized
-        next if !surface.adjacentSurface.get.space.get.thermalZone.is_initialized
+        next unless surface.adjacentSurface.get.space.is_initialized
+        next unless surface.adjacentSurface.get.space.get.thermalZone.is_initialized
+
         adjacent_zone = surface.adjacentSurface.get.space.get.thermalZone.get
         if surface.surfaceType == 'RoofCeiling' || surface.surfaceType == 'Wall'
           if surface.isAirWall
@@ -106,8 +109,9 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
           else
             surface.subSurfaces.each do |sub_surface|
               next if sub_surface.adjacentSubSurface.is_initialized != true
-              next if !sub_surface.adjacentSubSurface.get.surface.get.space.is_initialized
-              next if !sub_surface.adjacentSubSurface.get.surface.get.space.get.thermalZone.is_initialized
+              next unless sub_surface.adjacentSubSurface.get.surface.get.space.is_initialized
+              next unless sub_surface.adjacentSubSurface.get.surface.get.space.get.thermalZone.is_initialized
+
               adjacent_zone = sub_surface.adjacentSubSurface.get.surface.get.space.get.thermalZone.get
               if sub_surface.isAirWall || sub_surface.subSurfaceType == 'OperableWindow'
                 array << [adjacent_zone, surface.surfaceType]
@@ -118,7 +122,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
       end
     end
 
-    return array
+    array
   end
 
   # define what happens when the measure is run
@@ -126,9 +130,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
     super(model, runner, user_arguments)
 
     # use the built-in error checking
-    if !runner.validateUserArguments(arguments(model), user_arguments)
-      return false
-    end
+    return false unless runner.validateUserArguments(arguments(model), user_arguments)
 
     # assign the user inputs to variables
     design_flow_rate = runner.getDoubleArgumentValue('design_flow_rate', user_arguments)
@@ -156,9 +158,11 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
       zone.spaces.each do |space|
         space.surfaces.each do |surface|
           next if surface.surfaceType != 'Wall'
+
           surface.subSurfaces.each do |sub_surface|
             next if sub_surface.outsideBoundaryCondition != 'Outdoors'
             next if sub_surface.subSurfaceType != 'OperableWindow'
+
             zone_area_counter += sub_surface.netArea * sub_surface.multiplier
           end
         end
@@ -169,6 +173,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
 
       # add to operable_ext_window_hash if non-zero area
       next if zone_area_counter == 0.0
+
       bldg_area_counter += zone_area_counter
       operable_ext_window_hash[zone] = zone_area_counter
     end
@@ -226,9 +231,10 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
       until found_path_end == true
         found_ceiling = false
         path_objects[current_zone].each do |object|
-          next if zones_used_for_this_path.include? (object[0])
+          next if zones_used_for_this_path.include?(object[0])
           next if object[1].to_s != 'RoofCeiling'
-          next if operable_ext_window_hash.include? (object[0])
+          next if operable_ext_window_hash.include?(object[0])
+
           if found_ceiling
             runner.registerWarning("Found more than one possible airflow path for #{current_zone.name}")
           else
@@ -238,12 +244,13 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
             found_ceiling = true
           end
         end
-        if !found_ceiling
+        unless found_ceiling
           found_wall = false
           path_objects[current_zone].each do |object|
-            next if zones_used_for_this_path.include? (object[0])
+            next if zones_used_for_this_path.include?(object[0])
             next if object[1].to_s != 'Wall'
-            next if operable_ext_window_hash.include? (object[0])
+            next if operable_ext_window_hash.include?(object[0])
+
             if found_wall
               runner.registerWarning("Found more than one possible airflow path for #{current_zone.name}")
             else
@@ -254,9 +261,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
             end
           end
         end
-        if (found_ceiling == false) && (found_wall == false)
-          found_path_end = true
-        end
+        found_path_end = true if (found_ceiling == false) && (found_wall == false)
       end
 
       # add one way air mixing objects along path zones
@@ -290,14 +295,12 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
         else
           exhaust_zones[flow_paths[zone].last] = fraction_flow
         end
-      else
+      elsif exhaust_zones.include? zone
         # extra code if there is no path from entry zone
-        if exhaust_zones.include? zone
-          exhaust_zones[zone] += fraction_flow
-        else
-          exhaust_zones[zone] = fraction_flow
-          runner.registerWarning("#{zone.name} doesn't have path to other zones. Exhaust assumed to be with the same zone as air enters.")
-        end
+        exhaust_zones[zone] += fraction_flow
+      else
+        exhaust_zones[zone] = fraction_flow
+        runner.registerWarning("#{zone.name} doesn't have path to other zones. Exhaust assumed to be with the same zone as air enters.")
       end
     end
 
@@ -316,11 +319,9 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
       # warn if zone multiplier are used
       non_default_multiplier = []
       model.getThermalZones.each do |zone|
-        if zone.multiplier > 1
-          non_default_multiplier << zone
-        end
+        non_default_multiplier << zone if zone.multiplier > 1
       end
-      if !non_default_multiplier.empty?
+      unless non_default_multiplier.empty?
         runner.registerWarning("This measure is not intended to be use when thermal zones have a non 1 multiplier. #{non_default_multiplier.size} zones in this model have multipliers greater than one. Results are likley invalid.")
       end
 

data/lib/measures/fan_assist_night_ventilation/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>fan_assist_night_ventilation</name>
   <uid>5e77cb11-0fa9-432b-97bd-87c40949ee1f</uid>
-  <version_id>7b02dbeb-897a-41f6-8c48-e987e9474ae5</version_id>
-  <version_modified>2024-11-16T23:47:46Z</version_modified>
+  <version_id>9faaaac3-a100-4359-9833-cbef50454be7</version_id>
+  <version_modified>2025-09-25T15:33:44Z</version_modified>
   <xml_checksum>26DDAE64</xml_checksum>
   <class_name>FanAssistNightVentilation</class_name>
   <display_name>Fan Assist Night Ventilation</display_name>
@@ -95,7 +95,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8C5A8023</checksum>
+      <checksum>FFCBFF29</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -118,7 +118,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E96BE908</checksum>
+      <checksum>3DBADD15</checksum>
     </file>
     <file>
       <filename>FanAssistNightVentilationMeasureGuide.pdf</filename>
@@ -154,7 +154,7 @@ To address an issue in OpenStudio zones with ZoneVentilation, this measure adds
       <filename>fan_assist_night_ventilation_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>CC3F5531</checksum>
+      <checksum>8F5F0305</checksum>
     </file>
     <file>
       <filename>no_opp_win.osm</filename>

data/lib/measures/nze_hvac/measure.rb

@@ -9,26 +9,26 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
   require 'openstudio-standards'
 
   def name
-    return 'NZEHVAC'
+    'NZEHVAC'
   end
 
   # human readable description
   def description
-    return 'This measure replaces the existing HVAC system if any with the user selected HVAC system.  The user can select how to partition the system, applying it to the whole building, a system per building type, a system per building story, or automatically partition based on residential/non-residential occupany types and space loads.'
+    'This measure replaces the existing HVAC system if any with the user selected HVAC system.  The user can select how to partition the system, applying it to the whole building, a system per building type, a system per building story, or automatically partition based on residential/non-residential occupany types and space loads.'
   end
 
   # human readable description of modeling approach
   def modeler_description
-    return 'HVAC system creation logic uses [openstudio-standards](https://github.com/NREL/openstudio-standards) and efficiency values are defined in the openstudio-standards Standards spreadsheet under the *NREL ZNE Ready 2017* template.'
+    'HVAC system creation logic uses [openstudio-standards](https://github.com/NREL/openstudio-standards) and efficiency values are defined in the openstudio-standards Standards spreadsheet under the *NREL ZNE Ready 2017* template.'
   end
 
   def add_system_to_zones(model, runner, hvac_system_type, zones, standard,
                           doas_dcv: false)
-    if doas_dcv
-      doas_system_type = 'DOAS with DCV'
-    else
-      doas_system_type = 'DOAS'
-    end
+    doas_system_type = if doas_dcv
+                         'DOAS with DCV'
+                       else
+                         'DOAS'
+                       end
 
     # create HVAC system
     # use methods in openstudio-standards
@@ -129,7 +129,8 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
       standard.model_add_hvac_system(model, doas_system_type, ht = 'AirSourceHeatPump', znht = nil, cl = 'Electricity', zones,
                                      air_loop_heating_type: 'Water',
                                      air_loop_cooling_type: 'Water')
-      standard.model_add_hvac_system(model, 'Radiant Slab', ht = 'AirSourceHeatPump', znht = nil, cl = 'Electricity', zones)
+      standard.model_add_hvac_system(model, 'Radiant Slab', ht = 'AirSourceHeatPump', znht = nil, cl = 'Electricity',
+                                     zones)
       chilled_water_loop = model.getPlantLoopByName('Chilled Water Loop').get
       condenser_water_loop = model.getPlantLoopByName('Condenser Water Loop').get
       standard.model_add_waterside_economizer(model, chilled_water_loop, condenser_water_loop,
@@ -184,7 +185,8 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
                                      heat_pump_loop_cooling_type: 'CoolingTower')
 
     when 'Water source heat pumps with ground source heat pump'
-      standard.model_add_hvac_system(model, 'Ground Source Heat Pumps', ht = 'Electricity', znht = nil, cl = 'Electricity', zones)
+      standard.model_add_hvac_system(model, 'Ground Source Heat Pumps', ht = 'Electricity', znht = nil,
+                                     cl = 'Electricity', zones)
 
     # PVAV systems by default use a DX coil for cooling
     when 'PVAV with gas boiler reheat'
@@ -192,7 +194,8 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
                                      hot_water_loop_type: 'LowTemperature')
 
     when 'PVAV with central air source heat pump reheat'
-      standard.model_add_hvac_system(model, 'PVAV Reheat', ht = 'AirSourceHeatPump', znht = 'AirSourceHeatPump', cl = 'Electricity', zones)
+      standard.model_add_hvac_system(model, 'PVAV Reheat', ht = 'AirSourceHeatPump', znht = 'AirSourceHeatPump',
+                                     cl = 'Electricity', zones)
 
     when 'VAV chiller with gas boiler reheat'
       standard.model_add_hvac_system(model, 'VAV Reheat', ht = 'NaturalGas', znht = 'NaturalGas', cl = 'Electricity', zones,
@@ -203,7 +206,8 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
                                               integrated: true)
 
     when 'VAV chiller with central air source heat pump reheat'
-      standard.model_add_hvac_system(model, 'VAV Reheat', ht = 'AirSourceHeatPump', znht = 'AirSourceHeatPump', cl = 'Electricity', zones)
+      standard.model_add_hvac_system(model, 'VAV Reheat', ht = 'AirSourceHeatPump', znht = 'AirSourceHeatPump',
+                                     cl = 'Electricity', zones)
       chilled_water_loop = model.getPlantLoopByName('Chilled Water Loop').get
       condenser_water_loop = model.getPlantLoopByName('Condenser Water Loop').get
       standard.model_add_waterside_economizer(model, chilled_water_loop, condenser_water_loop,
@@ -227,7 +231,7 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
     runner.registerInfo("Added HVAC System type #{hvac_system_type} to the model for #{zones.size} zones")
   end
 
-  def arguments(model)
+  def arguments(_model)
     args = OpenStudio::Measure::OSArgumentVector.new
 
     # argument to remove existing hvac system
@@ -263,7 +267,8 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
     hvac_system_type_choices << 'PVAV with gas boiler reheat'
     hvac_system_type_choices << 'PVAV with central air source heat pump reheat'
 
-    hvac_system_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('hvac_system_type', hvac_system_type_choices, true)
+    hvac_system_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('hvac_system_type', hvac_system_type_choices,
+                                                                          true)
     hvac_system_type.setDisplayName('HVAC System Type:')
     hvac_system_type.setDescription('Details on HVAC system type in measure documentation.')
     hvac_system_type.setDefaultValue('DOAS with fan coil chiller with central air source heat pump')
@@ -283,7 +288,8 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
     hvac_system_partition_choices << 'One System Per Building Story'
     hvac_system_partition_choices << 'One System Per Building Type'
 
-    hvac_system_partition = OpenStudio::Measure::OSArgument.makeChoiceArgument('hvac_system_partition', hvac_system_partition_choices, true)
+    hvac_system_partition = OpenStudio::Measure::OSArgument.makeChoiceArgument('hvac_system_partition',
+                                                                               hvac_system_partition_choices, true)
     hvac_system_partition.setDisplayName('HVAC System Partition:')
     hvac_system_partition.setDescription('Automatic Partition will separate the HVAC system by residential/non-residential and if loads and schedules are substantially different.')
     hvac_system_partition.setDefaultValue('Automatic Partition')
@@ -291,16 +297,14 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
 
     # add an argument for ventilation schedule
 
-    return args
+    args
   end # end the arguments method
 
   def run(model, runner, user_arguments)
     super(model, runner, user_arguments)
 
     # use the built-in error checking
-    if !runner.validateUserArguments(arguments(model), user_arguments)
-      return false
-    end
+    return false unless runner.validateUserArguments(arguments(model), user_arguments)
 
     # assign user inputs
     remove_existing_hvac = runner.getBoolArgumentValue('remove_existing_hvac', user_arguments)
@@ -325,9 +329,7 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
 
     # get the climate zone
     climate_zone_obj = model.getClimateZones.getClimateZone('ASHRAE', 2006)
-    if climate_zone_obj.empty
-      climate_zone_obj = model.getClimateZones.getClimateZone('ASHRAE', 2013)
-    end
+    climate_zone_obj = model.getClimateZones.getClimateZone('ASHRAE', 2013) if climate_zone_obj.empty
 
     if climate_zone_obj.empty
       runner.registerError('Please assign an ASHRAE climate zone to the model before running the measure.')
@@ -346,59 +348,67 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
     conditioned_zones = []
     model.getThermalZones.each do |zone|
       next if OpenstudioStandards::ThermalZone.thermal_zone_plenum?(zone)
-      next if !OpenstudioStandards::ThermalZone.thermal_zone_heated?(zone) && !OpenstudioStandards::ThermalZone.thermal_zone_cooled?(zone)
+      if !OpenstudioStandards::ThermalZone.thermal_zone_heated?(zone) && !OpenstudioStandards::ThermalZone.thermal_zone_cooled?(zone)
+        next
+      end
+
       conditioned_zones << zone
     end
 
     # logic to partition thermal zones to be served by different HVAC systems
     case hvac_system_partition
 
-      when 'Automatic Partition'
-        # group zones by occupancy type (residential/nonresidential)
-        # split non-dominant groups if their total area exceeds 20,000 ft2.
-        sys_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_occupancy_type(model, min_area_m2: OpenStudio.convert(20000, 'ft^2', 'm^2').get)
-
-        # assume secondary system type is PSZ-AC for VAV Reheat otherwise assume same hvac system type
-        sec_sys_type = hvac_system_type # same as primary system type
-        sec_sys_type = 'PSZ-HP' if (hvac_system_type.to_s == 'VAV Reheat') || (hvac_system_type.to_s == 'PVAV Reheat')
-
-        sys_groups.each do |sys_group|
-          # add the primary system to the primary zones and the secondary system to any zones that are different
-          # differentiate primary and secondary zones based on operating hours and internal loads (same as 90.1 PRM)
-          pri_sec_zone_lists = std.model_differentiate_primary_secondary_thermal_zones(model, sys_group['zones'])
-
-          # add the primary system to the primary zones
-          add_system_to_zones(model, runner, hvac_system_type, pri_sec_zone_lists['primary'], std, doas_dcv: doas_dcv)
-
-          # add the secondary system to the secondary zones (if any)
-          if !pri_sec_zone_lists['secondary'].empty?
-            runner.registerInfo("Secondary system type is #{sec_sys_type}")
-            add_system_to_zones(model, runner, sec_sys_type, pri_sec_zone_lists['secondary'], std, doas_dcv: doas_dcv)
-          end
+    when 'Automatic Partition'
+      # group zones by occupancy type (residential/nonresidential)
+      # split non-dominant groups if their total area exceeds 20,000 ft2.
+      sys_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_occupancy_type(model,
+                                                                                             min_area_m2: OpenStudio.convert(
+                                                                                               20_000, 'ft^2', 'm^2'
+                                                                                             ).get)
+
+      # assume secondary system type is PSZ-AC for VAV Reheat otherwise assume same hvac system type
+      sec_sys_type = hvac_system_type # same as primary system type
+      sec_sys_type = 'PSZ-HP' if (hvac_system_type.to_s == 'VAV Reheat') || (hvac_system_type.to_s == 'PVAV Reheat')
+
+      sys_groups.each do |sys_group|
+        # add the primary system to the primary zones and the secondary system to any zones that are different
+        # differentiate primary and secondary zones based on operating hours and internal loads (same as 90.1 PRM)
+        pri_sec_zone_lists = std.model_differentiate_primary_secondary_thermal_zones(model, sys_group['zones'])
+
+        # add the primary system to the primary zones
+        add_system_to_zones(model, runner, hvac_system_type, pri_sec_zone_lists['primary'], std, doas_dcv: doas_dcv)
+
+        # add the secondary system to the secondary zones (if any)
+        unless pri_sec_zone_lists['secondary'].empty?
+          runner.registerInfo("Secondary system type is #{sec_sys_type}")
+          add_system_to_zones(model, runner, sec_sys_type, pri_sec_zone_lists['secondary'], std, doas_dcv: doas_dcv)
         end
+      end
 
-      when 'Whole Building'
-        add_system_to_zones(model, runner, hvac_system_type, conditioned_zones, std, doas_dcv: doas_dcv)
+    when 'Whole Building'
+      add_system_to_zones(model, runner, hvac_system_type, conditioned_zones, std, doas_dcv: doas_dcv)
 
-      when 'One System Per Building Story'
-        story_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_building_story(model, conditioned_zones)
-        story_groups.each do |story_zones|
-          add_system_to_zones(model, runner, hvac_system_type, story_zones, std, doas_dcv: doas_dcv)
-        end
+    when 'One System Per Building Story'
+      story_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_building_story(model,
+                                                                                               conditioned_zones)
+      story_groups.each do |story_zones|
+        add_system_to_zones(model, runner, hvac_system_type, story_zones, std, doas_dcv: doas_dcv)
+      end
 
-      when 'One System Per Building Type'
-        system_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_building_type(model, min_area_m2: 0.0)
-        system_groups.each do |system_group|
-          add_system_to_zones(model, runner, hvac_system_type, system_group['zones'], std, doas_dcv: doas_dcv)
-        end
+    when 'One System Per Building Type'
+      system_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_building_type(model,
+                                                                                               min_area_m2: 0.0)
+      system_groups.each do |system_group|
+        add_system_to_zones(model, runner, hvac_system_type, system_group['zones'], std, doas_dcv: doas_dcv)
+      end
 
-      else
-        runner.registerError('Invalid HVAC system partition choice')
-        return false
+    else
+      runner.registerError('Invalid HVAC system partition choice')
+      return false
     end
 
     # check that weather file exists for a sizing run
-    if !model.weatherFile.is_initialized
+    unless model.weatherFile.is_initialized
       runner.registerError('Weather file not set. Cannot perform sizing run.')
       return false
     end
@@ -429,7 +439,7 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
 
     runner.registerFinalCondition("Added system type #{hvac_system_type} to model.")
 
-    return true
+    true
   end # end the run method
 end # end the measure
 

data/lib/measures/nze_hvac/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>nze_hvac</name>
   <uid>f060dff2-b28d-4194-a6af-e66d88ddb33c</uid>
-  <version_id>1501d0c9-780d-4c2b-973b-9985d654c11f</version_id>
-  <version_modified>2025-06-20T00:07:29Z</version_modified>
+  <version_id>9ef6d0b1-beec-4b75-a119-476f2fa9d4dc</version_id>
+  <version_modified>2025-09-25T16:10:25Z</version_modified>
   <xml_checksum>0E5E4776</xml_checksum>
   <class_name>NzeHvac</class_name>
   <display_name>NZEHVAC</display_name>
@@ -235,7 +235,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8C5A8023</checksum>
+      <checksum>FFCBFF29</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -258,13 +258,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>7EAD5ED0</checksum>
+      <checksum>59C247DF</checksum>
     </file>
     <file>
       <filename>NZEHVAC_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>4522D5A7</checksum>
+      <checksum>721443D9</checksum>
     </file>
     <file>
       <filename>USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>

data/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.rb

@@ -12,21 +12,21 @@
 class ReplaceWaterHeaterMixedWithThermalStorageChilledWater < OpenStudio::Measure::ModelMeasure
   # human readable name
   def name
-    return 'Replace Water Heater Mixed with Thermal Storage Chilled Water'
+    'Replace Water Heater Mixed with Thermal Storage Chilled Water'
   end
 
   # human readable description
   def description
-    return 'This measure is a quick fix for GUI issue that prevents putting thermal storage on two plant loops.'
+    'This measure is a quick fix for GUI issue that prevents putting thermal storage on two plant loops.'
   end
 
   # human readable description of modeling approach
   def modeler_description
-    return 'The model in this case used a water heater mixed as a place holder. This measure will take a string argument, and will replace the water heater with a new thermal storage chilled water object.'
+    'The model in this case used a water heater mixed as a place holder. This measure will take a string argument, and will replace the water heater with a new thermal storage chilled water object.'
   end
 
   # define the arguments that the user will input
-  def arguments(model)
+  def arguments(_model)
     args = OpenStudio::Measure::OSArgumentVector.new
 
     # the name of the water heater to replace
@@ -36,7 +36,7 @@ class ReplaceWaterHeaterMixedWithThermalStorageChilledWater < OpenStudio::Measur
     wh_name.setDefaultValue('CHW Tank Placeholder')
     args << wh_name
 
-    return args
+    args
   end
 
   # define what happens when the measure is run
@@ -44,9 +44,7 @@ class ReplaceWaterHeaterMixedWithThermalStorageChilledWater < OpenStudio::Measur
     super(model, runner, user_arguments)
 
     # use the built-in error checking
-    if !runner.validateUserArguments(arguments(model), user_arguments)
-      return false
-    end
+    return false unless runner.validateUserArguments(arguments(model), user_arguments)
 
     # assign the user inputs to variables
     wh_name = runner.getStringArgumentValue('wh_name', user_arguments)
@@ -71,22 +69,21 @@ class ReplaceWaterHeaterMixedWithThermalStorageChilledWater < OpenStudio::Measur
       puts "Checking #{plant_loop.name}"
 
       plant_loop.supplyComponents.each do |component|
-        if component.name.to_s == wh_name
-          placeholder = component
-          puts "found #{component.name}"
+        next unless component.name.to_s == wh_name
 
-          # swap components
-          supply_inlet_node = component.to_WaterToWaterComponent.get.supplyInletModelObject.get.to_Node.get
-          new_chilled_water.addToNode(supply_inlet_node)
-          demand_inlet_node = component.to_WaterToWaterComponent.get.demandInletModelObject.get.to_Node.get
-          new_chilled_water.addToNode(demand_inlet_node)
+        placeholder = component
+        puts "found #{component.name}"
 
-        end
+        # swap components
+        supply_inlet_node = component.to_WaterToWaterComponent.get.supplyInletModelObject.get.to_Node.get
+        new_chilled_water.addToNode(supply_inlet_node)
+        demand_inlet_node = component.to_WaterToWaterComponent.get.demandInletModelObject.get.to_Node.get
+        new_chilled_water.addToNode(demand_inlet_node)
       end
     end
 
     # remove unused water heater from the model
-    if !placeholder.nil?
+    unless placeholder.nil?
       puts 'Removing water heater'
       placeholder.remove
     end
@@ -94,7 +91,7 @@ class ReplaceWaterHeaterMixedWithThermalStorageChilledWater < OpenStudio::Measur
     # report final condition of model
     runner.registerFinalCondition("The building finished with #{model.getThermalStorageChilledWaterStratifieds.size} chilled water objects.")
 
-    return true
+    true
   end
 end
 

data/lib/measures/replace_water_heater_mixed_with_thermal_storage_chilled_water/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>replace_water_heater_mixed_with_thermal_storage_chilled_water</name>
   <uid>f219279a-96b6-4636-b663-467d554e42a5</uid>
-  <version_id>7f553fb6-8a67-4bb0-9ff9-3767354732ea</version_id>
-  <version_modified>2024-11-16T23:47:44Z</version_modified>
+  <version_id>82185c9d-bc51-49c0-91f5-4960d1473438</version_id>
+  <version_modified>2025-09-25T15:33:42Z</version_modified>
   <xml_checksum>D48F381B</xml_checksum>
   <class_name>ReplaceWaterHeaterMixedWithThermalStorageChilledWater</class_name>
   <display_name>Replace Water Heater Mixed with Thermal Storage Chilled Water</display_name>
@@ -53,7 +53,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8C5A8023</checksum>
+      <checksum>FFCBFF29</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -76,7 +76,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>A4A9061E</checksum>
+      <checksum>65E821E7</checksum>
     </file>
     <file>
       <filename>WaterHeaterToChilledWater.osm</filename>
@@ -88,7 +88,7 @@
       <filename>replace_water_heater_mixed_with_thermal_storage_chilled_water_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>8ECE4661</checksum>
+      <checksum>38E71E0B</checksum>
     </file>
   </files>
 </measure>