openstudio-standards 0.8.3 → 0.8.5.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (330) hide show
  1. checksums.yaml +4 -4
  2. data/data/geometry/ASHRAECollege.osm +30 -30
  3. data/data/geometry/ASHRAECourthouse.osm +22 -22
  4. data/data/geometry/ASHRAESmallOfficeDetailed.osm +2 -2
  5. data/data/geometry/DEER_Asm.osm +1 -1
  6. data/data/geometry/DEER_ECC.osm +1 -1
  7. data/data/geometry/DEER_EPr.osm +1 -1
  8. data/data/geometry/DEER_ERC.osm +1 -1
  9. data/data/geometry/DEER_ESe.osm +1 -1
  10. data/data/geometry/DEER_EUn.osm +1 -1
  11. data/data/geometry/DEER_Hsp.osm +1 -1
  12. data/data/geometry/DEER_Htl.osm +1 -1
  13. data/data/geometry/DEER_MBT.osm +1 -1
  14. data/data/geometry/DEER_MFm.osm +1 -1
  15. data/data/geometry/DEER_Nrs.osm +1 -1
  16. data/data/geometry/DEER_OfL.osm +1 -1
  17. data/data/geometry/DEER_OfS.osm +1 -1
  18. data/data/geometry/DEER_RFF.osm +1 -1
  19. data/data/geometry/DEER_RSD.osm +1 -1
  20. data/data/geometry/DEER_Rt3.osm +1 -1
  21. data/data/geometry/DEER_RtS.osm +1 -1
  22. data/data/standards/export_OpenStudio_libraries.rb +2 -3
  23. data/data/standards/test_performance_expected_dd_results.csv +42 -42
  24. data/lib/openstudio-standards/btap/NECB_building_types.csv +35 -0
  25. data/lib/openstudio-standards/btap/NECB_space_types.csv +109 -0
  26. data/lib/openstudio-standards/btap/activity.rb +480 -0
  27. data/lib/openstudio-standards/btap/attributes.rb +166 -0
  28. data/lib/openstudio-standards/btap/bridging.rb +561 -1402
  29. data/lib/openstudio-standards/btap/btap.rb +4 -2
  30. data/lib/openstudio-standards/btap/btap_test_helper.rb +86 -0
  31. data/lib/openstudio-standards/btap/carbon/btap_carbon.rb +177 -0
  32. data/lib/openstudio-standards/btap/common_paths.rb +81 -0
  33. data/lib/openstudio-standards/btap/common_resources/ConstructionProperties.csv +52 -0
  34. data/lib/openstudio-standards/btap/common_resources/Constructions.csv +37 -0
  35. data/lib/openstudio-standards/btap/common_resources/carbon_frame.csv +35 -0
  36. data/lib/openstudio-standards/btap/common_resources/carbon_glazing.csv +35 -0
  37. data/lib/openstudio-standards/btap/common_resources/carbon_opaque.csv +164 -0
  38. data/lib/openstudio-standards/btap/common_resources/construction_sets.csv +1270 -0
  39. data/lib/openstudio-standards/btap/common_resources/constructions_glazing.csv +121 -0
  40. data/lib/openstudio-standards/btap/common_resources/constructions_opaque.csv +2256 -0
  41. data/lib/openstudio-standards/btap/common_resources/costs.csv +1897 -0
  42. data/lib/openstudio-standards/btap/common_resources/costs_local_factors.csv +2315 -0
  43. data/lib/openstudio-standards/btap/common_resources/hvac_vent_ahu.csv +925 -0
  44. data/lib/openstudio-standards/btap/common_resources/lighting.csv +364 -0
  45. data/lib/openstudio-standards/btap/common_resources/lighting_sets.csv +2667 -0
  46. data/lib/openstudio-standards/btap/common_resources/locations.csv +75 -0
  47. data/lib/openstudio-standards/btap/common_resources/materials_glazing.csv +35 -0
  48. data/lib/openstudio-standards/btap/common_resources/materials_hvac.csv +1686 -0
  49. data/lib/openstudio-standards/btap/common_resources/materials_lighting.csv +267 -0
  50. data/lib/openstudio-standards/btap/common_resources/materials_opaque.csv +164 -0
  51. data/lib/openstudio-standards/btap/costing/README.md +502 -0
  52. data/lib/openstudio-standards/btap/costing/btap_costing.rb +469 -0
  53. data/lib/openstudio-standards/btap/costing/btap_measure_helper.rb +359 -0
  54. data/lib/openstudio-standards/btap/costing/btap_workflow.rb +117 -0
  55. data/lib/openstudio-standards/btap/costing/copy_test_results_files_to_expected_results.rb +11 -0
  56. data/lib/openstudio-standards/btap/costing/cost_building_from_file.rb +136 -0
  57. data/lib/openstudio-standards/btap/costing/costing_database_wrapper.rb +173 -0
  58. data/lib/openstudio-standards/btap/costing/daylighting_sensor_control_costing.rb +354 -0
  59. data/lib/openstudio-standards/btap/costing/dcv_costing.rb +314 -0
  60. data/lib/openstudio-standards/btap/costing/dummy.epw +8768 -0
  61. data/lib/openstudio-standards/btap/costing/dummy.osm +5320 -0
  62. data/lib/openstudio-standards/btap/costing/envelope_costing.rb +215 -0
  63. data/lib/openstudio-standards/btap/costing/heating_cooling_costing.rb +2584 -0
  64. data/lib/openstudio-standards/btap/costing/led_lighting_costing.rb +156 -0
  65. data/lib/openstudio-standards/btap/costing/lighting_costing.rb +209 -0
  66. data/lib/openstudio-standards/btap/costing/mech_sizing.json +502 -0
  67. data/lib/openstudio-standards/btap/costing/neb_end_use_prices.csv +42 -0
  68. data/lib/openstudio-standards/btap/costing/necb_2011_spacetype_info.csv +225 -0
  69. data/lib/openstudio-standards/btap/costing/necb_reference_runs.csv +28705 -0
  70. data/lib/openstudio-standards/btap/costing/nv_costing.rb +547 -0
  71. data/lib/openstudio-standards/btap/costing/parallel_tests.rb +92 -0
  72. data/lib/openstudio-standards/btap/costing/pv_ground_costing.rb +687 -0
  73. data/lib/openstudio-standards/btap/costing/shw_costing.rb +705 -0
  74. data/lib/openstudio-standards/btap/costing/test_list.txt +15 -0
  75. data/lib/openstudio-standards/btap/costing/test_run_all_test_locally.rb +27 -0
  76. data/lib/openstudio-standards/btap/costing/test_run_costing_tests.rb +80 -0
  77. data/lib/openstudio-standards/btap/costing/ventilation_costing.rb +2616 -0
  78. data/lib/openstudio-standards/btap/geometry.rb +86 -6
  79. data/lib/openstudio-standards/btap/structure.rb +657 -0
  80. data/lib/openstudio-standards/constructions/modify.rb +2 -1
  81. data/lib/openstudio-standards/create_typical/create_typical.rb +17 -33
  82. data/lib/openstudio-standards/create_typical/space_type_ratios.rb +36 -36
  83. data/lib/openstudio-standards/equipment/create_transformer.rb +104 -0
  84. data/lib/openstudio-standards/equipment/create_typical_equipment.rb +117 -0
  85. data/lib/openstudio-standards/equipment/data/electric_equipment_space_types.json +1514 -0
  86. data/lib/openstudio-standards/equipment/data/gas_equipment_space_types.json +227 -0
  87. data/lib/openstudio-standards/exterior_lighting/create.rb +22 -22
  88. data/lib/openstudio-standards/exterior_lighting/information.rb +3 -2
  89. data/lib/openstudio-standards/hvac/components/air_conditioner_vrf.rb +482 -0
  90. data/lib/openstudio-standards/hvac/components/air_terminal.rb +31 -0
  91. data/lib/openstudio-standards/hvac/components/boiler_hot_water.rb +163 -0
  92. data/lib/openstudio-standards/hvac/components/central_air_source_heat_pump.rb +220 -0
  93. data/lib/openstudio-standards/hvac/components/chiller.rb +25 -0
  94. data/lib/openstudio-standards/hvac/components/coil.rb +276 -0
  95. data/lib/openstudio-standards/hvac/components/coil_cooling_dx_multi_speed.rb +40 -0
  96. data/lib/openstudio-standards/hvac/components/coil_cooling_dx_single_speed.rb +300 -0
  97. data/lib/openstudio-standards/hvac/components/coil_cooling_dx_two_speed.rb +187 -0
  98. data/lib/openstudio-standards/hvac/components/coil_cooling_water.rb +80 -0
  99. data/lib/openstudio-standards/hvac/components/coil_cooling_water_to_air_heat_pump_equation_fit.rb +182 -0
  100. data/lib/openstudio-standards/hvac/components/coil_heating_dx_single_speed.rb +220 -0
  101. data/lib/openstudio-standards/hvac/components/coil_heating_electric.rb +56 -0
  102. data/lib/openstudio-standards/hvac/components/coil_heating_gas.rb +90 -0
  103. data/lib/openstudio-standards/hvac/components/coil_heating_gas_multi_stage.rb +33 -0
  104. data/lib/openstudio-standards/hvac/components/coil_heating_water.rb +98 -0
  105. data/lib/openstudio-standards/hvac/components/coil_heating_water_to_air_heat_pump_equation_fit.rb +147 -0
  106. data/lib/openstudio-standards/hvac/components/component.rb +39 -0
  107. data/lib/openstudio-standards/{standards/ashrae_90_1/data/ashrae_90_1.fans.json → hvac/components/data/fans.json} +6 -6
  108. data/lib/openstudio-standards/hvac/components/fan.rb +363 -0
  109. data/lib/openstudio-standards/hvac/components/heat_exchanger_air_to_air.rb +203 -0
  110. data/lib/openstudio-standards/hvac/components/pump.rb +181 -0
  111. data/lib/openstudio-standards/hvac/controls/radiant_system_controls.rb +594 -0
  112. data/lib/openstudio-standards/hvac/conversions.rb +222 -0
  113. data/lib/openstudio-standards/hvac/curves.rb +192 -0
  114. data/lib/openstudio-standards/hvac/helpers.rb +357 -0
  115. data/lib/openstudio-standards/hvac/setpoint_managers/information.rb +4 -4
  116. data/lib/openstudio-standards/interior_lighting/create_lights.rb +52 -0
  117. data/lib/openstudio-standards/interior_lighting/create_typical_interior_lighting.rb +254 -0
  118. data/lib/openstudio-standards/interior_lighting/data/convert_lighting_data.rb +249 -0
  119. data/lib/openstudio-standards/interior_lighting/data/lighting_space_types.csv +96 -0
  120. data/lib/openstudio-standards/interior_lighting/data/lighting_space_types.json +1429 -0
  121. data/lib/openstudio-standards/interior_lighting/data/lighting_technology.csv +46 -0
  122. data/lib/openstudio-standards/interior_lighting/data/lighting_technology.json +859 -0
  123. data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.AirTerminalSingleDuctVAVReheat.rb +1 -1
  124. data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.AirTerminalSingleDuctVAVReheat.rb +1 -1
  125. data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2016/ashrae_90_1_2016.AirTerminalSingleDuctVAVReheat.rb +1 -1
  126. data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2016/ashrae_90_1_2016.Model.rb +4 -4
  127. data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.AirTerminalSingleDuctVAVReheat.rb +1 -1
  128. data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.Model.rb +4 -4
  129. data/lib/openstudio-standards/prototypes/ashrae_90_1/nrel_nze_ready_2017/nrel_zne_ready_2017.AirTerminalSingleDuctVAVReheat.rb +1 -1
  130. data/lib/openstudio-standards/prototypes/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.AirTerminalSingleDuctVAVReheat.rb +1 -1
  131. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.HighRiseApartment.rb +6 -7
  132. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.Hospital.rb +15 -15
  133. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.LargeHotel.rb +4 -4
  134. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.LargeOffice.rb +5 -5
  135. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.MediumOffice.rb +6 -6
  136. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.Outpatient.rb +7 -7
  137. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.PrimarySchool.rb +4 -4
  138. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.SecondarySchool.rb +6 -6
  139. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.SmallOfficeDetailed.rb +5 -1
  140. data/lib/openstudio-standards/prototypes/common/data/prototype_space_type_map.json +2594 -0
  141. data/lib/openstudio-standards/prototypes/common/data/thermostat_schedule_lookup.json +2108 -0
  142. data/lib/openstudio-standards/prototypes/common/objects/Prototype.AirTerminalSingleDuctVAVReheat.rb +33 -0
  143. data/lib/openstudio-standards/prototypes/common/objects/Prototype.Fan.rb +0 -140
  144. data/lib/openstudio-standards/prototypes/common/objects/Prototype.FanConstantVolume.rb +1 -73
  145. data/lib/openstudio-standards/prototypes/common/objects/Prototype.FanOnOff.rb +1 -69
  146. data/lib/openstudio-standards/prototypes/common/objects/Prototype.FanVariableVolume.rb +0 -116
  147. data/lib/openstudio-standards/prototypes/common/objects/Prototype.FanZoneExhaust.rb +0 -61
  148. data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.hvac.rb +2 -2
  149. data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.rb +128 -13
  150. data/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb +606 -607
  151. data/lib/openstudio-standards/prototypes/common/prototype_space_type_map.rb +41 -0
  152. data/lib/openstudio-standards/prototypes/common/space_type_equipment_map.rb +184 -0
  153. data/lib/openstudio-standards/prototypes/common/space_type_thermostat_schedule_map.rb +116 -0
  154. data/lib/openstudio-standards/qaqc/hvac.rb +12 -12
  155. data/lib/openstudio-standards/refrigeration/create_compressor.rb +2 -5
  156. data/lib/openstudio-standards/refrigeration/data/refrigeration_compressors.csv +4 -4
  157. data/lib/openstudio-standards/service_water_heating/create_water_heater.rb +1 -2
  158. data/lib/openstudio-standards/service_water_heating/create_water_use.rb +5 -5
  159. data/lib/openstudio-standards/space_type/data/level_1_space_types.json +612 -0
  160. data/lib/openstudio-standards/space_type/standards_space_type.rb +53 -0
  161. data/lib/openstudio-standards/standards/Standards.AirConditionerVariableRefrigerantFlow.rb +8 -26
  162. data/lib/openstudio-standards/standards/Standards.AirLoopHVAC.rb +13 -13
  163. data/lib/openstudio-standards/standards/Standards.AirTerminalSingleDuctVAVReheat.rb +0 -24
  164. data/lib/openstudio-standards/standards/Standards.BoilerHotWater.rb +6 -43
  165. data/lib/openstudio-standards/standards/Standards.ChillerElectricEIR.rb +7 -24
  166. data/lib/openstudio-standards/standards/Standards.CoilCoolingDXMultiSpeed.rb +19 -44
  167. data/lib/openstudio-standards/standards/Standards.CoilCoolingDXSingleSpeed.rb +25 -50
  168. data/lib/openstudio-standards/standards/Standards.CoilCoolingDXTwoSpeed.rb +25 -33
  169. data/lib/openstudio-standards/standards/Standards.CoilCoolingWaterToAirHeatPumpEquationFit.rb +9 -22
  170. data/lib/openstudio-standards/standards/Standards.CoilDX.rb +15 -157
  171. data/lib/openstudio-standards/standards/Standards.CoilHeatingDXMultiSpeed.rb +2 -2
  172. data/lib/openstudio-standards/standards/Standards.CoilHeatingDXSingleSpeed.rb +18 -105
  173. data/lib/openstudio-standards/standards/Standards.CoilHeatingGas.rb +3 -23
  174. data/lib/openstudio-standards/standards/Standards.CoilHeatingGasMultiStage.rb +0 -24
  175. data/lib/openstudio-standards/standards/Standards.CoilHeatingWaterToAirHeatPumpEquationFit.rb +2 -86
  176. data/lib/openstudio-standards/standards/Standards.FanVariableVolume.rb +0 -107
  177. data/lib/openstudio-standards/standards/Standards.Model.rb +45 -20
  178. data/lib/openstudio-standards/standards/Standards.People.rb +113 -0
  179. data/lib/openstudio-standards/standards/Standards.PlantLoop.rb +11 -11
  180. data/lib/openstudio-standards/standards/Standards.Pump.rb +2 -147
  181. data/lib/openstudio-standards/standards/Standards.PumpVariableSpeed.rb +57 -41
  182. data/lib/openstudio-standards/standards/Standards.SpaceType.rb +30 -153
  183. data/lib/openstudio-standards/standards/Standards.Ventilation.rb +74 -0
  184. data/lib/openstudio-standards/standards/Standards.ZoneHVACComponent.rb +1 -1
  185. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/ashrae_90_1_2004.PlantLoop.rb +4 -4
  186. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.heat_pumps_heating.json +3 -3
  187. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.spc_typ.json +37 -112
  188. 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 +37 -102
  189. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.heat_pumps_heating.json +3 -3
  190. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.spc_typ.json +37 -112
  191. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.AirTerminalSingleDuctVAVReheat.rb +1 -1
  192. 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 +37 -37
  193. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.heat_pumps_heating.json +6 -6
  194. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.spc_typ.json +37 -37
  195. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.AirTerminalSingleDuctVAVReheat.rb +1 -1
  196. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.BoilerHotWater.rb +1 -1
  197. 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 +37 -102
  198. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.heat_pumps_heating.json +6 -6
  199. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.spc_typ.json +37 -37
  200. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/ashrae_90_1_2016.AirTerminalSingleDuctVAVReheat.rb +1 -1
  201. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/ashrae_90_1_2016.BoilerHotWater.rb +1 -1
  202. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/comstock_ashrae_90_1_2016/data/comstock_ashrae_90_1_2016.spc_typ.json +45 -109
  203. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.heat_pumps_heating.json +6 -6
  204. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.spc_typ.json +37 -37
  205. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.AirLoopHVAC.rb +1 -1
  206. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.AirTerminalSingleDuctVAVReheat.rb +1 -1
  207. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.BoilerHotWater.rb +1 -1
  208. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.CoilHeatingGas.rb +1 -1
  209. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/comstock_ashrae_90_1_2019/data/comstock_ashrae_90_1_2019.spc_typ.json +45 -109
  210. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.heat_pumps_heating.json +6 -6
  211. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.spc_typ.json +37 -37
  212. data/lib/openstudio-standards/standards/ashrae_90_1/data/ashrae_90_1.curves.json +0 -200
  213. 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 +37 -37
  214. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/data/doe_ref_1980_2004.spc_typ.json +37 -37
  215. 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 +37 -37
  216. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/data/doe_ref_pre_1980.spc_typ.json +37 -37
  217. data/lib/openstudio-standards/standards/ashrae_90_1/nrel_zne_ready_2017/nrel_zne_ready_2017.AirTerminalSingleDuctVAVReheat.rb +1 -1
  218. data/lib/openstudio-standards/standards/ashrae_90_1/nrel_zne_ready_2017/nrel_zne_ready_2017.PlantLoop.rb +5 -5
  219. data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.AirTerminalSingleDuctVAVReheat.rb +1 -1
  220. data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.PlantLoop.rb +5 -5
  221. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.AirLoopHVAC.rb +1 -1
  222. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.ChillerElectricEIR.rb +2 -2
  223. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilCoolingDXSingleSpeed.rb +2 -68
  224. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilCoolingDXTwoSpeed.rb +2 -35
  225. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilDX.rb +42 -0
  226. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilHeatingDXSingleSpeed.rb +5 -2
  227. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.CoilHeatingGas.rb +2 -2
  228. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.Model.rb +2 -2
  229. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.PlantLoop.rb +3 -3
  230. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.SpaceType.rb +1 -1
  231. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm_2019/ashrae_90_1_prm_2019.Model.rb +1 -0
  232. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm_2019/ashrae_90_1_prm_2019_WaterHeaterMixed.rb +2 -4
  233. data/lib/openstudio-standards/standards/ashrae_90_1_prm/data/ashrae_90_1_prm.curves.json +0 -200
  234. data/lib/openstudio-standards/standards/ashrae_90_1_prm/data/ashrae_90_1_prm.fans.json +5 -5
  235. data/lib/openstudio-standards/standards/ashrae_90_1_prm/userdata_csv/ashrae_90_1_prm.UserData.rb +7 -1
  236. data/lib/openstudio-standards/standards/ashrae_90_1_prm/userdata_csv/userdata_enums.rb +0 -1
  237. data/lib/openstudio-standards/standards/cbes/data/cbes.curves.json +0 -200
  238. data/lib/openstudio-standards/standards/deer/data/deer.curves.json +0 -200
  239. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/btap_pre1980.rb +21 -37
  240. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/building_envelope.rb +12 -11
  241. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_3_and_8_single_speed.rb +68 -27
  242. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_4.rb +64 -25
  243. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_6.rb +9 -14
  244. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_systems.rb +4 -4
  245. data/lib/openstudio-standards/standards/necb/ECMS/ecms.rb +1 -1
  246. data/lib/openstudio-standards/standards/necb/ECMS/hvac_systems.rb +115 -112
  247. data/lib/openstudio-standards/standards/necb/NECB2011/autozone.rb +637 -249
  248. data/lib/openstudio-standards/standards/necb/NECB2011/beps_compliance_path.rb +16 -12
  249. data/lib/openstudio-standards/standards/necb/NECB2011/building_envelope.rb +799 -46
  250. data/lib/openstudio-standards/standards/necb/NECB2011/data/chillers.json +33 -51
  251. data/lib/openstudio-standards/standards/necb/NECB2011/data/constants.json +75 -7
  252. data/lib/openstudio-standards/standards/necb/NECB2011/data/fuel_type_sets.json +25 -1
  253. data/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/HighriseApartmentMult.osm +14272 -0
  254. data/lib/openstudio-standards/standards/necb/NECB2011/data/heat_pumps_heating.json +21 -15
  255. data/lib/openstudio-standards/standards/necb/NECB2011/data/necb_2015_table_c1.json +1 -1
  256. data/lib/openstudio-standards/standards/necb/NECB2011/data/space_types.json +437 -437
  257. data/lib/openstudio-standards/standards/necb/NECB2011/data/systems.json +516 -0
  258. data/lib/openstudio-standards/standards/necb/NECB2011/data/systems_including_sys5.json +588 -0
  259. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_namer.rb +489 -0
  260. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_1_single_speed.rb +18 -6
  261. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_2_and_5.rb +48 -5
  262. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_3_and_8_multi_speed.rb +2 -2
  263. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_3_and_8_single_speed.rb +35 -27
  264. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_4.rb +34 -23
  265. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_6.rb +8 -6
  266. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_systems.rb +68 -150
  267. data/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb +444 -134
  268. data/lib/openstudio-standards/standards/necb/NECB2011/system_fuels.rb +61 -1
  269. data/lib/openstudio-standards/standards/necb/NECB2015/data/heat_pumps_heating.json +10 -2
  270. data/lib/openstudio-standards/standards/necb/NECB2015/data/space_types.json +636 -636
  271. data/lib/openstudio-standards/standards/necb/NECB2015/data/unitary_acs.json +38 -38
  272. data/lib/openstudio-standards/standards/necb/NECB2015/hvac_systems.rb +17 -8
  273. data/lib/openstudio-standards/standards/necb/NECB2017/data/space_types.json +636 -636
  274. data/lib/openstudio-standards/standards/necb/NECB2020/data/chillers.json +71 -71
  275. data/lib/openstudio-standards/standards/necb/NECB2020/data/heat_pumps_heating.json +16 -6
  276. data/lib/openstudio-standards/standards/necb/NECB2020/data/unitary_acs.json +60 -61
  277. data/lib/openstudio-standards/standards/necb/NECB2020/service_water_heating.rb +30 -30
  278. data/lib/openstudio-standards/standards/necb/README.md +343 -0
  279. data/lib/openstudio-standards/standards/necb/common/btap_analysis.rb +79 -0
  280. data/lib/openstudio-standards/standards/necb/common/btap_data.rb +206 -32
  281. data/lib/openstudio-standards/standards/necb/common/btap_datapoint.rb +75 -43
  282. data/lib/openstudio-standards/standards/necb/common/eccc_electric_grid_intensity_20250311.csv +14 -0
  283. data/lib/openstudio-standards/standards/necb/common/nir_gas_grid_intensity_20250311.csv +14 -0
  284. data/lib/openstudio-standards/standards/necb/common/system_types.yaml +0 -0
  285. data/lib/openstudio-standards/thermal_zone/{thermal_zone.rb → information.rb} +12 -45
  286. data/lib/openstudio-standards/thermal_zone/thermostat_schedules.rb +152 -0
  287. data/lib/openstudio-standards/utilities/logging.rb +18 -14
  288. data/lib/openstudio-standards/version.rb +1 -1
  289. data/lib/openstudio-standards/weather/modify.rb +2 -2
  290. data/lib/openstudio-standards/weather/stat_file.rb +2 -2
  291. data/lib/openstudio-standards.rb +67 -38
  292. metadata +141 -50
  293. data/lib/openstudio-standards/hvac/components/create.rb +0 -169
  294. data/lib/openstudio-standards/hvac/components/modify.rb +0 -42
  295. data/lib/openstudio-standards/prototypes/common/objects/Prototype.AirConditionerVariableRefrigerantFlow.rb +0 -438
  296. data/lib/openstudio-standards/prototypes/common/objects/Prototype.BoilerHotWater.rb +0 -123
  297. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CentralAirSourceHeatPump.rb +0 -216
  298. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilCoolingDXSingleSpeed.rb +0 -273
  299. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilCoolingDXTwoSpeed.rb +0 -159
  300. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilCoolingWater.rb +0 -77
  301. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilCoolingWaterToAirHeatPumpEquationFit.rb +0 -154
  302. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilHeatingDXSingleSpeed.rb +0 -214
  303. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilHeatingElectric.rb +0 -53
  304. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilHeatingGas.rb +0 -72
  305. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilHeatingWater.rb +0 -95
  306. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilHeatingWaterToAirHeatPumpEquationFit.rb +0 -125
  307. data/lib/openstudio-standards/prototypes/common/objects/Prototype.ControllerWaterCoil.rb +0 -17
  308. data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.transformers.rb +0 -90
  309. data/lib/openstudio-standards/prototypes/common/objects/Prototype.Pump.rb +0 -4
  310. data/lib/openstudio-standards/prototypes/common/objects/Prototype.PumpVariableSpeed.rb +0 -70
  311. data/lib/openstudio-standards/prototypes/common/objects/Prototype.radiant_system_controls.rb +0 -590
  312. data/lib/openstudio-standards/prototypes/common/objects/Prototype.utilities.rb +0 -901
  313. data/lib/openstudio-standards/standards/Standards.FanConstantVolume.rb +0 -5
  314. data/lib/openstudio-standards/standards/Standards.FanOnOff.rb +0 -5
  315. data/lib/openstudio-standards/standards/Standards.FanZoneExhaust.rb +0 -5
  316. data/lib/openstudio-standards/standards/Standards.HeaderedPumpsConstantSpeed.rb +0 -5
  317. data/lib/openstudio-standards/standards/Standards.HeaderedPumpsVariableSpeed.rb +0 -55
  318. data/lib/openstudio-standards/standards/Standards.PumpConstantSpeed.rb +0 -5
  319. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.FanConstantVolume.rb +0 -5
  320. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.FanOnOff.rb +0 -5
  321. data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.FanZoneExhaust.rb +0 -5
  322. data/lib/openstudio-standards/standards/cbes/data/cbes.fans.json +0 -328
  323. data/lib/openstudio-standards/standards/deer/data/deer.fans.json +0 -328
  324. /data/lib/openstudio-standards/{prototypes → standards}/ashrae_90_1/ashrae_90_1_2004/ashrae_90_1_2004.PumpVariableSpeed.rb +0 -0
  325. /data/lib/openstudio-standards/{prototypes → standards}/ashrae_90_1/ashrae_90_1_2007/ashrae_90_1_2007.PumpVariableSpeed.rb +0 -0
  326. /data/lib/openstudio-standards/{prototypes → standards}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.PumpVariableSpeed.rb +0 -0
  327. /data/lib/openstudio-standards/{prototypes → standards}/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.PumpVariableSpeed.rb +0 -0
  328. /data/lib/openstudio-standards/{prototypes → standards}/ashrae_90_1/ashrae_90_1_2016/ashrae_90_1_2016.PumpVariableSpeed.rb +0 -0
  329. /data/lib/openstudio-standards/{prototypes → standards}/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.Pump.rb +0 -0
  330. /data/lib/openstudio-standards/{prototypes → standards}/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.PumpVariableSpeed.rb +0 -0
data/lib/openstudio-standards/standards/necb/NECB2020/data/unitary_acs.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "unitary_acs": {
4
4
  "data_type": "table",
5
5
  "refs": [
6
- "assumption"
6
+ "NECB 2020p1"
7
7
  ],
8
8
  "table": [
9
9
  {
@@ -26,7 +26,7 @@
26
26
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
27
27
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
28
28
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
29
- "notes": "From NECB 2011, Table 5.2.12.1"
29
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
30
30
  },
31
31
  {
32
32
  "equipment_type": "Air Conditioners",
@@ -48,7 +48,7 @@
48
48
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
49
49
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
50
50
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
51
- "notes": "From NECB 2011, Table 5.2.12.1"
51
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
52
52
  },
53
53
  {
54
54
  "equipment_type": "Air Conditioners",
@@ -70,7 +70,7 @@
70
70
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
71
71
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
72
72
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
73
- "notes": "From NECB 2011, Table 5.2.12.1"
73
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
74
74
  },
75
75
  {
76
76
  "equipment_type": "Air Conditioners",
@@ -92,19 +92,19 @@
92
92
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
93
93
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
94
94
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
95
- "notes": "From NECB 2011, Table 5.2.12.1"
95
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
96
96
  },
97
97
  {
98
98
  "equipment_type": "Air Conditioners",
99
99
  "cooling_type": "AirCooled",
100
100
  "heating_type": "Electric Resistance or None",
101
101
  "subcategory": "Single Package",
102
- "minimum_capacity": 65001.0,
102
+ "minimum_capacity": 65000.0,
103
103
  "maximum_capacity": 136480.0,
104
104
  "start_date": "9/9/1919",
105
105
  "end_date": "2999-09-09T00:00:00+00:00",
106
106
  "minimum_seasonal_energy_efficiency_ratio": null,
107
- "minimum_energy_efficiency_ratio": 9.44,
107
+ "minimum_energy_efficiency_ratio": 11.2,
108
108
  "minimum_integrated_part_load_value": null,
109
109
  "minimum_integrated_energy_efficiency_ratio": null,
110
110
  "ptac_eer_coefficient_1": null,
@@ -114,19 +114,19 @@
114
114
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
115
115
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
116
116
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
117
- "notes": "From NECB 2011, Table 5.2.12.1"
117
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
118
118
  },
119
119
  {
120
120
  "equipment_type": "Air Conditioners",
121
121
  "cooling_type": "AirCooled",
122
122
  "heating_type": "All Other",
123
123
  "subcategory": "Single Package",
124
- "minimum_capacity": 65001.0,
124
+ "minimum_capacity": 65000.0,
125
125
  "maximum_capacity": 136480.0,
126
126
  "start_date": "9/9/1919",
127
127
  "end_date": "2999-09-09T00:00:00+00:00",
128
128
  "minimum_seasonal_energy_efficiency_ratio": null,
129
- "minimum_energy_efficiency_ratio": 9.26,
129
+ "minimum_energy_efficiency_ratio": 11.0,
130
130
  "minimum_integrated_part_load_value": null,
131
131
  "minimum_integrated_energy_efficiency_ratio": null,
132
132
  "ptac_eer_coefficient_1": null,
@@ -136,19 +136,19 @@
136
136
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
137
137
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
138
138
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
139
- "notes": "From NECB 2011, Table 5.2.12.1"
139
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
140
140
  },
141
141
  {
142
142
  "equipment_type": "Air Conditioners",
143
143
  "cooling_type": "AirCooled",
144
144
  "heating_type": "Electric Resistance or None",
145
145
  "subcategory": "Split System",
146
- "minimum_capacity": 65001.0,
146
+ "minimum_capacity": 65000.0,
147
147
  "maximum_capacity": 136480.0,
148
148
  "start_date": "9/9/1919",
149
149
  "end_date": "2999-09-09T00:00:00+00:00",
150
150
  "minimum_seasonal_energy_efficiency_ratio": null,
151
- "minimum_energy_efficiency_ratio": 9.44,
151
+ "minimum_energy_efficiency_ratio": 11.2,
152
152
  "minimum_integrated_part_load_value": null,
153
153
  "minimum_integrated_energy_efficiency_ratio": null,
154
154
  "ptac_eer_coefficient_1": null,
@@ -158,19 +158,19 @@
158
158
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
159
159
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
160
160
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
161
- "notes": "From NECB 2011, Table 5.2.12.1"
161
+ "notes": "From NECB 2020, Table 5.2.12.1.-A1"
162
162
  },
163
163
  {
164
164
  "equipment_type": "Air Conditioners",
165
165
  "cooling_type": "AirCooled",
166
166
  "heating_type": "All Other",
167
167
  "subcategory": "Split System",
168
- "minimum_capacity": 65001.0,
168
+ "minimum_capacity": 65000.0,
169
169
  "maximum_capacity": 136480.0,
170
170
  "start_date": "9/9/1919",
171
171
  "end_date": "2999-09-09T00:00:00+00:00",
172
172
  "minimum_seasonal_energy_efficiency_ratio": null,
173
- "minimum_energy_efficiency_ratio": 9.26,
173
+ "minimum_energy_efficiency_ratio": 11.0,
174
174
  "minimum_integrated_part_load_value": null,
175
175
  "minimum_integrated_energy_efficiency_ratio": null,
176
176
  "ptac_eer_coefficient_1": null,
@@ -180,19 +180,19 @@
180
180
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
181
181
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
182
182
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
183
- "notes": "From NECB 2011, Table 5.2.12.1"
183
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
184
184
  },
185
185
  {
186
186
  "equipment_type": "Air Conditioners",
187
187
  "cooling_type": "AirCooled",
188
188
  "heating_type": "Electric Resistance or None",
189
189
  "subcategory": "Single Package",
190
- "minimum_capacity": 136481.0,
190
+ "minimum_capacity": 136480.0,
191
191
  "maximum_capacity": 238840.0,
192
192
  "start_date": "9/9/1919",
193
193
  "end_date": "2999-09-09T00:00:00+00:00",
194
194
  "minimum_seasonal_energy_efficiency_ratio": null,
195
- "minimum_energy_efficiency_ratio": 9.26,
195
+ "minimum_energy_efficiency_ratio": 11.0,
196
196
  "minimum_integrated_part_load_value": null,
197
197
  "minimum_integrated_energy_efficiency_ratio": null,
198
198
  "ptac_eer_coefficient_1": null,
@@ -202,19 +202,19 @@
202
202
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
203
203
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
204
204
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
205
- "notes": "From NECB 2011, Table 5.2.12.1: CHECK THIS"
205
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
206
206
  },
207
207
  {
208
208
  "equipment_type": "Air Conditioners",
209
209
  "cooling_type": "AirCooled",
210
210
  "heating_type": "All Other",
211
211
  "subcategory": "Single Package",
212
- "minimum_capacity": 136481.0,
212
+ "minimum_capacity": 136480.0,
213
213
  "maximum_capacity": 238840.0,
214
214
  "start_date": "9/9/1919",
215
215
  "end_date": "2999-09-09T00:00:00+00:00",
216
216
  "minimum_seasonal_energy_efficiency_ratio": null,
217
- "minimum_energy_efficiency_ratio": 9.08,
217
+ "minimum_energy_efficiency_ratio": 10.8,
218
218
  "minimum_integrated_part_load_value": null,
219
219
  "minimum_integrated_energy_efficiency_ratio": null,
220
220
  "ptac_eer_coefficient_1": null,
@@ -224,19 +224,19 @@
224
224
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
225
225
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
226
226
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
227
- "notes": "From NECB 2011, Table 5.2.12.1: CHECK THIS"
227
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
228
228
  },
229
229
  {
230
230
  "equipment_type": "Air Conditioners",
231
231
  "cooling_type": "AirCooled",
232
232
  "heating_type": "Electric Resistance or None",
233
233
  "subcategory": "Split System",
234
- "minimum_capacity": 136481.0,
234
+ "minimum_capacity": 136480.0,
235
235
  "maximum_capacity": 238840.0,
236
236
  "start_date": "9/9/1919",
237
237
  "end_date": "2999-09-09T00:00:00+00:00",
238
238
  "minimum_seasonal_energy_efficiency_ratio": null,
239
- "minimum_energy_efficiency_ratio": 9.26,
239
+ "minimum_energy_efficiency_ratio": 11.0,
240
240
  "minimum_integrated_part_load_value": null,
241
241
  "minimum_integrated_energy_efficiency_ratio": null,
242
242
  "ptac_eer_coefficient_1": null,
@@ -246,19 +246,19 @@
246
246
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
247
247
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
248
248
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
249
- "notes": "From NECB 2011, Table 5.2.12.1: CHECK THIS"
249
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
250
250
  },
251
251
  {
252
252
  "equipment_type": "Air Conditioners",
253
253
  "cooling_type": "AirCooled",
254
254
  "heating_type": "All Other",
255
255
  "subcategory": "Split System",
256
- "minimum_capacity": 136481.0,
256
+ "minimum_capacity": 136480.0,
257
257
  "maximum_capacity": 238840.0,
258
258
  "start_date": "9/9/1919",
259
259
  "end_date": "2999-09-09T00:00:00+00:00",
260
260
  "minimum_seasonal_energy_efficiency_ratio": null,
261
- "minimum_energy_efficiency_ratio": 9.08,
261
+ "minimum_energy_efficiency_ratio": 10.8,
262
262
  "minimum_integrated_part_load_value": null,
263
263
  "minimum_integrated_energy_efficiency_ratio": null,
264
264
  "ptac_eer_coefficient_1": null,
@@ -268,19 +268,19 @@
268
268
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
269
269
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
270
270
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
271
- "notes": "From NECB 2011, Table 5.2.12.1: CHECK THIS"
271
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
272
272
  },
273
273
  {
274
274
  "equipment_type": "Air Conditioners",
275
275
  "cooling_type": "AirCooled",
276
276
  "heating_type": "Electric Resistance or None",
277
277
  "subcategory": "Single Package",
278
- "minimum_capacity": 238841.0,
278
+ "minimum_capacity": 238840.0,
279
279
  "maximum_capacity": 759999.0,
280
280
  "start_date": "9/9/1919",
281
281
  "end_date": "2999-09-09T00:00:00+00:00",
282
282
  "minimum_seasonal_energy_efficiency_ratio": null,
283
- "minimum_energy_efficiency_ratio": 8.39,
283
+ "minimum_energy_efficiency_ratio": 10.0,
284
284
  "minimum_integrated_part_load_value": null,
285
285
  "minimum_integrated_energy_efficiency_ratio": null,
286
286
  "ptac_eer_coefficient_1": null,
@@ -290,19 +290,19 @@
290
290
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
291
291
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
292
292
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
293
- "notes": "From NECB 2011, Table 5.2.12.1"
293
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
294
294
  },
295
295
  {
296
296
  "equipment_type": "Air Conditioners",
297
297
  "cooling_type": "AirCooled",
298
298
  "heating_type": "All Other",
299
299
  "subcategory": "Single Package",
300
- "minimum_capacity": 238841.0,
300
+ "minimum_capacity": 238840.0,
301
301
  "maximum_capacity": 759999.0,
302
302
  "start_date": "9/9/1919",
303
303
  "end_date": "2999-09-09T00:00:00+00:00",
304
304
  "minimum_seasonal_energy_efficiency_ratio": null,
305
- "minimum_energy_efficiency_ratio": 8.21,
305
+ "minimum_energy_efficiency_ratio": 9.8,
306
306
  "minimum_integrated_part_load_value": null,
307
307
  "minimum_integrated_energy_efficiency_ratio": null,
308
308
  "ptac_eer_coefficient_1": null,
@@ -312,19 +312,19 @@
312
312
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
313
313
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
314
314
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
315
- "notes": "From NECB 2011, Table 5.2.12.1"
315
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
316
316
  },
317
317
  {
318
318
  "equipment_type": "Air Conditioners",
319
319
  "cooling_type": "AirCooled",
320
320
  "heating_type": "Electric Resistance or None",
321
321
  "subcategory": "Split System",
322
- "minimum_capacity": 238841.0,
322
+ "minimum_capacity": 238840.0,
323
323
  "maximum_capacity": 759999.0,
324
324
  "start_date": "9/9/1919",
325
325
  "end_date": "2999-09-09T00:00:00+00:00",
326
326
  "minimum_seasonal_energy_efficiency_ratio": null,
327
- "minimum_energy_efficiency_ratio": 8.39,
327
+ "minimum_energy_efficiency_ratio": 10.0,
328
328
  "minimum_integrated_part_load_value": null,
329
329
  "minimum_integrated_energy_efficiency_ratio": null,
330
330
  "ptac_eer_coefficient_1": null,
@@ -334,7 +334,7 @@
334
334
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
335
335
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
336
336
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
337
- "notes": "From NECB 2011, Table 5.2.12.1"
337
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
338
338
  },
339
339
  {
340
340
  "equipment_type": "Air Conditioners",
@@ -346,7 +346,7 @@
346
346
  "start_date": "9/9/1919",
347
347
  "end_date": "2999-09-09T00:00:00+00:00",
348
348
  "minimum_seasonal_energy_efficiency_ratio": null,
349
- "minimum_energy_efficiency_ratio": 8.21,
349
+ "minimum_energy_efficiency_ratio": 9.8,
350
350
  "minimum_integrated_part_load_value": null,
351
351
  "minimum_integrated_energy_efficiency_ratio": null,
352
352
  "ptac_eer_coefficient_1": null,
@@ -356,19 +356,19 @@
356
356
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
357
357
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
358
358
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
359
- "notes": "From NECB 2011, Table 5.2.12.1"
359
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
360
360
  },
361
361
  {
362
362
  "equipment_type": "Air Conditioners",
363
363
  "cooling_type": "AirCooled",
364
364
  "heating_type": "Electric Resistance or None",
365
365
  "subcategory": "Single Package",
366
- "minimum_capacity": 760000.0,
366
+ "minimum_capacity": 759999.0,
367
367
  "maximum_capacity": 9999999.0,
368
368
  "start_date": "9/9/1919",
369
369
  "end_date": "2999-09-09T00:00:00+00:00",
370
370
  "minimum_seasonal_energy_efficiency_ratio": null,
371
- "minimum_energy_efficiency_ratio": 8.12,
371
+ "minimum_energy_efficiency_ratio": 9.7,
372
372
  "minimum_integrated_part_load_value": null,
373
373
  "minimum_integrated_energy_efficiency_ratio": null,
374
374
  "ptac_eer_coefficient_1": null,
@@ -378,19 +378,19 @@
378
378
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
379
379
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
380
380
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
381
- "notes": "From NECB 2011, Table 5.2.12.1"
381
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
382
382
  },
383
383
  {
384
384
  "equipment_type": "Air Conditioners",
385
385
  "cooling_type": "AirCooled",
386
386
  "heating_type": "All Other",
387
387
  "subcategory": "Single Package",
388
- "minimum_capacity": 760000.0,
388
+ "minimum_capacity": 759999.0,
389
389
  "maximum_capacity": 9999999.0,
390
390
  "start_date": "9/9/1919",
391
391
  "end_date": "2999-09-09T00:00:00+00:00",
392
392
  "minimum_seasonal_energy_efficiency_ratio": null,
393
- "minimum_energy_efficiency_ratio": 7.94,
393
+ "minimum_energy_efficiency_ratio": 9.5,
394
394
  "minimum_integrated_part_load_value": null,
395
395
  "minimum_integrated_energy_efficiency_ratio": null,
396
396
  "ptac_eer_coefficient_1": null,
@@ -400,19 +400,19 @@
400
400
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
401
401
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
402
402
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
403
- "notes": "From NECB 2011, Table 5.2.12.1"
403
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
404
404
  },
405
405
  {
406
406
  "equipment_type": "Air Conditioners",
407
407
  "cooling_type": "AirCooled",
408
408
  "heating_type": "Electric Resistance or None",
409
409
  "subcategory": "Split System",
410
- "minimum_capacity": 760000.0,
410
+ "minimum_capacity": 759999.0,
411
411
  "maximum_capacity": 9999999.0,
412
412
  "start_date": "9/9/1919",
413
413
  "end_date": "2999-09-09T00:00:00+00:00",
414
414
  "minimum_seasonal_energy_efficiency_ratio": null,
415
- "minimum_energy_efficiency_ratio": 8.12,
415
+ "minimum_energy_efficiency_ratio": 9.7,
416
416
  "minimum_integrated_part_load_value": null,
417
417
  "minimum_integrated_energy_efficiency_ratio": null,
418
418
  "ptac_eer_coefficient_1": null,
@@ -422,19 +422,19 @@
422
422
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
423
423
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
424
424
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
425
- "notes": "From NECB 2011, Table 5.2.12.1"
425
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
426
426
  },
427
427
  {
428
428
  "equipment_type": "Air Conditioners",
429
429
  "cooling_type": "AirCooled",
430
430
  "heating_type": "All Other",
431
431
  "subcategory": "Split System",
432
- "minimum_capacity": 760000.0,
432
+ "minimum_capacity": 759999.0,
433
433
  "maximum_capacity": 9999999.0,
434
434
  "start_date": "9/9/1919",
435
435
  "end_date": "2999-09-09T00:00:00+00:00",
436
436
  "minimum_seasonal_energy_efficiency_ratio": null,
437
- "minimum_energy_efficiency_ratio": 7.94,
437
+ "minimum_energy_efficiency_ratio": 9.5,
438
438
  "minimum_integrated_part_load_value": null,
439
439
  "minimum_integrated_energy_efficiency_ratio": null,
440
440
  "ptac_eer_coefficient_1": null,
@@ -444,7 +444,7 @@
444
444
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
445
445
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
446
446
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
447
- "notes": "From NECB 2011, Table 5.2.12.1"
447
+ "notes": "From NECB 2020, Table 5.2.12.1.-A"
448
448
  },
449
449
  {
450
450
  "equipment_type": "PTAC",
@@ -453,7 +453,7 @@
453
453
  "heating_type": "Electric Resistance or None",
454
454
  "subcategory": null,
455
455
  "minimum_capacity": 0,
456
- "maximum_capacity": 7165.4,
456
+ "maximum_capacity": 7165.5,
457
457
  "start_date": "9/9/1919",
458
458
  "end_date": "2999-09-09T00:00:00+00:00",
459
459
  "minimum_seasonal_energy_efficiency_ratio": null,
@@ -467,7 +467,7 @@
467
467
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
468
468
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
469
469
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
470
- "notes": "From NECB 2020, Table 5.2.12.1.G"
470
+ "notes": "From NECB 2020, Table 5.2.12.1.-G"
471
471
  },
472
472
  {
473
473
  "equipment_type": "PTAC",
@@ -476,7 +476,7 @@
476
476
  "heating_type": "All Other",
477
477
  "subcategory": null,
478
478
  "minimum_capacity": 0,
479
- "maximum_capacity": 7165.4,
479
+ "maximum_capacity": 7165.5,
480
480
  "start_date": "9/9/1919",
481
481
  "end_date": "2999-09-09T00:00:00+00:00",
482
482
  "minimum_seasonal_energy_efficiency_ratio": null,
@@ -490,7 +490,7 @@
490
490
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
491
491
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
492
492
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
493
- "notes": "From NECB 2020, Table 5.2.12.1.G"
493
+ "notes": "From NECB 2020, Table 5.2.12.1.-G"
494
494
  },
495
495
  {
496
496
  "equipment_type": "PTAC",
@@ -513,7 +513,7 @@
513
513
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
514
514
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
515
515
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
516
- "notes": "From NECB 2020, Table 5.2.12.1.G"
516
+ "notes": "From NECB 2020, Table 5.2.12.1.-G"
517
517
  },
518
518
  {
519
519
  "equipment_type": "PTAC",
@@ -536,7 +536,7 @@
536
536
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
537
537
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
538
538
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
539
- "notes": "From NECB 2020, Table 5.2.12.1.G"
539
+ "notes": "From NECB 2020, Table 5.2.12.1.-G"
540
540
  },
541
541
  {
542
542
  "equipment_type": "PTAC",
@@ -559,7 +559,7 @@
559
559
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
560
560
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
561
561
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
562
- "notes": "From NECB 2020, Table 5.2.12.1.G"
562
+ "notes": "From NECB 2020, Table 5.2.12.1.-G"
563
563
  },
564
564
  {
565
565
  "equipment_type": "PTAC",
@@ -582,9 +582,8 @@
582
582
  "cool_eir_ft": "DXCOOL-NECB2011-REF-COOLEIRFT",
583
583
  "cool_eir_fflow": "DXCOOL-NECB2011-REF-COOLEIRFFLOW",
584
584
  "cool_plf_fplr": "DXCOOL-NECB2011-REF-COOLPLFFPLR",
585
- "notes": "From NECB 2020, Table 5.2.12.1.G"
585
+ "notes": "From NECB 2020, Table 5.2.12.1.-G"
586
586
  }
587
-
588
587
  ]
589
588
  }
590
589
  }
data/lib/openstudio-standards/standards/necb/NECB2020/service_water_heating.rb CHANGED
@@ -20,6 +20,7 @@ class NECB2020
20
20
  else
21
21
  capacity_w = capacity_w.get
22
22
  end
23
+ capacity_kw = capacity_w/1000.0
23
24
  capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
24
25
  capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, 'W', 'kBtu/hr').get
25
26
 
@@ -35,6 +36,7 @@ class NECB2020
35
36
  end
36
37
  volume_gal = OpenStudio.convert(volume_m3, 'm^3', 'gal').get
37
38
  volume_litre = OpenStudio.convert(volume_m3, 'm^3', 'L').get
39
+
38
40
  # Get the heater fuel type
39
41
  fuel_type = water_heater_mixed.heaterFuelType
40
42
  unless fuel_type == 'NaturalGas' || fuel_type == 'Electricity' || fuel_type == 'FuelOilNo2'
@@ -47,12 +49,12 @@ class NECB2020
47
49
  # From PNNL http://www.energycodes.gov/sites/default/files/documents/PrototypeModelEnhancements_2014_0.pdf
48
50
  # Appendix A: Service Water Heating
49
51
  # and modified by PCF 1630 as noted below.
50
-
51
52
  water_heater_eff = nil
52
53
  ua_btu_per_hr_per_f = nil
53
54
  sl_btu_per_hr = nil
54
55
  q_load_btu_per_hr = nil
55
56
  uef = nil
57
+
56
58
  case fuel_type
57
59
  when 'Electricity'
58
60
  volume_litre_per_s = volume_m3 * 1000
@@ -89,55 +91,57 @@ class NECB2020
89
91
  # AND
90
92
  #
91
93
  # PNNL http://www.energycodes.gov/sites/default/files/documents/PrototypeModelEnhancements_2014_0.pdf
94
+ #
95
+ # Updated reference links:
96
+ # https://www.pnnl.gov/main/publications/external/technical_reports/PNNL-23269.pdf - Equations may have typos, also for EF which is at diff test T.
97
+ # https://www.nrel.gov/docs/fy21osti/71633.pdf
98
+ # https://ases.org/wp-content/uploads/2021/11/Using-Simple-Algebraic-Models-and-Rating-Test-Data-to-Predict-Water-Heater-Energy-Consumption-Under-Off-Test-Conditions-.pdf
99
+ # https://www.ecfr.gov/current/title-10/chapter-II/subchapter-D/part-430/subpart-B/appendix-Appendix%20E%20to%20Subpart%20B%20of%20Part%20430
100
+ #
101
+
102
+ # Assume first hour rating.
103
+ # Rule of thumb is FHR is 70% tank_volume + ~40 Gal
104
+ # Ref: https://www.waterheaterpros.com/first-hour-rating#:~:text=To%20find%20a%20water%20heater%27s,can%20deliver%20at%20peak%20hours.
105
+ fhr_L_per_hr = 0.7*volume_litre + 151.0
92
106
 
93
- # Assume fhr = peak demand flow
94
- tank_param = auto_size_shw_capacity(model:water_heater_mixed.model, shw_scale: 'NECB_Default')
95
- fhr_L_per_hr = tank_param['loop_peak_flow_rate_SI']
96
- fhr_L_per_hr = fhr_L_per_hr * 3600000
97
107
  if capacity_w <= 22000 and volume_litre >= 76 and volume_litre < 208
98
- if fhr_L_per_hr < 68
108
+ if fhr_L_per_hr < 68 # 18 US Gal - UEF draw pattern very small usage
99
109
  uef = 0.3456 - 0.00053*volume_litre
100
- q_load_btu_per_hr = 5561
101
- volume_drawn_gal = 10
102
- elsif fhr_L_per_hr >= 68 and fhr_L_per_hr < 193
110
+ volume_drawn_gal = 10 # 37.85L
111
+ elsif fhr_L_per_hr >= 68 and fhr_L_per_hr < 193 # 51 US Gal - UEF draw pattern low usage
103
112
  uef = 0.5982 - 0.00050*volume_litre
104
- q_load_btu_per_hr = 21131
105
- volume_drawn_gal = 38
106
- elsif fhr_L_per_hr >= 193 and fhr_L_per_hr < 284
113
+ volume_drawn_gal = 38 # 143.8L
114
+ elsif fhr_L_per_hr >= 193 and fhr_L_per_hr < 284 # 75 US Gal - UEF draw pattern medium usage
107
115
  uef = 0.6483 - 0.00045*volume_litre
108
- q_load_btu_per_hr = 30584
109
- volume_drawn_gal = 55
110
- elsif fhr_L_per_hr >= 284
116
+ volume_drawn_gal = 55 # 208.2L
117
+ elsif fhr_L_per_hr >= 284 # 75 US Gal - UEF draw pattern high usage
111
118
  uef = 0.6920 - 0.00034*volume_litre
112
- q_load_btu_per_hr = 46710
113
- volume_drawn_gal = 84
119
+ volume_drawn_gal = 84 # 318.0L
114
120
  end
115
121
 
116
- # Assume burner efficiency (PNNL)
122
+ # Assume burner efficiency (PNNL-23269)
117
123
  water_heater_eff = 0.82
118
124
 
119
125
  # Estimate recovery efficiency (RE) and UA (Maguire and Robers, 2020)
120
- q_load_btu = volume_drawn_gal*8.30074*0.99826*(125-58) #water properties at 91.5F
126
+ q_load_btu = volume_drawn_gal*8.30074*0.99826*(125.0-58.0) # water properties at 91.5F; derived from UEF test.
121
127
  capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
128
+
129
+ # From PNNL-23269?
122
130
  re = water_heater_eff + q_load_btu*(uef-water_heater_eff)/(24*capacity_btu_per_hr*uef)
123
131
  ua_btu_per_hr_per_f = (water_heater_eff-re)*capacity_btu_per_hr/(125-67.5)
124
132
 
125
133
  elsif capacity_w <= 22000 and volume_litre >= 208 and volume_litre < 380
126
134
  if fhr_L_per_hr < 68
127
135
  uef = 0.6470 - 0.00016*volume_litre
128
- q_load_btu_per_hr = 5561
129
136
  volume_drawn_gal = 10
130
137
  elsif fhr_L_per_hr >= 68 and fhr_L_per_hr < 193
131
138
  uef = 0.7689 - 0.00013*volume_litre
132
- q_load_btu_per_hr = 21131
133
139
  volume_drawn_gal = 38
134
140
  elsif fhr_L_per_hr >= 193 and fhr_L_per_hr < 284
135
141
  uef = 0.7897 - 0.00011*volume_litre
136
- q_load_btu_per_hr = 30584
137
142
  volume_drawn_gal = 55
138
143
  elsif fhr_L_per_hr >= 284
139
144
  uef = 0.8072 - 0.00008*volume_litre
140
- q_load_btu_per_hr = 46710
141
145
  volume_drawn_gal = 84
142
146
  end
143
147
 
@@ -147,7 +151,8 @@ class NECB2020
147
151
  # Estimate recovery efficiency (RE) and UA (Maguire and Robers, 2020)
148
152
  q_load_btu = volume_drawn_gal*8.30074*0.99826*(125-58) #water properties at 91.5F
149
153
  capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
150
- # Estimate recovery efficiency (RE) and UA (Maguire and Robers, 2020)
154
+
155
+ # Estimate recovery efficiency (RE) and UA (Maguire and Robers, 2020); Note tank at 125F for UEF, previously 135F for EF test
151
156
  re = water_heater_eff + q_load_btu*(uef-water_heater_eff)/(24*capacity_btu_per_hr*uef)
152
157
  ua_btu_per_hr_per_f = (water_heater_eff-re)*capacity_btu_per_hr/(125-67.5)
153
158
 
@@ -163,16 +168,12 @@ class NECB2020
163
168
  # Estimate recovery efficiency (RE) and UA (Maguire and Robers, 2020)
164
169
  capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
165
170
  if fhr_L_per_hr < 68
166
- q_load_btu_per_hr = 5561
167
171
  volume_drawn_gal = 10
168
172
  elsif fhr_L_per_hr >= 68 and fhr_L_per_hr < 193
169
- q_load_btu_per_hr = 21131
170
173
  volume_drawn_gal = 38
171
174
  elsif fhr_L_per_hr >= 193 and fhr_L_per_hr < 284
172
- q_load_btu_per_hr = 30584
173
175
  volume_drawn_gal = 55
174
- elsif fhr_L_per_hr >= 284
175
- q_load_btu_per_hr = 46710
176
+ elsif fhr_L_per_hr >= 284
176
177
  volume_drawn_gal = 84
177
178
  end
178
179
  q_load_btu = volume_drawn_gal*8.30074*0.99826*(125-58) #water properties at 91.5F
@@ -182,7 +183,6 @@ class NECB2020
182
183
  ua_btu_per_hr_per_f = (water_heater_eff-re)*capacity_btu_per_hr/(125-67.5)
183
184
 
184
185
  else # all other water heaters
185
- capacity_kw = capacity_w/1000
186
186
  capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
187
187
  # thermal efficiency (NECB2020)
188
188
  et = 0.9