diff --git a/tutorials/cfdemSolverMultiphase/damBreak/Allrun.sh b/tutorials/cfdemSolverMultiphase/damBreak/Allrun.sh index 555a8043..6b9b4e2d 100755 --- a/tutorials/cfdemSolverMultiphase/damBreak/Allrun.sh +++ b/tutorials/cfdemSolverMultiphase/damBreak/Allrun.sh @@ -31,5 +31,5 @@ fi bash $casePath/parCFDDEMrun.sh if [ "$postProcessing" = true ]; then - source $casePath/postRun.sh + bash $casePath/postrun.sh fi diff --git a/tutorials/cfdemSolverMultiphase/damBreak/parCFDDEMrun.sh b/tutorials/cfdemSolverMultiphase/damBreak/parCFDDEMrun.sh index 37536250..cc74e38d 100755 --- a/tutorials/cfdemSolverMultiphase/damBreak/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverMultiphase/damBreak/parCFDDEMrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# allrun script for testcase as part of test routine -# run settlingTest CFD part -# Christoph Goniva - Feb. 2011 +# allrun script for testcase as part of test routine +# run damBreak CFD part #===================================================================# #- source CFDEM env vars diff --git a/tutorials/cfdemSolverMultiphase/damBreak/parDEMrun.sh b/tutorials/cfdemSolverMultiphase/damBreak/parDEMrun.sh index b5c2d5dd..9290dfde 100755 --- a/tutorials/cfdemSolverMultiphase/damBreak/parDEMrun.sh +++ b/tutorials/cfdemSolverMultiphase/damBreak/parDEMrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# DEMrun script for ErgunTestMPI testcase -# init ErgunTestMPI -# Christoph Goniva - July 2014 +# DEMrun script for damBreak testcase +# init damBreak #===================================================================# #- source CFDEM env vars diff --git a/tutorials/cfdemSolverMultiphase/damBreak/postRun.sh b/tutorials/cfdemSolverMultiphase/damBreak/postrun.sh similarity index 100% rename from tutorials/cfdemSolverMultiphase/damBreak/postRun.sh rename to tutorials/cfdemSolverMultiphase/damBreak/postrun.sh diff --git a/tutorials/cfdemSolverMultiphase/particlesWaterEntry/Allrun.sh b/tutorials/cfdemSolverMultiphase/particlesWaterEntry/Allrun.sh index 6503f26c..c732f168 100755 --- a/tutorials/cfdemSolverMultiphase/particlesWaterEntry/Allrun.sh +++ b/tutorials/cfdemSolverMultiphase/particlesWaterEntry/Allrun.sh @@ -31,5 +31,5 @@ fi bash $casePath/parCFDDEMrun.sh if [ "$postProcessing" = true ]; then - bash $casePath/postRun.sh + bash $casePath/postrun.sh fi diff --git a/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parCFDDEMrun.sh b/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parCFDDEMrun.sh index 37536250..2882782b 100755 --- a/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parCFDDEMrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# allrun script for testcase as part of test routine -# run settlingTest CFD part -# Christoph Goniva - Feb. 2011 +# allrun script for testcase as part of test routine +# run particlesWaterEntry CFD part #===================================================================# #- source CFDEM env vars diff --git a/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parDEMrun.sh b/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parDEMrun.sh index b5c2d5dd..6bba2001 100755 --- a/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parDEMrun.sh +++ b/tutorials/cfdemSolverMultiphase/particlesWaterEntry/parDEMrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# DEMrun script for ErgunTestMPI testcase -# init ErgunTestMPI -# Christoph Goniva - July 2014 +# DEMrun script for particlesWaterEntry testcase +# init particlesWaterEntry #===================================================================# #- source CFDEM env vars diff --git a/tutorials/cfdemSolverMultiphase/particlesWaterEntry/postRun.sh b/tutorials/cfdemSolverMultiphase/particlesWaterEntry/postrun.sh similarity index 100% rename from tutorials/cfdemSolverMultiphase/particlesWaterEntry/postRun.sh rename to tutorials/cfdemSolverMultiphase/particlesWaterEntry/postrun.sh diff --git a/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/Allrun.sh b/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/Allrun.sh index 2ea9e436..6a977cba 100755 --- a/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/Allrun.sh +++ b/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/Allrun.sh @@ -25,4 +25,4 @@ cp -r ./CFD/1.org ./CFD/1 # generate files for post processing cd $casePath -./postRun.sh +./postrun.sh diff --git a/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/parCFDDEMrun.sh b/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/parCFDDEMrun.sh index 37536250..b6487e2f 100755 --- a/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/parCFDDEMrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# allrun script for testcase as part of test routine -# run settlingTest CFD part -# Christoph Goniva - Feb. 2011 +# allrun script for testcase as part of test routine +# run CFD part #===================================================================# #- source CFDEM env vars diff --git a/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/postRun.sh b/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/postrun.sh similarity index 88% rename from tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/postRun.sh rename to tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/postrun.sh index d013ddea..eff06cbf 100755 --- a/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/postRun.sh +++ b/tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/postrun.sh @@ -12,4 +12,4 @@ cd $casePath/CFD reconstructPar -noLagrangian foamToVTK -#rm -r $casePath/CFD/processor* +#rm -r $casePath/CFD/processor* diff --git a/tutorials/cfdemSolverMultiphase/tankDrainage/Allrun.sh b/tutorials/cfdemSolverMultiphase/tankDrainage/Allrun.sh index 8a34bf56..c2eae317 100755 --- a/tutorials/cfdemSolverMultiphase/tankDrainage/Allrun.sh +++ b/tutorials/cfdemSolverMultiphase/tankDrainage/Allrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# allrun script for testcase as part of test routine -# run settlingTest -# Christoph Goniva - Sept. 2010 +# allrun script for testcase as part of test routine +# run tankDrainage #===================================================================# #- define variables @@ -34,7 +33,7 @@ fi bash $casePath/parCFDDEMrun.sh if [ "$postProcessing" = true ]; then - cd $casePath - bash $casePath/postRun.sh - octave $casePath/volFlow.m + cd $casePath + bash $casePath/postrun.sh + octave $casePath/volFlow.m fi diff --git a/tutorials/cfdemSolverMultiphase/tankDrainage/parCFDDEMrun.sh b/tutorials/cfdemSolverMultiphase/tankDrainage/parCFDDEMrun.sh index 37536250..2d92d1bb 100755 --- a/tutorials/cfdemSolverMultiphase/tankDrainage/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverMultiphase/tankDrainage/parCFDDEMrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# allrun script for testcase as part of test routine -# run settlingTest CFD part -# Christoph Goniva - Feb. 2011 +# allrun script for testcase as part of test routine +# run tankDrainage CFD part #===================================================================# #- source CFDEM env vars diff --git a/tutorials/cfdemSolverMultiphase/tankDrainage/parDEMrun.sh b/tutorials/cfdemSolverMultiphase/tankDrainage/parDEMrun.sh index b5c2d5dd..8be90dee 100755 --- a/tutorials/cfdemSolverMultiphase/tankDrainage/parDEMrun.sh +++ b/tutorials/cfdemSolverMultiphase/tankDrainage/parDEMrun.sh @@ -1,9 +1,8 @@ #!/bin/bash #===================================================================# -# DEMrun script for ErgunTestMPI testcase -# init ErgunTestMPI -# Christoph Goniva - July 2014 +# DEMrun script for tankDrainage testcase +# init tankDrainage #===================================================================# #- source CFDEM env vars diff --git a/tutorials/cfdemSolverMultiphase/tankDrainage/postRun.sh b/tutorials/cfdemSolverMultiphase/tankDrainage/postrun.sh similarity index 100% rename from tutorials/cfdemSolverMultiphase/tankDrainage/postRun.sh rename to tutorials/cfdemSolverMultiphase/tankDrainage/postrun.sh