Merge pull request #157 from NREL/3.7.0-rc1

initial setup for branch for OS 3.7
NREL · Dec 14, 2023 · 5be24c8 · 5be24c8
2 parents 0e3558c + 20b65de
commit 5be24c8
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 225 deletions.
diff --git a/.github/workflows/test_with_openstudio.yml b/.github/workflows/test_with_openstudio.yml
@@ -17,7 +17,7 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     container:
-      image: nrel/openstudio:3.5.1
+      image: nrel/openstudio:3.7.0
 
     steps:
       - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # OpenStudio Common Measures Gem
 
+## Version 0.9.0
+
+- Support for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.7)
+- Fixed [#140]( https://github.com/NREL/openstudio-common-measures-gem/issues/140 ), XcelEDAReportingandQAQC failing on 3.6.0 and CI issue with 3.5.1 measure
+
 ## Version 0.8.0
 
 - Support for OpenStudio 3.6 (upgrade to standards gem 0.4.0, extension gem 0.6.1)

diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ bundle exec rake openstudio:test_with_openstudio
 
 |OpenStudio Common Measures Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.9.0         | 3.7      | 2.7    |
 | 0.8.0         | 3.6      | 2.7    |
 | 0.7.0         | 3.5      | 2.7    |
 | 0.6.0 - 0.6.1 | 3.4      | 2.7    |

diff --git a/lib/measures/XcelEDAReportingandQAQC/measure.xml b/lib/measures/XcelEDAReportingandQAQC/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>xcel_eda_reportingand_qaqc</name>
   <uid>92bee759-86ae-4617-92e2-f8e5aa9dc684</uid>
-  <version_id>1fbb6bad-30d2-4d7b-8202-9bffacab9a27</version_id>
-  <version_modified>20230606T063314Z</version_modified>
+  <version_id>ee4dabcc-8247-4671-a7a2-50b7302e36f2</version_id>
+  <version_modified>2023-11-28T19:09:56Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>XcelEDAReportingandQAQC</class_name>
   <display_name>XcelEDAReportingandQAQC</display_name>
@@ -29,29 +29,17 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>0116_OfficeTest121_dev.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>63E36762</checksum>
-    </file>
-    <file>
-      <filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
-      <filetype>epw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>BDF687C1</checksum>
-    </file>
-    <file>
-      <filename>FuelSwap.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>0331B57B</checksum>
-    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>9640B6CB</checksum>
+      <checksum>BFFB1AA6</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>2313289F</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>
@@ -60,57 +48,69 @@
       <checksum>703C9964</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>2313289F</checksum>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>2.0.0</identifier>
+        <min_compatible>3.6.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>9F3C9614</checksum>
     </file>
     <file>
-      <filename>UnmetHrs.rb</filename>
+      <filename>CreateResults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>A57CD713</checksum>
+      <checksum>6C13695C</checksum>
     </file>
     <file>
       <filename>EUI.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>5048D687</checksum>
+      <checksum>26507097</checksum>
     </file>
     <file>
-      <filename>XcelEDAReportingandQAQC_Test.rb</filename>
+      <filename>EndUseBreakdown.rb</filename>
       <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>92CFA4EC</checksum>
+      <usage_type>resource</usage_type>
+      <checksum>3D03A79A</checksum>
     </file>
     <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>2.0.0</identifier>
-        <min_compatible>3.6.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
+      <filename>FuelSwap.rb</filename>
       <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>1A411884</checksum>
+      <usage_type>resource</usage_type>
+      <checksum>A762BB1E</checksum>
     </file>
     <file>
       <filename>PeakHeatCoolMonth.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>BF7DA333</checksum>
+      <checksum>0D95CAA2</checksum>
     </file>
     <file>
-      <filename>EndUseBreakdown.rb</filename>
+      <filename>UnmetHrs.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>40551D0D</checksum>
+      <checksum>144A1BBA</checksum>
     </file>
     <file>
-      <filename>CreateResults.rb</filename>
+      <filename>0116_OfficeTest121_dev.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>63E36762</checksum>
+    </file>
+    <file>
+      <filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
+      <filetype>epw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BDF687C1</checksum>
+    </file>
+    <file>
+      <filename>XcelEDAReportingandQAQC_Test.rb</filename>
       <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>C1E641AA</checksum>
+      <usage_type>test</usage_type>
+      <checksum>A33FAF92</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/XcelEDAReportingandQAQC/resources/CreateResults.rb b/lib/measures/XcelEDAReportingandQAQC/resources/CreateResults.rb
@@ -268,6 +268,7 @@ def create_results(skip_weekends = true,
       OpenStudio::EndUseFuelType.new('OtherFuel_2').value => OpenStudio::FuelType.new('OtherFuel_2'), 
       OpenStudio::EndUseFuelType.new('DistrictCooling').value => OpenStudio::FuelType.new('DistrictCooling'),
       OpenStudio::EndUseFuelType.new('DistrictHeating').value => OpenStudio::FuelType.new('DistrictHeating'),
+      OpenStudio::EndUseFuelType.new('DistrictHeatingSteam').value => OpenStudio::FuelType.new('DistrictHeatingSteam'),
       OpenStudio::EndUseFuelType.new('Water').value => OpenStudio::FuelType.new('Water')
     }
 
@@ -285,6 +286,7 @@ def create_results(skip_weekends = true,
       OpenStudio::EndUseFuelType.new('OtherFuel_2').value => 'other_fuel_2',
       OpenStudio::EndUseFuelType.new('DistrictCooling').value => 'district_cooling',
       OpenStudio::EndUseFuelType.new('DistrictHeating').value => 'district_heating',
+      OpenStudio::EndUseFuelType.new('DistrictHeatingSteam').value => 'district_heating_steam',
       OpenStudio::EndUseFuelType.new('Water').value => 'water'
     }