Merge develop; resolve conflicts

.decent_ci-Linux.yaml

@@ -1,14 +1,14 @@
 compilers:
   - name: "gcc"
-    version: "13.2"
+    version: "13.3"
     cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DBUILD_PERFORMANCE_TESTS:BOOL=ON -DVALGRIND_ANALYZE_PERFORMANCE_TESTS:BOOL=ON -DENABLE_PCH:BOOL=OFF
     collect_performance_results: true
     skip_regression: true
     s3_upload_bucket: energyplus
     num_parallel_builds: 16
 
   - name: "gcc"
-    version: "13.2"
+    version: "13.3"
     build_type: RelWithDebInfo
     cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA:STRING=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DENABLE_PCH:BOOL=OFF
     coverage_enabled: true
@@ -23,7 +23,7 @@ compilers:
     num_parallel_builds: 16
 
   - name: "gcc"
-    version: "13.2"
+    version: "13.3"
     build_type: RelWithDebInfo
     cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA:STRING=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DENABLE_PCH:BOOL=OFF
     coverage_enabled: true

.git-blame-ignore-revs

@@ -232,6 +232,10 @@ a9778bafea2ee3e92c6671144fa08d1394f11099
 64b07699758bdf5f8bcd1211338e0428c80684c3
 #    1005 files changed, 1006 insertions(+), 1006 deletions(-)
 
+# Update the license scripts a bit [Jason W. DeGraw, 2023-01-04]
+b2d55beb46c49fbb7bf84364d3a45f86e554a826
+#   2 files changed, 36 insertions(+), 17 deletions(-)
+
 # Merge pull request #9781 from NREL/update-license-year [Michael J. Witte, 2023-01-04]
 0ff3e33ff6d1d60abcaeb02f021f459840a2faa2
 
@@ -246,6 +250,13 @@ a9778bafea2ee3e92c6671144fa08d1394f11099
 # Merge pull request #10352 from NREL/update-license-year-2024 [Edwin Lee, 2024-01-02]
 6fafbb763fe676012f5db10da7b3e8449f578094
 
+# Update the license year to 2025 [Jason W. DeGraw, 2025-01-01]
+5b2874d37a39aa528c7fba0d87b675d2d30cc146
+#   1053 files changed, 1059 insertions(+), 1056 deletions(-)
+
+# Merge pull request #10886 from NREL/update-license-year-2025 [Edwin Lee, 2025-01-08]
+b46ced64a420a7df09af0f301499d0548ac89966
+
 #######################################################################
 #                         S T Y L E    B O T                          #
 #######################################################################
@@ -494,14 +505,26 @@ deb313430ea9b1cc2c0bb679c376689db32eeb17
 c8f9fbba47a5425fbb4220285f70d0017f6f65b4
 #    2 files changed, 2 insertions(+)
 
-# Apply clang-format to src/EnergyPlus and tst/EnergyPlus/unit [Edwin Lee, 2021-03-30]
-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(-)
+
+# Apply clang-format to src/EnergyPlus and tst/EnergyPlus/unit [Edwin Lee, 2021-03-30]
+33b71ed598f37c10e9bfb6492e2a2103ba24e3dd
+# 762 files changed, 397748 insertions(+), 351788 deletions(-)
+
+# Add copyright header to EPVector.hh [Jason Turner, 2021-04-09]
+fec99239575da7f77999cf82f4140f38a8026b80
+#   1 file changed, 51 insertions(+), 4 deletions(-)
+
+# clang-format [chore] [Julien Marrec, 2021-06-21]
+7d40fa29de91752d5d449fe9be45a008c236fefb
+#   2 files changed, 17 insertions(+), 17 deletions(-)
+
+# [chore] Typo cooing -> cooling [Julien Marrec, 2025-01-23]
+ab5c96312d0cddec395e9616f23a8bd5f433ac6e
+# 25 files changed, 132 insertions(+), 131 deletions(-)

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

@@ -0,0 +1,74 @@
+name: Bug Report
+description: Use this template for reporting an issue.
+labels: Triage, UnconfirmedDefect
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a report.
+        Include all applicable information to help us reproduce.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Issue overview
+      description: |
+        Please change this line to a description of the defect, with useful supporting information including how the issue was found,
+        conditions that trigger this defect, workarounds for users of the current version,
+        and a clear description of how to validate that a fix is complete for this defect.
+
+        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
+      placeholder: Include all applicable information with details to help us reproduce your problem.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: operating_system_multiple
+    attributes:
+      label: Operating System (Multiple choices)
+      multiple: true
+      description: What Operating System are you encountering issues on?
+      options:
+        - Windows
+        - Ubuntu
+        - MacOS
+        - Any
+        - Other
+    validations:
+      required: true
+
+  - type: input
+    id: operating_system_version
+    attributes:
+      label: Operating System Version
+      placeholder: ex. 24.04
+    validations:
+      required: true
+
+  - type: input
+    id: eplus_version
+    attributes:
+      label: Version of EnergyPlus
+      description: if using an intermediate build, include SHA
+      placeholder: ex. 24.2.0
+    validations:
+      required: true
+
+  - type: input
+    id: uh_helpdesk_link
+    attributes:
+      label: Unmethours link or helpdesk ticket number
+      placeholder: ex. 24.2.0
+      value: N/A
+    validations:
+      required: false
+
+  - type: textarea
+    id: defect_file
+    attributes:
+      label: Defect file
+      description: |
+          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).

.github/ISSUE_TEMPLATE/02-enhancement-request.yml

@@ -0,0 +1,38 @@
+name: Enhancement Request
+description: Use this template for suggesting an enhancement.
+labels: Triage, NewFeatureRequest
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a report.
+        Include all applicable information to help us reproduce.
+
+  - type: textarea
+    id: summary
+    attributes:
+      label: General Summary
+      description: |
+        Provide a general summary of the feature you would like to see implemented
+    validations:
+      required: true
+
+  - type: textarea
+    id: details
+    attributes:
+      label: Detailed Description
+      description: |
+        Provide a detailed description of the change or addition you are proposing.
+
+        Include screenshots, schemas, IDD/IDF snippets as appropriate.
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Possible Implementation
+      description: |
+        Not mandatory, but if you can, suggest an idea for implementing the feature
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Unmet Hours
+    url: https://unmethours.com
+    about: "Ask modeling **questions** on unmethours.com"
+  - name: Helpdesk
+    url: https://energyplushelp.freshdesk.com/support/home
+    about: The EnergyPlus Helpdesk has a knowledge base and entry forms for submitting help requests and bug reports

.github/pull_request_template.md

@@ -1,12 +1,18 @@
 Pull request overview
 ---------------------
- - Fixes #ISSUENUMBERHERE (IF THIS IS A DEFECT)
- - DESCRIBE PURPOSE OF THIS PULL REQUEST
 
-**NOTE: ENHANCEMENTS MUST FOLLOW A SUBMISSION PROCESS INCLUDING A FEATURE PROPOSAL AND DESIGN DOCUMENT PRIOR TO SUBMITTING CODE**
+- Fixes #ISSUENUMBERHERE <!-- IF THIS IS A DEFECT -->
+
+<!-- NOTE: ENHANCEMENTS MUST FOLLOW A SUBMISSION PROCESS INCLUDING A FEATURE PROPOSAL AND DESIGN DOCUMENT PRIOR TO SUBMITTING CODE -->
+
+### Description of the purpose of this PR
+
+<!-- DESCRIBE PURPOSE OF THIS PULL REQUEST -->
 
 ### Pull Request Author
-Add to this list or remove from it as applicable.  This is a simple templated set of guidelines.
+
+<!-- Add to this list or remove from it as applicable.  This is a simple templated set of guidelines. -->
+
  - [ ] Title of PR should be user-synopsis style (clearly understandable in a standalone changelog context)
  - [ ] Label the PR with at least one of: Defect, Refactoring, NewFeature, Performance, and/or DoNoPublish
  - [ ] Pull requests that impact EnergyPlus code must also include unit tests to cover enhancement or defect repair
@@ -19,7 +25,9 @@ Add to this list or remove from it as applicable.  This is a simple templated se
  - [ ] If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies
 
 ### Reviewer
-This will not be exhaustively relevant to every PR.
+
+<!-- This will not be exhaustively relevant to every PR. -->
+
  - [ ] Perform a Code Review on GitHub
  - [ ] If branch is behind develop, merge develop and build locally to check for side effects of the merge
  - [ ] If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix

.github/workflows/build_wheels.yml

@@ -47,7 +47,7 @@ jobs:
         path: ./dist
 
     - name: Deploy on Test PyPi
-      uses: pypa/[email protected].2
+      uses: pypa/[email protected].4
       with:
         repository-url: https://test.pypi.org/legacy/
         user: __token__

.github/workflows/test_pull_requests.yml

@@ -62,6 +62,7 @@ jobs:
         brew reinstall gcc@13
         echo "FC=$(brew --prefix gcc@13)/bin/gfortran-13" >> $GITHUB_ENV
         echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos_dev_target }} >> $GITHUB_ENV
+        pip install pytest lxml
 
     - name: Install Dependencies for Linux
       if: runner.os == 'Linux'
@@ -72,6 +73,7 @@ jobs:
           # https://github.com/actions/runner-images/issues/10025
           echo "FC=gfortran-13" >> $GITHUB_ENV
         fi
+        pip install pytest lxml
 
     # BUILD AND TEST INTEGRATION FILES ON THE BASELINE BRANCH
 
@@ -166,7 +168,7 @@ jobs:
 
     - name: Install Regression Tool
       if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure'  # always run this step as long as we actually built
-      run: pip install energyplus-regressions
+      run: pip install energyplus-regressions>=2.1.1  # could rely on the requirements.txt file maybe
 
     - name: Run Regressions
       if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure'  # always run this step as long as we actually built
@@ -200,6 +202,8 @@ jobs:
           const script = require('${{ github.workspace }}/regressions/summary.js')
           console.log(script({github, context}))
 
+    # - uses: lhotari/action-upterm@v1
+
     - name: Fail on Regressions from Forked Repository
       if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' && github.event.pull_request.head.repo.full_name != 'NREL/EnergyPlus'
       run: |

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17)
+cmake_minimum_required(VERSION 3.19)
 
 # Use ccache if available, has to be before "project()"
 find_program(CCACHE_PROGRAM NAMES ccache sccache)
@@ -35,6 +35,7 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -228,6 +229,21 @@ if(BUILD_TESTING)
   endif()
   set_property(GLOBAL PROPERTY CTEST_TARGETS_ADDED 1)  # This avoids all the CTest Nightly, Continuous, etc. tests.
   enable_testing()
+
+  execute_process(COMMAND ${Python_EXECUTABLE} -m pytest --version
+    RESULT_VARIABLE _Pytest_STATUS
+        OUTPUT_VARIABLE Pytest_Version
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if(_Pytest_STATUS AND NOT _Pytest_STATUS EQUAL 0)
+    message(AUTHOR_WARNING "Pytest isn't installed on your system python, so some tests won't be run. Run `${Python_EXECUTABLE} -m pip install pytest`")
+    set(Pytest_AVAILABLE OFF)
+  else()
+    message(VERBOSE "Found Pytest: ${Pytest_Version}")
+    set(Pytest_AVAILABLE ON)
+  endif()
+
 endif()
 
 if(ENABLE_REGRESSION_TESTING)

LICENSE.txt

@@ -1,4 +1,4 @@
-EnergyPlus, Copyright (c) 1996-2024, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
+EnergyPlus, Copyright (c) 1996-2025, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
 
 NOTICE: This Software was developed under funding from the U.S. Department of Energy and the U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit others to do so.
 

cmake/ProjectMacros.cmake

@@ -1,19 +1,5 @@
 include(CMakeParseArguments)
-
-# Add google tests macro
-macro(ADD_GOOGLE_TESTS executable)
-  foreach(source ${ARGN})
-    string(REGEX MATCH .*cpp|.*cc source "${source}")
-    if(source)
-      file(READ "${source}" contents)
-      string(REGEX MATCHALL "TEST_?F?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
-      foreach(hit ${found_tests})
-        string(REGEX REPLACE ".*\\(( )*([A-Za-z_0-9]+)( )*,( )*([A-Za-z_0-9]+)( )*\\).*" "\\2.\\5" test_name ${hit})
-        add_test(NAME ${test_name} COMMAND "${executable}" "--gtest_filter=${test_name}")
-      endforeach(hit)
-    endif()
-  endforeach()
-endmacro()
+include(GoogleTest)
 
 # Create source groups automatically based on file path
 macro(CREATE_SRC_GROUPS SRC)
@@ -62,7 +48,11 @@ macro(CREATE_TEST_TARGETS BASE_NAME SRC DEPENDENCIES USE_PCH)
 
     target_link_libraries(${BASE_NAME}_tests PRIVATE ${ALL_DEPENDENCIES} gtest)
 
-    add_google_tests(${BASE_NAME}_tests ${SRC})
+    gtest_discover_tests(${BASE_NAME}_tests
+            DISCOVERY_TIMEOUT 30
+            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+
   endif()
 endmacro()
 

cmake/PythonCopyStandardLib.py

@@ -1,4 +1,4 @@
-# EnergyPlus, Copyright (c) 1996-2024, The Board of Trustees of the University
+# EnergyPlus, Copyright (c) 1996-2025, The Board of Trustees of the University
 # of Illinois, The Regents of the University of California, through Lawrence
 # Berkeley National Laboratory (subject to receipt of any required approvals
 # from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-

cmake/PythonFixUpTclTk.py

@@ -1,4 +1,4 @@
-# EnergyPlus, Copyright (c) 1996-2024, The Board of Trustees of the University
+# EnergyPlus, Copyright (c) 1996-2025, The Board of Trustees of the University
 # of Illinois, The Regents of the University of California, through Lawrence
 # Berkeley National Laboratory (subject to receipt of any required approvals
 # from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-

cmake/PythonGetBitSize.py

@@ -1,4 +1,4 @@
-# EnergyPlus, Copyright (c) 1996-2024, The Board of Trustees of the University
+# EnergyPlus, Copyright (c) 1996-2025, The Board of Trustees of the University
 # of Illinois, The Regents of the University of California, through Lawrence
 # Berkeley National Laboratory (subject to receipt of any required approvals
 # from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-

cmake/ReverseDDPostProcess.py

@@ -1,4 +1,4 @@
-# EnergyPlus, Copyright (c) 1996-2024, The Board of Trustees of the University
+# EnergyPlus, Copyright (c) 1996-2025, The Board of Trustees of the University
 # of Illinois, The Regents of the University of California, through Lawrence
 # Berkeley National Laboratory (subject to receipt of any required approvals
 # from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-