openstudio-standards 0.2.0.rc1 → 0.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a78c7667ff57212581bbc69d8744490c265aff07
-  data.tar.gz: b107d9d448db0c835b05bacb73ba5bc56ca3d51b
+  metadata.gz: 7971c760a2256abb5458a28ad4e0d31a9364acca
+  data.tar.gz: b4ed3ac1b33749ad8511de8b22dac45052074476
 SHA512:
-  metadata.gz: 27fa35de23af880319a26fff22651e1f537eb552fda5a94a09f2a47fd4c5eed354138993b5eb90cdb6621b6b7cd146f721f751dd0441d15df71b036f272d6b5b
-  data.tar.gz: d15cce110d43968f18d4374b3b3144606c3b1aabb88f1ee328431e2ccfee4b2b4f50b72621a2817dd123f9fb4bb89bf0da0478934a500a4aad5b2a79d0529e40
+  metadata.gz: 7156d8390581e7633b5ec60a0fb1d44f8bb1eb78876eaf5b4ab26adcddededd0fe2b5e6a3e411d1721cce3532e5cb1c7d108f54ccfe00148555fb42b97502055
+  data.tar.gz: 8a8c9b87d8796999ffcee7319ec59f109513f5a7ed2057ac1b5853936263781a78797febee97909888af385c51a3db17d92a2b7402843299d9e63cf78b238f5d

data/data/standards/export_OpenStudio_libraries.rb

@@ -10,14 +10,15 @@ require 'openstudio'
 require_relative '../../lib/openstudio-standards'
 
 def export_openstudio_libraries
+  start_time = Time.now
 
   ### Define what to include in the libraries ###
-  include_construction_sets = true # Construction Sets, Constructions, and Materials
-  include_space_types = true # Space Types, Internal Loads, and associated Schedule Sets and Schedules
   include_boilers = true # BoilerHotWater
   include_chillers = true # ChillerElectricEIR
   include_unitary_acs = true # CoilCoolingDXSingleSpeed
-  include_heat_pumps = true # CoilCoolingDXSingleSpeed, CoilHeatingDXSingleSpeed, AirLoopHVACUnitaryHeatPump
+  include_heat_pumps = false # CoilCoolingDXSingleSpeed, CoilHeatingDXSingleSpeed, AirLoopHVACUnitaryHeatPump
+  include_space_types = true # Space Types, Internal Loads, and associated Schedule Sets and Schedules
+  include_construction_sets = true # Construction Sets, Constructions, and Materials
 
   # Make an initial Standard to access the library data
   std = Standard.build('90.1-2013')
@@ -27,412 +28,427 @@ def export_openstudio_libraries
   templates_to_climate_zones = JSON.parse(temp)
 
   # Make a library model for each template
-  template_to_lib_models = {}
   std.standards_data["templates"].each do |template|
-    template_name = template['name']
-    data = {}
-    data['model'] = OpenStudio::Model::Model.new
+
+    # Wrap each library creation in a begin/rescue because
+    # the entire process can take a long time and
+    # we don't want to lose all templates if one fails
     begin
-      data['standard_applier'] = Standard.build(template_name)
-      template_to_lib_models[template_name] = data
-    rescue Exception => e
-      puts "'#{template_name}' is not defined in OpenStudio-Standards yet"
-    end
-  end
 
-  # Construction Sets, Constructions, and Materials
-  # TODO fix code to remove duplicate constructions and materials
-  if include_construction_sets
-    std.standards_data['construction_sets'].each do |props|
-      lib = template_to_lib_models[props['template']]
-      next if lib.nil? # Skip unsupported templates
-      model = lib['model']
-      std_applier = lib['standard_applier']
-
-      # Add a construction set for each valid climate zone
-      templates_to_climate_zones[props['template']].each do |climate_zone|
-        construction_set = std_applier.model_add_construction_set(model,
-                                                                  climate_zone,
-                                                                  props['building_type'],
-                                                                  props['space_type'],
-                                                                  props['is_residential'])
+      # Make a Standard for this template
+      template_name = template['name']
+      puts "*** Making #{template_name} ***"
+      template_start_time = Time.now
+      puts "* Started #{template_name} at: #{template_start_time}"
+      begin
+        std_applier = Standard.build(template_name)
+      rescue Exception => e
+        puts "'#{template_name}' is not defined in OpenStudio-Standards yet"
       end
-    end
-  end
-
-  # Space Types
-  if include_space_types
-    std.standards_data['space_types'].each do |props|
-      lib = template_to_lib_models[props['template']]
-      next if lib.nil? # Skip unsupported templates
-      model = lib['model']
-      std_applier = lib['standard_applier']
 
-      # Create a new space type
-      space_type = OpenStudio::Model::SpaceType.new(model)
-      space_type.setStandardsBuildingType(props['building_type'])
-      space_type.setStandardsSpaceType(props['space_type'])
-      space_type.setName("#{props['building_type']} #{props['space_type']}")
+      # Reset the openstudio-standards log
+      reset_log
+
+      next unless template_name == '90.1-2004'
+
+      # Make an empty model
+      model = OpenStudio::Model::Model.new
+
+      # Boilers
+      if include_boilers
+        puts "* Boilers *"
+        std.standards_data['boilers'].each do |props|
+          next unless props['template'] == template_name
+
+          # Make a new boiler
+          boiler = OpenStudio::Model::BoilerHotWater.new(model)
+          # Fuel Type
+          case props['fuel_type']
+            when 'Gas'
+              boiler.setFuelType('NaturalGas')
+            when 'Electric'
+              boiler.setFuelType('Electricity')
+            when 'Oil'
+              boiler.setFuelType('FuelOil#2')
+          end
+          # Set capacity to middle of range
+          min_cap_btu_per_hr = props['minimum_capacity'].to_f
+          max_cap_btu_per_hr = props['maximum_capacity'].to_f
+          mid_cap_btu_per_hr = (min_cap_btu_per_hr + max_cap_btu_per_hr) / 2
+          mid_cap_w = OpenStudio.convert(mid_cap_btu_per_hr, 'Btu/hr', 'W').get
+          boiler.setNominalCapacity(mid_cap_w)
+
+          # Apply the standard
+          std_applier.boiler_hot_water_apply_efficiency_and_curves(boiler)
+
+          # Reset the capacity
+          boiler.autosizeNominalCapacity
+
+          # Modify the name of the boiler to reflect the capacity range
+          min_cap_kbtu_per_hr = OpenStudio.convert(min_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
+          max_cap_kbtu_per_hr = OpenStudio.convert(max_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
+
+          old_name = boiler.name.get.to_s
+          m = old_name.match(/(\d+)kBtu\/hr/)
+          if m
+            # Put the fuel type into the name
+            old_type = 'Boiler Hot Water 1'
+            new_type = "#{props['fuel_type']} Boiler"
+            new_name = old_name.gsub(old_type, new_type)
+            # Swap out the capacity number for a range
+            old_cap = m[1]
+            if max_cap_kbtu_per_hr == 10_000_000 # Value representing infinity
+              new_cap = "> #{min_cap_kbtu_per_hr}"
+            else
+              new_cap = "#{min_cap_kbtu_per_hr}-#{max_cap_kbtu_per_hr}"
+            end
+            new_name = new_name.gsub(old_cap, new_cap)
+            boiler.setName(new_name)
+            puts "#{props['template']}: #{boiler.name.get.to_s}"
+          end
 
-      # Rendering color
-      std_applier.space_type_apply_rendering_color(space_type)
-
-      # Loads
-      std_applier.space_type_apply_internal_loads(space_type, true, true, true, true, true, true)
+        end
+      end
 
-      # Schedules
-      std_applier.space_type_apply_internal_load_schedules(space_type, true, true, true, true, true, true, true)
+      # Chillers
+      if include_chillers
+        puts "* Chillers *"
+        std.standards_data['chillers'].each do |props|
+          next unless props['template'] == template_name
+
+          # Skip absorption chillers
+          next unless props['absorption_type'].nil?
+
+          # Skip interim chiller efficiency requirements
+          next unless props['end_date'] == "2999-09-09T00:00:00+00:00"
+
+          # Make a new chiller
+          chiller = OpenStudio::Model::ChillerElectricEIR.new(model)
+          # Set capacity to middle of range
+          min_cap_tons = props['minimum_capacity'].to_f
+          max_cap_tons = props['maximum_capacity'].to_f
+          mid_cap_tons = (min_cap_tons + max_cap_tons) / 2
+          mid_cap_w = OpenStudio.convert(mid_cap_tons, 'ton', 'W').get
+          chiller.setReferenceCapacity(mid_cap_w)
+
+          # Add the chiller properties to the name, because this is what
+          # the standards currently work off of.
+          if props['cooling_type'] == 'AirCooled'
+            new_name = "#{props['cooling_type']} Chiller #{props['condenser_type']}"
+          elsif props['cooling_type'] == 'WaterCooled'
+            new_name = "#{props['cooling_type']} #{props['compressor_type']} Chiller"
+          else
+            new_name = chiller.name.get
+          end
+          chiller.setName(new_name)
+
+          # Apply the standard
+          std_applier.chiller_electric_eir_apply_efficiency_and_curves(chiller, nil)
+
+          # Reset the capacity
+          chiller.autosizeReferenceCapacity
+
+          # Modify the name of the chiller to reflect the capacity range
+          old_name = chiller.name.get.to_s
+          m = old_name.match(/(\d+)tons/)
+          if m
+            # Put the fuel type into the name
+            old_type = 'Chiller Electric EIR 1'
+            new_type = 'Chiller'
+            new_name = old_name.gsub(old_type, new_type)
+            # Swap out the capacity number for a range
+            old_cap = m[1]
+            if max_cap_tons == 10_000 # Value representing infinity
+              new_cap = "> #{min_cap_tons.round}"
+            else
+              new_cap = "#{min_cap_tons.round}-#{max_cap_tons.round}"
+            end
+            new_name = new_name.gsub(old_cap, new_cap)
+            chiller.setName(new_name)
+            puts "#{props['template']}: #{chiller.name.get.to_s}"
+          end
 
-    end
-  end
-
-  # Boilers
-  if include_boilers
-    std.standards_data['boilers'].each do |props|
-      lib = template_to_lib_models[props['template']]
-      next if lib.nil? # Skip unsupported templates
-      # Skip NECB 2011 for now
-      next if props['template'] == 'NECB 2011'
-      model = lib['model']
-      std_applier = lib['standard_applier']
-
-      # Make a new boiler
-      boiler = OpenStudio::Model::BoilerHotWater.new(model)
-      # Fuel Type
-      case props['fuel_type']
-      when 'Gas'
-        boiler.setFuelType('NaturalGas')
-      when 'Electric'
-        boiler.setFuelType('Electricity')
-      when 'Oil'
-        boiler.setFuelType('FuelOil#2')
-      end
-      # Set capacity to middle of range
-      min_cap_btu_per_hr = props['minimum_capacity'].to_f
-      max_cap_btu_per_hr = props['maximum_capacity'].to_f
-      mid_cap_btu_per_hr = (min_cap_btu_per_hr + max_cap_btu_per_hr) / 2
-      mid_cap_w = OpenStudio.convert(mid_cap_btu_per_hr, 'Btu/hr', 'W').get
-      boiler.setNominalCapacity(mid_cap_w)
-
-      # Apply the standard
-      std_applier.boiler_hot_water_apply_efficiency_and_curves(boiler)
-
-      # Reset the capacity
-      boiler.autosizeNominalCapacity
-
-      # Modify the name of the boiler to reflect the capacity range
-      min_cap_kbtu_per_hr = OpenStudio.convert(min_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
-      max_cap_kbtu_per_hr = OpenStudio.convert(max_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
-
-      old_name = boiler.name.get.to_s
-      m = old_name.match(/(\d+)kBtu\/hr/)
-      if m
-        # Put the fuel type into the name
-        old_type = 'Boiler Hot Water 1'
-        new_type = "#{props['fuel_type']} Boiler"
-        new_name = old_name.gsub(old_type, new_type)
-        # Swap out the capacity number for a range
-        old_cap = m[1]
-        if max_cap_kbtu_per_hr == 10_000_000 # Value representing infinity
-          new_cap = "> #{min_cap_kbtu_per_hr}"
-        else
-          new_cap = "#{min_cap_kbtu_per_hr}-#{max_cap_kbtu_per_hr}"
         end
-        new_name = new_name.gsub(old_cap, new_cap)
-        boiler.setName(new_name)
-        puts "#{props['template']}: #{boiler.name.get.to_s}"
       end
 
-    end
-  end
+      # Unitary AC
+      if include_unitary_acs
+        puts "* Unitary ACs *"
+        std.standards_data['unitary_acs'].each do |props|
+          next unless props['template'] == template_name
+
+          # Skip interim efficiency requirements
+          next unless props['end_date'] == "2999-09-09T00:00:00+00:00"
+
+          # Make a new DX coil
+          dx_coil = OpenStudio::Model::CoilCoolingDXSingleSpeed.new(model)
+          # Set capacity to middle of range
+          min_cap_btu_per_hr = props['minimum_capacity'].to_f
+          max_cap_btu_per_hr = props['maximum_capacity'].to_f
+          mid_cap_btu_per_hr = (min_cap_btu_per_hr + max_cap_btu_per_hr) / 2
+          mid_cap_w = OpenStudio.convert(mid_cap_btu_per_hr, 'Btu/hr', 'W').get
+          dx_coil.setRatedTotalCoolingCapacity(mid_cap_w)
+
+          # Add the subcategory to the name so that it
+          # can be used by the efficiency lookup
+          dx_coil.setName("#{dx_coil.name} #{props['subcategory']}")
+
+          # If it is a PTAC coil, add to PTAC
+          if props['subcategory'] == 'PTAC'
+            htg_coil = nil
+            if props['heating_type'] == 'Electric Resistance or None'
+              htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model)
+              htg_coil.setName('PTAC Electric Backup Htg Coil')
+            else
+              htg_coil = OpenStudio::Model::CoilHeatingGas.new(model)
+              htg_coil.setName('PTAC Gas Backup Htg Coil')
+            end
+            fan = OpenStudio::Model::FanOnOff.new(model, model.alwaysOnDiscreteSchedule)
+            fan.setName("PTAC Supply Fan")
+            ptac = OpenStudio::Model::ZoneHVACPackagedTerminalAirConditioner.new(model,
+                                                                                 model.alwaysOnDiscreteSchedule,
+                                                                                 fan,
+                                                                                 htg_coil,
+                                                                                 dx_coil)
+          end
+
+          # Apply the standard
+          std_applier.coil_cooling_dx_single_speed_apply_efficiency_and_curves(dx_coil, {})
+
+          # Reset the capacity
+          dx_coil.autosizeRatedTotalCoolingCapacity
+
+          # Modify the name of the boiler to reflect the capacity range
+          min_cap_kbtu_per_hr = OpenStudio.convert(min_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
+          max_cap_kbtu_per_hr = OpenStudio.convert(max_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
+
+          # Modify the name of the dx_coil to reflect the capacity range
+          old_name = dx_coil.name.get.to_s
+          m = old_name.match(/(\d+)kBtu\/hr/)
+          if m
+            # Put the fuel type into the name
+            old_type = "Coil Cooling DX Single Speed 1 #{props['subcategory']}"
+            new_type = "#{props['cooling_type']} #{props['heating_type']} #{props['subcategory']} DX"
+            new_name = old_name.gsub(old_type, new_type)
+            # Swap out the capacity number for a range
+            old_cap = m[1]
+            if max_cap_kbtu_per_hr ==  10_000 # Value representing infinity
+              new_cap = "> #{min_cap_kbtu_per_hr}"
+            else
+              new_cap = "#{min_cap_kbtu_per_hr}-#{max_cap_kbtu_per_hr}"
+            end
+            new_name = new_name.gsub(old_cap, new_cap)
+            dx_coil.setName(new_name)
+            puts "#{props['template']}: #{dx_coil.name.get.to_s}"
+
+            # Rename PTAC too
+            if props['subcategory'] == 'PTAC'
+              ptac.setName("PTAC #{new_name}")
+            end
+
+          end
 
-  # Chillers
-  if include_chillers
-    std.standards_data['chillers'].each do |props|
-      lib = template_to_lib_models[props['template']]
-      next if lib.nil? # Skip unsupported templates
-      # Skip NECB 2011 for now
-      next if props['template'] == 'NECB 2011'
-      model = lib['model']
-      std_applier = lib['standard_applier']
-
-      # Skip absorption chillers
-      next unless props['absorption_type'].nil?
-
-      # Skip interim chiller efficiency requirements
-      next unless props['end_date'] == "2999-09-09T00:00:00+00:00"
-
-      # Make a new chiller
-      chiller = OpenStudio::Model::ChillerElectricEIR.new(model)
-      # Set capacity to middle of range
-      min_cap_tons = props['minimum_capacity'].to_f
-      max_cap_tons = props['maximum_capacity'].to_f
-      mid_cap_tons = (min_cap_tons + max_cap_tons) / 2
-      mid_cap_w = OpenStudio.convert(mid_cap_tons, 'ton', 'W').get
-      chiller.setReferenceCapacity(mid_cap_w)
-
-      # Add the chiller properties to the name, because this is what
-      # the standards currently work off of.
-      if props['cooling_type'] == 'AirCooled'
-        new_name = "#{props['cooling_type']} Chiller #{props['condenser_type']}"
-      elsif props['cooling_type'] == 'WaterCooled'
-        new_name = "#{props['cooling_type']} #{props['compressor_type']} Chiller"
-      else
-        new_name = chiller.name.get
-      end
-      chiller.setName(new_name)
-
-      # Apply the standard
-      std_applier.chiller_electric_eir_apply_efficiency_and_curves(chiller, nil)
-
-      # Reset the capacity
-      chiller.autosizeReferenceCapacity
-
-      # Modify the name of the chiller to reflect the capacity range
-      old_name = chiller.name.get.to_s
-      m = old_name.match(/(\d+)tons/)
-      if m
-        # Put the fuel type into the name
-        old_type = 'Chiller Electric EIR 1'
-        new_type = 'Chiller'
-        new_name = old_name.gsub(old_type, new_type)
-        # Swap out the capacity number for a range
-        old_cap = m[1]
-        if max_cap_tons == 10_000 # Value representing infinity
-          new_cap = "> #{min_cap_tons.round}"
-        else
-          new_cap = "#{min_cap_tons.round}-#{max_cap_tons.round}"
         end
-        new_name = new_name.gsub(old_cap, new_cap)
-        chiller.setName(new_name)
-        puts "#{props['template']}: #{chiller.name.get.to_s}"
       end
 
-    end
-  end
+      # Heat Pumps
+      if include_heat_pumps
+        puts "* Heat Pumps *"
+        std.standards_data['heat_pumps'].each do |props|
+          next unless props['template'] == template_name
+
+          # Skip interim efficiency requirements
+          next unless props['end_date'] == "2999-09-09T00:00:00+00:00"
+
+          # Make a new DX cooling coil
+          clg_coil = OpenStudio::Model::CoilCoolingDXSingleSpeed.new(model)
+          # Set capacity to middle of range
+          min_clg_cap_btu_per_hr = props['minimum_capacity'].to_f
+          max_clg_cap_btu_per_hr = props['maximum_capacity'].to_f
+          mid_clg_cap_btu_per_hr = (min_clg_cap_btu_per_hr + max_clg_cap_btu_per_hr) / 2
+          mid_clg_cap_w = OpenStudio.convert(mid_clg_cap_btu_per_hr, 'Btu/hr', 'W').get
+          clg_coil.setRatedTotalCoolingCapacity(mid_clg_cap_w)
+
+          # Make a new DX heating coil sized at 90% of the capacity
+          # of the cooling coil.
+          htg_coil = OpenStudio::Model::CoilHeatingDXSingleSpeed.new(model)
+          mid_htg_cap_w = mid_clg_cap_w * 0.9
+          htg_coil.setRatedTotalHeatingCapacity(mid_htg_cap_w)
+
+          # If it is a PTHP Coil, add to PTHP
+          # If not, add to unitary HP
+          if props['subcategory'] == 'PTHP'
+            if props['heating_type'] == 'Electric Resistance or None'
+              backup_htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model)
+              backup_htg_coil.setName('PTHP Electric Backup Htg Coil')
+            else
+              backup_htg_coil = OpenStudio::Model::CoilHeatingGas.new(model)
+              backup_htg_coil.setName('PTHP Electric Backup Htg Coil')
+            end
+            fan = OpenStudio::Model::FanOnOff.new(model, model.alwaysOnDiscreteSchedule)
+            fan.setName("PTHP Supply Fan")
+            pthp = OpenStudio::Model::ZoneHVACPackagedTerminalHeatPump.new(model,
+                                                                           model.alwaysOnDiscreteSchedule,
+                                                                           fan,
+                                                                           htg_coil,
+                                                                           clg_coil,
+                                                                           backup_htg_coil)
+          else
+            if props['heating_type'] == 'Electric Resistance or None'
+              backup_htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model)
+              backup_htg_coil.setName('Unitary Heat Pump Electric Backup Htg Coil')
+            else
+              backup_htg_coil = OpenStudio::Model::CoilHeatingGas.new(model)
+              backup_htg_coil.setName('Unitary Heat Pump Electric Backup Htg Coil')
+            end
+            fan = OpenStudio::Model::FanOnOff.new(model, model.alwaysOnDiscreteSchedule)
+            fan.setName("Unitary Heat Pump Supply Fan")
+            unitary_system = OpenStudio::Model::AirLoopHVACUnitaryHeatPumpAirToAir.new(model,
+                                                                                       model.alwaysOnDiscreteSchedule,
+                                                                                       fan,
+                                                                                       htg_coil,
+                                                                                       clg_coil,
+                                                                                       backup_htg_coil)
+            unitary_system.setName("Unitary Heat Pump")
+            unitary_system.setMaximumOutdoorDryBulbTemperatureforSupplementalHeaterOperation(OpenStudio.convert(40, 'F', 'C').get)
+          end
+
+          # Apply the standard
+          std_applier.coil_cooling_dx_single_speed_apply_efficiency_and_curves(clg_coil, {})
+          std_applier.coil_heating_dx_single_speed_apply_efficiency_and_curves(htg_coil, {})
+
+          # Reset the capacity
+          clg_coil.autosizeRatedTotalCoolingCapacity
+          htg_coil.autosizeRatedTotalHeatingCapacity
+
+          # Modify the name of the boiler to reflect the capacity range
+          min_clg_cap_kbtu_per_hr = OpenStudio.convert(min_clg_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
+          max_clg_cap_kbtu_per_hr = OpenStudio.convert(max_clg_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
+
+          # Modify the name of the dx_coil to reflect the capacity range
+          old_name = clg_coil.name.get.to_s
+          m = old_name.match(/(\d+)kBtu\/hr/)
+          if m
+            # Put the fuel type into the name
+            old_type = 'Coil Cooling DX Single Speed 1'
+            new_type = "#{props['cooling_type']} #{props['heating_type']} #{props['subcategory']} DX"
+            new_name = old_name.gsub(old_type, new_type)
+            # Swap out the capacity number for a range
+            old_cap = m[1]
+            if max_clg_cap_kbtu_per_hr ==  10_000 # Value representing infinity
+              new_cap = "> #{min_clg_cap_kbtu_per_hr}"
+            else
+              new_cap = "#{min_clg_cap_kbtu_per_hr}-#{max_clg_cap_kbtu_per_hr}"
+            end
+            new_name = new_name.gsub(old_cap, new_cap)
+            clg_coil.setName(new_name)
+            puts "#{props['template']}: #{clg_coil.name.get.to_s}"
+
+            # Rename PTHP or unitary same as the cooling coil
+            if pthp
+              pthp.setName("PTHP #{new_name}")
+            else
+              unitary_system.setName("Unitary Heat Pump #{new_name}")
+            end
+
+            # Rename the heating coil
+            old_type = 'Coil Heating DX Single Speed 1'
+            new_type = "#{props['cooling_type']} #{props['heating_type']} #{props['subcategory']} DX"
+            new_name = old_name.gsub(old_type, new_type)
+            # Swap out the capacity number for a blank
+            old_cap = m[1]
+            new_name = new_name.gsub(old_cap, '')
+            htg_coil.setName(new_name)
+
+          end
 
-  # Unitary AC
-  if include_unitary_acs
-    std.standards_data['unitary_acs'].each do |props|
-      lib = template_to_lib_models[props['template']]
-      next if lib.nil? # Skip unsupported templates
-      # Skip NECB 2011 for now
-      next if props['template'] == 'NECB 2011'
-      model = lib['model']
-      std_applier = lib['standard_applier']
-
-      # Skip interim efficiency requirements
-      next unless props['end_date'] == "2999-09-09T00:00:00+00:00"
-
-      # Make a new DX coil
-      dx_coil = OpenStudio::Model::CoilCoolingDXSingleSpeed.new(model)
-      # Set capacity to middle of range
-      min_cap_btu_per_hr = props['minimum_capacity'].to_f
-      max_cap_btu_per_hr = props['maximum_capacity'].to_f
-      mid_cap_btu_per_hr = (min_cap_btu_per_hr + max_cap_btu_per_hr) / 2
-      mid_cap_w = OpenStudio.convert(mid_cap_btu_per_hr, 'Btu/hr', 'W').get
-      dx_coil.setRatedTotalCoolingCapacity(mid_cap_w)
-
-      # Add the subcategory to the name so that it
-      # can be used by the efficiency lookup
-      dx_coil.setName("#{dx_coil.name} #{props['subcategory']}")
-
-      # If it is a PTAC coil, add to PTAC
-      if props['subcategory'] == 'PTAC'
-        htg_coil = nil
-        if props['heating_type'] == 'Electric Resistance or None'
-          htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model)
-          htg_coil.setName('PTAC Electric Backup Htg Coil')
-        else
-          htg_coil = OpenStudio::Model::CoilHeatingGas.new(model)
-          htg_coil.setName('PTAC Gas Backup Htg Coil')
         end
-        fan = OpenStudio::Model::FanOnOff.new(model, model.alwaysOnDiscreteSchedule)
-        fan.setName("PTAC Supply Fan")
-        ptac = OpenStudio::Model::ZoneHVACPackagedTerminalAirConditioner.new(model,
-                                                                             model.alwaysOnDiscreteSchedule,
-                                                                             fan,
-                                                                             htg_coil,
-                                                                             dx_coil)
       end
 
-      # Apply the standard
-      std_applier.coil_cooling_dx_single_speed_apply_efficiency_and_curves(dx_coil, {})
-
-      # Reset the capacity
-      dx_coil.autosizeRatedTotalCoolingCapacity
-
-      # Modify the name of the boiler to reflect the capacity range
-      min_cap_kbtu_per_hr = OpenStudio.convert(min_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
-      max_cap_kbtu_per_hr = OpenStudio.convert(max_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
-
-      # Modify the name of the dx_coil to reflect the capacity range
-      old_name = dx_coil.name.get.to_s
-      m = old_name.match(/(\d+)kBtu\/hr/)
-      if m
-        # Put the fuel type into the name
-        old_type = "Coil Cooling DX Single Speed 1 #{props['subcategory']}"
-        new_type = "#{props['cooling_type']} #{props['heating_type']} #{props['subcategory']} DX"
-        new_name = old_name.gsub(old_type, new_type)
-        # Swap out the capacity number for a range
-        old_cap = m[1]
-        if max_cap_kbtu_per_hr ==  10_000 # Value representing infinity
-          new_cap = "> #{min_cap_kbtu_per_hr}"
-        else
-          new_cap = "#{min_cap_kbtu_per_hr}-#{max_cap_kbtu_per_hr}"
-        end
-        new_name = new_name.gsub(old_cap, new_cap)
-        dx_coil.setName(new_name)
-        puts "#{props['template']}: #{dx_coil.name.get.to_s}"
+      # Space Types
+      if include_space_types
+        puts "* Space Types *"
+        std.standards_data['space_types'].each do |props|
+          next unless props['template'] == template_name
 
-        # Rename PTAC too
-        if props['subcategory'] == 'PTAC'
-          ptac.setName("PTAC #{new_name}")
-        end
+          # Create a new space type
+          space_type = OpenStudio::Model::SpaceType.new(model)
+          space_type.setStandardsBuildingType(props['building_type'])
+          space_type.setStandardsSpaceType(props['space_type'])
+          space_type.setName("#{props['building_type']} #{props['space_type']}")
 
-      end
+          # Rendering color
+          std_applier.space_type_apply_rendering_color(space_type)
 
-    end
-  end
+          # Loads
+          std_applier.space_type_apply_internal_loads(space_type, true, true, true, true, true, true)
+
+          # Schedules
+          std_applier.space_type_apply_internal_load_schedules(space_type, true, true, true, true, true, true, true)
 
-  # Heat Pumps
-  if include_heat_pumps
-    std.standards_data['heat_pumps'].each do |props|
-      lib = template_to_lib_models[props['template']]
-      next if lib.nil? # Skip unsupported templates
-      # Skip NECB 2011 for now
-      next if props['template'] == 'NECB 2011'
-      model = lib['model']
-      std_applier = lib['standard_applier']
-
-      # Skip interim efficiency requirements
-      next unless props['end_date'] == "2999-09-09T00:00:00+00:00"
-
-      # Make a new DX cooling coil
-      clg_coil = OpenStudio::Model::CoilCoolingDXSingleSpeed.new(model)
-      # Set capacity to middle of range
-      min_clg_cap_btu_per_hr = props['minimum_capacity'].to_f
-      max_clg_cap_btu_per_hr = props['maximum_capacity'].to_f
-      mid_clg_cap_btu_per_hr = (min_clg_cap_btu_per_hr + max_clg_cap_btu_per_hr) / 2
-      mid_clg_cap_w = OpenStudio.convert(mid_clg_cap_btu_per_hr, 'Btu/hr', 'W').get
-      clg_coil.setRatedTotalCoolingCapacity(mid_clg_cap_w)
-
-      # Make a new DX heating coil sized at 90% of the capacity
-      # of the cooling coil.
-      htg_coil = OpenStudio::Model::CoilHeatingDXSingleSpeed.new(model)
-      mid_htg_cap_w = mid_clg_cap_w * 0.9
-      htg_coil.setRatedTotalHeatingCapacity(mid_htg_cap_w)
-
-      # If it is a PTHP Coil, add to PTHP
-      # If not, add to unitary HP
-      if props['subcategory'] == 'PTHP'
-        if props['heating_type'] == 'Electric Resistance or None'
-          backup_htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model)
-          backup_htg_coil.setName('PTHP Electric Backup Htg Coil')
-        else
-          backup_htg_coil = OpenStudio::Model::CoilHeatingGas.new(model)
-          backup_htg_coil.setName('PTHP Electric Backup Htg Coil')
-        end
-        fan = OpenStudio::Model::FanOnOff.new(model, model.alwaysOnDiscreteSchedule)
-        fan.setName("PTHP Supply Fan")
-        pthp = OpenStudio::Model::ZoneHVACPackagedTerminalHeatPump.new(model,
-                                                                       model.alwaysOnDiscreteSchedule,
-                                                                       fan,
-                                                                       htg_coil,
-                                                                       clg_coil,
-                                                                       backup_htg_coil)
-      else
-        if props['heating_type'] == 'Electric Resistance or None'
-          backup_htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model)
-          backup_htg_coil.setName('Unitary Heat Pump Electric Backup Htg Coil')
-        else
-          backup_htg_coil = OpenStudio::Model::CoilHeatingGas.new(model)
-          backup_htg_coil.setName('Unitary Heat Pump Electric Backup Htg Coil')
         end
-        fan = OpenStudio::Model::FanOnOff.new(model, model.alwaysOnDiscreteSchedule)
-        fan.setName("Unitary Heat Pump Supply Fan")
-        unitary_system = OpenStudio::Model::AirLoopHVACUnitaryHeatPumpAirToAir.new(model,
-                                                                                   model.alwaysOnDiscreteSchedule,
-                                                                                   fan,
-                                                                                   htg_coil,
-                                                                                   clg_coil,
-                                                                                   backup_htg_coil)
-        unitary_system.setName("Unitary Heat Pump")
-        unitary_system.setMaximumOutdoorDryBulbTemperatureforSupplementalHeaterOperation(OpenStudio.convert(40, 'F', 'C').get)
       end
 
-      # Apply the standard
-      std_applier.coil_cooling_dx_single_speed_apply_efficiency_and_curves(clg_coil, {})
-      std_applier.coil_heating_dx_single_speed_apply_efficiency_and_curves(htg_coil, {})
-
-      # Reset the capacity
-      clg_coil.autosizeRatedTotalCoolingCapacity
-      htg_coil.autosizeRatedTotalHeatingCapacity
-
-      # Modify the name of the boiler to reflect the capacity range
-      min_clg_cap_kbtu_per_hr = OpenStudio.convert(min_clg_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
-      max_clg_cap_kbtu_per_hr = OpenStudio.convert(max_clg_cap_btu_per_hr, 'Btu/hr', 'kBtu/hr').get.round
-
-      # Modify the name of the dx_coil to reflect the capacity range
-      old_name = clg_coil.name.get.to_s
-      m = old_name.match(/(\d+)kBtu\/hr/)
-      if m
-        # Put the fuel type into the name
-        old_type = 'Coil Cooling DX Single Speed 1'
-        new_type = "#{props['cooling_type']} #{props['heating_type']} #{props['subcategory']} DX"
-        new_name = old_name.gsub(old_type, new_type)
-        # Swap out the capacity number for a range
-        old_cap = m[1]
-        if max_clg_cap_kbtu_per_hr ==  10_000 # Value representing infinity
-          new_cap = "> #{min_clg_cap_kbtu_per_hr}"
-        else
-          new_cap = "#{min_clg_cap_kbtu_per_hr}-#{max_clg_cap_kbtu_per_hr}"
-        end
-        new_name = new_name.gsub(old_cap, new_cap)
-        clg_coil.setName(new_name)
-        puts "#{props['template']}: #{clg_coil.name.get.to_s}"
-
-        # Rename PTHP or unitary same as the cooling coil
-        if pthp
-          pthp.setName("PTHP #{new_name}")
-        else
-          unitary_system.setName("Unitary Heat Pump #{new_name}")
+      # Construction Sets, Constructions, and Materials
+      # TODO fix code to remove duplicate constructions and materials
+      if include_construction_sets
+        puts "* Construction Sets *"
+        std.standards_data['construction_sets'].each do |props|
+          next unless props['template'] == template_name
+          # Add a construction set for each valid climate zone
+          templates_to_climate_zones[props['template']].each do |climate_zone|
+            construction_set = std_applier.model_add_construction_set(model,
+                                                                      climate_zone,
+                                                                      props['building_type'],
+                                                                      props['space_type'],
+                                                                      props['is_residential'])
+          end
         end
+      end
 
-        # Rename the heating coil
-        old_type = 'Coil Heating DX Single Speed 1'
-        new_type = "#{props['cooling_type']} #{props['heating_type']} #{props['subcategory']} DX"
-        new_name = old_name.gsub(old_type, new_type)
-        # Swap out the capacity number for a blank
-        old_cap = m[1]
-        new_name = new_name.gsub(old_cap, '')
-        htg_coil.setName(new_name)
-
+      # Delete all the unused curves
+      puts '* Cleaning up the unused curves *'
+      model.getCurves.sort.each do |curve|
+        if curve.directUseCount == 0
+          puts "    #{curve.name} is unused; successfully removed? #{model.removeObject(curve.handle)}."
+          # curve.remove # For some reason curve.remove doesn't work properly
+        end
       end
 
+      # Save the library
+      osm_lib_dir = "#{__dir__}/../../pkg/libraries"
+      Dir.mkdir(osm_lib_dir) unless Dir.exists?(osm_lib_dir)
+      library_path = "#{osm_lib_dir}/#{template_name.gsub(/\W/,'_')}.osm"
+      puts "* Saving library #{library_path}"
+      model.save(OpenStudio::Path.new(library_path), true)
+
+      # Save the log messages for debugging library creation
+      log_path = "#{osm_lib_dir}/#{template_name.gsub(/\W/,'_')}.log"
+      puts "* Saving log #{log_path}"
+      log_messages_to_file(log_path, debug=false)
+
+      # Show the timing
+      template_end_time = Time.now
+      template_time_min = ((template_end_time - template_start_time)/60.0).round(1)
+      puts "* Finished #{template_name} at: #{template_end_time}, time elapsed = #{template_time_min} min."
+
+    rescue Exception => exc
+      puts "ERROR creating '#{template_name}', skipping to next template."
+      puts "#{exc}"
+      puts "Backtrace:\n\t#{e.caller.join("\n\t")}"
+      puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+
+      # Save the log messages for debugging library creation even on failure
+      log_path = "#{osm_lib_dir}/#{template_name.gsub(/\W/,'_')}.log"
+      puts "* Saving log #{log_path}"
+      log_messages_to_file(log_path, debug=false)
     end
-  end
 
-  # Delete all the unused curves
-  puts 'Cleaning up the unused curves'
-  template_to_lib_models.each do |template, data|
-    puts ''
-    puts "***#{template}***"
-    data['model'].getCurves.sort.each do |curve|
-      if curve.directUseCount == 0
-        puts "    #{curve.name} is unused; successfully removed? #{data['model'].removeObject(curve.handle)}."
-        # curve.remove # For some reason curve.remove doesn't work properly
-      end
-    end
   end
 
-  # Save the libraries
-  osm_lib_dir = "#{__dir__}/../../pkg/libraries"
-  Dir.mkdir(osm_lib_dir) unless Dir.exists?(osm_lib_dir)
-  template_to_lib_models.each do |template, data|
-    library_path = "#{osm_lib_dir}/#{template.gsub(/\W/,'_')}.osm"
-    puts "Saving library #{library_path}"
-    data['model'].save(OpenStudio::Path.new(library_path), true)
-  end
+  # Show the timing
+  end_time = Time.now
+  total_time_min = ((end_time - start_time)/60.0).round(1)
+  puts "*** Finished all templates at: #{end_time}, time elapsed = #{total_time_min} min."
 
 end

data/data/standards/manage_OpenStudio_Standards.rb

@@ -1,7 +1,6 @@
 # This script reads OpenStudio_standards.xlsx
 # and creates a JSON file containing all the information
 
-require 'rubygems'
 require 'json'
 require 'rubyXL'
 

data/lib/openstudio-standards/btap/fileio.rb

@@ -22,7 +22,6 @@ require "#{File.dirname(__FILE__)}/btap"
 require 'fileutils'
 require 'csv'
 require 'securerandom'
-#require 'rubygems'
 
 
 module BTAP

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.Hospital.rb

@@ -71,8 +71,8 @@ module Hospital
           elec_equip_def1.setDesignLevel(915)
           elec_equip_def2.setDesignLevel(855)
         else
-          elec_equip_def1.setDesignLevel(99_999.88)
-          elec_equip_def2.setDesignLevel(99_999.99)
+          elec_equip_def1.setDesignLevel(915)
+          elec_equip_def2.setDesignLevel(855)
         end
         # Create the electric equipment instance and hook it up to the space type
         elec_equip1 = OpenStudio::Model::ElectricEquipment.new(elec_equip_def1)

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.LargeHotel.rb

@@ -106,8 +106,8 @@ module LargeHotel
           elec_equip_def1.setDesignLevel(457.7)
           elec_equip_def2.setDesignLevel(285)
         else
-          elec_equip_def1.setDesignLevel(99_999.88)
-          elec_equip_def2.setDesignLevel(99_999.99)
+          elec_equip_def1.setDesignLevel(457.7)
+          elec_equip_def2.setDesignLevel(285)
         end
         # Create the electric equipment instance and hook it up to the space type
         elec_equip1 = OpenStudio::Model::ElectricEquipment.new(elec_equip_def1)

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.PrimarySchool.rb

@@ -33,8 +33,8 @@ module PrimarySchool
           elec_equip_def1.setDesignLevel(915)
           elec_equip_def2.setDesignLevel(570)
         else
-          elec_equip_def1.setDesignLevel(99_999.88)
-          elec_equip_def2.setDesignLevel(99_999.99)
+          elec_equip_def1.setDesignLevel(1032)
+          elec_equip_def2.setDesignLevel(852)
         end
         # Create the electric equipment instance and hook it up to the space type
         elec_equip1 = OpenStudio::Model::ElectricEquipment.new(elec_equip_def1)

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.SecondarySchool.rb

@@ -49,8 +49,8 @@ module SecondarySchool
           elec_equip_def1.setDesignLevel(915)
           elec_equip_def2.setDesignLevel(570)
         else
-          elec_equip_def1.setDesignLevel(99_999.88)
-          elec_equip_def2.setDesignLevel(99_999.99)
+          elec_equip_def1.setDesignLevel(1032)
+          elec_equip_def2.setDesignLevel(852)
         end
         # Create the electric equipment instance and hook it up to the space type
         elec_equip1 = OpenStudio::Model::ElectricEquipment.new(elec_equip_def1)

data/lib/openstudio-standards/refs/references.rb

@@ -78,4 +78,17 @@ module References
   # @see http://deeresources.com/index.php/deer-versions
   class DEERMASControl; end
 
+  # OEESC 2014
+  # The Oregon Energy Efficiency Specialty Code is the building energy code for the
+  # state of Oregon.  It is very similar to ASHRAE 90.1-2013, but has been tailored
+  # to meet the needs of Oregon.
+  # @see http://www.oregon.gov/bcd/codes-stand/Pages/energy-efficiency.aspx
+  class OEESC2014; end
+
+  # ICC IECC 2015
+  # The International Code Council's International Energy Conservation Code is widely
+  # used across the United States.
+  # @see https://codes.iccsafe.org/public/document/toc/545/
+  class ICCIECC2015; end  
+
 end

data/lib/openstudio-standards/standards/Standards.Construction.rb

@@ -265,7 +265,7 @@ class Standard
   # Only applies to fenestration constructions.
   # @return [Double] the SHGC as a decimal.
   def construction_calculated_solar_heat_gain_coefficient(construction)
-    construction_name = name.get.to_s
+    construction_name = construction.name.get.to_s
 
     shgc = nil
 
@@ -286,7 +286,7 @@ class Standard
       if row_id.is_initialized
         row_id = row_id.get
       else
-        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', "SHGC row ID not found for construction: #{construction_name}.")
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Construction', "SHGC row ID not found for construction: #{construction_name}.")
         row_id = 9999
       end
 
@@ -315,7 +315,7 @@ class Standard
   # Only applies to fenestration constructions.
   # @return [Double] the visible transmittance as a decimal.
   def construction_calculated_visible_transmittance(construction)
-    construction_name = name.get.to_s
+    construction_name = construction.name.get.to_s
 
     vt = nil
 
@@ -365,7 +365,7 @@ class Standard
   # Only applies to fenestration constructions.
   # @return [Double] the U-Factor in W/m^2*K.
   def construction_calculated_u_factor(construction)
-    construction_name = name.get.to_s
+    construction_name = construction.name.get.to_s
 
     u_factor_w_per_m2_k = nil
 
@@ -386,7 +386,7 @@ class Standard
       if row_id.is_initialized
         row_id = row_id.get
       else
-        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', "U-Factor row ID not found for construction: #{construction_name}.")
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Construction', "U-Factor row ID not found for construction: #{construction_name}.")
         row_id = 9999
       end
 
@@ -405,7 +405,7 @@ class Standard
                             end
 
     else
-      OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Space', 'Model has no sql file containing results, cannot lookup data.')
+      OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Construction', 'Model has no sql file containing results, cannot lookup data.')
     end
 
     return u_factor_w_per_m2_k

data/lib/openstudio-standards/standards/Standards.Model.rb

@@ -4011,7 +4011,7 @@ class Standard
 
     parts = [template]
 
-    unless building_type.empty?
+    unless building_type.nil?
       parts << building_type
     end
 

data/lib/openstudio-standards/standards/Standards.Pump.rb

@@ -278,13 +278,24 @@ module Pump
     end
 
     rated_m3_per_s = 0
-    if pump.autosizedRatedFlowRate.is_initialized
-      rated_m3_per_s = pump.autosizedRatedFlowRate.get
-    elsif pump.ratedFlowRate.is_initialized
-      rated_m3_per_s = pump.ratedFlowRate.get
-    else
-      OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump Flow Rate, cannot determine w per gpm correctly.")
-      return 0.0
+    if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
+      if pump.ratedFlowRate.is_initialized
+        rated_m3_per_s = pump.ratedFlowRate.get
+      elsif pump.autosizedRatedFlowRate.is_initialized
+        rated_m3_per_s = pump.autosizedRatedFlowRate.get
+      else
+        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump Flow Rate, cannot determine w per gpm correctly.")
+        return 0.0
+      end
+    elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
+      if pump.totalRatedFlowRate.is_initialized
+        rated_m3_per_s = pump.totalRatedFlowRate.get
+      elsif pump.autosizedTotalRatedFlowRate.is_initialized
+        rated_m3_per_s = pump.autosizedTotalRatedFlowRate.get
+      else
+        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump Flow Rate, cannot determine w per gpm correctly.")
+        return 0.0
+      end
     end
 
     rated_w_per_m3s = rated_power_w / rated_m3_per_s

data/lib/openstudio-standards/standards/Standards.ScheduleRuleset.rb

@@ -79,7 +79,7 @@ class Standard
 
       previous_time_decimal = 0
       times.each_with_index do |time, i|
-        time_decimal = (time.days * 24) + time.hours + (time.minutes / 60) + (time.seconds / 3600)
+        time_decimal = (time.days * 24.0) + time.hours + (time.minutes / 60.0) + (time.seconds / 3600.0)
         duration_of_value = time_decimal - previous_time_decimal
         # OpenStudio::logFree(OpenStudio::Debug, "openstudio.standards.ScheduleRuleset", "  Value of #{values[i]} for #{duration_of_value} hours")
         daily_flh += values[i] * duration_of_value
@@ -219,7 +219,7 @@ class Standard
 
       previous_time_decimal = 0
       times.each_with_index do |time, i|
-        time_decimal = (time.days * 24) + time.hours + (time.minutes / 60) + (time.seconds / 3600)
+        time_decimal = (time.days * 24.0) + time.hours + (time.minutes / 60.0) + (time.seconds / 3600.0)
         duration_of_value = time_decimal - previous_time_decimal
         # OpenStudio::logFree(OpenStudio::Debug, "openstudio.standards.ScheduleRuleset", "  Value of #{values[i]} for #{duration_of_value} hours")
         daily_hrs += values[i] * duration_of_value

data/lib/openstudio-standards/standards/Standards.ThermalZone.rb

@@ -396,7 +396,7 @@ class Standard
     # Electricity, NaturalGas, PropaneGas, FuelOil#1, FuelOil#2,
     # Coal, Diesel, Gasoline, DistrictHeating,
     # and SolarEnergy.
-    htg_fuels = heating_fuels
+    htg_fuels = thermal_zone.heating_fuels
 
     if htg_fuels.include?('NaturalGas') ||
        htg_fuels.include?('PropaneGas') ||
@@ -498,7 +498,7 @@ class Standard
     # Electricity, NaturalGas, PropaneGas, FuelOil#1, FuelOil#2,
     # Coal, Diesel, Gasoline, DistrictHeating,
     # and SolarEnergy.
-    htg_fuels = heating_fuels
+    htg_fuels = thermal_zone.heating_fuels
 
     # Includes fossil
     fossil = false
@@ -576,7 +576,7 @@ class Standard
     has_ptac = false
     has_pthp = false
     has_unitheater = false
-    equipment.each do |equip|
+    thermal_zone.equipment.each do |equip|
       # Skip HVAC components
       next unless equip.to_HVACComponent.is_initialized
       equip = equip.to_HVACComponent.get
@@ -601,8 +601,8 @@ class Standard
     end
 
     # Get the zone heating and cooling fuels
-    htg_fuels = heating_fuels
-    clg_fuels = cooling_fuels
+    htg_fuels = thermal_zone.heating_fuels
+    clg_fuels = thermal_zone.cooling_fuels
     is_fossil = thermal_zone_fossil_hybrid_or_purchased_heat?(thermal_zone)
 
     # Infer the HVAC type
@@ -615,7 +615,7 @@ class Standard
         # Air Loop
         if has_air_loop
           # Gas_Furnace (as air loop)
-          sys_type = if cooling_fuels.size.zero?
+          sys_type = if clg_fuels.size.zero?
                        'Gas_Furnace'
                      # PSZ_AC
                      else
@@ -637,7 +637,7 @@ class Standard
         # Air Loop
         if has_air_loop
           # Electric_Furnace (as air loop)
-          sys_type = if cooling_fuels.size.zero?
+          sys_type = if clg_fuels.size.zero?
                        'Electric_Furnace'
                      # PSZ_HP
                      else

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

@@ -0,0 +1,9 @@
+# This abstract class holds methods that many versions of ICC IECC share.
+# If a method in this class is redefined by a subclass,
+# the implementation in the subclass is used.
+# @abstract
+class ICCIECC < Standard
+  def initialize
+    super()
+  end
+end

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

@@ -0,0 +1,16 @@
+# This class will hold methods that apply ICC IECC 2015
+# to a given model.
+# @todo ICC IECC 2015 is incomplete and will default to the logic
+# in the default Standard class methods
+# @ref [References::ICCIECC2015]
+class ICCIECC2015 < ICCIECC
+  @@template = 'ICC IECC 2015' # rubocop:disable Style/ClassVars
+  register_standard @@template
+  attr_reader :template
+
+  def initialize
+    super()
+    @template = @@template
+    load_standards_database
+  end
+end

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

@@ -1,6 +1,5 @@
 # This class holds methods that apply NECB2011 rules.
 # @ref [References::NECB2011]
-require 'rubyXL'
 class NECB2011 < Standard
   @template = self.new.class.name # rubocop:disable Style/ClassVars
   register_standard(@template)

data/lib/openstudio-standards/standards/necb/necb_2015/necb_2015.rb

@@ -1,6 +1,5 @@
 # This class holds methods that apply NECB2011 rules.
 # @ref [References::NECB2011]
-require 'rubyXL'
 class NECB2015 < NECB2011
   @template = self.new.class.name # rubocop:disable Style/ClassVars
   register_standard(@template)

data/lib/openstudio-standards/standards/oeesc/oeesc.rb

@@ -0,0 +1,9 @@
+# This abstract class holds methods that many versions of OEESC share.
+# If a method in this class is redefined by a subclass,
+# the implementation in the subclass is used.
+# @abstract
+class OEESC < Standard
+  def initialize
+    super()
+  end
+end

data/lib/openstudio-standards/standards/oeesc/oeesc_2014/oeesc_2014.rb

@@ -0,0 +1,16 @@
+# This class will hold methods that apply OEESC 2014
+# to a given model.
+# @todo OEESC 2014 is incomplete and will default to the logic
+# in the default Standard class methods
+# @ref [References::OEESC2014]
+class OEESC2014 < OEESC
+  @@template = 'OEESC 2014' # rubocop:disable Style/ClassVars
+  register_standard @@template
+  attr_reader :template
+
+  def initialize
+    super()
+    @template = @@template
+    load_standards_database
+  end
+end

data/lib/openstudio-standards/version.rb

@@ -13,5 +13,5 @@ module OpenstudioStandards
     end
     return 'git-not-found-on-this-system'
   end
-  VERSION = '0.2.0.rc1'.freeze
+  VERSION = '0.2.0.rc2'.freeze
 end

data/lib/openstudio-standards.rb

@@ -85,6 +85,12 @@ module OpenstudioStandards
   require_relative "#{stds}/deer/deer_2015/deer_2015"
   require_relative "#{stds}/deer/deer_2017/deer_2017"
 
+  require_relative "#{stds}/oeesc/oeesc"
+  require_relative "#{stds}/oeesc/oeesc_2014/oeesc_2014"  
+
+  require_relative "#{stds}/icc_iecc/icc_iecc"
+  require_relative "#{stds}/icc_iecc/icc_iecc_2015/icc_iecc_2015"
+
   # Files with modules
   require_relative "#{stds}/Standards.Fan"
   require_relative "#{stds}/Standards.CoilDX"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-standards
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc1
+  version: 0.2.0.rc2
 platform: ruby
 authors:
 - Andrew Parker
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.53'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.53'
 - !ruby/object:Gem::Dependency
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -1560,6 +1560,8 @@ files:
 - lib/openstudio-standards/standards/deer/deer_2015/deer_2015.rb
 - lib/openstudio-standards/standards/deer/deer_2017/deer_2017.rb
 - lib/openstudio-standards/standards/deer/deer_pre_1975/deer_pre_1975.rb
+- lib/openstudio-standards/standards/icc_iecc/icc_iecc.rb
+- lib/openstudio-standards/standards/icc_iecc/icc_iecc_2015/icc_iecc_2015.rb
 - lib/openstudio-standards/standards/necb/necb_2011/beps_compliance_path.rb
 - lib/openstudio-standards/standards/necb/necb_2011/building_envelope.rb
 - lib/openstudio-standards/standards/necb/necb_2011/data/boilers.json
@@ -1592,6 +1594,8 @@ files:
 - lib/openstudio-standards/standards/necb/necb_2011/necb_2011.rb
 - lib/openstudio-standards/standards/necb/necb_2011/service_water_heating.rb
 - lib/openstudio-standards/standards/necb/necb_2015/necb_2015.rb
+- lib/openstudio-standards/standards/oeesc/oeesc.rb
+- lib/openstudio-standards/standards/oeesc/oeesc_2014/oeesc_2014.rb
 - lib/openstudio-standards/standards/standard.rb
 - lib/openstudio-standards/utilities/convert_costing_constructions.rb
 - lib/openstudio-standards/utilities/define_thermal_zone_and_mulitpliers.rb