openstudio-ee 0.12.3 → 0.12.5

data/lib/measures/AddDaylightSensors/measure.rb

@@ -9,17 +9,17 @@
 class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
   # define the name that a user will see
   def name
-    return 'Add Daylight Sensor at the Center of Spaces with a Specified Space Type Assigned'
+    'Add Daylight Sensor at the Center of Spaces with a Specified Space Type Assigned'
   end
 
   # human readable description
   def description
-    return 'This measure will add daylighting controls to spaces that that have space types assigned with names containing the string in the argument. You can also add a cost per space for sensors added to the model.'
+    'This measure will add daylighting controls to spaces that that have space types assigned with names containing the string in the argument. You can also add a cost per space for sensors added to the model.'
   end
 
   # human readable description of modeling approach
   def modeler_description
-    return "Make an array of the spaces that meet the criteria. Locate the sensor x and y values by averaging the min and max X and Y values from floor surfaces in the space. If a space already has a daylighting control, do not add a new one and leave the original in place. Warn the user if the space isn't assigned to a thermal zone, or if the space doesn't have any translucent surfaces. Note that the cost is added to the space not the sensor. If the sensor is removed at a later date, the cost will remain."
+    "Make an array of the spaces that meet the criteria. Locate the sensor x and y values by averaging the min and max X and Y values from floor surfaces in the space. If a space already has a daylighting control, do not add a new one and leave the original in place. Warn the user if the space isn't assigned to a thermal zone, or if the space doesn't have any translucent surfaces. Note that the cost is added to the space not the sensor. If the sensor is removed at a later date, the cost will remain."
   end
 
   # define the arguments that the user will input
@@ -40,14 +40,15 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
     # looping through sorted hash of model objects
     space_type_args_hash.sort.map do |key, value|
       # only include if space type is used in the model
-      if !value.spaces.empty?
+      unless value.spaces.empty?
         space_type_handles << value.handle.to_s
         space_type_display_names << key
       end
     end
 
     # make a choice argument for space type
-    space_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('space_type', space_type_handles, space_type_display_names, true)
+    space_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('space_type', space_type_handles,
+                                                                    space_type_display_names, true)
     space_type.setDisplayName('Add Daylight Sensors to Spaces of This Space Type')
     args << space_type
 
@@ -144,7 +145,7 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
     om_frequency.setDefaultValue(1)
     args << om_frequency
 
-    return args
+    args
   end
 
   # define what happens when the measure is run
@@ -152,9 +153,7 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
     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
     space_type = runner.getOptionalWorkspaceObjectChoiceValue('space_type', user_arguments, model)
@@ -181,13 +180,11 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
         runner.registerError("The selected space type with handle '#{handle}' was not found in the model. It may have been removed by another measure.")
       end
       return false
+    elsif !space_type.get.to_SpaceType.empty?
+      space_type = space_type.get.to_SpaceType.get
     else
-      if !space_type.get.to_SpaceType.empty?
-        space_type = space_type.get.to_SpaceType.get
-      else
-        runner.registerError('Script Error - argument not showing up as space type.')
-        return false
-      end
+      runner.registerError('Script Error - argument not showing up as space type.')
+      return false
     end
 
     # check the setpoint for reasonableness
@@ -238,17 +235,15 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
     if (expected_life < 1) && (expected_life > 100)
       runner.registerError('Choose an integer greater than 0 and less than or equal to 100 for Expected Life.')
     end
-    if om_frequency < 1
-      runner.registerError('Choose an integer greater than 0 for O & M Frequency.')
-    end
+    runner.registerError('Choose an integer greater than 0 for O & M Frequency.') if om_frequency < 1
 
     # short def to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure
     def neat_numbers(number, roundto = 2) # round to 0 or 2)
-      if roundto == 2
-        number = format '%.2f', number
-      else
-        number = number.round
-      end
+      number = if roundto == 2
+                 format '%.2f', number
+               else
+                 number.round
+               end
       # regex to add commas
       number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
     end
@@ -259,14 +254,12 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
       objects.each do |object|
         object_LCCs = object.lifeCycleCosts
         object_LCCs.each do |object_LCC|
-          if (object_LCC.category == 'Construction') || (object_LCC.category == 'Salvage')
-            if object_LCC.yearsFromStart == 0
-              counter += object_LCC.totalCost
-            end
-          end
+          next unless (object_LCC.category == 'Construction') || (object_LCC.category == 'Salvage')
+
+          counter += object_LCC.totalCost if object_LCC.yearsFromStart == 0
         end
       end
-      return counter
+      counter
     end
 
     # unit conversion from IP units to SI units
@@ -297,15 +290,14 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
     spaces_using_space_type.each do |space_using_space_type|
       if space_using_space_type.daylightingControls.empty?
         space_zone = space_using_space_type.thermalZone
-        if !space_zone.empty?
+        if space_zone.empty?
+          runner.registerWarning("Space '#{space_using_space_type.name}' is not associated with a thermal zone. It won't be part of the EnergyPlus simulation.")
+        else
           space_zone = space_zone.get
           if space_zone.primaryDaylightingControl.empty? && space_zone.secondaryDaylightingControl.empty?
             spaces_using_space_type_in_zones_without_sensors << space_using_space_type
-          elsif
-            runner.registerWarning("Thermal zone '#{space_zone.name}' which includes space '#{space_using_space_type.name}' already had a daylighting sensor. No sensor was added to space '#{space_using_space_type.name}'.")
+          elsif runner.registerWarning("Thermal zone '#{space_zone.name}' which includes space '#{space_using_space_type.name}' already had a daylighting sensor. No sensor was added to space '#{space_using_space_type.name}'.")
           end
-        else
-          runner.registerWarning("Space '#{space_using_space_type.name}' is not associated with a thermal zone. It won't be part of the EnergyPlus simulation.")
         end
       else
         runner.registerWarning("Space '#{space_using_space_type.name}' already has a daylighting sensor. No sensor was added.")
@@ -323,9 +315,11 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
       has_ext_nat_light = false
       space.surfaces.each do |surface|
         next if surface.outsideBoundaryCondition != 'Outdoors'
+
         surface.subSurfaces.each do |sub_surface|
           next if sub_surface.subSurfaceType == 'Door'
           next if sub_surface.subSurfaceType == 'OverheadDoor'
+
           has_ext_nat_light = true
         end
       end
@@ -338,6 +332,7 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
       floors = []
       space.surfaces.each do |surface|
         next if surface.surfaceType != 'Floor'
+
         floors << surface
       end
 
@@ -373,16 +368,20 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
         starting_lcc_counter = space.lifeCycleCosts.size
 
         # adding new cost items
-        lcc_mat = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Mat - #{sensor.name}", space, material_cost, 'CostPerEach', 'Construction', expected_life, years_until_costs_start)
+        lcc_mat = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Mat - #{sensor.name}", space,
+                                                                       material_cost, 'CostPerEach', 'Construction', expected_life, years_until_costs_start)
         if demo_cost_initial_const
-          lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{sensor.name}", space, demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start)
+          lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{sensor.name}", space,
+                                                                          demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start)
         else
-          lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{sensor.name}", space, demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start + expected_life)
+          lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{sensor.name}", space,
+                                                                          demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start + expected_life)
         end
-        lcc_om = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_OM - #{sensor.name}", space, om_cost, 'CostPerEach', 'Maintenance', om_frequency, 0)
+        lcc_om = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_OM - #{sensor.name}", space, om_cost,
+                                                                      'CostPerEach', 'Maintenance', om_frequency, 0)
 
         if space.lifeCycleCosts.size - starting_lcc_counter == 3
-          if !warning_cost_assign_to_space
+          unless warning_cost_assign_to_space
             runner.registerInfo('Cost for daylight sensors was added to spaces. The cost will remain in the model unless the space is removed. Removing only the sensor will not remove the cost.')
             warning_cost_assign_to_space = true
           end
@@ -424,48 +423,47 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
         end
       end
 
-      if !zone_spaces_with_new_sensors.empty?
-        # need to identify the two largest spaces
-        primary_area = 0
-        secondary_area = 0
-        primary_space = nil
-        secondary_space = nil
-        three_or_more_sensors = false
-
-        # dfg temp - need to add another if statement so only get spaces with sensors
-        zone_spaces_with_new_sensors.each do |zone_space|
-          zone_space_area = zone_space.floorArea
-          if zone_space_area > primary_area
-            primary_area = zone_space_area
-            primary_space = zone_space
-          elsif zone_space_area > secondary_area
-            secondary_area = zone_space_area
-            secondary_space = zone_space
-          else
-            # setup flag to warn user that more than 2 sensors can't be added to a space
-            three_or_more_sensors = true
-          end
-        end
-
-        if primary_space
-          # setup primary sensor
-          sensor_primary = new_sensor_objects[primary_space.name.to_s]
-          zone.setPrimaryDaylightingControl(sensor_primary)
-          zone.setFractionofZoneControlledbyPrimaryDaylightingControl(fraction_zone_controlled * primary_area / (primary_area + secondary_area))
+      next if zone_spaces_with_new_sensors.empty?
+
+      # need to identify the two largest spaces
+      primary_area = 0
+      secondary_area = 0
+      primary_space = nil
+      secondary_space = nil
+      three_or_more_sensors = false
+
+      # dfg temp - need to add another if statement so only get spaces with sensors
+      zone_spaces_with_new_sensors.each do |zone_space|
+        zone_space_area = zone_space.floorArea
+        if zone_space_area > primary_area
+          primary_area = zone_space_area
+          primary_space = zone_space
+        elsif zone_space_area > secondary_area
+          secondary_area = zone_space_area
+          secondary_space = zone_space
+        else
+          # setup flag to warn user that more than 2 sensors can't be added to a space
+          three_or_more_sensors = true
         end
+      end
 
-        if secondary_space
-          # setup secondary sensor
-          sensor_secondary = new_sensor_objects[secondary_space.name.to_s]
-          zone.setSecondaryDaylightingControl(sensor_secondary)
-          zone.setFractionofZoneControlledbySecondaryDaylightingControl(fraction_zone_controlled * secondary_area / (primary_area + secondary_area))
-        end
+      if primary_space
+        # setup primary sensor
+        sensor_primary = new_sensor_objects[primary_space.name.to_s]
+        zone.setPrimaryDaylightingControl(sensor_primary)
+        zone.setFractionofZoneControlledbyPrimaryDaylightingControl(fraction_zone_controlled * primary_area / (primary_area + secondary_area))
+      end
 
-        # warn that additional sensors were not used
-        if three_or_more_sensors == true
-          runner.registerWarning("Thermal zone '#{zone.name}' had more than two spaces with sensors. Only two sensors were associated with the thermal zone.")
-        end
+      if secondary_space
+        # setup secondary sensor
+        sensor_secondary = new_sensor_objects[secondary_space.name.to_s]
+        zone.setSecondaryDaylightingControl(sensor_secondary)
+        zone.setFractionofZoneControlledbySecondaryDaylightingControl(fraction_zone_controlled * secondary_area / (primary_area + secondary_area))
+      end
 
+      # warn that additional sensors were not used
+      if three_or_more_sensors == true
+        runner.registerWarning("Thermal zone '#{zone.name}' had more than two spaces with sensors. Only two sensors were associated with the thermal zone.")
       end
     end
 
@@ -483,9 +481,11 @@ class AddDaylightSensors < OpenStudio::Measure::ModelMeasure
     yr0_capital_totalCosts = get_total_costs_for_objects(spaces_using_space_type)
 
     # reporting final condition of model
-    runner.registerFinalCondition("Added daylighting controls to #{sensor_count} spaces, covering #{area_ip}. Initial year costs associated with the daylighting controls is $#{neat_numbers(yr0_capital_totalCosts, 0)}.")
+    runner.registerFinalCondition("Added daylighting controls to #{sensor_count} spaces, covering #{area_ip}. Initial year costs associated with the daylighting controls is $#{neat_numbers(
+      yr0_capital_totalCosts, 0
+    )}.")
 
-    return true
+    true
   end
 end
 

data/lib/measures/AddDaylightSensors/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_daylight_sensors</name>
   <uid>62babdc7-c81e-4dfd-96e8-af1628a55167</uid>
-  <version_id>a544f8df-9af8-4b82-9806-bae6d49c009d</version_id>
-  <version_modified>2025-08-08T15:15:56Z</version_modified>
+  <version_id>39be2777-6303-4810-8fd0-aaae1dfa515b</version_id>
+  <version_modified>2025-09-25T15:33:42Z</version_modified>
   <xml_checksum>0AC58119</xml_checksum>
   <class_name>AddDaylightSensors</class_name>
   <display_name>Add Daylight Sensor at the Center of Spaces with a Specified Space Type Assigned</display_name>
@@ -216,13 +216,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>D8B26643</checksum>
+      <checksum>22008D9E</checksum>
     </file>
     <file>
       <filename>AddDaylightSensors_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>91062DC5</checksum>
+      <checksum>2F7FEB8D</checksum>
     </file>
     <file>
       <filename>ModelForDaylightSensors.osm</filename>

data/lib/measures/AddOverhangsByProjectionFactor/measure.rb

@@ -9,17 +9,17 @@
 class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
   # define the name that a user will see
   def name
-    return 'Add Overhangs by Projection Factor'
+    'Add Overhangs by Projection Factor'
   end
 
   # human readable description
   def description
-    return 'Add overhangs by projection factor to specified windows. The projection factor is the overhang depth divided by the window height. This can be applied to windows by the closest cardinal direction. If baseline model contains overhangs made by this measure, they will be replaced. Optionally the measure can delete any pre-existing space shading surfaces.'
+    'Add overhangs by projection factor to specified windows. The projection factor is the overhang depth divided by the window height. This can be applied to windows by the closest cardinal direction. If baseline model contains overhangs made by this measure, they will be replaced. Optionally the measure can delete any pre-existing space shading surfaces.'
   end
 
   # human readable description of modeling approach
   def modeler_description
-    return "If requested then delete existing space shading surfaces. Then loop through exterior windows. If the requested cardinal direction is the closest to the window, then add the overhang. Name the shading surface the same as the window but append with '-Overhang'.  If a space shading surface of that name already exists, then delete it before making the new one. This measure has no life cycle cost arguments. You can see the economic impact of the measure by costing the construction used for the overhangs."
+    "If requested then delete existing space shading surfaces. Then loop through exterior windows. If the requested cardinal direction is the closest to the window, then add the overhang. Name the shading surface the same as the window but append with '-Overhang'.  If a space shading surface of that name already exists, then delete it before making the new one. This measure has no life cycle cost arguments. You can see the economic impact of the measure by costing the construction used for the overhangs."
   end
 
   # define the arguments that the user will input
@@ -64,18 +64,19 @@ class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
     # looping through sorted hash of constructions
     construction_args_hash.sort.map do |key, value|
       # only include if construction is not used on surface
-      if !value.isFenestration
+      unless value.isFenestration
         construction_handles << value.handle.to_s
         construction_display_names << key
       end
     end
 
     # make an argument for construction
-    construction = OpenStudio::Measure::OSArgument.makeChoiceArgument('construction', construction_handles, construction_display_names, false)
+    construction = OpenStudio::Measure::OSArgument.makeChoiceArgument('construction', construction_handles,
+                                                                      construction_display_names, false)
     construction.setDisplayName('Optionally Choose a Construction for the Overhangs')
     args << construction
 
-    return args
+    args
   end
 
   # define what happens when the measure is run
@@ -83,9 +84,7 @@ class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
     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
     projection_factor = runner.getDoubleArgumentValue('projection_factor', user_arguments)
@@ -117,29 +116,30 @@ class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
         return false
       end
 
+    elsif !construction.get.to_Construction.empty?
+      construction = construction.get.to_Construction.get
     else
-      if !construction.get.to_Construction.empty?
-        construction = construction.get.to_Construction.get
-      else
-        runner.registerError('Script Error - argument not showing up as construction.')
-        return false
-      end
+      runner.registerError('Script Error - argument not showing up as construction.')
+      return false
     end
 
     # helper to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure.
     def neat_numbers(number, roundto = 2) # round to 0 or 2)
-      if roundto == 2
-        number = format '%.2f', number
-      else
-        number = number.round
-      end
+      number = if roundto == 2
+                 format '%.2f', number
+               else
+                 number.round
+               end
       # regex to add commas
       number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
     end
 
     # helper to make it easier to do unit conversions on the fly.  The definition be called through this measure.
     def unit_helper(number, from_unit_string, to_unit_string)
-      converted_number = OpenStudio.convert(OpenStudio::Quantity.new(number, OpenStudio.createUnit(from_unit_string).get), OpenStudio.createUnit(to_unit_string).get).get.value
+      converted_number = OpenStudio.convert(
+        OpenStudio::Quantity.new(number,
+                                 OpenStudio.createUnit(from_unit_string).get), OpenStudio.createUnit(to_unit_string).get
+      ).get.value
     end
 
     # helper that loops through lifecycle costs getting total costs under "Construction" or "Salvage" category and add to counter if occurs during year 0
@@ -148,14 +148,12 @@ class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
       objects.each do |object|
         object_LCCs = object.lifeCycleCosts
         object_LCCs.each do |object_LCC|
-          if (object_LCC.category == 'Construction') || (object_LCC.category == 'Salvage')
-            if object_LCC.yearsFromStart == 0
-              counter += object_LCC.totalCost
-            end
-          end
+          next unless (object_LCC.category == 'Construction') || (object_LCC.category == 'Salvage')
+
+          counter += object_LCC.totalCost if object_LCC.yearsFromStart == 0
         end
       end
-      return counter
+      counter
     end
 
     # counter for year 0 capital costs
@@ -201,17 +199,18 @@ class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
       next if s.subSurfaceType == 'TubularDaylightDiffuser'
 
       # get the absoluteAzimuth for the surface so we can categorize it
-      absoluteAzimuth = OpenStudio.convert(s.azimuth, 'rad', 'deg').get + s.space.get.directionofRelativeNorth + model.getBuilding.northAxis
+      absoluteAzimuth = OpenStudio.convert(s.azimuth, 'rad',
+                                           'deg').get + s.space.get.directionofRelativeNorth + model.getBuilding.northAxis
       absoluteAzimuth -= 360.0 until absoluteAzimuth < 360.0
 
       if facade == 'North'
-        next if !((absoluteAzimuth >= 315.0) || (absoluteAzimuth < 45.0))
+        next unless (absoluteAzimuth >= 315.0) || (absoluteAzimuth < 45.0)
       elsif facade == 'East'
-        next if !((absoluteAzimuth >= 45.0) && (absoluteAzimuth < 135.0))
+        next unless (absoluteAzimuth >= 45.0) && (absoluteAzimuth < 135.0)
       elsif facade == 'South'
-        next if !((absoluteAzimuth >= 135.0) && (absoluteAzimuth < 225.0))
+        next unless (absoluteAzimuth >= 135.0) && (absoluteAzimuth < 225.0)
       elsif facade == 'West'
-        next if !((absoluteAzimuth >= 225.0) && (absoluteAzimuth < 315.0))
+        next unless (absoluteAzimuth >= 225.0) && (absoluteAzimuth < 315.0)
       else
         runner.registerError('Unexpected value of facade: ' + facade + '.')
         return false
@@ -238,23 +237,19 @@ class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
         if new_overhang.empty?
           ok = runner.registerWarning('Unable to add overhang to ' + s.briefDescription +
                    ' with projection factor ' + projection_factor.to_s + ' and offset ' + offset.to_s + '.')
-          return false if !ok
+          return false unless ok
         else
           new_overhang.get.setName("#{s.name} - Overhang")
           runner.registerInfo('Added overhang ' + new_overhang.get.briefDescription + ' to ' +
               s.briefDescription + ' with projection factor ' + projection_factor.to_s +
               ' and offset ' + '0' + '.')
-          if construction_chosen
-            if !construction.to_Construction.empty?
-              new_overhang.get.setConstruction(construction)
-            end
-          end
+          new_overhang.get.setConstruction(construction) if construction_chosen && !construction.to_Construction.empty?
           overhang_added = true
         end
       end
     end
 
-    if !overhang_added
+    unless overhang_added
       runner.registerAsNotApplicable("The model has exterior #{facade.downcase} walls, but no windows were found to add overhangs to.")
       return true
     end
@@ -268,9 +263,11 @@ class AddOverhangsByProjectionFactor < OpenStudio::Measure::ModelMeasure
     final_shading_groups.each do |shading_group|
       number_of_final_space_shading_surf += shading_group.shadingSurfaces.size
     end
-    runner.registerFinalCondition("The final building has #{number_of_final_space_shading_surf} space shading surfaces. Initial capital costs associated with the improvements are $#{neat_numbers(yr0_capital_totalCosts, 0)}.")
+    runner.registerFinalCondition("The final building has #{number_of_final_space_shading_surf} space shading surfaces. Initial capital costs associated with the improvements are $#{neat_numbers(
+      yr0_capital_totalCosts, 0
+    )}.")
 
-    return true
+    true
   end
 end
 

data/lib/measures/AddOverhangsByProjectionFactor/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_overhangs_by_projection_factor</name>
   <uid>1e29e117-3916-4368-b24d-75da54045956</uid>
-  <version_id>680a7548-4ba3-4bde-9a58-f8873dd8d535</version_id>
-  <version_modified>2025-08-08T15:15:58Z</version_modified>
+  <version_id>7de48598-b984-4a31-b8b7-bedb9a80e9c2</version_id>
+  <version_modified>2025-09-25T15:33:44Z</version_modified>
   <xml_checksum>6DE831F7</xml_checksum>
   <class_name>AddOverhangsByProjectionFactor</class_name>
   <display_name>Add Overhangs by Projection Factor</display_name>
@@ -127,13 +127,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>330F0C00</checksum>
+      <checksum>5C47B13D</checksum>
     </file>
     <file>
       <filename>AddOverhangsByProjectionFactor_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>18A9E740</checksum>
+      <checksum>E5AFF7A2</checksum>
     </file>
     <file>
       <filename>OverhangTestModel_01.osm</filename>

data/lib/measures/EnableDemandControlledVentilation/measure.rb

@@ -19,11 +19,11 @@ class EnableDemandControlledVentilation < OpenStudio::Measure::ModelMeasure
   # define the name that a user will see, this method may be deprecated as
   # the display name in PAT comes from the name field in measure.xml
   def name
-    return 'Enable Demand Controlled Ventilation'
+    'Enable Demand Controlled Ventilation'
   end
 
   # define the arguments that the user will input
-  def arguments(model)
+  def arguments(_model)
     args = OpenStudio::Measure::OSArgumentVector.new
 
     # make choice argument economizer control type
@@ -35,7 +35,7 @@ class EnableDemandControlledVentilation < OpenStudio::Measure::ModelMeasure
     dcv_type.setDisplayName('DCV Type')
     args << dcv_type
 
-    return args
+    args
   end
 
   # define what happens when the measure is cop
@@ -43,9 +43,7 @@ class EnableDemandControlledVentilation < OpenStudio::Measure::ModelMeasure
     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
     dcv_type = runner.getStringArgumentValue('dcv_type', user_arguments)
@@ -59,11 +57,11 @@ class EnableDemandControlledVentilation < OpenStudio::Measure::ModelMeasure
 
     # short def to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure
     def neat_numbers(number, roundto = 2) # round to 0 or 2)
-      if roundto == 2
-        number = format '%.2f', number
-      else
-        number = number.round
-      end
+      number = if roundto == 2
+                 format '%.2f', number
+               else
+                 number.round
+               end
       # regex to add commas
       number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
     end
@@ -76,35 +74,34 @@ class EnableDemandControlledVentilation < OpenStudio::Measure::ModelMeasure
       # find AirLoopHVACOutdoorAirSystem on loop
       air_loop.supplyComponents.each do |supply_component|
         hVACComponent = supply_component.to_AirLoopHVACOutdoorAirSystem
-        if !hVACComponent.empty?
-          hVACComponent = hVACComponent.get
-
-          # get ControllerOutdoorAir
-          controller_oa = hVACComponent.getControllerOutdoorAir
-
-          # get ControllerMechanicalVentilation
-          controller_mv = controller_oa.controllerMechanicalVentilation
-
-          if dcv_type == 'EnableDCV'
-            # check if demand control is enabled, if not, then enable it
-            if controller_mv.demandControlledVentilation == true
-              runner.registerInfo("#{air_loop.name} already has DCV enabled.")
-            else
-              controller_mv.setDemandControlledVentilation(true)
-              runner.registerInfo("Enabling DCV for #{air_loop.name}.")
-              air_loops_changed << air_loop
-            end
-          elsif dcv_type == 'DisableDCV'
-            # check if demand control is disabled, if not, then disabled it
-            if controller_mv.demandControlledVentilation == false
-              runner.registerInfo("#{air_loop.name} already has DCV disabled.")
-            else
-              controller_mv.setDemandControlledVentilation(false)
-              runner.registerInfo("Disabling DCV for #{air_loop.name}.")
-              air_loops_changed << air_loop
-            end
-          end
+        next if hVACComponent.empty?
+
+        hVACComponent = hVACComponent.get
 
+        # get ControllerOutdoorAir
+        controller_oa = hVACComponent.getControllerOutdoorAir
+
+        # get ControllerMechanicalVentilation
+        controller_mv = controller_oa.controllerMechanicalVentilation
+
+        if dcv_type == 'EnableDCV'
+          # check if demand control is enabled, if not, then enable it
+          if controller_mv.demandControlledVentilation == true
+            runner.registerInfo("#{air_loop.name} already has DCV enabled.")
+          else
+            controller_mv.setDemandControlledVentilation(true)
+            runner.registerInfo("Enabling DCV for #{air_loop.name}.")
+            air_loops_changed << air_loop
+          end
+        elsif dcv_type == 'DisableDCV'
+          # check if demand control is disabled, if not, then disabled it
+          if controller_mv.demandControlledVentilation == false
+            runner.registerInfo("#{air_loop.name} already has DCV disabled.")
+          else
+            controller_mv.setDemandControlledVentilation(false)
+            runner.registerInfo("Disabling DCV for #{air_loop.name}.")
+            air_loops_changed << air_loop
+          end
         end
       end
     end
@@ -118,7 +115,7 @@ class EnableDemandControlledVentilation < OpenStudio::Measure::ModelMeasure
     # Report final condition of model
     runner.registerFinalCondition("#{air_loops_changed.size} air loops now have demand controlled ventilation enabled.")
 
-    return true
+    true
   end
 end