openstudio-model-articulation 0.3.1 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (203) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +2 -1
  3. data/CHANGELOG.md +28 -0
  4. data/Gemfile +6 -0
  5. data/Jenkinsfile +1 -0
  6. data/LICENSE.md +1 -1
  7. data/README.md +22 -3
  8. data/doc_templates/LICENSE.md +1 -1
  9. data/doc_templates/copyright_erb.txt +1 -1
  10. data/doc_templates/copyright_js.txt +1 -1
  11. data/doc_templates/copyright_ruby.txt +1 -1
  12. data/lib/measures/AssignConstructionSetToBuilding/LICENSE.md +1 -1
  13. data/lib/measures/AssignConstructionSetToBuilding/measure.rb +1 -1
  14. data/lib/measures/AssignConstructionSetToBuilding/measure.xml +16 -15
  15. data/lib/measures/AssignSpaceTypeBySpaceName/LICENSE.md +1 -1
  16. data/lib/measures/AssignSpaceTypeBySpaceName/measure.rb +1 -1
  17. data/lib/measures/AssignSpaceTypeBySpaceName/measure.xml +32 -13
  18. data/lib/measures/AssignSpaceTypeToBuilding/LICENSE.md +1 -1
  19. data/lib/measures/AssignSpaceTypeToBuilding/measure.rb +1 -1
  20. data/lib/measures/AssignSpaceTypeToBuilding/measure.xml +16 -15
  21. data/lib/measures/AssignSpacesToStories/LICENSE.md +1 -1
  22. data/lib/measures/AssignSpacesToStories/measure.rb +3 -5
  23. data/lib/measures/AssignSpacesToStories/measure.xml +14 -13
  24. data/lib/measures/BarAspectRatioStudy/LICENSE.md +1 -1
  25. data/lib/measures/BarAspectRatioStudy/measure.rb +3 -2
  26. data/lib/measures/BarAspectRatioStudy/measure.xml +8 -7
  27. data/lib/measures/CleanupSpaceOrigins/LICENSE.md +1 -1
  28. data/lib/measures/CleanupSpaceOrigins/measure.rb +4 -1
  29. data/lib/measures/CleanupSpaceOrigins/measure.xml +14 -13
  30. data/lib/measures/FindAndReplaceObjectNames/LICENSE.md +1 -1
  31. data/lib/measures/FindAndReplaceObjectNames/measure.rb +1 -1
  32. data/lib/measures/FindAndReplaceObjectNames/measure.xml +13 -12
  33. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/LICENSE.md +1 -1
  34. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.rb +3 -3
  35. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.xml +28 -10
  36. data/lib/measures/RemoveHardAssignedConstructions/LICENSE.md +1 -1
  37. data/lib/measures/RemoveHardAssignedConstructions/measure.rb +1 -1
  38. data/lib/measures/RemoveHardAssignedConstructions/measure.xml +13 -12
  39. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/LICENSE.md +1 -1
  40. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/measure.rb +1 -1
  41. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/measure.xml +42 -11
  42. data/lib/measures/RotateBuilding/LICENSE.md +1 -1
  43. data/lib/measures/RotateBuilding/measure.rb +1 -1
  44. data/lib/measures/RotateBuilding/measure.xml +13 -12
  45. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/LICENSE.md +1 -1
  46. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/measure.rb +1 -1
  47. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/measure.xml +17 -10
  48. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/LICENSE.md +1 -1
  49. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.rb +2 -2
  50. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.xml +13 -12
  51. data/lib/measures/SetInteriorWallsToSelectedConstruction/LICENSE.md +1 -1
  52. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.rb +2 -2
  53. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.xml +13 -12
  54. data/lib/measures/SetWindowToWallRatioByFacade/LICENSE.md +1 -1
  55. data/lib/measures/SetWindowToWallRatioByFacade/README.md +11 -0
  56. data/lib/measures/SetWindowToWallRatioByFacade/measure.rb +91 -143
  57. data/lib/measures/SetWindowToWallRatioByFacade/measure.xml +32 -11
  58. data/lib/measures/SetWindowToWallRatioByFacade/resources/functions.rb +176 -0
  59. data/lib/measures/SimplifyGeometryToSlicedBar/LICENSE.md +1 -1
  60. data/lib/measures/SimplifyGeometryToSlicedBar/measure.rb +9 -5
  61. data/lib/measures/SimplifyGeometryToSlicedBar/measure.xml +31 -13
  62. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_cofee.rb +7 -5
  63. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_geometry.rb +14 -9
  64. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_helper_methods.rb +3 -5
  65. data/lib/measures/SpaceTypeAndConstructionSetWizard/LICENSE.md +1 -1
  66. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.rb +2 -2
  67. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.xml +63 -11
  68. data/lib/measures/SurfaceMatching/LICENSE.md +1 -1
  69. data/lib/measures/SurfaceMatching/measure.rb +2 -1
  70. data/lib/measures/SurfaceMatching/measure.xml +13 -12
  71. data/lib/measures/{BarAspectRatioSlicedBySpaceType → add_empd_material_properties}/LICENSE.md +1 -1
  72. data/lib/measures/add_empd_material_properties/README.md +116 -0
  73. data/lib/measures/{BarAspectRatioSlicedBySpaceType → add_empd_material_properties}/README.md.erb +0 -0
  74. data/lib/measures/add_empd_material_properties/docs/.gitkeep +0 -0
  75. data/lib/measures/add_empd_material_properties/measure.rb +247 -0
  76. data/lib/measures/add_empd_material_properties/measure.xml +201 -0
  77. data/lib/measures/blended_space_type_from_floor_area_ratios/LICENSE.md +1 -1
  78. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.rb +5 -4
  79. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.xml +5 -5
  80. data/lib/measures/blended_space_type_from_model/LICENSE.md +1 -1
  81. data/lib/measures/blended_space_type_from_model/{resources → docs}/replace_occupied_spaces_with_blended_space_type_design_doc.txt +0 -0
  82. data/lib/measures/blended_space_type_from_model/measure.rb +16 -4
  83. data/lib/measures/blended_space_type_from_model/measure.xml +16 -22
  84. data/lib/measures/clone_building_from_external_model/LICENSE.md +1 -1
  85. data/lib/measures/clone_building_from_external_model/measure.rb +1 -1
  86. data/lib/measures/clone_building_from_external_model/measure.xml +5 -5
  87. data/lib/measures/create_DOE_prototype_building/LICENSE.md +1 -1
  88. data/lib/measures/create_DOE_prototype_building/measure.rb +4 -3
  89. data/lib/measures/create_DOE_prototype_building/measure.xml +163 -27
  90. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/LICENSE.md +1 -1
  91. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/measure.rb +1 -1
  92. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/measure.xml +5 -5
  93. data/lib/measures/create_bar_from_building_type_ratios/LICENSE.md +1 -1
  94. data/lib/measures/create_bar_from_building_type_ratios/README.md +109 -35
  95. data/lib/measures/create_bar_from_building_type_ratios/README.md.erb +54 -35
  96. data/lib/measures/create_bar_from_building_type_ratios/measure.rb +9 -4
  97. data/lib/measures/create_bar_from_building_type_ratios/measure.xml +124 -12
  98. data/lib/measures/create_bar_from_deer_building_type_ratios/LICENSE.md +1 -1
  99. data/lib/measures/create_bar_from_deer_building_type_ratios/README.md +301 -79
  100. data/lib/measures/create_bar_from_deer_building_type_ratios/README.md.erb +62 -79
  101. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.rb +10 -5
  102. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.xml +15 -59
  103. data/lib/measures/create_bar_from_doe_building_type_ratios/LICENSE.md +1 -1
  104. data/lib/measures/create_bar_from_doe_building_type_ratios/README.md +298 -57
  105. data/lib/measures/create_bar_from_doe_building_type_ratios/README.md.erb +54 -57
  106. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.rb +10 -5
  107. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml +122 -14
  108. data/lib/measures/create_bar_from_model/LICENSE.md +1 -1
  109. data/lib/measures/create_bar_from_model/measure.rb +11 -7
  110. data/lib/measures/create_bar_from_model/measure.xml +5 -5
  111. data/lib/measures/create_bar_from_space_type_ratios/LICENSE.md +27 -0
  112. data/lib/measures/create_bar_from_space_type_ratios/README.md +556 -0
  113. data/lib/measures/create_bar_from_space_type_ratios/README.md.erb +324 -0
  114. data/lib/measures/create_bar_from_space_type_ratios/docs/ar_05.png +0 -0
  115. data/lib/measures/create_bar_from_space_type_ratios/docs/ar_1.png +0 -0
  116. data/lib/measures/create_bar_from_space_type_ratios/docs/ar_2.png +0 -0
  117. data/lib/measures/create_bar_from_space_type_ratios/docs/bar_double_loaded.png +0 -0
  118. data/lib/measures/create_bar_from_space_type_ratios/docs/bar_single_core_perim.png +0 -0
  119. data/lib/measures/create_bar_from_space_type_ratios/docs/bar_sliced_indiv.png +0 -0
  120. data/lib/measures/create_bar_from_space_type_ratios/docs/bar_sliced_simple.png +0 -0
  121. data/lib/measures/create_bar_from_space_type_ratios/docs/basement.png +0 -0
  122. data/lib/measures/create_bar_from_space_type_ratios/docs/custom_height_false.png +0 -0
  123. data/lib/measures/create_bar_from_space_type_ratios/docs/custom_height_true.png +0 -0
  124. data/lib/measures/create_bar_from_space_type_ratios/docs/no_party_mult.png +0 -0
  125. data/lib/measures/create_bar_from_space_type_ratios/docs/party.png +0 -0
  126. data/lib/measures/create_bar_from_space_type_ratios/docs/party_multi.png +0 -0
  127. data/lib/measures/create_bar_from_space_type_ratios/docs/perim_mult_2010.png +0 -0
  128. data/lib/measures/create_bar_from_space_type_ratios/docs/perim_mult_2012.png +0 -0
  129. data/lib/measures/create_bar_from_space_type_ratios/docs/perim_mult_2020.png +0 -0
  130. data/lib/measures/create_bar_from_space_type_ratios/docs/sep_05.png +0 -0
  131. data/lib/measures/create_bar_from_space_type_ratios/docs/sep_10.png +0 -0
  132. data/lib/measures/create_bar_from_space_type_ratios/docs/sep_3.png +0 -0
  133. data/lib/measures/create_bar_from_space_type_ratios/docs/story_sort.png +0 -0
  134. data/lib/measures/create_bar_from_space_type_ratios/docs/wwr_custom.png +0 -0
  135. data/lib/measures/create_bar_from_space_type_ratios/measure.rb +314 -0
  136. data/lib/measures/create_bar_from_space_type_ratios/measure.xml +687 -0
  137. data/lib/measures/create_baseline_building/LICENSE.md +1 -1
  138. data/lib/measures/create_baseline_building/measure.rb +4 -3
  139. data/lib/measures/create_baseline_building/measure.xml +5 -5
  140. data/lib/measures/create_deer_prototype_building/LICENSE.md +1 -1
  141. data/lib/measures/create_deer_prototype_building/measure.rb +1 -1
  142. data/lib/measures/create_deer_prototype_building/measure.xml +6 -6
  143. data/lib/measures/create_deer_prototype_building/resources/deer_building_types.rb +1 -1
  144. data/lib/measures/create_parametric_schedules/LICENSE.md +1 -1
  145. data/lib/measures/create_parametric_schedules/measure.rb +16 -11
  146. data/lib/measures/create_parametric_schedules/measure.xml +5 -5
  147. data/lib/measures/create_typical_building_from_model/LICENSE.md +1 -1
  148. data/lib/measures/create_typical_building_from_model/README.md +82 -17
  149. data/lib/measures/create_typical_building_from_model/README.md.erb +36 -16
  150. data/lib/measures/create_typical_building_from_model/measure.rb +8 -6
  151. data/lib/measures/create_typical_building_from_model/measure.xml +59 -27
  152. data/lib/measures/create_typical_building_from_model/resources/Model.hvac.rb +8 -5
  153. data/lib/measures/create_typical_deer_building_from_model/LICENSE.md +1 -1
  154. data/lib/measures/create_typical_deer_building_from_model/README.md +173 -53
  155. data/lib/measures/create_typical_deer_building_from_model/README.md.erb +57 -53
  156. data/lib/measures/create_typical_deer_building_from_model/measure.rb +8 -3
  157. data/lib/measures/create_typical_deer_building_from_model/measure.xml +26 -26
  158. data/lib/measures/create_typical_deer_building_from_model/resources/Model.hvac.rb +8 -5
  159. data/lib/measures/create_typical_doe_building_from_model/LICENSE.md +1 -1
  160. data/lib/measures/create_typical_doe_building_from_model/README.md +182 -44
  161. data/lib/measures/create_typical_doe_building_from_model/README.md.erb +58 -44
  162. data/lib/measures/create_typical_doe_building_from_model/measure.rb +8 -3
  163. data/lib/measures/create_typical_doe_building_from_model/measure.xml +60 -28
  164. data/lib/measures/create_typical_doe_building_from_model/resources/Model.hvac.rb +8 -5
  165. data/lib/measures/deer_space_type_and_construction_set_wizard/LICENSE.md +1 -1
  166. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.rb +2 -2
  167. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.xml +17 -17
  168. data/lib/measures/find_and_replace_in_all_thermal_zone_names/LICENSE.md +1 -1
  169. data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.rb +1 -1
  170. data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.xml +8 -7
  171. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/LICENSE.md +1 -1
  172. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.rb +3 -1
  173. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.xml +5 -5
  174. data/lib/measures/merge_floorspace_js_with_model/LICENSE.md +1 -1
  175. data/lib/measures/merge_floorspace_js_with_model/measure.rb +5 -2
  176. data/lib/measures/merge_floorspace_js_with_model/measure.xml +5 -5
  177. data/lib/measures/merge_spaces_from_external_file/LICENSE.md +1 -1
  178. data/lib/measures/merge_spaces_from_external_file/measure.rb +1 -1
  179. data/lib/measures/merge_spaces_from_external_file/measure.xml +6 -6
  180. data/lib/measures/merge_spaces_from_external_file/resources/ScheduleTranslator.rb +1 -1
  181. data/lib/measures/radiance_measure/LICENSE.md +1 -1
  182. data/lib/measures/radiance_measure/measure.rb +63 -57
  183. data/lib/measures/radiance_measure/measure.xml +11 -11
  184. data/lib/measures/radiant_slab_with_doas/LICENSE.md +1 -1
  185. data/lib/measures/radiant_slab_with_doas/measure.rb +9 -2
  186. data/lib/measures/radiant_slab_with_doas/measure.xml +10 -10
  187. data/lib/measures/replace_geometry_by_story/LICENSE.md +1 -1
  188. data/lib/measures/replace_geometry_by_story/measure.rb +5 -1
  189. data/lib/measures/replace_geometry_by_story/measure.xml +5 -5
  190. data/lib/measures/scale_geometry/LICENSE.md +1 -1
  191. data/lib/measures/scale_geometry/measure.rb +1 -1
  192. data/lib/measures/scale_geometry/measure.xml +5 -5
  193. data/lib/openstudio/model_articulation/extension.rb +1 -1
  194. data/lib/openstudio/model_articulation/version.rb +2 -2
  195. data/lib/openstudio/model_articulation.rb +1 -1
  196. data/lib/openstudio-model-articulation.rb +1 -1
  197. data/openstudio-model-articulation.gemspec +3 -3
  198. metadata +42 -16
  199. data/lib/measures/BarAspectRatioSlicedBySpaceType/README.md +0 -64
  200. data/lib/measures/BarAspectRatioSlicedBySpaceType/measure.rb +0 -184
  201. data/lib/measures/BarAspectRatioSlicedBySpaceType/measure.xml +0 -130
  202. data/lib/measures/BarAspectRatioSlicedBySpaceType/resources/os_lib_cofee.rb +0 -252
  203. data/lib/measures/blended_space_type_from_model/resources/os_lib_model_simplification.rb +0 -1049
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -41,7 +41,7 @@ require 'openstudio-standards'
41
41
  # load OpenStudio measure libraries from openstudio-extension gem
42
42
  require 'openstudio-extension'
43
43
  require 'openstudio/extension/core/os_lib_helper_methods'
44
- require 'openstudio/extension/core/os_lib_model_generation.rb'
44
+ require 'openstudio/extension/core/os_lib_model_generation'
45
45
 
46
46
  require_relative 'resources/Model.hvac' # DLM: should this be in openstudio-standards? dfg some tests fail without it
47
47
 
@@ -66,6 +66,11 @@ class CreateTypicalDOEBuildingFromModel < OpenStudio::Measure::ModelMeasure
66
66
  return 'It is important that the template argument chosen for this measure is in line with the buding types for the stub space types of the model passed in.'
67
67
  end
68
68
 
69
+ # used to populate taxonomy in readme.md
70
+ def taxonomy
71
+ return 'Whole Building.Space Types'
72
+ end
73
+
69
74
  # define the arguments that the user will input
70
75
  def arguments(model)
71
76
  args = OpenStudio::Measure::OSArgumentVector.new
@@ -80,7 +85,7 @@ class CreateTypicalDOEBuildingFromModel < OpenStudio::Measure::ModelMeasure
80
85
  end
81
86
 
82
87
  # Make argument for template
83
- template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', get_doe_templates, true)
88
+ template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', get_doe_templates(false), true)
84
89
  template.setDisplayName('Target Standard')
85
90
  template.setDefaultValue(default_string)
86
91
  args << template
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_typical_doe_building_from_model</name>
5
5
  <uid>b2c80210-33b3-4dfd-8267-535efd81f552</uid>
6
- <version_id>a3906836-06ea-4bda-b13c-53c08cb23e95</version_id>
7
- <version_modified>20200911T195753Z</version_modified>
6
+ <version_id>bd01bf11-d315-49ed-8c05-3ce269edbc1f</version_id>
7
+ <version_modified>20220505T182933Z</version_modified>
8
8
  <xml_checksum>99E7000D</xml_checksum>
9
9
  <class_name>CreateTypicalDOEBuildingFromModel</class_name>
10
10
  <display_name>Create Typical DOE Building from Model</display_name>
@@ -43,6 +43,38 @@
43
43
  <value>90.1-2013</value>
44
44
  <display_name>90.1-2013</display_name>
45
45
  </choice>
46
+ <choice>
47
+ <value>90.1-2016</value>
48
+ <display_name>90.1-2016</display_name>
49
+ </choice>
50
+ <choice>
51
+ <value>90.1-2019</value>
52
+ <display_name>90.1-2019</display_name>
53
+ </choice>
54
+ <choice>
55
+ <value>ComStock DOE Ref Pre-1980</value>
56
+ <display_name>ComStock DOE Ref Pre-1980</display_name>
57
+ </choice>
58
+ <choice>
59
+ <value>ComStock DOE Ref 1980-2004</value>
60
+ <display_name>ComStock DOE Ref 1980-2004</display_name>
61
+ </choice>
62
+ <choice>
63
+ <value>ComStock 90.1-2004</value>
64
+ <display_name>ComStock 90.1-2004</display_name>
65
+ </choice>
66
+ <choice>
67
+ <value>ComStock 90.1-2007</value>
68
+ <display_name>ComStock 90.1-2007</display_name>
69
+ </choice>
70
+ <choice>
71
+ <value>ComStock 90.1-2010</value>
72
+ <display_name>ComStock 90.1-2010</display_name>
73
+ </choice>
74
+ <choice>
75
+ <value>ComStock 90.1-2013</value>
76
+ <display_name>ComStock 90.1-2013</display_name>
77
+ </choice>
46
78
  </choices>
47
79
  </argument>
48
80
  <argument>
@@ -1340,52 +1372,52 @@
1340
1372
  <usage_type>test</usage_type>
1341
1373
  <checksum>F22DEFBC</checksum>
1342
1374
  </file>
1343
- <file>
1344
- <filename>README.md.erb</filename>
1345
- <filetype>erb</filetype>
1346
- <usage_type>readmeerb</usage_type>
1347
- <checksum>46CFB534</checksum>
1348
- </file>
1349
1375
  <file>
1350
1376
  <filename>LICENSE.md</filename>
1351
1377
  <filetype>md</filetype>
1352
1378
  <usage_type>license</usage_type>
1353
- <checksum>E0468DD6</checksum>
1379
+ <checksum>A21A3ED2</checksum>
1354
1380
  </file>
1355
1381
  <file>
1356
- <version>
1357
- <software_program>OpenStudio</software_program>
1358
- <identifier>2.0.0</identifier>
1359
- <min_compatible>3.0.0</min_compatible>
1360
- </version>
1361
- <filename>measure.rb</filename>
1382
+ <filename>Model.hvac.rb</filename>
1362
1383
  <filetype>rb</filetype>
1363
- <usage_type>script</usage_type>
1364
- <checksum>57D960DB</checksum>
1384
+ <usage_type>resource</usage_type>
1385
+ <checksum>32C64B0B</checksum>
1386
+ </file>
1387
+ <file>
1388
+ <filename>README.md.erb</filename>
1389
+ <filetype>erb</filetype>
1390
+ <usage_type>readmeerb</usage_type>
1391
+ <checksum>BDCE44E6</checksum>
1392
+ </file>
1393
+ <file>
1394
+ <filename>README.md</filename>
1395
+ <filetype>md</filetype>
1396
+ <usage_type>readme</usage_type>
1397
+ <checksum>7F39813C</checksum>
1365
1398
  </file>
1366
1399
  <file>
1367
1400
  <filename>create_typical_doe_building_from_model_test.rb</filename>
1368
1401
  <filetype>rb</filetype>
1369
1402
  <usage_type>test</usage_type>
1370
- <checksum>8AC3CE71</checksum>
1403
+ <checksum>2DF721BA</checksum>
1371
1404
  </file>
1372
1405
  <file>
1373
1406
  <filename>measure_test_hvac.rb</filename>
1374
1407
  <filetype>rb</filetype>
1375
1408
  <usage_type>test</usage_type>
1376
- <checksum>2785485F</checksum>
1409
+ <checksum>9B04EEB7</checksum>
1377
1410
  </file>
1378
1411
  <file>
1379
- <filename>Model.hvac.rb</filename>
1412
+ <version>
1413
+ <software_program>OpenStudio</software_program>
1414
+ <identifier>2.0.0</identifier>
1415
+ <min_compatible>3.0.0</min_compatible>
1416
+ </version>
1417
+ <filename>measure.rb</filename>
1380
1418
  <filetype>rb</filetype>
1381
- <usage_type>resource</usage_type>
1382
- <checksum>D8BF0815</checksum>
1383
- </file>
1384
- <file>
1385
- <filename>README.md</filename>
1386
- <filetype>md</filetype>
1387
- <usage_type>readme</usage_type>
1388
- <checksum>1B1C70D8</checksum>
1419
+ <usage_type>script</usage_type>
1420
+ <checksum>72714DCB</checksum>
1389
1421
  </file>
1390
1422
  </files>
1391
1423
  </measure>
@@ -1,5 +1,8 @@
1
+ # ComStock™, Copyright (c) 2020 Alliance for Sustainable Energy, LLC. All rights reserved.
2
+ # See top level LICENSE.txt file for license terms.
3
+
1
4
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
5
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
6
  # All rights reserved.
4
7
  # Redistribution and use in source and binary forms, with or without
5
8
  # modification, are permitted provided that the following conditions are met:
@@ -279,7 +282,7 @@ class OpenStudio::Model::Model
279
282
  chilled_water_loop_cooling_type: 'AirCooled')
280
283
 
281
284
  when 'Fan coil district chilled water with boiler'
282
- standard.model_add_hvac_system(self, 'Fan Coil ', ht = 'NaturalGas', znht = nil, cl = 'DistrictCooling', zones)
285
+ standard.model_add_hvac_system(self, 'Fan Coil', ht = 'NaturalGas', znht = nil, cl = 'DistrictCooling', zones)
283
286
 
284
287
  when 'Fan coil district chilled water with central air source heat pump'
285
288
  standard.model_add_hvac_system(self, 'Fan Coil', ht = 'AirSourceHeatPump', znht = nil, cl = 'DistrictCooling', zones)
@@ -494,7 +497,7 @@ class OpenStudio::Model::Model
494
497
  when 'VAV chiller with gas boiler reheat'
495
498
  standard.model_add_hvac_system(self, 'VAV Reheat', ht = 'NaturalGas', znht = 'NaturalGas', cl = 'Electricity', zones)
496
499
 
497
- when 'VAV chiller with central air source heat pump reheat '
500
+ when 'VAV chiller with central air source heat pump reheat'
498
501
  standard.model_add_hvac_system(self, 'VAV Reheat', ht = 'AirSourceHeatPump', znht = 'AirSourceHeatPump', cl = 'Electricity', zones)
499
502
 
500
503
  when 'VAV chiller with district hot water reheat'
@@ -628,8 +631,8 @@ class OpenStudio::Model::Model
628
631
  standard.model_add_hvac_system(self, 'Window AC', ht = nil, znht = nil, cl = 'Electricity', cooled_zones)
629
632
 
630
633
  else
631
- puts "HVAC system type '#{system_type}' not recognized"
632
-
634
+ return false
633
635
  end
636
+ return true
634
637
  end
635
638
  end
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted
4
4
  provided that the following conditions are met:
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -49,7 +49,7 @@ class DEERSpaceTypeAndConstructionSetWizard < OpenStudio::Measure::ModelMeasure
49
49
  # load OpenStudio measure libraries from openstudio-extension gem
50
50
  require 'openstudio-extension'
51
51
  require 'openstudio/extension/core/os_lib_helper_methods'
52
- require 'openstudio/extension/core/os_lib_model_generation.rb'
52
+ require 'openstudio/extension/core/os_lib_model_generation'
53
53
 
54
54
  # resource files used by measure
55
55
  include OsLib_HelperMethods
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>deer_space_type_and_construction_set_wizard</name>
5
5
  <uid>d8effcbd-52b2-4e5c-866c-e85091142aa6</uid>
6
- <version_id>44fc9ee7-0ca5-4569-b5d8-7ac498ecfd5f</version_id>
7
- <version_modified>20200509T155938Z</version_modified>
6
+ <version_id>ef3a2767-2503-4ef7-97aa-ad2e64a859a4</version_id>
7
+ <version_modified>20220505T182929Z</version_modified>
8
8
  <xml_checksum>A514F332</xml_checksum>
9
9
  <class_name>DEERSpaceTypeAndConstructionSetWizard</class_name>
10
10
  <display_name>DEER Space Type and Construction Set Wizard</display_name>
@@ -341,17 +341,29 @@
341
341
  <usage_type>readmeerb</usage_type>
342
342
  <checksum>703C9964</checksum>
343
343
  </file>
344
+ <file>
345
+ <filename>README.md</filename>
346
+ <filetype>md</filetype>
347
+ <usage_type>readme</usage_type>
348
+ <checksum>DA87BC3D</checksum>
349
+ </file>
350
+ <file>
351
+ <filename>design_doc.txt</filename>
352
+ <filetype>txt</filetype>
353
+ <usage_type>resource</usage_type>
354
+ <checksum>86154A1B</checksum>
355
+ </file>
344
356
  <file>
345
357
  <filename>LICENSE.md</filename>
346
358
  <filetype>md</filetype>
347
359
  <usage_type>license</usage_type>
348
- <checksum>E0468DD6</checksum>
360
+ <checksum>A21A3ED2</checksum>
349
361
  </file>
350
362
  <file>
351
363
  <filename>deer_space_type_and_construction_set_wizard_Test.rb</filename>
352
364
  <filetype>rb</filetype>
353
365
  <usage_type>test</usage_type>
354
- <checksum>3F17D906</checksum>
366
+ <checksum>8B39BFC0</checksum>
355
367
  </file>
356
368
  <file>
357
369
  <version>
@@ -362,19 +374,7 @@
362
374
  <filename>measure.rb</filename>
363
375
  <filetype>rb</filetype>
364
376
  <usage_type>script</usage_type>
365
- <checksum>70E4E892</checksum>
366
- </file>
367
- <file>
368
- <filename>README.md</filename>
369
- <filetype>md</filetype>
370
- <usage_type>readme</usage_type>
371
- <checksum>DA87BC3D</checksum>
372
- </file>
373
- <file>
374
- <filename>design_doc.txt</filename>
375
- <filetype>txt</filetype>
376
- <usage_type>resource</usage_type>
377
- <checksum>86154A1B</checksum>
377
+ <checksum>B9BC7D57</checksum>
378
378
  </file>
379
379
  </files>
380
380
  </measure>
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted
4
4
  provided that the following conditions are met:
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -1,9 +1,10 @@
1
+ <?xml version="1.0"?>
1
2
  <measure>
2
3
  <schema_version>3.0</schema_version>
3
4
  <name>find_and_replace_in_all_thermal_zone_names</name>
4
5
  <uid>3573d81e-e7de-4949-be50-8abcd0f95a35</uid>
5
- <version_id>8d5cca2d-5455-4180-ad96-3703178c26ef</version_id>
6
- <version_modified>20200229T024056Z</version_modified>
6
+ <version_id>aa8dce36-46c8-4bd1-a755-e5368218a0c1</version_id>
7
+ <version_modified>20220505T182935Z</version_modified>
7
8
  <xml_checksum>057E8D9D</xml_checksum>
8
9
  <class_name>FindAndReplaceInAllThermalZoneNames</class_name>
9
10
  <display_name>Find And Replace In All Thermal Zone Names</display_name>
@@ -27,8 +28,8 @@
27
28
  <default_value></default_value>
28
29
  </argument>
29
30
  </arguments>
30
- <outputs/>
31
- <provenances/>
31
+ <outputs />
32
+ <provenances />
32
33
  <tags>
33
34
  <tag>Whole Building.Space Types</tag>
34
35
  </tags>
@@ -72,19 +73,19 @@
72
73
  <filename>measure.rb</filename>
73
74
  <filetype>rb</filetype>
74
75
  <usage_type>script</usage_type>
75
- <checksum>E0917739</checksum>
76
+ <checksum>35235CD3</checksum>
76
77
  </file>
77
78
  <file>
78
79
  <filename>LICENSE.md</filename>
79
80
  <filetype>md</filetype>
80
81
  <usage_type>license</usage_type>
81
- <checksum>E0468DD6</checksum>
82
+ <checksum>A21A3ED2</checksum>
82
83
  </file>
83
84
  <file>
84
85
  <filename>find_and_replace_in_all_thermal_zone_names_test.rb</filename>
85
86
  <filetype>rb</filetype>
86
87
  <usage_type>test</usage_type>
87
- <checksum>71BBF3D7</checksum>
88
+ <checksum>1ACD900C</checksum>
88
89
  </file>
89
90
  </files>
90
91
  </measure>
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted
4
4
  provided that the following conditions are met:
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -132,6 +132,7 @@ class MakeShadingSurfacesBasedOnZoneMultipliers < OpenStudio::Measure::ModelMeas
132
132
 
133
133
  space.surfaces.each do |surface|
134
134
  next if surface.outsideBoundaryCondition != 'Outdoors'
135
+
135
136
  surfaces_to_copy[surface] = multiplier
136
137
 
137
138
  # store vertices
@@ -157,6 +158,7 @@ class MakeShadingSurfacesBasedOnZoneMultipliers < OpenStudio::Measure::ModelMeas
157
158
 
158
159
  space.surfaces.each do |surface|
159
160
  next if surface.outsideBoundaryCondition != 'Outdoors'
161
+
160
162
  surfaces_to_copy[surface] = multiplier
161
163
 
162
164
  # store vertices
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>make_shading_surfaces_based_on_zone_multipliers</name>
5
5
  <uid>57d7314d-2ff0-4c13-bf07-b63380bfdea6</uid>
6
- <version_id>403921df-59a1-4e44-93c6-3b773625c037</version_id>
7
- <version_modified>20200509T155936Z</version_modified>
6
+ <version_id>b6f2e9fb-355d-4e3d-acee-3ec908d95ef3</version_id>
7
+ <version_modified>20220505T182926Z</version_modified>
8
8
  <xml_checksum>2AF3A68E</xml_checksum>
9
9
  <class_name>MakeShadingSurfacesBasedOnZoneMultipliers</class_name>
10
10
  <display_name>Make Shading Surfaces Based on Zone Multipliers</display_name>
@@ -86,7 +86,7 @@
86
86
  <filename>LICENSE.md</filename>
87
87
  <filetype>md</filetype>
88
88
  <usage_type>license</usage_type>
89
- <checksum>E0468DD6</checksum>
89
+ <checksum>A21A3ED2</checksum>
90
90
  </file>
91
91
  <file>
92
92
  <version>
@@ -97,13 +97,13 @@
97
97
  <filename>measure.rb</filename>
98
98
  <filetype>rb</filetype>
99
99
  <usage_type>script</usage_type>
100
- <checksum>16D78867</checksum>
100
+ <checksum>5DEA693D</checksum>
101
101
  </file>
102
102
  <file>
103
103
  <filename>make_shading_surfaces_based_on_zone_multipliers_test.rb</filename>
104
104
  <filetype>rb</filetype>
105
105
  <usage_type>test</usage_type>
106
- <checksum>3DBDBE31</checksum>
106
+ <checksum>E4A4E702</checksum>
107
107
  </file>
108
108
  </files>
109
109
  </measure>
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted
4
4
  provided that the following conditions are met:
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -143,12 +143,14 @@ class MergeFloorspaceJsWithModel < OpenStudio::Measure::ModelMeasure
143
143
  fixed = false
144
144
  vertices.each do |vertex|
145
145
  next if fixed
146
+
146
147
  if array.include?(vertex)
147
148
  # create a new set of vertices
148
149
  new_vertices = OpenStudio::Point3dVector.new
149
150
  array_b = []
150
151
  surface.vertices.each do |vertex_b|
151
152
  next if array_b.include?(vertex_b)
153
+
152
154
  new_vertices << vertex_b
153
155
  array_b << vertex_b
154
156
  end
@@ -184,6 +186,7 @@ class MergeFloorspaceJsWithModel < OpenStudio::Measure::ModelMeasure
184
186
 
185
187
  surfaces_b.each do |surface_b|
186
188
  next if surface_a == surface_b # dont' test against same surface
189
+
187
190
  if surface_a.equalVertices(surface_b)
188
191
  runner.registerWarning("#{surface_a.name} and #{surface_b.name} in #{space.name} have duplicate geometry, removing #{surface_b.name}.")
189
192
  surface_b.remove
@@ -221,7 +224,7 @@ class MergeFloorspaceJsWithModel < OpenStudio::Measure::ModelMeasure
221
224
  json = JSON.parse(File.read(path.get.to_s))
222
225
 
223
226
  # error checking
224
- unless !json['space_types'].empty?
227
+ if json['space_types'].empty?
225
228
  runner.registerInfo('No space types were created.')
226
229
  end
227
230
 
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>merge_floorspace_js_with_model</name>
5
5
  <uid>16ef6369-6420-4f17-894c-a767895bcaa4</uid>
6
- <version_id>1033eb89-6eeb-4ec3-8fa3-097b1db946a2</version_id>
7
- <version_modified>20200624T003820Z</version_modified>
6
+ <version_id>e9c8d42e-69b7-4d09-9cf8-9090ce62e4e2</version_id>
7
+ <version_modified>20220505T182931Z</version_modified>
8
8
  <xml_checksum>0AD1E2E2</xml_checksum>
9
9
  <class_name>MergeFloorspaceJsWithModel</class_name>
10
10
  <display_name>Merge FloorspaceJs with Model</display_name>
@@ -87,7 +87,7 @@
87
87
  <filename>LICENSE.md</filename>
88
88
  <filetype>md</filetype>
89
89
  <usage_type>license</usage_type>
90
- <checksum>E0468DD6</checksum>
90
+ <checksum>A21A3ED2</checksum>
91
91
  </file>
92
92
  <file>
93
93
  <version>
@@ -98,13 +98,13 @@
98
98
  <filename>measure.rb</filename>
99
99
  <filetype>rb</filetype>
100
100
  <usage_type>script</usage_type>
101
- <checksum>00F6B912</checksum>
101
+ <checksum>66A3D44B</checksum>
102
102
  </file>
103
103
  <file>
104
104
  <filename>merge_floorspace_js_with_model_test.rb</filename>
105
105
  <filetype>rb</filetype>
106
106
  <usage_type>test</usage_type>
107
- <checksum>43B11AF8</checksum>
107
+ <checksum>F51D04E3</checksum>
108
108
  </file>
109
109
  </files>
110
110
  </measure>
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted
4
4
  provided that the following conditions are met:
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>merge_spaces_from_external_file</name>
5
5
  <uid>e439a1a9-d075-4a25-9f83-2dca79d2826e</uid>
6
- <version_id>fac6015b-aad1-4ebc-8285-d27109b95171</version_id>
7
- <version_modified>20200624T003830Z</version_modified>
6
+ <version_id>407db88d-c74e-4220-b538-cd528b293e2e</version_id>
7
+ <version_modified>20220505T182935Z</version_modified>
8
8
  <xml_checksum>D8922A73</xml_checksum>
9
9
  <class_name>MergeSpacesFromExternalFile</class_name>
10
10
  <display_name>Merge Spaces from External File</display_name>
@@ -215,13 +215,13 @@
215
215
  <filename>ScheduleTranslator.rb</filename>
216
216
  <filetype>rb</filetype>
217
217
  <usage_type>resource</usage_type>
218
- <checksum>C6391D71</checksum>
218
+ <checksum>636FA357</checksum>
219
219
  </file>
220
220
  <file>
221
221
  <filename>LICENSE.md</filename>
222
222
  <filetype>md</filetype>
223
223
  <usage_type>license</usage_type>
224
- <checksum>E0468DD6</checksum>
224
+ <checksum>A21A3ED2</checksum>
225
225
  </file>
226
226
  <file>
227
227
  <version>
@@ -232,13 +232,13 @@
232
232
  <filename>measure.rb</filename>
233
233
  <filetype>rb</filetype>
234
234
  <usage_type>script</usage_type>
235
- <checksum>6B61DDED</checksum>
235
+ <checksum>922A18F1</checksum>
236
236
  </file>
237
237
  <file>
238
238
  <filename>merge_spaces_from_external_file_test.rb</filename>
239
239
  <filetype>rb</filetype>
240
240
  <usage_type>test</usage_type>
241
- <checksum>6DE336DE</checksum>
241
+ <checksum>2D93C8DF</checksum>
242
242
  </file>
243
243
  </files>
244
244
  </measure>
@@ -1,5 +1,5 @@
1
1
  # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
2
+ # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
3
3
  # All rights reserved.
4
4
  # Redistribution and use in source and binary forms, with or without
5
5
  # modification, are permitted provided that the following conditions are met:
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted
4
4
  provided that the following conditions are met: