openstudio-standards 0.1.0 → 0.1.1

data/lib/openstudio-standards/hvac_sizing/HVACSizing.CoilCoolingWaterToAirHeatPumpEquationFit.rb

@@ -4,7 +4,10 @@ class OpenStudio::Model::CoilCoolingWaterToAirHeatPumpEquationFit
 
   # Sets all auto-sizeable fields to autosize
   def autosize
-    OpenStudio::logFree(OpenStudio::Warn, "openstudio.sizing.CoilCoolingWaterToAirHeatPumpEquationFit", ".autosize not yet implemented for #{self.iddObject.type.valueDescription}.")
+    self.autosizeRatedAirFlowRate
+    self.autosizeRatedTotalCoolingCapacity
+    self.autosizeRatedSensibleCoolingCapacity
+    self.autosizeRatedWaterFlowRate
   end
 
   # Takes the values calculated by the EnergyPlus sizing routines
@@ -12,16 +15,55 @@ class OpenStudio::Model::CoilCoolingWaterToAirHeatPumpEquationFit
   # Must have previously completed a run with sql output for this to work.
   def applySizingValues
 
-    OpenStudio::logFree(OpenStudio::Warn, "openstudio.sizing.CoilCoolingWaterToAirHeatPumpEquationFit", ".applySizingValues not yet implemented for #{self.iddObject.type.valueDescription}.")
-        
+    rated_air_flow_rate = self.autosizedRatedAirFlowRate
+    if rated_air_flow_rate.is_initialized
+      self.setRatedAirFlowRate(rated_air_flow_rate.get) 
+    end
+
+    rated_total_cooling_capacity = self.autosizedRatedTotalCoolingCapacity
+    if rated_total_cooling_capacity.is_initialized
+      self.setRatedTotalCoolingCapacity(rated_total_cooling_capacity.get) 
+    end    
+
+    rated_sensible_cooling_capacity = self.autosizedRatedSensibleCoolingCapacity
+    if rated_sensible_cooling_capacity.is_initialized
+      self.setRatedSensibleCoolingCapacity(rated_sensible_cooling_capacity.get) 
+    end 
+ 
+    rated_water_flow_rate = self.autosizedRatedWaterFlowRate
+    if rated_water_flow_rate.is_initialized
+      self.setRatedWaterFlowRate(rated_water_flow_rate.get) 
+    end 
+      
+  end
+
+  # returns the autosized rated air flow rate as an optional double
+  def autosizedRatedAirFlowRate
+
+    return self.model.getAutosizedValue(self, 'Design Size Rated Air Flow Rate', 'm3/s')
+
   end
 
-  # returns the autosized design supply air flow rate as an optional double
-  # def autosizedDesignSupplyAirFlowRate
+  # returns the autosized rated total cooling capacity as an optional double
+  def autosizedRatedTotalCoolingCapacity
 
-    # return self.model.getAutosizedValue(self, 'Design Supply Air Flow Rate', 'm3/s')
+    return self.model.getAutosizedValue(self, 'Design Size Rated Total Cooling Capacity', 'W')
     
-  # end
+  end
+
+  # returns the autosized rated sensible cooling capacity as an optional double
+  def autosizedRatedSensibleCoolingCapacity
+
+    return self.model.getAutosizedValue(self, 'Design Size Rated Sensible Cooling Capacity', 'W')
+    
+  end
   
+  # returns the autosized rated water flow rate as an optional double
+  def autosizedRatedWaterFlowRate
+
+    return self.model.getAutosizedValue(self, 'Design Size Rated Water Flow Rate', 'm3/s')   
+    
+  end
+
   
 end

data/lib/openstudio-standards/hvac_sizing/HVACSizing.CoilHeatingWaterToAirHeatPumpEquationFit.rb

@@ -4,7 +4,9 @@ class OpenStudio::Model::CoilHeatingWaterToAirHeatPumpEquationFit
 
   # Sets all auto-sizeable fields to autosize
   def autosize
-    OpenStudio::logFree(OpenStudio::Warn, "openstudio.sizing.CoilHeatingWaterToAirHeatPumpEquationFit", ".autosize not yet implemented for #{self.iddObject.type.valueDescription}.")
+    self.autosizeRatedAirFlowRate
+    self.autosizeRatedHeatingCapacity
+    self.autosizeRatedWaterFlowRate
   end
 
   # Takes the values calculated by the EnergyPlus sizing routines
@@ -12,16 +14,44 @@ class OpenStudio::Model::CoilHeatingWaterToAirHeatPumpEquationFit
   # Must have previously completed a run with sql output for this to work.
   def applySizingValues
 
-    OpenStudio::logFree(OpenStudio::Warn, "openstudio.sizing.CoilHeatingWaterToAirHeatPumpEquationFit", ".applySizingValues not yet implemented for #{self.iddObject.type.valueDescription}.")
-        
+    rated_air_flow_rate = self.autosizedRatedAirFlowRate
+    if rated_air_flow_rate.is_initialized
+      self.setRatedAirFlowRate(rated_air_flow_rate.get) 
+    end
+
+    rated_total_heating_capacity = self.autosizedRatedHeatingCapacity
+    if rated_total_heating_capacity.is_initialized
+      self.setRatedTotalHeatingCapacity(rated_total_heating_capacity.get) 
+    end
+ 
+    rated_water_flow_rate = self.autosizedRatedWaterFlowRate
+    if rated_water_flow_rate.is_initialized
+      self.setRatedWaterFlowRate(rated_water_flow_rate.get) 
+    end 
+      
+  end
+
+  # returns the autosized rated air flow rate as an optional double
+  def autosizedRatedAirFlowRate
+
+    return self.model.getAutosizedValue(self, 'Design Size Rated Air Flow Rate', 'm3/s')
+
   end
 
-  # returns the autosized design supply air flow rate as an optional double
-  # def autosizedDesignSupplyAirFlowRate
+  # returns the autosized rated total Heating capacity as an optional double
+  def autosizedRatedHeatingCapacity
 
-    # return self.model.getAutosizedValue(self, 'Design Supply Air Flow Rate', 'm3/s')
+    return self.model.getAutosizedValue(self, 'Design Size Rated Heating Capacity', 'W')
     
-  # end
+  end
   
+  # returns the autosized rated water flow rate as an optional double
+  def autosizedRatedWaterFlowRate
+
+    return self.model.getAutosizedValue(self, 'Design Size Rated Water Flow Rate', 'm3/s')   
+    
+  end
+
   
 end
+

data/lib/openstudio-standards/hvac_sizing/HVACSizing.Model.rb

@@ -24,6 +24,8 @@ class OpenStudio::Model::Model
   require_relative 'HVACSizing.CoilHeatingGas'
   require_relative 'HVACSizing.CoilHeatingWater'
   require_relative 'HVACSizing.CoilHeatingDXSingleSpeed'
+  require_relative 'HVACSizing.CoilHeatingWaterToAirHeatPumpEquationFit'
+  require_relative 'HVACSizing.CoilCoolingWaterToAirHeatPumpEquationFit'
   require_relative 'HVACSizing.CoilCoolingDXSingleSpeed'
   require_relative 'HVACSizing.CoilCoolingDXTwoSpeed'
   require_relative 'HVACSizing.CoilCoolingWater'
@@ -300,6 +302,11 @@ class OpenStudio::Model::Model
     
     object_type = object.iddObject.type.valueDescription.gsub('OS:','')
       
+    # Special logic for two coil types which are inconsistently
+    # uppercase in the sqlfile:
+    object_type = object_type.upcase if object_type == 'Coil:Cooling:WaterToAirHeatPump:EquationFit'
+    object_type = object_type.upcase if object_type == 'Coil:Heating:WaterToAirHeatPump:EquationFit'
+      
     sql = self.sqlFile
     
     if sql.is_initialized

data/lib/openstudio-standards/hvac_sizing/HVACSizing.PumpVariableSpeed.rb

@@ -51,7 +51,7 @@ class OpenStudio::Model::PumpVariableSpeed
       col_name = 'Design Power Consumption'
     end  
    
-    return self.model.getAutosizedValue(self, col_name, 'm3/s')
+    return self.model.getAutosizedValue(self, col_name, 'W')
     
   end  
   

data/lib/openstudio-standards/prototypes/Prototype.AirTerminalSingleDuctVAVReheat.rb

@@ -10,15 +10,20 @@ class OpenStudio::Model::AirTerminalSingleDuctVAVReheat
   # @param zone_oa_per_area [Double] the zone outdoor air per area, m^3/s
   # @return [Bool] returns true if successful, false if not
   # @todo remove exception where older vintages don't have minimum positions adjusted.
-  def set_initial_prototype_damper_position(building_vintage, zone_oa_per_area)
+  def set_initial_prototype_damper_position(building_type, building_vintage, zone_oa_per_area)
  
     # Minimum damper position is based on prototype
     # assumptions, which are not clearly documented.
     min_damper_position = nil
+    vav_name = self.name.get
     case building_vintage       
-    when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004', '90.1-2004'
-      min_damper_position = 0.3
-    when '90.1-2007'
+    when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
+      if building_type == "Outpatient" and vav_name.include? "Floor 1" 
+        min_damper_position = 1
+      else
+        min_damper_position = 0.3
+      end
+    when '90.1-2004', '90.1-2007'
       min_damper_position = 0.3
     when '90.1-2010', '90.1-2013'
       min_damper_position = 0.2
@@ -34,7 +39,11 @@ class OpenStudio::Model::AirTerminalSingleDuctVAVReheat
         self.setConstantMinimumAirFlowFraction(min_damper_position)
       else
         # High OA zones
-        self.setConstantMinimumAirFlowFraction(0.7)
+        if building_type == "Outpatient"
+          self.setConstantMinimumAirFlowFraction(1)
+        else
+          self.setConstantMinimumAirFlowFraction(0.7)
+        end
       end
     else
       # Low OA zones

data/lib/openstudio-standards/prototypes/Prototype.Model.hvac.rb

@@ -37,7 +37,7 @@ class OpenStudio::Model::Model
           chilled_water_loop = self.getPlantLoopByName('Chilled Water Loop').get
         else
           condenser_water_loop = nil
-          if prototype_input['chiller_condenser_type'] == 'WaterCooled'
+          if prototype_input['chiller_cooling_type'] == 'WaterCooled'
             condenser_water_loop = self.add_cw_loop()
           end
           
@@ -115,7 +115,7 @@ class OpenStudio::Model::Model
         # Special logic to make a heat pump loop if necessary
         heat_pump_loop = nil
         if prototype_input['pszac_heating_type'] == 'Water To Air Heat Pump'
-          heat_pump_loop = add_hp_loop(prototype_input)
+          heat_pump_loop = add_hp_loop(building_type)
         end
       
         self.add_psz_ac(building_vintage, 
@@ -139,6 +139,8 @@ class OpenStudio::Model::Model
         hot_water_loop = nil
         if self.getPlantLoopByName('Hot Water Loop').is_initialized
           hot_water_loop = self.getPlantLoopByName('Hot Water Loop').get
+        elsif building_type == 'MediumOffice'
+          hot_water_loop = nil
         else
           hot_water_loop = self.add_hw_loop('NaturalGas')
         end      
@@ -149,7 +151,8 @@ class OpenStudio::Model::Model
                       prototype_input['vav_operation_schedule'],
                       prototype_input['vav_oa_damper_schedule'],
                       hot_water_loop,
-                      return_plenum)
+                      return_plenum, 
+                      building_type)
       
       when 'DOAS'
       
@@ -169,7 +172,7 @@ class OpenStudio::Model::Model
           chilled_water_loop = self.getPlantLoopByName('Chilled Water Loop').get
         else
           condenser_water_loop = nil
-          if prototype_input['chiller_condenser_type'] == 'WaterCooled'
+          if prototype_input['chiller_cooling_type'] == 'WaterCooled'
             condenser_water_loop = self.add_cw_loop()
           end
           
@@ -210,7 +213,7 @@ class OpenStudio::Model::Model
         if self.getPlantLoopByName('Heat Pump Loop').is_initialized
           heat_pump_loop = self.getPlantLoopByName('Heat Pump Loop').get
         else
-          heat_pump_loop = self.add_hp_loop()
+          heat_pump_loop = self.add_hp_loop(building_type)
         end
       
         self.add_data_center_hvac(building_vintage,
@@ -266,6 +269,13 @@ class OpenStudio::Model::Model
                             system['balanced_exhaust_fraction_schedule_name'],
                             thermal_zones)
 
+      when 'Zone Ventilation'
+      
+        self.add_zone_ventilation(system['availability_sch_name'],
+                                  system['flow_rate'],
+                                  system['ventilation_type'],
+                                  thermal_zones)
+
       when 'Refrigeration'
       
         self.add_refrigeration(building_vintage,

data/lib/openstudio-standards/prototypes/Prototype.Model.rb

@@ -23,6 +23,14 @@ class OpenStudio::Model::Model
   # @example Create a Small Office, 90.1-2010, in ASHRAE Climate Zone 5A (Chicago)
   #   model.create_prototype_building('SmallOffice', '90.1-2010', 'ASHRAE 169-2006-5A')
   def create_prototype_building(building_type, building_vintage, climate_zone, sizing_run_dir = Dir.pwd, debug = false)
+    
+    # There are no reference models for HighriseApartment at vintages Pre-1980 and 1980-2004. This is a quick check.
+    if building_type == "HighriseApartment"
+      if building_vintage == 'DOE Ref Pre-1980' or building_vintage == 'DOE Ref 1980-2004'
+        OpenStudio::logFree(OpenStudio::Error, 'Not available', "DOE Reference models for #{building_type} at vintage #{building_vintage} are not available, the measure is disabled for this specific type.")
+        return false
+      end
+    end
 
     lookup_building_type = self.get_lookup_name(building_type)
 
@@ -56,8 +64,14 @@ class OpenStudio::Model::Model
     self.add_occupancy_sensors(building_type, building_vintage, climate_zone)
     self.add_design_days_and_weather_file(building_type, building_vintage, climate_zone)
     self.set_sizing_parameters(building_type, building_vintage)
-    self.yearDescription.get.setDayofWeekforStartDay('Sunday')  
-    
+    self.yearDescription.get.setDayofWeekforStartDay('Sunday')
+
+    # set climate zone and building type
+    self.getBuilding.setStandardsBuildingType(building_type)
+    if climate_zone.include? 'ASHRAE 169-2006-'
+      self.getClimateZones.setClimateZone("ASHRAE",climate_zone.gsub('ASHRAE 169-2006-',''))
+    end
+
     # Perform a sizing run
     if self.runSizingRun("#{sizing_run_dir}/SizingRun1") == false
       return false
@@ -80,6 +94,14 @@ class OpenStudio::Model::Model
     # which include sizing the fan pressure rises based
     # on the flow rate of the system.
     self.applyPrototypeHVACAssumptions(building_type, building_vintage, climate_zone)
+        
+    # for 90.1-2010 Outpatient, AHU2 set minimum outdoor air flow rate as 0
+    # AHU1 doesn't have economizer
+    if building_type == "Outpatient"
+      self.modify_OAcontroller(building_vintage)
+      # For operating room 1&2 in 2010 and 2013, VAV minimum air flow is set by schedule
+      self.reset_or_room_vav_minimum_damper(prototype_input, building_vintage)
+    end
 
     # Apply the HVAC efficiency standard
     self.applyHVACEfficiencyStandard(building_vintage, climate_zone)
@@ -706,7 +728,7 @@ class OpenStudio::Model::Model
 
     # This map define the multipliers for spaces with multipliers not equals to 1
     case building_type
-    when 'LargeHotel', 'MidriseApartment','LargeOffice'
+    when 'LargeHotel', 'MidriseApartment','LargeOffice','Hospital'
       space_multiplier_map = self.define_space_multiplier
     else
       space_multiplier_map ={}
@@ -949,40 +971,40 @@ class OpenStudio::Model::Model
   # @todo Consistency - make prototype and reference vintages consistent
   # @todo Add 90.1-2013?
   def modify_infiltration_coefficients(building_type, building_vintage, climate_zone)
-  # Select the terrain type, which
-  # impacts wind speed, and in turn infiltration
-  terrain = 'City'
-  case building_vintage
-  when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
-    case building_type
-    when 'Warehouse'
-    terrain = 'Urban'
-    when 'SmallHotel'
-    terrain = 'Suburbs'
-  end
-end
-# Set the terrain type
-self.getSite.setTerrain(terrain)
-
-    # modify the infiltration coefficients for 90.1-2004, 90.1-2007, 90.1-2010, 90.1-2013
-    return true unless building_vintage == '90.1-2004' or building_vintage == '90.1-2007' or building_vintage == '90.1-2010' or building_vintage == '90.1-2013'
-
-    # The pre-1980 and 1980-2004 buildings have this:
-    # 1.0000,                  !- Constant Term Coefficient
-    # 0.0000,                  !- Temperature Term Coefficient
-    # 0.0000,                  !- Velocity Term Coefficient
-    # 0.0000;                  !- Velocity Squared Term Coefficient
-    # The 90.1-2010 buildings have this:
-    # 0.0000,                  !- Constant Term Coefficient
-    # 0.0000,                  !- Temperature Term Coefficient
-    # 0.224,                   !- Velocity Term Coefficient
-    # 0.0000;                  !- Velocity Squared Term Coefficient
-    self.getSpaceInfiltrationDesignFlowRates.each do |infiltration|
-      infiltration.setConstantTermCoefficient(0.0)
-      infiltration.setTemperatureTermCoefficient(0.0)
-      infiltration.setVelocityTermCoefficient(0.224)
-      infiltration.setVelocitySquaredTermCoefficient(0.0)
+    # Select the terrain type, which
+    # impacts wind speed, and in turn infiltration
+    terrain = 'City'
+    case building_vintage
+    when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
+      case building_type
+      when 'Warehouse'
+      terrain = 'Urban'
+      when 'SmallHotel'
+      terrain = 'Suburbs'
+      end
     end
+    # Set the terrain type
+    self.getSite.setTerrain(terrain)
+  
+      # modify the infiltration coefficients for 90.1-2004, 90.1-2007, 90.1-2010, 90.1-2013
+      return true unless building_vintage == '90.1-2004' or building_vintage == '90.1-2007' or building_vintage == '90.1-2010' or building_vintage == '90.1-2013'
+  
+      # The pre-1980 and 1980-2004 buildings have this:
+      # 1.0000,                  !- Constant Term Coefficient
+      # 0.0000,                  !- Temperature Term Coefficient
+      # 0.0000,                  !- Velocity Term Coefficient
+      # 0.0000;                  !- Velocity Squared Term Coefficient
+      # The 90.1-2010 buildings have this:
+      # 0.0000,                  !- Constant Term Coefficient
+      # 0.0000,                  !- Temperature Term Coefficient
+      # 0.224,                   !- Velocity Term Coefficient
+      # 0.0000;                  !- Velocity Squared Term Coefficient
+      self.getSpaceInfiltrationDesignFlowRates.each do |infiltration|
+        infiltration.setConstantTermCoefficient(0.0)
+        infiltration.setTemperatureTermCoefficient(0.0)
+        infiltration.setVelocityTermCoefficient(0.224)
+        infiltration.setVelocitySquaredTermCoefficient(0.0)
+      end
   end
 
   # Sets the inside and outside convection algorithms for different vintages
@@ -1021,7 +1043,7 @@ self.getSite.setTerrain(terrain)
     case building_vintage
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       case building_type
-      when 'PrimarySchool', 'SecondarySchool'
+      when 'PrimarySchool', 'SecondarySchool', 'Outpatient'
         clg = 1.5
         htg = 1.5
       when 'LargeHotel'

data/lib/openstudio-standards/prototypes/Prototype.Model.swh.rb

@@ -78,7 +78,8 @@ class OpenStudio::Model::Model
                                 building_type)
 
         end
-      
+
+=begin      
       elsif building_type == 'LargeHotel'
       
         # Add water use equipment to each space
@@ -170,6 +171,7 @@ class OpenStudio::Model::Model
                               space_name,
                               building_type)
         end
+=end
  
       elsif prototype_input['main_service_water_peak_flowrate']
         
@@ -190,7 +192,7 @@ class OpenStudio::Model::Model
         space_type_map.each do |space_type_name, space_names|
           search_criteria = {
             'template' => building_vintage,
-            'building_type' => building_type,
+            'building_type' => get_lookup_name(building_type),
             'space_type' => space_type_name
           }
           data = find_object($os_standards['space_types'],search_criteria)
@@ -205,7 +207,7 @@ class OpenStudio::Model::Model
           space_names.each do |space_name|
             space = self.getSpaceByName(space_name).get
             space_multiplier = space.multiplier
-            self.add_swh_end_uses_by_space(building_type,
+            self.add_swh_end_uses_by_space(get_lookup_name(building_type),
                                           building_vintage,
                                           climate_zone,
                                           main_swh_loop,

data/lib/openstudio-standards/prototypes/Prototype.hospital.rb

@@ -25,7 +25,7 @@ class OpenStudio::Model::Model
         'PatRoom7_Mult10_Flr_3', 'PatRoom8_Flr_3', 'PatRoom1_Mult10_Flr_4', 'PatRoom2_Flr_4', 'PatRoom3_Mult10_Flr_4', 'PatRoom4_Flr_4', 'PatRoom5_Mult10_Flr_4', 
         'PatRoom6_Flr_4', 'PatRoom7_Mult10_Flr_4', 'PatRoom8_Flr_4', ],
       'PhysTherapy' => ['PhysTherapy_Flr_3', ],
-      'Radiology' => ['Radiology_Flr_4', ]
+      'Radiology' => ['Radiology_Flr_4', ]  # total number of zones: 55 - equals to the IDF
     }
     return space_type_map
   end
@@ -83,41 +83,101 @@ class OpenStudio::Model::Model
           'type' => 'CAV',
           'space_names' => [
             'Kitchen_Flr_5'
-          ]
-      }
+          ]                     # 55 spaces assigned.
+      },
+	  {
+            'type' => 'Refrigeration',
+            'case_type' => 'Walkin Freezer',
+            'cooling_capacity_per_length' => 734,
+            'length' => 10.98,
+            'evaporator_fan_pwr_per_length' => 69,
+            'lighting_per_length' => 33,
+            'lighting_sch_name' => 'Hospital BLDG_LIGHT_SCH',
+            'defrost_pwr_per_length' => 364,
+            'restocking_sch_name' => 'Hospital Kitchen_Flr_5_Case:1_WALKINFREEZER_WalkInStockingSched',
+            'cop' => 1.5,
+            'cop_f_of_t_curve_name' => 'RACK1_RackCOPfTCurve',
+            'condenser_fan_pwr' => 1000,
+            'condenser_fan_pwr_curve_name' => 'RACK1_RackCondFanCurve2',
+            'space_names' =>
+            [
+                'Kitchen_Flr_5'
+            ]
+        },
+	  {
+            'type' => 'Refrigeration',
+            'case_type' => 'Display Case',
+            'cooling_capacity_per_length' => 886.5,
+            'length' => 8.93,
+            'evaporator_fan_pwr_per_length' => 67,
+            'lighting_per_length' => 40,
+            'lighting_sch_name' => 'Hospital BLDG_LIGHT_SCH',
+            'defrost_pwr_per_length' => 0.0,
+            'restocking_sch_name' => 'Hospital Kitchen_Flr_5_Case:2_SELFCONTAINEDDISPLAYCASE_CaseStockingSched',
+            'cop' => 3.0,
+            'cop_f_of_t_curve_name' => 'RACK2_RackCOPfTCurve',
+            'condenser_fan_pwr' => 1000,
+            'condenser_fan_pwr_curve_name' => 'RACK1_RackCondFanCurve2',
+            'space_names' =>
+            [
+                'Kitchen_Flr_5'
+            ]
+        }
     ]
     return system_to_space_map
   end
-     
+    
+  def define_space_multiplier
+    # This map define the multipliers for spaces with multipliers not equals to 1
+    space_multiplier_map = {
+      'ER_Exam1_Mult4_Flr_1' => 4,
+      'ER_Exam3_Mult4_Flr_1' => 4,
+      'ER_Triage_Mult4_Flr_1' => 4,
+      'Office1_Mult4_Flr_1' => 5,
+      'OR2_Mult5_Flr_2' => 5,
+      'IC_PatRoom1_Mult5_Flr_2' => 5,
+      'IC_PatRoom3_Mult6_Flr_2' => 6,
+	  'PatRoom1_Mult10_Flr_3' => 10,
+	  'PatRoom3_Mult10_Flr_3' => 10,
+	  'PatRoom5_Mult10_Flr_3' => 10, 
+	  'PatRoom7_Mult10_Flr_3' => 10,
+	  'PatRoom1_Mult10_Flr_4' => 10,
+	  'PatRoom3_Mult10_Flr_4' => 10,
+	  'PatRoom5_Mult10_Flr_4' => 10,
+	  'PatRoom7_Mult10_Flr_4' => 10,
+	  'Office2_Mult5_Flr_5' => 5,
+	  'Office4_Mult6_Flr_5' => 6
+    }
+    return space_multiplier_map
+  end
+    
+    
+ 
   def custom_hvac_tweaks(building_type, building_vintage, climate_zone, prototype_input)
    
     return true
     
   end
-
-  def add_swh(building_type, building_vintage, climate_zone, prototype_input, hvac_standards)
-   
-    OpenStudio::logFree(OpenStudio::Info, "openstudio.model.Model", "Started Adding SWH")
-
-    main_swh_loop = self.add_swh_loop(prototype_input, hvac_standards, 'main')
-    water_heaters = main_swh_loop.supplyComponents(OpenStudio::Model::WaterHeaterMixed::iddObjectType)
-    
-    water_heaters.each do |water_heater|
-      water_heater = water_heater.to_WaterHeaterMixed.get
-      # water_heater.setAmbientTemperatureIndicator('Zone')
-      # water_heater.setAmbientTemperatureThermalZone(default_water_heater_ambient_temp_sch)
-      water_heater.setOffCycleParasiticFuelConsumptionRate(720)
-      water_heater.setOnCycleParasiticFuelConsumptionRate(720)
-      water_heater.setOffCycleLossCoefficienttoAmbientTemperature(7.561562668)
-      water_heater.setOnCycleLossCoefficienttoAmbientTemperature(7.561562668)
-    end
-
-    self.add_swh_end_uses(prototype_input, hvac_standards, main_swh_loop, 'main')
-    
-    OpenStudio::logFree(OpenStudio::Info, "openstudio.model.Model", "Finished adding SWH")
+  
+  def update_waterheater_loss_coefficient(building_vintage)
+    case building_vintage
+    when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
+      self.getWaterHeaterMixeds.sort.each do |water_heater|
+        water_heater.setOffCycleLossCoefficienttoAmbientTemperature(0.798542707)
+        water_heater.setOnCycleLossCoefficienttoAmbientTemperature(0.798542707)
+      end
+    end      
+  end  
+  
+  def custom_swh_tweaks(building_type, building_vintage, climate_zone, prototype_input)
     
+    self.update_waterheater_loss_coefficient(building_vintage)
+  
     return true
     
-  end #add swh    
+  end
 
 end
+ 
+
+