diff --git a/tutorials/cfdemPostproc/fillCylinder/Allrun.sh b/tutorials/cfdemPostproc/fillCylinder/Allrun.sh index b8476329..4ad6d401 100755 --- a/tutorials/cfdemPostproc/fillCylinder/Allrun.sh +++ b/tutorials/cfdemPostproc/fillCylinder/Allrun.sh @@ -9,7 +9,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #- define variables casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" diff --git a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh index 0c5232c9..def0b7cd 100755 --- a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh +++ b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh @@ -6,7 +6,7 @@ # Christoph Goniva - July. 2011, mod by Alice Hager - July 2011 #===================================================================# -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #- define variables casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" diff --git a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh index f3c02f0f..ddf201a0 100644 --- a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverPiso/ErgunTestCG/Allrun.sh b/tutorials/cfdemSolverPiso/ErgunTestCG/Allrun.sh index 329831fa..cc668ce0 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestCG/Allrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestCG/Allrun.sh @@ -10,7 +10,7 @@ casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh # check if mesh was built if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then diff --git a/tutorials/cfdemSolverPiso/ErgunTestCG/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestCG/parCFDDEMrun.sh index 2a476176..bc700b7f 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestCG/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestCG/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables @@ -67,8 +67,6 @@ if [ $postproc == "true" ] #- get VTK data from CFD sim cd $casePath/CFD foamToVTK #- serial run of foamToVTK - #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions - #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK #- start paraview paraview diff --git a/tutorials/cfdemSolverPiso/ErgunTestCG/parDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestCG/parDEMrun.sh index 9b431c5b..aff0b785 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestCG/parDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestCG/parDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh index 73c92d20..743ee33c 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables @@ -67,8 +67,6 @@ if [ $postproc == "true" ] #- get VTK data from CFD sim cd $casePath/CFD foamToVTK #- serial run of foamToVTK - #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions - #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK #- start paraview paraview diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/parDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI/parDEMrun.sh index d1e3a033..b5c2d5dd 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/parDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/parDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh echo "starting DEM run in parallel..." #--------------------------------------------------------------------------------# diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh index e6c4a062..79f137a4 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables @@ -67,8 +67,6 @@ if [ $postproc == "true" ] #- get VTK data from CFD sim cd $casePath/CFD foamToVTK #- serial run of foamToVTK - #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions - #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK #- start paraview paraview diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parDEMrun.sh index 9b431c5b..aff0b785 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh index a5564adb..175563a0 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh @@ -92,8 +92,6 @@ if [ $postproc == "true" ] #- get VTK data from CFD sim cd $casePath/CFD foamToVTK #- serial run of foamToVTK - #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions - #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK #- start paraview paraview diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parCFDDEMrun.sh index 75edf29d..be64f254 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parDEMrun.sh index 138c7400..fe247127 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh index 2d622d70..2af47890 100644 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables @@ -64,8 +64,6 @@ if [ $postproc == "true" ] #- get VTK data from CFD sim cd $casePath/CFD foamToVTK #- serial run of foamToVTK - #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions - #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK #- start paraview paraview diff --git a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/Allrun.sh b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/Allrun.sh index 5f0949ca..709e2c05 100755 --- a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/Allrun.sh +++ b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/Allrun.sh @@ -38,7 +38,7 @@ if [ $postproc == "true" ] #- get VTK data from CFD sim cd $casePath/CFD #foamToVTK #- serial run of foamToVTK - source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions + source $CFDEM_PROJECT_DIR/etc/functions.sh #- include functions pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK #- start paraview diff --git a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/parCFDDEMrun.sh index 800f7aea..e484c4f3 100644 --- a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh b/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh index c0073d9a..52a34dcd 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables @@ -70,8 +70,6 @@ if [ $postproc == "true" ] #- get VTK data from CFD sim cd $casePath/CFD foamToVTK #- serial run of foamToVTK - #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions - #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK #- start paraview paraview diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/parDEMrun.sh b/tutorials/cfdemSolverPisoScalar/packedBedTemp/parDEMrun.sh index 660b45a1..64e367bb 100755 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/parDEMrun.sh +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/parDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/parDEMrun.sh b/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/parDEMrun.sh index d1e3a033..b5c2d5dd 100755 --- a/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/parDEMrun.sh +++ b/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/parDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh echo "starting DEM run in parallel..." #--------------------------------------------------------------------------------# diff --git a/tutorials/cfdemSolverRhoPimple/FinesColumn/parCFDDEMrun.sh b/tutorials/cfdemSolverRhoPimple/FinesColumn/parCFDDEMrun.sh index 226bf237..802c3f12 100755 --- a/tutorials/cfdemSolverRhoPimple/FinesColumn/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverRhoPimple/FinesColumn/parCFDDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh #--------------------------------------------------------------------------------# #- define variables diff --git a/tutorials/cfdemSolverRhoPimple/FinesColumn/parDEMrun.sh b/tutorials/cfdemSolverRhoPimple/FinesColumn/parDEMrun.sh index c7a9b51d..1a45152f 100755 --- a/tutorials/cfdemSolverRhoPimple/FinesColumn/parDEMrun.sh +++ b/tutorials/cfdemSolverRhoPimple/FinesColumn/parDEMrun.sh @@ -10,7 +10,7 @@ . ~/.bashrc #- include functions -source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh +source $CFDEM_PROJECT_DIR/etc/functions.sh echo "starting DEM run in parallel..." #--------------------------------------------------------------------------------#