From 38a42b8e71f600ab86855da57aa58a257a076e2e Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Mon, 19 Dec 2022 15:56:04 +0100 Subject: [PATCH 1/6] Switch to unreleased version --- Adapter.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adapter.C b/Adapter.C index 93dba227..e7ca61ad 100644 --- a/Adapter.C +++ b/Adapter.C @@ -10,7 +10,7 @@ preciceAdapter::Adapter::Adapter(const Time& runTime, const fvMesh& mesh) : runTime_(runTime), mesh_(mesh) { - adapterInfo("Loaded the OpenFOAM-preCICE adapter - v1.2.1.", "info"); + adapterInfo("Loaded the OpenFOAM-preCICE adapter - v1.2.1 + unreleased changes.", "info"); return; } From d0fcd0537dcb734c63a55412ffdd6d6d49063885 Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Wed, 21 Dec 2022 19:50:49 +0100 Subject: [PATCH 2/6] Update docs notes on solids4foam --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index 1dad4983..584b458f 100644 --- a/docs/config.md +++ b/docs/config.md @@ -188,7 +188,7 @@ interface - For `readData(Displacement)` or `DisplacementDelta`, you need the following: - `type movingWallVelocity` for the interface (e.g., `flap`) in `0/U`, - `type fixedValue` for the interface (e.g., `flap`) in the `0/pointDisplacement`, and - - `solver displacementLaplacian` in the `constant/dynamicMeshDict`. The solver [`RBFMeshMotionSolver` from solids4foam is also known to work](https://github.com/precice/openfoam-adapter/pull/241), since the OpenFOAM adapter v1.2.0 and the [`nextRelease` branch (v2) of solids4foam](https://github.com/solids4foam/solids4foam/commit/971d4c08f0171cfd8d53a6f831ce0745d98521de). + - `solver displacementLaplacian` in the `constant/dynamicMeshDict`. The solver [`RBFMeshMotionSolver` from solids4foam is also known to work](https://github.com/precice/openfoam-adapter/pull/241), since the OpenFOAM adapter v1.2.0 and the solids4foam v2.0. ```c++ // File 0/U From e40fec1681a85d5147faa3100d21d28c2e205004 Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Tue, 3 Jan 2023 16:48:20 +0200 Subject: [PATCH 3/6] Fix compatibility with OpenFOAM v2212 Remove an unneeded refCast in SinkTemperature. --- CHT/SinkTemperature.C | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHT/SinkTemperature.C b/CHT/SinkTemperature.C index 8492119c..f373d650 100644 --- a/CHT/SinkTemperature.C +++ b/CHT/SinkTemperature.C @@ -24,9 +24,7 @@ void preciceAdapter::CHT::SinkTemperature::write(double* buffer, bool meshConnec int patchID = patchIDs_.at(j); // Get the boundary field of Temperature on the patch - const fvPatchScalarField& TPatch( - refCast( - T_->boundaryField()[patchID])); + const fvPatchScalarField& TPatch(T_->boundaryField()[patchID]); // Get the internal field next to the patch // TODO: Simplify? tmp patchInternalFieldTmp = TPatch.patchInternalField(); From cc64a0275c5604d9b9d5bc1585b50dcc4db12c04 Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Tue, 3 Jan 2023 16:52:48 +0200 Subject: [PATCH 4/6] Bump version to v1.2.2 --- Adapter.C | 2 +- CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Adapter.C b/Adapter.C index e7ca61ad..b82a5bc2 100644 --- a/Adapter.C +++ b/Adapter.C @@ -10,7 +10,7 @@ preciceAdapter::Adapter::Adapter(const Time& runTime, const fvMesh& mesh) : runTime_(runTime), mesh_(mesh) { - adapterInfo("Loaded the OpenFOAM-preCICE adapter - v1.2.1 + unreleased changes.", "info"); + adapterInfo("Loaded the OpenFOAM-preCICE adapter - v1.2.2.", "info"); return; } diff --git a/CHANGELOG.md b/CHANGELOG.md index 371c445c..d8cf466f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ Read more details in the issue [#52: Releases and versioning](https://github.com +## [v1.2.2] 2022-01-03 + +- Fix compatibility with OpenFOAM v2212, removing an unneeded `refCast` [commit e40fe](https://github.com/precice/openfoam-adapter/commit/e40fec1681a85d5147faa3100d21d28c2e205004). + ## [v1.2.1] 2022-12-15 - Replaced a `std::make_unique` by `new` in order to remain C++11 compatible and support older compilers [#264](https://github.com/precice/openfoam-adapter/pull/264). From 9b2b27fb6d0c9506c109e5a714d64607d4f73565 Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Tue, 3 Jan 2023 17:40:20 +0200 Subject: [PATCH 5/6] Document compatibility with OpenFOAM v2212 Also add in CI --- .github/workflows/build-custom.yml | 5 +++++ .github/workflows/build.yml | 4 ++-- .github/workflows/install-dependencies.sh | 4 ++-- README.md | 2 +- docs/openfoam-support.md | 8 ++++---- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-custom.yml b/.github/workflows/build-custom.yml index 59ffb656..aa4add22 100644 --- a/.github/workflows/build-custom.yml +++ b/.github/workflows/build-custom.yml @@ -19,6 +19,7 @@ on: required: true type: choice options: + - OpenFOAMv2212 - OpenFOAMv2206 - OpenFOAMv2112 - OpenFOAMv2106 @@ -78,6 +79,10 @@ jobs: id: installOpenFOAM run: | case "${{ github.event.inputs.versionOpenFOAM }}" in + OpenFOAMv2212) + wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash + sudo apt-get install openfoam2212-dev + echo "::set-output name=openfoam_exec::/usr/bin/openfoam2206";; OpenFOAMv2206) wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash sudo apt-get install openfoam2206-dev diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e388dce..fd80140a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build with OpenFOAM v2206 +name: Build with OpenFOAM v2212 on: push: branches-ignore: @@ -39,4 +39,4 @@ jobs: snapshot: '/' exclude: '/boot /data /dev /mnt /proc /run /sys' - name: Build OpenFOAM-preCICE adapter - run: /usr/bin/openfoam2206 ./Allwmake + run: /usr/bin/openfoam2212 ./Allwmake diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh index 128c1b88..b670d65c 100755 --- a/.github/workflows/install-dependencies.sh +++ b/.github/workflows/install-dependencies.sh @@ -1,8 +1,8 @@ #!/bin/bash -e -# Install OpenFOAM v2206 +# Install OpenFOAM v2212 wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash -sudo apt-get install openfoam2206-dev +sudo apt-get install openfoam2212-dev # Install preCICE v2.5.0 wget https://github.com/precice/precice/releases/download/v2.5.0/libprecice2_2.5.0_focal.deb diff --git a/README.md b/README.md index 211c7ce3..c9a186a0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # OpenFOAM-preCICE adapter -[![Build with OpenFOAM v2206](https://github.com/precice/openfoam-adapter/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/precice/openfoam-adapter/actions/workflows/build.yml) +[![Build with OpenFOAM v2212](https://github.com/precice/openfoam-adapter/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/precice/openfoam-adapter/actions/workflows/build.yml) [![Changelog](https://img.shields.io/badge/Keep%20a%20Changelog--555.svg?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9IiNmMTVkMzAiIHZpZXdCb3g9IjAgMCAxODcgMTg1Ij48cGF0aCBkPSJNNjIgN2MtMTUgMy0yOCAxMC0zNyAyMmExMjIgMTIyIDAgMDAtMTggOTEgNzQgNzQgMCAwMDE2IDM4YzYgOSAxNCAxNSAyNCAxOGE4OSA4OSAwIDAwMjQgNCA0NSA0NSAwIDAwNiAwbDMtMSAxMy0xYTE1OCAxNTggMCAwMDU1LTE3IDYzIDYzIDAgMDAzNS01MiAzNCAzNCAwIDAwLTEtNWMtMy0xOC05LTMzLTE5LTQ3LTEyLTE3LTI0LTI4LTM4LTM3QTg1IDg1IDAgMDA2MiA3em0zMCA4YzIwIDQgMzggMTQgNTMgMzEgMTcgMTggMjYgMzcgMjkgNTh2MTJjLTMgMTctMTMgMzAtMjggMzhhMTU1IDE1NSAwIDAxLTUzIDE2bC0xMyAyaC0xYTUxIDUxIDAgMDEtMTItMWwtMTctMmMtMTMtNC0yMy0xMi0yOS0yNy01LTEyLTgtMjQtOC0zOWExMzMgMTMzIDAgMDE4LTUwYzUtMTMgMTEtMjYgMjYtMzMgMTQtNyAyOS05IDQ1LTV6TTQwIDQ1YTk0IDk0IDAgMDAtMTcgNTQgNzUgNzUgMCAwMDYgMzJjOCAxOSAyMiAzMSA0MiAzMiAyMSAyIDQxLTIgNjAtMTRhNjAgNjAgMCAwMDIxLTE5IDUzIDUzIDAgMDA5LTI5YzAtMTYtOC0zMy0yMy01MWE0NyA0NyAwIDAwLTUtNWMtMjMtMjAtNDUtMjYtNjctMTgtMTIgNC0yMCA5LTI2IDE4em0xMDggNzZhNTAgNTAgMCAwMS0yMSAyMmMtMTcgOS0zMiAxMy00OCAxMy0xMSAwLTIxLTMtMzAtOS01LTMtOS05LTEzLTE2YTgxIDgxIDAgMDEtNi0zMiA5NCA5NCAwIDAxOC0zNSA5MCA5MCAwIDAxNi0xMmwxLTJjNS05IDEzLTEzIDIzLTE2IDE2LTUgMzItMyA1MCA5IDEzIDggMjMgMjAgMzAgMzYgNyAxNSA3IDI5IDAgNDJ6bS00My03M2MtMTctOC0zMy02LTQ2IDUtMTAgOC0xNiAyMC0xOSAzN2E1NCA1NCAwIDAwNSAzNGM3IDE1IDIwIDIzIDM3IDIyIDIyLTEgMzgtOSA0OC0yNGE0MSA0MSAwIDAwOC0yNCA0MyA0MyAwIDAwLTEtMTJjLTYtMTgtMTYtMzEtMzItMzh6bS0yMyA5MWgtMWMtNyAwLTE0LTItMjEtN2EyNyAyNyAwIDAxLTEwLTEzIDU3IDU3IDAgMDEtNC0yMCA2MyA2MyAwIDAxNi0yNWM1LTEyIDEyLTE5IDI0LTIxIDktMyAxOC0yIDI3IDIgMTQgNiAyMyAxOCAyNyAzM3MtMiAzMS0xNiA0MGMtMTEgOC0yMSAxMS0zMiAxMXptMS0zNHYxNGgtOFY2OGg4djI4bDEwLTEwaDExbC0xNCAxNSAxNyAxOEg5NnoiLz48L3N2Zz4K)](https://github.com/precice/openfoam-adapter/blob/develop/CHANGELOG.md) GNU GPL license diff --git a/docs/openfoam-support.md b/docs/openfoam-support.md index d5aa0364..79e2caf2 100644 --- a/docs/openfoam-support.md +++ b/docs/openfoam-support.md @@ -7,14 +7,14 @@ summary: Recent OpenFOAM.com versions work out-of-the-box. Recent OpenFOAM.org v ## How to get OpenFOAM -The easiest way to start is to get binary packages for your Linux distribution. For example, to [get OpenFOAM v2206 on Ubuntu](https://develop.openfoam.com/Development/openfoam/-/wikis/precompiled/debian#precompiled-packages-debianubuntu): +The easiest way to start is to get binary packages for your Linux distribution. For example, to [get OpenFOAM v2212 on Ubuntu](https://develop.openfoam.com/Development/openfoam/-/wikis/precompiled/debian#precompiled-packages-debianubuntu): ```bash # Add the signing key, add the repository, update: wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash -# Install OpenFOAM v2206: -sudo apt-get install openfoam2206-dev +# Install OpenFOAM v2212: +sudo apt-get install openfoam2212-dev ``` As these steps change your `.profile`, you need to log out and in again to make OpenFOAM fully discoverable. @@ -26,7 +26,7 @@ OpenFOAM is a project with long history and many forks, of which we try to suppo We provide version-specific [release archives](https://github.com/precice/openfoam-adapter/releases/latest) and respective Git branches for: - OpenCFD / ESI (openfoam.com) - main focus: - - [OpenFOAM v1812-v2206](https://github.com/precice/openfoam-adapter) or newer + - [OpenFOAM v1812-v2212](https://github.com/precice/openfoam-adapter) or newer - [OpenFOAM v1612-v1806](https://github.com/precice/openfoam-adapter/tree/OpenFOAMv1806) (not tested) - OpenFOAM Foundation (openfoam.org) - secondary, consider experimental: - [OpenFOAM 10](https://github.com/precice/openfoam-adapter/tree/OpenFOAM10) From eef7431ebb41a5ba58280a5a02e692c75333d0e7 Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Tue, 3 Jan 2023 17:47:15 +0200 Subject: [PATCH 6/6] Update changelog for v1.2.2 --- .github/workflows/build-custom.yml | 2 +- CHANGELOG.md | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-custom.yml b/.github/workflows/build-custom.yml index aa4add22..2dc6d5fa 100644 --- a/.github/workflows/build-custom.yml +++ b/.github/workflows/build-custom.yml @@ -82,7 +82,7 @@ jobs: OpenFOAMv2212) wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash sudo apt-get install openfoam2212-dev - echo "::set-output name=openfoam_exec::/usr/bin/openfoam2206";; + echo "::set-output name=openfoam_exec::/usr/bin/openfoam2212";; OpenFOAMv2206) wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash sudo apt-get install openfoam2206-dev diff --git a/CHANGELOG.md b/CHANGELOG.md index d8cf466f..7372bdf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,18 @@ Read more details in the issue [#52: Releases and versioning](https://github.com ## [v1.2.2] 2022-01-03 -- Fix compatibility with OpenFOAM v2212, removing an unneeded `refCast` [commit e40fe](https://github.com/precice/openfoam-adapter/commit/e40fec1681a85d5147faa3100d21d28c2e205004). +### Changed + +- Updated the default OpenFOAM version in documentation and CI to v2212 [commit 9b2b2](https://github.com/precice/openfoam-adapter/commit/9b2b27fb6d0c9506c109e5a714d64607d4f73565). + +### Fixed + +- Fixed compatibility with OpenFOAM v2212, removing an unneeded `refCast` [commit e40fe](https://github.com/precice/openfoam-adapter/commit/e40fec1681a85d5147faa3100d21d28c2e205004). ## [v1.2.1] 2022-12-15 +### Fixed + - Replaced a `std::make_unique` by `new` in order to remain C++11 compatible and support older compilers [#264](https://github.com/precice/openfoam-adapter/pull/264). ## [v1.2.0] 2022-11-14