Merge develop.

.git-blame-ignore-revs

@@ -202,6 +202,50 @@ d3608dbbdce2ee659e9a6d55f4683d2f8d7b05b0
 83e29cd9a81cd098e76bd79b0cc7ce00277c181c
 # 761 files changed, 795 insertions(+), 795 deletions(-)
 
+# Update the license year to 2021 [Jason W. DeGraw, 2021-01-02]
+669aaac766488b51bc0c4fe58e5b1664ee4e61f1
+#    926 files changed, 926 insertions(+), 926 deletions(-)
+
+# Add license to workflows [Jason W. DeGraw, 2021-01-07]
+79c028afaf6471e002800289b35a041287300787
+#    7 files changed, 332 insertions(+), 1 deletion(-)
+
+# Add license to api .py files, skip empty files [Jason W. DeGraw, 2021-01-07]
+84234c0f29bd770d858cfcf4f67f8dc6f96902b3
+#    11 files changed, 448 insertions(+), 4 deletions(-)
+
+# Expand the search scope, add license to more files [Jason W. DeGraw, 2021-01-14]
+d19e62bc7bb73bf9f72fb19ec85387a15bee019e
+#    36 files changed, 1898 insertions(+), 5 deletions(-)
+
+# Merge pull request #8445 from NREL/update-license-year [Edwin Lee, 2021-01-14]
+a9778bafea2ee3e92c6671144fa08d1394f11099
+
+# update license year to 2022 [Matt Mitchell, 2022-01-02]
+5d3c8b45c75dd22205bafe8d0fe05ee922025af6
+#    911 files changed, 4192 insertions(+), 4192 deletions(-)
+
+# Merge pull request #9219 from NREL/update-license-year-2022 [Edwin Lee, 2022-01-03]
+6d809760dc125f5a07348108716f328b5ce46c17
+
+# Update the license year [Jason W. DeGraw, 2023-01-03]
+64b07699758bdf5f8bcd1211338e0428c80684c3
+#    1005 files changed, 1006 insertions(+), 1006 deletions(-)
+
+# Merge pull request #9781 from NREL/update-license-year [Michael J. Witte, 2023-01-04]
+0ff3e33ff6d1d60abcaeb02f021f459840a2faa2
+
+# fix license text and clang-format [Yujie Xu, 2023-03-07]
+4d31ee6fb5c634f309f04d77040950a3c91d87e1
+#    14 files changed, 135 insertions(+), 159 deletions(-)
+
+# Update the license year to 2024 [Jason W. DeGraw, 2024-01-02]
+41b316c883dfa574a1c32310cf96fc1fa9b2d994
+#    1021 files changed, 1022 insertions(+), 1022 deletions(-)
+
+# Merge pull request #10352 from NREL/update-license-year-2024 [Edwin Lee, 2024-01-02]
+6fafbb763fe676012f5db10da7b3e8449f578094
+
 #######################################################################
 #                         S T Y L E    B O T                          #
 #######################################################################
@@ -454,3 +498,10 @@ c8f9fbba47a5425fbb4220285f70d0017f6f65b4
 33b71ed598f37c10e9bfb6492e2a2103ba24e3dd
 # 762 files changed, 397748 insertions(+), 351788 deletions(-)
 
+# `python change_version.py ../../ 9.3 9.4` [chore] [Julien Marrec, 2020-04-10]
+07ff20c0f9d89bde22c8f0b7a9dbbfe716339afd
+#    761 files changed, 795 insertions(+), 795 deletions(-)
+
+# [chore] clang-format the FMI and FMUParser directories, hard to read. [Julien Marrec, 2020-11-24]
+98dbfac765fbcf327681ecb13fb79a368363be9e
+#    26 files changed, 4230 insertions(+), 3938 deletions(-)

.github/workflows/build_wheels.yml

@@ -0,0 +1,47 @@
+name: Build wheels
+
+on:
+  # push:
+  #  branches:
+  #    - develop
+  #    - wheel
+  #  tags:
+  #    - "*"
+
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'The branch, tag, or SHA for which to run (eg: v22.1.0 or develop)'
+        required: true
+
+jobs:
+  build_wheel:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9"]
+        os: [ubuntu-22.04, macos-13, windows-2019]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Checkout EnergyPlus
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.inputs.ref }}
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: build wheels
+      run: |
+        pip install wheel
+        python setup.py bdist_wheel
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: energyplus-wheel-${{ matrix.os }}
+        path: ./dist

.github/workflows/custom_check.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python 3.7
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: '3.10'
 
     - name: Custom Check
       shell: bash

.github/workflows/documentation-windows.yml

@@ -17,10 +17,10 @@ jobs:
     - name: Checkout EnergyPlus
       uses: actions/checkout@v3
 
-    - name: Set up Python 3.7
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: '3.10'
 
     - name: Install System dependencies and LaTeX
       shell: bash
@@ -99,7 +99,7 @@ jobs:
     - name: Build Docs
       working-directory: ${{runner.workspace}}/EnergyPlus/doc/build
       run: |
-        cmake --build . -j 2
+        cmake --build . -j 4
 
     - name: Upload entire pdf folder
       if: ${{ always() }}

.github/workflows/documentation.yml

@@ -10,10 +10,10 @@ jobs:
     - name: Checkout EnergyPlus
       uses: actions/checkout@v3
 
-    - name: Set up Python 3.7
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: '3.10'
 
     - name: Set up LaTeX
       run: sudo apt update && sudo apt install -y texlive texlive-xetex texlive-science poppler-utils
@@ -30,7 +30,7 @@ jobs:
 
     - name: Build Docs
       working-directory: ${{runner.workspace}}/EnergyPlus/doc/build
-      run: cmake --build . -j 2
+      run: cmake --build . -j 4
 
     - name: Upload Acknowledgments
       uses: actions/upload-artifact@v3

.github/workflows/epjson.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
+        python-version: '3.10'
 
     - name: Setup
       shell: bash

.github/workflows/linux_build.yml

@@ -81,4 +81,4 @@ jobs:
       - name: Build EnergyPlus
         working-directory: ./build/
         shell: bash
-        run: cmake --build . --target energyplus -j 2
+        run: cmake --build . --target energyplus -j 4

.github/workflows/linux_release.yml

@@ -40,7 +40,7 @@ jobs:
     - name: Setup QtIFW 4.x
       uses: jmarrec/setup-qtifw@v1
       with:
-        qtifw-version: '4.x'
+        qtifw-version: '4.6.1'
 
     - name: Install Python dependencies
       run: |
@@ -72,7 +72,7 @@ jobs:
     - name: Build Package
       working-directory: ./build
       shell: bash
-      run: cmake --build . --target package -j 2
+      run: cmake --build . --target package -j 4
 
     - name: Upload Tarball to release
       uses: svenstaro/upload-release-action@v2

.github/workflows/mac_release.yml

@@ -8,9 +8,8 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BUILD_TYPE: Release
-  FC: gfortran-11
+  FC: gfortran-13
   SDKROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
-  Python_REQUIRED_VERSION: 3.8
 
 jobs:
   mac_release:
@@ -20,34 +19,40 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        macos_dev_target: [10.15, 11.6, 12.1]
+        macos_dev_target: [11.6, 12.1]  #, 13.0]
         include:
-        - macos_dev_target: 10.15
-          os: macos-11
-          allow_failure: false
         - macos_dev_target: 11.6
           os: macos-11
           allow_failure: false
+          arch: x86_64
+          python: 3.8
         - macos_dev_target: 12.1
           os: macos-12
           allow_failure: false
+          arch: x86_64
+          python: 3.8
+#        - macos_dev_target: 13.0
+#          os: macos-14
+#          allow_failure: false
+#          arch: arm64
+#          python: 3.12.0
     permissions:
       # Needed permission to upload the release asset
       contents: write
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
+    - name: Set up Python ${{ matrix.python }}
       id: setup-python
       uses: actions/setup-python@v4
       with:
-        python-version: ${{ env.Python_REQUIRED_VERSION }}
+        python-version: ${{ matrix.python }}
 
     - name: Setup QtIFW 4.x
       uses: jmarrec/setup-qtifw@v1
       with:
-        qtifw-version: '4.x'
+        qtifw-version: '4.6.1'
 
     - name: Install Python dependencies
       run: |
@@ -65,6 +70,9 @@ jobs:
         # The MACOSX_DEPLOYMENT_TARGET environment variable sets the default value for the CMAKE_OSX_DEPLOYMENT_TARGET variable.
         # We use cmake commands to build some subprojects, so setting it globally
         echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos_dev_target }} >> $GITHUB_ENV
+        echo "Installing gcc@13 for gfortran support of -static-libquadmath"
+        brew list gcc@13 || brew install gcc@13
+        which gfortran-13 || echo "FC=$(brew --prefix gcc@13)/bin/gfortran-13" >> $GITHUB_ENV
 
     - name: Create Build Directory
       run: cmake -E make_directory ./build/
@@ -79,18 +87,33 @@ jobs:
               -DPython_ROOT_DIR:PATH=$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/x64/ \
               -DBUILD_FORTRAN:BOOL=ON -DBUILD_PACKAGE:BOOL=ON \
               -DDOCUMENTATION_BUILD:STRING="BuildWithAll" -DTEX_INTERACTION:STRING="batchmode" \
+              -DENABLE_OPENMP:BOOL=OFF -DUSE_OpenMP:BOOL=OFF \
               ../
 
     - name: Build Package
       working-directory: ./build
       shell: bash
       run: cmake --build . --target package -j 3
 
+    - name: otool the exes and libs
+      shell: bash
+      working-directory: ./build
+      run: |
+        set -x
+        cd _CPack_Packages/Darwin/TGZ/EnergyPlus*/
+        otool -L ExpandObjects || true
+        otool -L ConvertInputFormat || true
+        otool -L energyplus || true
+        otool -L libenergyplusapi.dylib || true
+        otool -L PreProcess/IDFVersionUpdater/Transition-V23-1-0-to-V23-2-0 || true
+        otool -L PostProcess/ReadVarsESO || true
+        otool -L PostProcess/HVAC-Diagram || true
+
     - name: Upload Tarball to release
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: build/EnergyPlus-*-x86_64.tar.gz
+        file: build/EnergyPlus-*-${{ matrix.arch }}.tar.gz
         tag: ${{ github.ref }}
         overwrite: true
         file_glob: true
@@ -99,7 +122,7 @@ jobs:
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: build/EnergyPlus-*-x86_64.dmg
+        file: build/EnergyPlus-*-${{ matrix.arch }}.dmg
         tag: ${{ github.ref }}
         overwrite: true
         file_glob: true

.github/workflows/windows_release.yml

@@ -58,7 +58,7 @@ jobs:
     - name: Setup QtIFW 4.x
       uses: jmarrec/setup-qtifw@v1
       with:
-        qtifw-version: '4.x'
+        qtifw-version: '4.6.1'
 
     - name: Install Python dependencies
       run: |
@@ -102,6 +102,15 @@ jobs:
         mpm --find-updates
         mpm --admin --find-updates
 
+    - name: Downgrade cmake to 3.28
+      run: |
+        cmake --version
+        choco install cmake --version=3.28.4 --installargs 'ADD_CMAKE_TO_PATH=System'
+
+    - name: Check cmake
+      run: |
+        cmake --version
+
     # This will install all required packages and does that in a single thread. So later in cmake we can safely run in parallel
     - name: Install required packages by building the Test document
       shell: bash
@@ -131,7 +140,7 @@ jobs:
     - name: Build Package
       working-directory: ./build
       shell: bash
-      run: cmake --build . --target package -j 2 --config $BUILD_TYPE
+      run: cmake --build . --target package -j 4 --config $BUILD_TYPE
 
     - name: Upload Zip to release
       uses: svenstaro/upload-release-action@v2

.gitignore

@@ -70,6 +70,12 @@ cppcheck.txt
 # by default CLion uses cmake-build-debug as the build folder, so add that as well
 cmake-build-*
 
+# for wheel builds, we can also ignore a couple
+build-wheel/
+dist/
+energyplus.egg-info
+wheelhouse/
+
 # App-specific project files, for example, for Geany IDE:
 *.geany
 .project

.readthedocs.yml

@@ -2,9 +2,18 @@ version: 2
 
 sphinx:
   configuration: doc/readthedocs/sphinx/conf.py
+  builder: html
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+  apt_packages:
+    - doxygen
 
-# read the docs image build already includes sphinx-rtd-theme, so this isn't needed
-# however, keeping it here and running it on RTD is a near zero cost operation and makes sure the requirements are ok
 python:
   install:
     - requirements: doc/readthedocs/requirements.txt
+
+submodules:
+  exclude: all

CMakeLists.txt

@@ -349,6 +349,8 @@ if(BUILD_TESTING)
   set_target_properties(TestAPI_Runtime_C PROPERTIES FOLDER Testing)
   set_target_properties(TestAPI_Functional_C PROPERTIES FOLDER Testing)
   set_target_properties(TestEnergyPlusCallbacks PROPERTIES FOLDER Testing)
+  set_target_properties(TestAPI_RuntimeDeleteState_C PROPERTIES FOLDER Testing)
+  set_target_properties(TestAPI_RuntimeResetState_C PROPERTIES FOLDER Testing)
 endif()
 
 add_subdirectory(src/ConvertInputFormat)