Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add automatic logging #479

Merged
merged 22 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions breaking-dam-2d/fluid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#!/bin/sh
set -e -u

cp 0/alpha.water_orig 0/alpha.water
blockMesh
setFields
touch fluid-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log cp 0/alpha.water_orig 0/alpha.water
log blockMesh
log setFields

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
6 changes: 5 additions & 1 deletion breaking-dam-2d/solid-calculix/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
set -e -u

ccx_preCICE -i flap -precice-participant Solid
. ../../tools/log.sh

log ccx_preCICE -i flap -precice-participant Solid

close_log
6 changes: 5 additions & 1 deletion channel-transport-reaction/chemical-fenics/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
set -e -u

python3 chemical-reaction-advection-diffusion.py
. ../../tools/log.sh

log python3 chemical-reaction-advection-diffusion.py

close_log
11 changes: 11 additions & 0 deletions channel-transport-reaction/clean-tutorial.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh
set -e -u

# shellcheck disable=SC1091
. ../tools/cleaning-tools.sh

clean_tutorial .
clean_precice_logs .
rm -fv ./*.log
rm -fv ./*.vtu

6 changes: 5 additions & 1 deletion channel-transport-reaction/fluid-fenics/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
set -e -u

python3 fluid.py
. ../../tools/log.sh

log python3 fluid.py

close_log
12 changes: 8 additions & 4 deletions channel-transport/fluid-nutils/run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
#!/bin/sh
set -e -u

python3 -m venv .venv
. .venv/bin/activate
pip install -r requirements.txt
python3 fluid.py
. ../../tools/log.sh

log python3 -m venv .venv
log . .venv/bin/activate
log pip install -r requirements.txt
log python3 fluid.py

close_log
11 changes: 7 additions & 4 deletions channel-transport/fluid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

blockMesh
touch fluid-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log blockMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
12 changes: 8 additions & 4 deletions channel-transport/transport-nutils/run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
#!/bin/sh
set -e -u

python3 -m venv .venv
. .venv/bin/activate
pip install -r requirements.txt
python3 transport.py
. ../../tools/log.sh

log python3 -m venv .venv
log . .venv/bin/activate
log pip install -r requirements.txt
log python3 transport.py

close_log
12 changes: 8 additions & 4 deletions elastic-tube-1d/fluid-cpp/run.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/bin/sh
set -e -u

. ../../tools/log.sh

if [ ! -d build ]; then
mkdir build
cmake -S . -B build
cmake --build build
log mkdir build
log cmake -S . -B build
log cmake --build build
fi

./build/FluidSolver ../precice-config.xml
log ./build/FluidSolver ../precice-config.xml

close_log
6 changes: 5 additions & 1 deletion elastic-tube-1d/fluid-python/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
set -e -u

python3 ./FluidSolver.py ../precice-config.xml
. ../../tools/log.sh

log python3 ./FluidSolver.py ../precice-config.xml

close_log
6 changes: 5 additions & 1 deletion elastic-tube-1d/fluid-rust/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
set -e -u

cargo run --release ../precice-config.xml
. ../../tools/log.sh

log cargo run --release ../precice-config.xml

close_log
12 changes: 8 additions & 4 deletions elastic-tube-1d/solid-cpp/run.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/bin/sh
set -e -u

. ../../tools/log.sh

if [ ! -d build ]; then
mkdir build
cmake -S . -B build
cmake --build build
log mkdir build
log cmake -S . -B build
log cmake --build build
fi

./build/SolidSolver ../precice-config.xml
log ./build/SolidSolver ../precice-config.xml

close_log
6 changes: 5 additions & 1 deletion elastic-tube-1d/solid-python/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
set -e -u

python3 ./SolidSolver.py ../precice-config.xml
. ../../tools/log.sh

log python3 ./SolidSolver.py ../precice-config.xml

close_log
6 changes: 5 additions & 1 deletion elastic-tube-1d/solid-rust/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh
set -e -u

cargo run --release ../precice-config.xml
. ../../tools/log.sh

log cargo run --release ../precice-config.xml

close_log
11 changes: 7 additions & 4 deletions elastic-tube-3d/fluid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

cp -r constant/polyMesh.orig constant/polyMesh
touch fluid-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log cp -r constant/polyMesh.orig constant/polyMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
6 changes: 5 additions & 1 deletion elastic-tube-3d/solid-calculix/run.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/bin/sh
set -e -u

. ../../tools/log.sh

export OMP_NUM_THREADS=1
export CCX_NPROC_EQUATION_SOLVER=1
ccx_preCICE -i tube -precice-participant Solid
log ccx_preCICE -i tube -precice-participant Solid

close_log
22 changes: 13 additions & 9 deletions flow-around-controlled-moving-cylinder/controller-fmi/run.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
#!/bin/sh
set -e -u

. ../../tools/log.sh

if [ ! -f PIDcontroller.fmu ]; then
cd fmu
rm -rf build
mkdir build
cd build
cmake -DFMI_TYPE=CS -DFMI_VERSION=3 ..
make
cp ./PIDcontroller.fmu ../..
cd ../../
log cd fmu
log rm -rf build
log mkdir build
log cd build
log cmake -DFMI_TYPE=CS -DFMI_VERSION=3 ..
log make
log cp ./PIDcontroller.fmu ../..
log cd ../../
MakisH marked this conversation as resolved.
Show resolved Hide resolved
fi

fmiprecice ./fmi-settings.json ./precice-settings.json
log fmiprecice ./fmi-settings.json ./precice-settings.json

close_log
18 changes: 10 additions & 8 deletions flow-around-controlled-moving-cylinder/fluid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#!/bin/sh
set -e -u

blockMesh
transformPoints -scale '(0.0016 0.0016 1)'
transformPoints -translate '(0.0 0.0 -0.05)'
. ../../tools/log.sh

rm -rf 0
cp -r 0.orig 0
log blockMesh
log transformPoints -scale '(0.0016 0.0016 1)'
log transformPoints -translate '(0.0 0.0 -0.05)'

touch fluid-openfoam.foam
log rm -rf 0
log cp -r 0.orig 0

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
4 changes: 3 additions & 1 deletion flow-around-controlled-moving-cylinder/solid-python/run.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/sh
set -e -u

. ../../tools/log.sh

python3 solid.py ../precice-config.xml
log python3 solid.py ../precice-config.xml

close_log
11 changes: 7 additions & 4 deletions flow-over-heated-plate-nearest-projection/fluid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

blockMesh
touch fluid-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log blockMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
11 changes: 7 additions & 4 deletions flow-over-heated-plate-nearest-projection/solid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

blockMesh
touch solid-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log blockMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
11 changes: 7 additions & 4 deletions flow-over-heated-plate-partitioned-flow/fluid1-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

blockMesh
touch fluid1-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log blockMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
11 changes: 7 additions & 4 deletions flow-over-heated-plate-partitioned-flow/fluid2-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

blockMesh
touch fluid2-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log blockMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
11 changes: 7 additions & 4 deletions flow-over-heated-plate-partitioned-flow/solid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

blockMesh
touch solid-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log blockMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
11 changes: 7 additions & 4 deletions flow-over-heated-plate-steady-state/fluid-openfoam/run.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/sh
set -e -u

blockMesh
touch fluid-openfoam.foam
. ../../tools/log.sh

../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && openfoam_remove_empty_dirs
log blockMesh

log ../../tools/run-openfoam.sh "$@"
. ../../tools/openfoam-remove-empty-dirs.sh && log openfoam_remove_empty_dirs

close_log
16 changes: 10 additions & 6 deletions flow-over-heated-plate-steady-state/solid-codeaster/run.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
#!/bin/sh
set -e -u

echo "Warning: this case requires a manual preparation step for code_aster."
echo "You also need to set an absolute path as exchange-directory in precice-config.xml."
echo "See the tutorial and code_aster adapter documentation pages for more:"
echo "https://precice.org/adapter-code_aster.html"
echo ""
. ../../tools/log.sh

log echo "Warning: this case requires a manual preparation step for code_aster."
log echo "You also need to set an absolute path as exchange-directory in precice-config.xml."
log echo "See the tutorial and code_aster adapter documentation pages for more:"
log echo "https://precice.org/adapter-code_aster.html"
log echo ""

export TUTORIAL_ROOT="${PWD}"
export PRECICE_PARTICIPANT=Solid
as_run --run solid.export
log as_run --run solid.export

close_log
Loading