From 533a05f9f940840156e28138aa22370559f7d4f5 Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Mon, 2 Mar 2026 16:45:19 +0100 Subject: [PATCH 01/10] add pybind11 to dockerfile --- tools/tests/dockerfiles/ubuntu_2404/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile index e87599880..b687ce711 100644 --- a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile +++ b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile @@ -205,7 +205,15 @@ RUN python3 -m venv /home/precice/venv && \ git checkout ${MICRO_MANAGER_VERSION} && \ pip3 install . -FROM micro_manager AS dumux_adapter +FROM micro_manager AS pybind11 +USER precice +WORKDIR /home/precice +COPY --from=precice /home/precice/.local/ /home/precice/.local/ +RUN python3 -m venv /home/precice/venv && \ + . /home/precice/venv/bin/activate && \ + pip3 install pybind11 + +FROM pybind11 AS dumux_adapter USER root COPY --from=precice /home/precice/.local/ /home/precice/.local/ ARG DUNE_VERSION From 267436bf2b0d296916e0e7ecb2133bd8e2bdac46 Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Tue, 3 Mar 2026 10:22:44 +0100 Subject: [PATCH 02/10] merge pybind11 into MM installation --- tools/tests/dockerfiles/ubuntu_2404/Dockerfile | 6 +----- tools/tests/tests.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile index b687ce711..da42ec25b 100644 --- a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile +++ b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile @@ -204,16 +204,12 @@ RUN python3 -m venv /home/precice/venv && \ cd micro-manager && \ git checkout ${MICRO_MANAGER_VERSION} && \ pip3 install . - -FROM micro_manager AS pybind11 -USER precice WORKDIR /home/precice -COPY --from=precice /home/precice/.local/ /home/precice/.local/ RUN python3 -m venv /home/precice/venv && \ . /home/precice/venv/bin/activate && \ pip3 install pybind11 -FROM pybind11 AS dumux_adapter +FROM precice_dependencies AS dumux_adapter USER root COPY --from=precice /home/precice/.local/ /home/precice/.local/ ARG DUNE_VERSION diff --git a/tools/tests/tests.yaml b/tools/tests/tests.yaml index cc18820ea..fce38ea38 100644 --- a/tools/tests/tests.yaml +++ b/tools/tests/tests.yaml @@ -41,16 +41,16 @@ test_suites: reference_result: ./perpendicular-flap/reference-results/fluid-openfoam_solid-calculix.tar.gz dumux_test: tutorials: - - path: free-flow-over-porous-media - case_combination: - - free-flow-dumux - - porous-media-dumux - reference_result: ./free-flow-over-porous-media/reference-results/free-flow-dumux_porous-media-dumux.tar.gz - path: two-scale-heat-conduction case_combination: - macro-dumux - micro-dumux reference_result: ./two-scale-heat-conduction/reference-results/macro-dumux_micro-dumux.tar.gz + - path: free-flow-over-porous-media + case_combination: + - free-flow-dumux + - porous-media-dumux + reference_result: ./free-flow-over-porous-media/reference-results/free-flow-dumux_porous-media-dumux.tar.gz su2_test: tutorials: - path: perpendicular-flap From 5d46091136aa15ca67236d156e9add3f588d16f2 Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Tue, 3 Mar 2026 10:31:32 +0100 Subject: [PATCH 03/10] typing mistake --- tools/tests/dockerfiles/ubuntu_2404/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile index da42ec25b..3fc3a0532 100644 --- a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile +++ b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile @@ -209,7 +209,7 @@ RUN python3 -m venv /home/precice/venv && \ . /home/precice/venv/bin/activate && \ pip3 install pybind11 -FROM precice_dependencies AS dumux_adapter +FROM precice_dependecies AS dumux_adapter USER root COPY --from=precice /home/precice/.local/ /home/precice/.local/ ARG DUNE_VERSION From a8d7cd5b73e10b9c99fb94c38922083839e043c2 Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Tue, 3 Mar 2026 11:22:33 +0100 Subject: [PATCH 04/10] add both components --- two-scale-heat-conduction/metadata.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/two-scale-heat-conduction/metadata.yaml b/two-scale-heat-conduction/metadata.yaml index 4bce52559..99d51e3fd 100644 --- a/two-scale-heat-conduction/metadata.yaml +++ b/two-scale-heat-conduction/metadata.yaml @@ -17,4 +17,6 @@ cases: participant: Micro-Manager directory: ./micro-dumux run: ./run.sh -l /home/precice/dumux - component: dumux-adapter + component: + - dumux-adapter + - micro-manager From ce4adf34630b88373e7d85b407203c3edb9d9634 Mon Sep 17 00:00:00 2001 From: June <94080048+Fujikawas@users.noreply.github.com> Date: Thu, 12 Mar 2026 09:14:36 +0100 Subject: [PATCH 05/10] Remove double components metadata.yaml --- two-scale-heat-conduction/metadata.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/two-scale-heat-conduction/metadata.yaml b/two-scale-heat-conduction/metadata.yaml index 99d51e3fd..4bce52559 100644 --- a/two-scale-heat-conduction/metadata.yaml +++ b/two-scale-heat-conduction/metadata.yaml @@ -17,6 +17,4 @@ cases: participant: Micro-Manager directory: ./micro-dumux run: ./run.sh -l /home/precice/dumux - component: - - dumux-adapter - - micro-manager + component: dumux-adapter From 586358e094b4087f07ffe2a53e7f95f38a3e0175 Mon Sep 17 00:00:00 2001 From: June <94080048+Fujikawas@users.noreply.github.com> Date: Thu, 12 Mar 2026 09:16:14 +0100 Subject: [PATCH 06/10] Update dumux_adapter dependency --- tools/tests/dockerfiles/ubuntu_2404/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile index 3fc3a0532..a9cc75352 100644 --- a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile +++ b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile @@ -209,7 +209,7 @@ RUN python3 -m venv /home/precice/venv && \ . /home/precice/venv/bin/activate && \ pip3 install pybind11 -FROM precice_dependecies AS dumux_adapter +FROM micro_manager AS dumux_adapter USER root COPY --from=precice /home/precice/.local/ /home/precice/.local/ ARG DUNE_VERSION From ba2df1541362b571f5be0355eacb8717f1b2dbd9 Mon Sep 17 00:00:00 2001 From: June <94080048+Fujikawas@users.noreply.github.com> Date: Thu, 12 Mar 2026 16:55:34 +0100 Subject: [PATCH 07/10] Update pybind11 path --- tools/tests/dockerfiles/ubuntu_2404/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile index a9cc75352..80fa144d9 100644 --- a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile +++ b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile @@ -207,7 +207,9 @@ RUN python3 -m venv /home/precice/venv && \ WORKDIR /home/precice RUN python3 -m venv /home/precice/venv && \ . /home/precice/venv/bin/activate && \ - pip3 install pybind11 + pip3 install pybind11 &&\ + pybind11_DIR = "/home/precice/venv/lib/python3.13/site-packages/pybind11/share/cmake/pybind11" + FROM micro_manager AS dumux_adapter USER root From 75651a44b26cd1a9bc09af314e00ef40a6136def Mon Sep 17 00:00:00 2001 From: June <94080048+Fujikawas@users.noreply.github.com> Date: Fri, 13 Mar 2026 13:33:45 +0100 Subject: [PATCH 08/10] Update pybind11 path --- tools/tests/dockerfiles/ubuntu_2404/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile index 80fa144d9..aa4f45da1 100644 --- a/tools/tests/dockerfiles/ubuntu_2404/Dockerfile +++ b/tools/tests/dockerfiles/ubuntu_2404/Dockerfile @@ -207,8 +207,8 @@ RUN python3 -m venv /home/precice/venv && \ WORKDIR /home/precice RUN python3 -m venv /home/precice/venv && \ . /home/precice/venv/bin/activate && \ - pip3 install pybind11 &&\ - pybind11_DIR = "/home/precice/venv/lib/python3.13/site-packages/pybind11/share/cmake/pybind11" + pip3 install pybind11 +ENV pybind11_DIR = "/home/precice/venv/lib/python3.13/site-packages/pybind11/share/cmake/pybind11" FROM micro_manager AS dumux_adapter From 5c5b2cd7a3bd3f92d056449048543a56e0c2f461 Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Fri, 13 Mar 2026 14:20:29 +0100 Subject: [PATCH 09/10] help look for pybind11 --- two-scale-heat-conduction/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/two-scale-heat-conduction/metadata.yaml b/two-scale-heat-conduction/metadata.yaml index 4bce52559..d1f2862ad 100644 --- a/two-scale-heat-conduction/metadata.yaml +++ b/two-scale-heat-conduction/metadata.yaml @@ -16,5 +16,5 @@ cases: micro-dumux: participant: Micro-Manager directory: ./micro-dumux - run: ./run.sh -l /home/precice/dumux + run: export pybind11_DIR="/home/precice/venv/lib/python3.13/site-packages/pybind11/share/cmake/pybind11" && ./run.sh -l /home/precice/dumux component: dumux-adapter From 7a4ef499d10723b3f2234aa3c870f913059d1f4f Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Fri, 13 Mar 2026 14:47:42 +0100 Subject: [PATCH 10/10] activate venv --- two-scale-heat-conduction/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/two-scale-heat-conduction/metadata.yaml b/two-scale-heat-conduction/metadata.yaml index d1f2862ad..75d465531 100644 --- a/two-scale-heat-conduction/metadata.yaml +++ b/two-scale-heat-conduction/metadata.yaml @@ -16,5 +16,5 @@ cases: micro-dumux: participant: Micro-Manager directory: ./micro-dumux - run: export pybind11_DIR="/home/precice/venv/lib/python3.13/site-packages/pybind11/share/cmake/pybind11" && ./run.sh -l /home/precice/dumux + run: source /home/precice/venv/bin/activate && ./run.sh -l /home/precice/dumux component: dumux-adapter