openstudio-ee 0.12.3 → 0.12.4

data/lib/measures/ImproveFanBeltEfficiency/measure.rb

@@ -10,7 +10,7 @@ class ImproveFanBeltEfficiency < 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 'Improve Fan Belt Efficiency'
+    'Improve Fan Belt Efficiency'
   end
 
   # define the arguments that the user will input
@@ -33,15 +33,9 @@ class ImproveFanBeltEfficiency < OpenStudio::Measure::ModelMeasure
       show_loop = false
       components = value.supplyComponents
       components.each do |component|
-        if !component.to_FanConstantVolume.empty?
-          show_loop = true
-        end
-        if !component.to_FanVariableVolume.empty?
-          show_loop = true
-        end
-        if !component.to_FanOnOff.empty?
-          show_loop = true
-        end
+        show_loop = true unless component.to_FanConstantVolume.empty?
+        show_loop = true unless component.to_FanVariableVolume.empty?
+        show_loop = true unless component.to_FanOnOff.empty?
       end
 
       # if loop as object of correct type then add to hash.
@@ -117,7 +111,7 @@ class ImproveFanBeltEfficiency < OpenStudio::Measure::ModelMeasure
     om_frequency.setDefaultValue(1)
     args << om_frequency
 
-    return args
+    args
   end
 
   # define what happens when the measure is cop
@@ -125,9 +119,7 @@ class ImproveFanBeltEfficiency < 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
     object = runner.getOptionalWorkspaceObjectChoiceValue('object', user_arguments, model) # model is passed in because of argument type
@@ -152,15 +144,13 @@ class ImproveFanBeltEfficiency < OpenStudio::Measure::ModelMeasure
         runner.registerError("The selected loop with handle '#{handle}' was not found in the model. It may have been removed by another measure.")
       end
       return false
+    elsif !object.get.to_Loop.empty?
+      loop = object.get.to_Loop.get
+    elsif !object.get.to_Building.empty?
+      apply_to_all_loops = true
     else
-      if !object.get.to_Loop.empty?
-        loop = object.get.to_Loop.get
-      elsif !object.get.to_Building.empty?
-        apply_to_all_loops = true
-      else
-        runner.registerError('Script Error - argument not showing up as loop.')
-        return false
-      end
+      runner.registerError('Script Error - argument not showing up as loop.')
+      return false
     end
 
     # check the user_name for reasonableness
@@ -193,17 +183,15 @@ class ImproveFanBeltEfficiency < 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
@@ -214,14 +202,12 @@ class ImproveFanBeltEfficiency < 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
 
     # get loops for measure
@@ -243,67 +229,61 @@ class ImproveFanBeltEfficiency < OpenStudio::Measure::ModelMeasure
       # find fans on loop
       supply_components.each do |supply_component|
         hVACComponent = supply_component.to_FanConstantVolume
-        if hVACComponent.empty?
-          hVACComponent = supply_component.to_FanVariableVolume
-        end
-        if hVACComponent.empty?
-          hVACComponent = supply_component.to_FanOnOff
-        end
+        hVACComponent = supply_component.to_FanVariableVolume if hVACComponent.empty?
+        hVACComponent = supply_component.to_FanOnOff if hVACComponent.empty?
 
         # alter components of correct type
-        if !hVACComponent.empty?
-          hVACComponent = hVACComponent.get
-
-          # change and report changes to fans and motors
-          initial_motor_efficiency = hVACComponent.motorEfficiency
-          target_motor_efficiency = initial_motor_efficiency + motor_eff * 0.01
-          initial_motor_efficiency_values << initial_motor_efficiency
-          if target_motor_efficiency > 1
-            hVACComponent.setMotorEfficiency(1.0)
-            runner.registerWarning("Requested efficiency of #{target_motor_efficiency * 100}% for #{hVACComponent.name} is not possible. Setting motor efficiency to 100%.")
-          elsif target_motor_efficiency < 0
-            hVACComponent.setMotorEfficiency(0.0)
-            runner.registerWarning("Requested efficiency of #{target_motor_efficiency * 100}% for #{hVACComponent.name} is not possible. Setting motor efficiency to 0%.")
-          else
-            hVACComponent.setMotorEfficiency(target_motor_efficiency)
-            runner.registerInfo("Changing the motor efficiency from #{initial_motor_efficiency * 100}% to #{target_motor_efficiency * 100}% for '#{hVACComponent.name}' onloop '#{loop.name}.'")
-            if target_motor_efficiency > 0.96
-              runner.registerWarning("Requested efficiency for #{hVACComponent.name} is greater than 96%.")
-            end
-          end
-
-          # get initial year 0 cost
-          yr0_capital_totalCosts_baseline += get_total_costs_for_objects([hVACComponent])
-
-          # demo value of baseline costs associated with unit
-          demo_LCCs = hVACComponent.lifeCycleCosts
-          demo_LCCs.each do |demo_LCC|
-            if demo_LCC.category == 'Salvage'
-              demo_costs_of_baseline_objects += demo_LCC.totalCost
-            end
+        next if hVACComponent.empty?
+
+        hVACComponent = hVACComponent.get
+
+        # change and report changes to fans and motors
+        initial_motor_efficiency = hVACComponent.motorEfficiency
+        target_motor_efficiency = initial_motor_efficiency + (motor_eff * 0.01)
+        initial_motor_efficiency_values << initial_motor_efficiency
+        if target_motor_efficiency > 1
+          hVACComponent.setMotorEfficiency(1.0)
+          runner.registerWarning("Requested efficiency of #{target_motor_efficiency * 100}% for #{hVACComponent.name} is not possible. Setting motor efficiency to 100%.")
+        elsif target_motor_efficiency < 0
+          hVACComponent.setMotorEfficiency(0.0)
+          runner.registerWarning("Requested efficiency of #{target_motor_efficiency * 100}% for #{hVACComponent.name} is not possible. Setting motor efficiency to 0%.")
+        else
+          hVACComponent.setMotorEfficiency(target_motor_efficiency)
+          runner.registerInfo("Changing the motor efficiency from #{initial_motor_efficiency * 100}% to #{target_motor_efficiency * 100}% for '#{hVACComponent.name}' onloop '#{loop.name}.'")
+          if target_motor_efficiency > 0.96
+            runner.registerWarning("Requested efficiency for #{hVACComponent.name} is greater than 96%.")
           end
+        end
 
-          # remove all old costs
-          if !hVACComponent.lifeCycleCosts.empty? && (remove_costs == true)
-            runner.registerInfo("Removing existing lifecycle cost objects associated with #{hVACComponent.name}")
-            removed_costs = hVACComponent.removeLifeCycleCosts
-          end
+        # get initial year 0 cost
+        yr0_capital_totalCosts_baseline += get_total_costs_for_objects([hVACComponent])
 
-          # add new costs
-          if costs_requested == true
+        # demo value of baseline costs associated with unit
+        demo_LCCs = hVACComponent.lifeCycleCosts
+        demo_LCCs.each do |demo_LCC|
+          demo_costs_of_baseline_objects += demo_LCC.totalCost if demo_LCC.category == 'Salvage'
+        end
 
-            # adding new cost items
-            lcc_mat = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Mat - #{hVACComponent.name}", hVACComponent, material_cost, 'CostPerEach', 'Construction', expected_life, years_until_costs_start)
-            # cost for if demo_initial_Construction == true is added at the end of the measure
-            lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{hVACComponent.name}", hVACComponent, demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start + expected_life)
-            lcc_om = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_OM - #{hVACComponent.name}", hVACComponent, om_cost, 'CostPerEach', 'Maintenance', om_frequency, 0)
+        # remove all old costs
+        if !hVACComponent.lifeCycleCosts.empty? && (remove_costs == true)
+          runner.registerInfo("Removing existing lifecycle cost objects associated with #{hVACComponent.name}")
+          removed_costs = hVACComponent.removeLifeCycleCosts
+        end
 
-            # get final year 0 cost
-            yr0_capital_totalCosts_proposed += get_total_costs_for_objects([hVACComponent])
+        # add new costs
+        next unless costs_requested == true
 
-          end
+        # adding new cost items
+        lcc_mat = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Mat - #{hVACComponent.name}",
+                                                                       hVACComponent, material_cost, 'CostPerEach', 'Construction', expected_life, years_until_costs_start)
+        # cost for if demo_initial_Construction == true is added at the end of the measure
+        lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{hVACComponent.name}",
+                                                                        hVACComponent, demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start + expected_life)
+        lcc_om = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_OM - #{hVACComponent.name}",
+                                                                      hVACComponent, om_cost, 'CostPerEach', 'Maintenance', om_frequency, 0)
 
-        end
+        # get final year 0 cost
+        yr0_capital_totalCosts_proposed += get_total_costs_for_objects([hVACComponent])
       end
     end
 
@@ -311,12 +291,11 @@ class ImproveFanBeltEfficiency < OpenStudio::Measure::ModelMeasure
     if demo_cost_initial_const == true
       building = model.getBuilding
       lcc_baseline_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost('LCC_baseline_demo', building, demo_costs_of_baseline_objects, 'CostPerEach', 'Salvage', 0, years_until_costs_start).get # using 0 for repeat period since one time cost.
-      runner.registerInfo("Adding one time cost of $#{neat_numbers(lcc_baseline_demo.totalCost, 0)} related to demolition of baseline objects.")
+      runner.registerInfo("Adding one time cost of $#{neat_numbers(lcc_baseline_demo.totalCost,
+                                                                   0)} related to demolition of baseline objects.")
 
       # if demo occurs on year 0 then add to initial capital cost counter
-      if lcc_baseline_demo.yearsFromStart == 0
-        yr0_capital_totalCosts_proposed += lcc_baseline_demo.totalCost
-      end
+      yr0_capital_totalCosts_proposed += lcc_baseline_demo.totalCost if lcc_baseline_demo.yearsFromStart == 0
     end
 
     if initial_motor_efficiency_values.size + missing_initial_motor_efficiency == 0
@@ -325,12 +304,16 @@ class ImproveFanBeltEfficiency < OpenStudio::Measure::ModelMeasure
     end
 
     # reporting initial condition of model
-    runner.registerInitialCondition("The starting motor efficiency values in affected loop(s) range from #{initial_motor_efficiency_values.min * 100}% to #{initial_motor_efficiency_values.max * 100}%. Initial year 0 capital costs for affected fans is $#{neat_numbers(yr0_capital_totalCosts_baseline, 0)}.")
+    runner.registerInitialCondition("The starting motor efficiency values in affected loop(s) range from #{initial_motor_efficiency_values.min * 100}% to #{initial_motor_efficiency_values.max * 100}%. Initial year 0 capital costs for affected fans is $#{neat_numbers(
+      yr0_capital_totalCosts_baseline, 0
+    )}.")
 
     # reporting final condition of model
-    runner.registerFinalCondition("#{initial_motor_efficiency_values.size + missing_initial_motor_efficiency} fans had motor efficiency values set to altered. Final year 0 capital costs for affected fans is $#{neat_numbers(yr0_capital_totalCosts_proposed, 0)}.")
+    runner.registerFinalCondition("#{initial_motor_efficiency_values.size + missing_initial_motor_efficiency} fans had motor efficiency values set to altered. Final year 0 capital costs for affected fans is $#{neat_numbers(
+      yr0_capital_totalCosts_proposed, 0
+    )}.")
 
-    return true
+    true
   end
 end
 

data/lib/measures/ImproveFanBeltEfficiency/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>improve_fan_belt_efficiency</name>
   <uid>ebeca0aa-a432-4283-a714-17116f7c8f8c</uid>
-  <version_id>3648c506-be6e-42b1-acfb-6ad1d2c6e203</version_id>
-  <version_modified>2025-08-08T15:15:58Z</version_modified>
+  <version_id>b8f329e9-87df-4d83-96b2-9358e169a121</version_id>
+  <version_modified>2025-09-25T15:33:44Z</version_modified>
   <xml_checksum>F78494F2</xml_checksum>
   <class_name>ImproveFanBeltEfficiency</class_name>
   <display_name>Improve Fan Belt Efficiency</display_name>
@@ -47,10 +47,10 @@ Well-adjusted belts run cooler, last longer, and operate at higher efficiency th
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{c0101731-e87e-4af9-8f1f-cc53448e4105}</default_value>
+      <default_value>{eb63161e-e882-4957-a540-b6e7bb7abfd4}</default_value>
       <choices>
         <choice>
-          <value>{c0101731-e87e-4af9-8f1f-cc53448e4105}</value>
+          <value>{eb63161e-e882-4957-a540-b6e7bb7abfd4}</value>
           <display_name>*All Air Loops*</display_name>
         </choice>
       </choices>
@@ -193,7 +193,7 @@ Well-adjusted belts run cooler, last longer, and operate at higher efficiency th
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>DC853729</checksum>
+      <checksum>1691AE3F</checksum>
     </file>
     <file>
       <filename>0320_ModelWithHVAC_01.osm</filename>
@@ -205,7 +205,7 @@ Well-adjusted belts run cooler, last longer, and operate at higher efficiency th
       <filename>ImproveFanBeltEfficiency_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>8E07B9DC</checksum>
+      <checksum>19994729</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/ImproveMotorEfficiency/measure.rb

@@ -10,7 +10,7 @@ class ImproveMotorEfficiency < 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 'Improve Motor Efficiency in Selected Fans and Pumps'
+    'Improve Motor Efficiency in Selected Fans and Pumps'
   end
 
   # define the arguments that the user will input
@@ -33,21 +33,11 @@ class ImproveMotorEfficiency < OpenStudio::Measure::ModelMeasure
       show_loop = false
       components = value.supplyComponents
       components.each do |component|
-        if !component.to_FanConstantVolume.empty?
-          show_loop = true
-        end
-        if !component.to_FanVariableVolume.empty?
-          show_loop = true
-        end
-        if !component.to_FanOnOff.empty?
-          show_loop = true
-        end
-        if !component.to_PumpConstantSpeed.empty?
-          show_loop = true
-        end
-        if !component.to_PumpVariableSpeed.empty?
-          show_loop = true
-        end
+        show_loop = true unless component.to_FanConstantVolume.empty?
+        show_loop = true unless component.to_FanVariableVolume.empty?
+        show_loop = true unless component.to_FanOnOff.empty?
+        show_loop = true unless component.to_PumpConstantSpeed.empty?
+        show_loop = true unless component.to_PumpVariableSpeed.empty?
       end
 
       # if loop as object of correct type then add to hash.
@@ -122,7 +112,7 @@ class ImproveMotorEfficiency < OpenStudio::Measure::ModelMeasure
     om_frequency.setDefaultValue(1)
     args << om_frequency
 
-    return args
+    args
   end
 
   # define what happens when the measure is cop
@@ -130,9 +120,7 @@ class ImproveMotorEfficiency < 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
     object = runner.getOptionalWorkspaceObjectChoiceValue('object', user_arguments, model) # model is passed in because of argument type
@@ -157,15 +145,13 @@ class ImproveMotorEfficiency < OpenStudio::Measure::ModelMeasure
         runner.registerError("The selected loop with handle '#{handle}' was not found in the model. It may have been removed by another measure.")
       end
       return false
+    elsif !object.get.to_Loop.empty?
+      loop = object.get.to_Loop.get
+    elsif !object.get.to_Building.empty?
+      apply_to_all_loops = true
     else
-      if !object.get.to_Loop.empty?
-        loop = object.get.to_Loop.get
-      elsif !object.get.to_Building.empty?
-        apply_to_all_loops = true
-      else
-        runner.registerError('Script Error - argument not showing up as loop.')
-        return false
-      end
+      runner.registerError('Script Error - argument not showing up as loop.')
+      return false
     end
 
     # check the user_name for reasonableness
@@ -198,17 +184,15 @@ class ImproveMotorEfficiency < 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
@@ -219,14 +203,12 @@ class ImproveMotorEfficiency < 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
 
     # get loops for measure
@@ -248,61 +230,51 @@ class ImproveMotorEfficiency < OpenStudio::Measure::ModelMeasure
       # find fans and pumps on loop
       supply_components.each do |supply_component|
         hVACComponent = supply_component.to_FanConstantVolume
-        if hVACComponent.empty?
-          hVACComponent = supply_component.to_FanVariableVolume
-        end
-        if hVACComponent.empty?
-          hVACComponent = supply_component.to_FanOnOff
-        end
-        if hVACComponent.empty?
-          hVACComponent = supply_component.to_PumpConstantSpeed
-        end
-        if hVACComponent.empty?
-          hVACComponent = supply_component.to_PumpVariableSpeed
-        end
+        hVACComponent = supply_component.to_FanVariableVolume if hVACComponent.empty?
+        hVACComponent = supply_component.to_FanOnOff if hVACComponent.empty?
+        hVACComponent = supply_component.to_PumpConstantSpeed if hVACComponent.empty?
+        hVACComponent = supply_component.to_PumpVariableSpeed if hVACComponent.empty?
 
         # alter components of correct type
-        if !hVACComponent.empty?
-          hVACComponent = hVACComponent.get
-
-          # change and report changes to fans and motors
-          initial_motor_efficiency = hVACComponent.motorEfficiency
-          runner.registerInfo("Changing the motor efficiency from #{initial_motor_efficiency * 100}% to #{motor_eff}% for '#{hVACComponent.name}' onloop '#{loop.name}.'")
-          initial_motor_efficiency_values << initial_motor_efficiency
-          hVACComponent.setMotorEfficiency(motor_eff * 0.01)
-
-          # get initial year 0 cost
-          yr0_capital_totalCosts_baseline += get_total_costs_for_objects([hVACComponent])
-
-          # demo value of baseline costs associated with unit
-          demo_LCCs = hVACComponent.lifeCycleCosts
-          demo_LCCs.each do |demo_LCC|
-            if demo_LCC.category == 'Salvage'
-              demo_costs_of_baseline_objects += demo_LCC.totalCost
-            end
-          end
-
-          # remove all old costs
-          if !hVACComponent.lifeCycleCosts.empty? && (remove_costs == true)
-            runner.registerInfo("Removing existing lifecycle cost objects associated with #{hVACComponent.name}")
-            removed_costs = hVACComponent.removeLifeCycleCosts
-          end
-
-          # add new costs
-          if costs_requested == true
-
-            # adding new cost items
-            lcc_mat = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Mat - #{hVACComponent.name}", hVACComponent, material_cost, 'CostPerEach', 'Construction', expected_life, years_until_costs_start)
-            # cost for if demo_initial_Construction == true is added at the end of the measure
-            lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{hVACComponent.name}", hVACComponent, demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start + expected_life)
-            lcc_om = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_OM - #{hVACComponent.name}", hVACComponent, om_cost, 'CostPerEach', 'Maintenance', om_frequency, 0)
-
-            # get final year 0 cost
-            yr0_capital_totalCosts_proposed += get_total_costs_for_objects([hVACComponent])
-
-          end
+        next if hVACComponent.empty?
+
+        hVACComponent = hVACComponent.get
+
+        # change and report changes to fans and motors
+        initial_motor_efficiency = hVACComponent.motorEfficiency
+        runner.registerInfo("Changing the motor efficiency from #{initial_motor_efficiency * 100}% to #{motor_eff}% for '#{hVACComponent.name}' onloop '#{loop.name}.'")
+        initial_motor_efficiency_values << initial_motor_efficiency
+        hVACComponent.setMotorEfficiency(motor_eff * 0.01)
+
+        # get initial year 0 cost
+        yr0_capital_totalCosts_baseline += get_total_costs_for_objects([hVACComponent])
 
+        # demo value of baseline costs associated with unit
+        demo_LCCs = hVACComponent.lifeCycleCosts
+        demo_LCCs.each do |demo_LCC|
+          demo_costs_of_baseline_objects += demo_LCC.totalCost if demo_LCC.category == 'Salvage'
         end
+
+        # remove all old costs
+        if !hVACComponent.lifeCycleCosts.empty? && (remove_costs == true)
+          runner.registerInfo("Removing existing lifecycle cost objects associated with #{hVACComponent.name}")
+          removed_costs = hVACComponent.removeLifeCycleCosts
+        end
+
+        # add new costs
+        next unless costs_requested == true
+
+        # adding new cost items
+        lcc_mat = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Mat - #{hVACComponent.name}",
+                                                                       hVACComponent, material_cost, 'CostPerEach', 'Construction', expected_life, years_until_costs_start)
+        # cost for if demo_initial_Construction == true is added at the end of the measure
+        lcc_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_Demo - #{hVACComponent.name}",
+                                                                        hVACComponent, demolition_cost, 'CostPerEach', 'Salvage', expected_life, years_until_costs_start + expected_life)
+        lcc_om = OpenStudio::Model::LifeCycleCost.createLifeCycleCost("LCC_OM - #{hVACComponent.name}",
+                                                                      hVACComponent, om_cost, 'CostPerEach', 'Maintenance', om_frequency, 0)
+
+        # get final year 0 cost
+        yr0_capital_totalCosts_proposed += get_total_costs_for_objects([hVACComponent])
       end
     end
 
@@ -310,12 +282,11 @@ class ImproveMotorEfficiency < OpenStudio::Measure::ModelMeasure
     if demo_cost_initial_const == true
       building = model.getBuilding
       lcc_baseline_demo = OpenStudio::Model::LifeCycleCost.createLifeCycleCost('LCC_baseline_demo', building, demo_costs_of_baseline_objects, 'CostPerEach', 'Salvage', 0, years_until_costs_start).get # using 0 for repeat period since one time cost.
-      runner.registerInfo("Adding one time cost of $#{neat_numbers(lcc_baseline_demo.totalCost, 0)} related to demolition of baseline objects.")
+      runner.registerInfo("Adding one time cost of $#{neat_numbers(lcc_baseline_demo.totalCost,
+                                                                   0)} related to demolition of baseline objects.")
 
       # if demo occurs on year 0 then add to initial capital cost counter
-      if lcc_baseline_demo.yearsFromStart == 0
-        yr0_capital_totalCosts_proposed += lcc_baseline_demo.totalCost
-      end
+      yr0_capital_totalCosts_proposed += lcc_baseline_demo.totalCost if lcc_baseline_demo.yearsFromStart == 0
     end
 
     if initial_motor_efficiency_values.size + missing_initial_motor_efficiency == 0
@@ -324,12 +295,16 @@ class ImproveMotorEfficiency < OpenStudio::Measure::ModelMeasure
     end
 
     # reporting initial condition of model
-    runner.registerInitialCondition("The starting motor efficiency values in affected loop(s) range from #{initial_motor_efficiency_values.min * 100}% to #{initial_motor_efficiency_values.max * 100}%. Initial year 0 capital costs for affected fans or pumps is $#{neat_numbers(yr0_capital_totalCosts_baseline, 0)}.")
+    runner.registerInitialCondition("The starting motor efficiency values in affected loop(s) range from #{initial_motor_efficiency_values.min * 100}% to #{initial_motor_efficiency_values.max * 100}%. Initial year 0 capital costs for affected fans or pumps is $#{neat_numbers(
+      yr0_capital_totalCosts_baseline, 0
+    )}.")
 
     # reporting final condition of model
-    runner.registerFinalCondition("#{initial_motor_efficiency_values.size + missing_initial_motor_efficiency} fans or pumps had motor efficiency values set to #{motor_eff}%. Final year 0 capital costs for affected fans and pumps is $#{neat_numbers(yr0_capital_totalCosts_proposed, 0)}.")
+    runner.registerFinalCondition("#{initial_motor_efficiency_values.size + missing_initial_motor_efficiency} fans or pumps had motor efficiency values set to #{motor_eff}%. Final year 0 capital costs for affected fans and pumps is $#{neat_numbers(
+      yr0_capital_totalCosts_proposed, 0
+    )}.")
 
-    return true
+    true
   end
 end
 

data/lib/measures/ImproveMotorEfficiency/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>improve_motor_efficiency</name>
   <uid>52013ba9-7b9b-4ffd-bc67-d4c0fa05d7ae</uid>
-  <version_id>f10a9555-aef0-4ca0-b1de-285d32d5561c</version_id>
-  <version_modified>2025-08-08T15:15:57Z</version_modified>
+  <version_id>b489d3b7-146d-4ef3-95b3-02fbed79c46b</version_id>
+  <version_modified>2025-09-25T15:33:44Z</version_modified>
   <xml_checksum>F78494F2</xml_checksum>
   <class_name>ImproveMotorEfficiency</class_name>
   <display_name>Improve Motor Efficiency in Selected Fans and Pumps</display_name>
@@ -31,10 +31,10 @@ The cost arguments are user arguments that start with a default of $0. Operation
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{783d4a71-fb33-4da4-8fea-0f5801bac4eb}</default_value>
+      <default_value>{477f3286-308d-43c0-8e7f-483284eb60d1}</default_value>
       <choices>
         <choice>
-          <value>{783d4a71-fb33-4da4-8fea-0f5801bac4eb}</value>
+          <value>{477f3286-308d-43c0-8e7f-483284eb60d1}</value>
           <display_name>*All Plant and Air Loops*</display_name>
         </choice>
       </choices>
@@ -177,7 +177,7 @@ The cost arguments are user arguments that start with a default of $0. Operation
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>CB567949</checksum>
+      <checksum>09B3E503</checksum>
     </file>
     <file>
       <filename>0320_ModelWithHVAC_01.osm</filename>
@@ -189,7 +189,7 @@ The cost arguments are user arguments that start with a default of $0. Operation
       <filename>ImproveMotorEfficiency_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>087B8F20</checksum>
+      <checksum>E64A2125</checksum>
     </file>
   </files>
 </measure>