openstudio-model-articulation 0.9.0 → 0.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (130) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +13 -3
  3. data/Gemfile +12 -5
  4. data/Jenkinsfile +1 -1
  5. data/LICENSE.md +1 -1
  6. data/README.md +2 -0
  7. data/lib/measures/AssignConstructionSetToBuilding/LICENSE.md +1 -1
  8. data/lib/measures/AssignConstructionSetToBuilding/measure.xml +21 -21
  9. data/lib/measures/AssignSpaceTypeBySpaceName/LICENSE.md +1 -1
  10. data/lib/measures/AssignSpaceTypeBySpaceName/measure.xml +37 -37
  11. data/lib/measures/AssignSpaceTypeToBuilding/LICENSE.md +1 -1
  12. data/lib/measures/AssignSpaceTypeToBuilding/measure.xml +21 -21
  13. data/lib/measures/AssignSpacesToStories/LICENSE.md +1 -1
  14. data/lib/measures/AssignSpacesToStories/measure.xml +17 -17
  15. data/lib/measures/BarAspectRatioStudy/LICENSE.md +1 -1
  16. data/lib/measures/BarAspectRatioStudy/measure.xml +11 -11
  17. data/lib/measures/CleanupSpaceOrigins/LICENSE.md +1 -1
  18. data/lib/measures/CleanupSpaceOrigins/measure.xml +17 -17
  19. data/lib/measures/FindAndReplaceObjectNames/LICENSE.md +1 -1
  20. data/lib/measures/FindAndReplaceObjectNames/measure.xml +17 -17
  21. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/LICENSE.md +1 -1
  22. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.xml +54 -54
  23. data/lib/measures/RemoveHardAssignedConstructions/LICENSE.md +1 -1
  24. data/lib/measures/RemoveHardAssignedConstructions/measure.xml +17 -17
  25. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/LICENSE.md +1 -1
  26. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/measure.xml +40 -40
  27. data/lib/measures/RotateBuilding/LICENSE.md +1 -1
  28. data/lib/measures/RotateBuilding/measure.xml +19 -19
  29. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/LICENSE.md +1 -1
  30. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/measure.xml +21 -21
  31. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/LICENSE.md +1 -1
  32. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.xml +17 -17
  33. data/lib/measures/SetInteriorWallsToSelectedConstruction/LICENSE.md +1 -1
  34. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.xml +17 -17
  35. data/lib/measures/SetWindowToWallRatioByFacade/LICENSE.md +1 -1
  36. data/lib/measures/SetWindowToWallRatioByFacade/measure.xml +46 -46
  37. data/lib/measures/SimplifyGeometryToSlicedBar/LICENSE.md +1 -1
  38. data/lib/measures/SimplifyGeometryToSlicedBar/measure.rb +32 -37
  39. data/lib/measures/SimplifyGeometryToSlicedBar/measure.xml +34 -80
  40. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_cofee.rb +10 -9
  41. data/lib/measures/SpaceTypeAndConstructionSetWizard/LICENSE.md +1 -1
  42. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.rb +10 -13
  43. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.xml +28 -28
  44. data/lib/measures/SurfaceMatching/LICENSE.md +1 -1
  45. data/lib/measures/SurfaceMatching/measure.xml +17 -17
  46. data/lib/measures/add_empd_material_properties/LICENSE.md +1 -1
  47. data/lib/measures/add_empd_material_properties/measure.xml +27 -27
  48. data/lib/measures/blended_space_type_from_floor_area_ratios/LICENSE.md +1 -1
  49. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.rb +31 -14
  50. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.xml +36 -36
  51. data/lib/measures/blended_space_type_from_model/LICENSE.md +1 -1
  52. data/lib/measures/blended_space_type_from_model/measure.rb +12 -5
  53. data/lib/measures/blended_space_type_from_model/measure.xml +47 -47
  54. data/lib/measures/clone_building_from_external_model/LICENSE.md +1 -1
  55. data/lib/measures/clone_building_from_external_model/measure.xml +23 -23
  56. data/lib/measures/create_DOE_prototype_building/LICENSE.md +1 -1
  57. data/lib/measures/create_DOE_prototype_building/measure.rb +1 -1
  58. data/lib/measures/create_DOE_prototype_building/measure.xml +19 -875
  59. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/LICENSE.md +1 -1
  60. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/measure.xml +13 -13
  61. data/lib/measures/create_bar_from_building_type_ratios/LICENSE.md +1 -1
  62. data/lib/measures/create_bar_from_building_type_ratios/README.md +2 -13
  63. data/lib/measures/create_bar_from_building_type_ratios/measure.rb +122 -30
  64. data/lib/measures/create_bar_from_building_type_ratios/measure.xml +108 -349
  65. data/lib/measures/create_bar_from_deer_building_type_ratios/LICENSE.md +1 -1
  66. data/lib/measures/create_bar_from_deer_building_type_ratios/README.md +21 -1
  67. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.rb +120 -18
  68. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.xml +94 -32
  69. data/lib/measures/create_bar_from_doe_building_type_ratios/LICENSE.md +1 -1
  70. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.rb +127 -18
  71. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml +48 -26
  72. data/lib/measures/create_bar_from_model/LICENSE.md +1 -1
  73. data/lib/measures/create_bar_from_model/measure.rb +17 -18
  74. data/lib/measures/create_bar_from_model/measure.xml +41 -41
  75. data/lib/measures/create_bar_from_space_type_ratios/LICENSE.md +1 -1
  76. data/lib/measures/create_bar_from_space_type_ratios/README.md +1 -1
  77. data/lib/measures/create_bar_from_space_type_ratios/measure.rb +94 -14
  78. data/lib/measures/create_bar_from_space_type_ratios/measure.xml +104 -63
  79. data/lib/measures/create_baseline_building/LICENSE.md +1 -1
  80. data/lib/measures/create_baseline_building/measure.xml +35 -35
  81. data/lib/measures/create_deer_prototype_building/LICENSE.md +1 -1
  82. data/lib/measures/create_deer_prototype_building/measure.xml +17 -17
  83. data/lib/measures/create_parametric_schedules/LICENSE.md +1 -1
  84. data/lib/measures/create_parametric_schedules/measure.rb +17 -20
  85. data/lib/measures/create_parametric_schedules/measure.xml +15 -15
  86. data/lib/measures/create_typical_building_from_model/LICENSE.md +1 -1
  87. data/lib/measures/create_typical_building_from_model/README.md +16 -16
  88. data/lib/measures/create_typical_building_from_model/measure.rb +84 -18
  89. data/lib/measures/create_typical_building_from_model/measure.xml +159 -211
  90. data/lib/measures/create_typical_deer_building_from_model/LICENSE.md +1 -1
  91. data/lib/measures/create_typical_deer_building_from_model/README.md +38 -5
  92. data/lib/measures/create_typical_deer_building_from_model/measure.rb +84 -12
  93. data/lib/measures/create_typical_deer_building_from_model/measure.xml +165 -65
  94. data/lib/measures/create_typical_doe_building_from_model/LICENSE.md +1 -1
  95. data/lib/measures/create_typical_doe_building_from_model/README.md +17 -4
  96. data/lib/measures/create_typical_doe_building_from_model/measure.rb +84 -12
  97. data/lib/measures/create_typical_doe_building_from_model/measure.xml +125 -65
  98. data/lib/measures/deer_space_type_and_construction_set_wizard/LICENSE.md +1 -1
  99. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.rb +13 -16
  100. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.xml +72 -29
  101. data/lib/measures/find_and_replace_in_all_thermal_zone_names/LICENSE.md +1 -1
  102. data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.xml +17 -17
  103. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/LICENSE.md +1 -1
  104. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.rb +4 -4
  105. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.xml +21 -21
  106. data/lib/measures/merge_floorspace_js_with_model/LICENSE.md +1 -1
  107. data/lib/measures/merge_floorspace_js_with_model/measure.xml +29 -29
  108. data/lib/measures/merge_spaces_from_external_file/LICENSE.md +1 -1
  109. data/lib/measures/merge_spaces_from_external_file/measure.rb +4 -4
  110. data/lib/measures/merge_spaces_from_external_file/measure.xml +34 -34
  111. data/lib/measures/radiance_measure/LICENSE.md +1 -1
  112. data/lib/measures/radiance_measure/measure.rb +3 -3
  113. data/lib/measures/radiance_measure/measure.xml +29 -29
  114. data/lib/measures/radiant_slab_with_doas/LICENSE.md +1 -1
  115. data/lib/measures/radiant_slab_with_doas/measure.rb +2 -2
  116. data/lib/measures/radiant_slab_with_doas/measure.xml +5 -5
  117. data/lib/measures/replace_geometry_by_story/LICENSE.md +1 -1
  118. data/lib/measures/replace_geometry_by_story/measure.rb +6 -10
  119. data/lib/measures/replace_geometry_by_story/measure.xml +19 -19
  120. data/lib/measures/scale_geometry/LICENSE.md +1 -1
  121. data/lib/measures/scale_geometry/measure.xml +11 -11
  122. data/lib/measures/set_nist_infiltration_correlations/LICENSE.md +7 -21
  123. data/lib/measures/set_nist_infiltration_correlations/measure.rb +2 -32
  124. data/lib/measures/set_nist_infiltration_correlations/measure.xml +5 -5
  125. data/lib/openstudio/model_articulation/version.rb +1 -1
  126. data/openstudio-model-articulation.gemspec +10 -4
  127. metadata +55 -16
  128. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_geometry.rb +0 -1174
  129. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_helper_methods.rb +0 -367
  130. data/lib/measures/create_typical_building_from_model/resources/Model.hvac.rb +0 -608
data/lib/measures/deer_space_type_and_construction_set_wizard/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</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>6b1f150e-13ee-47bc-9e4f-39f8e12a0b4c</version_id>
7
- <version_modified>20230602T160043Z</version_modified>
6
+ <version_id>9bc1b1a3-3cde-488d-8813-2f985dfa18c5</version_id>
7
+ <version_modified>2024-11-16T23:56:34Z</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>
@@ -17,6 +17,7 @@
17
17
  <type>Choice</type>
18
18
  <required>true</required>
19
19
  <model_dependent>false</model_dependent>
20
+ <default_value>Asm</default_value>
20
21
  <choices>
21
22
  <choice>
22
23
  <value>Asm</value>
@@ -134,6 +135,7 @@
134
135
  <type>Choice</type>
135
136
  <required>true</required>
136
137
  <model_dependent>false</model_dependent>
138
+ <default_value>DEER 2017</default_value>
137
139
  <choices>
138
140
  <choice>
139
141
  <value>DEER Pre-1975</value>
@@ -175,6 +177,46 @@
175
177
  <value>DEER 2020</value>
176
178
  <display_name>DEER 2020</display_name>
177
179
  </choice>
180
+ <choice>
181
+ <value>ComStock DEER Pre-1975</value>
182
+ <display_name>ComStock DEER Pre-1975</display_name>
183
+ </choice>
184
+ <choice>
185
+ <value>ComStock DEER 1985</value>
186
+ <display_name>ComStock DEER 1985</display_name>
187
+ </choice>
188
+ <choice>
189
+ <value>ComStock DEER 1996</value>
190
+ <display_name>ComStock DEER 1996</display_name>
191
+ </choice>
192
+ <choice>
193
+ <value>ComStock DEER 2003</value>
194
+ <display_name>ComStock DEER 2003</display_name>
195
+ </choice>
196
+ <choice>
197
+ <value>ComStock DEER 2007</value>
198
+ <display_name>ComStock DEER 2007</display_name>
199
+ </choice>
200
+ <choice>
201
+ <value>ComStock DEER 2011</value>
202
+ <display_name>ComStock DEER 2011</display_name>
203
+ </choice>
204
+ <choice>
205
+ <value>ComStock DEER 2014</value>
206
+ <display_name>ComStock DEER 2014</display_name>
207
+ </choice>
208
+ <choice>
209
+ <value>ComStock DEER 2015</value>
210
+ <display_name>ComStock DEER 2015</display_name>
211
+ </choice>
212
+ <choice>
213
+ <value>ComStock DEER 2017</value>
214
+ <display_name>ComStock DEER 2017</display_name>
215
+ </choice>
216
+ <choice>
217
+ <value>ComStock DEER 2020</value>
218
+ <display_name>ComStock DEER 2020</display_name>
219
+ </choice>
178
220
  </choices>
179
221
  </argument>
180
222
  <argument>
@@ -183,6 +225,7 @@
183
225
  <type>Choice</type>
184
226
  <required>true</required>
185
227
  <model_dependent>false</model_dependent>
228
+ <default_value>CEC T24-CEC8</default_value>
186
229
  <choices>
187
230
  <choice>
188
231
  <value>CEC T24-CEC1</value>
@@ -324,16 +367,16 @@
324
367
  </attributes>
325
368
  <files>
326
369
  <file>
327
- <filename>EmptySeedModel.osm</filename>
328
- <filetype>osm</filetype>
329
- <usage_type>test</usage_type>
330
- <checksum>50769D09</checksum>
370
+ <filename>LICENSE.md</filename>
371
+ <filetype>md</filetype>
372
+ <usage_type>license</usage_type>
373
+ <checksum>8696A072</checksum>
331
374
  </file>
332
375
  <file>
333
- <filename>two_story_bar.osm</filename>
334
- <filetype>osm</filetype>
335
- <usage_type>test</usage_type>
336
- <checksum>85FF42E2</checksum>
376
+ <filename>README.md</filename>
377
+ <filetype>md</filetype>
378
+ <usage_type>readme</usage_type>
379
+ <checksum>DA87BC3D</checksum>
337
380
  </file>
338
381
  <file>
339
382
  <filename>README.md.erb</filename>
@@ -342,10 +385,15 @@
342
385
  <checksum>703C9964</checksum>
343
386
  </file>
344
387
  <file>
345
- <filename>README.md</filename>
346
- <filetype>md</filetype>
347
- <usage_type>readme</usage_type>
348
- <checksum>DA87BC3D</checksum>
388
+ <version>
389
+ <software_program>OpenStudio</software_program>
390
+ <identifier>2.0.0</identifier>
391
+ <min_compatible>3.8.0</min_compatible>
392
+ </version>
393
+ <filename>measure.rb</filename>
394
+ <filetype>rb</filetype>
395
+ <usage_type>script</usage_type>
396
+ <checksum>D15EF711</checksum>
349
397
  </file>
350
398
  <file>
351
399
  <filename>design_doc.txt</filename>
@@ -354,27 +402,22 @@
354
402
  <checksum>86154A1B</checksum>
355
403
  </file>
356
404
  <file>
357
- <filename>LICENSE.md</filename>
358
- <filetype>md</filetype>
359
- <usage_type>license</usage_type>
360
- <checksum>BFFB1AA6</checksum>
405
+ <filename>EmptySeedModel.osm</filename>
406
+ <filetype>osm</filetype>
407
+ <usage_type>test</usage_type>
408
+ <checksum>50769D09</checksum>
361
409
  </file>
362
410
  <file>
363
411
  <filename>deer_space_type_and_construction_set_wizard_Test.rb</filename>
364
412
  <filetype>rb</filetype>
365
413
  <usage_type>test</usage_type>
366
- <checksum>05F3FC70</checksum>
414
+ <checksum>7BFB1B49</checksum>
367
415
  </file>
368
416
  <file>
369
- <version>
370
- <software_program>OpenStudio</software_program>
371
- <identifier>2.0.0</identifier>
372
- <min_compatible>2.8.0</min_compatible>
373
- </version>
374
- <filename>measure.rb</filename>
375
- <filetype>rb</filetype>
376
- <usage_type>script</usage_type>
377
- <checksum>94916FFD</checksum>
417
+ <filename>two_story_bar.osm</filename>
418
+ <filetype>osm</filetype>
419
+ <usage_type>test</usage_type>
420
+ <checksum>85FF42E2</checksum>
378
421
  </file>
379
422
  </files>
380
423
  </measure>
data/lib/measures/find_and_replace_in_all_thermal_zone_names/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</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>e761160f-c143-448d-aacf-bd711ba6d025</version_id>
7
- <version_modified>20230602T160046Z</version_modified>
6
+ <version_id>89be78f0-de55-47eb-ac28-10152ef91c79</version_id>
7
+ <version_modified>2024-11-16T23:56:37Z</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>
@@ -47,16 +47,10 @@
47
47
  </attributes>
48
48
  <files>
49
49
  <file>
50
- <filename>ImportedIdf_RefFsr.osm</filename>
51
- <filetype>osm</filetype>
52
- <usage_type>test</usage_type>
53
- <checksum>3740003C</checksum>
54
- </file>
55
- <file>
56
- <filename>README.md.erb</filename>
57
- <filetype>erb</filetype>
58
- <usage_type>readmeerb</usage_type>
59
- <checksum>703C9964</checksum>
50
+ <filename>LICENSE.md</filename>
51
+ <filetype>md</filetype>
52
+ <usage_type>license</usage_type>
53
+ <checksum>8696A072</checksum>
60
54
  </file>
61
55
  <file>
62
56
  <filename>README.md</filename>
@@ -64,6 +58,12 @@
64
58
  <usage_type>readme</usage_type>
65
59
  <checksum>4D12DAE2</checksum>
66
60
  </file>
61
+ <file>
62
+ <filename>README.md.erb</filename>
63
+ <filetype>erb</filetype>
64
+ <usage_type>readmeerb</usage_type>
65
+ <checksum>703C9964</checksum>
66
+ </file>
67
67
  <file>
68
68
  <version>
69
69
  <software_program>OpenStudio</software_program>
@@ -76,10 +76,10 @@
76
76
  <checksum>D9A03E8B</checksum>
77
77
  </file>
78
78
  <file>
79
- <filename>LICENSE.md</filename>
80
- <filetype>md</filetype>
81
- <usage_type>license</usage_type>
82
- <checksum>BFFB1AA6</checksum>
79
+ <filename>ImportedIdf_RefFsr.osm</filename>
80
+ <filetype>osm</filetype>
81
+ <usage_type>test</usage_type>
82
+ <checksum>3740003C</checksum>
83
83
  </file>
84
84
  <file>
85
85
  <filename>find_and_replace_in_all_thermal_zone_names_test.rb</filename>
data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.rb CHANGED
@@ -6,9 +6,8 @@
6
6
  # see the URL below for information on how to write OpenStudio measures
7
7
  # http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/
8
8
 
9
- # load OpenStudio measure libraries from openstudio-extension gem
10
- require 'openstudio-extension'
11
- require 'openstudio/extension/core/os_lib_helper_methods'
9
+ # load openstudio-standards gem
10
+ require 'openstudio-standards'
12
11
 
13
12
  # start the measure
14
13
  class MakeShadingSurfacesBasedOnZoneMultipliers < OpenStudio::Measure::ModelMeasure
@@ -65,7 +64,8 @@ class MakeShadingSurfacesBasedOnZoneMultipliers < OpenStudio::Measure::ModelMeas
65
64
  super(model, runner, user_arguments)
66
65
 
67
66
  # assign the user inputs to variables
68
- args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model))
67
+ args = runner.getArgumentValues(arguments(model), user_arguments)
68
+ args = Hash[args.collect{ |k, v| [k.to_s, v] }]
69
69
  if !args then return false end
70
70
 
71
71
  # report initial condition of model
data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</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>5558e56c-47e7-4ede-b4b8-d0889a4ccbeb</version_id>
7
- <version_modified>20230602T160040Z</version_modified>
6
+ <version_id>1eb24a2e-b770-4053-bc57-3c8e4b364b95</version_id>
7
+ <version_modified>2024-11-16T23:56:33Z</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>
@@ -59,16 +59,10 @@
59
59
  </attributes>
60
60
  <files>
61
61
  <file>
62
- <filename>1003_LargeOffice_5b_Pre 1980.osm</filename>
63
- <filetype>osm</filetype>
64
- <usage_type>test</usage_type>
65
- <checksum>7908DE91</checksum>
66
- </file>
67
- <file>
68
- <filename>1003_LargeHotel_5b_2010.osm</filename>
69
- <filetype>osm</filetype>
70
- <usage_type>test</usage_type>
71
- <checksum>79D66118</checksum>
62
+ <filename>LICENSE.md</filename>
63
+ <filetype>md</filetype>
64
+ <usage_type>license</usage_type>
65
+ <checksum>8696A072</checksum>
72
66
  </file>
73
67
  <file>
74
68
  <filename>README.md</filename>
@@ -82,22 +76,28 @@
82
76
  <usage_type>readmeerb</usage_type>
83
77
  <checksum>703C9964</checksum>
84
78
  </file>
85
- <file>
86
- <filename>LICENSE.md</filename>
87
- <filetype>md</filetype>
88
- <usage_type>license</usage_type>
89
- <checksum>BFFB1AA6</checksum>
90
- </file>
91
79
  <file>
92
80
  <version>
93
81
  <software_program>OpenStudio</software_program>
94
82
  <identifier>2.0.0</identifier>
95
- <min_compatible>2.8.0</min_compatible>
83
+ <min_compatible>3.8.0</min_compatible>
96
84
  </version>
97
85
  <filename>measure.rb</filename>
98
86
  <filetype>rb</filetype>
99
87
  <usage_type>script</usage_type>
100
- <checksum>E5D4BCD4</checksum>
88
+ <checksum>4E2B7893</checksum>
89
+ </file>
90
+ <file>
91
+ <filename>1003_LargeHotel_5b_2010.osm</filename>
92
+ <filetype>osm</filetype>
93
+ <usage_type>test</usage_type>
94
+ <checksum>79D66118</checksum>
95
+ </file>
96
+ <file>
97
+ <filename>1003_LargeOffice_5b_Pre 1980.osm</filename>
98
+ <filetype>osm</filetype>
99
+ <usage_type>test</usage_type>
100
+ <checksum>7908DE91</checksum>
101
101
  </file>
102
102
  <file>
103
103
  <filename>make_shading_surfaces_based_on_zone_multipliers_test.rb</filename>
data/lib/measures/merge_floorspace_js_with_model/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/merge_floorspace_js_with_model/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>merge_floorspace_js_with_model</name>
5
5
  <uid>16ef6369-6420-4f17-894c-a767895bcaa4</uid>
6
- <version_id>1f1d4832-dec4-460c-854f-54edd7133f57</version_id>
7
- <version_modified>20230602T160044Z</version_modified>
6
+ <version_id>3a5f4dca-2a46-421c-b3e8-06c236afcb4e</version_id>
7
+ <version_modified>2024-11-16T23:56:35Z</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>
@@ -54,28 +54,10 @@
54
54
  </attributes>
55
55
  <files>
56
56
  <file>
57
- <filename>README.md.erb</filename>
58
- <filetype>erb</filetype>
59
- <usage_type>readmeerb</usage_type>
60
- <checksum>703C9964</checksum>
61
- </file>
62
- <file>
63
- <filename>office_floorplan.json</filename>
64
- <filetype>json</filetype>
65
- <usage_type>test</usage_type>
66
- <checksum>88795F74</checksum>
67
- </file>
68
- <file>
69
- <filename>SDDC Office template.osm</filename>
70
- <filetype>osm</filetype>
71
- <usage_type>test</usage_type>
72
- <checksum>757BD721</checksum>
73
- </file>
74
- <file>
75
- <filename>measure_test.osw</filename>
76
- <filetype>osw</filetype>
77
- <usage_type>test</usage_type>
78
- <checksum>3CCFE3D3</checksum>
57
+ <filename>LICENSE.md</filename>
58
+ <filetype>md</filetype>
59
+ <usage_type>license</usage_type>
60
+ <checksum>8696A072</checksum>
79
61
  </file>
80
62
  <file>
81
63
  <filename>README.md</filename>
@@ -84,10 +66,10 @@
84
66
  <checksum>31568C75</checksum>
85
67
  </file>
86
68
  <file>
87
- <filename>LICENSE.md</filename>
88
- <filetype>md</filetype>
89
- <usage_type>license</usage_type>
90
- <checksum>BFFB1AA6</checksum>
69
+ <filename>README.md.erb</filename>
70
+ <filetype>erb</filetype>
71
+ <usage_type>readmeerb</usage_type>
72
+ <checksum>703C9964</checksum>
91
73
  </file>
92
74
  <file>
93
75
  <version>
@@ -100,6 +82,18 @@
100
82
  <usage_type>script</usage_type>
101
83
  <checksum>23601781</checksum>
102
84
  </file>
85
+ <file>
86
+ <filename>SDDC Office template.osm</filename>
87
+ <filetype>osm</filetype>
88
+ <usage_type>test</usage_type>
89
+ <checksum>757BD721</checksum>
90
+ </file>
91
+ <file>
92
+ <filename>measure_test.osw</filename>
93
+ <filetype>osw</filetype>
94
+ <usage_type>test</usage_type>
95
+ <checksum>3CCFE3D3</checksum>
96
+ </file>
103
97
  <file>
104
98
  <filename>merge_floorspace_js_with_model_test.rb</filename>
105
99
  <filetype>rb</filetype>
@@ -112,5 +106,11 @@
112
106
  <usage_type>test</usage_type>
113
107
  <checksum>EE1B31D8</checksum>
114
108
  </file>
109
+ <file>
110
+ <filename>office_floorplan.json</filename>
111
+ <filetype>json</filetype>
112
+ <usage_type>test</usage_type>
113
+ <checksum>88795F74</checksum>
114
+ </file>
115
115
  </files>
116
116
  </measure>
data/lib/measures/merge_spaces_from_external_file/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/merge_spaces_from_external_file/measure.rb CHANGED
@@ -6,9 +6,8 @@
6
6
  # see the URL below for information on how to write OpenStudio measures
7
7
  # http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/
8
8
 
9
- # load OpenStudio measure libraries from openstudio-extension gem
10
- require 'openstudio-extension'
11
- require 'openstudio/extension/core/os_lib_helper_methods'
9
+ # load openstudio-standards gem
10
+ require 'openstudio-standards'
12
11
 
13
12
  require_relative 'resources/ScheduleTranslator'
14
13
 
@@ -208,7 +207,8 @@ class MergeSpacesFromExternalFile < OpenStudio::Measure::ModelMeasure
208
207
  end
209
208
 
210
209
  # assign the user inputs to variables
211
- args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model))
210
+ args = runner.getArgumentValues(arguments(model), user_arguments)
211
+ args = Hash[args.collect{ |k, v| [k.to_s, v] }]
212
212
  if !args then return false end
213
213
 
214
214
  # initial condition
data/lib/measures/merge_spaces_from_external_file/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>merge_spaces_from_external_file</name>
5
5
  <uid>e439a1a9-d075-4a25-9f83-2dca79d2826e</uid>
6
- <version_id>53875f3e-b70c-479e-a5dd-fb8a3c97ee53</version_id>
7
- <version_modified>20230602T160047Z</version_modified>
6
+ <version_id>a12c1d8e-c465-43a9-bfbc-37bb30e3b998</version_id>
7
+ <version_modified>2024-11-16T23:56:37Z</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>
@@ -182,22 +182,16 @@
182
182
  </attributes>
183
183
  <files>
184
184
  <file>
185
- <filename>measure_test.osw</filename>
186
- <filetype>osw</filetype>
187
- <usage_type>test</usage_type>
188
- <checksum>F5FABCCF</checksum>
189
- </file>
190
- <file>
191
- <filename>current_model_test.osm</filename>
192
- <filetype>osm</filetype>
193
- <usage_type>test</usage_type>
194
- <checksum>2F818B1A</checksum>
185
+ <filename>LICENSE.md</filename>
186
+ <filetype>md</filetype>
187
+ <usage_type>license</usage_type>
188
+ <checksum>8696A072</checksum>
195
189
  </file>
196
190
  <file>
197
- <filename>external_model_test.osm</filename>
198
- <filetype>osm</filetype>
199
- <usage_type>test</usage_type>
200
- <checksum>637A1436</checksum>
191
+ <filename>README.md</filename>
192
+ <filetype>md</filetype>
193
+ <usage_type>readme</usage_type>
194
+ <checksum>90DBF164</checksum>
201
195
  </file>
202
196
  <file>
203
197
  <filename>README.md.erb</filename>
@@ -206,10 +200,15 @@
206
200
  <checksum>703C9964</checksum>
207
201
  </file>
208
202
  <file>
209
- <filename>README.md</filename>
210
- <filetype>md</filetype>
211
- <usage_type>readme</usage_type>
212
- <checksum>90DBF164</checksum>
203
+ <version>
204
+ <software_program>OpenStudio</software_program>
205
+ <identifier>2.0.4</identifier>
206
+ <min_compatible>3.8.0</min_compatible>
207
+ </version>
208
+ <filename>measure.rb</filename>
209
+ <filetype>rb</filetype>
210
+ <usage_type>script</usage_type>
211
+ <checksum>C7B7CC3E</checksum>
213
212
  </file>
214
213
  <file>
215
214
  <filename>ScheduleTranslator.rb</filename>
@@ -218,21 +217,22 @@
218
217
  <checksum>8EB6C501</checksum>
219
218
  </file>
220
219
  <file>
221
- <filename>LICENSE.md</filename>
222
- <filetype>md</filetype>
223
- <usage_type>license</usage_type>
224
- <checksum>BFFB1AA6</checksum>
220
+ <filename>current_model_test.osm</filename>
221
+ <filetype>osm</filetype>
222
+ <usage_type>test</usage_type>
223
+ <checksum>2F818B1A</checksum>
225
224
  </file>
226
225
  <file>
227
- <version>
228
- <software_program>OpenStudio</software_program>
229
- <identifier>2.0.4</identifier>
230
- <min_compatible>2.8.0</min_compatible>
231
- </version>
232
- <filename>measure.rb</filename>
233
- <filetype>rb</filetype>
234
- <usage_type>script</usage_type>
235
- <checksum>8CD1FEE7</checksum>
226
+ <filename>external_model_test.osm</filename>
227
+ <filetype>osm</filetype>
228
+ <usage_type>test</usage_type>
229
+ <checksum>637A1436</checksum>
230
+ </file>
231
+ <file>
232
+ <filename>measure_test.osw</filename>
233
+ <filetype>osw</filetype>
234
+ <usage_type>test</usage_type>
235
+ <checksum>F5FABCCF</checksum>
236
236
  </file>
237
237
  <file>
238
238
  <filename>merge_spaces_from_external_file_test.rb</filename>
data/lib/measures/radiance_measure/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
1
+ OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
2
2
 
3
3
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4
4
 
data/lib/measures/radiance_measure/measure.rb CHANGED
@@ -196,7 +196,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
196
196
  'Site Sky Diffuse Solar Radiation Luminous Efficacy',
197
197
  'Site Beam Solar Radiation Luminous Efficacy',
198
198
  'Zone People Occupant Count',
199
- 'Zone Lights Electric Power'
199
+ 'Zone Lights Electricity Rate'
200
200
  ]
201
201
 
202
202
  output_variables.each do |var|
@@ -1649,11 +1649,11 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
1649
1649
  end
1650
1650
 
1651
1651
  # get lights schedule for zone
1652
- lightsTimeseries = sqlFile.timeSeries('Run Period 1'.upcase, 'Hourly', 'Zone Lights Electric Power', thermalZone.name.get.upcase)
1652
+ lightsTimeseries = sqlFile.timeSeries('Run Period 1'.upcase, 'Hourly', 'Zone Lights Electricity Rate', thermalZone.name.get.upcase)
1653
1653
 
1654
1654
  if lightsTimeseries.empty?
1655
1655
  newname = thermalZone.name.get.sub(/^OS:/, '')
1656
- print_statement("Cannot find timeseries 'Zone Lights Electric Power' for ThermalZone '#{thermalZone.name}', skipping.", runner)
1656
+ print_statement("Cannot find timeseries 'Zone Lights Electricity Rate' for ThermalZone '#{thermalZone.name}', skipping.", runner)
1657
1657
  next
1658
1658
  end
1659
1659