openstudio-standards 0.2.16 → 0.2.17.rc2

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

@@ -24,28 +24,28 @@ require "#{File.dirname(__FILE__)}/btap"
 
 class OSMArg
   ARGUMENT_TYPES = [
-    "BOOL",         
-    "STRING",       
-    "INTEGER",      
-    "FLOAT",        
+    "BOOL",
+    "STRING",
+    "INTEGER",
+    "FLOAT",
     "STRINGCHOICE",
-    "WSCHOICE"     
+    "WSCHOICE"
   ]
-        
-        
-        
-  attr_accessor :runner, 
-    :variable_name, 
+
+
+
+  attr_accessor :runner,
+    :variable_name,
     :type,
-    :required,  
+    :required,
     :model_dependant,
-    :display_name, 
-    :default_value, 
-    :min_value,  
-    :max_value,  
-    :string_choice_array,  	
+    :display_name,
+    :default_value,
+    :min_value,
+    :max_value,
+    :string_choice_array,
     :os_object_type
-        
+
   def self.bool( variable_name,display_name,required,default_value )
     raise "#{default_value} defaut value is not a bool." unless default_value.is_a?(Bool)
     default_value.respond_to?(:to_s)
@@ -53,47 +53,47 @@ class OSMArg
     arg.default_value = default_value
     return arg
   end
-        
+
   def self.string( variable_name,display_name,required,default_value )
     raise "#{default_value} defaut value is not a string." unless default_value.respond_to?(:to_s)
     arg = OSMArg.new( "STRING", variable_name, display_name, required)
     arg.default_value = default_value
     return arg
   end
-        
+
   def self.integer( variable_name,display_name,required,default_value,min_value,max_value )
     raise "#{default_value} defaut value is not a integer." unless default_value.respond_to?(:to_i)
     arg = OSMArg.new( "INTEGER", variable_name, display_name, required)
     arg.default_value = default_value
     arg.min_value = min_value
     arg.max_value = max_value
-    return arg          
+    return arg
   end
-        
+
   def self.float( variable_name, display_name, required,default_value,min_value, max_value )
     raise "#{default_value} defaut value is not a float." unless default_value.respond_to?(:to_f)
     arg = OSMArg.new( "INTEGER", variable_name, display_name, required)
     arg.default_value = default_value
     arg.min_value = min_value
     arg.max_value = max_value
-    return arg          
+    return arg
   end
-        
+
   def self.choice(variable_name,display_name,required,default_value,string_choice_array)
-    raise "#{default_value} defaut value is not an array." unless default_value.is_a?(Array)    
+    raise "#{default_value} defaut value is not an array." unless default_value.is_a?(Array)
     arg = OSMArg.new( "STRINGCHOICE", variable_name, display_name, required)
     arg.default_value = default_value
     arg.string_choice_array = string_choice_array
     return arg
   end
-        
+
   def self.wschoice( variable_name, display_name, required, default_value, os_object_type)
     arg = OSMArg.new( "WSCHOICE", variable_name, display_name, required )
     arg.default_value = default_value
     arg.os_object_type = os_object_type
-    return arg          
+    return arg
   end
-        
+
   def initialize( type, variable_name, display_name, required )
     self.type = type
     self.variable_name = variable_name
@@ -106,9 +106,9 @@ class OSMArg
       self.model_dependant = false
     end
     return self
-  end  
+  end
 end
-      
+
 
 
 
@@ -116,10 +116,10 @@ end
 module BTAP
   module Measures
     module OSMeasures
-      
-      
-      
-      
+
+
+
+
       class BTAPModelUserScript < OpenStudio::Ruleset::ModelUserScript
         #if and E+ measure replace OpenStudio::Ruleset::ModelUserScript with OpenStudio::Ruleset::WorkspaceUserScript
         #Array containing information of all inputs required by measure.
@@ -134,8 +134,8 @@ module BTAP
           "BTAPModelUserScript"
           OSMArgument.new
         end
-        
-        #this method will output the ruby macro to perform the change. 
+
+        #this method will output the ruby macro to perform the change.
         def generate_ruby_macro(model,runner)
           if @file == nil or @file == ""
             @file = "Enter_Path_To_#{self.class.name}_measure.rb_File!"
@@ -190,8 +190,8 @@ module BTAP
           if not runner.validateUserArguments(self.arguments(model),user_arguments)
             return false
           end
-          
-          #Set argument to instance variables. 
+
+          #Set argument to instance variables.
           self.argument_getter(model, runner,user_arguments)
           #will run the childs method measure_code
           result =  self.measure_code(model,runner)
@@ -201,7 +201,7 @@ module BTAP
 
         def argument_setter(model,args)
           #***boilerplate code starts. Do not edit...
-          
+
 
           #iterate through array of hashes and make arguments based on type and set
           # max and min values where applicable.
@@ -247,7 +247,7 @@ module BTAP
           unless @argument_array == nil
             @argument_array.each do |row|
               name = row.variable_name
-            
+
               case row.type
               when "BOOL"
                 value = runner.getBoolArgumentValue(name, user_arguments)
@@ -269,7 +269,7 @@ module BTAP
                 value = runner.getDoubleArgumentValue(name, user_arguments)
                 instance_variable_set("@#{name}",value)
                 @arg_table << [name,value]
-                
+
                 if ( not row.min_value.nil?  and instance_variable_get("@#{name}") < row.min_value ) or ( not row.max_value.nil? and instance_variable_get("@#{name}") > row.max_value )
                   runner.registerError("#{row.display_name} must be greater than or equal to #{row.min_value} and less than or equal to #{row.max_value}.  You entered #{instance_variable_get("@#{name}")}.")
                   return false
@@ -288,10 +288,10 @@ module BTAP
             end #end do
           end
           return @arg_table
-        end        
-        
+        end
+
       end
-      #Measure Template simplified. 
+      #Measure Template simplified.
       class TemplateModelMeasure < BTAPModelUserScript
 
         def name
@@ -391,14 +391,14 @@ module BTAP
         def run(model, runner, user_arguments)
           #run the super
           parent_method_is_true = super(model, runner, user_arguments)
-          
-          
+
+
           ###############
-          
-          #Set Archetype name in runner. 
+
+          #Set Archetype name in runner.
           runner.registerValue('archetype_name',@archetype_name)
-          
-          #Set path to OSM files. 
+
+          #Set path to OSM files.
           alternative_model_path = OpenStudio::Path.new("#{File.dirname(__FILE__)}/#{@archetype_name}.osm")
           #load model and test.
           translator = OpenStudio::OSVersion::VersionTranslator.new
@@ -561,7 +561,7 @@ module BTAP
             model = self.load_base_model_building()
             self.set_weather_file(model)
             self.set_hourly_output(model)
-          
+
             model,log = self.apply_ecms(model,@csv_data)
             BTAP::FileIO::save_osm( model, "#{output_folder}/#{BTAP::FileIO::get_name(model)}.osm") unless output_folder.nil?
             File.open("#{output_folder}/#{BTAP::FileIO::get_name(model)}.log", 'w') { |file| file.write(log) }  unless output_folder.nil?
@@ -621,7 +621,7 @@ module BTAP
           "cost_per_building"
         ]
         self.set_instance_variables( measure_values )
-        
+
         #cost per building and building area
         building = model.building.get
         raise ("you did not enter a cost for measure #{@measure_id}. All measures must have a cost of at least 0.0 .  Please add a cost_per_building field.") if @cost_per_building.nil?
@@ -753,7 +753,7 @@ module BTAP
             @total_building_construction_set_cost
           )
 
-          #Give adiabatic surfaces a construction. Does not matter what. This is a bug in Openstudio that leave these surfaces unassigned by the default construction set.
+          #Give adiabatic surfaces a construction. Does not matter what. This is a bug in OpenStudio that leave these surfaces unassigned by the default construction set.
           all_adiabatic_surfaces = BTAP::Geometry::Surfaces::filter_by_boundary_condition(model.getSurfaces, "Adiabatic")
           unless all_adiabatic_surfaces.empty?
             BTAP::Geometry::Surfaces::set_surfaces_construction( all_adiabatic_surfaces, model.building.get.defaultConstructionSet.get.defaultInteriorSurfaceConstructions.get.wallConstruction.get)
@@ -772,7 +772,7 @@ module BTAP
           "infiltration_flow_per_exterior_area",
           "infiltration_air_changes_per_hour"
         ]
-    
+
         #Set all the above instance variables to the @csv_data values or, if not set or == 'na', to nil.
         self.set_instance_variables(measure_values)
 
@@ -811,7 +811,7 @@ module BTAP
             fan.setMotorEfficiency( @fan_motor_eff ) unless @fan_motor_eff.nil?
             log  << fan.name.get.to_s << ",#{fan.fanEfficiency},#{fan.motorEfficiency}\n"
           end
-          
+
         end
 
         case @fan_volume_type
@@ -975,7 +975,9 @@ module BTAP
           model.getCoilCoolingDXSingleSpeeds.sort.each do |cooling_coil|
             cooling_coil.setRatedCOP( OpenStudio::OptionalDouble.new( @cop ) ) unless @cop.nil?
             cop = "NA"
-            cop = cooling_coil.ratedCOP.get unless cooling_coil.ratedCOP.empty?
+            # Prior to 3.5.0, it was an optional double, now it's a double
+            cop_ = OpenStudio::OptionalDouble.new(cooling_coil.ratedCOP)
+            cop = cop_.get unless cop_.empty?
             log  << cooling_coil.name.get.to_s << ",#{cop}\n"
 
           end
@@ -987,9 +989,11 @@ module BTAP
             cooling_coil.setRatedHighSpeedCOP( @cop  ) unless @cop.nil?
             cooling_coil.setRatedLowSpeedCOP(  @cop  ) unless @cop.nil?
             cop_high = "NA"
-            cop_high = cooling_coil.ratedHighSpeedCOP.get unless cooling_coil.ratedHighSpeedCOP.empty?
+            cop_ = OpenStudio::OptionalDouble.new(cooling_coil.ratedHighSpeedCOP)
+            cop_high = cop_.get unless cop_.empty?
             cop_low = "NA"
-            cop_low = cooling_coil.ratedLowSpeedCOP.get unless cooling_coil.ratedLowSpeedCOP.empty?
+            cop_ = OpenStudio::OptionalDouble.new(cooling_coil.ratedLowSpeedCOP)
+            cop_low = cop_.get unless cop_.empty?
             log  << cooling_coil.name.get.to_s << ",#{cop_high},#{cop_low}\n"
           end
         end
@@ -1296,8 +1300,8 @@ module BTAP
             @erv_nominal_electric_power,
             @erv_economizer_lockout.to_bool
           ).each { |erv| log << erv.to_s }
-          
-          
+
+
           #Add setpoint manager to all OA object in airloops.
           model.getHeatExchangerAirToAirSensibleAndLatents.sort.each do |erv|
 

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

@@ -99,7 +99,7 @@ class Vintagizer
     new_construction_set.setName(construction_id)
     constructions_model.building.get.setDefaultConstructionSet( new_construction_set.clone( constructions_model ).to_DefaultConstructionSet.get )
 
-    #Give adiabatic surfaces a construction. Does not matter what. This is a bug in Openstudio that leave these surfaces unassigned by the default construction set.
+    #Give adiabatic surfaces a construction. Does not matter what. This is a bug in OpenStudio that leave these surfaces unassigned by the default construction set.
     all_adiabatic_surfaces = BTAP::Geometry::Surfaces::filter_by_boundary_condition(constructions_model.getSurfaces, "Adiabatic")
     BTAP::Geometry::Surfaces::set_surfaces_construction( all_adiabatic_surfaces, constructions_model.building.get.defaultConstructionSet.get.defaultInteriorSurfaceConstructions.get.wallConstruction.get)
 

data/lib/openstudio-standards/hvac_sizing/Siz.HeatingCoolingFuels.rb

@@ -196,6 +196,358 @@ class OpenStudio::Model::Model
 
   end
 
+  # Get type of heat for coil for Appendix G system type selections
+  # 
+  # @param heating_coil [object] 
+  # @return string description of heat type: Fuel, Electric, District, HeatPump, Solar, Mixed
+  def coil_heat_type(heating_coil)
+    fuels = []
+    heat_type = ''
+    # Get the object type
+    obj_type = heating_coil.iddObjectType.valueName.to_s
+    case obj_type
+    when 'OS_Coil_Heating_DX_MultiSpeed'
+      heat_type = 'HeatPump'
+    when 'OS_Coil_Heating_DX_SingleSpeed'
+      heat_type = 'HeatPump'
+    when 'OS_Coil_Heating_DX_VariableRefrigerantFlow'
+      heat_type = 'HeatPump'
+    when 'OS_Coil_Heating_DX_VariableSpeed'
+      heat_type = 'HeatPump'
+    when 'OS_Coil_Heating_Desuperheater'
+      heat_type = 'Electric'
+    when 'OS_Coil_Heating_Electric'
+      heat_type = 'Electric'
+    when 'OS_Coil_Heating_Gas'
+      heat_type = 'Fuel'
+    when 'OS_Coil_Heating_Gas_MultiStage'
+      heat_type = 'Fuel'
+    when 'OS_Coil_Heating_Water'
+      heating_coil = heating_coil.to_CoilHeatingWater.get
+      if heating_coil.plantLoop.is_initialized
+        fuels += self.plant_loop_heating_fuels(heating_coil.plantLoop.get)
+      end
+    when 'OS_Coil_Heating_Water_BaseboardRadiant'
+      heating_coil = heating_coil.to_CoilHeatingWaterBaseboardRadiant.get
+        if heating_coil.plantLoop.is_initialized
+        fuels += self.plant_loop_heating_fuels(heating_coil.plantLoop.get)
+      end  
+    when 'OS_Coil_Heating_WaterToAirHeatPump_EquationFit'
+      fuels << 'Electricity'
+      heating_coil = heating_coil.to_CoilHeatingWaterToAirHeatPumpEquationFit.get
+      if heating_coil.plantLoop.is_initialized
+        fuels += self.plant_loop_heating_fuels(heating_coil.plantLoop.get)
+      end
+    when 'OS_Coil_Heating_WaterToAirHeatPump_VariableSpeedEquationFit'
+      fuels << 'Electricity'
+      heating_coil = heating_coil.to_CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit.get
+      if heating_coil.plantLoop.is_initialized
+        fuels += self.plant_loop_heating_fuels(heating_coil.plantLoop.get)
+      end
+    when 'OS_Coil_Heating_LowTemperatureRadiant_ConstantFlow'
+      heating_coil = heating_coil.to_CoilHeatingLowTempRadiantConstFlow.get
+      if heating_coil.plantLoop.is_initialized
+        fuels += self.plant_loop_heating_fuels(heating_coil.plantLoop.get)
+      end
+    when 'OS_Coil_Heating_LowTemperatureRadiant_VariableFlow'
+      heating_coil = heating_coil.to_CoilHeatingLowTempRadiantVarFlow.get
+      if heating_coil.plantLoop.is_initialized
+        fuels += self.plant_loop_heating_fuels(heating_coil.plantLoop.get)
+      end
+    when 'OS_Coil_WaterHeating_AirToWaterHeatPump'
+      heat_type = 'Electricity'
+    when 'OS_Coil_WaterHeating_Desuperheater'
+      heat_type = 'Electricity'
+    else
+      OpenStudio::logFree(OpenStudio::Debug, 'openstudio.sizing.Model', "No heating fuel types found for #{obj_type}")
+    end
+
+    has_electric = false
+    has_fuel = false
+    has_district = false
+    has_solar = false
+    has_hp = false
+    if fuels.size > 0
+      fuels.sort.each do |fuel|
+        case fuel
+        when 'Electricity'
+          has_electric = true
+        when 'DistrictHeating'
+          has_district = true
+        when 'SolarEnergy'
+          has_solar = true
+        when 'NaturalGas', 'PropaneGas', 'Coal', 'Diesel'
+          has_fuel = true
+        when 'FuelOilNo1', 'FuelOilNo2'
+          has_fuel = true
+        end
+      end
+    end
+    
+    # Choose only one heat type, or Mixed if there are multiple
+    if heat_type == ''
+      if has_fuel == true
+        heat_type = 'Fuel'
+      end
+      if has_district == true  && heat_type != 'District'
+        if heat_type == ''
+          heat_type = 'District'
+        else
+          heat_type = 'Mixed'
+        end
+      end
+      if has_electric == true && heat_type != 'Electric'
+        if heat_type == ''
+          heat_type = 'Electric'
+        else
+          heat_type = 'Mixed'
+        end
+      end
+      if has_solar == true && heat_type != 'Solar'
+        if heat_type == ''
+          heat_type = 'Solar'
+        else
+          heat_type = 'Mixed'
+        end
+      end
+      if has_hp == true && heat_type != 'HeatPump'
+        if heat_type == ''
+          heat_type = 'HeatPump'
+        elsif heat_type != 'HeatPump'
+          heat_type = 'Mixed'
+        end
+      end
+    end
+
+    return heat_type
+  end
+
+  # Get primary type of heat for one air loop for Appendix G system type selections
+  # 
+  # @param air_loop [object] 
+  # @return string description of heat type: Fuel, Electric, District, HeatPump, Solar, Mixed
+  def airloop_primary_heat_type(air_loop)
+
+    heat_types = []
+    air_loop.supplyComponents.each do |component|
+      # Get the object type
+      obj_type = component.iddObjectType.valueName.to_s
+      case obj_type
+      when 'OS_AirLoopHVAC_UnitaryHeatCool_VAVChangeoverBypass'
+        component = component.to_AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.get
+        heat_types << self.coil_heat_type(component.heatingCoil)
+      when 'OS_AirLoopHVAC_UnitaryHeatPump_AirToAir'
+        component = component.to_AirLoopHVACUnitaryHeatPumpAirToAir.get
+        heat_types << self.coil_heat_type(component.heatingCoil)
+      when 'OS_AirLoopHVAC_UnitaryHeatPump_AirToAir_MultiSpeed'
+        component = component.to_AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed.get
+        heat_types << self.coil_heat_type(component.heatingCoil)
+      when 'OS_AirLoopHVAC_UnitarySystem'
+        component = component.to_AirLoopHVACUnitarySystem.get
+        if component.heatingCoil.is_initialized
+          heat_types << self.coil_heat_type(component.heatingCoil.get)
+        end
+      when 'OS_Coil_Heating_DX_MultiSpeed'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_DX_SingleSpeed'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_DX_VariableSpeed'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_Desuperheater'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_Electric'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_Gas'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_Gas_MultiStage'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_Water'
+        heat_types << self.coil_heat_type(component)  
+      when 'OS_Coil_Heating_WaterToAirHeatPump_EquationFit'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_Heating_WaterToAirHeatPump_VariableSpeed_EquationFit'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_WaterHeating_AirToWaterHeatPump'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Coil_WaterHeating_Desuperheater'
+        heat_types << self.coil_heat_type(component)
+      when 'OS_Node', 'OS_Fan_ConstantVolume', 'OS_Fan_VariableVolume', 'OS_AirLoopHVAC_OutdoorAirSystem'
+        # To avoid extraneous debug messages  
+      else
+        #OpenStudio::logFree(OpenStudio::Debug, 'openstudio.sizing.Model', "No heating fuel types found for #{obj_type}")
+      end
+    end    
+
+    has_electric = false
+    has_fuel = false
+    has_district = false
+    has_solar = false
+    has_hp = false
+    has_mixed = false
+    if heat_types.size > 0
+      heat_types.sort.each do |heat_type|
+         case heat_type
+        when 'Electricity', 'Electric'
+          has_electric = true
+        when 'DistrictHeating', 'District'
+          has_district = true
+        when 'SolarEnergy', 'Solar'
+          has_solar = true
+        when 'NaturalGas', 'Fuel', 'PropaneGas', 'Coal', 'Diesel'
+          has_fuel = true
+        when 'FuelOilNo1', 'FuelOilNo2'
+          has_fuel = true
+        when 'HeatPump'
+          has_hp = true
+        when 'Mixed'
+          has_mixed = true
+        end
+      end
+    end
+
+    # Choose only one heat type, or Mixed if there are multiple
+    heat_type = ''
+    if has_mixed == true
+      heat_type = 'Mixed'
+    end
+    if has_fuel == true && heat_type != 'Fuel'
+      if heat_type == ''
+        heat_type = 'Fuel'
+      else
+        heat_type = 'Mixed'
+      end
+    end
+    if has_district == true && heat_type != 'District'
+      if heat_type == ''
+        heat_type = 'District'
+      else
+        heat_type = 'Mixed'
+      end
+    end
+    if has_electric == true && heat_type != 'Electric'
+      if heat_type == ''
+        heat_type = 'Electric'
+      else
+        heat_type = 'Mixed'
+      end
+    end
+    if has_solar == true && heat_type != 'Solar'
+      if heat_type == ''
+        heat_type = 'Solar'
+      else
+        heat_type = 'Mixed'
+      end
+    end
+    if has_hp == true && heat_type != 'HeatPump'
+      # Assume any additional heat types are supplemental
+      heat_type = 'HeatPump'
+    end
+
+    return heat_type
+
+  end
+
+  # Get primary type of heat for one air loop for Appendix G system type selections
+  # 
+  # @param air_loop [object] 
+  # @return string description of heat type: Fuel, Electric, District, HeatPump, Solar, Mixed
+  def zone_equipment_heat_type(zone)
+    fuels = []
+    heat_type = ''
+    # Get the heating fuels for all zone HVAC equipment
+    zone.equipment.each do |equipment|
+      # Get the object type
+      obj_type = equipment.iddObjectType.valueName.to_s
+      case obj_type
+      when 'OS_AirTerminal_SingleDuct_ConstantVolume_FourPipeInduction'
+        equipment = equipment.to_AirTerminalSingleDuctConstantVolumeFourPipeInduction.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil)
+      when 'OS_AirTerminal_SingleDuct_ConstantVolume_Reheat'
+        equipment = equipment.to_AirTerminalSingleDuctConstantVolumeReheat.get
+        heat_type = self.coil_heat_type(equipment.reheatCoil)  
+      when 'OS_AirTerminal_SingleDuct_InletSideMixer'
+        # TODO
+      when 'OS_AirTerminal_SingleDuct_ParallelPIU_Reheat'
+        equipment = equipment.to_AirTerminalSingleDuctParallelPIUReheat.get
+        heat_type = self.coil_heat_type(equipment.reheatCoil) 
+      when 'OS_AirTerminal_SingleDuct_SeriesPIU_Reheat'
+        equipment = equipment.to_AirTerminalSingleDuctSeriesPIUReheat.get
+        heat_type = self.coil_heat_type(equipment.reheatCoil) 
+      when 'OS_AirTerminal_SingleDuct_VAVHeatAndCool_Reheat'
+        equipment = equipment.to_AirTerminalSingleDuctVAVHeatAndCoolReheat.get
+        heat_type = self.coil_heat_type(equipment.reheatCoil) 
+      when 'OS_AirTerminal_SingleDuct_VAV_Reheat'
+        equipment = equipment.to_AirTerminalSingleDuctVAVReheat.get
+        heat_type = self.coil_heat_type(equipment.reheatCoil)
+      when 'OS_ZoneHVAC_Baseboard_Convective_Water'
+        equipment = equipment.to_ZoneHVACBaseboardConvectiveWater.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil) 
+      when 'OS_ZoneHVAC_Baseboard_RadiantConvective_Water'
+        equipment = equipment.to_ZoneHVACBaseboardRadiantConvectiveWater.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil) 
+      when 'OS_ZoneHVAC_FourPipeFanCoil'
+        equipment = equipment.to_ZoneHVACFourPipeFanCoil.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil) 
+      when 'OS_ZoneHVAC_LowTemperatureRadiant_ConstantFlow'
+        equipment = equipment.to_ZoneHVACLowTempRadiantConstFlow.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil) 
+      when 'OS_ZoneHVAC_LowTemperatureRadiant_VariableFlow'
+        equipment = equipment.to_ZoneHVACLowTempRadiantVarFlow.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil) 
+      when 'OS_ZoneHVAC_UnitHeater'
+        equipment = equipment.to_ZoneHVACUnitHeater.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil) 
+      when 'OS_ZoneHVAC_UnitVentilator'
+        equipment = equipment.to_ZoneHVACUnitVentilator.get
+        if equipment.heatingCoil.is_initialized
+          heat_type = self.coil_heat_type(equipment.heatingCoil.get) 
+        end 
+      when 'OS_ZoneHVAC_Baseboard_Convective_Electric'
+        heat_type = 'Electric'
+      when 'OS_ZoneHVAC_Baseboard_RadiantConvective_Electric'
+        heat_type = 'Electric'
+      when 'OS_ZoneHVAC_HighTemperatureRadiant'
+        equipment = equipment.to_ZoneHVACHighTemperatureRadiant.get
+        case equipment.fuelType
+        when 'Electricity'
+          heat_type = 'Electric'
+        when 'DistrictHeating', 'District'
+          heat_type = 'District'
+        when 'SolarEnergy', 'Solar'
+          heat_type = 'Solar'
+        when 'NaturalGas', 'Fuel', 'PropaneGas', 'Coal', 'Diesel'
+          heat_type = 'Fuel'
+        when 'FuelOilNo1', 'FuelOilNo2'
+          heat_type = 'Fuel'
+        when 'HeatPump'
+          heat_type = 'HeatPump'
+        else
+          heat_type = 'Other'
+        end
+      when 'OS_ZoneHVAC_IdealLoadsAirSystem'
+        heat_type = 'District'
+      when 'OS_ZoneHVAC_LowTemperatureRadiant_Electric'
+        heat_type = 'Electric'
+      when 'OS_ZoneHVAC_PackagedTerminalAirConditioner'
+        equipment = equipment.to_ZoneHVACPackagedTerminalAirConditioner.get
+        heat_type = self.coil_heating_fuels(equipment.heatingCoil)
+      when 'OS_ZoneHVAC_PackagedTerminalHeatPump'
+        heat_type = 'HeatPump'
+      when 'OS_ZoneHVAC_TerminalUnit_VariableRefrigerantFlow'
+        heat_type = 'HeatPump'
+      when 'OS_ZoneHVAC_WaterToAirHeatPump'
+        # We also go check what fuel serves the loop on which the WSHP heating coil is
+        equipment = equipment.to_ZoneHVACWaterToAirHeatPump.get
+        heat_type = self.coil_heat_type(equipment.heatingCoil)
+      else
+        OpenStudio::logFree(OpenStudio::Debug, 'openstudio.sizing.Model', "No heat type found for #{obj_type}")      end
+    end
+    
+    return heat_type
+    
+  end
+
+
   # Get the cooling fuel type of a cooling coil
   def coil_cooling_fuels(cooling_coil)
     fuels = []
@@ -276,10 +628,10 @@ class OpenStudio::Model::Model
         fuels += self.coil_heating_fuels(equipment.reheatCoil)  
       when 'OS_AirTerminal_SingleDuct_InletSideMixer'
         # @todo complete method
-      when 'OS_AirTerminal_SingleDuct_ParallelPIUReheat'
+      when 'OS_AirTerminal_SingleDuct_ParallelPIU_Reheat'
         equipment = equipment.to_AirTerminalSingleDuctParallelPIUReheat.get
         fuels += self.coil_heating_fuels(equipment.reheatCoil) 
-      when 'OS_AirTerminal_SingleDuct_SeriesPIUReheat'
+      when 'OS_AirTerminal_SingleDuct_SeriesPIU_Reheat'
         equipment = equipment.to_AirTerminalSingleDuctSeriesPIUReheat.get
         fuels += self.coil_heating_fuels(equipment.reheatCoil) 
       when 'OS_AirTerminal_SingleDuct_VAVHeatAndCool_Reheat'