diff --git a/benchmarks/helicalMixer/helicalMixer_250K/cleanThisCase b/benchmarks/helicalMixer/helicalMixer_250K/cleanThisCase index 8a0ab919..18052ce6 100755 --- a/benchmarks/helicalMixer/helicalMixer_250K/cleanThisCase +++ b/benchmarks/helicalMixer/helicalMixer_250K/cleanThisCase @@ -2,6 +2,7 @@ cd ${0%/*} || exit 1 # Run from this directory ls | grep -P "^(([0-9]+\.?[0-9]*)|(\.[0-9]+))$" | xargs -d"\n" rm -rf -rm -rf VTK +rm -rf VTK +rm -rf stl #------------------------------------------------------------------------------ diff --git a/benchmarks/helicalMixer/helicalMixer_250K/runThisCase b/benchmarks/helicalMixer/helicalMixer_250K/runThisCase index a5ab12b0..5730ed8f 100755 --- a/benchmarks/helicalMixer/helicalMixer_250K/runThisCase +++ b/benchmarks/helicalMixer/helicalMixer_250K/runThisCase @@ -1,5 +1,12 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory + +echo "\n<--------------------------------------------------------------------->" +echo "0) Copying stl files" +echo "\n<--------------------------------------------------------------------->" +mkdir -p stl +cp -rfv $pFlow_PROJECT_DIR/resources/stls/helicalMixer/* ./stl/ echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" echo "<--------------------------------------------------------------------->\n" diff --git a/benchmarks/rotatingDrum/rotatingDrum_1mParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/benchmarks/rotatingDrum/rotatingDrum_1mParticles/runThisCase +++ b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/benchmarks/rotatingDrum/rotatingDrum_250kParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/benchmarks/rotatingDrum/rotatingDrum_250kParticles/runThisCase +++ b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/benchmarks/rotatingDrum/rotatingDrum_2mParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/benchmarks/rotatingDrum/rotatingDrum_2mParticles/runThisCase +++ b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/benchmarks/rotatingDrum/rotatingDrum_4mParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/benchmarks/rotatingDrum/rotatingDrum_4mParticles/runThisCase +++ b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/benchmarks/rotatingDrum/rotatingDrum_8mParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/benchmarks/rotatingDrum/rotatingDrum_8mParticles/runThisCase +++ b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/benchmarks/helicalMixer/helicalMixer_250K/stl/helix2.stl b/resources/stls/helicalMixer/helix2.stl similarity index 100% rename from benchmarks/helicalMixer/helicalMixer_250K/stl/helix2.stl rename to resources/stls/helicalMixer/helix2.stl diff --git a/benchmarks/helicalMixer/helicalMixer_250K/stl/shell2.stl b/resources/stls/helicalMixer/shell2.stl similarity index 100% rename from benchmarks/helicalMixer/helicalMixer_250K/stl/shell2.stl rename to resources/stls/helicalMixer/shell2.stl diff --git a/tutorials/grainGranFlow/rotatingDrum/runThisCase b/tutorials/grainGranFlow/rotatingDrum/runThisCase index 695dc761..d16ec81c 100755 --- a/tutorials/grainGranFlow/rotatingDrum/runThisCase +++ b/tutorials/grainGranFlow/rotatingDrum/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/iterateGeometry/inclinedScrewConveyor/runThisCase b/tutorials/iterateGeometry/inclinedScrewConveyor/runThisCase index 3f667a12..a206a829 100755 --- a/tutorials/iterateGeometry/inclinedScrewConveyor/runThisCase +++ b/tutorials/iterateGeometry/inclinedScrewConveyor/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" diff --git a/tutorials/postprocessPhasicFlow/segregation/runThisCase b/tutorials/postprocessPhasicFlow/segregation/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/postprocessPhasicFlow/segregation/runThisCase +++ b/tutorials/postprocessPhasicFlow/segregation/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/runThisCase b/tutorials/sphereGranFlow/RotaryAirLockValve/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/RotaryAirLockValve/runThisCase +++ b/tutorials/sphereGranFlow/RotaryAirLockValve/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/RotatingDrumWithBaffles/runThisCase b/tutorials/sphereGranFlow/RotatingDrumWithBaffles/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/RotatingDrumWithBaffles/runThisCase +++ b/tutorials/sphereGranFlow/RotatingDrumWithBaffles/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/V-blender/runThisCase b/tutorials/sphereGranFlow/V-blender/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/V-blender/runThisCase +++ b/tutorials/sphereGranFlow/V-blender/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/binarySystemOfParticles/runThisCase b/tutorials/sphereGranFlow/binarySystemOfParticles/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/binarySystemOfParticles/runThisCase +++ b/tutorials/sphereGranFlow/binarySystemOfParticles/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/conveyorBelt/runThisCase b/tutorials/sphereGranFlow/conveyorBelt/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/conveyorBelt/runThisCase +++ b/tutorials/sphereGranFlow/conveyorBelt/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/drum-PeriodicBoundary/runThisCase b/tutorials/sphereGranFlow/drum-PeriodicBoundary/runThisCase index 57c84e49..f3bd8bc6 100755 --- a/tutorials/sphereGranFlow/drum-PeriodicBoundary/runThisCase +++ b/tutorials/sphereGranFlow/drum-PeriodicBoundary/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/homogenizationSilo-PeriodicBoundary/runThisCase b/tutorials/sphereGranFlow/homogenizationSilo-PeriodicBoundary/runThisCase index e774b13c..3185c731 100755 --- a/tutorials/sphereGranFlow/homogenizationSilo-PeriodicBoundary/runThisCase +++ b/tutorials/sphereGranFlow/homogenizationSilo-PeriodicBoundary/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/layeredSiloFilling/runThisCase b/tutorials/sphereGranFlow/layeredSiloFilling/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/layeredSiloFilling/runThisCase +++ b/tutorials/sphereGranFlow/layeredSiloFilling/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/rotatingDrumMedium/runThisCase b/tutorials/sphereGranFlow/rotatingDrumMedium/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/rotatingDrumMedium/runThisCase +++ b/tutorials/sphereGranFlow/rotatingDrumMedium/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/rotatingDrumSmall/runThisCase b/tutorials/sphereGranFlow/rotatingDrumSmall/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/rotatingDrumSmall/runThisCase +++ b/tutorials/sphereGranFlow/rotatingDrumSmall/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/screwConveyor/runThisCase b/tutorials/sphereGranFlow/screwConveyor/runThisCase index c6926cd1..32802adb 100755 --- a/tutorials/sphereGranFlow/screwConveyor/runThisCase +++ b/tutorials/sphereGranFlow/screwConveyor/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles" diff --git a/tutorials/sphereGranFlow/toteBlender/runThisCase b/tutorials/sphereGranFlow/toteBlender/runThisCase index c48d71fe..bfbc7cc5 100755 --- a/tutorials/sphereGranFlow/toteBlender/runThisCase +++ b/tutorials/sphereGranFlow/toteBlender/runThisCase @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Exit immediately if a command exits with a non-zero status cd ${0%/*} || exit 1 # Run from this directory echo "\n<--------------------------------------------------------------------->" echo "1) Creating particles"