Solved merge conflict

tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties

@@ -55,9 +55,11 @@ forceModels
     //GidaspowDrag
     //BeetstraDrag
     //DiFeliceDrag
-    KochHillDrag
     gradPForce
     viscForce
+    KochHillDrag
+    //DEMbasedDrag
+    //RongDrag
     //Archimedes
     //volWeightedAverage
     //totalMomentumExchange
@@ -99,23 +101,20 @@ implicitCoupleProps
 
 ArchimedesProps
 {
-    densityFieldName "rho";
     gravityFieldName "g";
 }
 gradPForceProps
 {
     pFieldName "p";
-    densityFieldName "rho";
     voidfractionFieldName "voidfraction";
     velocityFieldName "U";
-    interpolation;
+    interpolation true;
 }
 
 viscForceProps
 {
     velocityFieldName "U";
-    densityFieldName "rho";
-    interpolation;
+    interpolation true;
 }
 volWeightedAverageProps
 {
@@ -128,7 +127,7 @@ volWeightedAverageProps
     );
     upperThreshold 0.999;
     lowerThreshold 0;
-    verbose;
+    verbose true;
 }
 totalMomentumExchangeProps
 {
@@ -136,46 +135,48 @@ totalMomentumExchangeProps
     explicitMomExFieldName "none";
     fluidVelFieldName "U";
     granVelFieldName "Us";
-    densityFieldName "rho";
 }
 GidaspowDragProps
 {
-    verbose;
+    verbose true;
     velFieldName "U";
-    densityFieldName "rho";
     voidfractionFieldName "voidfraction";
-    interpolation;
+    interpolation true;
     phi 1;
 }
+DEMbasedDragProps
+{
+    velFieldName "U";
+    voidfractionFieldName "voidfraction";
+}
+
 DiFeliceDragProps
 {
-    //verbose;
+    //verbose true;
     velFieldName "U";
-    densityFieldName "rho";
     voidfractionFieldName "voidfraction";
     granVelFieldName "Us";
-    interpolation;
+    interpolation true;
 }
 
 KochHillDragProps
 {
-    //verbose;
+    //verbose true;
     velFieldName "U";
-    densityFieldName "rho";
     voidfractionFieldName "voidfraction";
-    interpolation;
+    interpolation true;
     //forceSubModels
     //(
     //    ImExCorr
     //);
-    //implDEM true;
+    implForceDEM true;
+    //implForceDEMaccumulated true;
     //explicitInterpCorr true;
 }
 
 BeetstraDragProps
 {
     velFieldName "U";
-    densityFieldName "rho";
     gravityFieldName "g";
     rhoParticle     2000.;
     voidfractionFieldName "voidfraction";
@@ -184,20 +185,30 @@ BeetstraDragProps
     useParcelSizeDependentFilteredDrag ;
     k       0.05;
     aLimit  0.0;
-//    verbose ;
+//    verbose true;
+}
+
+RongDragProps
+{
+    verbose true;
+    velFieldName "U";
+    voidfractionFieldName "voidfraction";
+    interpolation true;
+    implForceDEM true;
+    implForceDEMaccumulated true;
+    granVelFieldName "Us";
 }
 
 virtualMassForceProps
 {
     velFieldName "U";
-    densityFieldName "rho";
 }
 
 particleCellVolumeProps
 {
     upperThreshold 0.999;
     lowerThreshold 0.;
-    verbose;
+    verbose true;
 }
 
 oneWayVTKProps

tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/liggghtsCommands

@@ -26,6 +26,7 @@ FoamFile
 liggghtsCommandModels
 (
     runLiggghts
+    //writeLiggghts
 );
 // ************************************************************************* //
 
@@ -33,3 +34,10 @@ liggghtsCommandModels
 {
     preNo false;
 }*/
+
+/*writeLiggghtsProps
+{
+    writeLast off;
+    writeName "post/restart/liggghts.restartCFDEM";
+    overwrite on;
+}*/

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

@@ -53,7 +53,7 @@ fprintf('so the result does not depend on density\n')
 %==================================
 % min fluidization velocity in m/s
 %==================================
-rhoP = 2000                      % particle density in kg/m3
+rhoP = 2000                     % particle density in kg/m3
 g = 9.81                        % gravity m/s2
 
 Umf = dp^2*(rhoP-rhoG)*g/(150*muG)*(epsilon^3*phip^2)/(1-epsilon);
@@ -96,8 +96,4 @@ axis([0,Uend,0,dpErgun(length(dpErgun))])
 
 %print('cfdemSolverPiso_settlingTest.eps','-deps2')
 print -color "cfdemSolverPiso_ErgunTestMPI.eps"
-replot;
-
-
-
 

tutorials/cfdemSolverPiso/ErgunTestMPI/DEM/in.liggghts_run

@@ -44,6 +44,8 @@ set         group all density 2000
 # cfd coupling
 fix         cfd all couple/cfd couple_every 100 mpi
 fix         cfd2 all couple/cfd/force/implicit
+#fix         cfd2 all couple/cfd/force/accumulator RongDrag 10 1.5e-3
+#fix         cfd2 all couple/cfd/force/implicit/accumulated #CrankNicolson 0.5
 
 # apply nve integration to all particles that are inserted as single particles
 fix         integr all nve/sphere

tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh

@@ -87,7 +87,8 @@ cd $casePath/CFD
 cleanCase
 rm -r $casePath/CFD/clockData
 rm $casePath/DEM/post/*.*
-#rm -r $casePath/DEM/post/restart/*.*
 touch $casePath/DEM/post/.gitignore
+#rm $casePath/DEM/post/restart/*.*
+rm $casePath/DEM/post/restart/liggghts.restartCFDEM*
 touch $casePath/DEM/post/restart/.gitignore
 echo "done"