Merge pull request #1015 from NREL/latest-os-hpxml

Latest OS-HPXML
NREL · Feb 1, 2023 · e2ec4a1 · e2ec4a1
2 parents 09c97b7 + 6ba8f1e
commit e2ec4a1
Show file tree

Hide file tree

Showing 168 changed files with 932,014 additions and 675,038 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -11,9 +11,9 @@ jobs:
   unit-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.5.0
+      image: docker://nrel/openstudio:3.5.1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
@@ -34,17 +34,17 @@ jobs:
           bundle exec rake unit_tests:measure_tests
 
       - name: Upload feature samples
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: resources/buildstock.csv
           name: samples
 
   analysis-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.5.0
+      image: docker://nrel/openstudio:3.5.1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
@@ -57,7 +57,7 @@ jobs:
           bundle exec rake workflow:analysis_tests
 
       - name: Upload run_analysis.rb results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: |
             project_national/results-Baseline.csv
@@ -69,13 +69,13 @@ jobs:
   integration-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
       - name: Run buildstockbatch
         run: |
-          pip install git+https://github.com/NREL/buildstockbatch.git@v2022.12.0
+          pip install git+https://github.com/NREL/buildstockbatch.git@v2023.01.0
           
           buildstock_docker project_national/national_baseline.yml
           buildstock_docker project_testing/testing_baseline.yml
@@ -107,22 +107,22 @@ jobs:
           python test/util.py
 
       - name: Upload integration results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: |
             baseline
             upgrades
           name: results
 
       - name: Upload output files
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: |
             outputs
           name: outputs
 
       - name: Upload buildstockbatch results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: |
             project_national/national_baseline/results_csvs/results_up00.csv
@@ -135,18 +135,18 @@ jobs:
     runs-on: ubuntu-latest
     needs: [unit-tests, analysis-tests, integration-tests]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
       - name: Download buildstockbatch results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: buildstockbatch
           name: buildstockbatch
 
       - name: Download run_analysis results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: run_analysis
           name: run_analysis
@@ -160,34 +160,34 @@ jobs:
     runs-on: ubuntu-latest
     needs: [unit-tests, analysis-tests, integration-tests]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.base.sha }}
 
       - name: Upload base results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: test/base_results
           name: base_results
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Download base results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: base_results
           name: base_results
 
       - name: Download feature samples
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: samples
           name: samples
 
       - name: Download feature results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: results
           name: results
@@ -232,7 +232,7 @@ jobs:
           python test/compare.py -a timeseries -b base_results/upgrades/timeseries -f results/upgrades/timeseries -e test/base_results/comparisons/upgrades/timeseries
 
       - name: Upload comparisons
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: test/base_results/comparisons
           name: comparisons
@@ -241,7 +241,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [unit-tests, analysis-tests, integration-tests]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
@@ -252,19 +252,19 @@ jobs:
           sudo pip3 install sphinx sphinx-rtd-theme
 
       - name: Download feature samples
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: samples
           name: samples
 
       - name: Download feature results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: results
           name: results
 
       - name: Download output files
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: outputs
           name: outputs
@@ -296,7 +296,7 @@ jobs:
           make html SPHINXOPTS="-W --keep-going -n"
 
       - name: Save Docs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: documentation
           path: docs/read_the_docs/_build/html/
diff --git a/measures/ApplyUpgrade/measure.xml b/measures/ApplyUpgrade/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>bbc2ca5f-4f0f-4baa-8b89-4df062c9eae1</version_id>
-  <version_modified>20220912T204948Z</version_modified>
+  <version_id>30a03e58-aaf7-4479-bbb1-9fda9283b2b7</version_id>
+  <version_modified>20230104T191300Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>
@@ -6331,7 +6331,7 @@
       <filename>apply_upgrade_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>4D55D0B8</checksum>
+      <checksum>672FDD8F</checksum>
     </file>
     <file>
       <version>
@@ -6342,7 +6342,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>ADB8265D</checksum>
+      <checksum>E8B729A9</checksum>
     </file>
   </files>
 </measure>
diff --git a/measures/BuildExistingModel/measure.rb b/measures/BuildExistingModel/measure.rb
@@ -567,10 +567,18 @@ def run(model, runner, user_arguments)
     end
 
     # Report some additional location and model characteristics
-    weather = WeatherProcess.new(model, runner)
-    register_value(runner, 'weather_file_city', weather.header.City)
-    register_value(runner, 'weather_file_latitude', "#{weather.header.Latitude}")
-    register_value(runner, 'weather_file_longitude', "#{weather.header.Longitude}")
+    if File.exist?(hpxml_path)
+      hpxml = HPXML.new(hpxml_path: hpxml_path)
+    else
+      runner.registerWarning("BuildExistingModel measure could not find '#{hpxml_path}'.")
+      return true
+    end
+
+    epw_path = Location.get_epw_path(hpxml, hpxml_path)
+    epw_file = OpenStudio::EpwFile.new(epw_path)
+    register_value(runner, 'weather_file_city', epw_file.city)
+    register_value(runner, 'weather_file_latitude', epw_file.latitude)
+    register_value(runner, 'weather_file_longitude', epw_file.longitude)
 
     # Determine weight
     if args['number_of_buildings_represented'].is_initialized

diff --git a/measures/BuildExistingModel/measure.xml b/measures/BuildExistingModel/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>build_existing_model</name>
   <uid>dedf59bb-3b88-4f16-8755-2c1ff5519cbf</uid>
-  <version_id>0d1f6325-f179-4ec8-9ada-26499f6c4c53</version_id>
-  <version_modified>20220912T204948Z</version_modified>
+  <version_id>669b50df-3f02-4911-8032-eb629aa35902</version_id>
+  <version_modified>20230104T213808Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildExistingModel</class_name>
   <display_name>Build Existing Model</display_name>
@@ -320,7 +320,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>BB3171DA</checksum>
+      <checksum>F01D215C</checksum>
     </file>
   </files>
 </measure>
diff --git a/measures/ServerDirectoryCleanup/measure.xml b/measures/ServerDirectoryCleanup/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>server_directory_cleanup</name>
   <uid>ec7d04ad-0b7b-495b-825a-e1b6d28d1d3f</uid>
-  <version_id>96f3de97-3fc9-403a-b051-b274de040849</version_id>
-  <version_modified>20221101T160731Z</version_modified>
+  <version_id>0dbff4fe-7131-47dd-b513-4cacf1d72612</version_id>
+  <version_modified>20230201T165356Z</version_modified>
   <xml_checksum>5F1EDF75</xml_checksum>
   <class_name>ServerDirectoryCleanup</class_name>
   <display_name>Server Directory Cleanup</display_name>