Skip to content

Commit 7b5c53f

Browse files
authored
Merge branch 'precice:develop' into micro-dumux-surrogate
2 parents 776655a + d7dcb35 commit 7b5c53f

72 files changed

Lines changed: 1238 additions & 288 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
- id: markdownlint-fix
1313
exclude: ^(.github/pull_request_template.md|changelog-entries)
1414
- repo: https://github.com/hhatto/autopep8
15-
rev: v2.0.4
15+
rev: v2.3.2
1616
hooks:
1717
- id: autopep8
1818
args: [ --in-place, --exit-code, --aggressive, --ignore=E402, --max-line-length=120 ]

changelog-entries/662.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Updated the Micro Manager config files as per Micro Manager v0.7.0 [#662](https://github.com/precice/tutorials/pull/662)

changelog-entries/663.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Enable parallel execution of the participant macro-dumux in the two-scale heat conduction tutorial [#663](https://github.com/precice/tutorials/pull/663)

changelog-entries/664.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix negotiation of dt value in two-scale-heat-conduction/macro-dumux [#664](https://github.com/precice/tutorials/pull/664)

changelog-entries/665.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix data writing for elements in parallel execution of macro-dumux in two-scale-heat-conduction [#665](https://github.com/precice/tutorials/pull/665)

changelog-entries/666.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix subcycling and checkpointing in macro-dumux of two-scale-heat-conduction [#666](https://github.com/precice/tutorials/pull/666)

changelog-entries/668.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Removed simulation time from precice-config.xml of two-scale heat conduction [#668](https://github.com/precice/tutorials/pull/668)

changelog-entries/676.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Switched to adapter-based checkpointing in the macro-dumux participant of the two-scale heat conduction tutorial [#676](https://github.com/precice/tutorials/pull/676)

changelog-entries/680.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Added the `PRECICE_TUTORIALS_NO_VENV` environment variable to skip the setup of a Python venv in the run.sh scripts of Python-related tutorials [#680](https://github.com/precice/tutorials/pull/680). Use as `set PRECICE_TUTORIALS_NO_VENV && ./run.sh`.

channel-transport-reaction/chemical-fenics/run.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ set -e -u
44
. ../../tools/log.sh
55
exec > >(tee --append "$LOGFILE") 2>&1
66

7-
python3 -m venv --system-site-package .venv
8-
. .venv/bin/activate
9-
pip install -r requirements.txt && pip freeze > pip-installed-packages.log
7+
if [ ! -v PRECICE_TUTORIALS_NO_VENV ]
8+
then
9+
python3 -m venv --system-site-package .venv
10+
. .venv/bin/activate
11+
pip install -r requirements.txt && pip freeze > pip-installed-packages.log
12+
fi
1013

1114
python3 chemical-reaction-advection-diffusion.py
1215

0 commit comments

Comments
 (0)