Merge pull request #71 from NREL/develop

Prep release 0.4.0
NREL · Apr 23, 2021 · ae85bfc · ae85bfc
2 parents 6f0e15a + a730cb2
commit ae85bfc
Show file tree

Hide file tree

Showing 230 changed files with 3,347 additions and 25,988 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # OpenStudio Model Articulation Gems
 
+## 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

diff --git a/Gemfile b/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'

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,3 +8,4 @@ if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
   openstudio_extension_gems()
 
 }
+
diff --git a/LICENSE.md b/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:

diff --git a/doc_templates/LICENSE.md b/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:

diff --git a/doc_templates/copyright_erb.txt b/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:

diff --git a/doc_templates/copyright_js.txt b/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.
 */
diff --git a/doc_templates/copyright_ruby.txt b/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:

diff --git a/lib/measures/AssignConstructionSetToBuilding/LICENSE.md b/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:

diff --git a/lib/measures/AssignConstructionSetToBuilding/measure.rb b/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:

diff --git a/lib/measures/AssignConstructionSetToBuilding/measure.xml b/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>44de5d16-ee07-4122-bfd2-9b488da700f9</version_id>
+  <version_modified>20210423T142509Z</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>{27349627-8827-46b4-80f7-4f0731404a8c}</default_value>
       <choices>
         <choice>
-          <value>{96f339b3-3b1a-4d56-9da8-e8b682a5cf14}</value>
-          <display_name>&lt;clear field></display_name>
+          <value>{27349627-8827-46b4-80f7-4f0731404a8c}</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>
+      <checksum>40E5CA19</checksum>
     </file>
     <file>
       <filename>AssignConstructionSetToBuilding_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>1FCB8918</checksum>
+      <checksum>51FB4344</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AssignConstructionSetToBuilding/tests/AssignConstructionSetToBuilding_Test.rb b/lib/measures/AssignConstructionSetToBuilding/tests/AssignConstructionSetToBuilding_Test.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:

diff --git a/lib/measures/AssignSpaceTypeBySpaceName/LICENSE.md b/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:

diff --git a/lib/measures/AssignSpaceTypeBySpaceName/measure.rb b/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:

diff --git a/lib/measures/AssignSpaceTypeBySpaceName/measure.xml b/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>b6bc9d20-d8d1-4319-8cd1-c9e9afdb9773</version_id>
+  <version_modified>20210423T142509Z</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>{12c3c432-4def-4ca1-bfc7-8cecc9e88d88}</default_value>
       <choices>
         <choice>
-          <value>{750d43f2-e137-4a44-8b11-f37816ad36b5}</value>
-          <display_name>&lt;clear field></display_name>
+          <value>{12c3c432-4def-4ca1-bfc7-8cecc9e88d88}</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,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>09E97413</checksum>
+      <checksum>6A6F122F</checksum>
     </file>
     <file>
       <filename>AssignSpaceTypeBySpaceName_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>A62C6900</checksum>
+      <checksum>EA4BB066</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AssignSpaceTypeBySpaceName/tests/AssignSpaceTypeBySpaceName_Test.rb b/lib/measures/AssignSpaceTypeBySpaceName/tests/AssignSpaceTypeBySpaceName_Test.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:

diff --git a/lib/measures/AssignSpaceTypeToBuilding/LICENSE.md b/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:

diff --git a/lib/measures/AssignSpaceTypeToBuilding/measure.rb b/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:

diff --git a/lib/measures/AssignSpaceTypeToBuilding/measure.xml b/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>0ca1ef7f-22e8-4e62-b013-a4d40186aeb0</version_id>
+  <version_modified>20210423T142509Z</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>{4d195512-5588-4038-a932-f9e242e346a6}</default_value>
       <choices>
         <choice>
-          <value>{fdc29a03-de66-47a1-9874-c307c8fc87dc}</value>
-          <display_name>&lt;clear field></display_name>
+          <value>{4d195512-5588-4038-a932-f9e242e346a6}</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>
+      <checksum>C904ACC5</checksum>
     </file>
     <file>
       <filename>AssignSpaceTypeToBuilding_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>11BF4055</checksum>
+      <checksum>0DA553E5</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AssignSpaceTypeToBuilding/tests/AssignSpaceTypeToBuilding_Test.rb b/lib/measures/AssignSpaceTypeToBuilding/tests/AssignSpaceTypeToBuilding_Test.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:

diff --git a/lib/measures/AssignSpacesToStories/LICENSE.md b/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:

diff --git a/lib/measures/AssignSpacesToStories/measure.rb b/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:

diff --git a/lib/measures/AssignSpacesToStories/measure.xml b/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>6f11b9e3-a0c0-4624-8270-e6989aa85b98</version_id>
+  <version_modified>20210423T142509Z</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>
@@ -55,19 +56,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>4E95712C</checksum>
+      <checksum>43120824</checksum>
     </file>
     <file>
       <filename>AssignSpacesToStories_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>7A32032F</checksum>
+      <checksum>D0D1E059</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AssignSpacesToStories/tests/AssignSpacesToStories_Test.rb b/lib/measures/AssignSpacesToStories/tests/AssignSpacesToStories_Test.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:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@ if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
		openstudio_extension_gems()

		}