diff --git a/changelog-entries/680.md b/changelog-entries/680.md new file mode 100644 index 000000000..d3785d56c --- /dev/null +++ b/changelog-entries/680.md @@ -0,0 +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`. \ No newline at end of file diff --git a/channel-transport-reaction/chemical-fenics/run.sh b/channel-transport-reaction/chemical-fenics/run.sh index 3ed9632e8..e0927a968 100755 --- a/channel-transport-reaction/chemical-fenics/run.sh +++ b/channel-transport-reaction/chemical-fenics/run.sh @@ -4,9 +4,12 @@ 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 && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-package .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 chemical-reaction-advection-diffusion.py diff --git a/channel-transport-reaction/fluid-fenics/run.sh b/channel-transport-reaction/fluid-fenics/run.sh index 120db79ce..ff60931b0 100755 --- a/channel-transport-reaction/fluid-fenics/run.sh +++ b/channel-transport-reaction/fluid-fenics/run.sh @@ -4,10 +4,12 @@ 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 && pip freeze > pip-installed-packages.log - +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-package .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 fluid.py diff --git a/channel-transport/fluid-nutils/run.sh b/channel-transport/fluid-nutils/run.sh index cdb96dfed..641f4f465 100755 --- a/channel-transport/fluid-nutils/run.sh +++ b/channel-transport/fluid-nutils/run.sh @@ -4,9 +4,13 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi + python3 fluid.py close_log diff --git a/channel-transport/transport-nutils/run.sh b/channel-transport/transport-nutils/run.sh index 3a604fda5..c36a5bf49 100755 --- a/channel-transport/transport-nutils/run.sh +++ b/channel-transport/transport-nutils/run.sh @@ -4,9 +4,13 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi + python3 transport.py "$@" close_log diff --git a/elastic-tube-1d/fluid-python/run.sh b/elastic-tube-1d/fluid-python/run.sh index 9f36f4e56..381bf0c1b 100755 --- a/elastic-tube-1d/fluid-python/run.sh +++ b/elastic-tube-1d/fluid-python/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 ./FluidSolver.py ../precice-config.xml diff --git a/elastic-tube-1d/solid-python/run.sh b/elastic-tube-1d/solid-python/run.sh index 02bcad4a8..60fba521e 100755 --- a/elastic-tube-1d/solid-python/run.sh +++ b/elastic-tube-1d/solid-python/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 ./SolidSolver.py ../precice-config.xml diff --git a/elastic-tube-3d/solid-fenics/run.sh b/elastic-tube-3d/solid-fenics/run.sh index 93a508e26..a06dd46bb 100755 --- a/elastic-tube-3d/solid-fenics/run.sh +++ b/elastic-tube-3d/solid-fenics/run.sh @@ -4,8 +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 && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-package .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 solid.py diff --git a/flow-around-controlled-moving-cylinder/controller-fmi/run.sh b/flow-around-controlled-moving-cylinder/controller-fmi/run.sh index 76fb0a70c..57be1215c 100755 --- a/flow-around-controlled-moving-cylinder/controller-fmi/run.sh +++ b/flow-around-controlled-moving-cylinder/controller-fmi/run.sh @@ -15,9 +15,12 @@ if [ ! -f PIDcontroller.fmu ]; then cd ../../ fi -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi fmiprecice ./fmi-settings.json ./precice-settings.json diff --git a/flow-around-controlled-moving-cylinder/solid-python/run.sh b/flow-around-controlled-moving-cylinder/solid-python/run.sh index a2b5ee205..0b6c1f894 100755 --- a/flow-around-controlled-moving-cylinder/solid-python/run.sh +++ b/flow-around-controlled-moving-cylinder/solid-python/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 solid.py ../precice-config.xml diff --git a/flow-over-heated-plate/fluid-su2/run.sh b/flow-over-heated-plate/fluid-su2/run.sh index d047b7e8d..db3ab8b76 100755 --- a/flow-over-heated-plate/fluid-su2/run.sh +++ b/flow-over-heated-plate/fluid-su2/run.sh @@ -4,9 +4,12 @@ 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 && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-package .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi SU2_preCICE_CHT.py -f laminar_config_unsteady.cfg -r --parallel diff --git a/flow-over-heated-plate/solid-dunefem/run.sh b/flow-over-heated-plate/solid-dunefem/run.sh index b24be62c1..3c0c73f5c 100755 --- a/flow-over-heated-plate/solid-dunefem/run.sh +++ b/flow-over-heated-plate/solid-dunefem/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 solid.py close_log diff --git a/flow-over-heated-plate/solid-fenics/run.sh b/flow-over-heated-plate/solid-fenics/run.sh index 032cd009f..3a0977996 100755 --- a/flow-over-heated-plate/solid-fenics/run.sh +++ b/flow-over-heated-plate/solid-fenics/run.sh @@ -4,9 +4,12 @@ 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 && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-package .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 solid.py diff --git a/flow-over-heated-plate/solid-nutils/run.sh b/flow-over-heated-plate/solid-nutils/run.sh index b24be62c1..3c0c73f5c 100755 --- a/flow-over-heated-plate/solid-nutils/run.sh +++ b/flow-over-heated-plate/solid-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 solid.py close_log diff --git a/oscillator/mass-left-fmi/run.sh b/oscillator/mass-left-fmi/run.sh index 922d816a4..2d8940011 100755 --- a/oscillator/mass-left-fmi/run.sh +++ b/oscillator/mass-left-fmi/run.sh @@ -16,9 +16,12 @@ if [ ! -f ../solver-fmi/Oscillator.fmu ]; then cd ../../../mass-left-fmi fi -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi 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 diff --git a/oscillator/mass-right-fmi/run.sh b/oscillator/mass-right-fmi/run.sh index a628fe8ae..7cd85afd9 100755 --- a/oscillator/mass-right-fmi/run.sh +++ b/oscillator/mass-right-fmi/run.sh @@ -16,9 +16,12 @@ if [ ! -f ../solver-fmi/Oscillator.fmu ]; then cd ../../../mass-right-fmi fi -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi 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 diff --git a/partitioned-heat-conduction-complex/dirichlet-fenics/run.sh b/partitioned-heat-conduction-complex/dirichlet-fenics/run.sh index 655407447..feccfc7b7 100755 --- a/partitioned-heat-conduction-complex/dirichlet-fenics/run.sh +++ b/partitioned-heat-conduction-complex/dirichlet-fenics/run.sh @@ -4,9 +4,12 @@ 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 ../solver-fenics/requirements.txt +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi python3 ../solver-fenics/heat.py -d -i complex diff --git a/partitioned-heat-conduction-complex/neumann-fenics/run.sh b/partitioned-heat-conduction-complex/neumann-fenics/run.sh index e9a09cd54..e505b7711 100755 --- a/partitioned-heat-conduction-complex/neumann-fenics/run.sh +++ b/partitioned-heat-conduction-complex/neumann-fenics/run.sh @@ -4,9 +4,12 @@ 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 ../solver-fenics/requirements.txt +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi python3 ../solver-fenics/heat.py -n -i complex diff --git a/partitioned-heat-conduction-direct/dirichlet-nutils/run.sh b/partitioned-heat-conduction-direct/dirichlet-nutils/run.sh index cafde6cdb..2d3ff34db 100755 --- a/partitioned-heat-conduction-direct/dirichlet-nutils/run.sh +++ b/partitioned-heat-conduction-direct/dirichlet-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi rm -rf Dirichlet-*.vtk NUTILS_RICHOUTPUT=no python3 heat.py diff --git a/partitioned-heat-conduction-direct/neumann-nutils/run.sh b/partitioned-heat-conduction-direct/neumann-nutils/run.sh index 8183d6603..54734b5f9 100755 --- a/partitioned-heat-conduction-direct/neumann-nutils/run.sh +++ b/partitioned-heat-conduction-direct/neumann-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi rm -rf Neumann-*.vtk NUTILS_RICHOUTPUT=no python3 heat.py diff --git a/partitioned-heat-conduction-overlap/left-fenics/run.sh b/partitioned-heat-conduction-overlap/left-fenics/run.sh index 5304329a4..b19c1f5d9 100755 --- a/partitioned-heat-conduction-overlap/left-fenics/run.sh +++ b/partitioned-heat-conduction-overlap/left-fenics/run.sh @@ -4,9 +4,12 @@ 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 ../solver-fenics/requirements.txt +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi python3 ../solver-fenics/heat.py Left diff --git a/partitioned-heat-conduction-overlap/right-fenics/run.sh b/partitioned-heat-conduction-overlap/right-fenics/run.sh index 1df24c1db..b8f73ac22 100755 --- a/partitioned-heat-conduction-overlap/right-fenics/run.sh +++ b/partitioned-heat-conduction-overlap/right-fenics/run.sh @@ -4,9 +4,12 @@ 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 ../solver-fenics/requirements.txt +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi python3 ../solver-fenics/heat.py Right diff --git a/partitioned-heat-conduction/dirichlet-fenics/run.sh b/partitioned-heat-conduction/dirichlet-fenics/run.sh index 5561ced17..880f966a2 100755 --- a/partitioned-heat-conduction/dirichlet-fenics/run.sh +++ b/partitioned-heat-conduction/dirichlet-fenics/run.sh @@ -1,13 +1,16 @@ #!/usr/bin/env bash set -e -u -python3 -m venv --system-site-packages .venv -. .venv/bin/activate -pip install -r ../solver-fenics/requirements.txt - . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi + if [ $# -eq 0 ] then echo "Running simulation with default FEniCS implementation" @@ -27,9 +30,12 @@ else python3 ../solver-fenics/heatHigherOrder.py Dirichlet ;; sdc) - # install pySDC + its dependencies only if needed - pip install git+https://github.com/Parallel-in-Time/pySDC@5.5.0 - pip install pySDC~=5.5 + if [ ! -v PRECICE_TUTORIALS_NO_VENV ] + then + # install pySDC + its dependencies only if needed + pip install git+https://github.com/Parallel-in-Time/pySDC@5.5.0 + pip install pySDC~=5.5 + fi echo "Running simulation with pySDC+FEniCS implementation" python3 ../solver-fenics/heat_pySDC.py Dirichlet ;; diff --git a/partitioned-heat-conduction/dirichlet-nutils/run.sh b/partitioned-heat-conduction/dirichlet-nutils/run.sh index cafde6cdb..2d3ff34db 100755 --- a/partitioned-heat-conduction/dirichlet-nutils/run.sh +++ b/partitioned-heat-conduction/dirichlet-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi rm -rf Dirichlet-*.vtk NUTILS_RICHOUTPUT=no python3 heat.py diff --git a/partitioned-heat-conduction/neumann-fenics/run.sh b/partitioned-heat-conduction/neumann-fenics/run.sh index da9959e4d..cc7a42c41 100755 --- a/partitioned-heat-conduction/neumann-fenics/run.sh +++ b/partitioned-heat-conduction/neumann-fenics/run.sh @@ -1,16 +1,15 @@ #!/usr/bin/env bash set -e -u -python3 -m venv --system-site-packages .venv -. .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 +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi python3 ../solver-fenics/heat.py Neumann diff --git a/partitioned-heat-conduction/neumann-nutils/run.sh b/partitioned-heat-conduction/neumann-nutils/run.sh index 8183d6603..54734b5f9 100755 --- a/partitioned-heat-conduction/neumann-nutils/run.sh +++ b/partitioned-heat-conduction/neumann-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi rm -rf Neumann-*.vtk NUTILS_RICHOUTPUT=no python3 heat.py diff --git a/perpendicular-flap/fluid-fake/run.sh b/perpendicular-flap/fluid-fake/run.sh index 85316ca94..cae9e3b83 100755 --- a/perpendicular-flap/fluid-fake/run.sh +++ b/perpendicular-flap/fluid-fake/run.sh @@ -1,7 +1,10 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -e -u -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 fake.py diff --git a/perpendicular-flap/fluid-nutils/run.sh b/perpendicular-flap/fluid-nutils/run.sh index cdb96dfed..f68b56661 100755 --- a/perpendicular-flap/fluid-nutils/run.sh +++ b/perpendicular-flap/fluid-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 fluid.py close_log diff --git a/perpendicular-flap/fluid-su2/run.sh b/perpendicular-flap/fluid-su2/run.sh index 15b6ae3eb..e6c7a0fcb 100755 --- a/perpendicular-flap/fluid-su2/run.sh +++ b/perpendicular-flap/fluid-su2/run.sh @@ -4,9 +4,12 @@ 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 && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi SU2_preCICE_FSI.py -f euler_config_unsteady.cfg --parallel diff --git a/perpendicular-flap/solid-fake/run.sh b/perpendicular-flap/solid-fake/run.sh index 85316ca94..cae9e3b83 100755 --- a/perpendicular-flap/solid-fake/run.sh +++ b/perpendicular-flap/solid-fake/run.sh @@ -1,7 +1,10 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -e -u -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 fake.py diff --git a/perpendicular-flap/solid-fenics/run.sh b/perpendicular-flap/solid-fenics/run.sh index 032cd009f..310a8fb12 100755 --- a/perpendicular-flap/solid-fenics/run.sh +++ b/perpendicular-flap/solid-fenics/run.sh @@ -4,9 +4,12 @@ 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 && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 solid.py diff --git a/perpendicular-flap/solid-nutils/run.sh b/perpendicular-flap/solid-nutils/run.sh index 0837dc6ff..1b0420d63 100755 --- a/perpendicular-flap/solid-nutils/run.sh +++ b/perpendicular-flap/solid-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 solid.py richoutput=no close_log diff --git a/resonant-circuit/capacitor-python/run.sh b/resonant-circuit/capacitor-python/run.sh index a68586939..042124adc 100755 --- a/resonant-circuit/capacitor-python/run.sh +++ b/resonant-circuit/capacitor-python/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 capacitor.py close_log diff --git a/resonant-circuit/coil-python/run.sh b/resonant-circuit/coil-python/run.sh index ddb1cd031..248944c23 100755 --- a/resonant-circuit/coil-python/run.sh +++ b/resonant-circuit/coil-python/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 coil.py close_log diff --git a/turek-hron-fsi3/fluid-nutils/run.sh b/turek-hron-fsi3/fluid-nutils/run.sh index 6df66157c..d0c4c71f9 100755 --- a/turek-hron-fsi3/fluid-nutils/run.sh +++ b/turek-hron-fsi3/fluid-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python fluid.py close_log diff --git a/turek-hron-fsi3/solid-nutils/run.sh b/turek-hron-fsi3/solid-nutils/run.sh index 802e43e8e..2942ab3ed 100755 --- a/turek-hron-fsi3/solid-nutils/run.sh +++ b/turek-hron-fsi3/solid-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python solid.py close_log diff --git a/two-scale-heat-conduction/macro-nutils/run.sh b/two-scale-heat-conduction/macro-nutils/run.sh index 163f754c8..3cf21c216 100755 --- a/two-scale-heat-conduction/macro-nutils/run.sh +++ b/two-scale-heat-conduction/macro-nutils/run.sh @@ -4,9 +4,12 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi python3 macro.py richoutput=no close_log diff --git a/two-scale-heat-conduction/micro-nutils/run.sh b/two-scale-heat-conduction/micro-nutils/run.sh index 3e8f043cb..4e57595db 100755 --- a/two-scale-heat-conduction/micro-nutils/run.sh +++ b/two-scale-heat-conduction/micro-nutils/run.sh @@ -6,9 +6,12 @@ exec > >(tee --append "$LOGFILE") 2>&1 usage() { echo "Usage: cmd [-s] [-p n]" 1>&2; exit 1; } -python3 -m venv .venv -. .venv/bin/activate -pip install -r requirements.txt && pip freeze > pip-installed-packages.log +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log +fi # Check if no input argument was provided if [ -z "$*" ] ; then diff --git a/volume-coupled-diffusion/drain-fenics/run.sh b/volume-coupled-diffusion/drain-fenics/run.sh index 47f434ab8..c519019d6 100755 --- a/volume-coupled-diffusion/drain-fenics/run.sh +++ b/volume-coupled-diffusion/drain-fenics/run.sh @@ -4,9 +4,12 @@ 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 ../solver-fenics/requirements.txt +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi python3 ../solver-fenics/volume-coupled-diffusion.py --drain diff --git a/volume-coupled-diffusion/source-fenics/run.sh b/volume-coupled-diffusion/source-fenics/run.sh index a0e1e60ca..76b168162 100755 --- a/volume-coupled-diffusion/source-fenics/run.sh +++ b/volume-coupled-diffusion/source-fenics/run.sh @@ -4,9 +4,12 @@ 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 ../solver-fenics/requirements.txt +if [ ! -v PRECICE_TUTORIALS_NO_VENV ] +then + python3 -m venv --system-site-packages .venv + . .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt +fi python3 ../solver-fenics/volume-coupled-diffusion.py --source