openstudio-standards 0.2.14 → 0.2.15.pre.rc1

data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.AirLoopHVAC.rb

@@ -4,8 +4,9 @@ class DEER2065 < DEER
   # Determine if the system required supply air temperature (SAT) reset.
   # Defaults to true for DEER 2065.
   #
-  # @param (see #economizer_required?)
-  # @return [Bool] Returns true if required, false if not.
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @param climate_zone [String] ASHRAE climate zone, e.g. 'ASHRAE 169-2013-4A'
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_supply_air_temperature_reset_required?(air_loop_hvac, climate_zone)
     is_sat_reset_required = true
     return is_sat_reset_required
@@ -13,17 +14,20 @@ class DEER2065 < DEER
 
   # Determine if a system's fans must shut off when not required.
   # Per ASHRAE 90.1 section 6.4.3.3, HVAC systems are required to have off-hour controls
-  # @return [Bool] true if required, false if not
+  #
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_unoccupied_fan_shutoff_required?(air_loop_hvac)
     shutoff_required = true
-
     return shutoff_required
   end
 
   # Determine if a motorized OA damper is required
   # Defaults to true for DEER 2065.
   #
-  # @return [Bool] Returns true if required, false if not.
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @param climate_zone [String] ASHRAE climate zone, e.g. 'ASHRAE 169-2013-4A'
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_motorized_oa_damper_required?(air_loop_hvac, climate_zone)
     motorized_oa_damper_required = true
     return motorized_oa_damper_required

data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.FanVariableVolume.rb

@@ -2,6 +2,9 @@ class DEER2065 < DEER
   # @!group FanVariableVolume
 
   # Determines whether there is a requirement to have a VSD or some other method to reduce fan power at low part load ratios.
+  #
+  # @param fan_variable_volume [OpenStudio::Model::FanVariableVolume] variable volume fan object
+  # @return [Bool] returns true if required, false if not
   def fan_variable_volume_part_load_fan_power_limitation?(fan_variable_volume)
     part_load_control_required = false
 

data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.Space.rb

@@ -73,15 +73,17 @@ class DEER2065 < DEER
     return [req_top_ctrl, req_pri_ctrl, req_sec_ctrl]
   end
 
-  # Determine the fraction controlled by each sensor and which
-  # window each sensor should go near.
+  # Determine the fraction controlled by each sensor and which window each sensor should go near.
   #
-  # @param space [OpenStudio::Model::Space] the space with the daylighting
+  # @param space [OpenStudio::Model::Space] space object
+  # @param areas [Hash] a hash of daylighted areas
   # @param sorted_windows [Hash] a hash of windows, sorted by priority
   # @param sorted_skylights [Hash] a hash of skylights, sorted by priority
   # @param req_top_ctrl [Bool] if toplighting controls are required
   # @param req_pri_ctrl [Bool] if primary sidelighting controls are required
   # @param req_sec_ctrl [Bool] if secondary sidelighting controls are required
+  # @return [Array] array of 4 items
+  #   [sensor 1 fraction, sensor 2 fraction, sensor 1 window, sensor 2 window]
   def space_daylighting_fractions_and_windows(space,
                                               areas,
                                               sorted_windows,

data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.rb

@@ -9,6 +9,10 @@ class DEER2065 < DEER
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/deer/deer_2070/comstock_deer_2070/comstock_deer_2070.rb

@@ -9,6 +9,10 @@ class ComStockDEER2070 < DEER2070
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.AirLoopHVAC.rb

@@ -4,8 +4,9 @@ class DEER2070 < DEER
   # Determine if the system required supply air temperature (SAT) reset.
   # Defaults to true for DEER 2070.
   #
-  # @param (see #economizer_required?)
-  # @return [Bool] Returns true if required, false if not.
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @param climate_zone [String] ASHRAE climate zone, e.g. 'ASHRAE 169-2013-4A'
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_supply_air_temperature_reset_required?(air_loop_hvac, climate_zone)
     is_sat_reset_required = true
     return is_sat_reset_required
@@ -13,17 +14,20 @@ class DEER2070 < DEER
 
   # Determine if a system's fans must shut off when not required.
   # Per ASHRAE 90.1 section 6.4.3.3, HVAC systems are required to have off-hour controls
-  # @return [Bool] true if required, false if not
+  #
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_unoccupied_fan_shutoff_required?(air_loop_hvac)
     shutoff_required = true
-
     return shutoff_required
   end
 
   # Determine if a motorized OA damper is required
   # Defaults to true for DEER 2070.
   #
-  # @return [Bool] Returns true if required, false if not.
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @param climate_zone [String] ASHRAE climate zone, e.g. 'ASHRAE 169-2013-4A'
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_motorized_oa_damper_required?(air_loop_hvac, climate_zone)
     motorized_oa_damper_required = true
     return motorized_oa_damper_required

data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.FanVariableVolume.rb

@@ -2,6 +2,9 @@ class DEER2070 < DEER
   # @!group FanVariableVolume
 
   # Determines whether there is a requirement to have a VSD or some other method to reduce fan power at low part load ratios.
+  #
+  # @param fan_variable_volume [OpenStudio::Model::FanVariableVolume] variable volume fan object
+  # @return [Bool] returns true if required, false if not
   def fan_variable_volume_part_load_fan_power_limitation?(fan_variable_volume)
     part_load_control_required = false
 

data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.Space.rb

@@ -73,15 +73,17 @@ class DEER2070 < DEER
     return [req_top_ctrl, req_pri_ctrl, req_sec_ctrl]
   end
 
-  # Determine the fraction controlled by each sensor and which
-  # window each sensor should go near.
+  # Determine the fraction controlled by each sensor and which window each sensor should go near.
   #
-  # @param space [OpenStudio::Model::Space] the space with the daylighting
+  # @param space [OpenStudio::Model::Space] space object
+  # @param areas [Hash] a hash of daylighted areas
   # @param sorted_windows [Hash] a hash of windows, sorted by priority
   # @param sorted_skylights [Hash] a hash of skylights, sorted by priority
   # @param req_top_ctrl [Bool] if toplighting controls are required
   # @param req_pri_ctrl [Bool] if primary sidelighting controls are required
   # @param req_sec_ctrl [Bool] if secondary sidelighting controls are required
+  # @return [Array] array of 4 items
+  #   [sensor 1 fraction, sensor 2 fraction, sensor 1 window, sensor 2 window]
   def space_daylighting_fractions_and_windows(space,
                                               areas,
                                               sorted_windows,

data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.rb

@@ -9,6 +9,10 @@ class DEER2070 < DEER
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/deer/deer_2075/comstock_deer_2075/comstock_deer_2075.rb

@@ -9,6 +9,10 @@ class ComStockDEER2075 < DEER2075
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/deer/deer_2075/deer_2075.AirLoopHVAC.rb

@@ -4,8 +4,9 @@ class DEER2075 < DEER
   # Determine if the system required supply air temperature (SAT) reset.
   # Defaults to true for DEER 2075.
   #
-  # @param (see #economizer_required?)
-  # @return [Bool] Returns true if required, false if not.
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @param climate_zone [String] ASHRAE climate zone, e.g. 'ASHRAE 169-2013-4A'
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_supply_air_temperature_reset_required?(air_loop_hvac, climate_zone)
     is_sat_reset_required = true
     return is_sat_reset_required
@@ -13,17 +14,20 @@ class DEER2075 < DEER
 
   # Determine if a system's fans must shut off when not required.
   # Per ASHRAE 90.1 section 6.4.3.3, HVAC systems are required to have off-hour controls
-  # @return [Bool] true if required, false if not
+  #
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_unoccupied_fan_shutoff_required?(air_loop_hvac)
     shutoff_required = true
-
     return shutoff_required
   end
 
   # Determine if a motorized OA damper is required
   # Defaults to true for DEER 2075.
   #
-  # @return [Bool] Returns true if required, false if not.
+  # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop
+  # @param climate_zone [String] ASHRAE climate zone, e.g. 'ASHRAE 169-2013-4A'
+  # @return [Bool] returns true if required, false if not
   def air_loop_hvac_motorized_oa_damper_required?(air_loop_hvac, climate_zone)
     motorized_oa_damper_required = true
     return motorized_oa_damper_required

data/lib/openstudio-standards/standards/deer/deer_2075/deer_2075.FanVariableVolume.rb

@@ -2,6 +2,9 @@ class DEER2075 < DEER
   # @!group FanVariableVolume
 
   # Determines whether there is a requirement to have a VSD or some other method to reduce fan power at low part load ratios.
+  #
+  # @param fan_variable_volume [OpenStudio::Model::FanVariableVolume] variable volume fan object
+  # @return [Bool] returns true if required, false if not
   def fan_variable_volume_part_load_fan_power_limitation?(fan_variable_volume)
     part_load_control_required = false
 

data/lib/openstudio-standards/standards/deer/deer_2075/deer_2075.Space.rb

@@ -73,15 +73,17 @@ class DEER2075 < DEER
     return [req_top_ctrl, req_pri_ctrl, req_sec_ctrl]
   end
 
-  # Determine the fraction controlled by each sensor and which
-  # window each sensor should go near.
+  # Determine the fraction controlled by each sensor and which window each sensor should go near.
   #
-  # @param space [OpenStudio::Model::Space] the space with the daylighting
+  # @param space [OpenStudio::Model::Space] space object
+  # @param areas [Hash] a hash of daylighted areas
   # @param sorted_windows [Hash] a hash of windows, sorted by priority
   # @param sorted_skylights [Hash] a hash of skylights, sorted by priority
   # @param req_top_ctrl [Bool] if toplighting controls are required
   # @param req_pri_ctrl [Bool] if primary sidelighting controls are required
   # @param req_sec_ctrl [Bool] if secondary sidelighting controls are required
+  # @return [Array] array of 4 items
+  #   [sensor 1 fraction, sensor 2 fraction, sensor 1 window, sensor 2 window]
   def space_daylighting_fractions_and_windows(space,
                                               areas,
                                               sorted_windows,

data/lib/openstudio-standards/standards/deer/deer_2075/deer_2075.rb

@@ -9,6 +9,10 @@ class DEER2075 < DEER
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/deer/deer_pre_1975/comstock_deer_pre_1975/comstock_deer_pre_1975.rb

@@ -10,6 +10,10 @@ class ComStockDEERPRE1975 < DEERPRE1975
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/deer/deer_pre_1975/comstock_deer_pre_1975/data/comstock_deer_pre_1975.ext_ltg.json

@@ -108,7 +108,7 @@
       "occupancy_setback_reduction": 0.0,
       "base_site_allowance_power": null,
       "base_site_allowance_fraction": 0.05,
-      "parking_areas_and_drives": 0.04,
+      "parking_areas_and_drives": 0.036491252,
       "walkways_less_than_10ft_wide": 1.0,
       "walkways_10ft_wide_or_greater": 0.2,
       "stairways": 1.0,
@@ -130,7 +130,7 @@
       "drive_through_windows_and_doors": 400.0,
       "parking_near_24_hour_entrances": 800.0,
       "roadway_parking": null,
-      "notes": "Same as DOE Ref 1980-2004; parking capped at 0.04 W/sf to account for replacement; canopies LPD adjusted from online research of actual hotels"
+      "notes": "Same as DOE Ref 1980-2004; parking capped at 0.04 W/sf to account for replacement; canopies LPD adjusted from online research of actual hotels. Parking Areas and Drives lpd updated based on values derived from 2015 U.S. Lighting Market Characterization report."
     },
     {
       "exterior_lighting_zone_number": 4.0,

data/lib/openstudio-standards/standards/deer/deer_pre_1975/deer_pre_1975.rb

@@ -10,6 +10,10 @@ class DEERPRE1975 < DEER
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/icc_iecc/icc_iecc_2015/icc_iecc_2015.rb

@@ -12,6 +12,10 @@ class ICCIECC2015 < ICCIECC
     load_standards_database
   end
 
+  # Loads the openstudio standards dataset for this standard.
+  #
+  # @param data_directories [Array<String>] array of file paths that contain standards data
+  # @return [Hash] a hash of standards data
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end

data/lib/openstudio-standards/standards/necb/BTAP1980TO2010/btap_1980to2010.rb

@@ -1,19 +1,17 @@
 # This class holds methods that apply BTAP19802010 rules.
 # @ref [References::BTAP19802010]
 class BTAP1980TO2010 < BTAPPRE1980
-  @template = self.new.class.name # rubocop:disable Style/ClassVars
+  @template = new.class.name
   register_standard(@template)
 
-
   def initialize
     super()
-    @template = self.class.name
-    @standards_data = self.load_standards_database_new()
-    self.corrupt_standards_database()
+    @standards_data = load_standards_database_new
+    corrupt_standards_database
   end
 
-  def load_standards_database_new()
-    #load BTAP19802010 data.
+  def load_standards_database_new
+    # load BTAP19802010 data.
     super()
 
     if __dir__[0] == ':' # Running from OpenStudio CLI
@@ -42,31 +40,11 @@ class BTAP1980TO2010 < BTAPPRE1980
     end
     # Write database to file.
     # File.open(File.join(File.dirname(__FILE__), '..', 'NECB2017.json'), 'w') {|f| f.write(JSON.pretty_generate(@standards_data))}
-
     return @standards_data
   end
 
-
-
-  #occupancy sensor control applied using lighting schedule, see apply_lighting_schedule method
+  # occupancy sensor control applied using lighting schedule, see apply_lighting_schedule method
   def set_occ_sensor_spacetypes(model, space_type_map)
     return true
   end
-
-=begin
-  def apply_loop_pump_power(model:, sizing_run_dir:)
-    # NECB2015 Custom code
-    # Do another sizing run to take into account adjustments to equipment efficiency etc. on capacities. This was done primarily
-    # because the cooling tower loop capacity is affected by the chiller COP.  If the chiller COP is not properly set then
-    # the cooling tower loop capacity can be significantly off which will affect the NECB 2015 maximum loop pump capacity.  Found
-    # all sizing was off somewhat if the additional sizing run was not done.
-    if model_run_sizing_run(model, "#{sizing_run_dir}/SR2") == false
-      raise("sizing run 2 failed!")
-    end
-    # Apply maxmimum loop pump power normalized by peak demand by served spaces as per NECB2015 5.2.6.3.(1)
-    apply_maximum_loop_pump_power(model)
-    #model = BTAP::FileIO::remove_duplicate_materials_and_constructions(model)
-    return model
-  end
-=end
 end

data/lib/openstudio-standards/standards/necb/BTAPPRE1980/btap_pre1980.rb

@@ -1,19 +1,17 @@
 # This class holds methods that apply NECB2011 rules.
 # @ref [References::NECB2011]
 class BTAPPRE1980 < NECB2011
-  @template = self.new.class.name # rubocop:disable Style/ClassVars
+  @template = new.class.name
   register_standard(@template)
 
-
   def initialize
     super()
-    @template = self.class.name
-    @standards_data = self.load_standards_database_new()
-    self.corrupt_standards_database()
+    @standards_data = load_standards_database_new
+    corrupt_standards_database
   end
 
-  def load_standards_database_new()
-    #load NECB2011 data.
+  def load_standards_database_new
+    # load NECB2011 data
     super()
 
     if __dir__[0] == ':' # Running from OpenStudio CLI
@@ -46,97 +44,31 @@ class BTAPPRE1980 < NECB2011
     return @standards_data
   end
 
-  # Created this method so that additional methods can be addded for bulding the prototype model in later
-  # code versions without modifying the build_protoype_model method or copying it wholesale for a few changes.
-  def model_apply_standard(model:,
-                           epw_file:,
-                           sizing_run_dir: Dir.pwd,
-                           primary_heating_fuel: 'DefaultFuel',
-                           dcv_type: 'NECB_Default',
-                           lights_type: 'NECB_Default',
-                           lights_scale: 1.0,
-                           daylighting_type: 'NECB_Default',
-                           ecm_system_name: 'NECB_Default',
-                           erv_package: 'NECB_Default',
-                           boiler_eff: nil,
-                           furnace_eff: nil,
-                           unitary_cop: nil,
-                           shw_eff: nil,
-                           ext_wall_cond: nil,
-                           ext_floor_cond: nil,
-                           ext_roof_cond: nil,
-                           ground_wall_cond: nil,
-                           ground_floor_cond: nil,
-                           ground_roof_cond: nil,
-                           door_construction_cond: nil,
-                           fixed_window_cond: nil,
-                           glass_door_cond: nil,
-                           overhead_door_cond: nil,
-                           skylight_cond: nil,
-                           glass_door_solar_trans: nil,
-                           fixed_wind_solar_trans: nil,
-                           skylight_solar_trans: nil,
-                           fdwr_set: -1,
-                           srr_set: -1,
-                           rotation_degrees: nil,
-                           scale_x: nil,
-                           scale_y: nil,
-                           scale_z: nil,
-                           pv_ground_type: 'NECB_Default',
-                           pv_ground_total_area_pv_panels_m2: nil ,
-                           pv_ground_tilt_angle: nil,
-                           pv_ground_azimuth_angle: nil,
-                           pv_ground_module_description: nil,
-                           nv_type: 'NECB_Default',
-                           nv_opening_fraction: nil,
-                           nv_Tout_min: nil,
-                           nv_Delta_Tin_Tout: nil
-
-  )
-    # This will allow changes to default fdwr/srr for vintages.. but will not touch the existing models if they were
-    # called for with -1.0 in the fdwr_srr method.
-    fdwr_set = -2 if fdwr_set.nil? || fdwr_set == -1.0
-    srr_set = -2 if srr_set.nil? || srr_set == -1.0
-    return super(model: model,
-                 epw_file: epw_file,
-                 sizing_run_dir: sizing_run_dir,
-                 primary_heating_fuel: primary_heating_fuel,
-                 dcv_type: dcv_type,
-                 lights_type: lights_type,
-                 lights_scale: lights_scale,
-                 daylighting_type: daylighting_type,
-                 ecm_system_name: ecm_system_name,
-                 erv_package: erv_package,
-                 boiler_eff: boiler_eff,
-                 furnace_eff: furnace_eff,
-                 unitary_cop: unitary_cop,
-                 shw_eff: shw_eff,
-                 ext_wall_cond: ext_wall_cond,
-                 ext_floor_cond: ext_floor_cond,
-                 ext_roof_cond: ext_roof_cond,
-                 ground_wall_cond: ground_wall_cond,
-                 ground_floor_cond: ground_floor_cond,
-                 ground_roof_cond: ground_roof_cond,
-                 door_construction_cond: door_construction_cond,
-                 fixed_window_cond: fixed_window_cond,
-                 glass_door_cond: glass_door_cond,
-                 overhead_door_cond: overhead_door_cond,
-                 skylight_cond: skylight_cond,
-                 glass_door_solar_trans: glass_door_solar_trans,
-                 fixed_wind_solar_trans: fixed_wind_solar_trans,
-                 skylight_solar_trans: skylight_solar_trans,
-                 fdwr_set: fdwr_set,
-                 srr_set: srr_set,
-                 rotation_degrees: rotation_degrees,
-                 scale_x: scale_x,
-                 scale_y: scale_y,
-                 scale_z: scale_z)
+  # Thermal zones need to be set to determine conditioned spaces when applying fdwr and srr limits.
+  #     # fdwr_set/srr_set settings:
+  #     # 0-1:  Remove all windows/skylights and add windows/skylights to match this fdwr/srr
+  #     # -1:  Remove all windows/skylights and add windows/skylights to match max fdwr/srr from NECB
+  #     # -2:  Do not apply any fdwr/srr changes, leave windows/skylights alone (also works for fdwr/srr > 1)
+  #     # -3:  Use old method which reduces existing window/skylight size (if necessary) to meet maximum NECB fdwr/srr
+  #     # limit
+  #     # <-3.1:  Remove all the windows/skylights
+  #     # > 1:  Do nothing
+  def apply_fdwr_srr_daylighting(model:, fdwr_set: -2.0, srr_set: -2.0)
+    fdwr_set = -2.0 if (fdwr_set == 'NECB_default') || fdwr_set.nil? || (fdwr_set.to_f.round(0) == -1.0)
+    srr_set = -2.0 if (srr_set == 'NECB_default') || srr_set.nil? || (srr_set.to_f.round(0) == -1.0)
+    fdwr_set = fdwr_set.to_f
+    srr_set = srr_set.to_f
+    apply_standard_window_to_wall_ratio(model: model, fdwr_set: fdwr_set)
+    apply_standard_skylight_to_roof_ratio(model: model, srr_set: srr_set)
+    # model_add_daylighting_controls(model) # to be removed after refactor.
   end
 
   def apply_standard_efficiencies(model:, sizing_run_dir:, dcv_type: 'NECB_Default')
     raise('validation of model failed.') unless validate_initial_model(model)
+
     climate_zone = 'NECB HDD Method'
     raise("sizing run 1 failed! check #{sizing_run_dir}") if model_run_sizing_run(model, "#{sizing_run_dir}/plant_loops") == false
+
     # This is needed for NECB2011 as a workaround for sizing the reheat boxes
     model.getAirTerminalSingleDuctVAVReheats.each { |iobj| air_terminal_single_duct_vav_reheat_set_heating_cap(iobj) }
     # Apply the prototype HVAC assumptions
@@ -149,25 +81,8 @@ class BTAPPRE1980 < NECB2011
     return sql_db_vars_map
   end
 
-  #occupancy sensor control applied using lighting schedule, see apply_lighting_schedule method
+  # occupancy sensor control applied using lighting schedule, see apply_lighting_schedule method
   def set_occ_sensor_spacetypes(model, space_type_map)
     return true
   end
-
-=begin
-  def apply_loop_pump_power(model:, sizing_run_dir:)
-    # NECB2015 Custom code
-    # Do another sizing run to take into account adjustments to equipment efficiency etc. on capacities. This was done primarily
-    # because the cooling tower loop capacity is affected by the chiller COP.  If the chiller COP is not properly set then
-    # the cooling tower loop capacity can be significantly off which will affect the NECB 2015 maximum loop pump capacity.  Found
-    # all sizing was off somewhat if the additional sizing run was not done.
-    if model_run_sizing_run(model, "#{sizing_run_dir}/SR2") == false
-      raise("sizing run 2 failed!")
-    end
-    # Apply maxmimum loop pump power normalized by peak demand by served spaces as per NECB2015 5.2.6.3.(1)
-    apply_maximum_loop_pump_power(model)
-    #model = BTAP::FileIO::remove_duplicate_materials_and_constructions(model)
-    return model
-  end
-=end
 end