Merge branch 'develop' into i547

changelog-entries/557.md

@@ -0,0 +1 @@
+- Added SDC from pySDC as new time-stepping scheme in [partitioned-heat-conduction tutorial](https://precice.org/tutorials-partitioned-heat-conduction.html) with FEniCS.

elastic-tube-1d/fluid-python/requirements.txt

@@ -1,3 +1,3 @@
-pyprecice~=3.0
+matplotlib
 numpy >1, <2
-matplotlib
+pyprecice~=3.0

elastic-tube-1d/fluid-python/run.sh

@@ -8,7 +8,6 @@ python3 -m venv .venv
 . .venv/bin/activate
 pip install -r requirements.txt
 
-
 python3 ./FluidSolver.py ../precice-config.xml
 
 close_log

elastic-tube-1d/solid-python/requirements.txt

@@ -1,2 +1,2 @@
+numpy >1, <2
 pyprecice~=3.0
-numpy >1, <2

elastic-tube-1d/solid-python/run.sh

@@ -8,7 +8,6 @@ python3 -m venv .venv
 . .venv/bin/activate
 pip install -r requirements.txt
 
-
 python3 ./SolidSolver.py ../precice-config.xml
 
 close_log

partitioned-heat-conduction/dirichlet-fenics/run.sh

@@ -1,13 +1,43 @@
 #!/usr/bin/env bash
 set -e -u
 
+python3 -m venv --system-site-packages ../solver-fenics/.venv
+. ../solver-fenics/.venv/bin/activate
+pip install -r ../solver-fenics/requirements.txt
+
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
-python3 -m venv --system-site-packages .venv
-. .venv/bin/activate
-pip install -r ../solver-fenics/requirements.txt
-
-python3 ../solver-fenics/heat.py Dirichlet
+if [ $# -eq 0 ] 
+then
+    echo "Running simulation with default FEniCS implementation"
+    python3 ../solver-fenics/heat.py Dirichlet
+else
+    case "$1" in
+        -[hH]|--help)
+            echo "Usage: $0 [highorder|sdc|*]"
+            echo ""
+            echo "      irk : Run simulation with higher-order implicit Runge-Kutta schemes FEniCS implementation"
+            echo "      sdc : Run simulation with pySDC+FEniCS implementation"
+            echo "      *   : For every other input run the simulation with default FEniCS implementation"
+            exit 0
+            ;;
+        irk)
+            echo "Running simulation with higher-order implicit Runge-Kutta schemes FEniCS implementation"
+            python3 ../solver-fenics/heatHigherOrder.py Dirichlet
+            ;;
+        sdc)
+            # install pySDC + its dependencies only if needed
+            pip install git+https://github.com/Parallel-in-Time/[email protected]
+            pip install pySDC~=5.5
+            echo "Running simulation with pySDC+FEniCS implementation"
+            python3 ../solver-fenics/heat_pySDC.py Dirichlet
+            ;;
+        *)
+            echo "Running simulation with default FEniCS implementation"
+            python3 ../solver-fenics/heat.py Dirichlet
+            ;;
+    esac
+fi
 
 close_log

partitioned-heat-conduction/neumann-fenics/run.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -e -u
 
+python3 -m venv --system-site-packages ../solver-fenics/.venv
+. ../solver-fenics/.venv/bin/activate
+pip install -r ../solver-fenics/requirements.txt
+
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1