openstudio-model-articulation 0.3.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c5bcb07416106fe61980acd3e210ece468d45963aa7e3aa8b4fda084653564
-  data.tar.gz: 20262b87740ed3c3919b410cfb737082fe58f3378e14c6eceaeb67e1fe1586d1
+  metadata.gz: 6e4a8ca5bd1a4d319fece164759f13bb32c326b6de0da69088c0d848c5fff6d4
+  data.tar.gz: 32b16197235bc5a1e5b79d9afa31b5db7e2107ad577bea982f71a1fecefb1835
 SHA512:
-  metadata.gz: bf0db0301f4a11a7a778c1e5eb1d164dfc348fafe40e4e757a5e13867b1e53e3de37c4eeb8427982b9c274f532d1885d115e5ca8877722b629e617741149e37c
-  data.tar.gz: 280a09fd5229b5769a2e9b0698aa85a6abf7de45acd45c0cf6045a739f298e255f86ff69f7d11eeeb3184d9c0e28450d0ecb76218eb696e9b84f5c30cfcc8e1b
+  metadata.gz: 1f9554f9825cd4423651324b1cff0c7fe0001a1fef16391d24c32bc1ae51c18b10037caa61fe0a9fa85aa23ff10698977d3d7bd45f7e60107b31bfb758415a40
+  data.tar.gz: f16d2ad5b3f2d03c0014480b4599f1f0823f5af56bddfaa36dc1d102b00e556ecae682d6ceefb390e25af0bc0a944db482eea437dc928acf8ca8236e4570f147

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   Exclude:
     - 'spec/test_measures/**/*'
+require: rubocop-performance
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # OpenStudio Model Articulation Gems
 
+## Version 0.6.0
+* Support for OpenStudio 3.4 (upgrade to standards gem 0.2.16, no extension gem upgrade)
+* Fixed [#92]( https://github.com/NREL/openstudio-model-articulation-gem/issues/92 ), SetWindowToWallRatio triangulation can produce non-planar surfaces
+* Fixed [#94]( https://github.com/NREL/openstudio-model-articulation-gem/pull/94 ), fix SetWindowToWallRatio triangulation
+* 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
+* Fixed [#98]( https://github.com/NREL/openstudio-model-articulation-gem/pull/98 ), Radiance Daylighting Measure - Update measure.rb
+* Fixed [#101]( https://github.com/NREL/openstudio-model-articulation-gem/pull/101 ), setting building and space type standard to Blend
+
+## Version 0.5.0
+* Support for OpenStudio 3.3 (upgrade to extension gem 0.5.1 and standards gem 0.2.15)
+* Fixed [#73]( https://github.com/NREL/openstudio-model-articulation-gem/pull/73 ), added add_empd_material_properties measure contributed by GFlechas
+* Fixed [#83]( https://github.com/NREL/openstudio-model-articulation-gem/pull/83 ), adding compatibility matrix and contribution policy
+* Fixed [#85]( https://github.com/NREL/openstudio-model-articulation-gem/pull/85 ), For SetWindowToWallRatioByFacade fixed rectangle tol and pre-split at door remove windows
+
+## Version 0.4.1
+
+* Support for OpenStudio 3.2.1 (upgrade to extension gem 0.4.3 and standards gem 0.2.14)
+* update to use rubocop_v4
+* Documentation update to some measures
+* Setting up webhook for https://bcl2.nrel.gov
+
+## Version 0.4.0
+
+* Support Ruby ~> 2.7
+* Support for OpenStudio 3.2 (upgrade to extension gem 0.4.2 and standards gem 0.2.13)
+* Support for ASHRAE 90.1 2016 for DOE prototype measure
+* Support for ASHRAE 90.1 216 and 2019 for measures that pull templates from extension gem. This includes but is not limited to DOE create_bar, create_typical, and space type and construction set wizard measures.
+
 ## Version 0.3.1
 
 * Bump openstudio-extension-gem version to 0.3.2 to support updated workflow-gem

data/Gemfile

@@ -11,6 +11,12 @@ gemspec
 # checkout the latest version (develop) from github.
 allow_local = ENV['FAVOR_LOCAL_GEMS']
 
+# uncomment when you want CI to use develop branch of extension gem
+#gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
+
+# uncomment when you want CI to use develop branch of openstudio-standards gem
+#gem 'openstudio-standards', github: 'NREL/OpenStudio-standards', branch: 'master'
+
 # Only uncomment if you need to test a different version of the extension gem
 # if allow_local && File.exist?('../OpenStudio-extension-gem')
 #   gem 'openstudio-extension', path: '../OpenStudio-extension-gem'

data/Jenkinsfile

@@ -8,3 +8,4 @@ if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
   openstudio_extension_gems()
     
 }
+

data/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/README.md

@@ -47,16 +47,35 @@ bundle exec rake openstudio:test_with_openstudio
 /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/'
 ```
 
+# Compatibility Matrix
+
+|OpenStudio Model Articulation Gem|OpenStudio|Ruby|
+|:--------------:|:----------:|:--------:|
+| 0.6.0          | 3.4      | 2.7    |
+| 0.5.0          | 3.3      | 2.7    |
+| 0.4.0 - 0.4.2  | 3.2      | 2.7    |
+| 0.3.0 - 0.3.1  | 3.1      | 2.5    |
+| 0.2.0 - 0.2.1  | 3.0      | 2.5    |
+| 0.1.1 and below | 2.9 and below      | 2.2.4    |
+
+# Contributing 
+
+Please review the [OpenStudio Contribution Policy](https://openstudio.net/openstudio-contribution-policy) if you would like to contribute code to this gem.
+
 ## TODO
 
-- [ ] Move articulation measures from openstudio-measures
-- [ ] Move articulation measure lib files to openstudio-extension lib
+- [x] Move articulation measures from openstudio-measures
+- [x] Move articulation measure lib files to openstudio-extension lib
 - [ ] Update measures to correct naming conventions 
 
 # Releasing
 
 * Update CHANGELOG.md
-* Run `rake rubocop:auto_correct`
+* Run `rake openstudio:rubocop:auto_correct`
+* Run `rake openstudio:update_copyright`
+* Run `rake openstudio:update_measures` (this has to be done last since prior tasks alter measure files)
+* Update version in `readme.md`
+* Update version in `openstudio-model-articulation.gemspec`
 * Update version in `/lib/openstudio/model_articulation/version.rb`
 * Create PR to master, after tests and reviews complete, then merge
 * Locally - from the master branch, run `rake release`

data/doc_templates/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/doc_templates/copyright_erb.txt

@@ -1,6 +1,6 @@
 <%
   # *******************************************************************************
-  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
   # All rights reserved.
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions are met:

data/doc_templates/copyright_js.txt

@@ -1,4 +1,4 @@
 /* @preserve
- * OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+ * OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license.
 */

data/doc_templates/copyright_ruby.txt

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/AssignConstructionSetToBuilding/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/AssignConstructionSetToBuilding/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/AssignConstructionSetToBuilding/measure.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>assign_construction_set_to_building</name>
   <uid>6e68ddea-2cff-47a3-9daf-f2189e4cf132</uid>
-  <version_id>7d0a6fbc-4921-4fa8-bdc2-081108e9d60e</version_id>
-  <version_modified>20200229T024044Z</version_modified>
+  <version_id>497da6f8-f10e-4c93-b5de-6d46027f0119</version_id>
+  <version_modified>20220505T182919Z</version_modified>
   <xml_checksum>1E963D9C</xml_checksum>
   <class_name>AssignConstructionSetToBuilding</class_name>
   <display_name>AssignConstructionSetToBuilding</display_name>
@@ -16,17 +17,17 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>&lt;clear field></default_value>
+      <default_value>{366b719d-cdcd-403e-82f2-1ff5eb23d1b8}</default_value>
       <choices>
         <choice>
-          <value>{96f339b3-3b1a-4d56-9da8-e8b682a5cf14}</value>
-          <display_name>&lt;clear field></display_name>
+          <value>{366b719d-cdcd-403e-82f2-1ff5eb23d1b8}</value>
+          <display_name>&lt;clear field&gt;</display_name>
         </choice>
       </choices>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Opaque</tag>
   </tags>
@@ -70,19 +71,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>6539FFE0</checksum>
-    </file>
-    <file>
-      <filename>AssignConstructionSetToBuilding_Test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>1FCB8918</checksum>
+      <checksum>40E5CA19</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
+    </file>
+    <file>
+      <filename>AssignConstructionSetToBuilding_Test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EAEB5017</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/AssignSpaceTypeBySpaceName/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/AssignSpaceTypeBySpaceName/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/AssignSpaceTypeBySpaceName/measure.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>assign_space_type_by_space_name</name>
   <uid>69ad41bb-cdfe-4a4c-a385-9efaf35b7c27</uid>
-  <version_id>86949250-e3fb-44cd-983a-6a5cf4cf28dd</version_id>
-  <version_modified>20200229T024056Z</version_modified>
+  <version_id>e60a2200-a654-4e1c-95fb-b19533ffb96b</version_id>
+  <version_modified>20220505T182934Z</version_modified>
   <xml_checksum>057E8D9D</xml_checksum>
   <class_name>AssignSpaceTypeBySpaceName</class_name>
   <display_name>AssignSpaceTypeBySpaceName</display_name>
@@ -23,11 +24,11 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>&lt;clear field></default_value>
+      <default_value>{ef3c55b4-9cb7-451d-8c82-00a6d685c59f}</default_value>
       <choices>
         <choice>
-          <value>{750d43f2-e137-4a44-8b11-f37816ad36b5}</value>
-          <display_name>&lt;clear field></display_name>
+          <value>{ef3c55b4-9cb7-451d-8c82-00a6d685c59f}</value>
+          <display_name>&lt;clear field&gt;</display_name>
         </choice>
       </choices>
     </argument>
@@ -50,8 +51,8 @@
       </choices>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Whole Building.Space Types</tag>
   </tags>
@@ -95,19 +96,37 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>09E97413</checksum>
+      <checksum>6A6F122F</checksum>
+    </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <filename>AssignSpaceTypeBySpaceName_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>A62C6900</checksum>
+      <checksum>4302B4E5</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <filename>ImportedIdf_TestModel/project.log</filename>
+      <filetype>log</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6D480771</checksum>
+    </file>
+    <file>
+      <filename>ImportedIdf_TestModel/run.db</filename>
+      <filetype>db</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BF4974CA</checksum>
+    </file>
+    <file>
+      <filename>ImportedIdf_TestModel/project.osp</filename>
+      <filetype>osp</filetype>
+      <usage_type>test</usage_type>
+      <checksum>19B74631</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/AssignSpaceTypeToBuilding/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/AssignSpaceTypeToBuilding/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/AssignSpaceTypeToBuilding/measure.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>assign_space_type_to_building</name>
   <uid>05e20922-6fe4-48a4-bddb-411f8167e757</uid>
-  <version_id>27d55f6d-a2a6-4842-8062-24a15045d1d6</version_id>
-  <version_modified>20200229T024044Z</version_modified>
+  <version_id>affc7390-ec3e-41fb-a814-adc09ac4ab80</version_id>
+  <version_modified>20220505T182919Z</version_modified>
   <xml_checksum>057E8D9D</xml_checksum>
   <class_name>AssignSpaceTypeToBuilding</class_name>
   <display_name>AssignSpaceTypeToBuilding</display_name>
@@ -16,17 +17,17 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>&lt;clear field></default_value>
+      <default_value>{045b3260-33ad-451f-9c68-f8e75c422740}</default_value>
       <choices>
         <choice>
-          <value>{fdc29a03-de66-47a1-9874-c307c8fc87dc}</value>
-          <display_name>&lt;clear field></display_name>
+          <value>{045b3260-33ad-451f-9c68-f8e75c422740}</value>
+          <display_name>&lt;clear field&gt;</display_name>
         </choice>
       </choices>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Whole Building.Space Types</tag>
   </tags>
@@ -70,19 +71,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>4FFBDBB2</checksum>
-    </file>
-    <file>
-      <filename>AssignSpaceTypeToBuilding_Test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>11BF4055</checksum>
+      <checksum>C904ACC5</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
+    </file>
+    <file>
+      <filename>AssignSpaceTypeToBuilding_Test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E998ED20</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/AssignSpacesToStories/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/AssignSpacesToStories/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -72,10 +72,8 @@ class AssignSpacesToStories < OpenStudio::Measure::ModelMeasure
     def getStoryForNominalZCoordinate(model, minz)
       model.getBuildingStorys.each do |story|
         z = story.nominalZCoordinate
-        if !z.empty?
-          if minz.round(2) == z.get.round(2)
-            return story
-          end
+        if !z.empty? && (minz.round(2) == z.get.round(2))
+          return story
         end
       end
 

data/lib/measures/AssignSpacesToStories/measure.xml

@@ -1,17 +1,18 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>assign_spaces_to_stories</name>
   <uid>2c91fe40-db31-4334-a1dd-817cd419f1b6</uid>
-  <version_id>22a0bea4-3fec-487a-b335-1af6de435dc5</version_id>
-  <version_modified>20200229T024057Z</version_modified>
+  <version_id>4e02a25e-c2d0-4dbe-8359-0cc52c0d0930</version_id>
+  <version_modified>20220505T182936Z</version_modified>
   <xml_checksum>45097B60</xml_checksum>
   <class_name>AssignSpacesToStories</class_name>
   <display_name>AssignSpacesToStories</display_name>
   <description>This measure will look as space geometry and assign each space to a story, creating new stories as necessary.</description>
   <modeler_description>If spaces are already assigned to stories, the will be left alone.</modeler_description>
-  <arguments/>
-  <outputs/>
-  <provenances/>
+  <arguments />
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Form</tag>
   </tags>
@@ -46,6 +47,12 @@
       <usage_type>readme</usage_type>
       <checksum>8BA985AD</checksum>
     </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -55,19 +62,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>4E95712C</checksum>
+      <checksum>F3B0D790</checksum>
     </file>
     <file>
       <filename>AssignSpacesToStories_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>7A32032F</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>2D0ACAFB</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/BarAspectRatioStudy/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/BarAspectRatioStudy/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -127,7 +127,8 @@ class BarAspectRatioStudy < OpenStudio::Measure::ModelMeasure
     end
 
     # helper to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure.
-    def neat_numbers(number, roundto = 2) # round to 0 or 2)
+    # round to 0 or 2)
+    def neat_numbers(number, roundto = 2)
       if roundto == 2
         number = format '%.2f', number
       else

data/lib/measures/BarAspectRatioStudy/measure.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>bar_aspect_ratio_study</name>
   <uid>3dcac94d-8a2e-43b6-8698-a3a4e8f3903f</uid>
-  <version_id>bc5cc57e-c161-4c4f-a411-d0719e883a45</version_id>
-  <version_modified>20200229T024052Z</version_modified>
+  <version_id>360834b1-c338-4e27-a2f8-f22268563f3d</version_id>
+  <version_modified>20220505T182927Z</version_modified>
   <xml_checksum>49BEF039</xml_checksum>
   <class_name>BarAspectRatioStudy</class_name>
   <display_name>Bar Aspect Ratio Study</display_name>
@@ -81,8 +82,8 @@
       </choices>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Form</tag>
   </tags>
@@ -125,7 +126,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -136,13 +137,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>741408BD</checksum>
+      <checksum>1B314685</checksum>
     </file>
     <file>
       <filename>BarAspectRatioStudy_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>3311CA6D</checksum>
+      <checksum>92B6A007</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/CleanupSpaceOrigins/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/CleanupSpaceOrigins/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -94,6 +94,7 @@ class CleanupSpaceOrigins < OpenStudio::Measure::ModelMeasure
     # do spaces first as these may contain other groups
     model.getSpaces.each do |space|
       next if !runner.inSelection(space)
+
       cleanup_group(space)
 
       space.shadingSurfaceGroups.each do |group|
@@ -108,12 +109,14 @@ class CleanupSpaceOrigins < OpenStudio::Measure::ModelMeasure
     # now do shading surfaces
     model.getShadingSurfaceGroups.each do |group|
       next if !runner.inSelection(group)
+
       cleanup_group(group)
     end
 
     # now do interior partition surface groups
     model.getInteriorPartitionSurfaceGroups.each do |group|
       next if !runner.inSelection(group)
+
       cleanup_group(group)
     end