Fix init case

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/Allclean.sh

@@ -20,6 +20,5 @@ echo "Enter: yes, Ctrl + C: no"
 read
 
 rm $casePath/DEM/post/restart/*.*
-rm -r $casePath/DEM/post/restart/5/
 
 

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/Allrun.sh

@@ -18,20 +18,20 @@ else
 fi
 
 # check if initialization was done
-if [ -f "$casePath/DEM/post/restart/liggghts.restartCFDEM_5.000000" ];  then
+if [ -f "$casePath/DEM/post/restart/liggghts.restart" ];  then
     echo "Initialization was run before - using existing restart file"
 else
 	cd $casePath
-	bash init.sh
+	./parDEMrun.sh
 fi
 
-# run the drainage simulation
 cd $casePath/CFD
-cp system/controlDict.run system/controlDict
-cp constant/couplingProperties.run constant couplingProperties
-cp -r $casePath/DEM/post/restart/5/ .
+cp -r 0.org 0
+setFields
 decomposePar -force
-mpirun -np $nrProcs cfdemSolverMultiphase -parallel |& tee $casePath/log_run
+
+cd $casePath
+./parCFDDEMrun.sh
 
 # generate files for post processing
 cd $casePath

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/CFD/0.org/nut

@@ -39,7 +39,7 @@ boundaryField
     atmosphere
     {
         type            calculated;
-	uniform		0;
+		value			uniform	0;
     } 
 }
 

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/CFD/constant/couplingProperties

@@ -61,13 +61,13 @@ forceModels
     //BeetstraDrag
     //DiFeliceDrag
     //gradPForce
-    gradPForceSmooth
-    viscForce
-    KochHillDrag
+    //gradPForceSmooth
+    //viscForce
+    //KochHillDrag
     //interface
     //DEMbasedDrag
     //RongDrag
-    //Archimedes
+    Archimedes
     //volWeightedAverage
     //totalMomentumExchange
     //particleCellVolume

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/CFD/system/controlDict

@@ -23,7 +23,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         5; //60
+endTime         1; //60
 
 deltaT          0.005;
 

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/DEM/in.liggghts_init

@@ -95,4 +95,4 @@ run         ${nrIterations} upto
 region particleRm cylinder z 0 0 ${cylRadius} 0.08 0.15
 delete_atoms region particleRm
 
-write_restart   post/restart/fill.restart
+write_restart   post/restart/liggghts.restart

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/DEM/in.liggghts_run

@@ -75,7 +75,7 @@ units           si
 processors      2 2 1
 
 # read the restart file
-read_restart    ../DEM/post/restart/liggghts.restartCFDEM_5.000000
+read_restart    ../DEM/post/restart/liggghts.restart
 
 neighbor        ${skin} bin
 neigh_modify    delay 0

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/parCFDDEMrun.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+#===================================================================#
+# allrun script for testcase as part of test routine 
+# run settlingTest CFD part
+# Christoph Goniva - Feb. 2011
+#===================================================================#
+
+#- source CFDEM env vars
+. ~/.bashrc
+
+#- include functions
+source $CFDEM_PROJECT_DIR/etc/functions.sh
+
+#--------------------------------------------------------------------------------#
+#- define variables
+casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
+logpath=$casePath
+headerText="run_parallel_cfdemSolverMultiphase_test"
+logfileName="log_$headerText"
+solverName="cfdemSolverMultiphase"
+nrProcs="4"
+machineFileName="none"   # yourMachinefileName | none
+debugMode="off"          # on | off| strict
+testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
+#--------------------------------------------------------------------------------#
+
+#- call function to run a parallel CFD-DEM case
+parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode
+

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/parDEMrun.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+#===================================================================#
+# DEMrun script for ErgunTestMPI testcase
+# init ErgunTestMPI
+# Christoph Goniva - July 2014
+#===================================================================#
+
+#- source CFDEM env vars
+. ~/.bashrc
+
+#- include functions
+source $CFDEM_PROJECT_DIR/etc/functions.sh
+
+echo "starting DEM run in parallel..."
+#--------------------------------------------------------------------------------#
+#- define variables
+casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
+logpath="$casePath"
+headerText="run_liggghts_init_DEM"
+logfileName="log_$headerText"
+solverName="in.liggghts_init"
+nrProcs=4
+machineFileName="none"
+debugMode="off"
+#--------------------------------------------------------------------------------#
+
+#- call function to run DEM case
+parDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode
+

tutorials/cfdemSolverMultiphase/small_scale_hearth_drainage/init/postRun.sh

@@ -9,7 +9,6 @@ python $CFDEM_LPP_DIR/lpp.py dump*.liggghts_run
 
 #- get VTK data from CFD sim
 cd $casePath/CFD
-reconstructPar -zeroTime -noLagrangian
+reconstructPar -withZero -noLagrangian
 foamToVTK
 
-#rm -r $casePath/CFD/processor*