release on 2014-07-17_15-58-48

tutorials/cfdemSolverPiso/ErgunTestCG/Allrun.sh

@@ -18,5 +18,12 @@ else
     blockMesh
 fi
 
+if [ -f "$casePath/DEM/post/restart/liggghts.restart*" ];  then
+    echo "LIGGGHTS init was run before - using existing restart file"
+else
+    #- run DEM in new terminal
+    $casePath/parDEMrun.sh
+fi
+
 #- run parallel CFD-DEM in new terminal
 gnome-terminal --title='cfdemSolverPiso ErgunTestCG CFD'  -e "bash $casePath/parCFDDEMrun.sh" 

tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties

@@ -224,6 +224,6 @@ dividedProps
 twoWayMPIProps
 {
     maxNumberOfParticles 10100;
-    liggghtsPath "../DEM/in.liggghts_resume";
+    liggghtsPath "../DEM/in.liggghts_run";
 }
 // ************************************************************************* //

tutorials/cfdemSolverPiso/ErgunTestCG/CFD/octave/totalPressureDrop.m

@@ -103,7 +103,7 @@ ylabel("pressure drop [Pa]")
 axis([0,Uend,0,dpErgun(length(dpErgun))])
 
 %print('cfdemSolverPiso_settlingTest.eps','-deps2')
-print -color "cfdemSolverPiso_ErgunTestMPI.eps"
+print -color "cfdemSolverPiso_ErgunTestCG.eps"
 replot;
 
 

tutorials/cfdemSolverPiso/ErgunTestCG/DEM/in.liggghts_init

@@ -7,7 +7,7 @@ echo both
 #######################################################
 # variables                                           #
 #######################################################
-variable cg equal 1
+variable cg equal 2
 variable r0 equal 0.00025
 variable nPorg equal 71000
 variable nPscal equal ${nPorg}/(${cg}*${cg}*${cg})
@@ -75,5 +75,5 @@ dump		dmp all custom 5000 post/dump.liggghts_init id type type x y z ix iy iz vx
 #node : f_couple_cfd[6]
 #cell id : f_couple_cfd[7]
 
-run		10000 upto
-write_restart 	liggghts.restart_coarseGraining_${cg}
+run		        10000 upto
+write_restart 	../DEM/post/restart/liggghts.restart_coarseGraining_${cg}

tutorials/cfdemSolverPiso/ErgunTestCG/DEM/in.liggghts_run

@@ -7,7 +7,7 @@ echo both
 #######################################################
 # variables                                           #
 #######################################################
-variable cg equal 3
+variable cg equal 2
 variable r0 equal 0.00025
 variable nPorg equal 71000
 variable nPscal equal ${nPorg}/(${cg}*${cg}*${cg})
@@ -25,7 +25,8 @@ units		si
 processors	2 2 1
 
 #read the restart file
-read_restart 	../DEM/liggghts.restart_coarseGraining_${cg}
+read_restart 	../DEM/post/restart/liggghts.restart_coarseGraining_${cg}
+#_coarseGraining_${cg}
 
 neighbor	0.001 bin
 neigh_modify	delay 0

tutorials/cfdemSolverPiso/ErgunTestCG/parCFDDEMrun.sh

@@ -16,7 +16,7 @@ source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
 #- define variables
 casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
 logpath=$casePath
-headerText="run_parallel_cfdemSolverPiso_ErgunTestMPI_CFDDEM"
+headerText="run_parallel_cfdemSolverPiso_ErgunTestCG_CFDDEM"
 logfileName="log_$headerText"
 solverName="cfdemSolverPiso"
 nrProcs="4"
@@ -40,17 +40,17 @@ if [ $runOctave == "true" ]
         cd octave
 
         #- rmove old graph
-        rm cfdemSolverPiso_ErgunTestMPI.eps
+        rm cfdemSolverPiso_ErgunTestCG.eps
 
         #- run octave
         octave totalPressureDrop.m
 
         #- show plot 
-        evince cfdemSolverPiso_ErgunTestMPI.eps
+        evince cfdemSolverPiso_ErgunTestCG.eps
 
         #- copy log file to test harness
         cp ../../$logfileName $testHarnessPath
-        cp cfdemSolverPiso_ErgunTestMPI.eps $testHarnessPath
+        cp cfdemSolverPiso_ErgunTestCG.eps $testHarnessPath
 fi
 
 if [ $postproc == "true" ]
@@ -62,7 +62,7 @@ if [ $postproc == "true" ]
 
     #- get VTK data from liggghts dump file
     cd $casePath/DEM/post
-    python -i $CFDEM_LPP_DIR/lpp.py dump*.liggghts_restart
+    python -i $CFDEM_LPP_DIR/lpp.py dump*.liggghts_run
 
     #- get VTK data from CFD sim
     cd $casePath/CFD
@@ -86,6 +86,8 @@ source $WM_PROJECT_DIR/bin/tools/CleanFunctions
 cd $casePath/CFD
 cleanCase
 rm -r $casePath/CFD/clockData
-rm -r $casePath/DEM/post/*
-(cd $casePath/DEM/post && touch dummy)
+rm -r $casePath/DEM/post/*.*
+rm -r $casePath/DEM/post/restart/*.*
+touch $casePath/DEM/post/.gitignore
+touch $casePath/DEM/post/restart/.gitignore
 echo "done"

tutorials/cfdemSolverPiso/ErgunTestCG/parDEMrun.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+#===================================================================#
+# DEMrun script for ErgunTestMPI testcase
+# init ErgunTestMPI
+# Daniel Queteschiner - June 2014
+#===================================================================#
+
+#- source CFDEM env vars
+. ~/.bashrc
+
+#- include functions
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
+
+#--------------------------------------------------------------------------------#
+#- 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"   # yourMachinefileName | none
+#--------------------------------------------------------------------------------#
+
+#- call function to run DEM case
+parDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName
+

tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh

@@ -86,7 +86,7 @@ source $WM_PROJECT_DIR/bin/tools/CleanFunctions
 cd $casePath/CFD
 cleanCase
 rm -r $casePath/CFD/clockData
-rm -r $casePath/DEM/post/*.*
+rm $casePath/DEM/post/*.*
 rm -r $casePath/DEM/post/restart/*.*
 touch $casePath/DEM/post/.gitignore
 touch $casePath/DEM/post/restart/.gitignore