Skip to content

Commit 8e214c2

Browse files
Merge branch 'develop' into systemtests/add-perpendicular-flap-cases
2 parents 0942986 + 091b0ff commit 8e214c2

25 files changed

Lines changed: 106 additions & 25 deletions

File tree

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

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ jobs:
1313
ref-precice: ${{ steps.ref-precice.outputs.shorthash }}
1414
ref-python-bindings: ${{ steps.ref-python-bindings.outputs.shorthash }}
1515
ref-calculix-adapter: ${{ steps.ref-calculix-adapter.outputs.shorthash }}
16+
ref-dumux-adapter: ${{ steps.ref-dumux-adapter.outputs.shorthash }}
1617
ref-fenics-adapter: ${{ steps.ref-fenics-adapter.outputs.shorthash }}
18+
ref-micro-manager: ${{ steps.ref-micro-manager.outputs.shorthash }}
1719
ref-openfoam-adapter: ${{ steps.ref-openfoam-adapter.outputs.shorthash }}
1820
ref-su2-adapter: ${{ steps.ref-su2-adapter.outputs.shorthash }}
1921
ref-tutorials: ${{ steps.ref-tutorials.outputs.shorthash }}
@@ -39,13 +41,27 @@ jobs:
3941
owner: precice
4042
repo: calculix-adapter
4143
branch: develop
44+
- id: ref-dumux-adapter
45+
name: Get DuMux adapter ref
46+
uses: nmbgeek/github-action-get-latest-commit@main
47+
with:
48+
owner: precice
49+
repo: dumux-adapter
50+
branch: develop
4251
- id: ref-fenics-adapter
4352
name: Get FEniCS adapter ref
4453
uses: nmbgeek/github-action-get-latest-commit@main
4554
with:
4655
owner: precice
4756
repo: fenics-adapter
4857
branch: develop
58+
- id: ref-micro-manager
59+
name: Get Micro-Manager ref
60+
uses: nmbgeek/github-action-get-latest-commit@main
61+
with:
62+
owner: precice
63+
repo: micro-manager
64+
branch: develop
4965
- id: ref-openfoam-adapter
5066
name: Get OpenFOAM adapter ref
5167
uses: nmbgeek/github-action-get-latest-commit@main
@@ -73,7 +89,9 @@ jobs:
7389
printf 'preCICE: ${{ steps.ref-precice.outputs.shorthash }}\n ${{ steps.ref-precice.outputs.description }}\n----------\n'
7490
printf 'Python bindings: ${{ steps.ref-python-bindings.outputs.shorthash }}\n ${{ steps.ref-python-bindings.outputs.description }}\n----------\n'
7591
printf 'CalculiX adapter: ${{ steps.ref-calculix-adapter.outputs.shorthash }}\n ${{ steps.ref-calculix-adapter.outputs.description }}\n----------\n'
92+
printf 'DuMux adapter: ${{ steps.ref-dumux-adapter.outputs.shorthash }}\n ${{ steps.ref-dumux-adapter.outputs.description }}\n----------\n'
7693
printf 'FEniCS adapter: ${{ steps.ref-fenics-adapter.outputs.shorthash }}\n ${{ steps.ref-fenics-adapter.outputs.description }}\n----------\n'
94+
printf 'Micro-Manager: ${{ steps.ref-micro-manager.outputs.shorthash }}\n ${{ steps.ref-micro-manager.outputs.description }}\n----------\n'
7795
printf 'OpenFOAM adapter: ${{ steps.ref-openfoam-adapter.outputs.shorthash }} ${{ steps.ref-openfoam-adapter.outputs.description }}\n----------\n'
7896
printf 'SU2 adapter: ${{ steps.ref-su2-adapter.outputs.shorthash }}\n ${{ steps.ref-su2-adapter.outputs.description }}\n----------\n'
7997
printf 'Tutorials: ${{ steps.ref-tutorials.outputs.shorthash }} ${{ steps.ref-tutorials.outputs.description }}\n----------\n'
@@ -99,12 +117,24 @@ jobs:
99117
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
100118
echo "${{ steps.ref-calculix-adapter.outputs.description }}" >> $GITHUB_STEP_SUMMARY
101119
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
120+
echo "### DuMux adapter" >> $GITHUB_STEP_SUMMARY
121+
echo "Reference: [\`${{ steps.ref-dumux-adapter.outputs.shorthash }}\`](https://github.com/precice/dumux-adapter/commit/${{ steps.ref-dumux-adapter.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
122+
echo "Description:" >> $GITHUB_STEP_SUMMARY
123+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
124+
echo "${{ steps.ref-dumux-adapter.outputs.description }}" >> $GITHUB_STEP_SUMMARY
125+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
102126
echo "### FEniCS adapter" >> $GITHUB_STEP_SUMMARY
103127
echo "Reference: [\`${{ steps.ref-fenics-adapter.outputs.shorthash }}\`](https://github.com/precice/fenics-adapter/commit/${{ steps.ref-fenics-adapter.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
104128
echo "Description:" >> $GITHUB_STEP_SUMMARY
105129
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
106130
echo "${{ steps.ref-fenics-adapter.outputs.description }}" >> $GITHUB_STEP_SUMMARY
107131
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
132+
echo "### Micro-Manager" >> $GITHUB_STEP_SUMMARY
133+
echo "Reference: [\`${{ steps.ref-micro-manager.outputs.shorthash }}\`](https://github.com/precice/micro-manager/commit/${{ steps.ref-micro-manager.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
134+
echo "Description:" >> $GITHUB_STEP_SUMMARY
135+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
136+
echo "${{ steps.ref-micro-manager.outputs.description }}" >> $GITHUB_STEP_SUMMARY
137+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
108138
echo "### OpenFOAM adapter" >> $GITHUB_STEP_SUMMARY
109139
echo "Reference: [\`${{ steps.ref-openfoam-adapter.outputs.shorthash }}\`](https://github.com/precice/openfoam-adapter/commit/${{ steps.ref-openfoam-adapter.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
110140
echo "Description:" >> $GITHUB_STEP_SUMMARY
@@ -135,13 +165,14 @@ jobs:
135165
PYTHON_BINDINGS_REF:${{ needs.gather-refs.outputs.ref-python-bindings }},\
136166
CALCULIX_VERSION:2.20,\
137167
CALCULIX_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-calculix-adapter }},\
168+
DUMUX_VERSION:3.7,\
169+
DUMUX_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-dumux-adapter }},\
138170
FENICS_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-fenics-adapter }},\
171+
MICRO_MANAGER_REF:${{ needs.gather-refs.outputs.ref-micro-manager }},\
139172
OPENFOAM_EXECUTABLE:openfoam2512,\
140173
OPENFOAM_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-openfoam-adapter }},\
141174
SU2_VERSION:7.5.1,\
142175
SU2_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-su2-adapter }},\
143-
DUMUX_VERSION:3.7,\
144-
MICRO_MANAGER_VERSION:0.8.0,\
145176
TUTORIALS_REF:${{ needs.gather-refs.outputs.ref-tutorials }}"
146177
system_tests_branch: develop
147178
log_level: "INFO"

.github/workflows/system-tests-pr.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ jobs:
1313
ref-precice: ${{ steps.ref-precice.outputs.shorthash }}
1414
ref-python-bindings: ${{ steps.ref-python-bindings.outputs.shorthash }}
1515
ref-calculix-adapter: ${{ steps.ref-calculix-adapter.outputs.shorthash }}
16+
ref-dumux-adapter: ${{ steps.ref-dumux-adapter.outputs.shorthash }}
1617
ref-fenics-adapter: ${{ steps.ref-fenics-adapter.outputs.shorthash }}
18+
ref-micro-manager: ${{ steps.ref-micro-manager.outputs.shorthash }}
1719
ref-openfoam-adapter: ${{ steps.ref-openfoam-adapter.outputs.shorthash }}
1820
ref-su2-adapter: ${{ steps.ref-su2-adapter.outputs.shorthash }}
1921
steps:
@@ -38,13 +40,27 @@ jobs:
3840
owner: precice
3941
repo: calculix-adapter
4042
branch: develop
43+
- id: ref-dumux-adapter
44+
name: Get DuMux adapter ref
45+
uses: nmbgeek/github-action-get-latest-commit@main
46+
with:
47+
owner: precice
48+
repo: dumux-adapter
49+
branch: develop
4150
- id: ref-fenics-adapter
4251
name: Get FEniCS adapter ref
4352
uses: nmbgeek/github-action-get-latest-commit@main
4453
with:
4554
owner: precice
4655
repo: fenics-adapter
4756
branch: develop
57+
- id: ref-micro-manager
58+
name: Get Micro-Manager ref
59+
uses: nmbgeek/github-action-get-latest-commit@main
60+
with:
61+
owner: precice
62+
repo: micro-manager
63+
branch: develop
4864
- id: ref-openfoam-adapter
4965
name: Get OpenFOAM adapter ref
5066
uses: nmbgeek/github-action-get-latest-commit@main
@@ -65,7 +81,9 @@ jobs:
6581
printf 'preCICE: ${{ steps.ref-precice.outputs.shorthash }}\n ${{ steps.ref-precice.outputs.description }}\n----------\n'
6682
printf 'Python bindings: ${{ steps.ref-python-bindings.outputs.shorthash }}\n ${{ steps.ref-python-bindings.outputs.description }}\n----------\n'
6783
printf 'CalculiX adapter: ${{ steps.ref-calculix-adapter.outputs.shorthash }}\n ${{ steps.ref-calculix-adapter.outputs.description }}\n----------\n'
84+
printf 'DuMux adapter: ${{ steps.ref-dumux-adapter.outputs.shorthash }}\n ${{ steps.ref-dumux-adapter.outputs.description }}\n----------\n'
6885
printf 'FEniCS adapter: ${{ steps.ref-fenics-adapter.outputs.shorthash }}\n ${{ steps.ref-fenics-adapter.outputs.description }}\n----------\n'
86+
printf 'Micro-Manager: ${{ steps.ref-micro-manager.outputs.shorthash }}\n ${{ steps.ref-micro-manager.outputs.description }}\n----------\n'
6987
printf 'OpenFOAM adapter: ${{ steps.ref-openfoam-adapter.outputs.shorthash }} ${{ steps.ref-openfoam-adapter.outputs.description }}\n----------\n'
7088
printf 'SU2 adapter: ${{ steps.ref-su2-adapter.outputs.shorthash }}\n ${{ steps.ref-su2-adapter.outputs.description }}\n----------\n'
7189
- id: summary
@@ -90,12 +108,24 @@ jobs:
90108
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
91109
echo "${{ steps.ref-calculix-adapter.outputs.description }}" >> $GITHUB_STEP_SUMMARY
92110
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
111+
echo "### DuMux adapter" >> $GITHUB_STEP_SUMMARY
112+
echo "Reference: [\`${{ steps.ref-dumux-adapter.outputs.shorthash }}\`](https://github.com/precice/dumux-adapter/commit/${{ steps.ref-dumux-adapter.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
113+
echo "Description:" >> $GITHUB_STEP_SUMMARY
114+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
115+
echo "${{ steps.ref-dumux-adapter.outputs.description }}" >> $GITHUB_STEP_SUMMARY
116+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
93117
echo "### FEniCS adapter" >> $GITHUB_STEP_SUMMARY
94118
echo "Reference: [\`${{ steps.ref-fenics-adapter.outputs.shorthash }}\`](https://github.com/precice/fenics-adapter/commit/${{ steps.ref-fenics-adapter.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
95119
echo "Description:" >> $GITHUB_STEP_SUMMARY
96120
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
97121
echo "${{ steps.ref-fenics-adapter.outputs.description }}" >> $GITHUB_STEP_SUMMARY
98122
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
123+
echo "### Micro-Manager" >> $GITHUB_STEP_SUMMARY
124+
echo "Reference: [\`${{ steps.ref-micro-manager.outputs.shorthash }}\`](https://github.com/precice/micro-manager/commit/${{ steps.ref-micro-manager.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
125+
echo "Description:" >> $GITHUB_STEP_SUMMARY
126+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
127+
echo "${{ steps.ref-micro-manager.outputs.description }}" >> $GITHUB_STEP_SUMMARY
128+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
99129
echo "### OpenFOAM adapter" >> $GITHUB_STEP_SUMMARY
100130
echo "Reference: [\`${{ steps.ref-openfoam-adapter.outputs.shorthash }}\`](https://github.com/precice/openfoam-adapter/commit/${{ steps.ref-openfoam-adapter.outputs.shorthash }})" >> $GITHUB_STEP_SUMMARY
101131
echo "Description:" >> $GITHUB_STEP_SUMMARY
@@ -124,7 +154,10 @@ jobs:
124154
PYTHON_BINDINGS_REF:${{ needs.gather-refs.outputs.ref-python-bindings }},\
125155
CALCULIX_VERSION:2.20,\
126156
CALCULIX_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-calculix-adapter }},\
157+
DUMUX_VERSION:3.7,\
158+
DUMUX_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-dumux-adapter }},\
127159
FENICS_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-fenics-adapter }},\
160+
MICRO_MANAGER_REF:${{ needs.gather-refs.outputs.ref-micro-manager }},\
128161
OPENFOAM_EXECUTABLE:openfoam2512,\
129162
OPENFOAM_ADAPTER_REF:${{ needs.gather-refs.outputs.ref-openfoam-adapter }},\
130163
SU2_VERSION:7.5.1,\

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ precice-profiling/
2020
precice-run/
2121
core
2222
profiling.json
23+
profiling.db
2324
profiling.csv
2425
trace.json
26+
profiling.pftrace
2527

2628
# C++
2729
*.o
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setuptools # required by nutils
2-
nutils==7
2+
nutils~=7.3
33
numpy >1, <2
44
pyprecice~=3.0
55
setuptools
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setuptools # required by nutils
2-
nutils==7
2+
nutils~=7.3
33
numpy >1, <2
44
pyprecice~=3.0
55
setuptools

channel-transport/transport-nutils/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setuptools # required by nutils
2-
nutils==7
2+
nutils~=7.3
33
numpy >1, <2
44
# remeshing support will be released with preCICE version 3.2
55
pyprecice @ git+https://github.com/precice/python-bindings.git@develop
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
setuptools # required by nutils
2-
nutils==7
2+
nutils~=7.3
33
numpy >1, <2
44
pyprecice~=3.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
setuptools # required by nutils
2-
nutils==7
2+
nutils~=7.3
33
numpy >1, <2
44
pyprecice~=3.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
setuptools # required by nutils
2-
nutils==7
2+
nutils~=7.3
33
numpy >1, <2
44
pyprecice~=3.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
setuptools # required by nutils
2-
nutils==7
2+
nutils~=7.3
33
numpy >1, <2
44
pyprecice~=3.0

0 commit comments

Comments
 (0)