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/cfdemSolverIB/twoSpheresGlowinskiMPI/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/CFD/constant/couplingProperties
@ -99,7 +99,6 @@ IBProps
    maxCellsPerParticle 1000;
    alphaMin 0.30;
    scaleUpVol 1.0;
-    checkPeriodicCells;
 }

 bigParticleProps
@ -127,7 +126,6 @@ engineIBProps
    }
    zSplit 8;
    xySplit 16;
-    checkPeriodicCells;
 }

 // ************************************************************************* //
--- a/tutorials/cfdemSolverPimple/ErgunTestMPI/Allrun.sh
+++ b/tutorials/cfdemSolverPimple/ErgunTestMPI/Allrun.sh
@ -21,8 +21,6 @@ else
    blockMesh
 fi

-
-
 #- run parallel CFD-DEM in new terminal
 gnome-terminal --title='cfdemSolverPimple ErgunTestMPI CFD'  -e "bash $casePath/parCFDDEMrun.sh" 

--- a/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/totalPressureDrop.m
+++ b/tutorials/cfdemSolverPimple/ErgunTestMPI/CFD/octave/totalPressureDrop.m
@ -6,7 +6,7 @@ clc;
 % simulation data 1
 %====================================%
 %path = '../probes/0/p';
-path = '../probes/0/p';
+path = '../postProcessing/0/p';
 columns=22;
 headerlines=4;
 data = loaddata(path,columns,headerlines);
--- a/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/post/dummy
+++ b/tutorials/cfdemSolverPimple/ErgunTestMPI/DEM/post/dummy
@ -75,3 +75,4 @@ dummyfile
 dummyfile
 dummyfile
 dummyfile
+dummyfile
--- 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