openstudio-standards 0.1.4 → 0.1.5

data/lib/openstudio-standards/standards/Standards.AirTerminalSingleDuctParallelPIUReheat.rb

@@ -1,71 +1,62 @@
 
 # open the class to add methods to apply HVAC efficiency standards
 class OpenStudio::Model::AirTerminalSingleDuctParallelPIUReheat
-
   # Sets the fan power of a PIU fan based on the W/cfm
   # specified in the standard.
   #
-  # @param template [String] the standard
+  # @param template [String] the template base requirements on
   # @return [Bool] returns true if successful, false if not
-  def set_performance_rating_method_baseline_fan_power(template)
+  def apply_prm_baseline_fan_power(template)
+    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "Setting PIU fan power for #{name}.")
+
+    # Determine the fan sizing flow rate, min flow rate,
+    # and W/cfm
+    sec_flow_frac = 0.5
+    min_flow_frac = 0.3
+    fan_efficacy_w_per_cfm = 0.35
+
+    # Convert efficacy to metric
+    # 1 cfm = 0.0004719 m^3/s
+    fan_efficacy_w_per_m3_per_s = fan_efficacy_w_per_cfm / 0.0004719
+
+    # Get the maximum flow rate through the terminal
+    max_primary_air_flow_rate = nil
+    if autosizedMaximumPrimaryAirFlowRate.is_initialized
+      max_primary_air_flow_rate = autosizedMaximumPrimaryAirFlowRate.get
+    elsif maximumPrimaryAirFlowRate.is_initialized
+      max_primary_air_flow_rate = maximumPrimaryAirFlowRate.get
+    end
 
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "Setting PIU fan power for #{self.name}.")
-  
-      # Determine the fan sizing flow rate, min flow rate,
-      # and W/cfm
-      sec_flow_frac = 0.5
-      min_flow_frac = 0.3
-      fan_efficacy_w_per_cfm = 0.35
-      # case template
-      # when
-      # else
-      # end
-  
-      # Get the maximum flow rate through the terminal
-      max_primary_air_flow_rate = nil
-      if self.autosizedMaximumPrimaryAirFlowRate.is_initialized
-        max_primary_air_flow_rate = self.autosizedMaximumPrimaryAirFlowRate.get
-      elsif self.maximumPrimaryAirFlowRate.is_initialized
-        max_primary_air_flow_rate = self.maximumPrimaryAirFlowRate.get
-      end
-      
-      # Set the max secondary air flow rate
-      max_sec_flow_rate_m3_per_s = max_primary_air_flow_rate * sec_flow_frac
-      self.setMaximumSecondaryAirFlowRate(max_sec_flow_rate_m3_per_s)
-      
-      # Set the minimum flow fraction
-      #TODO Also compare to min OA requirement
-      self.setMinimumPrimaryAirFlowFraction(min_flow_frac)
-    
-      # Set the fan efficacy
-      fan = self.fan.to_FanConstantVolume.get
-      fan_rise_pa = fan.pressureRise
-      fan_rise_in_wc = OpenStudio.convert(fan_rise_pa, "Pa", "inH_{2}O")
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "=> Pressure Rise = #{fan_rise_pa} Pa")
+    # Set the max secondary air flow rate
+    max_sec_flow_rate_m3_per_s = max_primary_air_flow_rate * sec_flow_frac
+    setMaximumSecondaryAirFlowRate(max_sec_flow_rate_m3_per_s)
+    max_sec_flow_rate_cfm = OpenStudio.convert(max_sec_flow_rate_m3_per_s, 'm^3/s', 'ft^3/min').get
 
-      max_sec_flow_rate_cfm = OpenStudio.convert(max_sec_flow_rate_m3_per_s, "m^3/s", "ft^3/min").get
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "=> Maximum Fan Flow Rate = #{max_sec_flow_rate_cfm} m3/s")
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "=> Maximum Secondary Air Flow Rate = #{self.maximumSecondaryAirFlowRate.get} m3/s")      
-      
-      fan_efficiency = fan.fanEfficiency
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "=> Fan Total Efficiency = #{fan_efficiency}")
+    # Set the minimum flow fraction
+    # TODO Also compare to min OA requirement
+    setMinimumPrimaryAirFlowFraction(min_flow_frac)
 
-      fan_power_w = fan_rise_pa * max_sec_flow_rate_m3_per_s / fan_efficiency
-      fan_efficacy_calc = fan_power_w / max_sec_flow_rate_m3_per_s
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "=> fan efficacy calculated = #{fan_efficacy_calc} W-s/m3")
+    # Get the fan
+    fan = self.fan.to_FanConstantVolume.get
 
-      fan_efficacy_w_per_m3_per_s = fan_efficacy_w_per_cfm * OpenStudio.convert(1, 'm^3/s', 'cfm').get
+    # Set the impeller efficiency
+    fan.change_impeller_efficiency(fan.baseline_impeller_efficiency(template))
 
-      fan_rise_new_pa = fan_efficacy_w_per_m3_per_s * fan_efficiency
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "=> fan pressure rise new = #{fan_rise_new_pa} Pa")
-      fan.setPressureRise(fan_rise_new_pa)
-      fan_power_new_w = fan_rise_new_pa * max_sec_flow_rate_cfm / fan_efficiency
-      fan_efficacy_new_w_per_cfm = fan_power_new_w / max_sec_flow_rate_cfm
-      
-      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "For #{self.name}: fan efficacy set to #{fan_efficacy_new_w_per_cfm.round(2)} W/cfm, fan bhp = #{fan.brakeHorsepower} hp, motor efficiency = #{fan.motorEfficiency}.")
-      
-      return true
-    
-    end
+    # Set the motor efficiency, preserving the impeller efficency.
+    # For terminal fans, a bhp lookup of 0.5bhp is always used because
+    # they are assumed to represent a series of small fans in reality.
+    fan.apply_standard_minimum_motor_efficiency(template, fan.brake_horsepower)
+
+    # Calculate a new pressure rise to hit the target W/cfm
+    fan_tot_eff = fan.fanEfficiency
+    fan_rise_new_pa = fan_efficacy_w_per_m3_per_s * fan_tot_eff
+    fan.setPressureRise(fan_rise_new_pa)
+
+    # Calculate the newly set efficacy
+    fan_power_new_w = fan_rise_new_pa * max_sec_flow_rate_m3_per_s / fan_tot_eff
+    fan_efficacy_new_w_per_cfm = fan_power_new_w / max_sec_flow_rate_cfm
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.AirTerminalSingleDuctParallelPIUReheat', "For #{name}: fan efficacy set to #{fan_efficacy_new_w_per_cfm.round(2)} W/cfm.")
 
+    return true
+  end
 end

data/lib/openstudio-standards/standards/Standards.AirTerminalSingleDuctVAVReheat.rb

@@ -1,50 +1,43 @@
 
 class OpenStudio::Model::AirTerminalSingleDuctVAVReheat
-
   # Set the minimum damper position based on OA
-  # rate of the space and the building vintage.
-  # Zones with low OA per area get lower initial guesses. 
+  # rate of the space and the template.
+  # Zones with low OA per area get lower initial guesses.
   # Final position will be adjusted upward
   # as necessary by Standards.AirLoopHVAC.adjust_minimum_vav_damper_positions
-  # @param building_vintage [String] the building vintage
-  # @param zone_oa_per_area [Double] the zone outdoor air per area, m^3/s
-  # @param has_ddc [Bool] whether or not there is DDC control of the VAV terminal
+  # @param template [String] the template
+  # @param zone_min_oa [Double] the zone outdoor air flow rate, in m^3/s.
+  # If supplied, this will be set as a minimum limit in addition to the minimum
+  # damper position.  EnergyPlus will use the larger of the two values during sizing.
+  # @param has_ddc [Bool] whether or not there is DDC control of the VAV terminal,
+  # which impacts the minimum damper position requirement.
   # @return [Bool] returns true if successful, false if not
   # @todo remove exception where older vintages don't have minimum positions adjusted.
-  def set_minimum_damper_position(building_vintage, zone_oa_per_area, has_ddc = true)
- 
-    # Minimum damper position is based on prototype
-    # assumptions, which are not clearly documented.
+  def apply_minimum_damper_position(template, zone_min_oa = nil, has_ddc = true)
+    # Minimum damper position
     min_damper_position = nil
-    case building_vintage       
+    case template
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004', '90.1-2004'
       min_damper_position = 0.3
     when '90.1-2007'
       min_damper_position = 0.3
     when '90.1-2010', '90.1-2013'
-      if has_ddc
-        min_damper_position = 0.2
-      else
-        min_damper_position = 0.3
-      end
+      min_damper_position = if has_ddc
+                              0.2
+                            else
+                              0.3
+                            end
     end
-	
-	
-	
-    # TODO remove the template conditional; doesn't make sense
-    # Determine whether or not to use the high minimum guess.
-    # Cutoff was determined by correlating apparent minimum guesses
-    # to OA rates in prototypes since not well documented in papers.
-    if zone_oa_per_area > 0.001 # 0.001 m^3/s*m^2 = .196 cfm/ft2
-      # High OA zones
-      self.setConstantMinimumAirFlowFraction(0.7)
-    else
-      # Low OA zones
-      self.setConstantMinimumAirFlowFraction(min_damper_position)
+    setConstantMinimumAirFlowFraction(min_damper_position)
+
+    # Minimum OA flow rate
+    # If specified, will also add this limit
+    # and the larger of the two will be used
+    # for sizing.
+    unless zone_min_oa.nil?
+      setFixedMinimumAirFlowRate(zone_min_oa)
     end
 
     return true
-  
   end
-
 end

data/lib/openstudio-standards/standards/Standards.BoilerHotWater.rb

@@ -1,13 +1,11 @@
 
 # Reopen the OpenStudio class to add methods to apply standards to this object
 class OpenStudio::Model::BoilerHotWater
-
   # find search criteria
   #
   # @param template [String] valid choices: 'DOE Ref Pre-1980', 'DOE Ref 1980-2004', '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
   # @return [Hash] used for find_object
   def find_search_criteria(template)
-
     # Define the criteria to find the boiler properties
     # in the hvac standards data set.
     search_criteria = {}
@@ -15,16 +13,16 @@ class OpenStudio::Model::BoilerHotWater
 
     # Get fuel type
     fuel_type = nil
-    case self.fuelType
-      when  'NaturalGas'
-        fuel_type = 'Gas'
-      when 'Electricity'
-        fuel_type = 'Electric'
-      when 'FuelOil#1', 'FuelOil#2'
-        fuel_type = 'Oil'
-      else
-        OpenStudio::logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{self.name}, a fuel type of #{self.fuelType} is not yet supported.  Assuming 'Gas.'")
-        fuel_type = 'Gas'
+    case fuelType
+    when 'NaturalGas'
+      fuel_type = 'Gas'
+    when 'Electricity'
+      fuel_type = 'Electric'
+    when 'FuelOil#1', 'FuelOil#2'
+      fuel_type = 'Oil'
+    else
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{name}, a fuel type of #{fuelType} is not yet supported.  Assuming 'Gas.'")
+      fuel_type = 'Gas'
     end
 
     search_criteria['fuel_type'] = fuel_type
@@ -34,32 +32,29 @@ class OpenStudio::Model::BoilerHotWater
     search_criteria['fluid_type'] = fluid_type
 
     return search_criteria
-
   end
 
   # find capacity
   #
   # @return [Double]  capacity_btu_per_hr - used for find_object
-  def find_capacity()
-
+  def find_capacity
     # Get the capacity
     capacity_w = nil
     capacity_btu_per_hr = nil
-    if self.nominalCapacity.is_initialized
-      capacity_w = self.nominalCapacity.get
-    elsif self.autosizedNominalCapacity.is_initialized
-      capacity_w = self.autosizedNominalCapacity.get
+    if nominalCapacity.is_initialized
+      capacity_w = nominalCapacity.get
+    elsif autosizedNominalCapacity.is_initialized
+      capacity_w = autosizedNominalCapacity.get
     else
-      OpenStudio::logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{self.name} capacity is not available, cannot apply efficiency standard.")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{name} capacity is not available, cannot apply efficiency standard.")
       successfully_set_all_properties = false
       return successfully_set_all_properties
     end
 
     # Convert capacity to Btu/hr
-    capacity_btu_per_hr = OpenStudio.convert(capacity_w, "W", "Btu/hr").get
+    capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
 
     return capacity_btu_per_hr
-
   end
 
   # Finds lookup object in standards and return minimum thermal efficiency
@@ -67,15 +62,14 @@ class OpenStudio::Model::BoilerHotWater
   # @param template [String] valid choices: 'DOE Ref Pre-1980', 'DOE Ref 1980-2004', '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
   # @param standards [Hash] the OpenStudio_Standards spreadsheet in hash format
   # @return [Double] minimum thermal efficiency
-  def standard_minimum_thermal_efficiency(template,standards)
-
+  def standard_minimum_thermal_efficiency(template, standards)
     # Get the boiler properties
-    search_criteria = self.find_search_criteria(template)
-    capacity_kbtu_per_hr = self.find_capacity
-    blr_props = self.model.find_object(standards['boilers'], search_criteria, capacity_kbtu_per_hr)
+    search_criteria = find_search_criteria(template)
+    capacity_kbtu_per_hr = find_capacity
+    blr_props = model.find_object(standards['boilers'], search_criteria, capacity_kbtu_per_hr)
 
-    fuel_type = blr_props["fuel_type"]
-    fluid_type = blr_props["fluid_type"]
+    fuel_type = blr_props['fuel_type']
+    fluid_type = blr_props['fluid_type']
 
     # Get the minimum efficiency standards
     thermal_eff = nil
@@ -84,128 +78,122 @@ class OpenStudio::Model::BoilerHotWater
     unless blr_props['minimum_annual_fuel_utilization_efficiency'].nil?
       min_afue = blr_props['minimum_annual_fuel_utilization_efficiency']
       thermal_eff = afue_to_thermal_eff(min_afue)
-      self.setName("#{self.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_afue} AFUE")
-      OpenStudio::logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater',  "For #{template}: #{self.name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; AFUE = #{min_afue}")
+      setName("#{name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_afue} AFUE")
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; AFUE = #{min_afue}")
     end
 
     # If specified as thermal efficiency
     unless blr_props['minimum_thermal_efficiency'].nil?
       thermal_eff = blr_props['minimum_thermal_efficiency']
-      self.setName("#{self.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{thermal_eff} Thermal Eff")
-      OpenStudio::logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{self.name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Thermal Efficiency = #{thermal_eff}")
+      setName("#{name} #{capacity_kbtu_per_hr.round}kBtu/hr #{thermal_eff} Thermal Eff")
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Thermal Efficiency = #{thermal_eff}")
     end
 
     # If specified as combustion efficiency
     unless blr_props['minimum_combustion_efficiency'].nil?
       min_comb_eff = blr_props['minimum_combustion_efficiency']
       thermal_eff = combustion_eff_to_thermal_eff(min_comb_eff)
-      self.setName("#{self.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_comb_eff} Combustion Eff")
-      OpenStudio::logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{self.name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Combustion Efficiency = #{min_comb_eff}")
+      setName("#{name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_comb_eff} Combustion Eff")
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Combustion Efficiency = #{min_comb_eff}")
     end
 
     return thermal_eff
-
   end
 
-
   # Applies the standard efficiency ratings and typical performance curves to this object.
-  # 
+  #
   # @param template [String] valid choices: 'DOE Ref Pre-1980', 'DOE Ref 1980-2004', '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NECB2011'
   # @param standards [Hash] the OpenStudio_Standards spreadsheet in hash format
-  # @return [Bool] true if successful, false if not 
-  def setStandardEfficiencyAndCurves(template)
-  
+  # @return [Bool] true if successful, false if not
+  def apply_efficiency_and_curves(template)
     successfully_set_all_properties = false
-  
+
     boilers = $os_standards['boilers']
 
     # Define the criteria to find the boiler properties
     # in the hvac standards data set.
     search_criteria = {}
     search_criteria['template'] = template
-    
+
     # Get fuel type
     fuel_type = nil
-    case self.fuelType
-    when  'NaturalGas'
+    case fuelType
+    when 'NaturalGas'
       fuel_type = 'Gas'
     when 'Electricity'
       fuel_type = 'Electric'
     when 'FuelOil#1', 'FuelOil#2'
       fuel_type = 'Oil'
     else
-      OpenStudio::logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{self.name}, a fuel type of #{self.fuelType} is not yet supported.  Assuming 'Gas.'")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{name}, a fuel type of #{fuelType} is not yet supported.  Assuming 'Gas.'")
       fuel_type = 'Gas'
     end
-    
-    
-    
+
     search_criteria['fuel_type'] = fuel_type
-    
+
     # Get the fluid type
     fluid_type = 'Hot Water'
     search_criteria['fluid_type'] = fluid_type
 
     # Get the capacity
     capacity_w = nil
-    if self.nominalCapacity.is_initialized
-      capacity_w = self.nominalCapacity.get
-    elsif self.autosizedNominalCapacity.is_initialized
-      capacity_w = self.autosizedNominalCapacity.get
+    if nominalCapacity.is_initialized
+      capacity_w = nominalCapacity.get
+    elsif autosizedNominalCapacity.is_initialized
+      capacity_w = autosizedNominalCapacity.get
     else
-      OpenStudio::logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{self.name} capacity is not available, cannot apply efficiency standard.")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{name} capacity is not available, cannot apply efficiency standard.")
       successfully_set_all_properties = false
       return successfully_set_all_properties
     end
-    
+
     # for NECB, check if secondary and/or modulating boiler required
-    if (template == 'NECB 2011')      
-      if (capacity_w/1000.0 >= 352.0)
-        if (self.name.to_s.include?("Primary Boiler"))
+    if template == 'NECB 2011'
+      if capacity_w / 1000.0 >= 352.0
+        if name.to_s.include?('Primary Boiler')
           boiler_capacity = capacity_w
-          self.setBoilerFlowMode('LeavingSetpointModulated')
-          self.setMinimumPartLoadRatio(0.25)
-        elsif (self.name.to_s.include?("Secondary Boiler"))
+          setBoilerFlowMode('LeavingSetpointModulated')
+          setMinimumPartLoadRatio(0.25)
+        elsif name.to_s.include?('Secondary Boiler')
           boiler_capacity = 0.001
         end
-      elsif ((capacity_w/1000.0) >= 176.0) && ((capacity_w/1000.0) < 352.0)
-        boiler_capacity = capacity_w/2
-      elsif ((capacity_w/1000.0) <= 176.0)
-        if (self.name.to_s.include?("Primary Boiler"))
+      elsif ((capacity_w / 1000.0) >= 176.0) && ((capacity_w / 1000.0) < 352.0)
+        boiler_capacity = capacity_w / 2
+      elsif (capacity_w / 1000.0) <= 176.0
+        if name.to_s.include?('Primary Boiler')
           boiler_capacity = capacity_w
-        elsif (self.name.to_s.include?("Secondary Boiler"))
+        elsif name.to_s.include?('Secondary Boiler')
           boiler_capacity = 0.001
         end
       end
-      self.setNominalCapacity(boiler_capacity)
-    end  # NECB 2011
+      setNominalCapacity(boiler_capacity)
+    end # NECB 2011
 
     # Convert capacity to Btu/hr
     if template == 'NECB 2011'
-      capacity_btu_per_hr = OpenStudio.convert(boiler_capacity, "W", "Btu/hr").get
-      capacity_kbtu_per_hr = OpenStudio.convert(boiler_capacity, "W", "kBtu/hr").get
+      capacity_btu_per_hr = OpenStudio.convert(boiler_capacity, 'W', 'Btu/hr').get
+      capacity_kbtu_per_hr = OpenStudio.convert(boiler_capacity, 'W', 'kBtu/hr').get
     else
-      capacity_btu_per_hr = OpenStudio.convert(capacity_w, "W", "Btu/hr").get
-      capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, "W", "kBtu/hr").get
+      capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
+      capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, 'W', 'kBtu/hr').get
     end
-      
 
     # Get the boiler properties
-    blr_props = self.model.find_object(boilers, search_criteria, capacity_btu_per_hr)
+    blr_props = model.find_object(boilers, search_criteria, capacity_btu_per_hr)
     unless blr_props
-      OpenStudio::logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{self.name}, cannot find boiler properties, cannot apply efficiency standard.")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{name}, cannot find boiler properties, cannot apply efficiency standard.")
       successfully_set_all_properties = false
       return successfully_set_all_properties
     end
 
     # Make the EFFFPLR curve
-    eff_fplr = self.model.add_curve(blr_props['efffplr'])
+    eff_fplr = model.add_curve(blr_props['efffplr'])
     if eff_fplr
-      self.setNormalizedBoilerEfficiencyCurve(eff_fplr)
+      setNormalizedBoilerEfficiencyCurve(eff_fplr)
     else
-      OpenStudio::logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{self.name}, cannot find eff_fplr curve, will not be set.")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "For #{name}, cannot find eff_fplr curve, will not be set.")
       successfully_set_all_properties = false
-    end   
+    end
 
     # Get the minimum efficiency standards
     thermal_eff = nil
@@ -214,31 +202,30 @@ class OpenStudio::Model::BoilerHotWater
     unless blr_props['minimum_annual_fuel_utilization_efficiency'].nil?
       min_afue = blr_props['minimum_annual_fuel_utilization_efficiency']
       thermal_eff = afue_to_thermal_eff(min_afue)
-      self.setName("#{self.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_afue} AFUE")
-      OpenStudio::logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater',  "For #{template}: #{self.name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; AFUE = #{min_afue}")
+      setName("#{name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_afue} AFUE")
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; AFUE = #{min_afue}")
     end
-    
+
     # If specified as thermal efficiency
     unless blr_props['minimum_thermal_efficiency'].nil?
       thermal_eff = blr_props['minimum_thermal_efficiency']
-      self.setName("#{self.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{thermal_eff} Thermal Eff")
-      OpenStudio::logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{self.name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Thermal Efficiency = #{thermal_eff}")
+      setName("#{name} #{capacity_kbtu_per_hr.round}kBtu/hr #{thermal_eff} Thermal Eff")
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Thermal Efficiency = #{thermal_eff}")
     end
 
     # If specified as combustion efficiency
     unless blr_props['minimum_combustion_efficiency'].nil?
       min_comb_eff = blr_props['minimum_combustion_efficiency']
       thermal_eff = combustion_eff_to_thermal_eff(min_comb_eff)
-      self.setName("#{self.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_comb_eff} Combustion Eff")
-      OpenStudio::logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{self.name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Combustion Efficiency = #{min_comb_eff}")
-    end    
-    
+      setName("#{name} #{capacity_kbtu_per_hr.round}kBtu/hr #{min_comb_eff} Combustion Eff")
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.BoilerHotWater', "For #{template}: #{name}: #{fuel_type} #{fluid_type} Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; Combustion Efficiency = #{min_comb_eff}")
+    end
+
     # Set the efficiency values
     unless thermal_eff.nil?
-      self.setNominalThermalEfficiency(thermal_eff)
-    end   
-  
+      setNominalThermalEfficiency(thermal_eff)
+    end
+
     return successfully_set_all_properties
   end
-  
 end