openstudio-standards 0.2.12.rc1 → 0.2.12.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +4 -4
  2. data/data/standards/OpenStudio_Standards-ashrae_90_1(space_types).xlsx +0 -0
  3. data/data/standards/manage_OpenStudio_Standards.rb +4 -1
  4. data/data/standards/test_performance_expected_dd_results.csv +155 -155
  5. data/lib/openstudio-standards/hvac_sizing/Siz.CoilHeatingWaterToAirHeatPumpEquationFit.rb +1 -1
  6. data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.AirTerminalSingleDuctVAVReheat.rb +2 -0
  7. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.Hospital.rb +1 -1
  8. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.LargeHotel.rb +1 -1
  9. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CentralAirSourceHeatPump.rb +1 -0
  10. data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.rb +1 -1
  11. data/lib/openstudio-standards/standards/Standards.AirLoopHVAC.rb +9 -49
  12. data/lib/openstudio-standards/standards/Standards.AirTerminalSingleDuctVAVReheat.rb +4 -0
  13. data/lib/openstudio-standards/standards/Standards.Model.rb +3 -3
  14. data/lib/openstudio-standards/standards/Standards.Space.rb +5 -7
  15. data/lib/openstudio-standards/standards/Standards.ThermalZone.rb +1 -1
  16. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/comstock_ashrae_90_1_2004/data/ashrae_90_1.schedules.json +5200 -0
  17. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/comstock_ashrae_90_1_2004/data/comstock_ashrae_90_1_2004.spc_typ.json +4526 -4526
  18. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.economizers.json +76 -0
  19. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/comstock_ashrae_90_1_2007/data/ashrae_90_1.schedules.json +5200 -0
  20. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/comstock_ashrae_90_1_2007/data/comstock_ashrae_90_1_2007.spc_typ.json +4549 -4549
  21. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.economizers.json +76 -0
  22. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.AirLoopHVAC.rb +29 -148
  23. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.Space.rb +5 -3
  24. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/comstock_ashrae_90_1_2010/data/ashrae_90_1.schedules.json +5200 -0
  25. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/comstock_ashrae_90_1_2010/data/comstock_ashrae_90_1_2010.spc_typ.json +4555 -4555
  26. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.economizers.json +76 -0
  27. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.energy_recovery.json +498 -0
  28. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.AirLoopHVAC.rb +53 -244
  29. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.Space.rb +5 -3
  30. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/comstock_ashrae_90_1_2013/data/ashrae_90_1.schedules.json +5200 -0
  31. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/comstock_ashrae_90_1_2013/data/comstock_ashrae_90_1_2013.spc_typ.json +4663 -4507
  32. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.economizers.json +76 -0
  33. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.energy_recovery.json +992 -0
  34. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/comstock_doe_ref_1980_2004/data/ashrae_90_1.schedules.json +5200 -0
  35. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/comstock_doe_ref_1980_2004/data/comstock_doe_ref_1980_2004.spc_typ.json +3245 -3245
  36. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/data/doe_ref_1980_2004.economizers.json +38 -0
  37. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/comstock_doe_ref_pre_1980/data/ashrae_90_1.schedules.json +5200 -0
  38. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/comstock_doe_ref_pre_1980/data/comstock_doe_ref_pre_1980.spc_typ.json +3213 -3213
  39. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/data/doe_ref_pre_1980.economizers.json +38 -0
  40. data/lib/openstudio-standards/standards/ashrae_90_1/nrel_zne_ready_2017/data/nrel_zne_ready_2017.economizers.json +76 -0
  41. data/lib/openstudio-standards/standards/ashrae_90_1/nrel_zne_ready_2017/nrel_zne_ready_2017.Space.rb +2 -3
  42. data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/data/ze_aedg_multifamily.economizers.json +76 -0
  43. data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.Space.rb +2 -3
  44. data/lib/openstudio-standards/standards/deer/deer_2014/deer_2014.Space.rb +2 -3
  45. data/lib/openstudio-standards/standards/deer/deer_2015/deer_2015.Space.rb +2 -3
  46. data/lib/openstudio-standards/standards/deer/deer_2017/deer_2017.Space.rb +2 -3
  47. data/lib/openstudio-standards/standards/deer/deer_2020/deer_2020.Space.rb +2 -3
  48. data/lib/openstudio-standards/standards/deer/deer_2025/deer_2025.Space.rb +2 -3
  49. data/lib/openstudio-standards/standards/deer/deer_2030/deer_2030.Space.rb +2 -3
  50. data/lib/openstudio-standards/standards/deer/deer_2035/deer_2035.Space.rb +2 -3
  51. data/lib/openstudio-standards/standards/deer/deer_2040/deer_2040.Space.rb +2 -3
  52. data/lib/openstudio-standards/standards/deer/deer_2045/deer_2045.Space.rb +2 -3
  53. data/lib/openstudio-standards/standards/deer/deer_2050/deer_2050.Space.rb +2 -3
  54. data/lib/openstudio-standards/standards/deer/deer_2055/deer_2055.Space.rb +2 -3
  55. data/lib/openstudio-standards/standards/deer/deer_2060/deer_2060.Space.rb +2 -3
  56. data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.Space.rb +2 -3
  57. data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.Space.rb +2 -3
  58. data/lib/openstudio-standards/standards/deer/deer_2075/deer_2075.Space.rb +2 -3
  59. data/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb +1 -1
  60. data/lib/openstudio-standards/version.rb +1 -1
  61. metadata +5 -3
  62. data/data/standards/OpenStudio_Standards-ashrae_90_1-ALL-comstock(space_types).xlsx +0 -0
data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.Space.rb CHANGED
@@ -20,7 +20,7 @@ class ZEAEDGMultifamily < ASHRAE901
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class ZEAEDGMultifamily < ASHRAE901
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2014/deer_2014.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2014 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2014 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2015/deer_2015.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2015 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2015 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2017/deer_2017.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2017 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2017 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2020/deer_2020.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2020 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2020 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2025/deer_2025.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2025 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2025 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2030/deer_2030.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2030 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2030 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2035/deer_2035.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2035 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2035 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2040/deer_2040.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2040 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2040 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2045/deer_2045.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2045 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2045 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2050/deer_2050.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2050 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2050 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2055/deer_2055.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2055 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2055 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2060/deer_2060.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2060 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2060 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2065/deer_2065.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2065 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2065 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2070/deer_2070.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2070 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2070 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/deer/deer_2075/deer_2075.Space.rb CHANGED
@@ -20,7 +20,7 @@ class DEER2075 < DEER
20
20
  # @param space [OpenStudio::Model::Space] the space in question
21
21
  # @param areas [Hash] a hash of daylighted areas
22
22
  # @return [Array<Bool>] req_top_ctrl, req_pri_ctrl, req_sec_ctrl
23
- def space_daylighting_control_required?(space, areas, climate_zone)
23
+ def space_daylighting_control_required?(space, areas)
24
24
  req_top_ctrl = true
25
25
  req_pri_ctrl = true
26
26
  req_sec_ctrl = true
@@ -88,8 +88,7 @@ class DEER2075 < DEER
88
88
  sorted_skylights,
89
89
  req_top_ctrl,
90
90
  req_pri_ctrl,
91
- req_sec_ctrl,
92
- climate_zone)
91
+ req_sec_ctrl)
93
92
  sensor_1_frac = 0.0
94
93
  sensor_2_frac = 0.0
95
94
  sensor_1_window = nil
data/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb CHANGED
@@ -254,7 +254,7 @@ class NECB2011 < Standard
254
254
  def apply_fdwr_srr_daylighting(model:, fdwr_set: -1.0, srr_set: -1.0)
255
255
  apply_standard_window_to_wall_ratio(model: model, fdwr_set: fdwr_set)
256
256
  apply_standard_skylight_to_roof_ratio(model: model, srr_set: srr_set)
257
- model_add_daylighting_controls(model, nil) # to be removed after refactor.
257
+ model_add_daylighting_controls(model) # to be removed after refactor.
258
258
  end
259
259
 
260
260
  def apply_standard_efficiencies(model:, sizing_run_dir:)
data/lib/openstudio-standards/version.rb CHANGED
@@ -13,5 +13,5 @@ module OpenstudioStandards
13
13
  end
14
14
  return 'git-not-found-on-this-system'
15
15
  end
16
- VERSION = '0.2.12.rc1'.freeze
16
+ VERSION = '0.2.12.rc2'.freeze
17
17
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openstudio-standards
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.12.rc1
4
+ version: 0.2.12.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Parker
@@ -22,7 +22,7 @@ authors:
22
22
  autorequire:
23
23
  bindir: bin
24
24
  cert_chain: []
25
- date: 2020-08-17 00:00:00.000000000 Z
25
+ date: 2020-09-09 00:00:00.000000000 Z
26
26
  dependencies:
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: minitest-reporters
@@ -664,7 +664,7 @@ files:
664
664
  - data/geometry/DOERefSmallOffice.json
665
665
  - data/geometry/DOERefWarehouse.json
666
666
  - data/geometry/DOERefWarehouse.osm
667
- - data/standards/OpenStudio_Standards-ashrae_90_1-ALL-comstock(space_types).xlsx
667
+ - data/standards/OpenStudio_Standards-ashrae_90_1(space_types).xlsx
668
668
  - data/standards/OpenStudio_Standards_elevators.json
669
669
  - data/standards/OpenStudio_Standards_fans.json
670
670
  - data/standards/OpenStudio_Standards_hvac_inference.json
@@ -1722,6 +1722,7 @@ files:
1722
1722
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.construction_sets.json
1723
1723
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.economizers.json
1724
1724
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.elevators.json
1725
+ - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.energy_recovery.json
1725
1726
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.ext_ltg.json
1726
1727
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.ground_temperatures.json
1727
1728
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.heat_pumps.json
@@ -1766,6 +1767,7 @@ files:
1766
1767
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.construction_sets.json
1767
1768
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.economizers.json
1768
1769
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.elevators.json
1770
+ - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.energy_recovery.json
1769
1771
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.ext_ltg.json
1770
1772
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.ground_temperatures.json
1771
1773
  - lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.heat_pumps.json