Merge branch 'i573' of github.com:NiklasVin/tutorials into i573

.gitignore

@@ -73,7 +73,7 @@ REPE_OUT/
 restart_flow_*.dat
 forces_breakdown.dat
 surface_flow_*.csv
-history_*.csv
+history*.csv
 
 # ASTE
 result.stats.json

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.

channel-transport-reaction/chemical-fenics/requirements.txt

@@ -0,0 +1,11 @@
+numpy >1, <2
+fenicsprecice~=2.0
+
+# Assuming FEniCS from ppa:fenics-packages/fenics was installed https://fenicsproject.org/download/archive/
+# Use --system-site-packages in venv
+fenics-dijitso==2019.2.0.dev0
+fenics-dolfin==2019.2.0.13.dev0
+fenics-ffc==2019.2.0.dev0
+fenics-fiat==2019.2.0.dev0
+fenics-ufl-legacy==2022.3.0
+

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

@@ -4,6 +4,10 @@ set -e -u
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv --system-site-package .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 python3 chemical-reaction-advection-diffusion.py
 
-close_log
+close_log

channel-transport-reaction/fluid-fenics/requirements.txt

@@ -0,0 +1,10 @@
+numpy >1, <2
+fenicsprecice~=2.0
+
+# Assuming FEniCS from ppa:fenics-packages/fenics was installed https://fenicsproject.org/download/archive/
+# Use --system-site-packages in venv
+fenics-dijitso==2019.2.0.dev0
+fenics-dolfin==2019.2.0.13.dev0
+fenics-ffc==2019.2.0.dev0
+fenics-fiat==2019.2.0.dev0
+fenics-ufl-legacy==2022.3.0

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

@@ -4,6 +4,11 @@ set -e -u
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv --system-site-package .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
+
 python3 fluid.py
 
 close_log

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

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

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

@@ -4,6 +4,10 @@ set -e -u
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 python3 ./FluidSolver.py ../precice-config.xml
 
 close_log

oscillator/mass-left-python/requirements.txt → elastic-tube-1d/solid-python/requirements.txt

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

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

@@ -4,6 +4,10 @@ set -e -u
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 python3 ./SolidSolver.py ../precice-config.xml
 
 close_log

elastic-tube-3d/solid-fenics/requirements.txt

@@ -0,0 +1,10 @@
+fenicsprecice~=2.0
+numpy  >1, <2
+
+# Assuming FEniCS from ppa:fenics-packages/fenics was installed https://fenicsproject.org/download/archive/
+# Use --system-site-packages in venv
+fenics-dijitso==2019.2.0.dev0
+fenics-dolfin==2019.2.0.13.dev0
+fenics-ffc==2019.2.0.dev0
+fenics-fiat==2019.2.0.dev0
+fenics-ufl-legacy==2022.3.0

elastic-tube-3d/solid-fenics/run.sh

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

flow-around-controlled-moving-cylinder/controller-fmi/requirements.txt

@@ -0,0 +1 @@
+fmiprecice

flow-around-controlled-moving-cylinder/controller-fmi/run.sh

@@ -15,6 +15,10 @@ if [ ! -f PIDcontroller.fmu ]; then
   cd ../../
 fi
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 fmiprecice ./fmi-settings.json ./precice-settings.json
 
 close_log

flow-around-controlled-moving-cylinder/solid-python/requirements.txt

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

flow-around-controlled-moving-cylinder/solid-python/run.sh

@@ -4,6 +4,10 @@ set -e -u
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 python3 solid.py ../precice-config.xml
 
 close_log

flow-over-heated-plate/fluid-su2/laminar_config_unsteady.cfg

@@ -148,6 +148,30 @@ LINEAR_SOLVER_ERROR= 1E-6
 % Max number of iterations of the linear solver for the implicit formulation
 LINEAR_SOLVER_ITER= 10
 
+% -------------------------- MULTIGRID PARAMETERS -----------------------------%
+%
+% Multi-grid levels (0 = no multi-grid)
+MGLEVEL= 3
+%
+% Multi-grid cycle (V_CYCLE, W_CYCLE, FULLMG_CYCLE)
+MGCYCLE= V_CYCLE
+%
+% Multi-grid pre-smoothing level
+MG_PRE_SMOOTH= ( 1, 2, 3, 3 )
+%
+% Multi-grid post-smoothing level
+MG_POST_SMOOTH= ( 0, 0, 0, 0 )
+%
+% Jacobi implicit smoothing of the correction
+MG_CORRECTION_SMOOTH= ( 0, 0, 0, 0 )
+%
+% Damping factor for the residual restriction
+MG_DAMP_RESTRICTION= 0.75
+%
+% Damping factor for the correction prolongation
+MG_DAMP_PROLONGATION= 0.75
+
+
 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
 %
 % Convective numerical method (JST, LAX-FRIEDRICH, CUSP, ROE, AUSM, HLLC,

flow-over-heated-plate/solid-fenics/requirements.txt

@@ -0,0 +1,10 @@
+fenicsprecice~=2.0
+numpy >1, <2
+
+# Assuming FEniCS from ppa:fenics-packages/fenics was installed https://fenicsproject.org/download/archive/
+# Use --system-site-packages in venv
+fenics-dijitso==2019.2.0.dev0
+fenics-dolfin==2019.2.0.13.dev0
+fenics-ffc==2019.2.0.dev0
+fenics-fiat==2019.2.0.dev0
+fenics-ufl-legacy==2022.3.0

flow-over-heated-plate/solid-fenics/run.sh

@@ -4,6 +4,10 @@ set -e -u
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv --system-site-packages .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 python3 solid.py
 
 close_log

oscillator-overlap/mass-left-python/run.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -e -u
 
-python3 -m venv .venv
-. .venv/bin/activate
-pip install -r requirements.txt
-
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r ../solver-python/requirements.txt
+
 python3 ../solver-python/oscillator.py Mass-Left
 
 close_log

oscillator-overlap/mass-right-python/run.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -e -u
 
-python3 -m venv .venv
-. .venv/bin/activate
-pip install -r requirements.txt
-
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r ../solver-python/requirements.txt
+
 python3 ../solver-python/oscillator.py Mass-Right
 
 close_log

oscillator/mass-left-fmi/requirements.txt

@@ -0,0 +1 @@
+fmiprecice

oscillator/mass-left-fmi/run.sh

@@ -16,6 +16,10 @@ if [ ! -f ../solver-fmi/Oscillator.fmu ]; then
   cd ../../../mass-left-fmi
 fi
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 fmiprecice fmi-settings.json precice-settings.json
 python3 ../solver-fmi/calculate-error.py ../mass-left-fmi/fmi-settings.json ../mass-left-fmi/precice-settings.json ../mass-right-fmi/fmi-settings.json ../mass-right-fmi/precice-settings.json Mass-Left
 

oscillator/mass-left-python/run.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -e -u
 
-python3 -m venv .venv
-. .venv/bin/activate
-pip install -r requirements.txt
-
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r ../solver-python/requirements.txt
+
 python3 ../solver-python/oscillator.py Mass-Left
 
 close_log

oscillator/mass-right-fmi/requirements.txt

@@ -0,0 +1 @@
+fmiprecice

oscillator/mass-right-fmi/run.sh

@@ -16,6 +16,10 @@ if [ ! -f ../solver-fmi/Oscillator.fmu ]; then
   cd ../../../mass-right-fmi
 fi
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+
 fmiprecice fmi-settings.json precice-settings.json
 python3 ../solver-fmi/calculate-error.py ../mass-left-fmi/fmi-settings.json ../mass-left-fmi/precice-settings.json ../mass-right-fmi/fmi-settings.json ../mass-right-fmi/precice-settings.json Mass-Right
 

oscillator/mass-right-python/run.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -e -u
 
-python3 -m venv .venv
-. .venv/bin/activate
-pip install -r requirements.txt
-
 . ../../tools/log.sh
 exec > >(tee --append "$LOGFILE") 2>&1
 
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r ../solver-python/requirements.txt
+
 python3 ../solver-python/oscillator.py Mass-Right
 
 close_log

oscillator/solver-fmi/requirements.txt

@@ -0,0 +1 @@
+fmiprecice

oscillator/solver-python/mypy.ini

@@ -0,0 +1,7 @@
+[mypy]
+
+[mypy-scipy.*]
+ignore_missing_imports = True
+
+[mypy-precice.*]
+ignore_missing_imports = True