From e1245147fe5c19a32c4b99abec5e65374de4df57 Mon Sep 17 00:00:00 2001 From: danielque Date: Thu, 24 Mar 2022 15:43:56 +0100 Subject: [PATCH] clean up tutorial run/clean scripts --- .../falling_sphere_two_way_coupling/Allclean.sh | 15 ++++++--------- .../falling_sphere_two_way_coupling/Allrun.sh | 10 ++++------ .../parCFDDEMrun.sh | 11 +++++------ 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allclean.sh b/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allclean.sh index 50302aa1..3360c516 100755 --- a/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allclean.sh +++ b/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allclean.sh @@ -1,21 +1,18 @@ #!/bin/bash - -#===================================================================# -# allclean script for testcase +#------------------------------------------------------------------------------ +# Allclean script for falling sphere test case # clean CFD and DEM part -# Achuth N. Balachandran Nair - Oct. 2018 -#===================================================================# +# Achuth N. Balachandran Nair - October 2018 +#------------------------------------------------------------------------------ -#- source CFDEM env vars +#- source environment variables . ~/.bashrc -#- include functions +#- source CFDEM functions source $CFDEM_PROJECT_DIR/etc/functions.sh -#--------------------------------------------------------------------------------# #- define variables casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" -#--------------------------------------------------------------------------------# #- clean up case echo "deleting data at: $casePath" diff --git a/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allrun.sh b/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allrun.sh index 69df21d2..d1b1e2d6 100755 --- a/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allrun.sh +++ b/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/Allrun.sh @@ -1,10 +1,9 @@ #!/bin/bash - -#===================================================================# -# allrun script for testcase +#------------------------------------------------------------------------------ +# allrun script for falling sphere testcase # run falling_sphere_two_way_coupling # Achuth N. Balachandran Nair - Oct. 2018 -#===================================================================# +#------------------------------------------------------------------------------ source $CFDEM_PROJECT_DIR/etc/functions.sh @@ -22,6 +21,5 @@ else blockMesh fi - -#gnome-terminal --title='cfdemSolverIB twoSpheresGlowinskiMPI CFD' -e "bash $casePath/parCFDDEMrun.sh" +#- run parallel CFD-DEM bash $casePath/parCFDDEMrun.sh diff --git a/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/parCFDDEMrun.sh b/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/parCFDDEMrun.sh index 35056e98..7df8a47b 100644 --- a/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverIB/falling_sphere_two_way_coupling/parCFDDEMrun.sh @@ -1,10 +1,9 @@ #!/bin/bash - -#===================================================================# -# CFDDEMrun script for testcase +#------------------------------------------------------------------------------ +# parCFDDEMrun script for falling sphere testcase # run falling_sphere_two_way_coupling # Achuth N. Balachandran Nair - Oct. 2018 -#===================================================================# +#------------------------------------------------------------------------------ #- source CFDEM env vars . ~/.bashrc @@ -12,7 +11,7 @@ #- include functions source $CFDEM_PROJECT_DIR/etc/functions.sh -#--------------------------------------------------------------------------------# +#------------------------------------------------------------------------------ #- define variables casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" logpath=$casePath @@ -25,7 +24,7 @@ debugMode="off" # on | off| strict testHarnessPath="$CFDEM_TEST_HARNESS_PATH" runOctave="false" postproc="false" -#--------------------------------------------------------------------------------# +#------------------------------------------------------------------------------ #- call function to run a parallel CFD-DEM case parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode