From b0447047ef19bc072cfb3c8a541c787554e715de Mon Sep 17 00:00:00 2001 From: carloFiorina <37706622+carlo-fiorina@users.noreply.github.com> Date: Mon, 1 May 2023 13:46:45 -0500 Subject: [PATCH 1/6] Update options --- src/externalComm/Make/options | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/externalComm/Make/options b/src/externalComm/Make/options index 94a8e84..e432baf 100644 --- a/src/externalComm/Make/options +++ b/src/externalComm/Make/options @@ -20,6 +20,7 @@ EXE_INC = \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/thermoTools/lnInclude \ $(CONAN_INCS) LIB_LIBS = \ @@ -29,5 +30,6 @@ LIB_LIBS = \ -ldynamicMesh \ -lmeshTools \ -lforces \ + -lthermoTools \ $(CONAN_LIBS) From c397898625fb1d5f40beb322f2510386977e4a1f Mon Sep 17 00:00:00 2001 From: carloFiorina <37706622+carlo-fiorina@users.noreply.github.com> Date: Mon, 1 May 2023 13:48:25 -0500 Subject: [PATCH 2/6] Update coupledWallHeatFluxTemperatureFvPatchScalarField.C --- .../coupledWallHeatFluxTemperatureFvPatchScalarField.C | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/externalComm/externalIO/input/BC/coupledWallHeatFluxTemperature/coupledWallHeatFluxTemperatureFvPatchScalarField.C b/src/externalComm/externalIO/input/BC/coupledWallHeatFluxTemperature/coupledWallHeatFluxTemperatureFvPatchScalarField.C index 63e9f55..814cd0e 100644 --- a/src/externalComm/externalIO/input/BC/coupledWallHeatFluxTemperature/coupledWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/externalComm/externalIO/input/BC/coupledWallHeatFluxTemperature/coupledWallHeatFluxTemperatureFvPatchScalarField.C @@ -51,11 +51,7 @@ coupledWallHeatFluxTemperatureFvPatchScalarField mixedFvPatchScalarField(p, iF), temperatureCoupledBase ( - patch(), - "undefined", - "undefined", - "undefined-K", - "undefined-alpha" + patch() ), mode_(fixedPower), Q_(0), From e21d302a24e6ced2403ce8392101fab5c576e5ae Mon Sep 17 00:00:00 2001 From: carloFiorina <37706622+carlo-fiorina@users.noreply.github.com> Date: Mon, 1 May 2023 13:49:37 -0500 Subject: [PATCH 3/6] Update extForces.C --- src/externalComm/externalIO/output/extForces/extForces.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/externalComm/externalIO/output/extForces/extForces.C b/src/externalComm/externalIO/output/extForces/extForces.C index 6797498..c4f437d 100644 --- a/src/externalComm/externalIO/output/extForces/extForces.C +++ b/src/externalComm/externalIO/output/extForces/extForces.C @@ -99,7 +99,7 @@ bool Foam::externalIOObject::extForces::execute() } functionObjects::forces f("forces", time_, forceDict); - f.calcForcesMoment(); + f.calcForcesMoments(); vector& F = data.getObj(forceName_,commDataLayer::causality::out); F = f.forceEff(); From 7acf25ec9f52490f67a5cfa9e27b8502755e9b9b Mon Sep 17 00:00:00 2001 From: "Scheufler, Henning" Date: Mon, 1 May 2023 21:21:57 +0200 Subject: [PATCH 4/6] Fix: downgraded conan --- .github/workflows/openfoam.yml | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/openfoam.yml b/.github/workflows/openfoam.yml index 5b0618e..f88bbb2 100644 --- a/.github/workflows/openfoam.yml +++ b/.github/workflows/openfoam.yml @@ -19,7 +19,7 @@ jobs: run: | curl -s https://dl.openfoam.com/add-debian-repo.sh | sudo bash wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash - sudo apt-get install openfoam2106-dev + sudo apt-get install openfoam2212-dev - name: compile library shell: bash run: | @@ -37,14 +37,14 @@ jobs: cd ../.. # compile OpenFOAM - openfoam2106 -c ./Allwmake + openfoam2212 -c ./Allwmake - name: test shell: bash run: | python -m pip install --upgrade pip pip install -r requirements.txt - openfoam2106 -c "py.test -v --tb=auto -s" + openfoam2212 -c "py.test -v --tb=auto -s" - name: upload logs if: ${{ failure() }} diff --git a/requirements.txt b/requirements.txt index 1ada63d..df64980 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -conan +conan==1.58.0 oftest pyzmq \ No newline at end of file From 35ba23c3737aeb76ccaa23123c5a0c1e1068fce1 Mon Sep 17 00:00:00 2001 From: "Scheufler, Henning" Date: Mon, 1 May 2023 21:40:36 +0200 Subject: [PATCH 5/6] FIX option template --- src/externalComm/Make/options.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/externalComm/Make/options.template b/src/externalComm/Make/options.template index 8b2942d..c657713 100644 --- a/src/externalComm/Make/options.template +++ b/src/externalComm/Make/options.template @@ -13,6 +13,7 @@ EXE_INC = \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/thermoTools/lnInclude \ $(CONAN_INCS) LIB_LIBS = \ @@ -22,5 +23,6 @@ LIB_LIBS = \ -ldynamicMesh \ -lmeshTools \ -lforces \ + -lthermoTools \ $(CONAN_LIBS) From 004e8e3d67fe5e76bb15d8958172d644c1c2dcea Mon Sep 17 00:00:00 2001 From: "Scheufler, Henning" Date: Mon, 1 May 2023 21:46:22 +0200 Subject: [PATCH 6/6] DOC: changed support version --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d8ad1d4..429dbaa 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,13 @@ External Coupling Interface 4 FOAM ECI4FOAM provides an interface for coupling e ## Installation -requires OpenFOAM of2012 or higher sourced and installed and python 3.7+ (conda is highly recommended) +requires OpenFOAM of2212 or higher sourced and installed and python 3.7+ (conda is highly recommended) ``` ./build-ECI4FOAM.sh # will install conan zmq oftest ``` + +Note: Older version are supported on v1.0.1 ## Testsuite install oftest to automatically test OpenFOAM with py.test