openstudio-standards 0.2.15 → 0.2.16

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)
@@ -5922,6 +5931,7 @@ class Standard
         if air_loop_heating_type == 'Water'
           hot_water_loop = model_get_or_add_hot_water_loop(model, main_heat_fuel,
                                                            hot_water_loop_type: hot_water_loop_type)
+          heating_type = 'Water'
         else
           hot_water_loop = nil
         end

data/lib/openstudio-standards/prototypes/common/prototype_metaprogramming.rb

@@ -30,7 +30,7 @@ def create_class_array
                          'LargeOfficeDetailed',
                          'Laboratory',
                          'College',
-                         'CourtHouse',
+                         'Courthouse',
                          'TallBuilding',
                          'SuperTallBuilding']
 

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

@@ -489,7 +489,7 @@ class Standard
         fan_pwr_limit_type = 'variable volume'
       elsif comp.to_AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.is_initialized
         fan = comp.to_AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.get.supplyAirFan
-        if fan.to_FanConstantVolume.is_initialized || comp.to_FanOnOff.is_initialized
+        if fan.to_FanConstantVolume.is_initialized || fan.to_FanOnOff.is_initialized
           fan_pwr_limit_type = 'constant volume'
         elsif fan.to_FanVariableVolume.is_initialized
           fan_pwr_limit_type = 'variable volume'
@@ -1712,7 +1712,7 @@ class Standard
     heat_exchanger_air_to_air_sensible_and_latent_apply_prototype_nominal_electric_power(erv)
 
     # add economizer lockout
-    erv.setSupplyAirOutletTemperatureControl(false)
+    erv.setSupplyAirOutletTemperatureControl(true)
     erv.setEconomizerLockout(true)
 
     # add defrost

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

@@ -103,7 +103,6 @@ class Standard
   # @param sql_db_vars_map [Hash] hash map
   # @return [Hash] hash of coil objects
   def coil_cooling_water_to_air_heat_pump_apply_efficiency_and_curves(coil_cooling_water_to_air_heat_pump, sql_db_vars_map)
-    successfully_set_all_properties = true
 
     # Get the search criteria
     search_criteria = {}
@@ -116,8 +115,15 @@ class Standard
 
     # Check to make sure properties were found
     if coil_props.nil?
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.CoilCoolingWaterToAirHeatPumpEquationFit', "For #{coil_cooling_water_to_air_heat_pump.name}, cannot find efficiency info using #{search_criteria}, cannot apply efficiency standard.")
-      successfully_set_all_properties = false
+      # search again without capacity
+      matching_objects = model_find_objects(standards_data['water_source_heat_pumps'], search_criteria, nil, Date.today)
+      if matching_objects.size.zero?
+        # This proves that the search_criteria has issue finding the correct coil prop
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.CoilCoolingWaterToAirHeatPumpEquationFit', "For #{coil_cooling_water_to_air_heat_pump.name}, cannot find efficiency info using #{search_criteria}, cannot apply efficiency standard.")
+      else
+        # Issue warning indicate the coil size is may be too large
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.CoilCoolingWaterToAirHeatPumpEquationFit', "The capacity of the coil: #{coil_cooling_water_to_air_heat_pump.name} maybe too large to be found in the efficiency standard. The coil capacity is #{capacity_btu_per_hr} Btu/hr.")
+      end
       return sql_db_vars_map
     end
 

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

@@ -22,6 +22,8 @@ class Standard
     capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
     capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, 'W', 'kBtu/hr').get
 
+    return false unless capacity_btu_per_hr > 0
+
     # Get the boiler properties, if it exists for this template
     return false unless standards_data.include?('furnaces')
 

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

@@ -83,16 +83,22 @@ class Standard
     # and the R-value of the non-insulation layers and air films.
     # This is the desired R-value of the insulation.
     ins_r_value_si = target_r_value_si - other_layer_r_value_si
-    if ins_r_value_si <= 0.0
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Construction', "Requested U-value of #{target_u_value_ip} for #{construction.name} is too low given the other materials in the construction; insulation layer will not be modified.")
-      return false
-    end
-    ins_r_value_ip = OpenStudio.convert(ins_r_value_si, 'm^2*K/W', 'ft^2*h*R/Btu').get
 
     # Set the R-value of the insulation layer
-    construction.layers.each do |layer|
+    construction.layers.each_with_index do |layer, l|
       next unless layer.name.get == insulation_layer_name
 
+      # Remove insulation layer if requested R-value is lower than sum of non-insulation materials
+      if ins_r_value_si <= 0.0
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Construction', "Requested U-value of #{target_u_value_ip} for #{construction.name} is too low given the other materials in the construction; insulation layer will be removed.")
+        construction.eraseLayer(l)
+        # Set the target R-value to the sum of other layers to make name match properties
+        target_r_value_ip = OpenStudio.convert(other_layer_r_value_si, 'm^2*K/W', 'ft^2*hr*R/Btu').get
+        break # Don't modify the insulation layer since it has been removed
+      end
+
+      # Modify the insulation layer
+      ins_r_value_ip = OpenStudio.convert(ins_r_value_si, 'm^2*K/W', 'ft^2*h*R/Btu').get
       if layer.to_StandardOpaqueMaterial.is_initialized
         layer = layer.to_StandardOpaqueMaterial.get
         layer.setThickness(ins_r_value_si * layer.conductivity)

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

@@ -2010,7 +2010,7 @@ class Standard
       if existing_sch.is_initialized
         existing_sch = existing_sch.get
         existing_day_sch_vals = existing_sch.defaultDaySchedule.values
-        if existing_day_sch_vals.size == 1 && existing_day_sch_vals[0] == value
+        if existing_day_sch_vals.size == 1 && (existing_day_sch_vals[0] - value).abs < 1.0e-6
           return existing_sch
         end
       end
@@ -2524,12 +2524,28 @@ class Standard
     # which specifies properties by construction category by climate zone set.
     # AKA the info in Tables 5.5-1-5.5-8
 
-    props = model_find_object(standards_data['construction_properties'],
-                              'template' => template,
-                              'climate_zone_set' => climate_zone_set,
-                              'intended_surface_type' => intended_surface_type,
-                              'standards_construction_type' => standards_construction_type,
-                              'building_category' => building_category)
+    wwr = model_get_percent_of_surface_range(model, intended_surface_type)
+
+    search_criteria = { 'template' => template,
+                        'climate_zone_set' => climate_zone_set,
+                        'intended_surface_type' => intended_surface_type,
+                        'standards_construction_type' => standards_construction_type,
+                        'building_category' => building_category }
+
+    if !wwr['minimum_percent_of_surface'].nil? && !wwr['maximum_percent_of_surface'].nil?
+      search_criteria['minimum_percent_of_surface'] = wwr['minimum_percent_of_surface']
+      search_criteria['maximum_percent_of_surface'] = wwr['maximum_percent_of_surface']
+    end
+
+    # First search
+    props = model_find_object(standards_data['construction_properties'], search_criteria)
+
+    if !props
+      # Second search: In case need to use climate zone (e.g: 3) instead of sub-climate zone (e.g: 3A) for search
+      climate_zone = climate_zone_set[0..-2]
+      search_criteria['climate_zone_set'] = climate_zone
+      props = model_find_object(standards_data['construction_properties'], search_criteria)
+    end
 
     if !props
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find construction properties for: #{template}-#{climate_zone_set}-#{intended_surface_type}-#{standards_construction_type}-#{building_category}.")
@@ -3602,6 +3618,12 @@ class Standard
     # switch to use this but update test in standards and measures to load this outside of the method
     construction_properties = model_find_object(standards_data['construction_properties'], search_criteria)
 
+    if !construction_properties
+      # Search again use climate zone (e.g. 3) instead of sub-climate zone (3A)
+      search_criteria['climate_zone_set'] = climate_zone_set[0..-2]
+      construction_properties = model_find_object(standards_data['construction_properties'], search_criteria)
+    end
+
     return construction_properties
   end
 
@@ -3962,6 +3984,9 @@ class Standard
 
     # Air loops
     model.getAirLoopHVACs.each(&:remove)
+    if model.version > OpenStudio::VersionString.new('3.1.0')
+      model.getAirLoopHVACDedicatedOutdoorAirSystems.each(&:remove)
+    end
 
     # Zone equipment
     model.getThermalZones.sort.each do |zone|
@@ -4290,7 +4315,7 @@ class Standard
   # @param possible_climate_zone_sets [Array] climate zone sets
   # @return [String] climate zone ses
   def model_get_climate_zone_set_from_list(model, possible_climate_zone_sets)
-    climate_zone_set = possible_climate_zone_sets.min
+    climate_zone_set = possible_climate_zone_sets.max
     return climate_zone_set
   end
 
@@ -5185,6 +5210,7 @@ class Standard
       electric = true
 
       if htg_fuels.include?('NaturalGas') ||
+         htg_fuels.include?('Propane') ||
          htg_fuels.include?('PropaneGas') ||
          htg_fuels.include?('FuelOilNo1') ||
          htg_fuels.include?('FuelOilNo2') ||
@@ -5779,6 +5805,15 @@ class Standard
     return parametric_inputs
   end
 
+  # Determine the surface range of a baseline model.
+  # The method calculates the window to wall ratio (assuming all spaces are conditioned)
+  # and select the range based on the calculated window to wall ratio
+  # @param model [OpenStudio::Model::Model] OpenStudio model object
+  # @param intended_surface_type [String] surface type
+  def model_get_percent_of_surface_range(model, intended_surface_type)
+    return { 'minimum_percent_of_surface' => nil, 'maximum_percent_of_surface' => nil }
+  end
+
   # Default SAT reset type
   #
   # @param air_loop_hvac [OpenStudio::Model::AirLoopHVAC] air loop

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

@@ -92,6 +92,21 @@ class Standard
         OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.PlanarSurface', "Could not determine the standards fenestration type for #{planar_surface.name} from #{construction.name}.  This surface will not have the standard applied.")
         return previous_construction_map
       end
+    # Exterior Doors
+    elsif surf_type == 'ExteriorDoor'
+      stds_type = standards_info.standardsConstructionType
+      if stds_type.is_initialized
+        stds_type = stds_type.get
+        case stds_type
+        when 'RollUp', 'Rollup', 'NonSwinging', 'Nonswinging'
+          stds_type = 'NonSwinging'
+        else
+          stds_type = 'Swinging'
+        end
+      else
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.PlanarSurface', "Could not determine the standards construction type for exterior door #{planar_surface.name}.  This door will not have the standard applied.")
+        return previous_construction_map
+      end
     # All other surface types
     else
       stds_type = standards_info.standardsConstructionType

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

@@ -321,7 +321,7 @@ class Standard
               min_y_val = vertex.y
             end
             # Max y value
-            if vertex.y > max_x_val
+            if vertex.y > max_y_val
               max_y_val = vertex.y
             end
           end

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

@@ -599,6 +599,13 @@ class Standard
     # switch to use this but update test in standards and measures to load this outside of the method
     construction_properties = model_find_object(standards_data['construction_properties'], search_criteria)
 
+    if !construction_properties
+      # Search again use climate zone (e.g. 3) instead of sub-climate zone (3A)
+      search_criteria['climate_zone_set'] = climate_zone_set[0..-2]
+      construction_properties = model_find_object(standards_data['construction_properties'], search_criteria)
+    end
+
+
     return construction_properties
   end
 end