openstudio-standards 0.2.12.rc4 → 0.2.13.rc3

data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/data/ze_aedg_multifamily.water_heaters.json

@@ -8,7 +8,7 @@
       "start_date": "1919-09-09T00:00:00+00:00",
       "end_date": "2999-09-09T00:00:00+00:00",
       "energy_factor_base": 0.97,
-      "energy_factor_volume_derate": "",
+      "energy_factor_volume_derate": 0.00132,
       "standby_loss_base": null,
       "standby_loss_capacity_allowance": null,
       "standby_loss_volume_allowance": null,
@@ -42,7 +42,7 @@
       "start_date": "1919-09-09T00:00:00+00:00",
       "end_date": "2999-09-09T00:00:00+00:00",
       "energy_factor_base": 0.67,
-      "energy_factor_volume_derate": "",
+      "energy_factor_volume_derate": 0.0019,
       "standby_loss_base": null,
       "standby_loss_capacity_allowance": null,
       "standby_loss_volume_allowance": null,

data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.AirLoopHVAC.rb

@@ -11,11 +11,9 @@ class ZEAEDGMultifamily < ASHRAE901
 
     # Get the OA system and OA controller
     oa_sys = air_loop_hvac.airLoopHVACOutdoorAirSystem
-    if oa_sys.is_initialized
-      oa_sys = oa_sys.get
-    else
-      return [nil, nil, nil] # No OA system
-    end
+    return [nil, nil, nil] unless oa_sys.is_initialized # No OA system
+
+    oa_sys = oa_sys.get
     oa_control = oa_sys.getControllerOutdoorAir
     economizer_type = oa_control.getEconomizerControlType
     oa_control.resetEconomizerMinimumLimitDryBulbTemperature
@@ -406,7 +404,6 @@ class ZEAEDGMultifamily < ASHRAE901
   #
   # @return [Bool] Returns true if required, false if not.
   def air_loop_hvac_energy_recovery_ventilator_required?(air_loop_hvac, climate_zone)
-
     if air_loop_hvac.airLoopHVACOutdoorAirSystem.is_initialized
       oa_system = air_loop_hvac.airLoopHVACOutdoorAirSystem.get
       controller_oa = oa_system.getControllerOutdoorAir

data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.Model.rb

@@ -67,10 +67,10 @@ class ZEAEDGMultifamily < ASHRAE901
     model.getCoolingTowerVariableSpeeds.sort.each { |obj| cooling_tower_variable_speed_apply_efficiency_and_curves(obj) }
 
     # Fluid Coolers
-    model.getFluidCoolerSingleSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj) }
-    model.getFluidCoolerTwoSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj) }
-    model.getEvaporativeFluidCoolerSingleSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj) }
-    model.getEvaporativeFluidCoolerTwoSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj) }
+    model.getFluidCoolerSingleSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj, equipment_type: 'Dry Cooler') }
+    model.getFluidCoolerTwoSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj, equipment_type: 'Dry Cooler') }
+    model.getEvaporativeFluidCoolerSingleSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj, equipment_type: 'Closed Cooling Tower') }
+    model.getEvaporativeFluidCoolerTwoSpeeds.sort.each { |obj| fluid_cooler_apply_minimum_power_per_flow(obj, equipment_type: 'Closed Cooling Tower') }
 
     # ERVs
     model.getHeatExchangerAirToAirSensibleAndLatents.each { |obj| heat_exchanger_air_to_air_sensible_and_latent_apply_efficiency(obj) }

data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.PlantLoop.rb

@@ -65,4 +65,4 @@ class ZEAEDGMultifamily < ASHRAE901
 
     return true
   end
-end
+end

data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.ZoneHVACComponent.rb

@@ -5,4 +5,4 @@ class ZEAEDGMultifamily < ASHRAE901
     fan_efficacy_w_per_cfm = 0.65
     return fan_efficacy_w_per_cfm
   end
-end
+end

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

@@ -4,7 +4,7 @@ class CBES
   # Determine which climate zone to use.
   # Uses the most specific climate zone set.
   def model_get_climate_zone_set_from_list(model, possible_climate_zone_sets)
-    climate_zone_set = possible_climate_zone_sets.sort.last
+    climate_zone_set = possible_climate_zone_sets.max
     return climate_zone_set
   end
 
@@ -19,5 +19,3 @@ class CBES
     return ventilation_method
   end
 end
-
-

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

@@ -11,4 +11,4 @@ class CBES < Standard
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end
-end
+end

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

@@ -29,11 +29,9 @@ class DEER
 
     # Get the OA system and OA controller
     oa_sys = air_loop_hvac.airLoopHVACOutdoorAirSystem
-    if oa_sys.is_initialized
-      oa_sys = oa_sys.get
-    else
-      return true # No OA system
-    end
+    return true unless oa_sys.is_initialized # No OA system
+
+    oa_sys = oa_sys.get
     oa_control = oa_sys.getControllerOutdoorAir
     economizer_type = oa_control.getEconomizerControlType
 
@@ -56,11 +54,9 @@ class DEER
 
     # Get the OA system and OA controller
     oa_sys = air_loop_hvac.airLoopHVACOutdoorAirSystem
-    if oa_sys.is_initialized
-      oa_sys = oa_sys.get
-    else
-      return [nil, nil, nil] # No OA system
-    end
+    return [nil, nil, nil] unless oa_sys.is_initialized # No OA system
+
+    oa_sys = oa_sys.get
     oa_control = oa_sys.getControllerOutdoorAir
     economizer_type = oa_control.getEconomizerControlType
 
@@ -75,7 +71,7 @@ class DEER
       when 'CEC T24-CEC1',
         'CEC T24-CEC3',
         'CEC T24-CEC5'
-      drybulb_limit_f = 70
+        drybulb_limit_f = 70
       when 'CEC T24-CEC6',
         'CEC T24-CEC8',
         'CEC T24-CEC9'
@@ -96,5 +92,4 @@ class DEER
 
     return [drybulb_limit_f, enthalpy_limit_btu_per_lb, dewpoint_limit_f]
   end
-
-end
+end

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

@@ -5,7 +5,7 @@ class DEER
   # Uses the most specific climate zone set.
   def model_get_climate_zone_set_from_list(model, possible_climate_zone_sets)
     # OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', "SpaceType #{space.spaceType.get.name} does not have a standardsSpaceType assigned.")
-    climate_zone_set = possible_climate_zone_sets.sort.last
+    climate_zone_set = possible_climate_zone_sets.max
     return climate_zone_set
   end
-end
+end

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

@@ -24,10 +24,12 @@ class DEER
   def planar_surface_apply_standard_construction(planar_surface, climate_zone, previous_construction_map = {})
     # Skip surfaces not in a space
     return previous_construction_map if planar_surface.space.empty?
+
     space = planar_surface.space.get
 
     # Skip surfaces that don't have a construction
     return previous_construction_map if planar_surface.construction.empty?
+
     construction = planar_surface.construction.get
 
     # Determine if residential or nonresidential

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

@@ -17,4 +17,4 @@ class DEER
     basic_infil_rate_cfm_per_ft2 = 0.3393
     return basic_infil_rate_cfm_per_ft2
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2011/deer_2011.rb

@@ -13,5 +13,4 @@ class DEER2011 < DEER
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2014/deer_2014.Space.rb

@@ -134,5 +134,4 @@ class DEER2014 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2014/deer_2014.rb

@@ -13,5 +13,4 @@ class DEER2014 < DEER
   def load_standards_database(data_directories = [])
     super([__dir__] + data_directories)
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2015/deer_2015.Space.rb

@@ -134,5 +134,4 @@ class DEER2015 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2017/deer_2017.Space.rb

@@ -134,5 +134,4 @@ class DEER2017 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2020/deer_2020.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2020 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2020/deer_2020.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2020 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2020/deer_2020.Space.rb

@@ -134,5 +134,4 @@ class DEER2020 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2025/deer_2025.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2025 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2025/deer_2025.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2025 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2025/deer_2025.Space.rb

@@ -134,5 +134,4 @@ class DEER2025 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2030/deer_2030.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2030 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2030/deer_2030.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2030 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2030/deer_2030.Space.rb

@@ -134,5 +134,4 @@ class DEER2030 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2035/deer_2035.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2035 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2035/deer_2035.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2035 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2035/deer_2035.Space.rb

@@ -134,5 +134,4 @@ class DEER2035 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2040/deer_2040.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2040 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2040/deer_2040.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2040 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2040/deer_2040.Space.rb

@@ -134,5 +134,4 @@ class DEER2040 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2045/deer_2045.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2045 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2045/deer_2045.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2045 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2045/deer_2045.Space.rb

@@ -134,5 +134,4 @@ class DEER2045 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2050/deer_2050.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2050 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2050/deer_2050.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2050 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2050/deer_2050.Space.rb

@@ -134,5 +134,4 @@ class DEER2050 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2055/deer_2055.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2055 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2055/deer_2055.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2055 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2055/deer_2055.Space.rb

@@ -134,5 +134,4 @@ class DEER2055 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2060/deer_2060.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2060 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2060/deer_2060.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2060 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2060/deer_2060.Space.rb

@@ -134,5 +134,4 @@ class DEER2060 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2065 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2065 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.Space.rb

@@ -134,5 +134,4 @@ class DEER2065 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end

data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.AirLoopHVAC.rb

@@ -28,4 +28,4 @@ class DEER2070 < DEER
     motorized_oa_damper_required = true
     return motorized_oa_damper_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.FanVariableVolume.rb

@@ -24,4 +24,4 @@ class DEER2070 < DEER
 
     return part_load_control_required
   end
-end
+end

data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.Space.rb

@@ -134,5 +134,4 @@ class DEER2070 < DEER
 
     return [sensor_1_frac, sensor_2_frac, sensor_1_window, sensor_2_window]
   end
-
 end