From b8205b42f93c7c0ae94f989017bf0dd1d8896a9b Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Thu, 21 Mar 2024 09:53:25 +0100 Subject: [PATCH 1/3] Add information about v2.20.1 relying on preCICE v3.0.0 in the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 245169c..7be6df8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The adapter was initially developed for conjugate heat transfer (CHT) simulations via preCICE by Lucia Cheung in the scope of her master’s thesis [[1]](https://www5.in.tum.de/pub/Cheung2016_Thesis.pdf) in cooperation with [SimScale](https://www.simscale.com/). For running the adapter for CHT simulations refer to this thesis. The adapter was extended to fluid-structure interaction by Alexander Rusch [[2]](https://www.gacm2017.uni-stuttgart.de/registration/Upload/ExtendedAbstracts/ExtendedAbstract_0138.pdf). The latest version of the adapter is based on **CalculiX version 2.20.** -Legacy versions of the adapter for older versions of CalculiX are supported on various branches. Branches for CalculiX version older than 2.15 require **preCICE v1.x**, whereas newer versions rely on **preCICE v2.x**. +Legacy versions of the adapter for older versions of CalculiX are supported on various branches. Branches for CalculiX version older than 2.15 require **preCICE v1.x**, whereas newer versions rely on **preCICE v2.x**. The release [v2.20.1](https://github.com/precice/calculix-adapter/releases/tag/v2.20.1) relies on **preCICE v3.0.x**. ## Start here From 2b5802ef1426b727a2f71e1d88806bfd9e7a63f6 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Wed, 3 Apr 2024 08:52:10 +0200 Subject: [PATCH 2/3] Remove last traces of libprecice2 (#123) --- packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control b/packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control index 225c1a5..784b9a0 100644 --- a/packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control +++ b/packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control @@ -5,7 +5,7 @@ Architecture: amd64 Section: contrib/science Priority: optional Maintainer: The preCICE team (precice.org) -Depends: libarpack2 (>= 2.1), libblas3 | libblas.so.3, libc6 (>= 2.29), libgcc-s1 (>= 4.0), libgfortran5 (>= 8), libgomp1 (>= 4.9), liblapack3 | liblapack.so.3, libprecice2 (>= 2.0.0), libspooles2.2, libstdc++6 (>= 9), libyaml-cpp0.6 (>= 0.6.2) | libyaml-cpp0.7 +Depends: libarpack2 (>= 2.1), libblas3 | libblas.so.3, libc6 (>= 2.29), libgcc-s1 (>= 4.0), libgfortran5 (>= 8), libgomp1 (>= 4.9), liblapack3 | liblapack.so.3, libprecice3 (>= 3.0.0), libspooles2.2, libstdc++6 (>= 9), libyaml-cpp0.6 (>= 0.6.2) | libyaml-cpp0.7 Bugs: https://github.com/precice/calculix-adapter/issues Description: Official preCICE adapter for CalculiX. CalculiX is a Finite Element Method solver for structural mechanics. From 374fc7cae0be8be98fd356f0d7939f822a902b13 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Fri, 5 Apr 2024 10:26:17 +0200 Subject: [PATCH 3/3] Revert version bump and bump debian package version --- .github/workflows/ubuntu_build.yml | 6 +++--- README.md | 2 +- .../DEBIAN/control | 2 +- .../usr/share/doc/calculix-precice3/copyright | 0 packaging/make_deb.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename packaging/{calculix-precice3_2.20.1-1_amd64 => calculix-precice3_2.20.1-2_amd64}/DEBIAN/control (97%) rename packaging/{calculix-precice3_2.20.1-1_amd64 => calculix-precice3_2.20.1-2_amd64}/usr/share/doc/calculix-precice3/copyright (100%) diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 2d12a36..3b28908 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -20,7 +20,7 @@ jobs: container: precice/precice:develop continue-on-error: true env: # Versioning is "calculix-preciceX_2.YY-Z[...]" with X the major preCICE version, YY the minor CCX version and Z the package version - PACKAGE_NAME: "calculix-precice3_2.20.1-1_amd64" + PACKAGE_NAME: "calculix-precice3_2.20.1-2_amd64" steps: - name: Update system @@ -45,8 +45,8 @@ jobs: run: sudo apt install lintian pandoc -y - name: Create Debian Package run: | - mkdir -p "packaging/calculix-precice3_2.20.1-1_amd64/usr/bin" && - cp ./bin/ccx_preCICE ./packaging/calculix-precice3_2.20.1-1_amd64/usr/bin/ccx_preCICE && + mkdir -p "packaging/calculix-precice3_2.20.1-2_amd64/usr/bin" && + cp ./bin/ccx_preCICE ./packaging/calculix-precice3_2.20.1-2_amd64/usr/bin/ccx_preCICE && cd packaging && pwd && bash ./make_deb.sh ${{matrix.name}} - name: Store Debian package artifact uses: actions/upload-artifact@v2 diff --git a/README.md b/README.md index 7be6df8..58fadec 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The adapter was initially developed for conjugate heat transfer (CHT) simulations via preCICE by Lucia Cheung in the scope of her master’s thesis [[1]](https://www5.in.tum.de/pub/Cheung2016_Thesis.pdf) in cooperation with [SimScale](https://www.simscale.com/). For running the adapter for CHT simulations refer to this thesis. The adapter was extended to fluid-structure interaction by Alexander Rusch [[2]](https://www.gacm2017.uni-stuttgart.de/registration/Upload/ExtendedAbstracts/ExtendedAbstract_0138.pdf). The latest version of the adapter is based on **CalculiX version 2.20.** -Legacy versions of the adapter for older versions of CalculiX are supported on various branches. Branches for CalculiX version older than 2.15 require **preCICE v1.x**, whereas newer versions rely on **preCICE v2.x**. The release [v2.20.1](https://github.com/precice/calculix-adapter/releases/tag/v2.20.1) relies on **preCICE v3.0.x**. +Legacy versions of the adapter for older versions of CalculiX are supported on various branches. Branches for CalculiX version older than 2.15 require **preCICE v1.x**, whereas newer versions rely on **preCICE v2.x**. Releases **v2.20.1** and above rely on **preCICE v3.0.x**. ## Start here diff --git a/packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control b/packaging/calculix-precice3_2.20.1-2_amd64/DEBIAN/control similarity index 97% rename from packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control rename to packaging/calculix-precice3_2.20.1-2_amd64/DEBIAN/control index 784b9a0..21df4c5 100644 --- a/packaging/calculix-precice3_2.20.1-1_amd64/DEBIAN/control +++ b/packaging/calculix-precice3_2.20.1-2_amd64/DEBIAN/control @@ -1,5 +1,5 @@ Package: calculix-precice3 -Version: 2.20.1-1 +Version: 2.20.1-2 Source: calculix-precice3 Architecture: amd64 Section: contrib/science diff --git a/packaging/calculix-precice3_2.20.1-1_amd64/usr/share/doc/calculix-precice3/copyright b/packaging/calculix-precice3_2.20.1-2_amd64/usr/share/doc/calculix-precice3/copyright similarity index 100% rename from packaging/calculix-precice3_2.20.1-1_amd64/usr/share/doc/calculix-precice3/copyright rename to packaging/calculix-precice3_2.20.1-2_amd64/usr/share/doc/calculix-precice3/copyright diff --git a/packaging/make_deb.sh b/packaging/make_deb.sh index b5a560f..235d3cb 100755 --- a/packaging/make_deb.sh +++ b/packaging/make_deb.sh @@ -2,7 +2,7 @@ DISTRIBUTION="_$1" ADAPTER_VERSION="2.20.1" -PACKAGE_VERSION="1" +PACKAGE_VERSION="2" PACKAGE_FOLDER="calculix-precice3_$ADAPTER_VERSION-${PACKAGE_VERSION}_amd64"