openstudio-standards 0.2.15 → 0.2.16.rc1

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

@@ -32,8 +32,10 @@ class NECB2011
     system_data[:MinimumSystemAirFlowRatio] = 1.0
 
     # System 2 Zone data
-    system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
-    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference] = 11.0
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference] = 21.0
     system_data[:ZoneCoolingSizingFactor] = 1.1
     system_data[:ZoneHeatingSizingFactor] = 1.3
 
@@ -117,10 +119,12 @@ class NECB2011
 
     # Set up zonal FC (ZoneHVAC,cooling coil, heating coil, fan) in each zone
     zones.each do |zone|
-      # Zone sizing temperature
+      # Zone sizing temperature difference
       sizing_zone = zone.sizingZone
-      sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-      sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+      sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+      sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+      sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+      sizing_zone.setZoneHeatingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
       sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
       sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
 

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

@@ -29,8 +29,10 @@ class NECB2011
     system_data[:CentralHeatingDesignSupplyAirHumidityRatio] = 0.0080
 
     # System 3 Zone data
-    system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
-    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference] = 11.0
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference] = 21.0
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMin] = 13.0
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMax] = 43.0
     system_data[:ZoneDXCoolingSizingFactor] = 1.0
@@ -48,10 +50,12 @@ class NECB2011
                                                         system_data,
                                                         determine_control_zone(zones))
       # Add Zone equipment
-      zones.each do |zone| # Zone sizing temperature
+      zones.each do |zone| # Zone sizing temperature difference
         sizing_zone = zone.sizingZone
-        sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-        sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+        sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+        sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+        sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+        sizing_zone.setZoneHeatingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
         sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
         sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
         add_sys3_and_8_zone_equip(air_loop,
@@ -90,10 +94,12 @@ class NECB2011
     air_loop = common_air_loop(model: model, system_data: system_data)
     air_loop.setName("#{system_data[:name]} #{control_zone.name}")
 
-    # Zone sizing temperature
+    # Zone sizing temperature difference
     sizing_zone = control_zone.sizingZone
-    sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-    sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+    sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+    sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+    sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+    sizing_zone.setZoneHeatingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
     sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
     sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
 

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

@@ -54,8 +54,10 @@ class NECB2011
     system_data[:CentralHeatingDesignSupplyAirHumidityRatio] = 0.0080
 
     # System 3 Zone data
-    system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
-    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference] = 11.0
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference] = 21.0
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMin] = 13.0
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMax] = 43.0
     system_data[:ZoneDXCoolingSizingFactor] = 1.0
@@ -73,10 +75,12 @@ class NECB2011
                                             system_data,
                                             determine_control_zone(zones))
       # Add Zone equipment
-      zones.each do |zone| # Zone sizing temperature
+      zones.each do |zone| # Zone sizing temperature difference
         sizing_zone = zone.sizingZone
-        sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-        sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+        sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+        sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+        sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+        sizing_zone.setZoneHeatingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
         sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
         sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
         add_sys3_and_8_zone_equip(air_loop,
@@ -126,10 +130,12 @@ class NECB2011
     air_loop = common_air_loop(model: model, system_data: system_data)
     air_loop.setName("#{system_data[:name]} #{control_zone.name}")
 
-    # Zone sizing temperature
+    # Zone sizing temperature difference
     sizing_zone = control_zone.sizingZone
-    sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-    sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+    sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+    sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+    sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+    sizing_zone.setZoneHeatingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
     sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
     sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
 

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

@@ -29,7 +29,10 @@ class NECB2011
     # zone
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMax] = 43.0
     system_data[:SetpointManagerSingleZoneReheatSupplyTempMin] = 13.0
-    system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference] = 11.0
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference] = 21.0
     system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
     system_data[:ZoneCoolingSizingFactor] = 1.1
     system_data[:ZoneHeatingSizingFactor] = 1.3
@@ -62,10 +65,12 @@ class NECB2011
     air_loop = common_air_loop(model: model, system_data: system_data)
     air_loop.setName("#{system_data[:name]}_#{control_zone.name}")
 
-    # Zone sizing temperature
+    # Zone sizing temperature difference
     sizing_zone = control_zone.sizingZone
-    sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-    sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+    sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+    sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+    sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+    sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
     sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
     sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
 
@@ -130,8 +135,10 @@ class NECB2011
     #              heat_exchanger.addToNode(oa_node.get)
     zones.each do |zone|
       sizing_zone = zone.sizingZone
-      sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-      sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+      sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+      sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+      sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+      sizing_zone.setZoneHeatingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
       sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
       sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
       # Create a diffuser and attach the zone/diffuser pair to the air loop

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

@@ -33,8 +33,10 @@ class NECB2011
 
     # zone data
     system_data[:system_supply_air_temperature] = 13.0
-    system_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
-    system_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference] = 11.0
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference] = 21.0
     system_data[:ZoneCoolingSizingFactor] = 1.1
     system_data[:ZoneHeatingSizingFactor] = 1.3
     system_data[:ZoneVAVMinFlowFactorPerFloorArea] = 0.002
@@ -110,8 +112,10 @@ class NECB2011
         (BTAP::Geometry::BuildingStoreys.get_zones_from_storey(story) & zones).each do |zone|
           # Zone sizing parameters
           sizing_zone = zone.sizingZone
-          sizing_zone.setZoneCoolingDesignSupplyAirTemperature(system_data[:ZoneCoolingDesignSupplyAirTemperature])
-          sizing_zone.setZoneHeatingDesignSupplyAirTemperature(system_data[:ZoneHeatingDesignSupplyAirTemperature])
+          sizing_zone.setZoneCoolingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod])
+          sizing_zone.setZoneCoolingDesignSupplyAirTemperatureDifference(system_data[:ZoneCoolingDesignSupplyAirTemperatureDifference])
+          sizing_zone.setZoneHeatingDesignSupplyAirTemperatureInputMethod(system_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod])
+          sizing_zone.setZoneHeatingDesignSupplyAirTemperatureDifference(system_data[:ZoneHeatingDesignSupplyAirTemperatureDifference])
           sizing_zone.setZoneCoolingSizingFactor(system_data[:ZoneCoolingSizingFactor])
           sizing_zone.setZoneHeatingSizingFactor(system_data[:ZoneHeatingSizingFactor])
 
@@ -185,8 +189,10 @@ class NECB2011
     system_6_data[:MinimumSystemAirFlowRatio] = 0.03
     # zone data
     system_6_data[:system_supply_air_temperature] = 13.0
-    system_6_data[:ZoneCoolingDesignSupplyAirTemperature] = 13.0
-    system_6_data[:ZoneHeatingDesignSupplyAirTemperature] = 43.0
+    system_6_data[:ZoneCoolingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_6_data[:ZoneCoolingDesignSupplyAirTemperatureDifference] = 11.0
+    system_6_data[:ZoneHeatingDesignSupplyAirTemperatureInputMethod] = 'TemperatureDifference'
+    system_6_data[:ZoneHeatingDesignSupplyAirTemperatureDifference] = 21.0
     system_6_data[:ZoneCoolingSizingFactor] = 1.1
     system_6_data[:ZoneHeatingSizingFactor] = 1.3
     system_6_data[:ZoneVAVMinFlowFactorPerFloorArea] = 0.002

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

@@ -1643,8 +1643,10 @@ class NECB2011
     sizing_plant.setDesignLoopExitTemperature(7.0)
     sizing_plant.setLoopDesignTemperatureDifference(6.0)
 
-    # pump = OpenStudio::Model::PumpConstantSpeed.new(model)
-    chw_pump = OpenStudio::Model::PumpConstantSpeed.new(model)
+    # Note: pump of 'chilled water loop' has been changed to the variable one as the constant one caused fatal errors for LargeOffice-Yellowknife-NaturalGas for some ECMs and inputs.
+    # Fatal error was: 'CheckForRunawayPlantTemps: Simulation terminated because of run away plant temperatures, too cold' OR '..., too hot' for the PlantLoop of 'Chilled Water Loop'.
+    # Note that the variable speed pump has been already used for 'Hot Water Loop'.
+    chw_pump = OpenStudio::Model::PumpVariableSpeed.new(model)
 
     chiller1 = OpenStudio::Model::ChillerElectricEIR.new(model)
     chiller2 = OpenStudio::Model::ChillerElectricEIR.new(model)

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

@@ -171,7 +171,7 @@ class NECB2011 < Standard
     end
   end
 
-  # This method is a wrapper to create the 16 archetypes easily. # 37 args
+  # This method is a wrapper to create the 16 archetypes easily. # 55 args
   def model_create_prototype_model(template:,
                                    building_type:,
                                    epw_file:,
@@ -183,6 +183,7 @@ class NECB2011 < Standard
                                    lights_scale: 1.0,
                                    daylighting_type: 'NECB_Default',
                                    ecm_system_name: 'NECB_Default',
+                                   ecm_system_zones_map_option: 'NECB_Default',
                                    erv_package: 'NECB_Default',
                                    boiler_eff: nil,
                                    unitary_cop: nil,
@@ -223,8 +224,10 @@ class NECB2011 < Standard
                                    oa_scale: nil,
                                    infiltration_scale: nil,
                                    output_variables: nil,
+                                   shw_scale: nil,
                                    output_meters: nil,
-                                   airloop_economizer_type: nil)
+                                   airloop_economizer_type: nil,
+                                   baseline_system_zones_map_option: nil)
 
     model = load_building_type_from_library(building_type: building_type)
     return model_apply_standard(model: model,
@@ -236,6 +239,7 @@ class NECB2011 < Standard
                                 lights_scale: lights_scale,
                                 daylighting_type: daylighting_type, # Two options: (1) 'NECB_Default', (2) 'add_daylighting_controls'
                                 ecm_system_name: ecm_system_name,
+                                ecm_system_zones_map_option: ecm_system_zones_map_option, # (1) 'NECB_Default' (2) 'one_sys_per_floor' (3) 'one_sys_per_bldg'
                                 erv_package: erv_package,
                                 boiler_eff: boiler_eff,
                                 unitary_cop: unitary_cop,
@@ -259,9 +263,9 @@ class NECB2011 < Standard
                                 fdwr_set: fdwr_set,
                                 srr_set: srr_set,
                                 nv_type: nv_type, # Two options: (1) nil/none/false/'NECB_Default', (2) 'add_nv'
-                                nv_opening_fraction: nv_opening_fraction, # options: (1) nil/none/false (2) 'NECB_Default' (i.e. 0.1)
-                                nv_temp_out_min: nv_temp_out_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_temp_in_out: nv_delta_temp_in_out, # options: (1) nil/none/false (2) 'NECB_Default' (i.e. 1.0 based on inputs from Michel Tardif re a real school in QC)
+                                nv_opening_fraction: nv_opening_fraction, # options: (1) nil/none/false (2) 'NECB_Default' (i.e. 0.1), (3) opening fraction of windows, which can be a float number between 0.0 and 1.0
+                                nv_temp_out_min: nv_temp_out_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), (3) minimum outdoor air temperature (in Celsius) below which natural ventilation is shut down
+                                nv_delta_temp_in_out: nv_delta_temp_in_out, # options: (1) nil/none/false (2) 'NECB_Default' (i.e. 1.0 based on inputs from Michel Tardif re a real school in QC), (3) temperature difference (in Celsius) between the indoor and outdoor air temperatures below which ventilation is shut down
                                 scale_x: scale_x,
                                 scale_y: scale_y,
                                 scale_z: scale_z,
@@ -276,8 +280,11 @@ class NECB2011 < Standard
                                 infiltration_scale: infiltration_scale,
                                 chiller_type: chiller_type, # Options: (1) 'NECB_Default'/nil/'none'/false (i.e. do nothing), (2) e.g. 'VSD'
                                 output_variables: output_variables,
+                                shw_scale: shw_scale,  # Options: (1) 'NECB_Default'/nil/'none'/false (i.e. do nothing), (2) a float number larger than 0.0
                                 output_meters: output_meters,
-                                airloop_economizer_type: airloop_economizer_type) # (1) 'NECB_Default'/nil/' (2) 'DifferentialEnthalpy' (3) 'DifferentialTemperature'
+                                airloop_economizer_type: airloop_economizer_type, # (1) 'NECB_Default'/nil/' (2) 'DifferentialEnthalpy' (3) 'DifferentialTemperature'
+                                baseline_system_zones_map_option: baseline_system_zones_map_option  # Three options: (1) 'NECB_Default'/'none'/nil (i.e. 'one_sys_per_bldg'), (2) 'one_sys_per_dwelling_unit', (3) 'one_sys_per_bldg'
+                                )
 
   end
 
@@ -302,6 +309,7 @@ class NECB2011 < Standard
                            lights_scale: 'NECB_Default',
                            daylighting_type: 'NECB_Default',
                            ecm_system_name: 'NECB_Default',
+                           ecm_system_zones_map_option: 'NECB_Default',
                            erv_package: 'NECB_Default',
                            boiler_eff: nil,
                            furnace_eff: nil,
@@ -342,8 +350,10 @@ class NECB2011 < Standard
                            oa_scale: nil,
                            infiltration_scale: nil,
                            output_variables: nil,
+                           shw_scale: nil,
                            output_meters: nil,
-                           airloop_economizer_type: nil)
+                           airloop_economizer_type: nil,
+                           baseline_system_zones_map_option: nil)
 
     clean_and_scale_model(model: model, rotation_degrees: rotation_degrees, scale_x: scale_x, scale_y: scale_y, scale_z: scale_z)
     fdwr_set = convert_arg_to_f(variable: fdwr_set, default: -1)
@@ -384,6 +394,7 @@ class NECB2011 < Standard
                                    sizing_run_dir: sizing_run_dir,
                                    dcv_type: dcv_type,
                                    ecm_system_name: ecm_system_name,
+                                   ecm_system_zones_map_option: ecm_system_zones_map_option,
                                    erv_package: erv_package,
                                    boiler_eff: boiler_eff,
                                    unitary_cop: unitary_cop,
@@ -400,7 +411,9 @@ class NECB2011 < Standard
                                    pv_ground_azimuth_angle: pv_ground_azimuth_angle,
                                    pv_ground_module_description: pv_ground_module_description,
                                    chiller_type: chiller_type,
-                                   airloop_economizer_type: airloop_economizer_type)
+                                   shw_scale: shw_scale,
+                                   airloop_economizer_type: airloop_economizer_type,
+                                   baseline_system_zones_map_option: baseline_system_zones_map_option)
     self.set_output_variables(model: model, output_variables: output_variables)
     self.set_output_meters(model: model, output_meters: output_meters)
 
@@ -453,6 +466,7 @@ class NECB2011 < Standard
                                      sizing_run_dir:,
                                      dcv_type: 'NECB_Default',
                                      ecm_system_name: 'NECB_Default',
+                                     ecm_system_zones_map_option: 'NECB_Default',
                                      erv_package: 'NECB_Default',
                                      boiler_eff: nil,
                                      furnace_eff: nil,
@@ -469,7 +483,9 @@ class NECB2011 < Standard
                                      pv_ground_azimuth_angle:,
                                      pv_ground_module_description:,
                                      chiller_type: 'NECB_Default',
-                                     airloop_economizer_type: nil)
+                                     shw_scale:,
+                                     airloop_economizer_type: nil,
+                                     baseline_system_zones_map_option:)
 
     # Create ECM object.
     ecm = ECMS.new
@@ -477,10 +493,12 @@ class NECB2011 < Standard
     # -------- Systems Layout-----------
 
     # Create Default Systems.
-    apply_systems(model: model, primary_heating_fuel: primary_heating_fuel, sizing_run_dir: sizing_run_dir)
+    apply_systems(model: model, primary_heating_fuel: primary_heating_fuel, sizing_run_dir: sizing_run_dir, shw_scale: shw_scale,
+                  baseline_system_zones_map_option: baseline_system_zones_map_option)
 
     # Apply new ECM system. Overwrite standard as required.
-    ecm.apply_system_ecm(model: model, ecm_system_name: ecm_system_name, template_standard: self, primary_heating_fuel: primary_heating_fuel)
+    ecm.apply_system_ecm(model: model, ecm_system_name: ecm_system_name, template_standard: self, primary_heating_fuel: primary_heating_fuel, 
+                         ecm_system_zones_map_option: ecm_system_zones_map_option)
 
     # Apply ERV equipment as required.
     ecm.apply_erv_ecm(model: model, erv_package: erv_package)
@@ -525,14 +543,15 @@ class NECB2011 < Standard
 
     # -------Ground-mounted PV panels----------------
     # Apply ground-mounted PV panels as required.
-    return unless pv_ground_type == 'add_pv_ground'
-
-    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)
+    if pv_ground_type == 'add_pv_ground'
+      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
+
   end
 
   def apply_loads(model:,

data/lib/openstudio-standards/standards/necb/NECB2011/qaqc/necb_qaqc.rb

@@ -215,8 +215,8 @@ class NECB2011
                                                                        " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Electricity' AND RowName='Electricity:Facility'" \
                                                                        " AND ColumnName='Electricity Maximum Value' AND Units='W'")
     natural_gas_peak = model.sqlFile.get.execAndReturnFirstDouble("SELECT Value FROM tabulardatawithstrings WHERE ReportName='EnergyMeters'" \
-                                                                          " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Gas' AND RowName='Gas:Facility'" \
-                                                                          " AND ColumnName='Gas Maximum Value' AND Units='W'")
+                                                                          " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Natural Gas' AND RowName='NaturalGas:Facility'" \
+                                                                          " AND ColumnName='Natural Gas Maximum Value' AND Units='W'")
 
     get_sql_tables_to_json(model)
 

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

@@ -1,5 +1,5 @@
 class NECB2011
-  def model_add_swh(model:, swh_fueltype: 'DefaultFuel')
+  def model_add_swh(model:, swh_fueltype: 'DefaultFuel', shw_scale:)
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started Adding Service Water Heating')
     # Get default fuel based on epw location province.
     if swh_fueltype == 'DefaultFuel'
@@ -8,7 +8,7 @@ class NECB2011
     end
 
     # Calculate the tank size and service water pump information
-    shw_sizing = auto_size_shw_capacity(model)
+    shw_sizing = auto_size_shw_capacity(model: model, shw_scale: shw_scale)
     if shw_sizing['loop_peak_flow_rate_SI'] == 0
       # Only add a shw_loop if at least one space calls for shw.  If no space calls for shw put out a warning but do not
       # add a shw loop.
@@ -228,7 +228,7 @@ class NECB2011
 
   # This calculates the volume and capacity of one mixed tank that is assumed to service all shw in the building
   # u is the tank insulation in W/(m^2*K), height_to_radius is the ratio of tank radius to tank height and is dimensionless
-  def auto_size_shw_capacity(model, u: 0.45, height_to_radius: 2)
+  def auto_size_shw_capacity(model:, u: 0.45, height_to_radius: 2, shw_scale: 'NECB_Default')
     peak_flow_rate = 0
     shw_space_types = []
     space_peak_flows = []
@@ -247,6 +247,17 @@ class NECB2011
     total_peak_flow_rate = 0
     shw_spaces = []
     shw_sched_names = []
+
+    ##### Modify shw_scale if required
+    if shw_scale.instance_of?(String)
+      shw_scale = shw_scale.strip # remove leading or trailing whitespace in case users add them in shw_scale
+    end
+    if shw_scale == 'NECB_Default' or shw_scale.nil? or shw_scale == 'none' or shw_scale == false
+      shw_scale = 1.0
+    elsif shw_scale.instance_of?(String) # Convert a string to a float
+      shw_scale = shw_scale.to_f
+    end
+
     # First go through all the spaces in the building and determine and determine their shw requirements
     space_types_table = @standards_data['space_types']
     model.getSpaces.sort.each do |space|
@@ -278,7 +289,7 @@ class NECB2011
       # when defining water use equipment.  When when water use equipment is assigned to spaces then the water use
       # by the equipment is multiplied by the space multiplier.  Note that there is a separate water use equipment
       # multiplier as well which is different than the space (ultimately thermal zone) multiplier.
-      space_peak_flow_ind = data['service_water_heating_peak_flow_per_area'].to_f * space_area
+      space_peak_flow_ind = data['service_water_heating_peak_flow_per_area'].to_f * space_area * shw_scale
       space_peak_flow = space_peak_flow_ind * space.multiplier
       #      space_peak_flows << space_peak_flow
       # Add the peak shw flow rate for the space to the total for the entire building