openstudio-standards 0.6.3 → 0.7.0.rc1

data/lib/openstudio-standards/standards/deer/deer_pre_1975/data/deer_pre_1975.motors.json

@@ -246,7 +246,17 @@
       "type": "Enclosed",
       "synchronous_speed": 3600.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.941,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 2.0,
+      "type": "Enclosed",
+      "synchronous_speed": 3600.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.941,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     },
@@ -496,7 +506,17 @@
       "type": "Open",
       "synchronous_speed": 3600.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.941,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 2.0,
+      "type": "Open",
+      "synchronous_speed": 3600.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.941,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     },
@@ -746,7 +766,17 @@
       "type": "Enclosed",
       "synchronous_speed": 1800.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.945,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 4.0,
+      "type": "Enclosed",
+      "synchronous_speed": 1800.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.945,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     },
@@ -996,7 +1026,17 @@
       "type": "Open",
       "synchronous_speed": 1800.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.945,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 4.0,
+      "type": "Open",
+      "synchronous_speed": 1800.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.945,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     },
@@ -1246,7 +1286,17 @@
       "type": "Enclosed",
       "synchronous_speed": 1200.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.941,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 6.0,
+      "type": "Enclosed",
+      "synchronous_speed": 1200.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.941,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     },
@@ -1496,7 +1546,17 @@
       "type": "Open",
       "synchronous_speed": 1200.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.941,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 6.0,
+      "type": "Open",
+      "synchronous_speed": 1200.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.941,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     },
@@ -1746,7 +1806,17 @@
       "type": "Enclosed",
       "synchronous_speed": 900.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.941,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 8.0,
+      "type": "Enclosed",
+      "synchronous_speed": 900.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.941,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     },
@@ -1996,7 +2066,17 @@
       "type": "Open",
       "synchronous_speed": 900.0,
       "minimum_capacity": 450.0,
-      "maximum_capacity": 500.0,
+      "maximum_capacity": 499.999,
+      "nominal_full_load_efficiency": 0.941,
+      "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
+    },
+    {
+      "template": "DEER Pre-1975",
+      "number_of_poles": 8.0,
+      "type": "Open",
+      "synchronous_speed": 900.0,
+      "minimum_capacity": 500.0,
+      "maximum_capacity": 9999.0,
       "nominal_full_load_efficiency": 0.941,
       "notes": "Mapped from 'Standard' eff from DEER (2017.08.30)"
     }

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

@@ -85,4 +85,21 @@ class BTAPPRE1980 < NECB2011
   def set_occ_sensor_spacetypes(model, space_type_map)
     return true
   end
+
+  # This method sets the primary heating fuel to either NaturalGas or Electricity if a HP fuel type is set.
+  def validate_primary_heating_fuel(primary_heating_fuel:)
+    return primary_heating_fuel unless primary_heating_fuel == 'NaturalGasHPGasBackup' || primary_heating_fuel == 'NaturalGasHPElecBackupMixed' || primary_heating_fuel == 'ElectricityHPElecBackup' || primary_heating_fuel == 'ElectricityHPGasBackupMixed'
+    case primary_heating_fuel
+    when "NaturalGasHPGasBackup"
+      primary_heating_fuel = 'NaturalGas'
+    when "NaturalGasHPElecBackupMixed"
+      primary_heating_fuel = 'NaturalGas'
+    when "ElectricityHPElecBackup"
+      primary_heating_fuel = 'Electricity'
+    when "ElectricityHPGasBackupMixed"
+      primary_heating_fuel = 'Electricity'
+    end
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.Standards.Model', "Attemted to apply an NECB HP primary_heating_fuel to a vintage building type.  Replacing the selected primary_heating_fuel with #{primary_heating_fuel}.")
+    return primary_heating_fuel
+  end
 end

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

@@ -29,7 +29,8 @@ class BTAPPRE1980
     chiller_electric_eir.setChillerFlowMode('LeavingSetpointModulated')
     chiller_electric_eir.setMinimumPartLoadRatio(0.25)
     chiller_electric_eir.setMinimumUnloadingRatio(0.25)
-
+  
+    chiller_capacity = capacity_w
     if (capacity_w / 1000.0) <= 700.0
       # As per MNECB if chiller capacity <= 700 kW the compressor should be reciprocating so change the type here in
       # the name, compressor_type and search_criteria which is where the compressor type is used.

data/lib/openstudio-standards/standards/necb/ECMS/ecms.rb

@@ -43,11 +43,12 @@ class ECMS < NECB2011
                        ecm_system_name: nil,
                        template_standard:,
                        runner: nil,
-                       primary_heating_fuel: nil,
-                       swh_fuel: nil,
                        ecm_system_zones_map_option: 'NECB_Default')
     # Do nothing if nil or other usual suspects.. covering all bases for now.
     return if ecm_system_name.nil? || ecm_system_name == 'none' || ecm_system_name == 'NECB_Default'
+    # Verify the heating fuel
+    primary_heating_fuel = template_standard.fuel_type_set.ecm_fueltype
+    raise("Heating fuel for ECM #{ecm_system_name} is neither Electricity nor NaturalGas") if ((primary_heating_fuel != 'Electricity') && (primary_heating_fuel != 'NaturalGas'))
     ecm_system_zones_map_option = 'NECB_Default' if ecm_system_zones_map_option.nil? || ecm_system_zones_map_option == 'none'
 
     ecm_std = Standard.build('ECMS')
@@ -69,8 +70,7 @@ class ECMS < NECB2011
                  system_zones_map: map_system_to_zones,
                  system_doas_flags: system_doas_flags,
                  ecm_system_zones_map_option: ecm_system_zones_map_option,
-                 standard: template_standard,
-                 heating_fuel: primary_heating_fuel)
+                 standard: template_standard)
   end
 
   def apply_system_efficiencies_ecm(model:, ecm_system_name: nil, template_standard:)

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

@@ -504,13 +504,15 @@ class ECMS
     system_zones_map:,
     system_doas_flags:,
     ecm_system_zones_map_option:,
-    heating_fuel:,
     standard:,
     air_sys_eqpt_type: 'ccashp')
 
-    # Create one hot-water loop for hot-water baseboards if primary heating fuel is gas
+    # Get the heating fuel type from the system fuels object defined by the standards object
+    heating_fuel = standard.fuel_type_set.ecm_fueltype
+
+    # Create one hot-water loop for hot-water baseboards if required
     hw_loop = nil
-    hw_loop = add_hotwater_loop(model: model) if heating_fuel == 'NaturalGas'
+    hw_loop = add_hotwater_loop(model: model, fuel_type_set: standard.fuel_type_set) if standard.fuel_type_set.baseboard_type == 'Hot Water'
 
     # Update system zones map if needed
     system_zones_map = update_system_zones_map_keys(system_zones_map,'sys_1')
@@ -523,20 +525,14 @@ class ECMS
     # Update system doas flags
     system_doas_flags = {}
     system_zones_map.keys.each { |sname| system_doas_flags[sname] = true }
-    # Set heating fuel
-    updated_heating_fuel = heating_fuel
-    if heating_fuel == 'DefaultFuel'
-      epw = OpenStudio::EpwFile.new(model.weatherFile.get.path.get)
-      updated_heating_fuel = standard.standards_data['regional_fuel_use'].detect { |fuel_sources| fuel_sources['state_province_regions'].include?(epw.stateProvinceRegion) }['fueltype_set']
-    end
-    raise("Heating fuel for ECM 'HS08_CCASHP_VRF' is neither Electricity nor NaturalGas") if ((updated_heating_fuel != 'Electricity') && (updated_heating_fuel != 'NaturalGas'))
+
     # use system zones map and generate new air system and zonal equipment
     system_zones_map.sort.each do |sys_name, zones|
       sys_info = air_sys_comps_assumptions(sys_name: sys_name,
                                            zones: zones,
                                            system_doas_flags: system_doas_flags)
       sys_supp_htg_eqpt_type = 'coil_electric'
-      sys_supp_htg_eqpt_type = 'coil_gas' if updated_heating_fuel == 'NaturalGas'
+      sys_supp_htg_eqpt_type = 'coil_gas' if heating_fuel == 'NaturalGas'
       airloop,clg_dx_coil,htg_dx_coil,return_fan = add_air_system(model: model,
                                            zones: zones,
                                            sys_abbr: sys_info['sys_abbr'],
@@ -573,8 +569,8 @@ class ECMS
                     zone_fan_type: 'On_Off',
                     hw_loop: hw_loop)
       # add electric or hot-water baseboards for backup; Type of baseboard follows the primary heating fuel used in the building model.
-      zone_htg_eqpt_type = 'baseboard_hotwater' if heating_fuel == 'NaturalGas'
-      zone_htg_eqpt_type = 'baseboard_electric' if heating_fuel == 'Electricity'
+      zone_htg_eqpt_type = 'baseboard_hotwater' if standard.fuel_type_set.baseboard_type == 'Hot Water'
+      zone_htg_eqpt_type = 'baseboard_electric' if standard.fuel_type_set.baseboard_type == 'Electric'
 
       add_zone_eqpt(model: model,
                     airloop: airloop,
@@ -1223,23 +1219,18 @@ class ECMS
                                     system_zones_map:,    # hash of ailoop names as keys and array of zones as values
                                     system_doas_flags:,   # hash of system names as keys and flag for DOAS as values
                                     ecm_system_zones_map_option:,
-                                    heating_fuel:,
                                     standard:)
 
-    # Create one hot-water loop for hot-water baseboards if primary heating fuel is gas
+    # Get the heating fuel type from the system fuels object defined by the standards object
+    heating_fuel = standard.fuel_type_set.ecm_fueltype
+
+    # Create one hot-water loop for hot-water baseboards if required
     hw_loop = nil
-    hw_loop = add_hotwater_loop(model: model) if heating_fuel == 'NaturalGas'
+    hw_loop = add_hotwater_loop(model: model, fuel_type_set: standard.fuel_type_set) if standard.fuel_type_set.baseboard_type == 'Hot Water'
 
-    # Set heating fuel
-    updated_heating_fuel = heating_fuel
-    if heating_fuel == 'DefaultFuel'
-      epw = OpenStudio::EpwFile.new(model.weatherFile.get.path.get)
-      updated_heating_fuel = standard.standards_data['regional_fuel_use'].detect { |fuel_sources| fuel_sources['state_province_regions'].include?(epw.stateProvinceRegion)}['fueltype_set']
-    end
-    raise("Heating fuel for ECM 'HS09_CCASHP_Baseboard' is neither Electricity nor NaturalGas") if ((updated_heating_fuel != 'Electricity') && (updated_heating_fuel != 'NaturalGas'))
     # Set supplemental heating for air loop
     sys_supp_htg_eqpt_type = 'coil_electric'
-    sys_supp_htg_eqpt_type = 'coil_gas' if updated_heating_fuel == 'NaturalGas'
+    sys_supp_htg_eqpt_type = 'coil_gas' if heating_fuel == 'NaturalGas'
     systems = []
     system_zones_map.sort.each do |sys_name, zones|
       sys_info = air_sys_comps_assumptions(sys_name: sys_name,
@@ -1269,8 +1260,8 @@ class ECMS
         zone_clg_eqpt_type = 'ptac_electric_off'
         zone_fan_type = 'on_off'
       else
-        zone_htg_eqpt_type = 'baseboard_electric' if updated_heating_fuel == 'Electricity'
-        zone_htg_eqpt_type = 'baseboard_hotwater' if updated_heating_fuel == 'NaturalGas'
+        zone_htg_eqpt_type = 'baseboard_electric' if standard.fuel_type_set.baseboard_type == 'Electric'
+        zone_htg_eqpt_type = 'baseboard_hotwater' if standard.fuel_type_set.baseboard_type == 'Hot Water'
         zone_clg_eqpt_type = 'none'
         zone_fan_type = 'none'
       end
@@ -1286,8 +1277,8 @@ class ECMS
                     hw_loop: hw_loop)
       # for doas use baseboard electric or hotwater as backup for PTAC units
       if sys_info['sys_vent_type'] == 'doas'
-        zone_htg_eqpt_type = 'baseboard_electric' if updated_heating_fuel == 'Electricity'
-        zone_htg_eqpt_type = 'baseboard_hotwater' if updated_heating_fuel == 'NaturalGas'
+        zone_htg_eqpt_type = 'baseboard_electric' if standard.fuel_type_set.baseboard_type == 'Electric'
+        zone_htg_eqpt_type = 'baseboard_hotwater' if standard.fuel_type_set.baseboard_type == 'Hot Water'
         add_zone_eqpt(model: model,
                       airloop: airloop,
                       zones: zones,
@@ -1400,20 +1391,14 @@ class ECMS
                              system_zones_map:,
                              system_doas_flags:,
                              ecm_system_zones_map_option:,
-                             standard:,
-                             heating_fuel:)
+                             standard:)
     hw_loop = nil
 
-    # Set heating fuel
-    updated_heating_fuel = heating_fuel
-    if heating_fuel == 'DefaultFuel'
-      epw = OpenStudio::EpwFile.new(model.weatherFile.get.path.get)
-      updated_heating_fuel = standard.standards_data['regional_fuel_use'].detect { |fuel_sources| fuel_sources['state_province_regions'].include?(epw.stateProvinceRegion)}['fueltype_set']
-    end
-    raise("Heating fuel for ECM 'HS11_ASHP_PTHP' is neither Electricity nor NaturalGas") if ((updated_heating_fuel != 'Electricity') && (updated_heating_fuel != 'NaturalGas'))
+    # Get the heating fuel type from the system fuels object defined by the standards object
+    heating_fuel = standard.fuel_type_set.ecm_fueltype
     # Set supplemental heaing for airloop
     sys_supp_htg_eqpt_type = 'coil_electric'
-    sys_supp_htg_eqpt_type = 'coil_gas' if updated_heating_fuel == 'NaturalGas'
+    sys_supp_htg_eqpt_type = 'coil_gas' if heating_fuel == 'NaturalGas'
     # Update system zones map if needed
     system_zones_map = update_system_zones_map_keys(system_zones_map,'sys_1')
     system_zones_map = update_system_zones_map(model,system_zones_map,ecm_system_zones_map_option,'sys_1') if ecm_system_zones_map_option != 'NECB_Default'
@@ -1552,23 +1537,18 @@ class ECMS
                                   system_zones_map:,
                                   system_doas_flags:,
                                   ecm_system_zones_map_option:,
-                                  standard:,
-                                  heating_fuel:)
+                                  standard:)
+
+    # Get the heating fuel type from the system fuels object defined by the standards object
+    heating_fuel = standard.fuel_type_set.ecm_fueltype
 
-    # Create one hot-water loop for hot-water baseboards if primary heating fuel is gas
+    # Create one hot-water loop for hot-water baseboards if required
     hw_loop = nil
-    hw_loop = add_hotwater_loop(model: model) if heating_fuel == 'NaturalGas'
+    hw_loop = add_hotwater_loop(model: model, fuel_type_set: standard.fuel_type_set) if standard.fuel_type_set.baseboard_type == 'Hot Water'
 
-    # Set heating fuel
-    updated_heating_fuel = heating_fuel
-    if heating_fuel == 'DefaultFuel'
-      epw = OpenStudio::EpwFile.new(model.weatherFile.get.path.get)
-      updated_heating_fuel = standard.standards_data['regional_fuel_use'].detect { |fuel_sources| fuel_sources['state_province_regions'].include?(epw.stateProvinceRegion)}['fueltype_set']
-    end
-    raise("Heating fuel for ECM 'HS12_ASHP_Baseboard' is neither Electricity nor NaturalGas") if ((updated_heating_fuel != 'Electricity') && (updated_heating_fuel != 'NaturalGas'))
     # Set supplemental heating fuel for airloop
     sys_supp_htg_eqpt_type = 'coil_electric'
-    sys_supp_htg_eqpt_type = 'coil_gas' if updated_heating_fuel == 'NaturalGas'
+    sys_supp_htg_eqpt_type = 'coil_gas' if heating_fuel == 'NaturalGas'
     systems = []
     system_zones_map.sort.each do |sys_name, zones|
       sys_info = air_sys_comps_assumptions(sys_name: sys_name,
@@ -1595,8 +1575,8 @@ class ECMS
         zone_clg_eqpt_type = 'ptac_electric_off'
         zone_fan_type = 'on_off'
       else
-        zone_htg_eqpt_type = 'baseboard_electric' if updated_heating_fuel == 'Electricity'
-        zone_htg_eqpt_type = 'baseboard_hotwater' if updated_heating_fuel == 'NaturalGas'
+        zone_htg_eqpt_type = 'baseboard_electric' if standard.fuel_type_set.baseboard_type == 'Electric'
+        zone_htg_eqpt_type = 'baseboard_hotwater' if standard.fuel_type_set.baseboard_type == 'Hot Water'
         zone_clg_eqpt_type = 'none'
         zone_fan_type = 'none'
       end
@@ -1612,8 +1592,8 @@ class ECMS
                     hw_loop: hw_loop)
       # for doas use baseboard electric or hotwater as backup for PTAC units
       if sys_info['sys_vent_type'] == 'doas'
-        zone_htg_eqpt_type = 'baseboard_electric' if updated_heating_fuel == 'Electricity'
-        zone_htg_eqpt_type = 'baseboard_hotwater' if updated_heating_fuel == 'NaturalGas'
+        zone_htg_eqpt_type = 'baseboard_electric' if standard.fuel_type_set.baseboard_type == 'Electric'
+        zone_htg_eqpt_type = 'baseboard_hotwater' if standard.fuel_type_set.baseboard_type == 'Hot Water'
         add_zone_eqpt(model: model,
                       airloop: airloop,
                       zones: zones,
@@ -1711,15 +1691,13 @@ class ECMS
                             system_zones_map:,
                             system_doas_flags:,
                             ecm_system_zones_map_option:,
-                            standard:,
-                            heating_fuel:)
+                            standard:)
     # call method for ECM hs08 with ASHP in the air system
     add_ecm_hs08_ccashp_vrf(model: model,
                             system_zones_map: system_zones_map,
                             system_doas_flags: system_doas_flags,
                             ecm_system_zones_map_option: ecm_system_zones_map_option,
                             standard: standard,
-                            heating_fuel: heating_fuel,
                             air_sys_eqpt_type: 'ashp')
   end
 
@@ -1740,18 +1718,14 @@ class ECMS
                                   system_zones_map:,
                                   system_doas_flags:,
                                   ecm_system_zones_map_option:,
-                                  standard:,
-                                  heating_fuel:)
+                                  standard:)
+
+    # Get the heating fuel type from the system fuels object defined by the standards object
+    heating_fuel = standard.fuel_type_set.ecm_fueltype
 
-    updated_heating_fuel = heating_fuel
-    if heating_fuel == 'DefaultFuel'
-      epw = OpenStudio::EpwFile.new(model.weatherFile.get.path.get)
-      updated_heating_fuel = standard.standards_data['regional_fuel_use'].detect { |fuel_sources| fuel_sources['state_province_regions'].include?(epw.stateProvinceRegion)}['fueltype_set']
-    end
-    raise("Heating fuel for ECM 'HS11_ASHP_PTHP' is neither Electricity nor NaturalGas") if ((updated_heating_fuel != 'Electricity') && (updated_heating_fuel != 'NaturalGas'))
     # Set supplemental heaing for airloop
     sys_supp_htg_eqpt_type = 'coil_electric'
-    sys_supp_htg_eqpt_type = 'coil_gas' if updated_heating_fuel == 'NaturalGas'
+    sys_supp_htg_eqpt_type = 'coil_gas' if heating_fuel == 'NaturalGas'
     # Update system zones map if needed
     system_zones_map = update_system_zones_map_keys(system_zones_map,'sys_1')
     system_zones_map = update_system_zones_map(model,system_zones_map,ecm_system_zones_map_option,'sys_1') if ecm_system_zones_map_option != 'NECB_Default'
@@ -1820,7 +1794,7 @@ class ECMS
       raise("Can not find curve hpowerf for #{hw_loop_htg_eqpt.name}")
     end
     boiler = OpenStudio::Model::BoilerHotWater.new(model)
-    boiler.setFuelType(updated_heating_fuel)
+    boiler.setFuelType(heating_fuel)
     hw_loop_htg_eqpt_outlet_node = hw_loop_htg_eqpt.supplyOutletModelObject.get.to_Node.get
     boiler.addToNode(hw_loop_htg_eqpt_outlet_node)
 
@@ -2759,8 +2733,8 @@ class ECMS
 
     # If specified as COP
     unless props['minimum_coefficient_of_performance_heating'].nil?
-      cop = props['minimum_coefficient_of_performance_heating']
-      cop = cop_heating_to_cop_heating_no_fan(min_eer)
+      cop_min = props['minimum_coefficient_of_performance_heating']
+      cop = cop_heating_to_cop_heating_no_fan(cop_min, capacity_w)
       new_comp_name = "#{coil_heating_dx_single_speed.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{cop}COP"
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.CoilHeatingDXSingleSpeed', "For #{template}: #{coil_heating_dx_single_speed.name}: Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; EER = #{min_eer}")
     end
@@ -2896,8 +2870,8 @@ class ECMS
 
     # If specified as COP
     unless props['minimum_coefficient_of_performance_heating'].nil?
-      cop = props['minimum_coefficient_of_performance_heating']
-      cop = cop_heating_to_cop_heating_no_fan(min_eer)
+      min_cop = props['minimum_coefficient_of_performance_heating']
+      cop = cop_heating_to_cop_heating_no_fan(min_cop, capacity_w)
       new_comp_name = "#{coil_heating_dx_variable_speed.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{cop}COP"
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.CoilHeatingDXVariableSpeed', "For #{template}: #{coil_heating_dx_variable_speed.name}: Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; EER = #{min_eer}")
     end
@@ -3025,8 +2999,8 @@ class ECMS
 
     # If specified as COP
     unless props['minimum_coefficient_of_performance_heating'].nil?
-      cop = props['minimum_coefficient_of_performance_heating']
-      cop = cop_heating_to_cop_heating_no_fan(min_eer)
+      min_cop = props['minimum_coefficient_of_performance_heating']
+      cop = cop_heating_to_cop_heating_no_fan(min_cop, capacity_w)
       new_comp_name = "#{airconditioner_variablerefrigerantflow.name} #{capacity_kbtu_per_hr.round}kBtu/hr #{cop}COP"
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirConditionerVariableRefrigerantFlow', "For #{template}: #{airconditioner_variablerefrigerantflow.name}: Capacity = #{capacity_kbtu_per_hr.round}kBtu/hr; EER = #{min_eer}")
     end
@@ -3171,6 +3145,10 @@ class ECMS
     raise 'You attempted to set the part load curve of boilers in this model to nil.  Please check the ECMS class boiler_set.json file and ensure that both the efficiency and part load curve are set.' if boiler_eff['part_load_curve'].nil?
 
     model.getBoilerHotWaters.sort.each do |mod_boiler|
+      if mod_boiler.fuelType.to_s.downcase == 'electricity'
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.BoilerHotWater', "The boiler #{mod_boiler.name.to_s} is electrically powered.  Only the efficiencies of fuel fired boilers are modified.  The efficiency of this boiler will not be changed.")
+        next
+      end
       reset_boiler_efficiency(model: model, component: mod_boiler.to_BoilerHotWater.get, eff: boiler_eff)
     end
   end
@@ -3526,28 +3504,21 @@ class ECMS
                                                   system_zones_map:,
                                                   system_doas_flags: nil,
                                                   ecm_system_zones_map_option:,
-                                                  standard:,
-                                                  heating_fuel:)
+                                                  standard:)
     # Set the primary fuel set to default to to specific fuel type.
     standards_info = standard.standards_data
 
-    if heating_fuel == 'DefaultFuel'
-      epw = OpenStudio::EpwFile.new(model.weatherFile.get.path.get)
-      heating_fuel = standards_info['regional_fuel_use'].detect { |fuel_sources| fuel_sources['state_province_regions'].include?(epw.stateProvinceRegion) }['fueltype_set']
-    end
-    # Get fuelset.
-    system_fuel_defaults = standards_info['fuel_type_sets'].detect { |fuel_type_set| fuel_type_set['name'] == heating_fuel }
-    raise("fuel_type_sets named #{heating_fuel} not found in fuel_type_sets table.") if system_fuel_defaults.nil?
-
     # Assign fuel sources.
-    boiler_fueltype = system_fuel_defaults['boiler_fueltype']
-    baseboard_type = system_fuel_defaults['baseboard_type']
+    boiler_fueltype = standard.fuel_type_set.boiler_fueltype
+    backup_boiler_fueltype = standard.fuel_type_set.backup_boiler_fueltype
+    baseboard_type = standard.fuel_type_set.baseboard_type
     mau_heating_coil_type = 'none'
 
     # Create the hot water loop if necessary.
     hw_loop = standard.create_hw_loop_if_required(
       baseboard_type,
       boiler_fueltype,
+      backup_boiler_fueltype,
       mau_heating_coil_type,
       model
     )
@@ -3705,15 +3676,17 @@ class ECMS
     end
   end
   # ============================================================================================================================
-  # Add one hot-water loop for hot-water baseboards if primary heating fuel is gas
-  def add_hotwater_loop(model:)
+  # Add one hot-water loop for hot-water baseboards if required
+  def add_hotwater_loop(model:, fuel_type_set:)
+    primary_boiler_fueltype = fuel_type_set.boiler_fueltype
+    backup_boiler_fueltype = fuel_type_set.backup_boiler_fueltype
     plant_loop_names = []
     model.getPlantLoops.sort.each do |plant_loop|
       plant_loop_names << plant_loop.name.to_s
     end
     unless plant_loop_names.include? 'Hot Water Loop'
       hw_loop = OpenStudio::Model::PlantLoop.new(model)
-      setup_hw_loop_with_components(model, hw_loop, 'NaturalGas', model.alwaysOnDiscreteSchedule)
+      setup_hw_loop_with_components(model, hw_loop, primary_boiler_fueltype, backup_boiler_fueltype, model.alwaysOnDiscreteSchedule)
     end
     return hw_loop
   end

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

@@ -122,6 +122,7 @@ class NECB2011
     model.getZoneHVACIdealLoadsAirSystems.each(&:remove)
     @hw_loop = create_hw_loop_if_required(self.fuel_type_set.baseboard_type,
                                           self.fuel_type_set.boiler_fueltype,
+                                          self.fuel_type_set.backup_boiler_fueltype,
                                           self.fuel_type_set.mau_heating_coil_type,
                                           model)
     # Rule that all dwelling units have their own zone and system.
@@ -824,7 +825,7 @@ class NECB2011
   ################################################# NECB Systems
 
   # Method will create a hot water loop if systems default fuel and medium sources require it.
-  def create_hw_loop_if_required(baseboard_type, boiler_fueltype, mau_heating_coil_type, model)
+  def create_hw_loop_if_required(baseboard_type, boiler_fueltype, backup_boiler_fueltype, mau_heating_coil_type, model)
     # get systems that will be used in the model based on the space types to determine if a hw_loop is required.
     systems_used = []
     model.getSpaces.sort.each do |space|
@@ -857,7 +858,7 @@ class NECB2011
     if hw_loop_needed
       @hw_loop = OpenStudio::Model::PlantLoop.new(model)
       always_on = model.alwaysOnDiscreteSchedule
-      setup_hw_loop_with_components(model, @hw_loop, boiler_fueltype, always_on)
+      setup_hw_loop_with_components(model, @hw_loop, boiler_fueltype, backup_boiler_fueltype, always_on)
     end
     return @hw_loop
   end

data/lib/openstudio-standards/standards/necb/NECB2011/data/boiler_fuel_type_sets.json

@@ -0,0 +1,54 @@
+{
+  "tables": {
+    "boiler_fuel_type_sets": {
+      "data_type": "table",
+      "notes": "This is a list of boiler fuel type combinations",
+      "refs": [
+        "Kamel.Haddad@nrcan-rncan.gc.ca",
+        "Phylroy.lopez@nrcan-rncan.gc.ca",
+        "Chris.Kirney@nrcan-rncan.gc.ca"      ],
+      "table": [
+        {
+          "name":"NaturalGas",
+          "boiler_fueltype": "NaturalGas",
+          "backup_boiler_fueltype": "NaturalGas",
+          "baseboard_type": "Hot Water",
+          "mau_heating_coil_type": "Hot Water",
+          "heating_coil_type_sys6": "Hot Water"
+        },
+        {
+          "name":"NaturalGasElecBackup",
+          "boiler_fueltype": "NaturalGas",
+          "backup_boiler_fueltype": "Electricity",
+          "baseboard_type": "Hot Water",
+          "mau_heating_coil_type": "Hot Water",
+          "heating_coil_type_sys6": "Hot Water"
+        },
+        {
+          "name":"Electricity",
+          "boiler_fueltype": "Electricity",
+          "backup_boiler_fueltype": "Electricity",
+          "baseboard_type": "Hot Water",
+          "mau_heating_coil_type": "Hot Water",
+          "heating_coil_type_sys6": "Hot Water"
+        },
+        {
+          "name":"ElectricityGasBackup",
+          "boiler_fueltype": "Electricity",
+          "backup_boiler_fueltype": "NaturalGas",
+          "baseboard_type": "Hot Water",
+          "mau_heating_coil_type": "Hot Water",
+          "heating_coil_type_sys6": "Hot Water"
+        },
+        {
+          "name":"FuelOilNo2",
+          "boiler_fueltype": "FuelOilNo2",
+          "backup_boiler_fueltype": "FuelOilNo2",
+          "baseboard_type": "Hot Water",
+          "mau_heating_coil_type": "Hot Water",
+          "heating_coil_type_sys6": "Hot Water"
+        }
+      ]
+    }
+  }
+}

data/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/LEEPMidriseApartment.osm

@@ -1229,7 +1229,7 @@ OS:Building,
   6,                                      !- Standards Number of Stories
   6,                                      !- Standards Number of Above Ground Stories
   ,                                       !- Standards Template
-  ,                                       !- Standards Building Type
+  LEEPMidriseApartment,                   !- Standards Building Type
   ,                                       !- Standards Number of Living Units
   ,                                       !- Relocatable
   ;                                       !- Nominal Floor to Ceiling Height {m}

data/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/LEEPMultiTower.osm

@@ -1229,7 +1229,7 @@ OS:Building,
   60,                                     !- Standards Number of Stories
   60,                                     !- Standards Number of Above Ground Stories
   ,                                       !- Standards Template
-  ,                                       !- Standards Building Type
+  LEEPMultiTower,                         !- Standards Building Type
   ,                                       !- Standards Number of Living Units
   ,                                       !- Relocatable
   ;                                       !- Nominal Floor to Ceiling Height {m}

data/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/LEEPPointTower.osm

@@ -19487,7 +19487,7 @@ OS:Building,
   23,                                     !- Standards Number of Stories
   23,                                     !- Standards Number of Above Ground Stories
   ,                                       !- Standards Template
-  ,                                       !- Standards Building Type
+  LEEPPointTower,                         !- Standards Building Type
   ,                                       !- Standards Number of Living Units
   ,                                       !- Relocatable
   ;                                       !- Nominal Floor to Ceiling Height {m}