Run for R&D 100 (do not merge)

.github/workflows/config.yml

@@ -17,15 +17,15 @@ concurrency:
 env:
   OPENSTUDIO_VER: 3.10.0
   OPENSTUDIO_SHA: 86d7e215a1
-  OPENSTUDIO_PLATFORM: Ubuntu-22.04-x86_64
+  OPENSTUDIO_PLATFORM: Ubuntu-24.04-x86_64
   OPENSTUDIO_EXT: deb
   OPENSTUDIO_URL: https://github.com/NREL/OpenStudio/releases/download/v3.10.0
   BUILDSTOCK_BATCH_BRANCH: develop
   BUILDSTOCK_QUERY_BRANCH: main
 
 jobs:
   format-files:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout feature branch
         uses: actions/checkout@v4
@@ -47,20 +47,14 @@ jobs:
           if-no-files-found: error
 
   unit-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [format-files]
-    container:
-      image: docker://nrel/openstudio:3.10.0
     steps:
       - name: Checkout feature branch
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref || github.ref_name }}
 
-      - name: Install gems
-        run: |
-          rm -f Gemfile.lock && bundle install
-
       - name: Install python
         shell: bash
         run: |
@@ -79,17 +73,16 @@ jobs:
           path: resources
           name: options_lookup
 
-      - name: Run integrity checks for all projects
-        run: |
-          bundle exec rake unit_tests:project_integrity_checks
-
-      - name: Run all integrity check unit tests
+      - name: Download and Install OpenStudio
         run: |
-          bundle exec rake unit_tests:integrity_check_tests
+          export OS_DEBFILE="OpenStudio-$OPENSTUDIO_VER+$OPENSTUDIO_SHA-$OPENSTUDIO_PLATFORM.$OPENSTUDIO_EXT"
+          wget -q $OPENSTUDIO_URL/$OS_DEBFILE
+          sudo apt install -y ./$OS_DEBFILE
+          rm ./$OS_DEBFILE
 
-      - name: Run all measure tests
+      - name: Run unit tests
         run: |
-          bundle exec rake unit_tests:measure_tests
+          openstudio tasks.rb unit_tests
 
       - name: Generate precomputed buildstocks
         run: |
@@ -109,15 +102,8 @@ jobs:
           path: resources/buildstock.csv
           if-no-files-found: error
 
-      - name: Store code coverage
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage
-          path: coverage
-          if-no-files-found: error
-
   postprocessing-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout feature branch
         uses: actions/checkout@v4
@@ -144,8 +130,8 @@ jobs:
           uv run pytest tests
 
   build-documentation:
-    runs-on: ubuntu-22.04
-    needs: format-files
+    runs-on: ubuntu-24.04
+    needs: [format-files]
     steps:
       - name: Checkout feature branch
         uses: actions/checkout@v4
@@ -173,10 +159,10 @@ jobs:
           pip install changelog
           make html SPHINXOPTS="-W --keep-going -n"
 
-      - name: Technical reference guide tables
+      - name: Technical reference guide sections
         run: |
           sudo gem install oga
-          ruby docs/technical_reference_guide/tables/create_characteristics_tex.rb
+          ruby docs/technical_reference_guide/characteristics/create_characteristics_tex.rb
 
       - name: Build technical reference guide
         uses: dante-ev/latex-action@2023-A
@@ -210,20 +196,14 @@ jobs:
           fi
 
   analysis-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [unit-tests]
-    container:
-      image: docker://nrel/openstudio:3.10.0
     steps:
       - name: Checkout feature branch
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref || github.ref_name }}
 
-      - name: Install gems
-        run: |
-          rm -f Gemfile.lock && bundle install
-
       - name: Install python
         shell: bash
         run: |
@@ -248,9 +228,16 @@ jobs:
           path: test/tests_yml_files
           name: precomputed_buildstocks
 
+      - name: Download and Install OpenStudio
+        run: |
+          export OS_DEBFILE="OpenStudio-$OPENSTUDIO_VER+$OPENSTUDIO_SHA-$OPENSTUDIO_PLATFORM.$OPENSTUDIO_EXT"
+          wget -q $OPENSTUDIO_URL/$OS_DEBFILE
+          sudo apt install -y ./$OS_DEBFILE
+          rm ./$OS_DEBFILE
+
       - name: Run run_analysis.rb
         run: |
-          bundle exec rake workflow:analysis_tests
+          openstudio test/test_run_analysis.rb
 
       - name: Upload run_analysis.rb results
         uses: actions/upload-artifact@v4
@@ -262,7 +249,7 @@ jobs:
           if-no-files-found: error
 
   integration-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [unit-tests]
     steps:
       - name: Checkout base branch
@@ -294,8 +281,7 @@ jobs:
           export OS_DEBFILE="OpenStudio-$OPENSTUDIO_VER+$OPENSTUDIO_SHA-$OPENSTUDIO_PLATFORM.$OPENSTUDIO_EXT"
           wget -q $OPENSTUDIO_URL/$OS_DEBFILE
           sudo apt install -y ./$OS_DEBFILE
-          openstudio openstudio_version
-          which openstudio
+          rm ./$OS_DEBFILE
 
       - name: Clone and install buildstockbatch repository
         run: |
@@ -427,7 +413,7 @@ jobs:
           if-no-files-found: error
 
   compare-tools:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [analysis-tests, integration-tests]
     steps:
       - name: Checkout feature branch
@@ -455,20 +441,14 @@ jobs:
           ruby test/test_analysis_tools.rb
 
   sdr-options-analysis:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [unit-tests]
-    container:
-      image: docker://nrel/openstudio:3.10.0
     steps:
       - name: Checkout feature branch
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref || github.ref_name }}
 
-      - name: Install gems
-        run: |
-          rm -f Gemfile.lock && bundle install
-
       - name: Install python
         shell: bash
         run: |
@@ -486,6 +466,13 @@ jobs:
         run: |
           python3 -m pip install git+https://github.com/NREL/buildstock-query.git@$BUILDSTOCK_QUERY_BRANCH
 
+      - name: Download and Install OpenStudio
+        run: |
+          export OS_DEBFILE="OpenStudio-$OPENSTUDIO_VER+$OPENSTUDIO_SHA-$OPENSTUDIO_PLATFORM.$OPENSTUDIO_EXT"
+          wget -q $OPENSTUDIO_URL/$OS_DEBFILE
+          sudo apt install -y ./$OS_DEBFILE
+          rm ./$OS_DEBFILE
+
       - name: Generate 550K Sample
         run: |
           openstudio resources/run_sampling.rb -p project_national -n 550000 -o ../project_national/resources/national_550ksamples.csv
@@ -588,7 +575,7 @@ jobs:
           fi
 
   sdr-integration-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [sdr-options-analysis]
     steps:
       - name: Checkout feature branch
@@ -618,8 +605,7 @@ jobs:
           export OS_DEBFILE="OpenStudio-$OPENSTUDIO_VER+$OPENSTUDIO_SHA-$OPENSTUDIO_PLATFORM.$OPENSTUDIO_EXT"
           wget -q $OPENSTUDIO_URL/$OS_DEBFILE
           sudo apt install -y ./$OS_DEBFILE
-          openstudio openstudio_version
-          which openstudio
+          rm ./$OS_DEBFILE
 
       - name: Download formatted options_lookup
         uses: actions/download-artifact@v4
@@ -700,6 +686,7 @@ jobs:
           branch_name="${{ github.head_ref || github.ref_name }}"
           git checkout resources/options_lookup.tsv
           git pull --ff-only --no-tags --depth=3 origin $branch_name
+          rm -rf test/base_results/upgrades/sdr_annual/*
           cp -r project_national/sdr_upgrades_amy2018/results_csvs_pub/* test/base_results/upgrades/sdr_annual
           git add test/base_results/upgrades/sdr_annual
           git status
@@ -748,7 +735,7 @@ jobs:
           if-no-files-found: error
 
   standard-plots-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout feature branch
         uses: actions/checkout@v4

.gitignore

@@ -10,7 +10,6 @@
 # Project-specific files
 /project_national/national_baseline
 /project_national/sdr_upgrades_tmy3*
-/project_national/sdr_upgrades_amy2018*
 /project_testing/testing_baseline
 /national_baseline
 /testing_baseline
@@ -30,22 +29,11 @@ buildstockbatch_crash_details.log
 /weather
 
 # Development environment and system files
-.idea/
 .vscode/
-node_modules/
 .DS_Store
 **/.ipynb_checkpoints/*
 **/.bsq_cache/
 
-# Data directories
-**/data/*
-
-# Python virtual environments
-**/.venv/
-
-# Python compiled files
-**/*.pyc
-**/__pycache__/
 # Postprocessing build outputs
 /postprocessing/build/
 /postprocessing/resstockpostproc.egg-info/

Gemfile

@@ -2,14 +2,13 @@
 
 source 'http://rubygems.org'
 
-# Use version of gems that matches OS CLI (openstudio gem_list)
-gem 'oga', '3.2'
-gem 'rake', '13.2.1'
-gem 'matrix', '0.4.3'
-gem 'minitest', '5.14.4'
-gem 'minitest-reporters', '1.4.3'
-gem 'msgpack', '1.7.2'
-gem 'parallel', '1.19.2'
-gem 'simplecov', '0.22.0'
-gem 'simplecov-html', '0.13.1'
-gem 'rubyzip', '2.3.2'
+gem 'oga'
+gem 'rake'
+gem 'matrix'
+gem 'minitest', '5.15'
+gem 'minitest-reporters'
+gem 'msgpack'
+gem 'parallel'
+gem 'simplecov'
+gem 'simplecov-html'
+gem 'rubyzip'

Gemfile.lock

@@ -2,21 +2,21 @@ GEM
   remote: http://rubygems.org/
   specs:
     ansi (1.5.0)
-    ast (2.4.3)
-    builder (3.3.0)
-    docile (1.4.1)
-    matrix (0.4.3)
-    minitest (5.14.4)
-    minitest-reporters (1.4.3)
+    ast (2.4.2)
+    builder (3.2.4)
+    docile (1.4.0)
+    matrix (0.4.2)
+    minitest (5.15.0)
+    minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     msgpack (1.7.2)
-    oga (3.2)
+    oga (3.4)
       ast
       ruby-ll (~> 2.1)
-    parallel (1.19.2)
+    parallel (1.24.0)
     rake (13.2.1)
     ruby-ll (2.1.3)
       ansi
@@ -27,23 +27,23 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
 
 PLATFORMS
   x64-mingw-ucrt
 
 DEPENDENCIES
-  matrix (= 0.4.3)
-  minitest (= 5.14.4)
-  minitest-reporters (= 1.4.3)
-  msgpack (= 1.7.2)
-  oga (= 3.2)
-  parallel (= 1.19.2)
-  rake (= 13.2.1)
-  rubyzip (= 2.3.2)
-  simplecov (= 0.22.0)
-  simplecov-html (= 0.13.1)
+  matrix
+  minitest (= 5.15)
+  minitest-reporters
+  msgpack
+  oga
+  parallel
+  rake
+  rubyzip
+  simplecov
+  simplecov-html
 
 BUNDLED WITH
    2.4.10