Merge pull request #106 from NREL/develop

Fixing something that I broke in 0.6.0 release
NREL · May 12, 2022 · 584f2f7 · 584f2f7
2 parents 3bb93db + 4e25914
commit 584f2f7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # OpenStudio Model Articulation Gems
 
+## Version 0.6.1
+* 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.
+
 ## 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

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ bundle exec rake openstudio:test_with_openstudio
 
 |OpenStudio Model Articulation Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
-| 0.6.0          | 3.4      | 2.7    |
+| 0.6.0 - 0.6.1  | 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    |

diff --git a/lib/measures/blended_space_type_from_model/measure.rb b/lib/measures/blended_space_type_from_model/measure.rb
@@ -201,10 +201,6 @@ def run(model, runner, user_arguments)
     model.getSpaceTypes.sort.each do |space_type|
       next if space_type.floorArea == 0
 
-      # assign blend out building and space type standards (after update in ext gem can be removed here)
-      space_type.setStandardsBuildingType('Blend')
-      space_type.setStandardsSpaceType('Blend')
-
       floor_area_si = 0
       # loop through spaces so I can skip if not included in floor area
       space_type.spaces.each do |space|

diff --git a/lib/measures/blended_space_type_from_model/measure.xml b/lib/measures/blended_space_type_from_model/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>blended_space_type_from_model</name>
   <uid>667c2f1f-0927-4dbd-a7be-1087b5c15181</uid>
-  <version_id>db1f44c5-9a13-450e-aa39-3a64b755d13d</version_id>
-  <version_modified>20220505T182932Z</version_modified>
+  <version_id>68180f3a-0d37-4921-8eea-baab050bb62b</version_id>
+  <version_modified>20220512T054947Z</version_modified>
   <xml_checksum>28AD5222</xml_checksum>
   <class_name>BlendedSpaceTypeFromModel</class_name>
   <display_name>Blended Space Type from Model</display_name>
@@ -153,7 +153,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>BD6EC5A7</checksum>
+      <checksum>556BD210</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/openstudio/model_articulation/version.rb b/lib/openstudio/model_articulation/version.rb
@@ -35,6 +35,6 @@
 
 module OpenStudio
   module ModelArticulation
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end