Merge pull request #89 from NREL/for_0_5_0_release

For 0 5 0 release
NREL · Nov 10, 2021 · 0ad5ecd · 0ad5ecd
2 parents 8c53a39 + b8e80ec
commit 0ad5ecd
Show file tree

Hide file tree

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

diff --git a/Gemfile b/Gemfile
@@ -12,10 +12,10 @@ gemspec
 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'
+#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'
+#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')

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

diff --git a/lib/measures/create_bar_from_building_type_ratios/measure.xml b/lib/measures/create_bar_from_building_type_ratios/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>create_bar_from_building_type_ratios</name>
   <uid>6e3a14f8-c3c7-4e03-bc51-bef8a52e1a05</uid>
-  <version_id>71b66d7d-6355-4f9b-a1af-5342928775c9</version_id>
-  <version_modified>20210716T215717Z</version_modified>
+  <version_id>48c0bf21-b4c0-4755-83ae-a192dd5201cf</version_id>
+  <version_modified>20211029T200900Z</version_modified>
   <xml_checksum>2AF3A68E</xml_checksum>
   <class_name>CreateBarFromBuildingTypeRatios</class_name>
   <display_name>Create Bar From Building Type Ratios</display_name>
@@ -1682,12 +1682,6 @@
       <usage_type>license</usage_type>
       <checksum>A21A3ED2</checksum>
     </file>
-    <file>
-      <filename>create_bar_from_building_type_ratios_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E910D662</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -1711,5 +1705,11 @@
       <usage_type>readme</usage_type>
       <checksum>831A2956</checksum>
     </file>
+    <file>
+      <filename>create_bar_from_building_type_ratios_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1E066661</checksum>
+    </file>
   </files>
 </measure>
diff --git a/...s/create_bar_from_building_type_ratios/tests/create_bar_from_building_type_ratios_test.rb b/...s/create_bar_from_building_type_ratios/tests/create_bar_from_building_type_ratios_test.rb
@@ -174,7 +174,7 @@ def test_non_zero_rotation_primary_school
     # Initial area of other surface 'Surface 365' 535.72 does not equal post intersection area 593.326
     # should still fail with check of ground exposed floor or outdoor exposed roof
 
-    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, 1)
+    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, nil)
   end
 
   def test_non_zero_rotation_primary_school_adiabatic # to test intersection of just walls but not floors
@@ -188,7 +188,7 @@ def test_non_zero_rotation_primary_school_adiabatic # to test intersection of ju
     args['make_mid_story_surfaces_adiabatic'] = true
     args['bar_division_method'] = 'Multiple Space Types - Individual Stories Sliced'
 
-    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, 1)
+    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, nil)
   end
 
   def test_large_hotel_restaurant

diff --git a/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml b/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>create_bar_from_doe_building_type_ratios</name>
   <uid>0de3cff9-c805-42c4-964e-18cb43a22c63</uid>
-  <version_id>5e9da766-06e0-42e4-b006-8d9be5b6d6db</version_id>
-  <version_modified>20210716T215744Z</version_modified>
+  <version_id>b22052fe-59c2-43ce-b4eb-9685a9469847</version_id>
+  <version_modified>20211029T201024Z</version_modified>
   <xml_checksum>5F523097</xml_checksum>
   <class_name>CreateBarFromDOEBuildingTypeRatios</class_name>
   <display_name>Create Bar From DOE Building Type Ratios</display_name>
@@ -994,12 +994,6 @@
       <usage_type>license</usage_type>
       <checksum>A21A3ED2</checksum>
     </file>
-    <file>
-      <filename>create_bar_from_doe_building_type_ratios_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E28A50CE</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -1023,5 +1017,11 @@
       <usage_type>readme</usage_type>
       <checksum>7D3973D6</checksum>
     </file>
+    <file>
+      <filename>create_bar_from_doe_building_type_ratios_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>A5886CCE</checksum>
+    </file>
   </files>
 </measure>
diff --git a/..._bar_from_doe_building_type_ratios/tests/create_bar_from_doe_building_type_ratios_test.rb b/..._bar_from_doe_building_type_ratios/tests/create_bar_from_doe_building_type_ratios_test.rb
@@ -166,7 +166,7 @@ def test_non_zero_rotation_primary_school
     args['building_rotation'] = -90
     args['party_wall_stories_east'] = 2
 
-    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, 1)
+    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, nil)
   end
 
   def test_large_hotel_restaurant

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.4.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end
diff --git a/openstudio-model-articulation.gemspec b/openstudio-model-articulation.gemspec
@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '~> 2.7.0'
 
   spec.add_dependency 'bundler', '~> 2.1'
-  spec.add_dependency 'openstudio-extension', '~> 0.4.3'
-  spec.add_dependency 'openstudio-standards', '~> 0.2.14'
+  spec.add_dependency 'openstudio-extension', '~> 0.5.1'
+  spec.add_dependency 'openstudio-standards', '~> 0.2.15'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'