Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/develop' into 10814-DOAS…
Browse files Browse the repository at this point in the history
…-vector-issue
  • Loading branch information
mjwitte committed Dec 19, 2024
2 parents b249e6f + acda84e commit 4aed060
Show file tree
Hide file tree
Showing 215 changed files with 5,667 additions and 7,758 deletions.
9 changes: 6 additions & 3 deletions .decent_ci-Linux.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -33,3 +35,4 @@ compilers:
ctest_filter: -R "integration.*"
skip_regression: true
skip_packaging: true
num_parallel_builds: 16
2 changes: 1 addition & 1 deletion .decent_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 : ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/cpp-problem-matcher.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"problemMatcher": [
{
"owner": "gcc-problem-matcher",
"pattern": [
{
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
"file": 1,
"line": 2,
"column": 3,
"severity": 4,
"message": 5
}
]
}
]
}
7 changes: 4 additions & 3 deletions .github/workflows/test_code_integrity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
- uses: actions/checkout@v4

- name: Run clang-format style check for C/C++ source code.
uses: jidicula/clang-format-action@v4.13.0
uses: jidicula/clang-format-action@v4.14.0
if: always()
with:
clang-format-version: '10'
check-path: 'src/EnergyPlus'

- name: Run clang-format style check for C/C++ unit test code.
uses: jidicula/clang-format-action@v4.13.0
uses: jidicula/clang-format-action@v4.14.0
if: always()
with:
clang-format-version: '10'
Expand All @@ -46,7 +46,8 @@ jobs:
--force
--std=c++17
--inline-suppr
--suppress=cppcheckError
--suppress=missingInclude
--suppress=missingIncludeSystem
--suppress=unusedFunction:src/EnergyPlus/api/autosizing.cc
--suppress=unusedFunction:src/EnergyPlus/api/datatransfer.cc
--suppress=unusedFunction:src/EnergyPlus/api/func.cc
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test_develop_commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ jobs:
- name: Build
id: build
working-directory: ./build
run: cmake --build . -j ${{ matrix.nproc }} --config Release
run: |
echo "::add-matcher::./.github/workflows/cpp-problem-matcher.json"
cmake --build . -j ${{ matrix.nproc }} --config Release
echo "::remove-matcher owner=gcc-problem-matcher::"
- name: Test
# Not running test on alternate build yet, I need to test things
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/test_pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@ jobs:
- name: Branch Build
id: branch_build
working-directory: ./branch/build
run: cmake --build . -j ${{ matrix.nproc }} --config Release
run: |
echo "::add-matcher::./branch/.github/workflows/cpp-problem-matcher.json"
cmake --build . -j ${{ matrix.nproc }} --config Release
echo "::remove-matcher owner=gcc-problem-matcher::"
- name: Branch Test
working-directory: ./branch/build
Expand Down Expand Up @@ -191,8 +194,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
32 changes: 32 additions & 0 deletions dictionary.dic
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ \subsection{Pump}\label{pump}
\end{equation}

where $P$ is the pump power (\si{\watt}), $\dot{Q}$ is the volume flow rate (\si{\volumeFlowRate}), $\eta_{total}$ is the pump total efficiency (\%)
and $\Delta P_{override}$ is your EMS-overriden pressure rise (\si{\pascal}).
and $\Delta P_{override}$ is your EMS-overridden pressure rise (\si{\pascal}).

The unique identifier in both these actuator is the name of Pump Input object.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,6 @@ \subsection{Radiation Coefficients}\label{radiation-coefficients}

\subsection{References}\label{references-023}

ASHRAE HOF 2001.~ 2001 ASHRAE Fundamentals Handbook.~ American Society of Heating Refrigeration and Air-Conditioning Engineers. Altanta GA.
ASHRAE HOF 2001.~ 2001 ASHRAE Fundamentals Handbook.~ American Society of Heating Refrigeration and Air-Conditioning Engineers. Atlanta GA.

ISO. 2003. ISO 15099:2003. Thermal performance of windows, doors, and shading devices -- Detailed calculations. International Organization for Standardization.
Loading

0 comments on commit 4aed060

Please sign in to comment.