openstudio-calibration 0.9.0 → 0.10.0

data/lib/measures/CoilHeatingGasPercentChange/measure.rb

@@ -58,6 +58,7 @@ class CoilHeatingGasPercentChange < OpenStudio::Measure::ModelMeasure
       components = value.supplyComponents
       components.each do |component|
         next if component.to_CoilHeatingGas.empty?
+
         show_loop = true
         loop_handles << component.handle.to_s
         loop_display_names << component.name.to_s
@@ -180,13 +181,11 @@ class CoilHeatingGasPercentChange < OpenStudio::Measure::ModelMeasure
     coils.each do |coil|
       altered_coil = false
       # coil_capacity_perc_change
-      if coil_capacity_perc_change != 0.0
-        if coil.nominalCapacity.is_initialized
-          runner.registerInfo("Applying nominalCapacity #{coil_capacity_perc_change} Percent Change to #{coil.name.get}.")
-          coil.setNominalCapacity(coil.nominalCapacity.get + coil.nominalCapacity.get * coil_capacity_perc_change * 0.01)
-          altered_capacity << coil.handle.to_s
-          altered_coil = true
-        end
+      if coil_capacity_perc_change != 0.0 && coil.nominalCapacity.is_initialized
+        runner.registerInfo("Applying nominalCapacity #{coil_capacity_perc_change} Percent Change to #{coil.name.get}.")
+        coil.setNominalCapacity(coil.nominalCapacity.get + coil.nominalCapacity.get * coil_capacity_perc_change * 0.01)
+        altered_capacity << coil.handle.to_s
+        altered_coil = true
       end
 
       # modify coil_efficiency_perc_change
@@ -219,10 +218,11 @@ class CoilHeatingGasPercentChange < OpenStudio::Measure::ModelMeasure
       end
 
       next unless altered_coil
+
       altered_coils << coil.handle.to_s
       change_name(coil, coil_parasitic_gas_perc_change, coil_efficiency_perc_change, coil_parasitic_electric_perc_change, coil_capacity_perc_change)
       runner.registerInfo("coil name changed to: #{coil.name.get}")
-    end # end coil loop
+    end
 
     # na if nothing in model to look at
     if altered_coils.empty?

data/lib/measures/CoilHeatingGasPercentChange/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>coil_heating_gas_percent_change</name>
   <uid>8589af79-cfe7-45fb-9c79-e7b95e5fb02f</uid>
-  <version_id>ea6e0ebc-c5b8-40cf-9139-75b9e3c0ac92</version_id>
-  <version_modified>20230602T154653Z</version_modified>
+  <version_id>2d3164ef-dac5-48a6-ac7e-64a6e54e1ab2</version_id>
+  <version_modified>20240428T231345Z</version_modified>
   <xml_checksum>1F3D2430</xml_checksum>
   <class_name>CoilHeatingGasPercentChange</class_name>
   <display_name>Heating Coils Gas Percent Change</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{b8bc9ec0-4bbf-4437-aa27-64d7f682926f}</default_value>
+      <default_value>{7a7f95eb-f729-4e94-b6b2-b88ba068f2e0}</default_value>
       <choices>
         <choice>
-          <value>{b8bc9ec0-4bbf-4437-aa27-64d7f682926f}</value>
+          <value>{7a7f95eb-f729-4e94-b6b2-b88ba068f2e0}</value>
           <display_name>*All Gas Heating Coils*</display_name>
         </choice>
         <choice>
@@ -106,7 +106,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>B18BB064</checksum>
+      <checksum>2E389481</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/CoilHeatingWaterMultiplier/measure.rb

@@ -57,6 +57,7 @@ class CoilHeatingWaterMultiplier < OpenStudio::Measure::ModelMeasure
       components = value.supplyComponents
       components.each do |component|
         next if component.to_CoilHeatingWater.empty?
+
         show_loop = true
         loop_handles << component.handle.to_s
         loop_display_names << component.name.to_s
@@ -163,30 +164,27 @@ class CoilHeatingWaterMultiplier < OpenStudio::Measure::ModelMeasure
     coils.each do |coil|
       altered_coil = false
       # coil_capacity_multiplier
-      if coil_capacity_multiplier != 1.0
-        if coil.ratedCapacity.is_initialized
-          runner.registerInfo("Applying ratedCapacity #{coil_capacity_multiplier}x multiplier to #{coil.name.get}.")
-          coil.setRatedCapacity(coil.ratedCapacity.get * coil_capacity_multiplier)
-          altered_capacity << coil.handle.to_s
-          altered_coil = true
-        end
+      if coil_capacity_multiplier != 1.0 && coil.ratedCapacity.is_initialized
+        runner.registerInfo("Applying ratedCapacity #{coil_capacity_multiplier}x multiplier to #{coil.name.get}.")
+        coil.setRatedCapacity(coil.ratedCapacity.get * coil_capacity_multiplier)
+        altered_capacity << coil.handle.to_s
+        altered_coil = true
       end
 
       # modify ua_factor
-      if ua_factor != 1.0
-        if coil.uFactorTimesAreaValue.is_initialized
-          runner.registerInfo("Applying uFactorTimesAreaValue #{ua_factor}x multiplier to #{coil.name.get}.")
-          coil.setUFactorTimesAreaValue(coil.uFactorTimesAreaValue.get * ua_factor)
-          altered_coilefficiency << coil.handle.to_s
-          altered_coil = true
-         end
+      if ua_factor != 1.0 && coil.uFactorTimesAreaValue.is_initialized
+        runner.registerInfo("Applying uFactorTimesAreaValue #{ua_factor}x multiplier to #{coil.name.get}.")
+        coil.setUFactorTimesAreaValue(coil.uFactorTimesAreaValue.get * ua_factor)
+        altered_coilefficiency << coil.handle.to_s
+        altered_coil = true
       end
 
       next unless altered_coil
+
       altered_coils << coil.handle.to_s
       change_name(coil, ua_factor, coil_capacity_multiplier)
       runner.registerInfo("coil name changed to: #{coil.name.get}")
-    end # end coil loop
+    end
 
     # na if nothing in model to look at
     if altered_coils.empty?

data/lib/measures/CoilHeatingWaterMultiplier/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>coil_heating_water_multiplier</name>
   <uid>48c50a83-4092-4f2b-9968-8c820759f321</uid>
-  <version_id>879615bf-75fa-4c33-91b0-75bbac7dc69a</version_id>
-  <version_modified>20230602T154653Z</version_modified>
+  <version_id>602ecd8c-6385-41ce-b67c-823a6be2a13c</version_id>
+  <version_modified>20240428T231345Z</version_modified>
   <xml_checksum>1F3D2430</xml_checksum>
   <class_name>CoilHeatingWaterMultiplier</class_name>
   <display_name>Heating Coils Water Multiplier</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{60548f35-634d-40b3-b2f2-ad5241ee9f73}</default_value>
+      <default_value>{bc82c988-32c1-407e-912d-90c1dfca838a}</default_value>
       <choices>
         <choice>
-          <value>{60548f35-634d-40b3-b2f2-ad5241ee9f73}</value>
+          <value>{bc82c988-32c1-407e-912d-90c1dfca838a}</value>
           <display_name>*All Water Heating Coils*</display_name>
         </choice>
         <choice>
@@ -88,7 +88,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>9FB8C5A3</checksum>
+      <checksum>3343F97A</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/CoilHeatingWaterPercentChange/measure.rb

@@ -50,6 +50,7 @@ class CoilHeatingWaterPercentChange < OpenStudio::Measure::ModelMeasure
       components = value.supplyComponents
       components.each do |component|
         next if component.to_CoilHeatingWater.empty?
+
         show_loop = true
         loop_handles << component.handle.to_s
         loop_display_names << component.name.to_s
@@ -154,30 +155,27 @@ class CoilHeatingWaterPercentChange < OpenStudio::Measure::ModelMeasure
     coils.each do |coil|
       altered_coil = false
       # coil_capacity_perc_change
-      if coil_capacity_perc_change != 0.0
-        if coil.ratedCapacity.is_initialized
-          runner.registerInfo("Applying ratedCapacity #{coil_capacity_perc_change} Percent Change to #{coil.name.get}.")
-          coil.setRatedCapacity(coil.ratedCapacity.get + coil.ratedCapacity.get * coil_capacity_perc_change * 0.01)
-          altered_capacity << coil.handle.to_s
-          altered_coil = true
-        end
+      if coil_capacity_perc_change != 0.0 && coil.ratedCapacity.is_initialized
+        runner.registerInfo("Applying ratedCapacity #{coil_capacity_perc_change} Percent Change to #{coil.name.get}.")
+        coil.setRatedCapacity(coil.ratedCapacity.get + coil.ratedCapacity.get * coil_capacity_perc_change * 0.01)
+        altered_capacity << coil.handle.to_s
+        altered_coil = true
       end
 
       # modify ua_factor
-      if ua_factor != 0.0
-        if coil.uFactorTimesAreaValue.is_initialized
-          runner.registerInfo("Applying uFactorTimesAreaValue #{ua_factor} Percent Change to #{coil.name.get}.")
-          coil.setUFactorTimesAreaValue(coil.uFactorTimesAreaValue.get + coil.uFactorTimesAreaValue.get * ua_factor * 0.01)
-          altered_coilefficiency << coil.handle.to_s
-          altered_coil = true
-        end
+      if ua_factor != 0.0 && coil.uFactorTimesAreaValue.is_initialized
+        runner.registerInfo("Applying uFactorTimesAreaValue #{ua_factor} Percent Change to #{coil.name.get}.")
+        coil.setUFactorTimesAreaValue(coil.uFactorTimesAreaValue.get + coil.uFactorTimesAreaValue.get * ua_factor * 0.01)
+        altered_coilefficiency << coil.handle.to_s
+        altered_coil = true
       end
 
       next unless altered_coil
+
       altered_coils << coil.handle.to_s
       change_name(coil, ua_factor, coil_capacity_perc_change)
       runner.registerInfo("coil name changed to: #{coil.name.get}")
-    end # end coil loop
+    end
 
     # na if nothing in model to look at
     if altered_coils.empty?

data/lib/measures/CoilHeatingWaterPercentChange/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>coil_heating_water_percent_change</name>
   <uid>85674ff6-4fdc-463f-9695-36bf6c6a2608</uid>
-  <version_id>696c02e7-551b-41ad-81f0-e4c1dd18392f</version_id>
-  <version_modified>20230602T154653Z</version_modified>
+  <version_id>a71ee86a-c7c4-45bb-adea-d896d4bfe83b</version_id>
+  <version_modified>20240428T231345Z</version_modified>
   <xml_checksum>1F3D2430</xml_checksum>
   <class_name>CoilHeatingWaterPercentChange</class_name>
   <display_name>Heating Coils Water Percent Change</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{5b417baa-44ad-40ae-b668-07c56229c812}</default_value>
+      <default_value>{1d183cf3-6a81-43a8-af94-c3b67971c32c}</default_value>
       <choices>
         <choice>
-          <value>{5b417baa-44ad-40ae-b668-07c56229c812}</value>
+          <value>{1d183cf3-6a81-43a8-af94-c3b67971c32c}</value>
           <display_name>*All Water Heating Coils*</display_name>
         </choice>
         <choice>
@@ -88,7 +88,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>F57B1BF5</checksum>
+      <checksum>4B3483F9</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/ConstructionLayerZeroMaterialProperties/measure.rb

@@ -106,7 +106,7 @@ class ConstructionLayerZeroMaterialProperties < OpenStudio::Measure::ModelMeasur
     args << specific_heat
 
     args
-  end # end the arguments method
+  end
 
   # define what happens when the measure is run
   def run(model, runner, user_arguments)
@@ -143,7 +143,7 @@ class ConstructionLayerZeroMaterialProperties < OpenStudio::Measure::ModelMeasur
         runner.registerError('Script Error - argument not showing up as construction.')
         return false
       end
-    end # end of if construction.empty?
+    end
 
     initial_r_value_ip = OpenStudio.convert(1.0 / construction.thermalConductance.to_f, 'm^2*K/W', 'ft^2*h*R/Btu')
     runner.registerInitialCondition("The Initial R-value of #{construction.name} is #{initial_r_value_ip} (ft^2*h*R/Btu).")
@@ -184,8 +184,8 @@ class ConstructionLayerZeroMaterialProperties < OpenStudio::Measure::ModelMeasur
     runner.registerValue('final_r_value_ip', final_r_value_ip.to_f, 'ft^2*h*R/Btu')
 
     true
-  end # end the run method
-end # end the measure
+  end
+end
 
 # this allows the measure to be used by the application
 ConstructionLayerZeroMaterialProperties.new.registerWithApplication

data/lib/measures/ConstructionLayerZeroMaterialProperties/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>construction_layer_zero_material_properties</name>
   <uid>3c7a6751-bb54-4600-9410-8f042e1a413b</uid>
-  <version_id>e7381878-8180-4462-8b6d-312383d57220</version_id>
-  <version_modified>20230602T154652Z</version_modified>
+  <version_id>897e934d-1780-4fa7-8db2-ec27fd857ea0</version_id>
+  <version_modified>20240428T231344Z</version_modified>
   <xml_checksum>0BF71A3E</xml_checksum>
   <class_name>ConstructionLayerZeroMaterialProperties</class_name>
   <display_name>Change Parameters Of Material (Layer 0 of Construction)</display_name>
@@ -189,7 +189,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>58B551D5</checksum>
+      <checksum>29E8078F</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/ExteriorWallThermalPropertiesMultiplier/measure.rb

@@ -21,7 +21,8 @@ class ExteriorWallThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasur
   end
 
   # 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)
+  # round to 0 or 2)
+  def neat_numbers(number, roundto = 2)
     number = if roundto == 2
                format '%.2f', number
              else
@@ -29,7 +30,7 @@ class ExteriorWallThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasur
              end
     # regex to add commas
     number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
-  end # end def neat_numbers
+  end
 
   # helper to make it easier to do unit conversions on the fly
   def unit_helper(number, from_unit_string, to_unit_string)
@@ -64,7 +65,7 @@ class ExteriorWallThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasur
     args << thermal_mass_mult
 
     args
-  end # end the arguments method
+  end
 
   # define what happens when the measure is run
   def run(model, runner, user_arguments)
@@ -89,6 +90,7 @@ class ExteriorWallThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasur
     exterior_surface_constructions = []
     surfaces.each do |surface|
       next unless surface.outsideBoundaryCondition == 'Outdoors' && surface.surfaceType == 'Wall'
+
       exterior_surfaces << surface
       exterior_surface_const = surface.construction.get
       # only add construction if it hasn't been added yet
@@ -155,6 +157,7 @@ class ExteriorWallThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasur
     end
     initial_sol_abs.each_index do |index1|
       next unless initial_sol_abs[index1]
+
       desired_sol_abs[index1] = initial_sol_abs[index1] * solar_abs_mult
       if desired_sol_abs[index1] > 1
         desired_sol_abs[index1] = 1
@@ -226,8 +229,8 @@ class ExteriorWallThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasur
     runner.registerFinalCondition("Applied R #{r_value_mult.round(1)}x Solar #{solar_abs_mult.round(1)}x Therm #{thermal_mass_mult.round(1)}x change")
 
     true
-  end # end the run method
-end # end the measure
+  end
+end
 
 # this allows the measure to be used by the application
 ExteriorWallThermalPropertiesMultiplier.new.registerWithApplication

data/lib/measures/ExteriorWallThermalPropertiesMultiplier/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>exterior_wall_thermal_properties_multiplier</name>
   <uid>6ab39cf2-1f9e-4570-a797-360a814aaa74</uid>
-  <version_id>ff402058-f27c-4320-b847-86f6d776ca55</version_id>
-  <version_modified>20230602T154652Z</version_modified>
+  <version_id>684ac24d-dc00-4718-95a6-f0b4de85366c</version_id>
+  <version_modified>20240428T231344Z</version_modified>
   <xml_checksum>EB1A0C08</xml_checksum>
   <class_name>ExteriorWallThermalPropertiesMultiplier</class_name>
   <display_name>Exterior Wall Thermal Properties Multiplier</display_name>
@@ -88,6 +88,12 @@
       <usage_type>license</usage_type>
       <checksum>BFFB1AA6</checksum>
     </file>
+    <file>
+      <filename>ExteriorWallThermalPropertiesMultiplier_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>593F94D8</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -97,13 +103,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>B6F3A89B</checksum>
-    </file>
-    <file>
-      <filename>ExteriorWallThermalPropertiesMultiplier_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>593F94D8</checksum>
+      <checksum>9267EE80</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/ExteriorWallThermalPropertiesPercentChange/measure.rb

@@ -21,7 +21,8 @@ class ExteriorWallThermalPropertiesPercentChange < OpenStudio::Measure::ModelMea
   end
 
   # 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)
+  # round to 0 or 2)
+  def neat_numbers(number, roundto = 2)
     number = if roundto == 2
                format '%.2f', number
              else
@@ -29,7 +30,7 @@ class ExteriorWallThermalPropertiesPercentChange < OpenStudio::Measure::ModelMea
              end
     # regex to add commas
     number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
-  end # end def neat_numbers
+  end
 
   # helper to make it easier to do unit conversions on the fly
   def unit_helper(number, from_unit_string, to_unit_string)
@@ -57,7 +58,7 @@ class ExteriorWallThermalPropertiesPercentChange < OpenStudio::Measure::ModelMea
     args << thermal_mass_perc_change
 
     args
-  end # end the arguments method
+  end
 
   # define what happens when the measure is run
   def run(model, runner, user_arguments)
@@ -79,6 +80,7 @@ class ExteriorWallThermalPropertiesPercentChange < OpenStudio::Measure::ModelMea
     exterior_surface_constructions = []
     surfaces.each do |surface|
       next unless surface.outsideBoundaryCondition == 'Outdoors' && surface.surfaceType == 'Wall'
+
       exterior_surfaces << surface
       exterior_surface_const = surface.construction.get
       # only add construction if it hasn't been added yet
@@ -145,6 +147,7 @@ class ExteriorWallThermalPropertiesPercentChange < OpenStudio::Measure::ModelMea
     end
     initial_sol_abs.each_index do |index1|
       next unless initial_sol_abs[index1]
+
       desired_sol_abs[index1] = initial_sol_abs[index1] + initial_sol_abs[index1] * solar_abs_perc_change * 0.01
       if desired_sol_abs[index1] > 1
         desired_sol_abs[index1] = 1
@@ -216,8 +219,8 @@ class ExteriorWallThermalPropertiesPercentChange < OpenStudio::Measure::ModelMea
     runner.registerFinalCondition("Applied R #{r_value_perc_change.round(1)} Solar #{solar_abs_perc_change.round(1)} Therm #{thermal_mass_perc_change.round(1)} Percent change")
 
     true
-  end # end the run method
-end # end the measure
+  end
+end
 
 # this allows the measure to be used by the application
 ExteriorWallThermalPropertiesPercentChange.new.registerWithApplication

data/lib/measures/ExteriorWallThermalPropertiesPercentChange/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>exterior_wall_thermal_properties_percent_change</name>
   <uid>6ab39cf2-1f9e-4570-a797-360a814aaa64</uid>
-  <version_id>91864a79-286b-4cd1-92e4-c42deaf4fc48</version_id>
-  <version_modified>20230602T154653Z</version_modified>
+  <version_id>53318158-d762-4c16-bbc4-3e84fb7179f9</version_id>
+  <version_modified>20240428T231344Z</version_modified>
   <xml_checksum>EB1A0C08</xml_checksum>
   <class_name>ExteriorWallThermalPropertiesPercentChange</class_name>
   <display_name>Exterior Wall Thermal Percent Change</display_name>
@@ -88,6 +88,12 @@
       <usage_type>license</usage_type>
       <checksum>BFFB1AA6</checksum>
     </file>
+    <file>
+      <filename>ExteriorWallThermalPropertiesMultiplier_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>5AA3C07C</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -97,13 +103,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>76BA6F40</checksum>
-    </file>
-    <file>
-      <filename>ExteriorWallThermalPropertiesMultiplier_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>5AA3C07C</checksum>
+      <checksum>DC101DDE</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/FansMultiplier/measure.rb

@@ -75,6 +75,7 @@ class FansMultiplier < OpenStudio::Measure::ModelMeasure
           loop_display_names << component.name.to_s
         end
         next if component.to_FanOnOff.empty?
+
         show_loop = true
         loop_handles << component.handle.to_s
         loop_display_names << component.name.to_s
@@ -211,13 +212,11 @@ class FansMultiplier < OpenStudio::Measure::ModelMeasure
     fans.each do |fan|
       altered_fan = false
       # modify max flowrate
-      if max_flowrate_multiplier != 1.0
-        if fan.maximumFlowRate.is_initialized
-          runner.registerInfo("Applying #{max_flowrate_multiplier}x multiplier to #{fan.name.get}.")
-          fan.setMaximumFlowRate(fan.maximumFlowRate * max_flowrate_multiplier)
-          altered_maxflow << fan.handle.to_s
-          altered_fan = true
-        end
+      if max_flowrate_multiplier != 1.0 && fan.maximumFlowRate.is_initialized
+        runner.registerInfo("Applying #{max_flowrate_multiplier}x multiplier to #{fan.name.get}.")
+        fan.setMaximumFlowRate(fan.maximumFlowRate * max_flowrate_multiplier)
+        altered_maxflow << fan.handle.to_s
+        altered_fan = true
       end
 
       # modify fan_efficiency_multiplier
@@ -245,10 +244,11 @@ class FansMultiplier < OpenStudio::Measure::ModelMeasure
       end
 
       next unless altered_fan
+
       altered_fans << fan.handle.to_s
       change_name(fan, max_flowrate_multiplier, fan_efficiency_multiplier, pressure_rise_multiplier, motor_efficiency_multiplier)
       runner.registerInfo("Fan name changed to: #{fan.name.get}")
-    end # end fan loop
+    end
 
     # na if nothing in model to look at
     if altered_fans.empty?

data/lib/measures/FansMultiplier/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>fans_multiplier</name>
   <uid>af156383-cfe2-4798-b581-08a4cccb8877</uid>
-  <version_id>516e163b-bb20-4a39-9560-5bd1c4484e27</version_id>
-  <version_modified>20230602T154652Z</version_modified>
+  <version_id>5a102688-08bb-40fc-8553-3e098a2937d6</version_id>
+  <version_modified>20240428T231344Z</version_modified>
   <xml_checksum>3C1DA54F</xml_checksum>
   <class_name>FansMultiplier</class_name>
   <display_name>Fans Multiplier</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{45260742-e732-4235-827c-8f09f0ab6448}</default_value>
+      <default_value>{465ccf73-8c04-4fcd-89db-33e6f8748056}</default_value>
       <choices>
         <choice>
-          <value>{45260742-e732-4235-827c-8f09f0ab6448}</value>
+          <value>{465ccf73-8c04-4fcd-89db-33e6f8748056}</value>
           <display_name>*All Fans*</display_name>
         </choice>
         <choice>
@@ -162,7 +162,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>337D82DA</checksum>
+      <checksum>58640E33</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/FansPercentChange/measure.rb

@@ -68,6 +68,7 @@ class FansPercentChange < OpenStudio::Measure::ModelMeasure
           loop_display_names << component.name.to_s
         end
         next if component.to_FanOnOff.empty?
+
         show_loop = true
         loop_handles << component.handle.to_s
         loop_display_names << component.name.to_s
@@ -200,13 +201,11 @@ class FansPercentChange < OpenStudio::Measure::ModelMeasure
     fans.each do |fan|
       altered_fan = false
       # modify max flowrate
-      if max_flowrate_perc_change != 0.0
-        if fan.maximumFlowRate.is_initialized
-          runner.registerInfo("Applying #{max_flowrate_perc_change} Percent Change to #{fan.name.get}.")
-          fan.setMaximumFlowRate(fan.maximumFlowRate + fan.maximumFlowRate * max_flowrate_perc_change * 0.01)
-          altered_maxflow << fan.handle.to_s
-          altered_fan = true
-        end
+      if max_flowrate_perc_change != 0.0 && fan.maximumFlowRate.is_initialized
+        runner.registerInfo("Applying #{max_flowrate_perc_change} Percent Change to #{fan.name.get}.")
+        fan.setMaximumFlowRate(fan.maximumFlowRate + fan.maximumFlowRate * max_flowrate_perc_change * 0.01)
+        altered_maxflow << fan.handle.to_s
+        altered_fan = true
       end
 
       # modify fan_efficiency_perc_change
@@ -234,10 +233,11 @@ class FansPercentChange < OpenStudio::Measure::ModelMeasure
       end
 
       next unless altered_fan
+
       altered_fans << fan.handle.to_s
       change_name(fan, max_flowrate_perc_change, fan_efficiency_perc_change, pressure_rise_perc_change, motor_efficiency_perc_change)
       runner.registerInfo("Fan name changed to: #{fan.name.get}")
-    end # end fan loop
+    end
 
     # na if nothing in model to look at
     if altered_fans.empty?

data/lib/measures/FansPercentChange/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>fans_percent_change</name>
   <uid>4c13a935-976b-4d54-bf7f-a4064fb6e11d</uid>
-  <version_id>3247a047-54b8-44cd-9350-b141443ff173</version_id>
-  <version_modified>20230602T154653Z</version_modified>
+  <version_id>2929a54f-a286-455e-86a9-dbb09d274c8c</version_id>
+  <version_modified>20240428T231345Z</version_modified>
   <xml_checksum>3C1DA54F</xml_checksum>
   <class_name>FansPercentChange</class_name>
   <display_name>Fans Percent Change</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{9f2ad20c-215b-46e3-a486-358f9bb4b7ae}</default_value>
+      <default_value>{4bd31cd1-3d84-4d87-9ef0-1bee2b72e933}</default_value>
       <choices>
         <choice>
-          <value>{9f2ad20c-215b-46e3-a486-358f9bb4b7ae}</value>
+          <value>{4bd31cd1-3d84-4d87-9ef0-1bee2b72e933}</value>
           <display_name>*All Fans*</display_name>
         </choice>
         <choice>
@@ -162,7 +162,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>FB38189C</checksum>
+      <checksum>EC0A96E0</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/GeneralCalibrationMeasureMultiplier/measure.rb

@@ -414,7 +414,7 @@ class GeneralCalibrationMeasureMultiplier < OpenStudio::Measure::ModelMeasure
           runner.registerInfo("Skipping change to #{internalmass.name.get}")
         end
       end
-    end # end space_type loop
+    end
 
     runner.registerInfo("altered_lights_objects: #{altered_lights_objects}")
     runner.registerInfo("altered_luminaires_objects: #{altered_luminaires_objects}")
@@ -580,7 +580,7 @@ class GeneralCalibrationMeasureMultiplier < OpenStudio::Measure::ModelMeasure
           runner.registerInfo("Skipping change to #{internalmass.name.get}")
         end
       end
-    end # end spaces loop
+    end
 
     runner.registerInfo("altered_lights_objects: #{altered_lights_objects}")
     runner.registerInfo("altered_luminaires_objects: #{altered_luminaires_objects}")