From 4ac94e82c7e9475b424408eba22006fa2d236477 Mon Sep 17 00:00:00 2001 From: Daniel Queteschiner Date: Thu, 19 Sep 2019 16:40:07 +0200 Subject: [PATCH] fix up Allclean.sh scripts [ci skip] note that #!/bin/sh may invoke a different shell than #!/bin/bash --- .../R2_FB/Allclean.sh | 18 ++++------ .../30CO6H2_Hematite/Allclean.sh | 33 +++++-------------- .../33CO3H2_Hematite/Allclean.sh | 33 +++++-------------- .../GOD0k1_Hematite/Allclean.sh | 33 +++++-------------- .../SingleParticleCases/ISO4695/Allclean.sh | 33 +++++-------------- 5 files changed, 38 insertions(+), 112 deletions(-) diff --git a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/Allclean.sh b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/Allclean.sh index 0a5b74ec..665e1d5d 100755 --- a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/Allclean.sh +++ b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/Allclean.sh @@ -1,21 +1,15 @@ #!/bin/sh -#cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -source $CFDEM_PROJECT_DIR/etc/functions.sh -#- define variables -casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -cd $casePath/CFD +cd CFD cleanCase -rm $casePath/log* +cd - -rm $casePath/DEM/post/liggghts_run* -rm $casePath/DEM/post/dump.liggghts_run -#mkdir $casePath/DEM/post -#mkdir $casePath/DEM/post/restart -#cd $casePath/DEM/post/restart -#touch liggghts.restart +rm -f log* + +rm ./DEM/post/dump* # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/Allclean.sh b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/Allclean.sh index a27b0fac..b2a417c8 100755 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/Allclean.sh +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/Allclean.sh @@ -1,35 +1,18 @@ #!/bin/sh -#cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -source $CFDEM_PROJECT_DIR/etc/functions.sh -#- define variables -casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -cd $casePath/CFD +cd CFD cleanCase -# rm $casePath/CFD/rmass*.dat -#rm $casePath/CFD/*.dat -#rm $casePath/CFD/*.txt -rm $casePath/log* -#rm $casePath/run_error.log -#cp -R 0/Org/p 0/p -#cp -R 0/Org/U 0/U -#cp -R 0/Org/Us 0/Us -#cp -R 0/Org/phiIB 0/phiIB -#cp -R 0/Org/voidfraction 0/voidfraction +cd - -rm -R $casePath/DEM/post -mkdir $casePath/DEM/post -mkdir $casePath/DEM/post/restart -#cd $casePath/DEM/post/restart -#touch liggghts.restart +rm -f log* -## if postproc is activated (in fix_chem_shrink) -#rm $casePath/changeOfCO2 -#rm $casePath/changeOfO2 -#rm $casePath/rhogas_ -#rm $casePath/pmass_ +rm -r ./DEM/post +mkdir ./DEM/post +mkdir ./DEM/post/restart +touch ./DEM/post/restart/.gitignore # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/Allclean.sh b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/Allclean.sh index a27b0fac..b2a417c8 100755 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/Allclean.sh +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/Allclean.sh @@ -1,35 +1,18 @@ #!/bin/sh -#cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -source $CFDEM_PROJECT_DIR/etc/functions.sh -#- define variables -casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -cd $casePath/CFD +cd CFD cleanCase -# rm $casePath/CFD/rmass*.dat -#rm $casePath/CFD/*.dat -#rm $casePath/CFD/*.txt -rm $casePath/log* -#rm $casePath/run_error.log -#cp -R 0/Org/p 0/p -#cp -R 0/Org/U 0/U -#cp -R 0/Org/Us 0/Us -#cp -R 0/Org/phiIB 0/phiIB -#cp -R 0/Org/voidfraction 0/voidfraction +cd - -rm -R $casePath/DEM/post -mkdir $casePath/DEM/post -mkdir $casePath/DEM/post/restart -#cd $casePath/DEM/post/restart -#touch liggghts.restart +rm -f log* -## if postproc is activated (in fix_chem_shrink) -#rm $casePath/changeOfCO2 -#rm $casePath/changeOfO2 -#rm $casePath/rhogas_ -#rm $casePath/pmass_ +rm -r ./DEM/post +mkdir ./DEM/post +mkdir ./DEM/post/restart +touch ./DEM/post/restart/.gitignore # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/Allclean.sh b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/Allclean.sh index a27b0fac..b2a417c8 100755 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/Allclean.sh +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/Allclean.sh @@ -1,35 +1,18 @@ #!/bin/sh -#cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -source $CFDEM_PROJECT_DIR/etc/functions.sh -#- define variables -casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -cd $casePath/CFD +cd CFD cleanCase -# rm $casePath/CFD/rmass*.dat -#rm $casePath/CFD/*.dat -#rm $casePath/CFD/*.txt -rm $casePath/log* -#rm $casePath/run_error.log -#cp -R 0/Org/p 0/p -#cp -R 0/Org/U 0/U -#cp -R 0/Org/Us 0/Us -#cp -R 0/Org/phiIB 0/phiIB -#cp -R 0/Org/voidfraction 0/voidfraction +cd - -rm -R $casePath/DEM/post -mkdir $casePath/DEM/post -mkdir $casePath/DEM/post/restart -#cd $casePath/DEM/post/restart -#touch liggghts.restart +rm -f log* -## if postproc is activated (in fix_chem_shrink) -#rm $casePath/changeOfCO2 -#rm $casePath/changeOfO2 -#rm $casePath/rhogas_ -#rm $casePath/pmass_ +rm -r ./DEM/post +mkdir ./DEM/post +mkdir ./DEM/post/restart +touch ./DEM/post/restart/.gitignore # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/Allclean.sh b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/Allclean.sh index a27b0fac..b2a417c8 100755 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/Allclean.sh +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/Allclean.sh @@ -1,35 +1,18 @@ #!/bin/sh -#cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -source $CFDEM_PROJECT_DIR/etc/functions.sh -#- define variables -casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -cd $casePath/CFD +cd CFD cleanCase -# rm $casePath/CFD/rmass*.dat -#rm $casePath/CFD/*.dat -#rm $casePath/CFD/*.txt -rm $casePath/log* -#rm $casePath/run_error.log -#cp -R 0/Org/p 0/p -#cp -R 0/Org/U 0/U -#cp -R 0/Org/Us 0/Us -#cp -R 0/Org/phiIB 0/phiIB -#cp -R 0/Org/voidfraction 0/voidfraction +cd - -rm -R $casePath/DEM/post -mkdir $casePath/DEM/post -mkdir $casePath/DEM/post/restart -#cd $casePath/DEM/post/restart -#touch liggghts.restart +rm -f log* -## if postproc is activated (in fix_chem_shrink) -#rm $casePath/changeOfCO2 -#rm $casePath/changeOfO2 -#rm $casePath/rhogas_ -#rm $casePath/pmass_ +rm -r ./DEM/post +mkdir ./DEM/post +mkdir ./DEM/post/restart +touch ./DEM/post/restart/.gitignore # ----------------------------------------------------------------- end-of-file