openstudio-standards 0.2.14 → 0.2.15.pre.rc1

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

@@ -1,5 +1,4 @@
 class NECB2011
-
   # At this point the only way to implement multi-stage cooling and heating in OS is through the use
   # of object "AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed". This component uses as an argument a control
   # zone and then it responds to a call for heating or cooling for that control zone. This aspect of this
@@ -14,7 +13,7 @@ class NECB2011
                                                         hw_loop:)
 
     # Keep all data and assumptions for both systems on the top here for easy reference.
-    system_data = Hash.new
+    system_data = {}
     system_data[:name] = 'Sys_1_Make-up air unit'
     system_data[:PreheatDesignTemperature] = 7.0
     system_data[:PreheatDesignHumidityRatio] = 0.008
@@ -35,10 +34,10 @@ class NECB2011
     system_data[:TypeofLoadtoSizeOn] = 'VentilationRequirement'
     system_data[:MinimumSystemAirFlowRatio] = 1.0
     system_data[:MinimumOutdoorDryBulbTemperatureforCompressorOperation] = -10.0
-    #Zone data
+    # Zone data
     system_data[:system_supply_air_temperature] = 20.0
     system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
-    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0 #Examine to see if this is a code or assumption. 13.1 maybe need to check
+    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0 # Examine to see if this is a code or assumption. 13.1 maybe need to check
     system_data[:ZoneCoolingSizingFactor] = 1.1
     system_data[:ZoneHeatingSizingFactor] = 1.3
 
@@ -107,6 +106,10 @@ class NECB2011
       oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)
       oa_controller.autosizeMinimumOutdoorAirFlowRate
 
+      # Set mechanical ventilation controller outdoor air to ZoneSum (used to be defaulted to ZoneSum but now should be
+      # set explicitly)
+      oa_controller.controllerMechanicalVentilation.setSystemOutdoorAirMethod('ZoneSum')
+
       # oa_system
       oa_system = OpenStudio::Model::AirLoopHVACOutdoorAirSystem.new(model, oa_controller)
 
@@ -123,9 +126,8 @@ class NECB2011
       sat_sch.defaultDaySchedule.addValue(OpenStudio::Time.new(0, 24, 0, 0), system_data[:system_supply_air_temperature])
       setpoint_mgr = OpenStudio::Model::SetpointManagerScheduled.new(model, sat_sch)
       setpoint_mgr.addToNode(mau_air_loop.supplyOutletNode)
-
-    end # Create MAU
-
+      # Create MAU
+    end
 
     zones.each do |zone|
       # Zone sizing temperature
@@ -138,7 +140,7 @@ class NECB2011
       # Set up PTAC heating coil; apply always off schedule
 
       # htg_coil_elec = OpenStudio::Model::CoilHeatingElectric.new(model,always_on)
-      zero_outdoor_air = true  # flag to set outside air flow to zero
+      zero_outdoor_air = true # flag to set outside air flow to zero
       add_ptac_dx_cooling(model, zone, zero_outdoor_air)
 
       # add zone baseboards
@@ -149,10 +151,10 @@ class NECB2011
 
         diffuser = OpenStudio::Model::AirTerminalSingleDuctUncontrolled.new(model, always_on)
         mau_air_loop.addBranchForZone(zone, diffuser.to_StraightComponent)
-
-      end # components for MAU
-    end # of zone loop
-
+        # components for MAU
+      end
+      # of zone loop
+    end
     return true
   end
-end
+end

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

@@ -1,5 +1,4 @@
 class NECB2011
-
   def add_sys1_unitary_ac_baseboard_heating(model:,
                                             zones:,
                                             mau_type:,
@@ -25,14 +24,14 @@ class NECB2011
   end
 
   def add_sys1_unitary_ac_baseboard_heating_single_speed(model:,
-                                            zones:,
-                                            mau_type:,
-                                            mau_heating_coil_type:,
-                                            baseboard_type:,
-                                            hw_loop:)
+                                                         zones:,
+                                                         mau_type:,
+                                                         mau_heating_coil_type:,
+                                                         baseboard_type:,
+                                                         hw_loop:)
 
     # Keep all data and assumptions for both systems on the top here for easy reference.
-    system_data = Hash.new
+    system_data = {}
     system_data[:name] = 'Sys_1_Make-up air unit'
     system_data[:PreheatDesignTemperature] = 7.0
     system_data[:PreheatDesignHumidityRatio] = 0.008
@@ -52,14 +51,13 @@ class NECB2011
     system_data[:AllOutdoorAirinHeating] = true
     system_data[:TypeofLoadtoSizeOn] = 'VentilationRequirement'
     system_data[:MinimumSystemAirFlowRatio] = 1.0
-    #Zone data
+    # Zone data
     system_data[:system_supply_air_temperature] = 20.0
     system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
-    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0 #Examine to see if this is a code or assumption. 13.1 maybe need to check
+    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0 # Examine to see if this is a code or assumption. 13.1 maybe need to check
     system_data[:ZoneCoolingSizingFactor] = 1.1
     system_data[:ZoneHeatingSizingFactor] = 1.3
 
-
     # System Type 1: PTAC with no heating (unitary AC)
     # Zone baseboards, electric or hot water depending on argument baseboard_type
     # baseboard_type choices are "Hot Water" or "Electric"
@@ -80,15 +78,13 @@ class NECB2011
     always_on = model.alwaysOnDiscreteSchedule
     always_off = BTAP::Resources::Schedules::StandardSchedules::ON_OFF.always_off(model)
 
-
     # 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)
-      #MAU Heating type selection.
+      # MAU Heating type selection.
       if mau_heating_coil_type == 'Electric' # electric coil
         mau_htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model, always_on)
       end
@@ -99,12 +95,17 @@ class NECB2011
       end
 
       # Set up Single Speed DX coil with
-      mau_clg_coil = self.add_onespeed_DX_coil(model, always_on)
-      mau_clg_coil.setName("CoilCoolingDXSingleSpeed_dx")
+      mau_clg_coil = add_onespeed_DX_coil(model, always_on)
+      mau_clg_coil.setName('CoilCoolingDXSingleSpeed_dx')
 
       # Set up OA system
       oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)
       oa_controller.autosizeMinimumOutdoorAirFlowRate
+
+      # Set mechanical ventilation controller outdoor air to ZoneSum (used to be defaulted to ZoneSum but now should be
+      # set explicitly)
+      oa_controller.controllerMechanicalVentilation.setSystemOutdoorAirMethod('ZoneSum')
+
       oa_system = OpenStudio::Model::AirLoopHVACOutdoorAirSystem.new(model, oa_controller)
 
       # Add the components to the air loop
@@ -144,7 +145,7 @@ class NECB2011
       # TO DO: PTAC characteristics: sizing, fan schedules, temperature setpoints, interaction with MAU
 
       # htg_coil_elec = OpenStudio::Model::CoilHeatingElectric.new(model,always_on)
-      zero_outdoor_air = true  # flag to set outside air flow to 0.0
+      zero_outdoor_air = true # flag to set outside air flow to 0.0
       add_ptac_dx_cooling(model, zone, zero_outdoor_air)
 
       # add zone baseboards
@@ -157,23 +158,25 @@ class NECB2011
       if mau_type == true
         diffuser = OpenStudio::Model::AirTerminalSingleDuctUncontrolled.new(model, always_on)
         mau_air_loop.addBranchForZone(zone, diffuser.to_StraightComponent)
-      end # components for MAU
-    end # of zone loop
+        # components for MAU
+      end
+      # of zone loop
+    end
     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"
+      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)
+                           sys_abbr: 'sys_1',
+                           sys_oa: 'doas',
+                           sys_name_pars: sys_name_pars)
     end
 
     return true
   end
-end
+end

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

@@ -1,6 +1,4 @@
 class NECB2011
-
-
   def add_sys2_FPFC_sys5_TPFC(model:,
                               zones:,
                               chiller_type:,
@@ -8,8 +6,8 @@ class NECB2011
                               mau_cooling_type:,
                               hw_loop:)
 
-    #System 2 AHU data
-    system_data = Hash.new
+    # System 2 AHU data
+    system_data = {}
     system_data[:name] = 'Sys_2_Make-up air unit'
     system_data[:PreheatDesignTemperature] = 7.0
     system_data[:PreheatDesignHumidityRatio] = 0.008
@@ -33,14 +31,12 @@ class NECB2011
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMin] = 13.1
     system_data[:MinimumSystemAirFlowRatio] = 1.0
 
-    #System 2 Zone data
+    # System 2 Zone data
     system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
     system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
     system_data[:ZoneCoolingSizingFactor] = 1.1
     system_data[:ZoneHeatingSizingFactor] = 1.3
 
-
-
     # System Type 2: FPFC or System 5: TPFC
     # This measure creates:
     # -a four pipe or a two pipe fan coil unit for each zone in the building;
@@ -52,7 +48,7 @@ class NECB2011
     #   mua_cooling_type: make-up air unit cooling type "DX";"Hydronic"
     #   fan_coil_type options are "TPFC" or "FPFC"
 
-    # TODO: Add arguments as needed when the sizing routine is finalized. For example we will need to know the
+    # @todo Add arguments as needed when the sizing routine is finalized. For example we will need to know the
     # required size of the boilers to decide on how many units are needed based on NECB rules.
 
     always_on = model.alwaysOnDiscreteSchedule
@@ -62,11 +58,11 @@ class NECB2011
 
     # Create a chilled water loop
     chw_loop = OpenStudio::Model::PlantLoop.new(model)
-    chiller1, chiller2 = self.setup_chw_loop_with_components(model, chw_loop, chiller_type)
+    chiller1, chiller2 = setup_chw_loop_with_components(model, chw_loop, chiller_type)
 
     # Create a condenser Loop
     cw_loop = OpenStudio::Model::PlantLoop.new(model)
-    ctower = self.setup_cw_loop_with_components(model, cw_loop, chiller1, chiller2)
+    ctower = setup_cw_loop_with_components(model, cw_loop, chiller1, chiller2)
 
     # Set up make-up air unit for ventilation
     # TO DO: Need to investigate characteristics of make-up air unit for NECB reference
@@ -75,8 +71,6 @@ class NECB2011
     air_loop = mau_air_loop = common_air_loop(model: model, system_data: system_data)
     air_loop.setName(system_data[:name])
 
-
-
     fan = OpenStudio::Model::FanConstantVolume.new(model, always_on)
 
     # Assume direct-fired gas heating coil for now; need to add logic
@@ -86,8 +80,8 @@ 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")
+      clg_coil = 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)
@@ -97,6 +91,10 @@ class NECB2011
     oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)
     oa_controller.autosizeMinimumOutdoorAirFlowRate
 
+    # Set mechanical ventilation controller outdoor air to ZoneSum (used to be defaulted to ZoneSum but now should be
+    # set explicitly)
+    oa_controller.controllerMechanicalVentilation.setSystemOutdoorAirMethod('ZoneSum')
+
     # oa_system = OpenStudio::Model::AirLoopHVACOutdoorAirSystem.new(model,oa_controller)
     oa_system = OpenStudio::Model::AirLoopHVACOutdoorAirSystem.new(model, oa_controller)
 
@@ -147,27 +145,28 @@ class NECB2011
       hw_loop.addDemandBranchForComponent(fc_htg_coil)
       chw_loop.addDemandBranchForComponent(fc_clg_coil)
 
-      #add connections to FPFC.
+      # add connections to FPFC.
       zone_fc = OpenStudio::Model::ZoneHVACFourPipeFanCoil.new(model, always_on, fc_fan, fc_clg_coil, fc_htg_coil)
       zone_fc.addToThermalZone(zone)
 
       # Create a diffuser and attach the zone/diffuser pair to the air loop (make-up air unit)
       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"
+      # zone loop
+    end
+    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"
+    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_oa: 'doas',
                          sys_name_pars: sys_name_pars)
   end
 end

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

@@ -1,14 +1,12 @@
 class NECB2011
-
   # Some tests still require a simple way to set up a system without sizing.. so we are keeping the auto_zoner flag for this  method.
-
   def add_sys3and8_single_zone_packaged_rooftop_unit_with_baseboard_heating_multi_speed(model:,
                                                                                         zones:,
                                                                                         heating_coil_type:,
                                                                                         baseboard_type:,
                                                                                         hw_loop:,
                                                                                         new_auto_zoner: true)
-    system_data = Hash.new
+    system_data = {}
     system_data[:name] = 'Sys_3_PSZ'
     system_data[:CentralCoolingDesignSupplyAirTemperature] = 13.0
     system_data[:CentralHeatingDesignSupplyAirTemperature] = 43.0
@@ -30,7 +28,7 @@ class NECB2011
     system_data[:CentralCoolingDesignSupplyAirHumidityRatio] = 0.0085
     system_data[:CentralHeatingDesignSupplyAirHumidityRatio] = 0.0080
 
-    #System 3 Zone data
+    # System 3 Zone data
     system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
     system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMin] = 13.0
@@ -46,9 +44,9 @@ class NECB2011
 
       # Add Air Loop
       air_loop = add_system_3_and_8_airloop_multi_speed(heating_coil_type,
-                                            model,
-                                            system_data,
-                                            determine_control_zone(zones))
+                                                        model,
+                                                        system_data,
+                                                        determine_control_zone(zones))
       # Add Zone equipment
       zones.each do |zone| # Zone sizing temperature
         sizing_zone = zone.sizingZone
@@ -61,7 +59,6 @@ class NECB2011
                                   hw_loop,
                                   model,
                                   zone)
-
       end
       return true
     else
@@ -103,7 +100,7 @@ class NECB2011
     fan = OpenStudio::Model::FanConstantVolume.new(model, always_on)
 
     # Setup heating and cooling coils
-    if(heating_coil_type == 'Gas') || (heating_coil_type == 'Electric')
+    if (heating_coil_type == 'Gas') || (heating_coil_type == 'Electric')
       clg_coil = OpenStudio::Model::CoilCoolingDXMultiSpeed.new(model)
       clg_coil.setFuelType('Electricity')
       clg_stage_1 = OpenStudio::Model::CoilCoolingDXMultiSpeedStageData.new(model)
@@ -122,7 +119,7 @@ class NECB2011
         htg_stage_1.setNominalCapacity(0.001)
       end
     # Single stage DX and Electric heating
-    elsif(heating_coil_type == 'DX')
+    elsif heating_coil_type == 'DX'
       clg_coil = OpenStudio::Model::CoilCoolingDXSingleSpeed.new(model)
       clg_coil.setMinimumOutdoorDryBulbTemperatureforCompressorOperation(system_data[:MinimumOutdoorDryBulbTemperatureforCompressorOperation])
       htg_coil = OpenStudio::Model::CoilHeatingDXSingleSpeed.new(model)
@@ -135,6 +132,10 @@ class NECB2011
     oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)
     oa_controller.autosizeMinimumOutdoorAirFlowRate
 
+    # Set mechanical ventilation controller outdoor air to ZoneSum (used to be defaulted to ZoneSum but now should be
+    # set explicitly)
+    oa_controller.controllerMechanicalVentilation.setSystemOutdoorAirMethod('ZoneSum')
+
     # oa_system
     oa_system = OpenStudio::Model::AirLoopHVACOutdoorAirSystem.new(model, oa_controller)
 
@@ -142,13 +143,13 @@ class NECB2011
     # in order from closest to zone to furthest from zone
     supply_inlet_node = air_loop.supplyInletNode
 
-    if(heating_coil_type == "Gas") || (heating_coil_type == "Electric")
+    if (heating_coil_type == 'Gas') || (heating_coil_type == 'Electric')
       air_to_air_heatpump = OpenStudio::Model::AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed.new(model, fan, htg_coil, clg_coil, supplemental_htg_coil)
       air_to_air_heatpump.setControllingZoneorThermostatLocation(control_zone)
       air_to_air_heatpump.setNumberofSpeedsforHeating(1)
       air_to_air_heatpump.setNumberofSpeedsforCooling(2)
       air_to_air_heatpump.setMinimumOutdoorDryBulbTemperatureforCompressorOperation(system_data[:MinimumOutdoorDryBulbTemperatureforCompressorOperation])
-    elsif(heating_coil_type == 'DX')
+    elsif heating_coil_type == 'DX'
       air_to_air_heatpump = OpenStudio::Model::AirLoopHVACUnitaryHeatPumpAirToAir.new(model, always_on, fan, htg_coil, clg_coil, supplemental_htg_coil)
       air_to_air_heatpump.setControllingZone(zone)
     end
@@ -168,5 +169,4 @@ class NECB2011
 
     return air_loop
   end
-
-end
+end

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

@@ -1,5 +1,4 @@
 class NECB2011
-
   def add_sys3and8_single_zone_packaged_rooftop_unit_with_baseboard_heating(model:,
                                                                             zones:,
                                                                             heating_coil_type:,
@@ -9,18 +8,18 @@ class NECB2011
                                                                             multispeed: false)
     if multispeed
       add_sys3and8_single_zone_packaged_rooftop_unit_with_baseboard_heating_multi_speed(model: model,
-                                                                                         zones: zones,
-                                                                                         heating_coil_type: heating_coil_type,
-                                                                                         baseboard_type: baseboard_type,
-                                                                                         hw_loop: hw_loop,
-                                                                                         new_auto_zoner: new_auto_zoner)
-    else
-      add_sys3and8_single_zone_packaged_rooftop_unit_with_baseboard_heating_single_speed(model: model,
                                                                                         zones: zones,
                                                                                         heating_coil_type: heating_coil_type,
                                                                                         baseboard_type: baseboard_type,
                                                                                         hw_loop: hw_loop,
                                                                                         new_auto_zoner: new_auto_zoner)
+    else
+      add_sys3and8_single_zone_packaged_rooftop_unit_with_baseboard_heating_single_speed(model: model,
+                                                                                         zones: zones,
+                                                                                         heating_coil_type: heating_coil_type,
+                                                                                         baseboard_type: baseboard_type,
+                                                                                         hw_loop: hw_loop,
+                                                                                         new_auto_zoner: new_auto_zoner)
     end
   end
 
@@ -32,9 +31,7 @@ class NECB2011
                                                                                          baseboard_type:,
                                                                                          hw_loop:,
                                                                                          new_auto_zoner: true)
-
-
-    system_data = Hash.new
+    system_data = {}
     system_data[:name] = 'Sys_3_PSZ'
     system_data[:CentralCoolingDesignSupplyAirTemperature] = 13.0
     system_data[:CentralHeatingDesignSupplyAirTemperature] = 43.0
@@ -56,8 +53,7 @@ class NECB2011
     system_data[:CentralCoolingDesignSupplyAirHumidityRatio] = 0.0085
     system_data[:CentralHeatingDesignSupplyAirHumidityRatio] = 0.0080
 
-
-    #System 3 Zone data
+    # System 3 Zone data
     system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
     system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMin] = 13.0
@@ -68,7 +64,6 @@ class NECB2011
     system_data[:ZoneHeatingSizingFactor] = 1.3
     system_data[:MinimumOutdoorDryBulbTemperatureforCompressorOperation] = -10.0
 
-
     if new_auto_zoner == true
       # Create system airloop
 
@@ -89,7 +84,6 @@ class NECB2011
                                   hw_loop,
                                   model,
                                   zone)
-
       end
     else
       zones.each do |zone|
@@ -102,21 +96,20 @@ class NECB2011
       end
     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"
+    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_abbr: 'sys_3',
+                         sys_oa: 'mixed',
                          sys_name_pars: sys_name_pars)
     return true
   end
 
-
   def add_system_3_and_8_airloop(heating_coil_type, model, system_data, control_zone)
     # System Type 3: PSZ-AC
     # This measure creates:
@@ -129,7 +122,6 @@ class NECB2011
     # boiler_fueltype choices match OS choices for Boiler component fuel type, i.e.
     # "NaturalGas","Electricity","PropaneGas","FuelOilNo1","FuelOilNo2","Coal","Diesel","Gasoline","OtherFuel1"
 
-
     always_on = model.alwaysOnDiscreteSchedule
     air_loop = common_air_loop(model: model, system_data: system_data)
     air_loop.setName("#{system_data[:name]} #{control_zone.name}")
@@ -162,12 +154,16 @@ class NECB2011
 
     # Set up DX coil with NECB performance curve characteristics;
     clg_coil = OpenStudio::Model::CoilCoolingDXSingleSpeed.new(model)
-    clg_coil.setName("CoilCoolingDXSingleSpeed_dx")
+    clg_coil.setName('CoilCoolingDXSingleSpeed_dx')
 
     # oa_controller
     oa_controller = OpenStudio::Model::ControllerOutdoorAir.new(model)
     oa_controller.autosizeMinimumOutdoorAirFlowRate
 
+    # Set mechanical ventilation controller outdoor air to ZoneSum (used to be defaulted to ZoneSum but now should be
+    # set explicitly)
+    oa_controller.controllerMechanicalVentilation.setSystemOutdoorAirMethod('ZoneSum')
+
     # oa_system
     oa_system = OpenStudio::Model::AirLoopHVACOutdoorAirSystem.new(model, oa_controller)
 
@@ -206,5 +202,4 @@ class NECB2011
     air_loop.addBranchForZone(zone, diffuser.to_StraightComponent)
     add_zone_baseboards(baseboard_type: baseboard_type, hw_loop: hw_loop, model: model, zone: zone)
   end
-
-end
+end