openstudio-standards 0.2.15.pre.rc2 → 0.2.16.rc2

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

@@ -20,8 +20,8 @@ module BTAP
         " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Electricity' AND RowName='Electricity:Facility'" +
         " AND ColumnName='Electricity Maximum Value' AND Units='W'")
     natural_gas_peak = model.sqlFile().get().execAndReturnFirstDouble("SELECT Value FROM tabulardatawithstrings WHERE ReportName='EnergyMeters'" +
-        " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Gas' AND RowName='Gas:Facility'" +
-        " AND ColumnName='Gas Maximum Value' AND Units='W'")
+        " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Natural Gas' AND RowName='NaturalGas:Facility'" +
+        " AND ColumnName='Natural Gas Maximum Value' AND Units='W'")
 
     # Create hash to store all the collected data. 
     qaqc = {}

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

@@ -215,8 +215,8 @@ module BTAP
       end
 
       natural_gas_peak = model.sqlFile().get().execAndReturnFirstDouble("SELECT Value FROM tabulardatawithstrings WHERE ReportName='EnergyMeters'" +
-          " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Gas' AND RowName='Gas:Facility'" +
-          " AND ColumnName='Gas Maximum Value' AND Units='W'")
+          " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Natural Gas' AND RowName='NaturalGas:Facility'" +
+          " AND ColumnName='Natural Gas Maximum Value' AND Units='W'")
       if natural_gas_peak.empty?
         natural_gas_peak = 0.0
       end

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

@@ -472,8 +472,8 @@ module BTAP
         end
 
         natural_gas_peak = model.sqlFile().get().execAndReturnFirstDouble("SELECT Value FROM tabulardatawithstrings WHERE ReportName='EnergyMeters'" +
-            " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Gas' AND RowName='Gas:Facility'" +
-            " AND ColumnName='Gas Maximum Value' AND Units='W'")
+            " AND ReportForString='Entire Facility' AND TableName='Annual and Peak Values - Natural Gas' AND RowName='NaturalGas:Facility'" +
+            " AND ColumnName='Natural Gas Maximum Value' AND Units='W'")
         if natural_gas_peak.empty?
           natural_gas_peak = 0.0
         end

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

@@ -54,60 +54,6 @@ class OpenStudio::Model::ControllerOutdoorAir
     end
     air_loop = oa_sys.airLoop.get
 
-    # Determine if the system is multizone
-    multizone = false
-    if air_loop.thermalZones.size > 1
-      multizone = true
-    end
-
-    # Determine if the system is variable volume
-    vav = false
-    air_loop.supplyComponents.reverse.each do |comp|
-      if comp.to_FanVariableVolume.is_initialized
-        vav = true
-      elsif comp.to_AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.is_initialized
-        fan = comp.to_AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.get.supplyAirFan
-        if fan.to_FanVariableVolume.is_initialized
-          vav = true
-        end
-      elsif comp.to_AirLoopHVACUnitarySystem.is_initialized
-        fan = comp.to_AirLoopHVACUnitarySystem.get.supplyFan
-        if fan.is_initialized
-          if fan.get.to_FanVariableVolume.is_initialized
-            vav = true
-          end
-        end
-      end
-    end
-    
-    # If it is a multizone VAV system, get the system multiplier
-    # to work around the bug in EnergyPlus.
-    if multizone && vav
-      if oa.is_initialized
-        oa_val = oa.get
-        
-        # Get the system multiplier
-        mult = 1
-
-        # Get all the zone multipliers
-        zn_mults = []
-        air_loop.thermalZones.each do |zone|
-          zn_mults << zone.multiplier
-        end
-     
-        # Warn if there are different multipliers
-        uniq_mults = zn_mults.uniq
-        if uniq_mults.size > 1
-          OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.AirLoopHVAC', "For #{air_loop.name}: not all zones on the system have an identical zone multiplier.  Multipliers are: #{uniq_mults.join(', ')}.")
-        else
-          mult = uniq_mults[0]
-        end
-
-        oa_val = oa_val * mult
-        oa = OpenStudio::OptionalDouble.new(oa_val)
-      end
-    end
-
     return oa
   end
 end

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

@@ -263,6 +263,11 @@ class OpenStudio::Model::Model
       # Get the object type
       obj_type = equipment.iddObjectType.valueName.to_s
       case obj_type
+      when 'OS_AirLooHVAC_UnitarySystem'
+        equipment = equipment.to_AirLoopHVACUnitarySystem.get
+        if equipment.heatingCoil.is_initialized
+          fuels += self.coil_heating_fuels(equipment.heatingCoil.get)
+        end
       when 'OS_AirTerminal_SingleDuct_ConstantVolume_FourPipeInduction'
         equipment = equipment.to_AirTerminalSingleDuctConstantVolumeFourPipeInduction.get
         fuels += self.coil_heating_fuels(equipment.heatingCoil)
@@ -350,7 +355,12 @@ class OpenStudio::Model::Model
     zone.equipment.each do |equipment|
       # Get the object type
       obj_type = equipment.iddObjectType.valueName.to_s
-      case obj_type    
+      case obj_type
+      when 'OS_AirLoopHVAC_UnitarySystem'
+        equipment = equipment.to_AirLoopHVACUnitarySystem.get
+        if equipment.coolingCoil.is_initialized
+          fuels += self.coil_cooling_fuels(equipment.coolingCoil.get)
+        end
       when 'OS_AirTerminal_SingleDuct_ConstantVolume_CooledBeam'
         equipment = equipment.to_AirTerminalSingleDuctConstantVolumeCooledBeam.get
         fuels += self.coil_cooling_fuels(equipment.coilCoolingCooledBeam)

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

@@ -281,7 +281,7 @@ class OpenStudio::Model::Model
 
     result = OpenStudio::OptionalDouble.new
 
-    name = object.name.get.upcase
+    name = object.name.get.upcase.strip
 
     object_type = object.iddObject.type.valueDescription.gsub('OS:','')
 

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

@@ -236,7 +236,7 @@ class OpenStudio::Model::ThermalZone
   # serving those air loops.
   #
   # return [Array<String>] An array. Possible values are 
-  # Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2,
+  # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
   # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating, 
   # and SolarEnergy.
   def heating_fuels
@@ -278,7 +278,7 @@ class OpenStudio::Model::ThermalZone
   # serving those air loops.
   #
   # return [Array<String>] An array. Possible values are
-  # Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2,
+  # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
   # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating, 
   # and SolarEnergy.
   def cooling_fuels

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

@@ -9,6 +9,27 @@ module College
   # @param prototype_input [Hash] hash of prototype inputs
   # @return [Bool] returns true if successful, false if not
   def model_custom_hvac_tweaks(model, building_type, climate_zone, prototype_input)
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
+
+    model.getSpaces.each do |space|
+      if space.name.get.to_s == 'CB_PUBLIC_ELEVATORS_F1'
+        model_add_elevator(model,
+                           space,
+                           prototype_input['number_of_elevators'],
+                           prototype_input['elevator_type'],
+                           prototype_input['elevator_schedule'],
+                           prototype_input['elevator_fan_schedule'],
+                           prototype_input['elevator_fan_schedule'],
+                           building_type)
+      end
+    end
+
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
+
+    # add extra infiltration for entry door
+    add_door_infiltration(climate_zone, model)
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Added door infiltration')
+  
     return true
   end
 
@@ -25,7 +46,7 @@ module College
     infiltration_entrydoor.setName('entry door Infiltration')
     infiltration_per_zone_entrydoor = 0
     if template == '90.1-2004'
-      infiltration_per_zone_entrydoor = 7.678585
+      infiltration_per_zone_entrydoor = 4.566024
       infiltration_entrydoor.setSchedule(model_add_schedule(model, 'College INFIL_Door_Opening_SCH'))
     elsif template == '90.1-2007'
       case climate_zone
@@ -35,10 +56,10 @@ module College
         'ASHRAE 169-2006-4A',
         'ASHRAE 169-2006-4B',
         'ASHRAE 169-2006-4C'
-        infiltration_per_zone_entrydoor = 5.600600
+        infiltration_per_zone_entrydoor = 3.204085
         infiltration_entrydoor.setSchedule(model_add_schedule(model, 'College INFIL_Door_Opening_SCH'))
       else
-        infiltration_per_zone_entrydoor = 7.678585
+        infiltration_per_zone_entrydoor = 4.566024
         infiltration_entrydoor.setSchedule(model_add_schedule(model, 'College INFIL_Door_Opening_SCH'))
       end
     elsif template == '90.1-2010' || template == '90.1-2013'
@@ -46,10 +67,10 @@ module College
       when 'ASHRAE 169-2006-3A',
         'ASHRAE 169-2006-3B',
         'ASHRAE 169-2006-3C'
-        infiltration_per_zone_entrydoor = 5.600600
+        infiltration_per_zone_entrydoor = 3.204085
         infiltration_entrydoor.setSchedule(model_add_schedule(model, 'College INFIL_Door_Opening_SCH'))
       else
-        infiltration_per_zone_entrydoor = 7.678585
+        infiltration_per_zone_entrydoor = 4.566024
         infiltration_entrydoor.setSchedule(model_add_schedule(model, 'College INFIL_Door_Opening_SCH'))
       end
     end

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

@@ -11,6 +11,15 @@ module Laboratory
   def model_custom_hvac_tweaks(model, building_type, climate_zone, prototype_input)
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
 
+    # get the fume hood space type and exhaust ACH
+    fume_hood_exhaust_ach = nil
+    model.getSpaceTypes.each do |spc_type|
+      next unless spc_type.name.get.to_s.downcase.include? 'fume hood'
+
+      spc_type_properties = space_type_get_standards_data(spc_type)
+      fume_hood_exhaust_ach = spc_type_properties['ventilation_air_changes'].to_f
+    end
+
     # For fume hood, the OA rate varies with the fume hood schedule
     # So add "Proportional Control Minimum Outdoor Air Flow Rate Schedule"
     # at the mean time, modify "Outdoor Air Method" to "ProportionalControlBasedOnDesignOARate" in Controller:MechanicalVentilation of the DOAS
@@ -19,6 +28,11 @@ module Laboratory
 
       ventilation = space.designSpecificationOutdoorAir.get
       ventilation.setOutdoorAirFlowRateFractionSchedule(model_add_schedule(model, 'Lab_FumeHood_Sch'))
+
+      # add exhaust fan to fume hood zone
+      fume_hood_zone_volume = space.volume
+      flow_rate_fume_hood = fume_hood_zone_volume * fume_hood_exhaust_ach / 3600.0
+      model_add_exhaust_fan(model, [space.thermalZone.get], flow_rate: flow_rate_fume_hood,  flow_fraction_schedule_name: 'Lab_FumeHood_Sch')
     end
 
     # adjust doas sizing
@@ -38,12 +52,6 @@ module Laboratory
       end
     end
 
-    # @todo add exhaust fan to fume hood zone
-    #   search_criteria = ...
-    #   fume_hood_space = model_find_object(standards_data['Space Types'], search_criteria)
-    #   fume_hood_zone_volume = fume_hood_space.getVolume...
-    #   flow_rate_fume_hood = fume_hood_zone_volume * fume_hood_space['Ventilation_Air_Changes...']
-    #   model_add_exhaust_fan(model, thermal_zones, flow_rate=flow_rate_fume_hood,  flow_fraction_schedule_name='Lab_FumeHood_Sch')
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
     return true
   end

data/lib/openstudio-standards/prototypes/common/objects/Prototype.BoilerHotWater.rb

@@ -11,9 +11,9 @@ class Standard
   # @param nominal_thermal_efficiency [Double] boiler nominal thermal efficiency
   # @param eff_curve_temp_eval_var [String] LeavingBoiler or EnteringBoiler temperature for the boiler efficiency curve
   # @param flow_mode [String] boiler flow mode
-  # @param lvg_temp_dsgn [Double] boiler leaving design temperature, degrees Fahrenheit
+  # @param lvg_temp_dsgn_f [Double] boiler leaving design temperature in degrees Fahrenheit
   #   note that this field is deprecated in OS versions 3.0+
-  # @param out_temp_lmt [Double] boiler outlet temperature limit, degrees Fahrenheit
+  # @param out_temp_lmt_f [Double] boiler outlet temperature limit in degrees Fahrenheit
   # @param min_plr [Double] boiler minimum part load ratio
   # @param max_plr [Double] boiler maximum part load ratio
   # @param opt_plr [Double] boiler optimum part load ratio
@@ -27,8 +27,8 @@ class Standard
                               nominal_thermal_efficiency: 0.80,
                               eff_curve_temp_eval_var: 'LeavingBoiler',
                               flow_mode: 'LeavingSetpointModulated',
-                              lvg_temp_dsgn: 180.0,
-                              out_temp_lmt: 203.0, # 95C
+                              lvg_temp_dsgn_f: 180.0, # 82.22 degrees Celsius
+                              out_temp_lmt_f: 203.0, # 95.0 degrees Celsius
                               min_plr: 0.0,
                               max_plr: 1.2,
                               opt_plr: 1.0,
@@ -48,6 +48,8 @@ class Standard
 
     if fuel_type.nil? || fuel_type == 'Gas'
       boiler.setFuelType('NaturalGas')
+    elsif fuel_type == 'Propane' || fuel_type == 'PropaneGas'
+      boiler.setFuelType('Propane')
     else
       boiler.setFuelType(fuel_type)
     end
@@ -71,23 +73,24 @@ class Standard
     end
 
     if model.version < OpenStudio::VersionString.new('3.0.0')
-      if lvg_temp_dsgn.nil?
+      if lvg_temp_dsgn_f.nil?
         boiler.setDesignWaterOutletTemperature(OpenStudio.convert(180.0, 'F', 'C').get)
       else
-        boiler.setDesignWaterOutletTemperature(OpenStudio.convert(lvg_temp_dsgn, 'F', 'C').get)
+        boiler.setDesignWaterOutletTemperature(OpenStudio.convert(lvg_temp_dsgn_f, 'F', 'C').get)
       end
     end
 
-    if !out_temp_lmt.nil?
+    if out_temp_lmt_f.nil?
       boiler.setWaterOutletUpperTemperatureLimit(OpenStudio.convert(203.0, 'F', 'C').get)
     else
-      boiler.setWaterOutletUpperTemperatureLimit(OpenStudio.convert(out_temp_lmt, 'F', 'C').get)
+      boiler.setWaterOutletUpperTemperatureLimit(OpenStudio.convert(out_temp_lmt_f, 'F', 'C').get)
     end
 
     # logic to set different defaults for condensing boilers if not specified
     if draft_type == 'Condensing'
       if model.version < OpenStudio::VersionString.new('3.0.0')
-        boiler.setDesignWaterOutletTemperature(OpenStudio.convert(120.0, 'F', 'C').get) if lvg_temp_dsgn.nil?
+        # default to 120 degrees Fahrenheit (48.49 degrees Celsius)
+        boiler.setDesignWaterOutletTemperature(OpenStudio.convert(120.0, 'F', 'C').get) if lvg_temp_dsgn_f.nil?
       end
       boiler.setNominalThermalEfficiency(0.96) if nominal_thermal_efficiency.nil?
     end

data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilCoolingWaterToAirHeatPumpEquationFit.rb

@@ -44,22 +44,41 @@ class Standard
     if type == 'OS default'
       # use OS default curves
     else # default curve set
-      clg_coil.setTotalCoolingCapacityCoefficient1(-4.30266987344639)
-      clg_coil.setTotalCoolingCapacityCoefficient2(7.18536990534372)
-      clg_coil.setTotalCoolingCapacityCoefficient3(-2.23946714486189)
-      clg_coil.setTotalCoolingCapacityCoefficient4(0.139995928440879)
-      clg_coil.setTotalCoolingCapacityCoefficient5(0.102660179888915)
-      clg_coil.setSensibleCoolingCapacityCoefficient1(6.0019444814887)
-      clg_coil.setSensibleCoolingCapacityCoefficient2(22.6300677244073)
-      clg_coil.setSensibleCoolingCapacityCoefficient3(-26.7960783730934)
-      clg_coil.setSensibleCoolingCapacityCoefficient4(-1.72374720346819)
-      clg_coil.setSensibleCoolingCapacityCoefficient5(0.490644802367817)
-      clg_coil.setSensibleCoolingCapacityCoefficient6(0.0693119353468141)
-      clg_coil.setCoolingPowerConsumptionCoefficient1(-5.67775976415698)
-      clg_coil.setCoolingPowerConsumptionCoefficient2(0.438988156976704)
-      clg_coil.setCoolingPowerConsumptionCoefficient3(5.845277342193)
-      clg_coil.setCoolingPowerConsumptionCoefficient4(0.141605667000125)
-      clg_coil.setCoolingPowerConsumptionCoefficient5(-0.168727936032429)
+      if model.version < OpenStudio::VersionString.new('3.2.0')
+        clg_coil.setTotalCoolingCapacityCoefficient1(-4.30266987344639)
+        clg_coil.setTotalCoolingCapacityCoefficient2(7.18536990534372)
+        clg_coil.setTotalCoolingCapacityCoefficient3(-2.23946714486189)
+        clg_coil.setTotalCoolingCapacityCoefficient4(0.139995928440879)
+        clg_coil.setTotalCoolingCapacityCoefficient5(0.102660179888915)
+        clg_coil.setSensibleCoolingCapacityCoefficient1(6.0019444814887)
+        clg_coil.setSensibleCoolingCapacityCoefficient2(22.6300677244073)
+        clg_coil.setSensibleCoolingCapacityCoefficient3(-26.7960783730934)
+        clg_coil.setSensibleCoolingCapacityCoefficient4(-1.72374720346819)
+        clg_coil.setSensibleCoolingCapacityCoefficient5(0.490644802367817)
+        clg_coil.setSensibleCoolingCapacityCoefficient6(0.0693119353468141)
+        clg_coil.setCoolingPowerConsumptionCoefficient1(-5.67775976415698)
+        clg_coil.setCoolingPowerConsumptionCoefficient2(0.438988156976704)
+        clg_coil.setCoolingPowerConsumptionCoefficient3(5.845277342193)
+        clg_coil.setCoolingPowerConsumptionCoefficient4(0.141605667000125)
+        clg_coil.setCoolingPowerConsumptionCoefficient5(-0.168727936032429)
+      else
+        clg_coil.totalCoolingCapacityCurve.setCoefficient1Constant(-4.30266987344639)
+        clg_coil.totalCoolingCapacityCurve.setCoefficient2w(7.18536990534372)
+        clg_coil.totalCoolingCapacityCurve.setCoefficient3x(-2.23946714486189)
+        clg_coil.totalCoolingCapacityCurve.setCoefficient4y(0.139995928440879)
+        clg_coil.totalCoolingCapacityCurve.setCoefficient5z(0.102660179888915)
+        clg_coil.sensibleCoolingCapacityCurve.setCoefficient1Constant(6.0019444814887)
+        clg_coil.sensibleCoolingCapacityCurve.setCoefficient2v(22.6300677244073)
+        clg_coil.sensibleCoolingCapacityCurve.setCoefficient3w(-26.7960783730934)
+        clg_coil.sensibleCoolingCapacityCurve.setCoefficient4x(-1.72374720346819)
+        clg_coil.sensibleCoolingCapacityCurve.setCoefficient5y(0.490644802367817)
+        clg_coil.sensibleCoolingCapacityCurve.setCoefficient6z(0.0693119353468141)
+        clg_coil.coolingPowerConsumptionCurve.setCoefficient1Constant(-5.67775976415698)
+        clg_coil.coolingPowerConsumptionCurve.setCoefficient2w(0.438988156976704)
+        clg_coil.coolingPowerConsumptionCurve.setCoefficient3x(5.845277342193)
+        clg_coil.coolingPowerConsumptionCurve.setCoefficient4y(0.141605667000125)
+        clg_coil.coolingPowerConsumptionCurve.setCoefficient5z(-0.168727936032429)
+      end
     end
 
     return clg_coil

data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilHeatingWaterToAirHeatPumpEquationFit.rb

@@ -44,16 +44,29 @@ class Standard
     if type == 'OS default'
       # use OS default curves
     else # default curve set
-      htg_coil.setHeatingCapacityCoefficient1(0.237847462869254)
-      htg_coil.setHeatingCapacityCoefficient2(-3.35823796081626)
-      htg_coil.setHeatingCapacityCoefficient3(3.80640467406376)
-      htg_coil.setHeatingCapacityCoefficient4(0.179200417311554)
-      htg_coil.setHeatingCapacityCoefficient5(0.12860719846082)
-      htg_coil.setHeatingPowerConsumptionCoefficient1(-3.79175529243238)
-      htg_coil.setHeatingPowerConsumptionCoefficient2(3.38799239505527)
-      htg_coil.setHeatingPowerConsumptionCoefficient3(1.5022612076303)
-      htg_coil.setHeatingPowerConsumptionCoefficient4(-0.177653510577989)
-      htg_coil.setHeatingPowerConsumptionCoefficient5(-0.103079864171839)
+      if model.version < OpenStudio::VersionString.new('3.2.0')
+        htg_coil.setHeatingCapacityCoefficient1(0.237847462869254)
+        htg_coil.setHeatingCapacityCoefficient2(-3.35823796081626)
+        htg_coil.setHeatingCapacityCoefficient3(3.80640467406376)
+        htg_coil.setHeatingCapacityCoefficient4(0.179200417311554)
+        htg_coil.setHeatingCapacityCoefficient5(0.12860719846082)
+        htg_coil.setHeatingPowerConsumptionCoefficient1(-3.79175529243238)
+        htg_coil.setHeatingPowerConsumptionCoefficient2(3.38799239505527)
+        htg_coil.setHeatingPowerConsumptionCoefficient3(1.5022612076303)
+        htg_coil.setHeatingPowerConsumptionCoefficient4(-0.177653510577989)
+        htg_coil.setHeatingPowerConsumptionCoefficient5(-0.103079864171839)
+      else
+        htg_coil.heatingCapacityCurve.setCoefficient1Constant(0.237847462869254)
+        htg_coil.heatingCapacityCurve.setCoefficient2w(-3.35823796081626)
+        htg_coil.heatingCapacityCurve.setCoefficient3x(3.80640467406376)
+        htg_coil.heatingCapacityCurve.setCoefficient4y(0.179200417311554)
+        htg_coil.heatingCapacityCurve.setCoefficient5z(0.12860719846082)
+        htg_coil.heatingPowerConsumptionCurve.setCoefficient1Constant(-3.79175529243238)
+        htg_coil.heatingPowerConsumptionCurve.setCoefficient2w(3.38799239505527)
+        htg_coil.heatingPowerConsumptionCurve.setCoefficient3x(1.5022612076303)
+        htg_coil.heatingPowerConsumptionCurve.setCoefficient4y(-0.177653510577989)
+        htg_coil.heatingPowerConsumptionCurve.setCoefficient5z(-0.103079864171839)
+      end
     end
 
     return htg_coil

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

@@ -2692,6 +2692,42 @@ Standard.class_eval do
     return true
   end
 
+  # Calculate a model's window or WWR
+  # Disregard space conditioning (assume all spaces are conditioned)
+  # which is true for most of not all prototypes
+  #
+  # @param model [OpenStudio::Model::Model] OpenStudio model object
+  # @param wwr [Boolean]
+  # @return [Numeric] Returns window to wall ratio (percentage) or window area.
+  def model_get_window_area_info(model, wwr = true)
+
+    window_area = 0
+    wall_area = 0
+
+    model.getSpaces.each do |space|
+      # Get zone multipler
+      multiplier = space.thermalZone.get.multiplier
+      space.surfaces.each do |surface|
+        next if surface.surfaceType != 'Wall'
+        next if surface.outsideBoundaryCondition != 'Outdoors'
+
+        # Get wall and window area
+        wall_area += surface.grossArea * multiplier
+        surface.subSurfaces.each do |subsurface|
+          subsurface_type = subsurface.subSurfaceType.to_s.downcase
+          # Do not count doors
+          next unless (subsurface_type.include? 'window') || (subsurface_type.include? 'glass')
+
+          window_area += subsurface.grossArea * subsurface.multiplier * multiplier
+        end
+      end
+    end
+    return window_area / wall_area * 100 if wwr
+
+    # else
+    return window_area
+  end
+
   # Calculate a model's window or WWR for a specific orientation
   # Disregard space conditioning (assume all spaces are conditioned)
   # which is true for most of not all prototypes

data/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb

@@ -381,12 +381,13 @@ class Standard
       hpwh.setCondenserBottomLocation(h_condbot)
       hpwh.setCondenserTopLocation(h_condtop)
       hpwh.setTankElementControlLogic('MutuallyExclusive')
+      hpwh.autocalculateEvaporatorAirFlowRate
     elsif type == 'PumpedCondenser'
       hpwh.setDeadBandTemperatureDifference(3.89)
+      hpwh.autosizeEvaporatorAirFlowRate
     end
 
     # set heat pump water heater properties
-    hpwh.setEvaporatorAirFlowRate(OpenStudio.convert(181.0, 'ft^3/min', 'm^3/s').get)
     hpwh.setFanPlacement('DrawThrough')
     hpwh.setOnCycleParasiticElectricLoad(0.0)
     hpwh.setOffCycleParasiticElectricLoad(0.0)
@@ -445,9 +446,10 @@ class Standard
     if type == 'WrappedCondenser'
       coil = hpwh.dXCoil.to_CoilWaterHeatingAirToWaterHeatPumpWrapped.get
       coil.setRatedCondenserWaterTemperature(48.89)
+      coil.autocalculateRatedEvaporatorAirFlowRate
     elsif type == 'PumpedCondenser'
-      coil = OpenStudio::Model::CoilWaterHeatingAirToWaterHeatPump.new(model)
-      hpwh.setDXCoil(coil)
+      coil = hpwh.dXCoil.to_CoilWaterHeatingAirToWaterHeatPump.get
+      coil.autosizeRatedEvaporatorAirFlowRate
     end
 
     # set coil properties
@@ -457,7 +459,6 @@ class Standard
     coil.setRatedSensibleHeatRatio(shr)
     coil.setRatedEvaporatorInletAirDryBulbTemperature(OpenStudio.convert(67.5, 'F', 'C').get)
     coil.setRatedEvaporatorInletAirWetBulbTemperature(OpenStudio.convert(56.426, 'F', 'C').get)
-    coil.setRatedEvaporatorAirFlowRate(OpenStudio.convert(181.0, 'ft^3/min', 'm^3/s').get)
     coil.setEvaporatorFanPowerIncludedinRatedCOP(true)
     coil.setEvaporatorAirTemperatureTypeforCurveObjects('WetBulbTemperature')
     coil.setHeatingCapacityFunctionofTemperatureCurve(hpwh_cap)
@@ -507,8 +508,7 @@ class Standard
       tank.setSourceSideInletHeight(0)
       tank.setSourceSideOutletHeight(0)
     elsif type == 'PumpedCondenser'
-      tank = OpenStudio::Model::WaterHeaterMixed.new(model)
-      hpwh.setTank(tank)
+      tank = hpwh.tank.to_WaterHeaterMixed.get
       tank.setDeadbandTemperatureDifference(3.89)
       tank.setHeaterControlType('Cycle')
       tank.setHeaterMaximumCapacity(electric_backup_capacity)

data/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb

@@ -24,7 +24,7 @@ class Standard
   # Creates a hot water loop with a boiler, district heating, or a water-to-water heat pump and adds it to the model.
   #
   # @param model [OpenStudio::Model::Model] OpenStudio model object
-  # @param boiler_fuel_type [String] valid choices are Electricity, NaturalGas, PropaneGas, FuelOilNo1, FuelOilNo2, DistrictHeating, HeatPump
+  # @param boiler_fuel_type [String] valid choices are Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2, DistrictHeating, HeatPump
   # @param ambient_loop [OpenStudio::Model::PlantLoop] The condenser loop for the heat pump. Only used when boiler_fuel_type is HeatPump.
   # @param system_name [String] the name of the system, or nil in which case it will be defaulted
   # @param dsgn_sup_wtr_temp [Double] design supply water temperature in degrees Fahrenheit, default 180F
@@ -128,17 +128,17 @@ class Standard
       when 'AirSourceHeatPump', 'ASHP'
         create_central_air_source_heat_pump(model, hot_water_loop)
       # Boiler
-      when 'Electricity', 'Gas', 'NaturalGas', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
+      when 'Electricity', 'Gas', 'NaturalGas', 'Propane', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
         if boiler_lvg_temp_dsgn.nil?
-          lvg_temp_dsgn = dsgn_sup_wtr_temp
+          lvg_temp_dsgn_f = dsgn_sup_wtr_temp
         else
-          lvg_temp_dsgn = boiler_lvg_temp_dsgn
+          lvg_temp_dsgn_f = boiler_lvg_temp_dsgn
         end
 
         if boiler_out_temp_lmt.nil?
-          out_temp_lmt = OpenStudio.convert(203.0, 'F', 'C').get
+          out_temp_lmt_f = 203.0
         else
-          out_temp_lmt = boiler_out_temp_lmt
+          out_temp_lmt_f = boiler_out_temp_lmt
         end
 
         boiler = create_boiler_hot_water(model,
@@ -147,8 +147,8 @@ class Standard
                                          draft_type: boiler_draft_type,
                                          nominal_thermal_efficiency: 0.78,
                                          eff_curve_temp_eval_var: boiler_eff_curve_temp_eval_var,
-                                         lvg_temp_dsgn: lvg_temp_dsgn,
-                                         out_temp_lmt: out_temp_lmt,
+                                         lvg_temp_dsgn_f: lvg_temp_dsgn_f,
+                                         out_temp_lmt_f: out_temp_lmt_f,
                                          max_plr: boiler_max_plr,
                                          sizing_factor: boiler_sizing_factor)
 
@@ -803,13 +803,13 @@ class Standard
     when 'AirSourceHeatPump', 'ASHP'
       heating_equipment = create_central_air_source_heat_pump(model, heat_pump_water_loop)
       heating_equipment_stpt_manager.setName("#{heat_pump_water_loop.name} ASHP Scheduled Dual Setpoint")
-    when 'Electricity', 'Gas', 'NaturalGas', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
+    when 'Electricity', 'Gas', 'NaturalGas', 'Propane', 'PropaneGas', 'FuelOilNo1', 'FuelOilNo2'
       heating_equipment = create_boiler_hot_water(model,
                                                   hot_water_loop: heat_pump_water_loop,
                                                   name: "#{heat_pump_water_loop.name} Supplemental Boiler",
                                                   fuel_type: heating_fuel,
                                                   flow_mode: 'ConstantFlow',
-                                                  lvg_temp_dsgn: 86.0,
+                                                  lvg_temp_dsgn_f: 86.0, # 30.0 degrees Celsius
                                                   min_plr: 0.0,
                                                   max_plr: 1.2,
                                                   opt_plr: 1.0)
@@ -4031,7 +4031,7 @@ class Standard
       high_temp_radiant = OpenStudio::Model::ZoneHVACHighTemperatureRadiant.new(model)
       high_temp_radiant.setName("#{zone.name} High Temp Radiant")
 
-      if heating_type.nil? || heating_type == 'Gas'
+      if heating_type.nil? || heating_type == 'NaturalGas' || heating_type == 'Gas'
         high_temp_radiant.setFuelType('NaturalGas')
       else
         high_temp_radiant.setFuelType(heating_type)
@@ -4410,7 +4410,14 @@ class Standard
   # @param radiant_type [String] type of radiant system, floor or ceiling, to create in zone.
   # @param include_carpet [Bool] boolean to include thin carpet tile over radiant slab, default to true
   # @param carpet_thickness_in [Double] thickness of carpet in inches
-  # @param control_strategy [String] name of control strategy
+  # @param model_occ_hr_start [Double] (Optional) Only applies if control_strategy is 'proportional_control'.
+  #   Starting hour of building occupancy.
+  # @param model_occ_hr_end [Double] (Optional) Only applies if control_strategy is 'proportional_control'.
+  #   Ending hour of building occupancy.
+  # @param control_strategy [String] name of control strategy.  Options are 'proportional_control' and 'none'.
+  #   If control strategy is 'proportional_control', the method will apply the CBE radiant control sequences 
+  #   detailed in Raftery et al. (2017), “A new control strategy for high thermal mass radiant systems”.
+  #   Otherwise no control strategy will be applied and the radiant system will assume the EnergyPlus default controls.
   # @param proportional_gain [Double] (Optional) Only applies if control_strategy is 'proportional_control'.
   #   Proportional gain constant (recommended 0.3 or less).
   # @param minimum_operation [Double] (Optional) Only applies if control_strategy is 'proportional_control'.
@@ -4427,6 +4434,7 @@ class Standard
   #   Only used if radiant_lockout is true
   # @return [Array<OpenStudio::Model::ZoneHVACLowTemperatureRadiantVariableFlow>] array of radiant objects.
   # @todo Once the OpenStudio API supports it, make chilled water loops optional for heating only systems
+  # @todo Lookup occupany start and end hours from zone occupancy schedule
   def model_add_low_temp_radiant(model,
                                  thermal_zones,
                                  hot_water_loop,
@@ -4434,6 +4442,8 @@ class Standard
                                  radiant_type: 'floor',
                                  include_carpet: true,
                                  carpet_thickness_in: 0.25,
+                                 model_occ_hr_start: 6.0,
+                                 model_occ_hr_end: 18.0,
                                  control_strategy: 'proportional_control',
                                  proportional_gain: 0.3,
                                  minimum_operation: 1,
@@ -4743,6 +4753,8 @@ class Standard
       if control_strategy == 'proportional_control'
         model_add_radiant_proportional_controls(model, zone, radiant_loop,
                                                 radiant_type: radiant_type,
+                                                model_occ_hr_start: model_occ_hr_start,
+                                                model_occ_hr_end: model_occ_hr_end,
                                                 proportional_gain: proportional_gain,
                                                 minimum_operation: minimum_operation,
                                                 weekend_temperature_reset: weekend_temperature_reset,
@@ -5480,7 +5492,6 @@ class Standard
       ventilation.setSchedule(availability_schedule)
 
       if ventilation_type == 'Exhaust'
-        ventilation.setDesignFlowRateCalculationMethod('Flow/Zone')
         ventilation.setDesignFlowRate(flow_rate)
         ventilation.setFanPressureRise(31.1361206455786)
         ventilation.setFanTotalEfficiency(0.51)
@@ -5491,7 +5502,6 @@ class Standard
         ventilation.setMaximumIndoorTemperature(100.0)
         ventilation.setDeltaTemperature(-100.0)
       elsif ventilation_type == 'Natural'
-        ventilation.setDesignFlowRateCalculationMethod('Flow/Zone')
         ventilation.setDesignFlowRate(flow_rate)
         ventilation.setFanPressureRise(0.0)
         ventilation.setFanTotalEfficiency(1.0)
@@ -5502,7 +5512,6 @@ class Standard
         ventilation.setMaximumIndoorTemperature(29.4444452244559)
         ventilation.setDeltaTemperature(-100.0)
       elsif ventilation_type == 'Intake'
-        ventilation.setDesignFlowRateCalculationMethod('Flow/Area')
         ventilation.setFlowRateperZoneFloorArea(flow_rate)
         ventilation.setFanPressureRise(49.8)
         ventilation.setFanTotalEfficiency(0.53625)