openstudio-model-articulation 0.4.0 → 0.6.1

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 (107) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +2 -1
  3. data/CHANGELOG.md +24 -0
  4. data/Gemfile +2 -2
  5. data/README.md +22 -3
  6. data/lib/measures/AssignConstructionSetToBuilding/measure.xml +10 -10
  7. data/lib/measures/AssignSpaceTypeBySpaceName/measure.xml +27 -9
  8. data/lib/measures/AssignSpaceTypeToBuilding/measure.xml +10 -10
  9. data/lib/measures/AssignSpacesToStories/measure.rb +2 -4
  10. data/lib/measures/AssignSpacesToStories/measure.xml +10 -10
  11. data/lib/measures/BarAspectRatioStudy/measure.rb +2 -1
  12. data/lib/measures/BarAspectRatioStudy/measure.xml +4 -4
  13. data/lib/measures/CleanupSpaceOrigins/measure.rb +3 -0
  14. data/lib/measures/CleanupSpaceOrigins/measure.xml +10 -10
  15. data/lib/measures/FindAndReplaceObjectNames/measure.xml +8 -8
  16. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.rb +2 -2
  17. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.xml +22 -4
  18. data/lib/measures/RemoveHardAssignedConstructions/measure.xml +8 -8
  19. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/measure.xml +37 -7
  20. data/lib/measures/RotateBuilding/measure.xml +8 -8
  21. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/measure.xml +13 -7
  22. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.rb +1 -1
  23. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.xml +10 -10
  24. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.rb +1 -1
  25. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.xml +10 -10
  26. data/lib/measures/SetWindowToWallRatioByFacade/README.md +11 -0
  27. data/lib/measures/SetWindowToWallRatioByFacade/measure.rb +90 -142
  28. data/lib/measures/SetWindowToWallRatioByFacade/measure.xml +32 -11
  29. data/lib/measures/SetWindowToWallRatioByFacade/resources/functions.rb +176 -0
  30. data/lib/measures/SimplifyGeometryToSlicedBar/measure.rb +8 -4
  31. data/lib/measures/SimplifyGeometryToSlicedBar/measure.xml +31 -13
  32. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_cofee.rb +6 -4
  33. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_geometry.rb +13 -8
  34. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_helper_methods.rb +2 -4
  35. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.rb +1 -1
  36. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.xml +4 -4
  37. data/lib/measures/SurfaceMatching/measure.rb +1 -0
  38. data/lib/measures/SurfaceMatching/measure.xml +10 -10
  39. data/lib/measures/add_empd_material_properties/LICENSE.md +27 -0
  40. data/lib/measures/add_empd_material_properties/README.md +116 -0
  41. data/lib/measures/add_empd_material_properties/README.md.erb +42 -0
  42. data/lib/measures/add_empd_material_properties/docs/.gitkeep +0 -0
  43. data/lib/measures/add_empd_material_properties/measure.rb +247 -0
  44. data/lib/measures/add_empd_material_properties/measure.xml +201 -0
  45. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.rb +4 -3
  46. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.xml +4 -4
  47. data/lib/measures/blended_space_type_from_model/{resources → docs}/replace_occupied_spaces_with_blended_space_type_design_doc.txt +0 -0
  48. data/lib/measures/blended_space_type_from_model/measure.rb +11 -3
  49. data/lib/measures/blended_space_type_from_model/measure.xml +15 -21
  50. data/lib/measures/clone_building_from_external_model/measure.xml +3 -3
  51. data/lib/measures/create_DOE_prototype_building/measure.rb +2 -2
  52. data/lib/measures/create_DOE_prototype_building/measure.xml +442 -438
  53. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/measure.xml +3 -3
  54. data/lib/measures/create_bar_from_building_type_ratios/README.md +109 -35
  55. data/lib/measures/create_bar_from_building_type_ratios/README.md.erb +54 -35
  56. data/lib/measures/create_bar_from_building_type_ratios/measure.rb +8 -3
  57. data/lib/measures/create_bar_from_building_type_ratios/measure.xml +12 -12
  58. data/lib/measures/create_bar_from_deer_building_type_ratios/README.md +301 -79
  59. data/lib/measures/create_bar_from_deer_building_type_ratios/README.md.erb +62 -79
  60. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.rb +9 -4
  61. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.xml +15 -59
  62. data/lib/measures/create_bar_from_doe_building_type_ratios/README.md +298 -57
  63. data/lib/measures/create_bar_from_doe_building_type_ratios/README.md.erb +54 -57
  64. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.rb +9 -4
  65. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml +12 -16
  66. data/lib/measures/create_bar_from_model/measure.rb +10 -6
  67. data/lib/measures/create_bar_from_model/measure.xml +4 -4
  68. data/lib/measures/create_bar_from_space_type_ratios/README.md +94 -42
  69. data/lib/measures/create_bar_from_space_type_ratios/README.md.erb +60 -42
  70. data/lib/measures/create_bar_from_space_type_ratios/measure.rb +8 -3
  71. data/lib/measures/create_bar_from_space_type_ratios/measure.xml +15 -15
  72. data/lib/measures/create_baseline_building/measure.rb +3 -2
  73. data/lib/measures/create_baseline_building/measure.xml +4 -4
  74. data/lib/measures/create_deer_prototype_building/measure.xml +3 -3
  75. data/lib/measures/create_parametric_schedules/measure.rb +15 -10
  76. data/lib/measures/create_parametric_schedules/measure.xml +4 -4
  77. data/lib/measures/create_typical_building_from_model/README.md +81 -16
  78. data/lib/measures/create_typical_building_from_model/README.md.erb +36 -16
  79. data/lib/measures/create_typical_building_from_model/measure.rb +6 -1
  80. data/lib/measures/create_typical_building_from_model/measure.xml +19 -19
  81. data/lib/measures/create_typical_deer_building_from_model/README.md +173 -53
  82. data/lib/measures/create_typical_deer_building_from_model/README.md.erb +57 -53
  83. data/lib/measures/create_typical_deer_building_from_model/measure.rb +7 -2
  84. data/lib/measures/create_typical_deer_building_from_model/measure.xml +26 -26
  85. data/lib/measures/create_typical_doe_building_from_model/README.md +182 -44
  86. data/lib/measures/create_typical_doe_building_from_model/README.md.erb +58 -44
  87. data/lib/measures/create_typical_doe_building_from_model/measure.rb +7 -2
  88. data/lib/measures/create_typical_doe_building_from_model/measure.xml +26 -26
  89. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.rb +1 -1
  90. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.xml +4 -4
  91. data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.xml +3 -3
  92. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.rb +2 -0
  93. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.xml +4 -4
  94. data/lib/measures/merge_floorspace_js_with_model/measure.rb +4 -1
  95. data/lib/measures/merge_floorspace_js_with_model/measure.xml +4 -4
  96. data/lib/measures/merge_spaces_from_external_file/measure.xml +3 -3
  97. data/lib/measures/radiance_measure/measure.rb +62 -56
  98. data/lib/measures/radiance_measure/measure.xml +4 -4
  99. data/lib/measures/radiant_slab_with_doas/measure.rb +8 -1
  100. data/lib/measures/radiant_slab_with_doas/measure.xml +9 -9
  101. data/lib/measures/replace_geometry_by_story/measure.rb +4 -0
  102. data/lib/measures/replace_geometry_by_story/measure.xml +4 -4
  103. data/lib/measures/scale_geometry/measure.xml +3 -3
  104. data/lib/openstudio/model_articulation/version.rb +1 -1
  105. data/openstudio-model-articulation.gemspec +2 -2
  106. metadata +15 -9
  107. data/lib/measures/blended_space_type_from_model/resources/os_lib_model_simplification.rb +0 -1049
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ada0269d8c0aadbb589eb49f75011bafa85ce302c0e9bdfa4413148a154d31ed
4
- data.tar.gz: 93a7ad690679932908eb96c1d37945cf7bd9db04be84920541e0fa4ce19aa3fa
3
+ metadata.gz: e07e00709616f2f31d24a152703fef03c724ae0a9b50e3ff1780469afc6deceb
4
+ data.tar.gz: e37517a6dc18666066d5e5593a45f1bce119aac3f9976f70ff224cbde3eda9a8
5
5
  SHA512:
6
- metadata.gz: 697918537a72f4afa205095c421263bba207a977a413fe54f3bc19c19869c28932a1f054c58d02f6c068029a9b0529ab444adc788ea53b2fd73d6486c4affd14
7
- data.tar.gz: 137c18b1a0b847f2ed86166b3a530050de5a3a04d6f6fbf5d5c2ef931b2bbcf8be18460d4bbdf136fec8f7ccd31910403dd2b065141a4eafc29950e664c4f7b3
6
+ metadata.gz: ecb12dbb4a5d39377fa8d053fd08a97248a59fa51290ff3a89167dc544392cfbc16605ec0a066b148a2127d8dd831eaae41d751eb501321665d9558aa671970f
7
+ data.tar.gz: 9b9156e8445f909967dbf62b89e8723c9cf1b4a6912d46fff4c18f6d93587c47c9e04c897253b20a3dcfa1ec352825f908239bb75e17c65c6c33152db2f90cbc
data/.rubocop.yml CHANGED
@@ -1,5 +1,6 @@
1
1
  AllCops:
2
2
  Exclude:
3
3
  - 'spec/test_measures/**/*'
4
+ require: rubocop-performance
4
5
  inherit_from:
5
- - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
6
+ - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml
data/CHANGELOG.md CHANGED
@@ -1,5 +1,29 @@
1
1
  # OpenStudio Model Articulation Gems
2
2
 
3
+ ## Version 0.6.1
4
+ * Removed recent changes made to `blended_space_type_from_model` to remove standards space type and building type assignment from resulting blended space type. `blend_space_type_collections` method in extension gem `os_lib_model_simplification.rb` already picks the most prevenant space type. The space type name still indicates that it is blended.
5
+
6
+ ## Version 0.6.0
7
+ * Support for OpenStudio 3.4 (upgrade to standards gem 0.2.16, no extension gem upgrade)
8
+ * Fixed [#92]( https://github.com/NREL/openstudio-model-articulation-gem/issues/92 ), SetWindowToWallRatio triangulation can produce non-planar surfaces
9
+ * Fixed [#94]( https://github.com/NREL/openstudio-model-articulation-gem/pull/94 ), fix SetWindowToWallRatio triangulation
10
+ * Fixed [#95]( https://github.com/NREL/openstudio-model-articulation-gem/pull/95 ), add warnings to SetWindowToWallRatio to categorize cases when WWR can't be applied
11
+ * Fixed [#98]( https://github.com/NREL/openstudio-model-articulation-gem/pull/98 ), Radiance Daylighting Measure - Update measure.rb
12
+ * Fixed [#101]( https://github.com/NREL/openstudio-model-articulation-gem/pull/101 ), setting building and space type standard to Blend
13
+
14
+ ## Version 0.5.0
15
+ * Support for OpenStudio 3.3 (upgrade to extension gem 0.5.1 and standards gem 0.2.15)
16
+ * Fixed [#73]( https://github.com/NREL/openstudio-model-articulation-gem/pull/73 ), added add_empd_material_properties measure contributed by GFlechas
17
+ * Fixed [#83]( https://github.com/NREL/openstudio-model-articulation-gem/pull/83 ), adding compatibility matrix and contribution policy
18
+ * Fixed [#85]( https://github.com/NREL/openstudio-model-articulation-gem/pull/85 ), For SetWindowToWallRatioByFacade fixed rectangle tol and pre-split at door remove windows
19
+
20
+ ## Version 0.4.1
21
+
22
+ * Support for OpenStudio 3.2.1 (upgrade to extension gem 0.4.3 and standards gem 0.2.14)
23
+ * update to use rubocop_v4
24
+ * Documentation update to some measures
25
+ * Setting up webhook for https://bcl2.nrel.gov
26
+
3
27
  ## Version 0.4.0
4
28
 
5
29
  * Support Ruby ~> 2.7
data/Gemfile CHANGED
@@ -12,10 +12,10 @@ gemspec
12
12
  allow_local = ENV['FAVOR_LOCAL_GEMS']
13
13
 
14
14
  # uncomment when you want CI to use develop branch of extension gem
15
- gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
15
+ #gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
16
16
 
17
17
  # uncomment when you want CI to use develop branch of openstudio-standards gem
18
- gem 'openstudio-standards', github: 'NREL/OpenStudio-standards', branch: 'master'
18
+ #gem 'openstudio-standards', github: 'NREL/OpenStudio-standards', branch: 'master'
19
19
 
20
20
  # Only uncomment if you need to test a different version of the extension gem
21
21
  # if allow_local && File.exist?('../OpenStudio-extension-gem')
data/README.md CHANGED
@@ -47,16 +47,35 @@ bundle exec rake openstudio:test_with_openstudio
47
47
  /usr/local/openstudio-3.0.0-beta/bin/openstudio-3.0.0-beta --verbose --bundle '/var/simdata/openstudio/Gemfile' --bundle_path '/var/simdata/openstudio/.bundle/install/' measure -r '/var/simdata/openstudio/lib/measures/radiance_measure/'
48
48
  ```
49
49
 
50
+ # Compatibility Matrix
51
+
52
+ |OpenStudio Model Articulation Gem|OpenStudio|Ruby|
53
+ |:--------------:|:----------:|:--------:|
54
+ | 0.6.0 - 0.6.1 | 3.4 | 2.7 |
55
+ | 0.5.0 | 3.3 | 2.7 |
56
+ | 0.4.0 - 0.4.2 | 3.2 | 2.7 |
57
+ | 0.3.0 - 0.3.1 | 3.1 | 2.5 |
58
+ | 0.2.0 - 0.2.1 | 3.0 | 2.5 |
59
+ | 0.1.1 and below | 2.9 and below | 2.2.4 |
60
+
61
+ # Contributing
62
+
63
+ Please review the [OpenStudio Contribution Policy](https://openstudio.net/openstudio-contribution-policy) if you would like to contribute code to this gem.
64
+
50
65
  ## TODO
51
66
 
52
- - [ ] Move articulation measures from openstudio-measures
53
- - [ ] Move articulation measure lib files to openstudio-extension lib
67
+ - [x] Move articulation measures from openstudio-measures
68
+ - [x] Move articulation measure lib files to openstudio-extension lib
54
69
  - [ ] Update measures to correct naming conventions
55
70
 
56
71
  # Releasing
57
72
 
58
73
  * Update CHANGELOG.md
59
- * Run `rake rubocop:auto_correct`
74
+ * Run `rake openstudio:rubocop:auto_correct`
75
+ * Run `rake openstudio:update_copyright`
76
+ * Run `rake openstudio:update_measures` (this has to be done last since prior tasks alter measure files)
77
+ * Update version in `readme.md`
78
+ * Update version in `openstudio-model-articulation.gemspec`
60
79
  * Update version in `/lib/openstudio/model_articulation/version.rb`
61
80
  * Create PR to master, after tests and reviews complete, then merge
62
81
  * Locally - from the master branch, run `rake release`
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>assign_construction_set_to_building</name>
5
5
  <uid>6e68ddea-2cff-47a3-9daf-f2189e4cf132</uid>
6
- <version_id>44de5d16-ee07-4122-bfd2-9b488da700f9</version_id>
7
- <version_modified>20210423T142509Z</version_modified>
6
+ <version_id>497da6f8-f10e-4c93-b5de-6d46027f0119</version_id>
7
+ <version_modified>20220505T182919Z</version_modified>
8
8
  <xml_checksum>1E963D9C</xml_checksum>
9
9
  <class_name>AssignConstructionSetToBuilding</class_name>
10
10
  <display_name>AssignConstructionSetToBuilding</display_name>
@@ -17,10 +17,10 @@
17
17
  <type>Choice</type>
18
18
  <required>true</required>
19
19
  <model_dependent>false</model_dependent>
20
- <default_value>{27349627-8827-46b4-80f7-4f0731404a8c}</default_value>
20
+ <default_value>{366b719d-cdcd-403e-82f2-1ff5eb23d1b8}</default_value>
21
21
  <choices>
22
22
  <choice>
23
- <value>{27349627-8827-46b4-80f7-4f0731404a8c}</value>
23
+ <value>{366b719d-cdcd-403e-82f2-1ff5eb23d1b8}</value>
24
24
  <display_name>&lt;clear field&gt;</display_name>
25
25
  </choice>
26
26
  </choices>
@@ -73,17 +73,17 @@
73
73
  <usage_type>script</usage_type>
74
74
  <checksum>40E5CA19</checksum>
75
75
  </file>
76
- <file>
77
- <filename>AssignConstructionSetToBuilding_Test.rb</filename>
78
- <filetype>rb</filetype>
79
- <usage_type>test</usage_type>
80
- <checksum>51FB4344</checksum>
81
- </file>
82
76
  <file>
83
77
  <filename>LICENSE.md</filename>
84
78
  <filetype>md</filetype>
85
79
  <usage_type>license</usage_type>
86
80
  <checksum>A21A3ED2</checksum>
87
81
  </file>
82
+ <file>
83
+ <filename>AssignConstructionSetToBuilding_Test.rb</filename>
84
+ <filetype>rb</filetype>
85
+ <usage_type>test</usage_type>
86
+ <checksum>EAEB5017</checksum>
87
+ </file>
88
88
  </files>
89
89
  </measure>
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>assign_space_type_by_space_name</name>
5
5
  <uid>69ad41bb-cdfe-4a4c-a385-9efaf35b7c27</uid>
6
- <version_id>b6bc9d20-d8d1-4319-8cd1-c9e9afdb9773</version_id>
7
- <version_modified>20210423T142509Z</version_modified>
6
+ <version_id>e60a2200-a654-4e1c-95fb-b19533ffb96b</version_id>
7
+ <version_modified>20220505T182934Z</version_modified>
8
8
  <xml_checksum>057E8D9D</xml_checksum>
9
9
  <class_name>AssignSpaceTypeBySpaceName</class_name>
10
10
  <display_name>AssignSpaceTypeBySpaceName</display_name>
@@ -24,10 +24,10 @@
24
24
  <type>Choice</type>
25
25
  <required>true</required>
26
26
  <model_dependent>false</model_dependent>
27
- <default_value>{12c3c432-4def-4ca1-bfc7-8cecc9e88d88}</default_value>
27
+ <default_value>{ef3c55b4-9cb7-451d-8c82-00a6d685c59f}</default_value>
28
28
  <choices>
29
29
  <choice>
30
- <value>{12c3c432-4def-4ca1-bfc7-8cecc9e88d88}</value>
30
+ <value>{ef3c55b4-9cb7-451d-8c82-00a6d685c59f}</value>
31
31
  <display_name>&lt;clear field&gt;</display_name>
32
32
  </choice>
33
33
  </choices>
@@ -98,17 +98,35 @@
98
98
  <usage_type>script</usage_type>
99
99
  <checksum>6A6F122F</checksum>
100
100
  </file>
101
+ <file>
102
+ <filename>LICENSE.md</filename>
103
+ <filetype>md</filetype>
104
+ <usage_type>license</usage_type>
105
+ <checksum>A21A3ED2</checksum>
106
+ </file>
101
107
  <file>
102
108
  <filename>AssignSpaceTypeBySpaceName_Test.rb</filename>
103
109
  <filetype>rb</filetype>
104
110
  <usage_type>test</usage_type>
105
- <checksum>EA4BB066</checksum>
111
+ <checksum>4302B4E5</checksum>
106
112
  </file>
107
113
  <file>
108
- <filename>LICENSE.md</filename>
109
- <filetype>md</filetype>
110
- <usage_type>license</usage_type>
111
- <checksum>A21A3ED2</checksum>
114
+ <filename>ImportedIdf_TestModel/project.log</filename>
115
+ <filetype>log</filetype>
116
+ <usage_type>test</usage_type>
117
+ <checksum>6D480771</checksum>
118
+ </file>
119
+ <file>
120
+ <filename>ImportedIdf_TestModel/run.db</filename>
121
+ <filetype>db</filetype>
122
+ <usage_type>test</usage_type>
123
+ <checksum>BF4974CA</checksum>
124
+ </file>
125
+ <file>
126
+ <filename>ImportedIdf_TestModel/project.osp</filename>
127
+ <filetype>osp</filetype>
128
+ <usage_type>test</usage_type>
129
+ <checksum>19B74631</checksum>
112
130
  </file>
113
131
  </files>
114
132
  </measure>
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>assign_space_type_to_building</name>
5
5
  <uid>05e20922-6fe4-48a4-bddb-411f8167e757</uid>
6
- <version_id>0ca1ef7f-22e8-4e62-b013-a4d40186aeb0</version_id>
7
- <version_modified>20210423T142509Z</version_modified>
6
+ <version_id>affc7390-ec3e-41fb-a814-adc09ac4ab80</version_id>
7
+ <version_modified>20220505T182919Z</version_modified>
8
8
  <xml_checksum>057E8D9D</xml_checksum>
9
9
  <class_name>AssignSpaceTypeToBuilding</class_name>
10
10
  <display_name>AssignSpaceTypeToBuilding</display_name>
@@ -17,10 +17,10 @@
17
17
  <type>Choice</type>
18
18
  <required>true</required>
19
19
  <model_dependent>false</model_dependent>
20
- <default_value>{4d195512-5588-4038-a932-f9e242e346a6}</default_value>
20
+ <default_value>{045b3260-33ad-451f-9c68-f8e75c422740}</default_value>
21
21
  <choices>
22
22
  <choice>
23
- <value>{4d195512-5588-4038-a932-f9e242e346a6}</value>
23
+ <value>{045b3260-33ad-451f-9c68-f8e75c422740}</value>
24
24
  <display_name>&lt;clear field&gt;</display_name>
25
25
  </choice>
26
26
  </choices>
@@ -73,17 +73,17 @@
73
73
  <usage_type>script</usage_type>
74
74
  <checksum>C904ACC5</checksum>
75
75
  </file>
76
- <file>
77
- <filename>AssignSpaceTypeToBuilding_Test.rb</filename>
78
- <filetype>rb</filetype>
79
- <usage_type>test</usage_type>
80
- <checksum>0DA553E5</checksum>
81
- </file>
82
76
  <file>
83
77
  <filename>LICENSE.md</filename>
84
78
  <filetype>md</filetype>
85
79
  <usage_type>license</usage_type>
86
80
  <checksum>A21A3ED2</checksum>
87
81
  </file>
82
+ <file>
83
+ <filename>AssignSpaceTypeToBuilding_Test.rb</filename>
84
+ <filetype>rb</filetype>
85
+ <usage_type>test</usage_type>
86
+ <checksum>E998ED20</checksum>
87
+ </file>
88
88
  </files>
89
89
  </measure>
@@ -72,10 +72,8 @@ class AssignSpacesToStories < OpenStudio::Measure::ModelMeasure
72
72
  def getStoryForNominalZCoordinate(model, minz)
73
73
  model.getBuildingStorys.each do |story|
74
74
  z = story.nominalZCoordinate
75
- if !z.empty?
76
- if minz.round(2) == z.get.round(2)
77
- return story
78
- end
75
+ if !z.empty? && (minz.round(2) == z.get.round(2))
76
+ return story
79
77
  end
80
78
  end
81
79
 
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>assign_spaces_to_stories</name>
5
5
  <uid>2c91fe40-db31-4334-a1dd-817cd419f1b6</uid>
6
- <version_id>6f11b9e3-a0c0-4624-8270-e6989aa85b98</version_id>
7
- <version_modified>20210423T142509Z</version_modified>
6
+ <version_id>4e02a25e-c2d0-4dbe-8359-0cc52c0d0930</version_id>
7
+ <version_modified>20220505T182936Z</version_modified>
8
8
  <xml_checksum>45097B60</xml_checksum>
9
9
  <class_name>AssignSpacesToStories</class_name>
10
10
  <display_name>AssignSpacesToStories</display_name>
@@ -47,6 +47,12 @@
47
47
  <usage_type>readme</usage_type>
48
48
  <checksum>8BA985AD</checksum>
49
49
  </file>
50
+ <file>
51
+ <filename>LICENSE.md</filename>
52
+ <filetype>md</filetype>
53
+ <usage_type>license</usage_type>
54
+ <checksum>A21A3ED2</checksum>
55
+ </file>
50
56
  <file>
51
57
  <version>
52
58
  <software_program>OpenStudio</software_program>
@@ -56,19 +62,13 @@
56
62
  <filename>measure.rb</filename>
57
63
  <filetype>rb</filetype>
58
64
  <usage_type>script</usage_type>
59
- <checksum>43120824</checksum>
65
+ <checksum>F3B0D790</checksum>
60
66
  </file>
61
67
  <file>
62
68
  <filename>AssignSpacesToStories_Test.rb</filename>
63
69
  <filetype>rb</filetype>
64
70
  <usage_type>test</usage_type>
65
- <checksum>D0D1E059</checksum>
66
- </file>
67
- <file>
68
- <filename>LICENSE.md</filename>
69
- <filetype>md</filetype>
70
- <usage_type>license</usage_type>
71
- <checksum>A21A3ED2</checksum>
71
+ <checksum>2D0ACAFB</checksum>
72
72
  </file>
73
73
  </files>
74
74
  </measure>
@@ -127,7 +127,8 @@ class BarAspectRatioStudy < OpenStudio::Measure::ModelMeasure
127
127
  end
128
128
 
129
129
  # helper to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure.
130
- def neat_numbers(number, roundto = 2) # round to 0 or 2)
130
+ # round to 0 or 2)
131
+ def neat_numbers(number, roundto = 2)
131
132
  if roundto == 2
132
133
  number = format '%.2f', number
133
134
  else
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>bar_aspect_ratio_study</name>
5
5
  <uid>3dcac94d-8a2e-43b6-8698-a3a4e8f3903f</uid>
6
- <version_id>fe5839ff-2dfe-4053-be2d-603a439ce7f9</version_id>
7
- <version_modified>20210423T142509Z</version_modified>
6
+ <version_id>360834b1-c338-4e27-a2f8-f22268563f3d</version_id>
7
+ <version_modified>20220505T182927Z</version_modified>
8
8
  <xml_checksum>49BEF039</xml_checksum>
9
9
  <class_name>BarAspectRatioStudy</class_name>
10
10
  <display_name>Bar Aspect Ratio Study</display_name>
@@ -137,13 +137,13 @@
137
137
  <filename>measure.rb</filename>
138
138
  <filetype>rb</filetype>
139
139
  <usage_type>script</usage_type>
140
- <checksum>68A31043</checksum>
140
+ <checksum>1B314685</checksum>
141
141
  </file>
142
142
  <file>
143
143
  <filename>BarAspectRatioStudy_Test.rb</filename>
144
144
  <filetype>rb</filetype>
145
145
  <usage_type>test</usage_type>
146
- <checksum>B1DFBF18</checksum>
146
+ <checksum>92B6A007</checksum>
147
147
  </file>
148
148
  </files>
149
149
  </measure>
@@ -94,6 +94,7 @@ class CleanupSpaceOrigins < OpenStudio::Measure::ModelMeasure
94
94
  # do spaces first as these may contain other groups
95
95
  model.getSpaces.each do |space|
96
96
  next if !runner.inSelection(space)
97
+
97
98
  cleanup_group(space)
98
99
 
99
100
  space.shadingSurfaceGroups.each do |group|
@@ -108,12 +109,14 @@ class CleanupSpaceOrigins < OpenStudio::Measure::ModelMeasure
108
109
  # now do shading surfaces
109
110
  model.getShadingSurfaceGroups.each do |group|
110
111
  next if !runner.inSelection(group)
112
+
111
113
  cleanup_group(group)
112
114
  end
113
115
 
114
116
  # now do interior partition surface groups
115
117
  model.getInteriorPartitionSurfaceGroups.each do |group|
116
118
  next if !runner.inSelection(group)
119
+
117
120
  cleanup_group(group)
118
121
  end
119
122
 
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>cleanup_space_origins</name>
5
5
  <uid>d81f8791-081d-4346-9f27-1b721d27ea86</uid>
6
- <version_id>2adda00f-77ef-4a17-a6cd-f4284f7e8ea2</version_id>
7
- <version_modified>20210423T142509Z</version_modified>
6
+ <version_id>74e7a69c-75df-45b7-85f1-bcfed9cd6aeb</version_id>
7
+ <version_modified>20220505T182929Z</version_modified>
8
8
  <xml_checksum>45097B60</xml_checksum>
9
9
  <class_name>CleanupSpaceOrigins</class_name>
10
10
  <display_name>CleanupSpaceOrigins</display_name>
@@ -47,6 +47,12 @@
47
47
  <usage_type>readme</usage_type>
48
48
  <checksum>6B7F3F48</checksum>
49
49
  </file>
50
+ <file>
51
+ <filename>LICENSE.md</filename>
52
+ <filetype>md</filetype>
53
+ <usage_type>license</usage_type>
54
+ <checksum>A21A3ED2</checksum>
55
+ </file>
50
56
  <file>
51
57
  <version>
52
58
  <software_program>OpenStudio</software_program>
@@ -56,19 +62,13 @@
56
62
  <filename>measure.rb</filename>
57
63
  <filetype>rb</filetype>
58
64
  <usage_type>script</usage_type>
59
- <checksum>AE1DED78</checksum>
60
- </file>
61
- <file>
62
- <filename>LICENSE.md</filename>
63
- <filetype>md</filetype>
64
- <usage_type>license</usage_type>
65
- <checksum>A21A3ED2</checksum>
65
+ <checksum>692EC173</checksum>
66
66
  </file>
67
67
  <file>
68
68
  <filename>CleanupSpaceOrigins_Test.rb</filename>
69
69
  <filetype>rb</filetype>
70
70
  <usage_type>test</usage_type>
71
- <checksum>A470A74C</checksum>
71
+ <checksum>61DA00EE</checksum>
72
72
  </file>
73
73
  </files>
74
74
  </measure>
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>find_and_replace_object_names</name>
5
5
  <uid>f540d66c-800f-4187-81ee-957891034d56</uid>
6
- <version_id>f4dd1c8b-15c6-4bdf-8e29-1a09915461c1</version_id>
7
- <version_modified>20210423T142510Z</version_modified>
6
+ <version_id>2d1b4b2e-c116-4e02-9485-1dd4d22fd6da</version_id>
7
+ <version_modified>20220505T182936Z</version_modified>
8
8
  <xml_checksum>F6B8F064</xml_checksum>
9
9
  <class_name>FindAndReplaceObjectNames</class_name>
10
10
  <display_name>Find and Replace Object Names in the Model</display_name>
@@ -85,17 +85,17 @@
85
85
  <usage_type>script</usage_type>
86
86
  <checksum>C9F4ECE0</checksum>
87
87
  </file>
88
- <file>
89
- <filename>FindAndReplaceObjectNames_Test.rb</filename>
90
- <filetype>rb</filetype>
91
- <usage_type>test</usage_type>
92
- <checksum>4175F163</checksum>
93
- </file>
94
88
  <file>
95
89
  <filename>LICENSE.md</filename>
96
90
  <filetype>md</filetype>
97
91
  <usage_type>license</usage_type>
98
92
  <checksum>A21A3ED2</checksum>
99
93
  </file>
94
+ <file>
95
+ <filename>FindAndReplaceObjectNames_Test.rb</filename>
96
+ <filetype>rb</filetype>
97
+ <usage_type>test</usage_type>
98
+ <checksum>9E6692CB</checksum>
99
+ </file>
100
100
  </files>
101
101
  </measure>
@@ -291,7 +291,7 @@ class InjectOsmGeometryIntoAnExternalIdf < OpenStudio::Measure::EnergyPlusMeasur
291
291
 
292
292
  # create a list of objects to add
293
293
  objects = OpenStudio::IdfObjectVector.new
294
- objectsToAdd.values.each do |object|
294
+ objectsToAdd.each_value do |object|
295
295
  idfObject = object.idfObject()
296
296
  objects << idfObject
297
297
  end
@@ -322,7 +322,7 @@ class InjectOsmGeometryIntoAnExternalIdf < OpenStudio::Measure::EnergyPlusMeasur
322
322
 
323
323
  # create a list of objects to add
324
324
  objects = OpenStudio::IdfObjectVector.new
325
- objectsToAddFromSourceIDF.values.each do |idfObject|
325
+ objectsToAddFromSourceIDF.each_value do |idfObject|
326
326
  # idfObject = object.idfObject()
327
327
  objects << idfObject
328
328
  end
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>inject_osm_geometry_into_an_external_idf</name>
5
5
  <uid>633cd1c5-5b55-4b50-ab20-cf2d2f7ddff8</uid>
6
- <version_id>172665e1-0401-4511-a31e-c4f24cf4f99b</version_id>
7
- <version_modified>20210423T142510Z</version_modified>
6
+ <version_id>adf510ba-1aac-4f89-8e7f-b0c1720ebf4a</version_id>
7
+ <version_modified>20220505T182928Z</version_modified>
8
8
  <xml_checksum>3BE1CF9C</xml_checksum>
9
9
  <class_name>InjectOsmGeometryIntoAnExternalIdf</class_name>
10
10
  <display_name>InjectOsmGeometryIntoAnExternalIdf</display_name>
@@ -168,13 +168,31 @@ Constructions and other resources won?t be moved back and forth but the surface
168
168
  <filename>measure.rb</filename>
169
169
  <filetype>rb</filetype>
170
170
  <usage_type>script</usage_type>
171
- <checksum>466953F1</checksum>
171
+ <checksum>D5B1BE30</checksum>
172
172
  </file>
173
173
  <file>
174
174
  <filename>InjectOsmGeometryIntoAnExternalIdf_Test.rb</filename>
175
175
  <filetype>rb</filetype>
176
176
  <usage_type>test</usage_type>
177
- <checksum>7B655B56</checksum>
177
+ <checksum>0097ECFF</checksum>
178
+ </file>
179
+ <file>
180
+ <filename>4ZoneWithShading_Simple_1_AlteredGeo/run.db</filename>
181
+ <filetype>db</filetype>
182
+ <usage_type>test</usage_type>
183
+ <checksum>D307F08F</checksum>
184
+ </file>
185
+ <file>
186
+ <filename>RefBldgMediumOfficeNew2004_Chicago_AlteredGeo/run.db</filename>
187
+ <filetype>db</filetype>
188
+ <usage_type>test</usage_type>
189
+ <checksum>1387DFF3</checksum>
190
+ </file>
191
+ <file>
192
+ <filename>RefBldgMediumOfficeNew2004_Chicago_AlteredGeo_b/run.db</filename>
193
+ <filetype>db</filetype>
194
+ <usage_type>test</usage_type>
195
+ <checksum>BF7FFB65</checksum>
178
196
  </file>
179
197
  </files>
180
198
  </measure>
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>remove_hard_assigned_constructions</name>
5
5
  <uid>8fd2557e-907d-46a3-aebf-8cc81c58bc65</uid>
6
- <version_id>8b5b2fe1-0524-4b24-8f77-de57f98ed544</version_id>
7
- <version_modified>20210423T142510Z</version_modified>
6
+ <version_id>41caa15f-8f6a-4545-9420-268b9a1e02b8</version_id>
7
+ <version_modified>20220505T182936Z</version_modified>
8
8
  <xml_checksum>1E963D9C</xml_checksum>
9
9
  <class_name>RemoveHardAssignedConstructions</class_name>
10
10
  <display_name>RemoveHardAssignedConstructions</display_name>
@@ -77,17 +77,17 @@
77
77
  <usage_type>script</usage_type>
78
78
  <checksum>F18D020C</checksum>
79
79
  </file>
80
- <file>
81
- <filename>RemoveHardAssignedConstructions_Test.rb</filename>
82
- <filetype>rb</filetype>
83
- <usage_type>test</usage_type>
84
- <checksum>D38C492D</checksum>
85
- </file>
86
80
  <file>
87
81
  <filename>LICENSE.md</filename>
88
82
  <filetype>md</filetype>
89
83
  <usage_type>license</usage_type>
90
84
  <checksum>A21A3ED2</checksum>
91
85
  </file>
86
+ <file>
87
+ <filename>RemoveHardAssignedConstructions_Test.rb</filename>
88
+ <filetype>rb</filetype>
89
+ <usage_type>test</usage_type>
90
+ <checksum>A0577A5F</checksum>
91
+ </file>
92
92
  </files>
93
93
  </measure>
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>rename_space_surfaces_basedon_parent_spaceand_orientation</name>
5
5
  <uid>fee62510-c076-423a-b172-0810ecedba10</uid>
6
- <version_id>7f0ce0f3-bfff-410c-8bfe-348b99bfb9a6</version_id>
7
- <version_modified>20210423T142510Z</version_modified>
6
+ <version_id>6bbf16de-c93b-4cdc-bd57-db83a9c5ca8c</version_id>
7
+ <version_modified>20220505T182919Z</version_modified>
8
8
  <xml_checksum>0F858D9E</xml_checksum>
9
9
  <class_name>RenameSpaceSurfacesBasedonParentSpaceandOrientation</class_name>
10
10
  <display_name>RenameSpaceSurfacesBasedonParentSpaceandOrientation</display_name>
@@ -68,17 +68,47 @@
68
68
  <usage_type>script</usage_type>
69
69
  <checksum>EB416F3D</checksum>
70
70
  </file>
71
+ <file>
72
+ <filename>LICENSE.md</filename>
73
+ <filetype>md</filetype>
74
+ <usage_type>license</usage_type>
75
+ <checksum>A21A3ED2</checksum>
76
+ </file>
71
77
  <file>
72
78
  <filename>RenameSpaceSurfacesBasedonParentSpaceandOrientation_Test.rb</filename>
73
79
  <filetype>rb</filetype>
74
80
  <usage_type>test</usage_type>
75
- <checksum>9443B43B</checksum>
81
+ <checksum>CE99A0B2</checksum>
76
82
  </file>
77
83
  <file>
78
- <filename>LICENSE.md</filename>
79
- <filetype>md</filetype>
80
- <usage_type>license</usage_type>
81
- <checksum>A21A3ED2</checksum>
84
+ <filename>Section 6 - Model/project.log</filename>
85
+ <filetype>log</filetype>
86
+ <usage_type>test</usage_type>
87
+ <checksum>00000000</checksum>
88
+ </file>
89
+ <file>
90
+ <filename>Section 6 - Model/project.osp-journal</filename>
91
+ <filetype>osp-journal</filetype>
92
+ <usage_type>test</usage_type>
93
+ <checksum>00E88397</checksum>
94
+ </file>
95
+ <file>
96
+ <filename>Section 6 - Model/run.db</filename>
97
+ <filetype>db</filetype>
98
+ <usage_type>test</usage_type>
99
+ <checksum>4D2285B9</checksum>
100
+ </file>
101
+ <file>
102
+ <filename>Section 6 - Model/files/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>
103
+ <filetype>epw</filetype>
104
+ <usage_type>test</usage_type>
105
+ <checksum>3B177CE0</checksum>
106
+ </file>
107
+ <file>
108
+ <filename>Section 6 - Model/project.osp</filename>
109
+ <filetype>osp</filetype>
110
+ <usage_type>test</usage_type>
111
+ <checksum>FD14D013</checksum>
82
112
  </file>
83
113
  </files>
84
114
  </measure>