Skip to content

Commit

Permalink
Release v1.2.1 (#268)
Browse files Browse the repository at this point in the history
Release v1.2.1
  • Loading branch information
MakisH committed Dec 19, 2022
2 parents 7afeaed + cdd8f9c commit 6cf3dac
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 23 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build-custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Adapter.C
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Read more details in the issue [#52: Releases and versioning](https://github.com

<!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->

## [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
Expand Down
2 changes: 1 addition & 1 deletion FSI/Force.C
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ preciceAdapter::FSI::Force::Force(
}
else
{
ForceOwning_ = std::make_unique<volVectorField>(volVectorField(
ForceOwning_.reset(new volVectorField(
IOobject(
nameForce,
mesh_.time().timeName(),
Expand Down
11 changes: 8 additions & 3 deletions docs/openfoam-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
41 changes: 23 additions & 18 deletions tools/release_pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 6cf3dac

Please sign in to comment.