Merge pull request #36 from NREL/develop

merge to main for 0.5.0 release

.rubocop.yml

@@ -1,5 +1,7 @@
 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

CHANGELOG.md

@@ -1,5 +1,10 @@
 # OpenStudio EE Gem
 
+## Version 0.5.0
+* Support for OpenStudio 3.3 (upgrade to extension gem 0.5.1 and standards gem 0.2.15)
+* Fixed [#9]( https://github.com/NREL/openstudio-ee-gem/issues/9 ), nze_hvac is failing in 3.1
+* Fixed [#32]( https://github.com/NREL/openstudio-ee-gem/pull/32 ), adding compatibility matrix and contribution policy
+
 ## Version 0.4.0
 
 * Support Ruby ~> 2.7

Jenkinsfile

@@ -1,10 +1,11 @@
-//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs
-
+//Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs
+ 
 @Library('cbci_shared_libs') _
 
-// Build for PR to develop branch only.
+// Build for PR to develop branch only. 
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
 
   openstudio_extension_gems()
+
+}
 
-}

README.md

@@ -19,13 +19,20 @@ Or install it yourself as:
 
     $ gem install 'openstudio-ee-measures'
 
-## Usage
+# Compatibility Matrix
 
-To be filled out later.
+|OpenStudio EE Gem|OpenStudio|Ruby|
+|:--------------:|:----------:|:--------:|
+| 0.5.0 | 3.3      | 2.7    |
+| 0.4.0 | 3.2      | 2.7    |
+| 0.3.0 - 0.3.2  | 3.1      | 2.5    |
+| 0.2.0 - 0.2.1  | 3.0      | 2.5    |
+| 0.1.0 | 2.9     | 2.2.4    |
 
-## TODO
+# Contributing 
+
+Please review the [OpenStudio Contribution Policy](https://openstudio.net/openstudio-contribution-policy) if you would like to contribute code to this gem.
 
-- [x] Remove measures from OpenStudio-Measures to standardize on this location
 
 # Releasing
 

lib/measures/nze_hvac/measure.rb

@@ -369,7 +369,7 @@ def run(model, runner, user_arguments)
     # remove existing hvac system from model
     if remove_existing_hvac
       runner.registerInfo('Removing existing HVAC systems from the model')
-      std.remove_HVAC(model)
+      std.remove_hvac(model)
     end
 
     # exclude plenum zones, zones without thermostats, and zones with no floor area

lib/measures/nze_hvac/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>nze_hvac</name>
   <uid>f060dff2-b28d-4194-a6af-e66d88ddb33c</uid>
-  <version_id>7697ad4e-7392-40cd-aa0d-ba4163efd1c3</version_id>
-  <version_modified>20210423T162015Z</version_modified>
+  <version_id>d3dd0dce-6bc5-4626-9665-ff612d3a1e26</version_id>
+  <version_modified>20211104T165713Z</version_modified>
   <xml_checksum>0E5E4776</xml_checksum>
   <class_name>NzeHvac</class_name>
   <display_name>NZEHVAC</display_name>
@@ -319,12 +319,12 @@
       <version>
         <software_program>OpenStudio</software_program>
         <identifier>2.9.0</identifier>
-        <min_compatible>2.9.0</min_compatible>
+        <min_compatible>3.3.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>59C3DBB0</checksum>
+      <checksum>EE9C669A</checksum>
     </file>
   </files>
 </measure>

lib/openstudio/ee_measures/version.rb

@@ -37,6 +37,6 @@
 
 module OpenStudio
   module EeMeasures
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

openstudio-ee.gemspec

@@ -28,8 +28,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.2'
-  spec.add_dependency 'openstudio-standards', '~> 0.2.13'
+  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'