release on 2014-03-11_15-15-12

2014-03-11 15:15:12 +01:00
parent 5cdaaa289c
commit ef08058ce6
36 changed files with 282 additions and 169 deletions
--- a/tutorials/cfdemSolverPiso/ErgunTestCG/DEM/liggghts.restart
+++ b/tutorials/cfdemSolverPiso/ErgunTestCG/DEM/liggghts.restart
--- a/tutorials/cfdemSolverPiso/ErgunTestCG/DEM/liggghts.restart_coarseGraining_2
+++ b/tutorials/cfdemSolverPiso/ErgunTestCG/DEM/liggghts.restart_coarseGraining_2
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
@ -139,8 +139,11 @@ totalMomentumExchangeProps
 }
 GidaspowDragProps
 {
+    verbose;
    velFieldName "U";
    densityFieldName "rho";
+    voidfractionFieldName "voidfraction";
+    phi 1;
 }
 DiFeliceDragProps
 {
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh
@ -94,6 +94,7 @@ rm -r $casePath/DEM/post/*
 rm -r $casePath/DEM/log.*
 rm -r $casePath/DEM/liggghts.restartCFDEM*
 rm -r $casePath/CFD/probes
+rm -r $casePath/CFD/postProcessing
 rm -r $casePath/CFD/lagrangian
 rm -r $casePath/CFD/clockData
 echo "done"
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/DEM/post/dummy
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/DEM/post/dummy
@ -56,3 +56,5 @@ dummyfile
 dummyfile
 dummyfile
 dummyfile
+dummyfile
+dummyfile