Merge pull request #116 from NREL/develop

Version 0.7.0
NREL · Nov 30, 2022 · e43109d · e43109d
2 parents 584f2f7 + 147ba47
commit e43109d
Show file tree

Hide file tree

Showing 20 changed files with 896 additions and 677 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # OpenStudio Model Articulation Gems
 
+## Version 0.7.0
+* Support for OpenStudio 3.5 (upgrade to standards gem 0.3.0, extension gem 0.6.0)
+* Adding Courthouse and College buidling type argument values to `create_DOE_prototype_building` measure
+* Adding 90.1-2019 to templlate argument values for `create_DOE_prototype_building` measure
+* Fixed [#109]( https://github.com/NREL/openstudio-model-articulation-gem/pull/109 ), Floorspace js translation
+
 ## 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.
 

diff --git a/Gemfile b/Gemfile
@@ -11,12 +11,6 @@ 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'

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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:

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.7.0          | 3.5      | 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    |

diff --git a/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.xml b/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>set_interior_walls_and_floors_to_adiabatic</name>
   <uid>78cbde97-d7c4-425f-ab74-5053a681cc4b</uid>
-  <version_id>4ceba5f6-8f6f-4969-848c-0e5ffbfdfe75</version_id>
-  <version_modified>20220505T182932Z</version_modified>
+  <version_id>11f61180-4855-4378-b74a-e23aea799983</version_id>
+  <version_modified>20221129T233238Z</version_modified>
   <xml_checksum>1E963D9C</xml_checksum>
   <class_name>SetInteriorWallsAndFloorsToAdiabatic</class_name>
   <display_name>SetInteriorWallsAndFloorsToAdiabatic</display_name>
@@ -76,7 +76,7 @@
       <filename>SetInteriorWallsAndFloorsToSelectedConstruction_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>55AAC4F2</checksum>
+      <checksum>B939F385</checksum>
     </file>
   </files>
 </measure>
diff --git a/...orWallsAndFloorsToAdiabatic/tests/SetInteriorWallsAndFloorsToSelectedConstruction_Test.rb b/...orWallsAndFloorsToAdiabatic/tests/SetInteriorWallsAndFloorsToSelectedConstruction_Test.rb
@@ -64,7 +64,7 @@ def test_SetInteriorWallsAndFloorsToAdiabatic
     # set argument values to good values and run the measure on model with spaces
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
     construction = arguments[0].clone
-    assert(construction.setValue('Air Wall'))
+    assert(construction.setValue('000_Exterior Wall'))
     argument_map['construction'] = construction
     measure.run(model, runner, argument_map)
     result = runner.result

diff --git a/lib/measures/SetInteriorWallsToSelectedConstruction/measure.xml b/lib/measures/SetInteriorWallsToSelectedConstruction/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>set_interior_walls_to_selected_construction</name>
   <uid>e3d59d0d-1ce8-4cb2-ae59-001f0fa2ac46</uid>
-  <version_id>bb0dd052-2f62-49ef-8e20-2e9c39786802</version_id>
-  <version_modified>20220505T182927Z</version_modified>
+  <version_id>4c76d2a5-e9f2-45d5-bfa9-3676cb4e3afe</version_id>
+  <version_modified>20221129T233202Z</version_modified>
   <xml_checksum>1E963D9C</xml_checksum>
   <class_name>SetInteriorWallsToSelectedConstruction</class_name>
   <display_name>SetInteriorWallsToSelectedConstruction</display_name>
@@ -76,7 +76,7 @@
       <filename>SetInteriorWallstoSelectedConstruction_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>17B7EFF1</checksum>
+      <checksum>6031E729</checksum>
     </file>
   </files>
 </measure>
diff --git a/...tInteriorWallsToSelectedConstruction/tests/SetInteriorWallstoSelectedConstruction_Test.rb b/...tInteriorWallsToSelectedConstruction/tests/SetInteriorWallstoSelectedConstruction_Test.rb
@@ -64,7 +64,7 @@ def test_SetInteriorWallsToSelectedConstruction
     # set argument values to good values and run the measure on model with spaces
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
     construction = arguments[0].clone
-    assert(construction.setValue('Air Wall'))
+    assert(construction.setValue('000_Exterior Wall'))
     argument_map['construction'] = construction
     measure.run(model, runner, argument_map)
     result = runner.result

diff --git a/lib/measures/add_empd_material_properties/measure.rb b/lib/measures/add_empd_material_properties/measure.rb
@@ -65,7 +65,7 @@ def arguments(model)
     args = OpenStudio::Measure::OSArgumentVector.new
 
     # find the available materials
-    list_materials = model.getMaterials
+    list_materials = model.getStandardOpaqueMaterials
     mat_names = []
     list_materials.each do |v|
       mat_names.append(v.name.to_s)
@@ -193,7 +193,7 @@ def run(model, runner, user_arguments)
     #---------------------------------------------------------------------------
 
     # Get os object for selected material
-    mats = model.getMaterials
+    mats = model.getStandardOpaqueMaterials
     mat = ''
     mats.each do |m|
       if m.name.to_s == selected_material

diff --git a/lib/measures/add_empd_material_properties/measure.xml b/lib/measures/add_empd_material_properties/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>add_empd_material_properties</name>
   <uid>91799c24-d81e-42eb-a458-f2b3a0ee1ff3</uid>
-  <version_id>74e7a9c8-62dd-4f8b-ad26-f28fa0408982</version_id>
-  <version_modified>20210814T063318Z</version_modified>
+  <version_id>6f4bf017-c022-4174-8eca-acf979f14354</version_id>
+  <version_modified>20221129T234556Z</version_modified>
   <xml_checksum>9EF0A36D</xml_checksum>
   <class_name>AddEMPDMaterialProperties</class_name>
   <display_name>Add EMPD Material Properties</display_name>
@@ -174,17 +174,6 @@
       <usage_type>license</usage_type>
       <checksum>A21A3ED2</checksum>
     </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>3.0.0</identifier>
-        <min_compatible>3.0.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>96F39314</checksum>
-    </file>
     <file>
       <filename>README.md</filename>
       <filetype>md</filetype>
@@ -197,5 +186,16 @@
       <usage_type>test</usage_type>
       <checksum>360B75F1</checksum>
     </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>3.0.0</identifier>
+        <min_compatible>3.0.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>DF9BE58D</checksum>
+    </file>
   </files>
 </measure>
diff --git a/lib/measures/create_DOE_prototype_building/measure.rb b/lib/measures/create_DOE_prototype_building/measure.rb
@@ -79,6 +79,8 @@ def arguments(model)
     building_type_chs << 'LargeDataCenterLowITE'
     building_type_chs << 'SmallDataCenterHighITE'
     building_type_chs << 'SmallDataCenterLowITE'
+    building_type_chs << 'Courthouse'
+    building_type_chs << 'College'
     building_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('building_type', building_type_chs, true)
     building_type.setDisplayName('Building Type.')
     building_type.setDefaultValue('SmallOffice')
@@ -94,6 +96,7 @@ def arguments(model)
     template_chs << '90.1-2010'
     template_chs << '90.1-2013'
     template_chs << '90.1-2016'
+    template_chs << '90.1-2019'
     template_chs << 'NECB 2011'
     template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', template_chs, true)
     template.setDisplayName('Template.')