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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (102) hide show
  1. checksums.yaml +4 -4
  2. data/data/geometry/ASHRAEHighriseApartment.osm +0 -27
  3. data/data/standards/OpenStudio_Standards-ashrae_90_1.xlsx +0 -0
  4. data/data/standards/OpenStudio_Standards-ashrae_90_1_28Jan2022.xlsx +0 -0
  5. data/data/standards/OpenStudio_Standards-ashrae_90_1_28_Jan2022_2.xlsx +0 -0
  6. data/data/standards/export_OpenStudio_libraries.rb +2 -0
  7. data/data/standards/test_performance_expected_dd_results.csv +710 -710
  8. data/lib/openstudio-standards/btap/btap_result.rb +2 -2
  9. data/lib/openstudio-standards/btap/reporting.rb +2 -2
  10. data/lib/openstudio-standards/btap/simmanager.rb +2 -2
  11. data/lib/openstudio-standards/hvac_sizing/Siz.ControllerOutdoorAir.rb +0 -54
  12. data/lib/openstudio-standards/hvac_sizing/Siz.HeatingCoolingFuels.rb +11 -1
  13. data/lib/openstudio-standards/hvac_sizing/Siz.Model.rb +1 -1
  14. data/lib/openstudio-standards/hvac_sizing/Siz.ThermalZone.rb +2 -2
  15. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.College.rb +26 -5
  16. data/lib/openstudio-standards/prototypes/common/buildings/Prototype.Laboratory.rb +14 -6
  17. data/lib/openstudio-standards/prototypes/common/objects/Prototype.BoilerHotWater.rb +12 -9
  18. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilCoolingWaterToAirHeatPumpEquationFit.rb +35 -16
  19. data/lib/openstudio-standards/prototypes/common/objects/Prototype.CoilHeatingWaterToAirHeatPumpEquationFit.rb +23 -10
  20. data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.rb +36 -0
  21. data/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb +6 -6
  22. data/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb +24 -15
  23. data/lib/openstudio-standards/standards/Standards.AirLoopHVAC.rb +2 -2
  24. data/lib/openstudio-standards/standards/Standards.CoilCoolingWaterToAirHeatPumpEquationFit.rb +9 -3
  25. data/lib/openstudio-standards/standards/Standards.CoilHeatingGas.rb +2 -0
  26. data/lib/openstudio-standards/standards/Standards.Construction.rb +12 -6
  27. data/lib/openstudio-standards/standards/Standards.Model.rb +42 -7
  28. data/lib/openstudio-standards/standards/Standards.PlanarSurface.rb +15 -0
  29. data/lib/openstudio-standards/standards/Standards.Space.rb +1 -1
  30. data/lib/openstudio-standards/standards/Standards.SpaceType.rb +7 -0
  31. data/lib/openstudio-standards/standards/Standards.ThermalZone.rb +5 -2
  32. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/ashrae_90_1_2004.Model.rb +32 -11
  33. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.construction_properties.json +22 -742
  34. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.construction_sets.json +2 -2
  35. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.prototype_inputs.json +3 -3
  36. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.spc_typ.json +6 -6
  37. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.construction_properties.json +19 -559
  38. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.construction_sets.json +2 -2
  39. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.prototype_inputs.json +3 -3
  40. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.spc_typ.json +6 -6
  41. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.construction_properties.json +19 -559
  42. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.construction_sets.json +2 -2
  43. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.prototype_inputs.json +5 -5
  44. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.spc_typ.json +7 -7
  45. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.construction_properties.json +19 -559
  46. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.construction_sets.json +2 -2
  47. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.prototype_inputs.json +5 -5
  48. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.spc_typ.json +7 -7
  49. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.construction_properties.json +370 -910
  50. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.construction_sets.json +2 -2
  51. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.prototype_inputs.json +6 -6
  52. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.refrigeration_system.json +0 -8
  53. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.spc_typ.json +12 -12
  54. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.AirLoopHVAC.rb +19 -6
  55. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.construction_properties.json +2380 -1300
  56. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.construction_sets.json +2 -2
  57. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.prototype_inputs.json +6 -6
  58. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.refrigeration_system.json +0 -8
  59. data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.spc_typ.json +12 -12
  60. data/lib/openstudio-standards/standards/ashrae_90_1/data/ashrae_90_1.constructions.json +140 -0
  61. data/lib/openstudio-standards/standards/ashrae_90_1/data/ashrae_90_1.schedules.json +1176 -312
  62. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/data/doe_ref_1980_2004.construction_properties.json +172 -1132
  63. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/data/doe_ref_1980_2004.construction_sets.json +14 -14
  64. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/data/doe_ref_1980_2004.prototype_inputs.json +2 -2
  65. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_1980_2004/data/doe_ref_1980_2004.spc_typ.json +9 -9
  66. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/data/doe_ref_pre_1980.construction_properties.json +180 -1140
  67. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/data/doe_ref_pre_1980.construction_sets.json +14 -14
  68. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/data/doe_ref_pre_1980.prototype_inputs.json +2 -2
  69. data/lib/openstudio-standards/standards/ashrae_90_1/doe_ref_pre_1980/data/doe_ref_pre_1980.spc_typ.json +10 -10
  70. data/lib/openstudio-standards/standards/ashrae_90_1/nrel_zne_ready_2017/data/nrel_zne_ready_2017.construction_properties.json +9 -9
  71. data/lib/openstudio-standards/standards/ashrae_90_1/ze_aedg_multifamily/data/ze_aedg_multifamily.construction_properties.json +9 -9
  72. data/lib/openstudio-standards/standards/deer/deer.PlanarSurface.rb +15 -0
  73. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_3_and_8_single_speed.rb +12 -6
  74. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_4.rb +12 -6
  75. data/lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_6.rb +16 -8
  76. data/lib/openstudio-standards/standards/necb/ECMS/ecms.rb +10 -20
  77. data/lib/openstudio-standards/standards/necb/ECMS/hvac_systems.rb +209 -37
  78. data/lib/openstudio-standards/standards/necb/ECMS/loads.rb +1 -0
  79. data/lib/openstudio-standards/standards/necb/ECMS/pv_ground.rb +8 -6
  80. data/lib/openstudio-standards/standards/necb/NECB2011/autozone.rb +16 -9
  81. data/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/HighriseApartment.osm +1 -1
  82. data/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/LowriseApartment.osm +1 -1
  83. data/lib/openstudio-standards/standards/necb/NECB2011/data/geometry/MidriseApartment.osm +1 -1
  84. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_1_multi_speed.rb +9 -5
  85. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_1_single_speed.rb +10 -6
  86. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_2_and_5.rb +9 -5
  87. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_3_and_8_multi_speed.rb +14 -8
  88. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_3_and_8_single_speed.rb +14 -8
  89. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_4.rb +13 -6
  90. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_system_6.rb +12 -6
  91. data/lib/openstudio-standards/standards/necb/NECB2011/hvac_systems.rb +4 -2
  92. data/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb +38 -19
  93. data/lib/openstudio-standards/standards/necb/NECB2011/qaqc/necb_qaqc.rb +2 -2
  94. data/lib/openstudio-standards/standards/necb/NECB2011/service_water_heating.rb +15 -4
  95. data/lib/openstudio-standards/standards/necb/NECB2020/building_envelope.rb +10 -651
  96. data/lib/openstudio-standards/standards/necb/NECB2020/necb_2020.rb +8 -38
  97. data/lib/openstudio-standards/standards/necb/NECB2020/service_water_heating.rb +159 -0
  98. data/lib/openstudio-standards/standards/necb/common/btap_data.rb +41 -43
  99. data/lib/openstudio-standards/standards/necb/common/btap_datapoint.rb +7 -4
  100. data/lib/openstudio-standards/version.rb +1 -1
  101. data/lib/openstudio-standards.rb +1 -0
  102. metadata +5 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c869076e549ad8d81cad4079991abbab65dd9bbff243dce88065eb3ecd002d71
4
- data.tar.gz: b088c8b1a1386033e9739704641a400a13fa0e4b7fb5518be7edc223da2ca60a
3
+ metadata.gz: 4687323abab6ca503d4b6b32e17c1451d213155ed3c82871b94d34aaef2314e3
4
+ data.tar.gz: bfb5e5eb27e9097efa812f4feef93321a2e3f228cfd64678dc5792d96dd643ce
5
5
  SHA512:
6
- metadata.gz: 2f5805e1c695f9e8ff4012271b84596fbdcab4a0131a37b50739678af18ab4d74350c21a3e1a57c35eaf3e1c49857af082b72b36b07b4a30df5818a9d973883a
7
- data.tar.gz: de72946c20911940af99a6088e6fc252fa88afb5be8832aab7a80a7595c14527308db63860692c8762b6ad65f66c2e47177ecf9888cc447854cb6da1a747d2e2
6
+ metadata.gz: 5e9ddfba7c6e11bae35aca085b6c27de01aaae975019f4891f55d08a0a7da67efadf9e7344f992c09f332b7f56c8c3318242137fb106a314ccd7d35980bcbebc
7
+ data.tar.gz: b12da5eafbe5b39cc1e1785ffbca7d4b930fee40ec4966f1a8e4fdb534164fe2c00b8860a1c32613ec38db47c168b50a91ee21c39b72150915dc1066a2dc9411
data/data/geometry/ASHRAEHighriseApartment.osm CHANGED
@@ -13508,33 +13508,6 @@ OS:Surface,
13508
13508
  0, 7.6196, 3.0478, !- X,Y,Z Vertex 3 {m}
13509
13509
  0, 0, 3.0478; !- X,Y,Z Vertex 4 {m}
13510
13510
 
13511
- OS:EvaporativeFluidCooler:SingleSpeed,
13512
- {822282e8-6bd6-41b7-9797-e064cbc36279}, !- Handle
13513
- Central Tower, !- Name
13514
- , !- Water Inlet Node Name
13515
- , !- Water Outlet Node Name
13516
- autosize, !- Design Air Flow Rate {m3/s}
13517
- autosize, !- Fan Power at Design Air Flow Rate {W}
13518
- 0.002208, !- Design Spray Water Flow Rate {m3/s}
13519
- UFactorTimesAreaAndDesignWaterFlowRate, !- Performance Input Method
13520
- , !- Outdoor Air Inlet Node Name
13521
- , !- Standard Design Capacity {W}
13522
- autosize, !- U-factor Times Area Value at Design Air Flow Rate {W/K}
13523
- autosize, !- Design Water Flow Rate {m3/s}
13524
- , !- User Specified Design Capacity {W}
13525
- , !- Design Entering Water Temperature {C}
13526
- , !- Design Entering Air Temperature {C}
13527
- , !- Design Entering Air Wet-bulb Temperature {C}
13528
- FanCycling, !- Capacity Control
13529
- 1, !- Sizing Factor
13530
- SaturatedExit, !- Evaporation Loss Mode
13531
- , !- Evaporation Loss Factor {percent/K}
13532
- 0.008, !- Drift Loss Percent {percent}
13533
- ConcentrationRatio, !- Blowdown Calculation Mode
13534
- 3, !- Blowdown Concentration Ratio
13535
- , !- Blowdown Makeup Water Usage Schedule Name
13536
- ; !- Supply Water Storage Tank Name
13537
-
13538
13511
  OS:SubSurface,
13539
13512
  {169c8dba-3bb7-41bd-b3f8-820f9189483b}, !- Handle
13540
13513
  F4Window11, !- Name
data/data/standards/export_OpenStudio_libraries.rb CHANGED
@@ -87,6 +87,8 @@ def export_openstudio_libraries
87
87
  boiler.setFuelType('NaturalGas')
88
88
  when 'Electric'
89
89
  boiler.setFuelType('Electricity')
90
+ when 'Propane', 'PropaneGas'
91
+ boiler.setFuelType('Propane')
90
92
  when 'Oil'
91
93
  boiler.setFuelType('FuelOilNo2')
92
94
  end