mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
clean up tutorial run/clean scripts
This commit is contained in:
@ -1,21 +1,18 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
#===================================================================#
|
# Allclean script for falling sphere test case
|
||||||
# allclean script for testcase
|
|
||||||
# clean CFD and DEM part
|
# 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
|
. ~/.bashrc
|
||||||
|
|
||||||
#- include functions
|
#- source CFDEM functions
|
||||||
source $CFDEM_PROJECT_DIR/etc/functions.sh
|
source $CFDEM_PROJECT_DIR/etc/functions.sh
|
||||||
|
|
||||||
#--------------------------------------------------------------------------------#
|
|
||||||
#- define variables
|
#- define variables
|
||||||
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
|
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
|
||||||
#--------------------------------------------------------------------------------#
|
|
||||||
|
|
||||||
#- clean up case
|
#- clean up case
|
||||||
echo "deleting data at: $casePath"
|
echo "deleting data at: $casePath"
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
#===================================================================#
|
# allrun script for falling sphere testcase
|
||||||
# allrun script for testcase
|
|
||||||
# run falling_sphere_two_way_coupling
|
# run falling_sphere_two_way_coupling
|
||||||
# Achuth N. Balachandran Nair - Oct. 2018
|
# Achuth N. Balachandran Nair - Oct. 2018
|
||||||
#===================================================================#
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
source $CFDEM_PROJECT_DIR/etc/functions.sh
|
source $CFDEM_PROJECT_DIR/etc/functions.sh
|
||||||
|
|
||||||
@ -22,6 +21,5 @@ else
|
|||||||
blockMesh
|
blockMesh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#- run parallel CFD-DEM
|
||||||
#gnome-terminal --title='cfdemSolverIB twoSpheresGlowinskiMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
|
|
||||||
bash $casePath/parCFDDEMrun.sh
|
bash $casePath/parCFDDEMrun.sh
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
#===================================================================#
|
# parCFDDEMrun script for falling sphere testcase
|
||||||
# CFDDEMrun script for testcase
|
|
||||||
# run falling_sphere_two_way_coupling
|
# run falling_sphere_two_way_coupling
|
||||||
# Achuth N. Balachandran Nair - Oct. 2018
|
# Achuth N. Balachandran Nair - Oct. 2018
|
||||||
#===================================================================#
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
#- source CFDEM env vars
|
#- source CFDEM env vars
|
||||||
. ~/.bashrc
|
. ~/.bashrc
|
||||||
@ -12,7 +11,7 @@
|
|||||||
#- include functions
|
#- include functions
|
||||||
source $CFDEM_PROJECT_DIR/etc/functions.sh
|
source $CFDEM_PROJECT_DIR/etc/functions.sh
|
||||||
|
|
||||||
#--------------------------------------------------------------------------------#
|
#------------------------------------------------------------------------------
|
||||||
#- define variables
|
#- define variables
|
||||||
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
|
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
|
||||||
logpath=$casePath
|
logpath=$casePath
|
||||||
@ -25,7 +24,7 @@ debugMode="off" # on | off| strict
|
|||||||
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
|
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
|
||||||
runOctave="false"
|
runOctave="false"
|
||||||
postproc="false"
|
postproc="false"
|
||||||
#--------------------------------------------------------------------------------#
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
#- call function to run a parallel CFD-DEM case
|
#- call function to run a parallel CFD-DEM case
|
||||||
parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode
|
parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode
|
||||||
|
|||||||
Reference in New Issue
Block a user