openstudio-standards 0.2.12.rc5 → 0.2.13

data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_1_single_speed.rb

@@ -84,6 +84,7 @@ class NECB2011
     # Create MAU
     # TO DO: MAU sizing, characteristics (fan operation schedules, temperature setpoints, outdoor air, etc)
 
+
     if mau_type == true
       mau_air_loop = common_air_loop(model: model, system_data: system_data)
       mau_fan = OpenStudio::Model::FanConstantVolume.new(model, always_on)
@@ -99,6 +100,7 @@ class NECB2011
 
       # Set up Single Speed DX coil with
       mau_clg_coil = self.add_onespeed_DX_coil(model, always_on)
+      mau_clg_coil.setName("CoilCoolingDXSingleSpeed_dx")
 
       # Set up OA system
       oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)
@@ -122,7 +124,6 @@ class NECB2011
       setpoint_mgr.addToNode(mau_air_loop.supplyOutletNode)
     end
 
-
     zones.each do |zone|
       # Zone sizing temperature
       sizing_zone = zone.sizingZone
@@ -158,6 +159,21 @@ class NECB2011
         mau_air_loop.addBranchForZone(zone, diffuser.to_StraightComponent)
       end # components for MAU
     end # of zone loop
+    if mau_type
+      sys_name_pars = {}
+      sys_name_pars["sys_hr"] = "none"
+      sys_name_pars["sys_clg"] = "dx"
+      sys_name_pars["sys_htg"] = mau_heating_coil_type
+      sys_name_pars["sys_sf"] = "cv"
+      sys_name_pars["zone_htg"] = baseboard_type
+      sys_name_pars["zone_clg"] = "ptac"
+      sys_name_pars["sys_rf"] = "none"
+      assign_base_sys_name(mau_air_loop,
+                         sys_abbr: "sys_1",
+                         sys_oa: "doas",
+                         sys_name_pars: sys_name_pars)
+    end
+
     return true
   end
 end

data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_2_and_5.rb

@@ -87,6 +87,7 @@ class NECB2011
     # Add DX or hydronic cooling coil
     if mau_cooling_type == 'DX'
       clg_coil = self.add_onespeed_DX_coil(model, tpfc_clg_availability_sch)
+      clg_coil.setName("CoilCoolingDXSingleSpeed_dx")
     elsif mau_cooling_type == 'Hydronic'
       clg_coil = OpenStudio::Model::CoilCoolingWater.new(model, tpfc_clg_availability_sch)
       chw_loop.addDemandBranchForComponent(clg_coil)
@@ -154,5 +155,19 @@ class NECB2011
       diffuser = OpenStudio::Model::AirTerminalSingleDuctUncontrolled.new(model, always_on)
       air_loop.addBranchForZone(zone, diffuser.to_StraightComponent)
     end # zone loop
+    sys_abbr = "sys_2"
+    sys_abbr = "sys_5" if fan_coil_type == "TPFC"
+    sys_name_pars = {}
+    sys_name_pars["sys_hr"] = "none"
+    sys_name_pars["sys_clg"] = mau_cooling_type
+    sys_name_pars["sys_htg"] = "g"
+    sys_name_pars["sys_sf"] = "cv"
+    sys_name_pars["zone_htg"] = fan_coil_type
+    sys_name_pars["zone_clg"] = fan_coil_type
+    sys_name_pars["sys_rf"] = "none"
+    assign_base_sys_name(mau_air_loop,
+                         sys_abbr: sys_abbr,
+                         sys_oa: "doas",
+                         sys_name_pars: sys_name_pars)
   end
 end

data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_3_and_8_single_speed.rb

@@ -91,7 +91,6 @@ class NECB2011
                                   zone)
 
       end
-      return true
     else
       zones.each do |zone|
         air_loop = add_system_3_and_8_airloop(heating_coil_type, model, system_data, zone)
@@ -101,8 +100,20 @@ class NECB2011
                                   model,
                                   zone)
       end
-      return true
     end
+    sys_name_pars = {}
+    sys_name_pars["sys_hr"] = "none"
+    sys_name_pars["sys_clg"] = "dx"
+    sys_name_pars["sys_htg"] = heating_coil_type
+    sys_name_pars["sys_sf"] = "cv"
+    sys_name_pars["zone_htg"] = baseboard_type
+    sys_name_pars["zone_clg"] = "none"
+    sys_name_pars["sys_rf"] = "none"
+    assign_base_sys_name(air_loop,
+                         sys_abbr: "sys_3",
+                         sys_oa: "mixed",
+                         sys_name_pars: sys_name_pars)
+    return true
   end
 
 
@@ -151,6 +162,7 @@ class NECB2011
 
     # Set up DX coil with NECB performance curve characteristics;
     clg_coil = OpenStudio::Model::CoilCoolingDXSingleSpeed.new(model)
+    clg_coil.setName("CoilCoolingDXSingleSpeed_dx")
 
     # oa_controller
     oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)

data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_4.rb

@@ -86,6 +86,7 @@ class NECB2011
       # Set up DX coil with NECB performance curve characteristics;
 
       clg_coil = self.add_onespeed_DX_coil(model, always_on)
+      clg_coil.setName("CoilCoolingDXSingleSpeed_dx")
 
       # oa_controller
       oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)
@@ -141,6 +142,18 @@ class NECB2011
                           model: model,
                           zone: zone)
     end # zone loop
+    sys_name_pars = {}
+    sys_name_pars["sys_hr"] = "none"
+    sys_name_pars["sys_clg"] = "dx"
+    sys_name_pars["sys_htg"] = heating_coil_type
+    sys_name_pars["sys_sf"] = "cv"
+    sys_name_pars["zone_htg"] = baseboard_type
+    sys_name_pars["zone_clg"] = "none"
+    sys_name_pars["sys_rf"] = "none"
+    assign_base_sys_name(air_loop,
+                         sys_abbr: "sys_4",
+                         sys_oa: "mixed",
+                         sys_name_pars: sys_name_pars)
 
     return true
   end

data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_6.rb

@@ -133,6 +133,18 @@ class NECB2011
                               baseboard_type: baseboard_type,
                               hw_loop: hw_loop)
         end
+        sys_name_pars = {}
+        sys_name_pars["sys_hr"] = "none"
+        sys_name_pars["sys_htg"] = heating_coil_type
+        sys_name_pars["sys_clg"] = "Chilled Water"
+        sys_name_pars["sys_sf"] = "vv"
+        sys_name_pars["zone_htg"] = baseboard_type
+        sys_name_pars["zone_clg"] = "none"
+        sys_name_pars["sys_rf"] = "vv"
+        assign_base_sys_name(air_loop,
+                             sys_abbr: "sys_6",
+                             sys_oa: "mixed",
+                             sys_name_pars: sys_name_pars)
       end
     end # next story
 

data/lib/openstudio-standards/standards/necb/NECB2011/hvac_systems.rb

@@ -295,6 +295,7 @@ class NECB2011
     end
 
     # Create an ERV
+
     erv = OpenStudio::Model::HeatExchangerAirToAirSensibleAndLatent.new(air_loop_hvac.model)
     erv.setName("#{air_loop_hvac.name} ERV")
     erv.setSensibleEffectivenessat100HeatingAirFlow(0.5)
@@ -372,10 +373,9 @@ class NECB2011
   def heat_exchanger_air_to_air_sensible_and_latent_apply_efficiency(heat_exchanger_air_to_air_sensible_and_latent, erv_name = nil)
     # Assumed to be sensible and latent at all flow
     # This will now get data of the erv from the json file instead of hardcoding it. Defaults to NECB2011 erv we have been using.
-    erv_name = 'Rotary-Minimum-Eff-Existing' if erv_name.nil?
-    erv_info = @standards_data['erv'].detect { |item| item['erv_name'] == erv_name }
-
-    raise("Could not find #{erv_name} in #{self.class.name} class' erv.json file or it's parents. The available ervs are #{@standards_data['erv'].map{|item| item['erv_name']}}") if erv_info.nil?
+    erv_name = 'NECB_Default' if erv_name.nil?
+    erv_info = @standards_data['tables']['erv']['table'].detect { |item| item['erv_name'] == erv_name }
+    raise("Could not find #{erv_name} in #{self.class.name} class' erv.json file or it's parents. The available ervs are #{@standards_data['tables']['erv']['table'].map{|item| item['erv_name']}}") if erv_info.nil?
 
     heat_exchanger_air_to_air_sensible_and_latent.setHeatExchangerType(erv_info['HeatExchangerType'])
     heat_exchanger_air_to_air_sensible_and_latent.setSensibleEffectivenessat100HeatingAirFlow(erv_info['SensibleEffectivenessat100HeatingAirFlow'])
@@ -391,6 +391,8 @@ class NECB2011
     heat_exchanger_air_to_air_sensible_and_latent.setEconomizerLockout(erv_info['EconomizerLockout'])
     heat_exchanger_air_to_air_sensible_and_latent.setThresholdTemperature(erv_info['ThresholdTemperature'])
     heat_exchanger_air_to_air_sensible_and_latent.setInitialDefrostTimeFraction(erv_info['InitialDefrostTimeFraction'])
+    update_sys_name(heat_exchanger_air_to_air_sensible_and_latent.airLoopHVAC.get,sys_hr: "erv")
+
     return true
   end
 
@@ -939,7 +941,7 @@ class NECB2011
     # Make the COOL-CAP-FT curve
     cool_cap_ft = model_add_curve(model, ac_props['cool_cap_ft'])
     if cool_cap_ft
-      clg_stages.each do |stage|
+      clg_stages.sort.each do |stage|
         stage.setTotalCoolingCapacityFunctionofTemperatureCurve(cool_cap_ft)
       end
     else
@@ -951,7 +953,7 @@ class NECB2011
     # Make the COOL-CAP-FFLOW curve
     cool_cap_fflow = model_add_curve(model, ac_props['cool_cap_fflow'])
     if cool_cap_fflow
-      clg_stages.each do |stage|
+      clg_stages.sort.each do |stage|
         stage.setTotalCoolingCapacityFunctionofFlowFractionCurve(cool_cap_fflow)
       end
     else
@@ -963,7 +965,7 @@ class NECB2011
     # Make the COOL-EIR-FT curve
     cool_eir_ft = model_add_curve(model, ac_props['cool_eir_ft'])
     if cool_eir_ft
-      clg_stages.each do |stage|
+      clg_stages.sort.each do |stage|
         stage.setEnergyInputRatioFunctionofTemperatureCurve(cool_eir_ft)
       end
     else
@@ -975,7 +977,7 @@ class NECB2011
     # Make the COOL-EIR-FFLOW curve
     cool_eir_fflow = model_add_curve(model, ac_props['cool_eir_fflow'])
     if cool_eir_fflow
-      clg_stages.each do |stage|
+      clg_stages.sort.each do |stage|
         stage.setEnergyInputRatioFunctionofFlowFractionCurve(cool_eir_fflow)
       end
     else
@@ -987,7 +989,7 @@ class NECB2011
     # Make the COOL-PLF-FPLR curve
     cool_plf_fplr = model_add_curve(model, ac_props['cool_plf_fplr'])
     if cool_plf_fplr
-      clg_stages.each do |stage|
+      clg_stages.sort.each do |stage|
         stage.setPartLoadFractionCorrelationCurve(cool_plf_fplr)
       end
     else
@@ -999,7 +1001,7 @@ class NECB2011
     # Set the COP values
     cop, new_comp_name = coil_cooling_dx_multi_speed_standard_minimum_cop(coil_cooling_dx_multi_speed)
     unless cop.nil?
-      clg_stages.each do |istage|
+      clg_stages.sort.each do |istage|
         istage.setGrossRatedCoolingCOP(cop)
       end
     end
@@ -1077,7 +1079,7 @@ class NECB2011
     # get multi speed heat pump and air loop
     multi_speed_heat_pump = nil
     multi_speed_heat_pumps = model.getAirLoopHVACUnitaryHeatPumpAirToAirMultiSpeeds
-    multi_speed_heat_pumps.each do |iheat_pump|
+    multi_speed_heat_pumps.sort.each do |iheat_pump|
       htg_coil = iheat_pump.heatingCoil
       if htg_coil.name.to_s.strip == coil_heating_gas_multi_stage.name.to_s.strip
         multi_speed_heat_pump = iheat_pump
@@ -1239,7 +1241,7 @@ class NECB2011
 
     # Set the efficiency values
     unless thermal_eff.nil?
-      htg_stages.each do |stage|
+      htg_stages.sort.each do |stage|
         stage.setGasBurnerEfficiency(thermal_eff)
       end
     end
@@ -1459,6 +1461,15 @@ class NECB2011
     return true
   end
 
+  # Determine and set type of part load control type for heating and chilled
+  # water variable speed pumps
+  #
+  # @param pump [OpenStudio::Model::PumpVariableSpeed] OpenStudio pump object
+  # @return [Boolean] Returns true if applicable, false otherwise
+  def pump_variable_speed_control_type(pump)
+    return false
+  end
+
   # Sets the fan pressure rise based on the Prototype buildings inputs
   # which are governed by the flow rate coming through the fan
   # and whether the fan lives inside a unit heater, PTAC, etc.
@@ -2042,5 +2053,136 @@ class NECB2011
     return clg_availability_sch, htg_availability_sch
   end
 
+  # Method to set the base system name based on the following syntax:
+  # |sys_abbr|sys_oa|sh>?|sc>?|ssf>?|zh>?|zc>?|srf>?|
+  # "sys_abbr" designates the NECB system type ("sys_1, sys_2, ... sys_6")
+  # "sys_oa": "mixed" or "doas"
+  # "sys_name_pars" is a hash for the remaining system name parts for heat recovery,
+  # heating, cooling, supply fan, zone heating, zone cooling, and return fan
+  def assign_base_sys_name(airloop,sys_abbr:,sys_oa:,sys_name_pars:)
+    sys_name = "#{sys_abbr}|#{sys_oa}|"
+
+    sys_name_pars.each do |key,value|
+      case key.downcase
+      when "sys_hr"
+        case value.downcase
+        when "none"
+          sys_name += "shr>none"
+        end
+
+      when "sys_htg"
+        case value.downcase
+        when "none"
+          sys_name += "sh>none"
+        when "electric"
+          sys_name += "sh>c-e"
+        when "hot water"
+          sys_name += "sh>c-hw"
+        when "gas"
+          sys_name += "sh>c-g"
+        when "dx"
+          sys_name += "sh>ashp"
+        end
+
+      when "sys_clg"
+        case value.downcase
+        when "none"
+          sys_name += "sc>none"
+        when "chilled water"
+          sys_name += "sc>c-chw"
+        when "dx"
+          sys_name += "sc>dx"
+          sys_name += "sc>ashp" if sys_name_pars["sys_htg"] == "dx"
+        end
+
+      when "sys_sf"
+        case value.downcase
+        when "none"
+          sys_name += "ssf>none"
+        when "cv"
+          sys_name += "ssf>cv"
+        when "vv"
+          sys_name += "ssf>vv"
+        end
+
+      when "zone_htg"
+        case value.downcase
+        when "none"
+          sys_name += "zh>none"
+        when "electric"
+          sys_name += "zh>b-e"
+        when "hot water"
+          sys_name += "zh>b-hw"
+        when "tpfc"
+          sys_name += "zh>fpfc"
+        when "fpfc"
+          sys_name += "zh>tpfc"
+        end
+
+      when "zone_clg"
+        case value.downcase
+        when "none"
+          sys_name += "zc>none"
+        when "tpfc"
+          sys_name += "zc>tpfc"
+        when "fpfc"
+          sys_name += "zc>fpfc"
+        when "ptac"
+          sys_name += "zc>ptac"
+        end
+
+      when "sys_rf"
+        case value.downcase
+        when "none"
+          sys_name += "srf>none"
+        when "cv"
+          sys_name += "srf>cv"
+        when "vv"
+          sys_name += "srf>vv"
+        end
+      end
+      sys_name += "|"
+    end
+
+    airloop.setName(sys_name)
+  end
+
+  # Method to update the base system name based on the inputs provided.
+  # Only the parts of the name with string inputs are updated
+  def update_sys_name(airloop,
+                      sys_abbr: nil,
+                      sys_oa: nil,
+                      sys_hr: nil,
+                      sys_htg: nil,
+                      sys_clg: nil,
+                      sys_sf: nil,
+                      zone_htg: nil,
+                      zone_clg: nil,
+                      sys_rf: nil)
+    name_parts = airloop.name.to_s.split("|").select {|part| !part.empty?}
+    if sys_abbr.is_a? String then name_parts[0] = sys_abbr end
+    if sys_oa.is_a? String then name_parts[1] = sys_oa end
+    for i in 0..name_parts.size-1
+      if (name_parts[i].include? "shr>") && (sys_hr.is_a? String)
+        name_parts[i] = "shr>#{sys_hr}"
+      elsif (name_parts[i].include? "sh>") && (sys_htg.is_a? String)
+        name_parts[i] = "sh>#{sys_htg}"
+      elsif (name_parts[i].include? "sc>") && (sys_clg.is_a? String)
+        name_parts[i] = "sc>#{sys_clg}"
+      elsif (name_parts[i].include? "ssf") && (sys_sf.is_a? String)
+        name_parts[i] = "ssf>#{sys_sf}"
+      elsif (name_parts[i].include? "zh>") && (zone_htg.is_a? String)
+        name_parts[i] = "zh>#{zone_htg}"
+      elsif (name_parts[i].include? "zc>") && (zone_clg.is_a? String)
+        name_parts[i] = "zc>#{zone_clg}"
+      elsif (name_parts[i].include? "srf>") && (sys_rf.is_a? String)
+        name_parts[i] = "srf>#{sys_rf}"
+      end
+    end
+    sys_name = ""
+    name_parts.each {|part| sys_name += "#{part}|"}
+    sys_name = sys_name.chop if (Integer(name_parts.last.strip) rescue false)
 
+    airloop.setName(sys_name)
+  end
 end

data/lib/openstudio-standards/standards/necb/NECB2011/lighting.rb

@@ -1,9 +1,27 @@
 class NECB2011
 
   def apply_standard_lights(set_lights: true,
-                            space_type:, space_type_properties:,
-                            lights_type: 'NECB_Default',
-                            lights_scale: 1.0)
+                            space_type:,
+                            space_type_properties:,
+                            lights_type:,
+                            lights_scale:)
+
+    ##### Remove leading or trailing whitespace in case users add them in inputs
+    if lights_scale.instance_of?(String)
+      lights_scale = lights_scale.strip
+    end
+
+    if lights_type.nil? || lights_type == 'none'
+      lights_type = 'NECB_Default'
+    end
+    if lights_scale.nil? || lights_scale == 'none' || lights_scale == 'NECB_Default'
+      lights_scale = 1.0
+    end
+
+    ##### Convert a string to a float
+    if lights_scale.instance_of?(String)
+      lights_scale = lights_scale.to_f
+    end
 
     lights_have_info = false
     lighting_per_area = space_type_properties['lighting_per_area'].to_f

data/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb

@@ -8,6 +8,19 @@ class NECB2011 < Standard
   attr_accessor :space_type_map
   attr_accessor :space_multiplier_map
 
+  # This is a helper method to convert arguments that may support 'NECB_Default, and nils to convert to float'
+  def convert_arg_to_f(variable:,default:)
+    if variable.instance_of?(Numeric)
+      return variable
+    elsif variable.nil? or variable == 'NECB_Default'
+      return default
+    elsif variable.instance_of?(String)
+      variable = variable.strip
+      return variable.to_f
+    end
+  end
+
+
   def get_standards_table(table_name:)
     if @standards_data["tables"][table_name].nil?
       message = "Could not find table #{table_name} in database."
@@ -163,7 +176,7 @@ class NECB2011 < Standard
   end
 
 
-  # This method is a wrapper to create the 16 archetypes easily.
+  # This method is a wrapper to create the 16 archetypes easily. # 37 args
   def model_create_prototype_model(template:,
                                    building_type:,
                                    epw_file:,
@@ -177,6 +190,7 @@ class NECB2011 < Standard
                                    ecm_system_name: 'NECB_Default',
                                    erv_package: 'NECB_Default',
                                    boiler_eff: nil,
+                                   unitary_cop: nil,
                                    furnace_eff: nil,
                                    shw_eff: nil,
                                    ext_wall_cond: nil,
@@ -193,11 +207,24 @@ class NECB2011 < Standard
                                    glass_door_solar_trans: nil,
                                    fixed_wind_solar_trans: nil,
                                    skylight_solar_trans: nil,
+                                   rotation_degrees: nil,
                                    fdwr_set: -1.0,
-                                   srr_set: -1.0
-
+                                   srr_set: -1.0,
+                                   nv_type: nil,
+                                   nv_opening_fraction: nil,
+                                   nv_Tout_min: nil,
+                                   nv_Delta_Tin_Tout: nil,
+                                   scale_x: nil,
+                                   scale_y: nil,
+                                   scale_z: nil,
+                                   pv_ground_type: nil,
+                                   pv_ground_total_area_pv_panels_m2: nil,
+                                   pv_ground_tilt_angle: nil,
+                                   pv_ground_azimuth_angle: nil,
+                                   pv_ground_module_description: nil
   )
 
+
     model = load_building_type_from_library(building_type: building_type)
     return model_apply_standard(model: model,
                                 epw_file: epw_file,
@@ -210,6 +237,7 @@ class NECB2011 < Standard
                                 ecm_system_name: ecm_system_name,
                                 erv_package: erv_package,
                                 boiler_eff: boiler_eff,
+                                unitary_cop: unitary_cop,
                                 furnace_eff: furnace_eff,
                                 shw_eff: shw_eff,
                                 ext_wall_cond: ext_wall_cond,
@@ -226,10 +254,23 @@ class NECB2011 < Standard
                                 glass_door_solar_trans: glass_door_solar_trans,
                                 fixed_wind_solar_trans: fixed_wind_solar_trans,
                                 skylight_solar_trans: skylight_solar_trans,
+                                rotation_degrees: rotation_degrees,
                                 fdwr_set: fdwr_set,
-                                srr_set: srr_set
-
+                                srr_set: srr_set,
+                                nv_type: 'NECB_Default', # Two options: (1) nil/none/false/'NECB_Default', (2) true
+                                nv_opening_fraction: nv_opening_fraction, #options: (1) nil/none/false (2) 'NECB_Default' (i.e. 0.1)
+                                nv_Tout_min: nv_Tout_min, #options: (1) nil/none/false(2) 'NECB_Default' (i.e. 13.0 based on inputs from Michel Tardif re a real school in QC)
+                                nv_Delta_Tin_Tout: nv_Delta_Tin_Tout, #options: (1) nil/none/false (2) 'NECB_Default' (i.e. 1.0 based on inputs from Michel Tardif re a real school in QC)
+                                scale_x: scale_x,
+                                scale_y: scale_y,
+                                scale_z: scale_z,
+                                pv_ground_type: 'NECB_Default',  # Two options: (1) nil/none/false/'NECB_Default', (2) true
+                                pv_ground_total_area_pv_panels_m2: pv_ground_total_area_pv_panels_m2, # Options: (1) nil/none/false, (2) 'NECB_Default' (i.e. building footprint), (3) area value (e.g. 50)
+                                pv_ground_tilt_angle: pv_ground_tilt_angle, # Options: (1) nil/none/false, (2) 'NECB_Default' (i.e. latitude), (3) tilt angle value (e.g. 20)
+                                pv_ground_azimuth_angle: pv_ground_azimuth_angle, # Options: (1) nil/none/false, (2) 'NECB_Default' (i.e. south), (3) azimuth angle value (e.g. 90)
+                                pv_ground_module_description: pv_ground_module_description # Options: (1) nil/none/false, (2) 'NECB_Default' (i.e. Standard), (3) other options ('Standard', 'Premium', ThinFilm')
     )
+
   end
 
   def load_building_type_from_library(building_type:)
@@ -248,12 +289,13 @@ class NECB2011 < Standard
                            primary_heating_fuel: 'DefaultFuel',
                            dcv_type: 'NECB_Default',
                            lights_type: 'NECB_Default',
-                           lights_scale: 1.0,
+                           lights_scale: 'NECB_Default',
                            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,
@@ -269,22 +311,49 @@ class NECB2011 < Standard
                            glass_door_solar_trans: nil,
                            fixed_wind_solar_trans: nil,
                            skylight_solar_trans: nil,
-                           fdwr_set: -1,
-                           srr_set: -1,
+                           fdwr_set: nil,
+                           srr_set: nil,
                            rotation_degrees: nil,
                            scale_x: nil,
                            scale_y: nil,
-                           scale_z: nil
+                           scale_z: nil,
+                           nv_type: nil,
+                           nv_opening_fraction: nil,
+                           nv_Tout_min: nil,
+                           nv_Delta_Tin_Tout: nil,
+                           pv_ground_type: nil,
+                           pv_ground_total_area_pv_panels_m2: nil ,
+                           pv_ground_tilt_angle: nil,
+                           pv_ground_azimuth_angle: nil,
+                           pv_ground_module_description: nil
   )
-
-    BTAP::Geometry::rotate_building(model: model,degrees: rotation_degrees) unless rotation_degrees.nil?
-    unless scale_x.nil? && scale_y.nil? && scale_z.nil?
-      scale_x = 1 if scale_x.nil?
-      scale_y = 1 if scale_y.nil?
-      scale_z = 1 if scale_y.nil?
-      BTAP::Geometry::scale_model(model, scale_x, scale_y, scale_z)
+    #clean model..
+    model = remove_all_HVAC(model)
+    model.getThermalZones.sort.each {|zone| zone.setUseIdealAirLoads(true)}
+    model.getZoneHVACPackagedTerminalAirConditioners.each(&:remove)
+    model.getCoilCoolingDXSingleSpeeds.each(&:remove)
+    model.getZoneHVACBaseboardConvectiveWaters.each(&:remove)
+    model.getAirLoopHVACZoneMixers.each(&:remove)
+    model.getAirLoopHVACZoneSplitters.each(&:remove)
+    model.getAirTerminalSingleDuctConstantVolumeNoReheats.each(&:remove)
+    model.getWaterUseEquipmentDefinitions.each(&:remove)
+    model.getWaterUseEquipments.each(&:remove)
+    model.getWaterUseConnectionss.each(&:remove)
+
+    rotation_degrees = convert_arg_to_f(variable: rotation_degrees,default: 0.0)
+    BTAP::Geometry::rotate_building(model: model,degrees: rotation_degrees) unless rotation_degrees == 0.0
+    scale_x = convert_arg_to_f(variable: scale_x,default: 1.0)
+    scale_y = convert_arg_to_f(variable: scale_y,default: 1.0)
+    scale_z = convert_arg_to_f(variable: scale_z,default: 1.0)
+    if scale_x != 1.0 || scale_y != 1.0 || scale_z != 1.0
+      BTAP::Geometry::scale_model(model, scale_x, scale_x, scale_x)
     end
 
+
+    fdwr_set = convert_arg_to_f(variable: fdwr_set,default: -1)
+    srr_set = convert_arg_to_f(variable: srr_set,default: -1)
+
+
     apply_weather_data(model: model, epw_file: epw_file)
     apply_loads(model: model, lights_type: lights_type, lights_scale: lights_scale)
     apply_envelope(model: model,
@@ -316,10 +385,21 @@ class NECB2011 < Standard
                                    ecm_system_name: ecm_system_name,
                                    erv_package: erv_package,
                                    boiler_eff: boiler_eff,
+                                   unitary_cop: unitary_cop,
                                    furnace_eff: furnace_eff,
                                    shw_eff: shw_eff,
-                                   daylighting_type: daylighting_type
+                                   daylighting_type: daylighting_type,
+                                   nv_type: nv_type,
+                                   nv_opening_fraction: nv_opening_fraction,
+                                   nv_Tout_min: nv_Tout_min,
+                                   nv_Delta_Tin_Tout: nv_Delta_Tin_Tout,
+                                   pv_ground_type: pv_ground_type,
+                                   pv_ground_total_area_pv_panels_m2: pv_ground_total_area_pv_panels_m2,
+                                   pv_ground_tilt_angle: pv_ground_tilt_angle,
+                                   pv_ground_azimuth_angle: pv_ground_azimuth_angle,
+                                   pv_ground_module_description: pv_ground_module_description
     )
+
     return model
   end
 
@@ -332,8 +412,20 @@ class NECB2011 < Standard
                                      erv_package: 'NECB_Default',
                                      boiler_eff: nil,
                                      furnace_eff: nil,
+                                     unitary_cop: nil,
                                      shw_eff: nil,
-                                     daylighting_type: 'NECB_Default')
+                                     daylighting_type: 'NECB_Default',
+                                     nv_type: nil,
+                                     nv_opening_fraction: nil,
+                                     nv_Tout_min: nil,
+                                     nv_Delta_Tin_Tout:nil,
+                                     pv_ground_type:,
+                                     pv_ground_total_area_pv_panels_m2:,
+                                     pv_ground_tilt_angle:,
+                                     pv_ground_azimuth_angle:,
+                                     pv_ground_module_description:
+  )
+
     # Create ECM object.
     ecm = ECMS.new
 
@@ -343,7 +435,7 @@ class NECB2011 < Standard
     apply_systems(model: model, primary_heating_fuel: primary_heating_fuel, sizing_run_dir: sizing_run_dir)
 
     # Apply new ECM system. Overwrite standard as required.
-    ecm.apply_system_ecm(model: model, ecm_system_name: ecm_system_name, template_standard: self)
+    ecm.apply_system_ecm(model: model, ecm_system_name: ecm_system_name, template_standard: self, primary_heating_fuel: primary_heating_fuel)
 
     # Apply ERV equipment as required.
     ecm.apply_erv_ecm(model: model, erv_package: erv_package)
@@ -352,7 +444,7 @@ class NECB2011 < Standard
     # -------- Performace, Efficiencies, Controls and Sensors ------------
     #
     # Set code standard equipment charecteristics.
-    apply_standard_efficiencies(model: model, sizing_run_dir: sizing_run_dir)
+    sql_db_vars_map = apply_standard_efficiencies(model: model, sizing_run_dir: sizing_run_dir)
     # Apply System
     ecm.apply_system_efficiencies_ecm(model: model, ecm_system_name: ecm_system_name)
 
@@ -364,6 +456,8 @@ class NECB2011 < Standard
     ecm.modify_boiler_efficiency(model: model, boiler_eff: boiler_eff)
     # Apply Furnace Efficiency
     ecm.modify_furnace_efficiency(model: model, furnace_eff: furnace_eff)
+    # Apply Unitary efficiency
+    ecm.modify_unitary_cop(model: model,unitary_cop: unitary_cop,sql_db_vars_map: sql_db_vars_map)
     # Apply SHW Efficiency
     ecm.modify_shw_efficiency(model: model, shw_eff: shw_eff)
     # Apply daylight controls.
@@ -373,10 +467,29 @@ class NECB2011 < Standard
     # -------Pump sizing required by some vintages----------------
     # Apply Pump power as required.
     apply_loop_pump_power(model: model, sizing_run_dir: sizing_run_dir)
+
+    # -------Natural ventilation----------------
+    # Apply natural ventilation using simplified method.
+    ecm.apply_nv(model: model,
+                 nv_type: nv_type,
+                 nv_opening_fraction: nv_opening_fraction,
+                 nv_Tout_min: nv_Tout_min,
+                 nv_Delta_Tin_Tout: nv_Delta_Tin_Tout)
+
+    # -------Ground-mounted PV panels----------------   #Sara
+    # Apply ground-mounted PV panels as required.
+    ecm.apply_pv_ground(model: model,
+                        pv_ground_type: pv_ground_type,
+                        pv_ground_total_area_pv_panels_m2: pv_ground_total_area_pv_panels_m2,
+                        pv_ground_tilt_angle: pv_ground_tilt_angle,
+                        pv_ground_azimuth_angle: pv_ground_azimuth_angle,
+                        pv_ground_module_description: pv_ground_module_description)
+
   end
 
 
   def apply_loads(model:, lights_type: 'NECB_Default', lights_scale: 1.0, validate: true)
+    lights_scale = convert_arg_to_f(variable: lights_scale,default: 1.0)
     if validate
       raise('validation of model failed.') unless validate_initial_model(model)
       raise('validation of spacetypes failed.') unless validate_and_upate_space_types(model)
@@ -448,6 +561,10 @@ class NECB2011 < Standard
   #     # <-3.1:  Remove all the windows/skylights
   #     # > 1:  Do nothing
   def apply_fdwr_srr_daylighting(model:, fdwr_set: -1.0, srr_set: -1.0)
+    fdwr_set = -1.0 if fdwr_set == 'NECB_default' or fdwr_set.nil?
+    srr_set = -1.0 if srr_set == 'NECB_default' or srr_set.nil?
+    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.
@@ -462,8 +579,57 @@ class NECB2011 < Standard
     # Apply the prototype HVAC assumptions
     model_apply_prototype_hvac_assumptions(model, nil, climate_zone)
     # Apply the HVAC efficiency standard
-    model_apply_hvac_efficiency_standard(model, climate_zone)
+    sql_db_vars_map = {}
+    model_apply_hvac_efficiency_standard(model, climate_zone, sql_db_vars_map: sql_db_vars_map)
     model_enable_demand_controlled_ventilation(model, dcv_type)
+    return sql_db_vars_map
+  end
+
+  # Shut off the system during unoccupied periods.
+  # During these times, systems will cycle on briefly
+  # if temperature drifts below setpoint.  For systems
+  # with fan-powered terminals, the whole system
+  # (not just the terminal fans) will cycle on.
+  # Terminal-only night cycling is not used because the terminals cannot
+  # provide cooling, so terminal-only night cycling leads to excessive
+  # unmet cooling hours during unoccupied periods.
+  # If the system already has a schedule other than
+  # Always-On, no change will be made.  If the system has
+  # an Always-On schedule assigned, a new schedule will be created.
+  # In this case, occupied is defined as the total percent
+  # occupancy for the loop for all zones served.
+  #
+  # @param min_occ_pct [Double] the fractional value below which
+  # the system will be considered unoccupied.
+  # @return [Bool] true if successful, false if not
+  def air_loop_hvac_enable_unoccupied_fan_shutoff(air_loop_hvac, min_occ_pct = 0.05)
+    # Set the system to night cycle
+    air_loop_hvac.setNightCycleControlType('CycleOnAny')
+
+    # Check if already using a schedule other than always on
+    avail_sch = air_loop_hvac.availabilitySchedule
+    unless avail_sch == air_loop_hvac.model.alwaysOnDiscreteSchedule
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{air_loop_hvac.name}: Availability schedule is already set to #{avail_sch.name}.  Will assume this includes unoccupied shut down; no changes will be made.")
+      return true
+    end
+
+    # Get the airloop occupancy schedule
+    loop_occ_sch = air_loop_hvac_get_occupancy_schedule(air_loop_hvac, occupied_percentage_threshold: min_occ_pct)
+    flh = schedule_ruleset_annual_equivalent_full_load_hrs(loop_occ_sch)
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{air_loop_hvac.name}: Annual occupied hours = #{flh.round} hr/yr, assuming a #{min_occ_pct} occupancy threshold.  This schedule will be used as the HVAC operation schedule.")
+
+    # Set HVAC availability schedule to follow occupancy
+    air_loop_hvac.setAvailabilitySchedule(loop_occ_sch)
+    air_loop_hvac.supplyComponents('OS:AirLoopHVAC:UnitaryHeatPump:AirToAir:MultiSpeed'.to_IddObjectType).each do |comp|
+      comp.to_AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed.get.setAvailabilitySchedule(loop_occ_sch)
+    end
+
+    return true
+  end
+
+  # do not apply zone hvac ventilation control
+  def zone_hvac_component_occupancy_ventilation_control(zone_hvac_component)
+    return false
   end
 
   def apply_loop_pump_power(model:, sizing_run_dir:)