Skip to content

Commit e576056

Browse files
Merge branch 'develop' into systemtests/add-heat-exchanger-simplified
2 parents 4fab16a + e9c2f2e commit e576056

File tree

9 files changed

+141
-4
lines changed

9 files changed

+141
-4
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
schedule:
55
- cron: "0 4 * * *"
66
workflow_dispatch:
7-
7+
88
jobs:
99
gather-refs:
1010
name: Map Git branches to latest refs
@@ -140,6 +140,8 @@ jobs:
140140
OPENFOAM_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-openfoam-adapter }},\
141141
SU2_VERSION:7.5.1,\
142142
SU2_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-su2-adapter }},\
143+
DUMUX_VERSION:3.7,\
144+
MICRO_MANAGER_VERSION:0.8.0,\
143145
TUTORIALS_REF:${{ needs.gather-refs.outputs.ref-tutorials }}"
144146
system_tests_branch: develop
145-
log_level: "INFO"
147+
log_level: "INFO"

changelog-entries/696.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Added dumux\_test test suite to the system tests[#696](https://github.com/precice/tutorials/pull/696)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Free flow over porous media
2+
path: free-flow-over-porous-media
3+
url: https://precice.org/tutorials-free-flow-over-porous-media-2d.html
4+
5+
participants:
6+
- Free-Flow
7+
- Porous-Media
8+
9+
cases:
10+
free-flow-dumux:
11+
participant: Free-Flow
12+
directory: ./free-flow-dumux
13+
run: ./run.sh -l /home/precice/dumux
14+
component: dumux-adapter
15+
16+
porous-media-dumux:
17+
participant: Porous-Media
18+
directory: ./porous-media-dumux
19+
run: ./run.sh -l /home/precice/dumux
20+
component: dumux-adapter
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: dumux_adapter
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"
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: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,50 @@ dealii-adapter:
168168
default: "master"
169169
DEALII_ADAPTER_REF:
170170
description: Version of deal.ii-adapter to use
171-
default: "master"
171+
default: "master"
172+
173+
dumux-adapter:
174+
repository: https://github.com/precice/dumux-adapter
175+
template: component-templates/dumux-adapter.yaml
176+
build_arguments:
177+
PLATFORM:
178+
description: Dockerfile platform used
179+
default: "ubuntu_2404"
180+
PRECICE_REF:
181+
description: Version of preCICE to use
182+
default: "main"
183+
PRECICE_PRESET:
184+
description: CMake preset of preCICE
185+
default: "production-audit"
186+
TUTORIALS_REF:
187+
description: Tutorial git reference to use
188+
default: "master"
189+
DUNE_VERSION:
190+
description: Version of DUNE to use
191+
default: "2.9"
192+
DUMUX_VERSION:
193+
description: Version of DuMux to use
194+
default: "3.7"
195+
DUMUX_ADAPTER_REF:
196+
semnantic: Git ref of the dumux adapter to use
197+
default: "main"
198+
199+
micro-manager:
200+
repository: https://github.com/precice/micro-manager
201+
template: component-templates/micro-manager.yaml
202+
build_arguments:
203+
PLATFORM:
204+
description: Dockerfile platform used
205+
default: "ubuntu_2404"
206+
PRECICE_REF:
207+
description: Version of preCICE to use
208+
default: "main"
209+
PRECICE_PRESET:
210+
description: CMake preset of preCICE
211+
default: "production-audit"
212+
TUTORIALS_REF:
213+
description: Tutorial git reference to use
214+
default: "master"
215+
MICRO_MANAGER_VERSION:
216+
description: Version of Micro-Manager to use
217+
default: "0.8.0"

tools/tests/reference_versions.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ OPENFOAM_EXECUTABLE: "openfoam2312"
44
OPENFOAM_ADAPTER_REF: "v1.3.1"
55
PYTHON_BINDINGS_REF: "v3.2.0"
66
FENICS_ADAPTER_REF: "v2.2.0"
7-
TUTORIALS_REF: "80b5e41" # develop, April 12, 2025
7+
TUTORIALS_REF: "2579210" # develop, Febuary 05, 2026
88
PLATFORM: "ubuntu_2404"
99
CALCULIX_VERSION: "2.20"
1010
CALCULIX_ADAPTER_REF: "v2.20.1"
1111
SU2_VERSION: "7.5.1"
1212
SU2_ADAPTER_REF: "64d4aff" # Distribution v2404
1313
DEALII_ADAPTER_REF: "02c5d18" # develop, April 12, 2025
14+
DUNE_VERSION: "2.9"
15+
DUMUX_VERSION: "3.7"
16+
DUMUX_ADAPTER_REF: "v3.0.0"
17+
MICRO_MANAGER_VERSION: "v0.8.0"

tools/tests/tests.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ test_suites:
3939
- fluid-openfoam
4040
- solid-calculix
4141
reference_result: ./perpendicular-flap/reference-results/fluid-openfoam_solid-calculix.tar.gz
42+
dumux_test:
43+
tutorials:
44+
- path: free-flow-over-porous-media
45+
case_combination:
46+
- free-flow-dumux
47+
- porous-media-dumux
48+
reference_result: ./free-flow-over-porous-media/reference-results/free-flow-dumux_porous-media-dumux.tar.gz
49+
- path: two-scale-heat-conduction
50+
case_combination:
51+
- macro-dumux
52+
- micro-dumux
53+
reference_result: ./two-scale-heat-conduction/reference-results/macro-dumux_micro-dumux.tar.gz
4254
su2_test:
4355
tutorials:
4456
- path: perpendicular-flap
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Two-scale heat conduction
2+
path: two-scale-heat-conduction
3+
url: https://precice.org/tutorials-two-scale-heat-conduction.html
4+
5+
participants:
6+
- Macro
7+
- Micro-Manager
8+
9+
cases:
10+
macro-dumux:
11+
participant: Macro
12+
directory: ./macro-dumux
13+
run: ./run.sh -l /home/precice/dumux
14+
component: dumux-adapter
15+
16+
micro-dumux:
17+
participant: Micro-Manager
18+
directory: ./micro-dumux
19+
run: ./run.sh -l /home/precice/dumux
20+
component: dumux-adapter

0 commit comments

Comments
 (0)