diff --git a/.gitignore b/.gitignore index ba29ff2fa..1a45bde2a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,12 +31,19 @@ precice-config.xml.orig *.o *.so .out + +# CMake build/ +CMakeFiles/ +cmake_install.cmake +CMakeCache.txt +Makefile # Python .venv/ __pycache__/ *.pyc +*.pyo # Rust Cargo.lock @@ -60,6 +67,10 @@ postProcessing/ *.foam *.OpenFOAM dynamicCode +Make/* +!Make/files +!Make/options +lnInclude/ # CalculiX spooles.out @@ -108,6 +119,9 @@ install* # G+smo pointData.csv +# FMI +*.fmu + # FEniCS covered by .vtk # Nutils covered by .vtk diff --git a/elastic-tube-1d/.gitignore b/elastic-tube-1d/.gitignore deleted file mode 100644 index bd6ed9162..000000000 --- a/elastic-tube-1d/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -fluid-cpp/build/ -solid-cpp/build/ -fluid-python/__pycache__/ -solid-python/__pycache__/ - -*.o -*.log -*.json -*.pyc diff --git a/flow-around-controlled-moving-cylinder/.gitignore b/flow-around-controlled-moving-cylinder/.gitignore deleted file mode 100644 index 2e8d5b709..000000000 --- a/flow-around-controlled-moving-cylinder/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -controller-fmi/PIDcontroller.fmu -# The fluid-openfoam case uses a 0.orig -fluid-openfoam/0/ diff --git a/flow-around-controlled-moving-cylinder/fluid-openfoam/.gitignore b/flow-around-controlled-moving-cylinder/fluid-openfoam/.gitignore new file mode 100644 index 000000000..9a342fb3d --- /dev/null +++ b/flow-around-controlled-moving-cylinder/fluid-openfoam/.gitignore @@ -0,0 +1,2 @@ +# Pre-processing 0.orig +0/ diff --git a/flow-over-heated-plate/solid-fenicsx/clean.sh b/flow-over-heated-plate/solid-fenicsx/clean.sh index 9413511cc..57d3ea1b0 100755 --- a/flow-over-heated-plate/solid-fenicsx/clean.sh +++ b/flow-over-heated-plate/solid-fenicsx/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/flow-over-heated-plate/solid-fenicsx/run.sh b/flow-over-heated-plate/solid-fenicsx/run.sh index 01793a3e7..d339c8e23 100755 --- a/flow-over-heated-plate/solid-fenicsx/run.sh +++ b/flow-over-heated-plate/solid-fenicsx/run.sh @@ -1,10 +1,14 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u -if [ ! -d .venv ]; then +if [ ! -v PRECICE_TUTORIALS_NO_VENV ]; then + if [ ! -d ".venv" ]; then python3 -m venv --system-site-packages .venv + source .venv/bin/activate + pip install -r requirements.txt && pip freeze > pip-installed-packages.log + else + source .venv/bin/activate fi -. .venv/bin/activate -pip install -r requirements.txt +fi python3 solid.py diff --git a/heat-exchanger/.gitignore b/heat-exchanger/.gitignore deleted file mode 100644 index 41190654c..000000000 --- a/heat-exchanger/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -# This case stores pre-generated meshes outside the repository -solid-calculix/adiabatic.dfl -solid-calculix/all.msh -solid-calculix/inner-interface.flm -solid-calculix/inner-interface.nam -solid-calculix/inner-interface.sur -solid-calculix/outer-interface.flm -solid-calculix/outer-interface.nam -solid-calculix/outer-interface.sur -solid-calculix/solid.inp -fluid-inner-openfoam/constant/polyMesh -fluid-outer-openfoam/constant/polyMesh diff --git a/heat-exchanger/fluid-inner-openfoam/.gitignore b/heat-exchanger/fluid-inner-openfoam/.gitignore new file mode 100644 index 000000000..8cd8f4a4c --- /dev/null +++ b/heat-exchanger/fluid-inner-openfoam/.gitignore @@ -0,0 +1 @@ +constant/polyMesh \ No newline at end of file diff --git a/heat-exchanger/fluid-outer-openfoam/.gitignore b/heat-exchanger/fluid-outer-openfoam/.gitignore new file mode 100644 index 000000000..8cd8f4a4c --- /dev/null +++ b/heat-exchanger/fluid-outer-openfoam/.gitignore @@ -0,0 +1 @@ +constant/polyMesh \ No newline at end of file diff --git a/heat-exchanger/solid-calculix/.gitignore b/heat-exchanger/solid-calculix/.gitignore new file mode 100644 index 000000000..b15ea7aaf --- /dev/null +++ b/heat-exchanger/solid-calculix/.gitignore @@ -0,0 +1,10 @@ +# Files downloaded via run.sh +adiabatic.dfl +all.msh +inner-interface.flm +inner-interface.nam +inner-interface.sur +outer-interface.flm +outer-interface.nam +outer-interface.sur +solid.inp diff --git a/oscillator/.gitignore b/oscillator/.gitignore deleted file mode 100644 index 69310321e..000000000 --- a/oscillator/.gitignore +++ /dev/null @@ -1 +0,0 @@ -fmi/Oscillator.fmu diff --git a/oscillator/mass-left-fmi/.gitignore b/oscillator/mass-left-fmi/.gitignore deleted file mode 100644 index 653e4b980..000000000 --- a/oscillator/mass-left-fmi/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Oscillator.fmu \ No newline at end of file diff --git a/oscillator/mass-right-fmi/.gitignore b/oscillator/mass-right-fmi/.gitignore deleted file mode 100644 index 653e4b980..000000000 --- a/oscillator/mass-right-fmi/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Oscillator.fmu \ No newline at end of file diff --git a/partitioned-heat-conduction/dirichlet-fenics/run.sh b/partitioned-heat-conduction/dirichlet-fenics/run.sh index 288101292..f0ae51182 100755 --- a/partitioned-heat-conduction/dirichlet-fenics/run.sh +++ b/partitioned-heat-conduction/dirichlet-fenics/run.sh @@ -4,13 +4,14 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -if [ ! -v PRECICE_TUTORIALS_NO_VENV ] -then - if [ ! -d .venv ]; then +if [ ! -v PRECICE_TUTORIALS_NO_VENV ]; then + if [ ! -d ".venv" ]; then python3 -m venv --system-site-packages .venv + source .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt && pip freeze > pip-installed-packages.log + else + source .venv/bin/activate fi - . .venv/bin/activate - pip install -r ../solver-fenics/requirements.txt fi if [ $# -eq 0 ] diff --git a/partitioned-heat-conduction/dirichlet-fenicsx/run.sh b/partitioned-heat-conduction/dirichlet-fenicsx/run.sh index 81dc8e08c..f18697619 100755 --- a/partitioned-heat-conduction/dirichlet-fenicsx/run.sh +++ b/partitioned-heat-conduction/dirichlet-fenicsx/run.sh @@ -1,10 +1,14 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u -if [ ! -d .venv ]; then +if [ ! -v PRECICE_TUTORIALS_NO_VENV ]; then + if [ ! -d ".venv" ]; then python3 -m venv --system-site-packages .venv + source .venv/bin/activate + pip install -r ../solver-fenicsx/requirements.txt && pip freeze > pip-installed-packages.log + else + source .venv/bin/activate fi -. .venv/bin/activate -pip install -r ../solver-fenicsx/requirements.txt +fi python3 ../solver-fenicsx/heat.py Dirichlet diff --git a/partitioned-heat-conduction/neumann-fenics/run.sh b/partitioned-heat-conduction/neumann-fenics/run.sh index d71a3122f..cb8940be6 100755 --- a/partitioned-heat-conduction/neumann-fenics/run.sh +++ b/partitioned-heat-conduction/neumann-fenics/run.sh @@ -4,13 +4,14 @@ set -e -u . ../../tools/log.sh exec > >(tee --append "$LOGFILE") 2>&1 -if [ ! -v PRECICE_TUTORIALS_NO_VENV ] -then - if [ ! -d .venv ]; then +if [ ! -v PRECICE_TUTORIALS_NO_VENV ]; then + if [ ! -d ".venv" ]; then python3 -m venv --system-site-packages .venv + source .venv/bin/activate + pip install -r ../solver-fenics/requirements.txt && pip freeze > pip-installed-packages.log + else + source .venv/bin/activate fi - . .venv/bin/activate - pip install -r ../solver-fenics/requirements.txt fi python3 ../solver-fenics/heat.py Neumann diff --git a/partitioned-heat-conduction/neumann-fenicsx/run.sh b/partitioned-heat-conduction/neumann-fenicsx/run.sh index c352157be..0ba6e8b47 100755 --- a/partitioned-heat-conduction/neumann-fenicsx/run.sh +++ b/partitioned-heat-conduction/neumann-fenicsx/run.sh @@ -1,9 +1,14 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u -if [ ! -d .venv ]; then +if [ ! -v PRECICE_TUTORIALS_NO_VENV ]; then + if [ ! -d ".venv" ]; then python3 -m venv --system-site-packages .venv + source .venv/bin/activate + pip install -r ../solver-fenicsx/requirements.txt && pip freeze > pip-installed-packages.log + else + source .venv/bin/activate fi -. .venv/bin/activate -pip install -r ../solver-fenicsx/requirements.txt +fi + python3 ../solver-fenicsx/heat.py Neumann diff --git a/partitioned-heat-conduction/solver-fenicsx/clean.sh b/partitioned-heat-conduction/solver-fenicsx/clean.sh index a5aeebd18..bdd9995e1 100755 --- a/partitioned-heat-conduction/solver-fenicsx/clean.sh +++ b/partitioned-heat-conduction/solver-fenicsx/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/partitioned-heat-conduction/solver-openfoam/.gitignore b/partitioned-heat-conduction/solver-openfoam/.gitignore deleted file mode 100644 index 1729c7850..000000000 --- a/partitioned-heat-conduction/solver-openfoam/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Make/* -!Make/files -!Make/options -lnInclude/ diff --git a/perpendicular-flap/solid-openfoam/solidDisplacementFoamForce/.gitignore b/perpendicular-flap/solid-openfoam/solidDisplacementFoamForce/.gitignore deleted file mode 100644 index 1729c7850..000000000 --- a/perpendicular-flap/solid-openfoam/solidDisplacementFoamForce/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Make/* -!Make/files -!Make/options -lnInclude/ diff --git a/quickstart/solid-cpp/.gitignore b/quickstart/solid-cpp/.gitignore index 01e69efeb..21e96cc46 100644 --- a/quickstart/solid-cpp/.gitignore +++ b/quickstart/solid-cpp/.gitignore @@ -1,5 +1 @@ -CMakeFiles/ -cmake_install.cmake -CMakeCache.txt -Makefile rigid_body_solver diff --git a/resonant-circuit/capacitor-julia/clean.sh b/resonant-circuit/capacitor-julia/clean.sh index 8c3dba08a..f9c06b0f3 100755 --- a/resonant-circuit/capacitor-julia/clean.sh +++ b/resonant-circuit/capacitor-julia/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/resonant-circuit/capacitor-matlab/clean.sh b/resonant-circuit/capacitor-matlab/clean.sh index 8b1311d03..e0b5926f1 100755 --- a/resonant-circuit/capacitor-matlab/clean.sh +++ b/resonant-circuit/capacitor-matlab/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/resonant-circuit/capacitor-matlab/run.sh b/resonant-circuit/capacitor-matlab/run.sh index 37a830a91..906b25220 100755 --- a/resonant-circuit/capacitor-matlab/run.sh +++ b/resonant-circuit/capacitor-matlab/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Run MATLAB code without GUI matlab -nodisplay -r "capacitor;exit;" diff --git a/resonant-circuit/capacitor-python/clean.sh b/resonant-circuit/capacitor-python/clean.sh index 8c3dba08a..f9c06b0f3 100755 --- a/resonant-circuit/capacitor-python/clean.sh +++ b/resonant-circuit/capacitor-python/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/resonant-circuit/coil-julia/clean.sh b/resonant-circuit/coil-julia/clean.sh index 8c3dba08a..f9c06b0f3 100755 --- a/resonant-circuit/coil-julia/clean.sh +++ b/resonant-circuit/coil-julia/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/resonant-circuit/coil-matlab/clean.sh b/resonant-circuit/coil-matlab/clean.sh index 5c6294dfa..8dc0ec32b 100755 --- a/resonant-circuit/coil-matlab/clean.sh +++ b/resonant-circuit/coil-matlab/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/resonant-circuit/coil-matlab/run.sh b/resonant-circuit/coil-matlab/run.sh index 2c5e471a7..085ae73f2 100755 --- a/resonant-circuit/coil-matlab/run.sh +++ b/resonant-circuit/coil-matlab/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Run MATLAB code without GUI matlab -nodisplay -r "coil;exit;" diff --git a/resonant-circuit/coil-python/clean.sh b/resonant-circuit/coil-python/clean.sh index 8c3dba08a..f9c06b0f3 100755 --- a/resonant-circuit/coil-python/clean.sh +++ b/resonant-circuit/coil-python/clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e -u . ../../tools/cleaning-tools.sh diff --git a/resonant-circuit/plot-solution.sh b/resonant-circuit/plot-solution.sh index 85f5b901c..bd2158b27 100755 --- a/resonant-circuit/plot-solution.sh +++ b/resonant-circuit/plot-solution.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash if [ "${1:-}" = "" ]; then echo "No target directory specified. Please specify the directory of the participant containing the watchpoint, e.g. ./plot-displacement.sh coil-python." diff --git a/tools/tests/.gitignore b/tools/tests/.gitignore deleted file mode 100644 index 3072e6ffe..000000000 --- a/tools/tests/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.pyc -*.pyo \ No newline at end of file diff --git a/volume-coupled-flow/.gitignore b/volume-coupled-flow/.gitignore index 0e6291ec5..1706a8443 100644 --- a/volume-coupled-flow/.gitignore +++ b/volume-coupled-flow/.gitignore @@ -1 +1,2 @@ +# Signal file expected by the system tests specifically in uni-directional coupling fluid-participant-finished.log \ No newline at end of file