openstudio-model-articulation 0.5.0 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (86) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +1 -2
  3. data/CHANGELOG.md +8 -0
  4. data/README.md +8 -3
  5. data/lib/measures/AssignConstructionSetToBuilding/measure.xml +10 -10
  6. data/lib/measures/AssignSpaceTypeBySpaceName/measure.xml +27 -9
  7. data/lib/measures/AssignSpaceTypeToBuilding/measure.xml +10 -10
  8. data/lib/measures/AssignSpacesToStories/measure.rb +2 -4
  9. data/lib/measures/AssignSpacesToStories/measure.xml +10 -10
  10. data/lib/measures/BarAspectRatioStudy/measure.rb +2 -1
  11. data/lib/measures/BarAspectRatioStudy/measure.xml +4 -4
  12. data/lib/measures/CleanupSpaceOrigins/measure.rb +3 -0
  13. data/lib/measures/CleanupSpaceOrigins/measure.xml +10 -10
  14. data/lib/measures/FindAndReplaceObjectNames/measure.xml +8 -8
  15. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.rb +2 -2
  16. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.xml +22 -4
  17. data/lib/measures/RemoveHardAssignedConstructions/measure.xml +8 -8
  18. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/measure.xml +37 -7
  19. data/lib/measures/RotateBuilding/measure.xml +8 -8
  20. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/measure.xml +13 -7
  21. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.rb +1 -1
  22. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.xml +10 -10
  23. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.rb +1 -1
  24. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.xml +10 -10
  25. data/lib/measures/SetWindowToWallRatioByFacade/README.md +11 -0
  26. data/lib/measures/SetWindowToWallRatioByFacade/measure.rb +84 -143
  27. data/lib/measures/SetWindowToWallRatioByFacade/measure.xml +32 -17
  28. data/lib/measures/SetWindowToWallRatioByFacade/resources/functions.rb +176 -0
  29. data/lib/measures/SimplifyGeometryToSlicedBar/measure.rb +8 -4
  30. data/lib/measures/SimplifyGeometryToSlicedBar/measure.xml +31 -13
  31. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_cofee.rb +6 -4
  32. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_geometry.rb +13 -8
  33. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_helper_methods.rb +2 -4
  34. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.rb +1 -1
  35. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.xml +4 -4
  36. data/lib/measures/SurfaceMatching/measure.rb +1 -0
  37. data/lib/measures/SurfaceMatching/measure.xml +10 -10
  38. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.rb +4 -3
  39. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.xml +4 -4
  40. data/lib/measures/blended_space_type_from_model/{resources → docs}/replace_occupied_spaces_with_blended_space_type_design_doc.txt +0 -0
  41. data/lib/measures/blended_space_type_from_model/measure.rb +15 -3
  42. data/lib/measures/blended_space_type_from_model/measure.xml +15 -21
  43. data/lib/measures/clone_building_from_external_model/measure.xml +3 -3
  44. data/lib/measures/create_DOE_prototype_building/measure.rb +2 -2
  45. data/lib/measures/create_DOE_prototype_building/measure.xml +442 -438
  46. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/measure.xml +3 -3
  47. data/lib/measures/create_bar_from_building_type_ratios/measure.rb +3 -3
  48. data/lib/measures/create_bar_from_building_type_ratios/measure.xml +14 -14
  49. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.rb +3 -3
  50. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.xml +16 -16
  51. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.rb +3 -3
  52. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml +14 -14
  53. data/lib/measures/create_bar_from_model/measure.rb +10 -6
  54. data/lib/measures/create_bar_from_model/measure.xml +4 -4
  55. data/lib/measures/create_bar_from_space_type_ratios/measure.rb +3 -3
  56. data/lib/measures/create_bar_from_space_type_ratios/measure.xml +16 -16
  57. data/lib/measures/create_baseline_building/measure.rb +3 -2
  58. data/lib/measures/create_baseline_building/measure.xml +4 -4
  59. data/lib/measures/create_deer_prototype_building/measure.xml +3 -3
  60. data/lib/measures/create_parametric_schedules/measure.rb +15 -10
  61. data/lib/measures/create_parametric_schedules/measure.xml +4 -4
  62. data/lib/measures/create_typical_building_from_model/measure.rb +1 -1
  63. data/lib/measures/create_typical_building_from_model/measure.xml +21 -21
  64. data/lib/measures/create_typical_deer_building_from_model/measure.rb +1 -1
  65. data/lib/measures/create_typical_deer_building_from_model/measure.xml +21 -21
  66. data/lib/measures/create_typical_doe_building_from_model/measure.rb +1 -1
  67. data/lib/measures/create_typical_doe_building_from_model/measure.xml +21 -21
  68. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.rb +1 -1
  69. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.xml +4 -4
  70. data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.xml +3 -3
  71. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.rb +2 -0
  72. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.xml +4 -4
  73. data/lib/measures/merge_floorspace_js_with_model/measure.rb +4 -1
  74. data/lib/measures/merge_floorspace_js_with_model/measure.xml +4 -4
  75. data/lib/measures/merge_spaces_from_external_file/measure.xml +3 -3
  76. data/lib/measures/radiance_measure/measure.rb +62 -56
  77. data/lib/measures/radiance_measure/measure.xml +4 -4
  78. data/lib/measures/radiant_slab_with_doas/measure.rb +4 -1
  79. data/lib/measures/radiant_slab_with_doas/measure.xml +4 -4
  80. data/lib/measures/replace_geometry_by_story/measure.rb +4 -0
  81. data/lib/measures/replace_geometry_by_story/measure.xml +4 -4
  82. data/lib/measures/scale_geometry/measure.xml +3 -3
  83. data/lib/openstudio/model_articulation/version.rb +1 -1
  84. data/openstudio-model-articulation.gemspec +1 -1
  85. metadata +7 -7
  86. data/lib/measures/blended_space_type_from_model/resources/os_lib_model_simplification.rb +0 -1049
data/lib/measures/create_typical_building_from_model/measure.xml CHANGED
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_typical_building_from_model</name>
5
5
  <uid>339a2e3a-273c-4494-bb50-bfe586a0647c</uid>
6
- <version_id>97112603-b027-4802-9310-d0e02b78200d</version_id>
7
- <version_modified>20210716T214830Z</version_modified>
6
+ <version_id>31f3a460-1a03-4b60-abe2-26a20388685f</version_id>
7
+ <version_modified>20220505T182926Z</version_modified>
8
8
  <xml_checksum>EE13F09F</xml_checksum>
9
9
  <class_name>CreateTypicalBuildingFromModel</class_name>
10
10
  <display_name>Create Typical Building from Model</display_name>
@@ -1544,18 +1544,6 @@
1544
1544
  <usage_type>license</usage_type>
1545
1545
  <checksum>A21A3ED2</checksum>
1546
1546
  </file>
1547
- <file>
1548
- <filename>measure_test_hvac.rb</filename>
1549
- <filetype>rb</filetype>
1550
- <usage_type>test</usage_type>
1551
- <checksum>DEB61C22</checksum>
1552
- </file>
1553
- <file>
1554
- <filename>create_typical_building_from_model_test.rb</filename>
1555
- <filetype>rb</filetype>
1556
- <usage_type>test</usage_type>
1557
- <checksum>1C2C0385</checksum>
1558
- </file>
1559
1547
  <file>
1560
1548
  <filename>Model.hvac.rb</filename>
1561
1549
  <filetype>rb</filetype>
@@ -1568,6 +1556,24 @@
1568
1556
  <usage_type>readmeerb</usage_type>
1569
1557
  <checksum>6A400402</checksum>
1570
1558
  </file>
1559
+ <file>
1560
+ <filename>README.md</filename>
1561
+ <filetype>md</filetype>
1562
+ <usage_type>readme</usage_type>
1563
+ <checksum>AC908059</checksum>
1564
+ </file>
1565
+ <file>
1566
+ <filename>measure_test_hvac.rb</filename>
1567
+ <filetype>rb</filetype>
1568
+ <usage_type>test</usage_type>
1569
+ <checksum>3ADA2599</checksum>
1570
+ </file>
1571
+ <file>
1572
+ <filename>create_typical_building_from_model_test.rb</filename>
1573
+ <filetype>rb</filetype>
1574
+ <usage_type>test</usage_type>
1575
+ <checksum>70747188</checksum>
1576
+ </file>
1571
1577
  <file>
1572
1578
  <version>
1573
1579
  <software_program>OpenStudio</software_program>
@@ -1577,13 +1583,7 @@
1577
1583
  <filename>measure.rb</filename>
1578
1584
  <filetype>rb</filetype>
1579
1585
  <usage_type>script</usage_type>
1580
- <checksum>D98EF78A</checksum>
1581
- </file>
1582
- <file>
1583
- <filename>README.md</filename>
1584
- <filetype>md</filetype>
1585
- <usage_type>readme</usage_type>
1586
- <checksum>AC908059</checksum>
1586
+ <checksum>A6580D22</checksum>
1587
1587
  </file>
1588
1588
  </files>
1589
1589
  </measure>
data/lib/measures/create_typical_deer_building_from_model/measure.rb CHANGED
@@ -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
 
data/lib/measures/create_typical_deer_building_from_model/measure.xml CHANGED
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_typical_deer_building_from_model</name>
5
5
  <uid>09cc23db-5e9b-4b11-b167-1852a15ed339</uid>
6
- <version_id>bdfa6001-d655-473d-94bd-02c58b4808a8</version_id>
7
- <version_modified>20210729T163235Z</version_modified>
6
+ <version_id>f8a8e7e4-350b-4b0f-a27a-18e1ddf170fd</version_id>
7
+ <version_modified>20220505T182935Z</version_modified>
8
8
  <xml_checksum>AABAC479</xml_checksum>
9
9
  <class_name>CreateTypicalDEERBuildingFromModel</class_name>
10
10
  <display_name>Create Typical DEER Building from Model</display_name>
@@ -1381,18 +1381,6 @@
1381
1381
  <usage_type>license</usage_type>
1382
1382
  <checksum>A21A3ED2</checksum>
1383
1383
  </file>
1384
- <file>
1385
- <filename>measure_test_hvac.rb</filename>
1386
- <filetype>rb</filetype>
1387
- <usage_type>test</usage_type>
1388
- <checksum>B00E4105</checksum>
1389
- </file>
1390
- <file>
1391
- <filename>create_typical_deer_building_from_model_test.rb</filename>
1392
- <filetype>rb</filetype>
1393
- <usage_type>test</usage_type>
1394
- <checksum>F3844890</checksum>
1395
- </file>
1396
1384
  <file>
1397
1385
  <filename>Model.hvac.rb</filename>
1398
1386
  <filetype>rb</filetype>
@@ -1405,6 +1393,24 @@
1405
1393
  <usage_type>readmeerb</usage_type>
1406
1394
  <checksum>DD4698D3</checksum>
1407
1395
  </file>
1396
+ <file>
1397
+ <filename>README.md</filename>
1398
+ <filetype>md</filetype>
1399
+ <usage_type>readme</usage_type>
1400
+ <checksum>1B2E71EB</checksum>
1401
+ </file>
1402
+ <file>
1403
+ <filename>measure_test_hvac.rb</filename>
1404
+ <filetype>rb</filetype>
1405
+ <usage_type>test</usage_type>
1406
+ <checksum>3FE8544B</checksum>
1407
+ </file>
1408
+ <file>
1409
+ <filename>create_typical_deer_building_from_model_test.rb</filename>
1410
+ <filetype>rb</filetype>
1411
+ <usage_type>test</usage_type>
1412
+ <checksum>B3C5409D</checksum>
1413
+ </file>
1408
1414
  <file>
1409
1415
  <version>
1410
1416
  <software_program>OpenStudio</software_program>
@@ -1414,13 +1420,7 @@
1414
1420
  <filename>measure.rb</filename>
1415
1421
  <filetype>rb</filetype>
1416
1422
  <usage_type>script</usage_type>
1417
- <checksum>10822852</checksum>
1418
- </file>
1419
- <file>
1420
- <filename>README.md</filename>
1421
- <filetype>md</filetype>
1422
- <usage_type>readme</usage_type>
1423
- <checksum>1B2E71EB</checksum>
1423
+ <checksum>088F9AFB</checksum>
1424
1424
  </file>
1425
1425
  </files>
1426
1426
  </measure>
data/lib/measures/create_typical_doe_building_from_model/measure.rb CHANGED
@@ -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
 
data/lib/measures/create_typical_doe_building_from_model/measure.xml CHANGED
@@ -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>6272a546-b267-4de2-a0cc-0ea8d18c5159</version_id>
7
- <version_modified>20210716T214758Z</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>
@@ -1378,18 +1378,6 @@
1378
1378
  <usage_type>license</usage_type>
1379
1379
  <checksum>A21A3ED2</checksum>
1380
1380
  </file>
1381
- <file>
1382
- <filename>create_typical_doe_building_from_model_test.rb</filename>
1383
- <filetype>rb</filetype>
1384
- <usage_type>test</usage_type>
1385
- <checksum>59AEB6FD</checksum>
1386
- </file>
1387
- <file>
1388
- <filename>measure_test_hvac.rb</filename>
1389
- <filetype>rb</filetype>
1390
- <usage_type>test</usage_type>
1391
- <checksum>188F5F6B</checksum>
1392
- </file>
1393
1381
  <file>
1394
1382
  <filename>Model.hvac.rb</filename>
1395
1383
  <filetype>rb</filetype>
@@ -1402,6 +1390,24 @@
1402
1390
  <usage_type>readmeerb</usage_type>
1403
1391
  <checksum>BDCE44E6</checksum>
1404
1392
  </file>
1393
+ <file>
1394
+ <filename>README.md</filename>
1395
+ <filetype>md</filetype>
1396
+ <usage_type>readme</usage_type>
1397
+ <checksum>7F39813C</checksum>
1398
+ </file>
1399
+ <file>
1400
+ <filename>create_typical_doe_building_from_model_test.rb</filename>
1401
+ <filetype>rb</filetype>
1402
+ <usage_type>test</usage_type>
1403
+ <checksum>2DF721BA</checksum>
1404
+ </file>
1405
+ <file>
1406
+ <filename>measure_test_hvac.rb</filename>
1407
+ <filetype>rb</filetype>
1408
+ <usage_type>test</usage_type>
1409
+ <checksum>9B04EEB7</checksum>
1410
+ </file>
1405
1411
  <file>
1406
1412
  <version>
1407
1413
  <software_program>OpenStudio</software_program>
@@ -1411,13 +1417,7 @@
1411
1417
  <filename>measure.rb</filename>
1412
1418
  <filetype>rb</filetype>
1413
1419
  <usage_type>script</usage_type>
1414
- <checksum>7A862D5A</checksum>
1415
- </file>
1416
- <file>
1417
- <filename>README.md</filename>
1418
- <filetype>md</filetype>
1419
- <usage_type>readme</usage_type>
1420
- <checksum>7F39813C</checksum>
1420
+ <checksum>72714DCB</checksum>
1421
1421
  </file>
1422
1422
  </files>
1423
1423
  </measure>
data/lib/measures/deer_space_type_and_construction_set_wizard/measure.rb CHANGED
@@ -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
data/lib/measures/deer_space_type_and_construction_set_wizard/measure.xml CHANGED
@@ -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>745737d5-1816-4dc6-8a95-0059b881b88a</version_id>
7
- <version_modified>20210423T142536Z</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>
@@ -363,7 +363,7 @@
363
363
  <filename>deer_space_type_and_construction_set_wizard_Test.rb</filename>
364
364
  <filetype>rb</filetype>
365
365
  <usage_type>test</usage_type>
366
- <checksum>854655C1</checksum>
366
+ <checksum>8B39BFC0</checksum>
367
367
  </file>
368
368
  <file>
369
369
  <version>
@@ -374,7 +374,7 @@
374
374
  <filename>measure.rb</filename>
375
375
  <filetype>rb</filetype>
376
376
  <usage_type>script</usage_type>
377
- <checksum>D6961EE1</checksum>
377
+ <checksum>B9BC7D57</checksum>
378
378
  </file>
379
379
  </files>
380
380
  </measure>
data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.xml CHANGED
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>find_and_replace_in_all_thermal_zone_names</name>
5
5
  <uid>3573d81e-e7de-4949-be50-8abcd0f95a35</uid>
6
- <version_id>85da1815-b093-45ef-a399-1c8cc9b46956</version_id>
7
- <version_modified>20210423T142537Z</version_modified>
6
+ <version_id>aa8dce36-46c8-4bd1-a755-e5368218a0c1</version_id>
7
+ <version_modified>20220505T182935Z</version_modified>
8
8
  <xml_checksum>057E8D9D</xml_checksum>
9
9
  <class_name>FindAndReplaceInAllThermalZoneNames</class_name>
10
10
  <display_name>Find And Replace In All Thermal Zone Names</display_name>
@@ -85,7 +85,7 @@
85
85
  <filename>find_and_replace_in_all_thermal_zone_names_test.rb</filename>
86
86
  <filetype>rb</filetype>
87
87
  <usage_type>test</usage_type>
88
- <checksum>5EF10DDA</checksum>
88
+ <checksum>1ACD900C</checksum>
89
89
  </file>
90
90
  </files>
91
91
  </measure>
data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.rb CHANGED
@@ -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
data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.xml CHANGED
@@ -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>280fcc05-b5d1-4f95-9bc3-f0a426fa1a1f</version_id>
7
- <version_modified>20210423T142537Z</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>
@@ -97,13 +97,13 @@
97
97
  <filename>measure.rb</filename>
98
98
  <filetype>rb</filetype>
99
99
  <usage_type>script</usage_type>
100
- <checksum>2A4A98D5</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>E7C200C9</checksum>
106
+ <checksum>E4A4E702</checksum>
107
107
  </file>
108
108
  </files>
109
109
  </measure>
data/lib/measures/merge_floorspace_js_with_model/measure.rb CHANGED
@@ -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
 
data/lib/measures/merge_floorspace_js_with_model/measure.xml CHANGED
@@ -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>cd8c6e2c-6e2b-45d3-a9a2-aaccb5dd38a9</version_id>
7
- <version_modified>20210423T142537Z</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>
@@ -98,13 +98,13 @@
98
98
  <filename>measure.rb</filename>
99
99
  <filetype>rb</filetype>
100
100
  <usage_type>script</usage_type>
101
- <checksum>B66DBC8C</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>33A937E8</checksum>
107
+ <checksum>F51D04E3</checksum>
108
108
  </file>
109
109
  </files>
110
110
  </measure>
data/lib/measures/merge_spaces_from_external_file/measure.xml CHANGED
@@ -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>d727f4c4-a1b5-485f-8ed0-984dc2083fc0</version_id>
7
- <version_modified>20210423T142538Z</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>
@@ -238,7 +238,7 @@
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>9AAAEDBF</checksum>
241
+ <checksum>2D93C8DF</checksum>
242
242
  </file>
243
243
  </files>
244
244
  </measure>