Merge remote-tracking branch 'remotes/origin/develop' into 10819ExpOb…

…jectsDistrictHotWater

.decent_ci-Linux.yaml

@@ -1,13 +1,14 @@
 compilers:
   - name: "gcc"
-    version: "11.4"
+    version: "13.2"
     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: "11.4"
+    version: "13.2"
     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
@@ -19,9 +20,10 @@ compilers:
     ctest_filter: -E "integration.*"
     skip_regression: true
     skip_packaging: true
+    num_parallel_builds: 16
 
   - name: "gcc"
-    version: "11.4"
+    version: "13.2"
     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
@@ -33,3 +35,4 @@ compilers:
     ctest_filter: -R "integration.*"
     skip_regression: true
     skip_packaging: true
+    num_parallel_builds: 16

.decent_ci.yaml

@@ -2,7 +2,7 @@ results_repository : Myoldmopar/EnergyPlusBuildResults
 results_path : _posts
 results_base_url : https://myoldmopar.github.io/EnergyPlusBuildResults
 regression_repository : NREL/EnergyPlusRegressionTool
-regression_branch : BumpToBoto3 # this is the branch of NREL/EnergyPlusRegressionTool to use (usually main)
+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_baseline_develop : ""
 regression_baseline_master : ""

.github/workflows/build_wheels.yml

@@ -47,7 +47,7 @@ jobs:
         path: ./dist
 
     - name: Deploy on Test PyPi
-      uses: pypa/gh-action-pypi-publish@v1.10.3
+      uses: pypa/gh-action-pypi-publish@v1.12.2
       with:
         repository-url: https://test.pypi.org/legacy/
         user: __token__

.github/workflows/test_pull_requests.yml

@@ -191,8 +191,14 @@ jobs:
         ${{ steps.upload_regressions.outputs.artifact-url }}
 
     - uses: actions/github-script@v7
-      if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure'
+      if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' && github.event.pull_request.head.repo.full_name == 'NREL/EnergyPlus'
       with:
         script: |
           const script = require('${{ github.workspace }}/regressions/summary.js')
           console.log(script({github, context}))
+
+    - 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: |
+        echo "::error::Regressions detected in pull request from forked repository, check job summary for details and to download regression results"
+        exit 1

dictionary.dic

@@ -0,0 +1,32 @@
+AirLoopHVAC
+AirToAir
+BalancedFlow
+Celdek
+CeldekPad
+CoilSystem
+ComponentModel
+ConstantVolume
+DetailedGeometry
+Evaporative
+EvaporativeCooler
+FlatPlate
+HeatExchanger
+HeatExchangerAssisted
+HVACDOAS
+Liesen
+NoFans
+OutdoorAir
+OutdoorAirSystem
+PhotovoltaicThermal
+ResearchSpecial
+SensibleAndLatent
+SolarCollector
+SystemModel
+TerminalUnit
+UnglazedTranspired
+UnitarySystem
+UserDefined
+VariableRefrigerantFlow
+VariableVolume
+WetCoil
+ZoneHVAC

src/EnergyPlus/Data/BaseData.hh

@@ -54,6 +54,7 @@ struct EnergyPlusData; // Forward declaration
 
 struct BaseGlobalStruct
 {
+    virtual ~BaseGlobalStruct() = default;
     virtual void init_state([[maybe_unused]] EnergyPlusData &state) = 0;
     virtual void clear_state() = 0;
 };

src/EnergyPlus/Data/CommonIncludes.hh

@@ -159,7 +159,6 @@
 #include <EnergyPlus/GlobalNames.hh>
 #include <EnergyPlus/GroundHeatExchangers.hh>
 #include <EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.hh>
-#include <EnergyPlus/GroundTemperatureModeling/GroundTemperatureModelManager.hh>
 #include <EnergyPlus/HVACControllers.hh>
 #include <EnergyPlus/HVACCooledBeam.hh>
 #include <EnergyPlus/HVACDXHeatPumpSystem.hh>

src/EnergyPlus/Data/EnergyPlusData.hh

@@ -50,8 +50,6 @@
 
 // C++ Headers
 #include <memory>
-#include <string>
-#include <unordered_map>
 
 // EnergyPlus Headers
 #include <EnergyPlus/Data/BaseData.hh>