Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions .github/workflows/test_develop_commits.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Develop Branch Testing

on:
push:
pull_request:
branches: [ develop ] # run this on all commits to the develop branch

defaults:
Expand Down Expand Up @@ -41,6 +41,7 @@ jobs:
alternate: false
build-type: release
run-tests: true
link-with-python: true
# - os: ubuntu-24.04
# arch: x86_64
# python-arch: x64
Expand All @@ -50,15 +51,27 @@ jobs:
# alternate: false
# build-type: release
# run-tests: true
# link-with-python: true
- os: windows-2022
arch: x86_64
python-arch: x64
generator: "Visual Studio 17 2022"
nproc: 4
pretty: "Standard Build on Windows VS 2022"
pretty: "Standard Debug Build on Windows VS 2022 - Debug"
alternate: false
build-type: debug
run-tests: false
link-with-python: true
- os: windows-2022
arch: x86_64
python-arch: x64
generator: "Visual Studio 17 2022"
nproc: 4
pretty: "Standard Build on Windows VS 2022 - Debug, No Python"
alternate: false
build-type: debug
run-tests: false
link-with-python: false
- os: ubuntu-24.04
arch: x86_64
python-arch: x64
Expand All @@ -68,6 +81,7 @@ jobs:
alternate: true
build-type: release
run-tests: true
link-with-python: false

steps:

Expand Down Expand Up @@ -105,8 +119,8 @@ jobs:
-G "${{ matrix.generator }}"
-DCMAKE_BUILD_TYPE:STRING="${{ matrix.build-type }}"
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${{ matrix.macos_dev_target }}
-DLINK_WITH_PYTHON:BOOL=ON
-DPYTHON_CLI:BOOL=ON
-DLINK_WITH_PYTHON:BOOL=${{ matrix.link-with-python }}
-DPYTHON_CLI:BOOL=${{ matrix.link-with-python }}
-DPython_REQUIRED_VERSION:STRING=${{ steps.setup-python.outputs.python-version }}
-DPython_ROOT_DIR:PATH=$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/${{ matrix.python-arch }}/
-DBUILD_TESTING:BOOL=ON
Expand All @@ -122,7 +136,7 @@ jobs:
run: >
cmake
-DCMAKE_BUILD_TYPE="${{ matrix.build-type }}"
-DLINK_WITH_PYTHON=OFF
-DLINK_WITH_PYTHON=${{ matrix.link-with-python }}
-DUSE_PSYCHROMETRICS_CACHING=OFF
-DUSE_GLYCOL_CACHING=OFF
-DOPENGL_REQUIRED=OFF
Expand Down
3 changes: 2 additions & 1 deletion src/EnergyPlus/GroundHeatExchangers/Vertical.cc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ GLHEVert::GLHEVert(EnergyPlusData &state, std::string const &objName, nlohmann::
if (this->gFuncCalcMethod == GFuncCalcMethod::FullDesign) {
#ifndef PYTHON_CLI
ShowFatalError(state, "Attempted to use borehole field design in a build without PYTHON_CLI, which is invalid");
#endif
#else
// g-functions won't be calculated until after sizing is complete
bool foundSizing = false;
bool objTypeFound = j.find("ghe_vertical_sizing_object_type") != j.end();
Expand Down Expand Up @@ -305,6 +305,7 @@ GLHEVert::GLHEVert(EnergyPlusData &state, std::string const &objName, nlohmann::
ShowSevereError(state, "Something went wrong creating response factor for GroundHeatExchanger, check previous errors.");
errorsFound = true;
}
#endif

} else if (j.find("ghe_vertical_array_object_name") != j.end()) {
// Response factors come from array object
Expand Down
Loading