Skip to content

Commit 4c7d21b

Browse files
committed
add micro manager in docker image
1 parent c4aa8d1 commit 4c7d21b

File tree

6 files changed

+57
-4
lines changed

6 files changed

+57
-4
lines changed

.github/workflows/system-tests-latest-components.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ jobs:
142142
SU2_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-su2-adapter }},\
143143
DUNE_VERSION:2.9,\
144144
DUMUX_VERSION:3.7,\
145+
MICRO_MANAGER_VERSION:0.8.0,\
145146
TUTORIALS_REF:${{ needs.gather-refs.outputs.ref-tutorials }}"
146147
system_tests_branch: develop
147148
log_level: "INFO"
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
build:
2+
context: {{ dockerfile_context }}
3+
args:
4+
{% for key, value in build_arguments.items() %}
5+
- {{key}}={{value}}
6+
{% endfor %}
7+
target: micro_manager
8+
depends_on:
9+
prepare:
10+
condition: service_completed_successfully
11+
volumes:
12+
- {{ run_directory }}:/runs
13+
command: >
14+
/bin/bash -c "id &&
15+
cd '/runs/{{ tutorial_folder }}/{{ case_folder }}' &&
16+
{{ run }} | tee system-tests_{{ case_folder }}.log 2>&1"

tools/tests/components.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,23 @@ dumux-adapter:
192192
DUMUX_ADAPTER_REF:
193193
semnantic: Git ref of the dumux adapter to use
194194
default: "main"
195+
196+
micro-manager:
197+
repository: https://github.com/precice/micro-manager
198+
template: component-templates/micro-manager.yaml
199+
build_arguments:
200+
PLATFORM:
201+
description: Dockerfile platform used
202+
default: "ubuntu_2404"
203+
PRECICE_REF:
204+
description: Version of preCICE to use
205+
default: "main"
206+
PRECICE_PRESET:
207+
description: CMake preset of preCICE
208+
default: "production-audit"
209+
TUTORIALS_REF:
210+
description: Tutorial git reference to use
211+
default: "master"
212+
MICRO_MANAGER_VERSION:
213+
description: Version of Micro-Manager to use
214+
default: "0.8.0"

tools/tests/dockerfiles/ubuntu_2404/Dockerfile

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,22 @@ RUN git clone https://github.com/precice/dealii-adapter.git &&\
189189
cmake . && \
190190
make -j $(nproc)
191191

192-
FROM precice_dependecies AS dumux_adapter
192+
193+
FROM precice_dependecies AS micro_manager
194+
USER root
195+
WORKDIR /home/precice
196+
USER precice
197+
COPY --from=precice /home/precice/.local/ /home/precice/.local/
198+
199+
ARG MICRO_MANAGER_VERSION
200+
RUN python3 -m venv /home/precice/venv && \
201+
. /home/precice/venv/bin/activate && \
202+
git clone https://github.com/precice/micro-manager.git && \
203+
cd micro-manager && \
204+
git checkout ${MICRO_MANAGER_VERSION} && \
205+
pip3 install .
206+
207+
FROM micro_manager AS dumux_adapter
193208
USER root
194209
COPY --from=precice /home/precice/.local/ /home/precice/.local/
195210
ARG DUNE_VERSION

tools/tests/reference_versions.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ SU2_ADAPTER_REF: "64d4aff" # Distribution v2404
1313
DEALII_ADAPTER_REF: "02c5d18" # develop, April 12, 2025
1414
DUNE_VERSION: "2.9"
1515
DUMUX_VERSION: "3.7"
16-
DUMUX_ADAPTER_REF: "3.0.0"
16+
DUMUX_ADAPTER_REF: "v3.0.0"
17+
MICRO_MANAGER_VERSION: "v0.8.0"

two-scale-heat-conduction/metadata.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ cases:
1010
macro-dumux:
1111
participant: macro-heat
1212
directory: ./macro-dumux
13-
run: ./run.sh
13+
run: ./../compile-dumux-cases.sh && ./run.sh
1414
component: dumux-adapter
1515

1616
micro-dumux:
1717
participant: Micro-Manager
1818
directory: ./micro-dumux
19-
run: ./run.sh
19+
run: ./../compile-dumux-cases.sh && ./run.sh
2020
component: dumux-adapter

0 commit comments

Comments
 (0)