Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to OpenFOAM 2212 #4

Merged
merged 6 commits into from
May 1, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions .github/workflows/openfoam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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() }}
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
conan
conan==1.58.0
oftest
pyzmq
2 changes: 2 additions & 0 deletions src/externalComm/Make/options
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand All @@ -29,5 +30,6 @@ LIB_LIBS = \
-ldynamicMesh \
-lmeshTools \
-lforces \
-lthermoTools \
$(CONAN_LIBS)

2 changes: 2 additions & 0 deletions src/externalComm/Make/options.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand All @@ -22,5 +23,6 @@ LIB_LIBS = \
-ldynamicMesh \
-lmeshTools \
-lforces \
-lthermoTools \
$(CONAN_LIBS)

Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ coupledWallHeatFluxTemperatureFvPatchScalarField
mixedFvPatchScalarField(p, iF),
temperatureCoupledBase
(
patch(),
"undefined",
"undefined",
"undefined-K",
"undefined-alpha"
patch()
),
mode_(fixedPower),
Q_(0),
Expand Down
2 changes: 1 addition & 1 deletion src/externalComm/externalIO/output/extForces/extForces.C
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ bool Foam::externalIOObject::extForces::execute()
}

functionObjects::forces f("forces", time_, forceDict);
f.calcForcesMoment();
f.calcForcesMoments();

vector& F = data.getObj<vector>(forceName_,commDataLayer::causality::out);
F = f.forceEff();
Expand Down