Merge branch 'develop' into recalc_t_wtr_out_cycl

Author: lymereJ

.cmake-format.yaml

@@ -152,7 +152,7 @@ markup:
   canonicalize_hashrulers: true
   _help_enable_markup:
   - enable comment markup parsing and reflow
-  enable_markup: false 
+  enable_markup: false
 _help_lint: Options affecting the linter
 lint:
   _help_disabled_codes:

.decent_ci.yaml

@@ -2,11 +2,11 @@ results_repository : Myoldmopar/EnergyPlusBuildResults
 results_path : _posts
 results_base_url : https://myoldmopar.github.io/EnergyPlusBuildResults
 regression_repository : NREL/EnergyPlusRegressionTool
-regression_branch : main # this is the branch of NREL/EnergyPlusRegressionTool to use (usually main)
-regression_baseline_default : develop # this is the NREL/EnergyPlus branch to use as the baseline for regressions
+regression_branch : main # this is the branch of NatLabRockies/EnergyPlusRegressionTool to use (usually main)
+regression_baseline_default : develop # this is the NatLabRockies/EnergyPlus branch to use as the baseline for regressions
 regression_baseline_develop : ""
 regression_baseline_master : ""
-notification_recipients:
-  - myoldmopar
+# notification_recipients:
+#   - myoldmopar
 aging_pull_requests_notification: true
 aging_pull_requests_numdays: 28

.git-blame-ignore-revs

@@ -531,3 +531,11 @@ ab5c96312d0cddec395e9616f23a8bd5f433ac6e
 
 # Apply clang-format-19 and clang-tidy --checks=-*,readability-braces-around-statements [Julien Marrec, 2025-05-23]
 9985a5f1a0f9e6fbb59033996f2d17f2a8eaf6fb
+
+# [chore] Reformat IDFs [Julien Marrec, 2025-10-10]
+c52230939b1c05078af093479e7ad8fd68068931
+92edaf24429481630f8ba3c4aad8da464814e938
+0eeb10edfde3c9d9bf015722b962164686ddb339
+de3778bc1cfa756d84cc3e925e811fea4b232765
+8b1dd8074891e1baa85e72799d861c143d479798
+1ccaafed343cc3f6d58cea99275a9001ccfd29a4

.github/ISSUE_TEMPLATE/01-bug-report.yml

@@ -71,4 +71,4 @@ body:
           You **can supply a link to your IDF if applicable**, or rename it to in.idf.txt and upload it directly here by drag and drop.
 
           Ideally, make it a _Minimum, Complete, Verifiable, Example (MCVE)_ by including the smallest possible number of input objects to reproduce the defect.
-          A good start might be to try to reproduce your issue with one of the EnergyPlus [ExampleFiles](https://github.com/NREL/EnergyPlus/tree/develop/testfiles).
+          A good start might be to try to reproduce your issue with one of the EnergyPlus [ExampleFiles](https://github.com/NatLabRockies/EnergyPlus/tree/develop/testfiles).

.github/pull_request_template.md

@@ -23,6 +23,11 @@ Pull request overview
  - [ ] If IDD requires transition, transition source, rules, ExpandObjects, and IDFs must be updated, and add IDDChange label
  - [ ] If structural output changes, add to output rules file and add OutputChange label
  - [ ] If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies
+ - [ ] If adding/removing any output files (e.g., eplustbl.*)
+   - [ ] Update ..\scripts\Epl-run.bat
+   - [ ] Update ..\scripts\RunEPlus.bat
+   - [ ] Update ..\src\EPLaunch\ MainModule.bas, epl-ui.frm, and epl.vbp (VersionComments)
+   - [ ] Update ..\.github\workflows\energyplus.py
 
 ### Reviewer
 

.github/release.yml

@@ -15,4 +15,3 @@ changelog:
     - title: Under the Hood Refactoring ⚙
       labels:
         - Refactoring
-

.github/workflows/build_documentation.yml

@@ -23,12 +23,15 @@ jobs:
           - os: windows-2022
             generator: "Visual Studio 17 2022"
             pretty: "Windows"
+#         - os: macos-15
+#           generator: "Unix Makefiles"
+#           pretty: 'Mac arm64'
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout EnergyPlus
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Python 3.12
       uses: actions/setup-python@v6
@@ -39,6 +42,14 @@ jobs:
       if: runner.os == 'Linux'
       run: sudo apt update && sudo apt install -y texlive texlive-xetex texlive-science poppler-utils
 
+    - name: Setup up LaTeX on Mac
+      if: runner.os == 'macOS'
+      run: |
+        echo "Using brew to install basictex and adding it to PATH"
+        brew install --cask basictex
+        echo "/Library/TeX/texbin" >> $GITHUB_PATH
+        brew install poppler
+
     - name: Set up LaTeX on Windows
       if: runner.os == 'Windows'
       run: |
@@ -100,6 +111,19 @@ jobs:
         fi;
         echo "TOC is available for pass NO.2"
 
+    - name: Preinstall Packages on macOS
+      if: runner.os == 'macOS'
+      working-directory: ./doc/test
+      run: |
+        sudo tlmgr update --self
+        # Just install these, since I now know what we need
+        sudo tlmgr install enumitem framed multirow siunitx
+        # sudo tlmgr list --only-installed --data name > ori_installed.lst
+        # sudo tlmgr install texliveonfly
+        # sudo texliveonfly --compiler=xelatex dependencies.tex
+        # sudo tlmgr list --only-installed --data name > new_installed.lst
+        # python -c "from pathlib import Path; ori_lines = set(Path('./ori_installed.lst').read_text().splitlines()); new_lines = set(Path('./new_installed.lst').read_text().splitlines()); new_pkgs = new_lines - ori_lines; print([x for x in new_pkgs if not x.startswith('texliveonfly')])"
+
     - name: Create Build Environment
       run: cmake -E make_directory ./doc/build
 
@@ -115,78 +139,78 @@ jobs:
       run: cmake --build . -j 4
 
     - name: Upload EngineeringReference
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: EngineeringReference
         path: ${{ github.workspace }}/doc/build/pdf/EngineeringReference.pdf
 
     - name: Upload ExternalInterfacesApplicationGuide
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: ExternalInterfacesApplicationGuide
         path: ${{ github.workspace }}/doc/build/pdf/ExternalInterfacesApplicationGuide.pdf
 
     - name: Upload GettingStarted
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: GettingStarted
         path: ${{ github.workspace }}/doc/build/pdf/GettingStarted.pdf
 
     - name: Upload InputOutputReference
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: InputOutputReference
         path: ${{ github.workspace }}/doc/build/pdf/InputOutputReference.pdf
 
     - name: Upload InterfaceDeveloper
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: InterfaceDeveloper
         path: ${{ github.workspace }}/doc/build/pdf/InterfaceDeveloper.pdf
 
     - name: Upload ModuleDeveloper
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: ModuleDeveloper
         path: ${{ github.workspace }}/doc/build/pdf/ModuleDeveloper.pdf
 
     - name: Upload OutputDetailsAndExamples
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: OutputDetailsAndExamples
         path: ${{ github.workspace }}/doc/build/pdf/OutputDetailsAndExamples.pdf
 
     - name: Upload PlantApplicationGuide
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: PlantApplicationGuide
         path: ${{ github.workspace }}/doc/build/pdf/PlantApplicationGuide.pdf
 
     - name: Upload UsingEnergyPlusForCompliance
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: matrix.os == 'ubuntu-24.04'
       with:
         name: UsingEnergyPlusForCompliance
         path: ${{ github.workspace }}/doc/build/pdf/UsingEnergyPlusForCompliance.pdf
 
     - name: Upload entire pdf folder
-      uses: actions/upload-artifact@v4
-      if: always() && matrix.os == 'ubuntu-24.04'
+      uses: actions/upload-artifact@v6
+      if: always()
       with:
-        name: "AllDocumentation-${{ github.event.pull_request.head.sha }}"
+        name: "AllDocumentation-${{ matrix.os }}-${{ github.event.pull_request.head.sha }}"
         path: ${{ github.workspace }}/doc/build/pdf/
 
     - name: Upload log folder upon failure
       if: failure() && runner.os == 'Windows'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: Xelatex_Logs_after_all
         path: C:\Users\runneradmin\AppData\Local\MiKTeX\miktex\log\

.github/workflows/build_wheels.yml

@@ -21,13 +21,13 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9"]
-        os: [ubuntu-22.04]  # , macos-13, windows-2022]
+        os: [ubuntu-22.04]  # , macos-15-intel, macos-15, windows-2022]
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout EnergyPlus
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         ref: ${{ github.event.inputs.ref }}
 
@@ -41,7 +41,7 @@ jobs:
         pip install wheel
         python setup.py bdist_wheel
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: energyplus-wheel-${{ matrix.os }}
         path: ./dist

.github/workflows/doc-problem-match.json

@@ -13,4 +13,4 @@
       ]
     }
   ]
-}
+}

.github/workflows/release_linux.yml

@@ -43,7 +43,7 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
       id: setup-python
@@ -96,7 +96,7 @@ jobs:
       run: cmake --build . --target package -j 4
 
     - name: Upload Tarball as artifact for testing
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: energyplus-${{ matrix.os }}
         path: build/EnergyPlus-*-${{ matrix.arch }}.tar.gz
@@ -152,7 +152,7 @@ jobs:
             test_key: ubuntu2404-arm64
 
     steps:
-      - uses: actions/checkout@v5  # Still need E+ checked out to get testing scripts
+      - uses: actions/checkout@v6  # Still need E+ checked out to get testing scripts
         with:
           path: checkout
 
@@ -164,7 +164,7 @@ jobs:
           architecture: ${{ matrix.arch }}
 
       - name: Gather Test Package from Artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: energyplus-${{ matrix.os }}
           path: package