diff --git a/.github/workflows/4-1-partitioned-oscillator.yml b/.github/workflows/4-1-partitioned-oscillator.yml index fe1ab79..8c7484b 100644 --- a/.github/workflows/4-1-partitioned-oscillator.yml +++ b/.github/workflows/4-1-partitioned-oscillator.yml @@ -31,7 +31,7 @@ jobs: defaults: run: working-directory: experiments/oscillator-overlap - container: precice/precice:3.3.0 + container: precice/precice:3.4.1 steps: - name: Checkout Repository uses: actions/checkout@v4 diff --git a/.github/workflows/4-2-partitioned-heat-conduction.yml b/.github/workflows/4-2-partitioned-heat-conduction.yml index 670db04..545841a 100644 --- a/.github/workflows/4-2-partitioned-heat-conduction.yml +++ b/.github/workflows/4-2-partitioned-heat-conduction.yml @@ -33,7 +33,7 @@ jobs: defaults: run: working-directory: experiments/partitioned-heat-conduction - container: precice/precice:3.3.0 + container: precice/precice:3.4.1 steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -80,7 +80,7 @@ jobs: defaults: run: working-directory: experiments/partitioned-heat-conduction - container: precice/precice:3.3.0 + container: precice/precice:3.4.1 steps: - name: Checkout Repository uses: actions/checkout@v4 diff --git a/.github/workflows/4-3-perpendicular-flap.yml b/.github/workflows/4-3-perpendicular-flap.yml index 4248af3..ab8bf43 100644 --- a/.github/workflows/4-3-perpendicular-flap.yml +++ b/.github/workflows/4-3-perpendicular-flap.yml @@ -21,7 +21,7 @@ jobs: shell: bash working-directory: experiments/perpendicular-flap # built using tools/docker/fenics-openfoam/Dockerfile - container: benjaminrodenberg/fenics-openfoam:3.3.0 + container: benjaminrodenberg/fenics-openfoam:3.4.1 steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -30,7 +30,7 @@ jobs: - name: Activate OpenFOAM # From https://github.com/gerlero/setup-openfoam/blob/68e0bf96c7f2aac1a100291a5d61fff934a472a8/action.yml#L54-L69 run: | old_path="$PATH" - source /usr/lib/openfoam/openfoam2412/etc/bashrc || true + source /usr/lib/openfoam/openfoam2512/etc/bashrc || true for var in "${!WM_@}"; do echo "$var=${!var}" >> "$GITHUB_ENV" diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index fafdc5a..2623a69 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -4,7 +4,7 @@ on: jobs: build_precice_openfoam: - name: "Build preCICE 3.3.0 on top of opencfd/openfoam-dev:2412" + name: "Build preCICE 3.4.1 on top of opencfd/openfoam-dev:2512" runs-on: ubuntu-latest env: docker_username: benjaminrodenberg @@ -21,7 +21,7 @@ jobs: with: push: true file: "./tools/docker/precice-openfoam/Dockerfile" - tags: ${{ env.docker_username }}/precice-openfoam:3.3.0 + tags: ${{ env.docker_username }}/precice-openfoam:3.4.1 build_fenics_openfoam: name: "Build FEniCS-OpenFOAM" needs: build_precice_openfoam @@ -41,4 +41,4 @@ jobs: with: push: true file: "./tools/docker/fenics-openfoam/Dockerfile" - tags: ${{ env.docker_username }}/fenics-openfoam:3.3.0 + tags: ${{ env.docker_username }}/fenics-openfoam:3.4.1 diff --git a/experiments/README.md b/experiments/README.md index d70c5b4..e4dece7 100644 --- a/experiments/README.md +++ b/experiments/README.md @@ -18,9 +18,9 @@ You can start from a recent Linux-based system (Ubuntu 24.04 is recommended). Th ### preCICE components -* preCICE [`3.3.0`](https://github.com/precice/precice/releases/tag/v3.3.0) -* pyprecice [`3.3.1`](https://github.com/precice/python-bindings/releases/tag/v3.3.1) (automatically installed via `requirements.txt` of the respective cases) -* FEniCS adapter [`2.2.0`](https://github.com/precice/fenics-adapter/releases/tag/v2.2.0) (automatically installed via `requirements.txt` of the respective cases) +* preCICE [`3.4.1`](https://github.com/precice/precice/releases/tag/v3.4.1) +* pyprecice [`3.4.0`](https://github.com/precice/python-bindings/releases/tag/v3.4.0) (automatically installed via `requirements.txt` of the respective cases) +* FEniCS adapter [`2.3.0`](https://github.com/precice/fenics-adapter/releases/tag/v2.3.0) (automatically installed via `requirements.txt` of the respective cases) * OpenFOAM adapter [`1.3.1`](https://github.com/precice/openfoam-adapter/releases/tag/v1.3.1) ### Other dependencies @@ -28,17 +28,17 @@ You can start from a recent Linux-based system (Ubuntu 24.04 is recommended). Th * The Python package [prepesthel](https://pypi.org/project/prepesthel/) for automation of preCICE runs (automatically installed via `requirements.txt` of the respective cases) * Additional python packages (automatically installed via `requirements.txt` of the respective cases) * FEniCS `2019.2.0.64.dev0` (installed from FEniCS PPA https://launchpad.net/~fenics-packages/+archive/ubuntu/fenics; compare version provided by `python3 -c "import dolfin;print(dolfin.__version__)"` or run `fenics-version`) -* OpenFOAM `2412` from OpenCFD / ESI (openfoam.com) +* OpenFOAM `2512` from OpenCFD / ESI (openfoam.com) ### Installing the required dependencies The following steps will install the required dependencies: -1. **preCICE**: Download the Debian package (`.deb`) of [preCICE v3.3.0](https://github.com/precice/precice/releases/tag/v3.3.0) and install it on your system by running the command +1. **preCICE**: Download the Debian package (`.deb`) of [preCICE v3.4.1](https://github.com/precice/precice/releases/tag/v3.4.1) and install it on your system by running the command ```sh - wget https://github.com/precice/precice/releases/download/v3.3.0/libprecice3_3.3.0_noble.deb - sudo apt install -y libprecice3_3.3.0_noble.deb + wget https://github.com/precice/precice/releases/download/v3.4.1/libprecice3_3.4.1_noble.deb + sudo apt install -y libprecice3_3.4.1_noble.deb ``` Note: The code name `noble` refers to Ubuntu 24.04, see [Ubuntu docs](https://documentation.ubuntu.com/project/release-team/list-of-releases/). If you are using a different Ubuntu version, please replace `noble` with the respective code name. @@ -54,24 +54,24 @@ The following steps will install the required dependencies: These installation instructions are similar to the instructions the [FEniCS docs](https://fenicsproject.org/download/archive/). -3. **OpenFOAM 2414**: Enter the following commands: +3. **OpenFOAM 2512**: Enter the following commands: ```sh curl -s https://dl.openfoam.com/add-debian-repo.sh | sudo bash sudo apt update - sudo apt install -y openfoam2412-default + sudo apt install -y openfoam2512-default ``` These installation instructions are similar to the instructions from the [OpenFOAM docs](https://develop.openfoam.com/Development/openfoam/-/wikis/precompiled/debian). After that, you also need to source the OpenFOAM bashrc file: ```sh - source /usr/lib/openfoam/openfoam2412/etc/bashrc + source /usr/lib/openfoam/openfoam2512/etc/bashrc ``` You can also append this line to your `~/.bashrc` file by running ```sh - echo "source /usr/lib/openfoam/openfoam2412/etc/bashrc" >> ~/.bashrc + echo "source /usr/lib/openfoam/openfoam2512/etc/bashrc" >> ~/.bashrc ``` 4. **OpenFOAM adapter**: Enter the following commands: diff --git a/tools/docker/fenics-openfoam/Dockerfile b/tools/docker/fenics-openfoam/Dockerfile index 69b8e1e..6b05b56 100644 --- a/tools/docker/fenics-openfoam/Dockerfile +++ b/tools/docker/fenics-openfoam/Dockerfile @@ -1,4 +1,4 @@ -FROM benjaminrodenberg/precice-openfoam:3.3.0 +FROM benjaminrodenberg/precice-openfoam:3.4.1 USER root @@ -6,13 +6,13 @@ USER root RUN apt-get -qq update && \ apt-get -qq install --no-install-recommends wget software-properties-common -# OpenFOAM.com does not work; OpenFOAM installation already provided in benjaminrodenberg/precice-openfoam:3.3.0 +# OpenFOAM.com does not work; OpenFOAM installation already provided in benjaminrodenberg/precice-openfoam:3.4.1 # # Install OpenFOAM # RUN wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | bash && \ -# apt-get -qq install openfoam2412-dev && \ +# apt-get -qq install openfoam2512-dev && \ # rm -rf /var/lib/apt/lists/* -RUN echo '. /usr/lib/openfoam/openfoam2412/etc/bashrc' >> /root/.bashrc && \ - echo '. /usr/lib/openfoam/openfoam2412/etc/bashrc' >> /home/precice/.bashrc +RUN echo '. /usr/lib/openfoam/openfoam2512/etc/bashrc' >> /root/.bashrc && \ + echo '. /usr/lib/openfoam/openfoam2512/etc/bashrc' >> /home/precice/.bashrc # Install FEniCS RUN add-apt-repository -y ppa:fenics-packages/fenics && \ diff --git a/tools/docker/precice-openfoam/Dockerfile b/tools/docker/precice-openfoam/Dockerfile index 3d7f57d..76c9ec7 100644 --- a/tools/docker/precice-openfoam/Dockerfile +++ b/tools/docker/precice-openfoam/Dockerfile @@ -1,7 +1,7 @@ # Based on https://github.com/precice/precice/blob/625092d2c2f23f021708e8d74228d523742d1e1f/tools/releasing/packaging/docker/release.dockerfile # Use OpenFOAM docker container as basis. -FROM opencfd/openfoam-dev:2412 +FROM opencfd/openfoam-dev:2512 # Remove OpenFOAM PPA RUN rm /etc/apt/sources.list.d/openfoam.list # Add the precice user @@ -11,7 +11,7 @@ ARG TIMEZONE=Europe/Berlin RUN export TZ=$TIMEZONE && echo $TZ > /etc/timezone && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \ apt-get -yy update && apt-get -yy install wget tzdata lsb-release && rm -rf /var/lib/apt/lists/* # The version to fetch the package for: X.Y.Z -ARG version=3.3.0 +ARG version=3.4.1 RUN echo "$version" | grep "[0-9]\+\.[0-9]\+\.[0-9]\+" > /dev/null # The version must follow the format X.Y.Z RUN wget -q -O libprecice.deb https://github.com/precice/precice/releases/download/v${version}/libprecice`echo ${version} | sed 's/\([0-9]\+\)\.\([0-9]\+\.[0-9]\+\)/\1_\1.\2/'`_$(lsb_release -sc).deb && \ apt-get update && apt-get -yy install ./libprecice.deb && \