diff --git a/.github/workflows/build-custom.yml b/.github/workflows/build-custom.yml index 0d0dc4e5..59ffb656 100644 --- a/.github/workflows/build-custom.yml +++ b/.github/workflows/build-custom.yml @@ -182,6 +182,11 @@ jobs: echo "Manually changing from pimpleFoam to pimpleDyMFoam for compatibility with OpenFOAM 5." sed -i 's/pimpleFoam/pimpleDyMFoam/g' system/controlDict fi + if [ "${{ github.event.inputs.versionOpenFOAM }}" == "OpenFOAM9" ] + then + echo "Manually changing from solver to motionSolver in dynamicMeshDict for compatibility with OpenFOAM 9." + sed -i 's/solver/motionSolver/g' constant/dynamicMeshDict + fi ${{steps.installOpenFOAM.outputs.openfoam_exec}} ./run.sh | tee fluid-openfoam.log 2>&1 & PIDfluid=$! cd ../solid-cpp diff --git a/Adapter.C b/Adapter.C index 98560abd..93dba227 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.0.", "info"); + adapterInfo("Loaded the OpenFOAM-preCICE adapter - v1.2.1.", "info"); return; } diff --git a/CHANGELOG.md b/CHANGELOG.md index b26d6da8..371c445c 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.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). + ## [v1.2.0] 2022-11-14 ### Added diff --git a/FSI/Force.C b/FSI/Force.C index a51791db..5f829645 100644 --- a/FSI/Force.C +++ b/FSI/Force.C @@ -19,7 +19,7 @@ preciceAdapter::FSI::Force::Force( } else { - ForceOwning_ = std::make_unique(volVectorField( + ForceOwning_.reset(new volVectorField( IOobject( nameForce, mesh_.time().timeName(), diff --git a/docs/openfoam-support.md b/docs/openfoam-support.md index 76c217f7..d5aa0364 100644 --- a/docs/openfoam-support.md +++ b/docs/openfoam-support.md @@ -29,11 +29,16 @@ We provide version-specific [release archives](https://github.com/precice/openfo - [OpenFOAM v1812-v2206](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) (several [changes to the tutorials](https://github.com/precice/tutorials/tree/OpenFOAM10) are also needed, read the [discussion](https://github.com/precice/tutorials/pull/283)) - - [OpenFOAM 9](https://github.com/precice/openfoam-adapter/tree/OpenFOAM9) (rename also `solver` to `motionSolver` in `constant/dynamicMeshDict`) + - [OpenFOAM 10](https://github.com/precice/openfoam-adapter/tree/OpenFOAM10) + - Several [changes to the tutorials](https://github.com/precice/tutorials/tree/OpenFOAM10) are also needed, read the [discussion](https://github.com/precice/tutorials/pull/283). + - Same limitations as for OpenFOAM 9. + - [OpenFOAM 9](https://github.com/precice/openfoam-adapter/tree/OpenFOAM9) + - Rename `solver` to `motionSolver` in `constant/dynamicMeshDict`. + - Limitations in adjustable time step size ([#261](https://github.com/precice/openfoam-adapter/issues/261)). - [OpenFOAM 8](https://github.com/precice/openfoam-adapter/tree/OpenFOAM8) - [OpenFOAM 7](https://github.com/precice/openfoam-adapter/tree/OpenFOAM7) - - [OpenFOAM 6](https://github.com/precice/openfoam-adapter/tree/OpenFOAM6) (modify also `residualControl` to `outerResidualControl` in `system/fvSolution`) + - [OpenFOAM 6](https://github.com/precice/openfoam-adapter/tree/OpenFOAM6) + - Modify also `residualControl` to `outerResidualControl` in `system/fvSolution`. - [OpenFOAM 5.x](https://github.com/precice/openfoam-adapter/tree/OpenFOAM5) - [OpenFOAM 4.0/4.1](https://github.com/precice/openfoam-adapter/tree/OpenFOAM4) (not tested) diff --git a/tools/release_pull_request_template.md b/tools/release_pull_request_template.md index ca72ea81..1e7a2736 100644 --- a/tools/release_pull_request_template.md +++ b/tools/release_pull_request_template.md @@ -25,22 +25,6 @@ Copy this template to the release pull request description. Until we get automated system tests again, run all the tests manually. -## Prepare version-specific branches - -- [ ] Rebase `OpenFOAM4` on `develop` and force-push - - `git checkout OpenFOAM4 && git rebase develop` - - Resolve any conflicts. We should have only one commit in the end. - - `git push --force` -- [ ] Rebase `OpenFOAM5` on `OpenFOAM4`, `OpenFOAM6` on `OpenFOAM5`, ... -- [ ] Trigger a custom build for each version - -Overview of branches: - -```text -master <-- OpenFOAM4 <-- OpenFOAM5 <-- OpenFOAM6 <-- OpenFOAM7 <-- OpenFOAM8 <-- OpenFOAMdev -^-- develop ^-- OpenFOAMv1806 -``` - ## Preparing the Changelog - [ ] Copy all the changelog entries into `CHANGELOG.md` @@ -60,7 +44,29 @@ master <-- OpenFOAM4 <-- OpenFOAM5 <-- OpenFOAM6 <-- OpenFOAM7 <-- OpenFOAM8 <-- - [ ] Review pull request - [ ] Merge pull request (**not** squash) -- [ ] Rebase the version-specific branches on `master` + +## Prepare version-specific branches + +- [ ] Rebase `OpenFOAM4` on `master` and force-push + - `git checkout OpenFOAM4 && git rebase develop` + - Resolve any conflicts. We should have only one commit in the end. + - `git push --force` +- [ ] Rebase `OpenFOAM5` on `OpenFOAM4`, `OpenFOAM6` on `OpenFOAM5`, ... +- [ ] Trigger a custom build for each version and tick each when it succeeds: + - [ ] OpenFOAM5 on Ubuntu 18.04 with preCICE 2.3.0 and tutorials from develop + - [ ] OpenFOAM6 on Ubuntu 18.04 with preCICE 2.3.0 and tutorials from develop + - [ ] OpenFOAM7 on Ubuntu 20.04 with preCICE latest and tutorials from develop + - [ ] OpenFOAM8 on Ubuntu 20.04 with preCICE latest and tutorials from develop + - [ ] OpenFOAM9 on Ubuntu 20.04 with preCICE latest and tutorials from develop + - [ ] OpenFOAM10 on Ubuntu 20.04 with preCICE latest and tutorials from OpenFOAM10 + - [ ] OpenFOAM v1912 (adapter master) on Ubuntu 18.04 with preCICE v2.3.0 and tutorials from develop + +Overview of branches: + +```text +master <-- OpenFOAM4 <-- OpenFOAM5 <-- OpenFOAM6 <-- OpenFOAM7 <-- ... <-- OpenFOAMdev +^-- develop ^-- OpenFOAMv1806 +``` ## Release @@ -76,7 +82,6 @@ master <-- OpenFOAM4 <-- OpenFOAM5 <-- OpenFOAM6 <-- OpenFOAM7 <-- OpenFOAM8 <-- - [ ] Merge back from `master` to `develop`. No PR is needed for that. - [ ] Modify the adapter version message to `Loaded the OpenFOAM-preCICE adapter v1.0.0 + unreleased changes`. -- [ ] Update the git module on the website - [ ] Update workflows in the tutorials repository, if needed (e.g., OpenFOAM version) - [ ] Update external documentation (tutorials, website), e.g., regarding the adapter or OpenFOAM version. - [ ] Quickstart