typo in comment when using Bfull in checkModelType.H

applications/solvers/cfdemSolverIB/Make/options

@@ -1,10 +1,12 @@
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
 include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME)
 
 PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)"
 
 EXE_INC = \
      $(PFLAGS) \
-    $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
+     $(PINC) \
+     $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -16,6 +18,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
     -I$(CFDEM_LIGGGHTS_SRC_DIR)
+
 EXE_LIBS = \
     -L$(CFDEM_LIB_DIR)\
     $(CFDEM_ADD_INCOMPTURBMOD_LIBS) \

applications/solvers/cfdemSolverIB/cfdemSolverIB.C

@@ -47,7 +47,6 @@ Contributions
 #else
     #include "turbulenceModel.H"
 #endif
-#include "superquadric_flag.h"
 #include "cfdemCloudIB.H"
 #if defined(SUPERQUADRIC_ACTIVE_FLAG)
 #include "cfdemCloudIBSuperquadric.H"
@@ -55,7 +54,6 @@ Contributions
 #include "implicitCouple.H"
 
 #include "averagingModel.H"
-#include "regionModel.H"
 #include "voidFractionModel.H"
 
 #include "dynamicFvMesh.H"
@@ -108,7 +106,7 @@ int main(int argc, char *argv[])
 
         //=== dyM ===================
         interFace = mag(mesh.lookupObject<volScalarField>("voidfractionNext"));
-        mesh.update(); //dyM
+        particleCloud.setMeshHasUpdatedFlag(mesh.update()); //dyM
 
         #if defined(version30)
             #include "readTimeControls.H"
@@ -121,7 +119,7 @@ int main(int argc, char *argv[])
 
         // do particle stuff
         Info << "- evolve()" << endl;
-        particleCloud.evolve(voidfraction);
+        particleCloud.evolve(voidfraction, interFace);
 
         // Pressure-velocity PISO corrector
         {

applications/solvers/cfdemSolverIB/createFields.H

@@ -42,6 +42,21 @@
         mesh
     );
 
+    /*Info<< "\nCreating outside field\n" << endl;
+    volScalarField outside
+    (
+        IOobject
+        (
+            "outside",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        scalar(0)
+    );*/
+
 //========================
 // drag law modelling
 //========================

applications/solvers/cfdemSolverPiso/Make/options

@@ -1,14 +1,17 @@
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
 include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME)
 
 PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)"
 
 EXE_INC = \
      $(PFLAGS) \
-    $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
+     $(PINC) \
+     $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
     -I$(CFDEM_LIGGGHTS_SRC_DIR)
@@ -19,6 +22,7 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
+    -lfvOptions \
     -l$(CFDEM_LIB_NAME) \
      $(CFDEM_ADD_LIB_PATHS) \
      $(CFDEM_ADD_LIBS)

applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C

@@ -44,13 +44,17 @@ Description
 #else
     #include "turbulenceModel.H"
 #endif
+#if defined(versionv1606plus) || defined(version40)
+    #include "fvOptions.H"
+#else
+    #include "fvIOoptionList.H"
+#endif
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "cfdemCloud.H"
 
 #if defined(anisotropicRotation)
     #include "cfdemCloudRotation.H"
 #endif
-#include "superquadric_flag.h"
 #if defined(SUPERQUADRIC_ACTIVE_FLAG)
     #include "cfdemCloudRotationSuperquadric.H"
 #endif
@@ -72,10 +76,12 @@ int main(int argc, char *argv[])
         #include "createTimeControls.H"
     #endif
     #include "createFields.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     // create cfdemCloud
     #include "readGravitationalAcceleration.H"
+    #include "checkImCoupleM.H"
     #if defined(anisotropicRotation)
         cfdemCloudRotation particleCloud(mesh);
     #elif defined(SUPERQUADRIC_ACTIVE_FLAG)
@@ -89,8 +95,6 @@ int main(int argc, char *argv[])
     Info<< "\nStarting time loop\n" << endl;
     while (runTime.loop())
     {
-        particleCloud.clockM().start(1,"Global");
-
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #if defined(version30)
@@ -103,18 +107,21 @@ int main(int argc, char *argv[])
         #endif
 
         // do particle stuff
+        particleCloud.clockM().start(1,"Global");
         particleCloud.clockM().start(2,"Coupling");
         bool hasEvolved = particleCloud.evolve(voidfraction,Us,U);
 
         if(hasEvolved)
         {
-            particleCloud.smoothingM().smoothen(particleCloud.forceM(0).impParticleForces());
+            particleCloud.smoothingM().smoothenAbsolutField(particleCloud.forceM(0).impParticleForces());
         }
     
-        Info << "update Ksl.internalField()" << endl;
-        Ksl = particleCloud.momCoupleM(0).impMomSource();
+        Ksl = particleCloud.momCoupleM(particleCloud.registryM().getProperty("implicitCouple_index")).impMomSource();
         Ksl.correctBoundaryConditions();
 
+        surfaceScalarField voidfractionf = fvc::interpolate(voidfraction);
+        phi = voidfractionf*phiByVoidfraction;
+
         //Force Checks
         #include "forceCheckIm.H"
 
@@ -136,9 +143,11 @@ int main(int argc, char *argv[])
                   + particleCloud.divVoidfractionTau(U, voidfraction)
                   ==
                   - fvm::Sp(Ksl/rho,U)
+                  + fvOptions(U)
                 );
 
                 UEqn.relax();
+                fvOptions.constrain(UEqn);
 
                 #if defined(version30)
                     if (piso.momentumPredictor())
@@ -150,6 +159,8 @@ int main(int argc, char *argv[])
                         solve(UEqn == - fvc::grad(p) + Ksl/rho*Us);
                     else
                         solve(UEqn == - voidfraction*fvc::grad(p) + Ksl/rho*Us);
+
+                    fvOptions.correct(U);
                 }
 
                 // --- PISO loop
@@ -168,18 +179,54 @@ int main(int argc, char *argv[])
                     U = rUA*UEqn.H();
 
                     #ifdef version23
-                        phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() )
-                            + rUAfvoidfraction*fvc::ddtCorr(U, phi);
+                        phi = ( fvc::interpolate(U) & mesh.Sf() )
+                            + rUAfvoidfraction*fvc::ddtCorr(U, phiByVoidfraction);
                     #else
-                        phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() )
-                            + fvc::ddtPhiCorr(rUAvoidfraction, U, phi);
+                        phi = ( fvc::interpolate(U) & mesh.Sf() )
+                            + fvc::ddtPhiCorr(rUAvoidfraction, U, phiByVoidfraction);
                     #endif
-                    surfaceScalarField phiS(fvc::interpolate(Us*voidfraction) & mesh.Sf());
-                    surfaceScalarField phiGes = phi + rUAf*(fvc::interpolate(Ksl/rho) * phiS);
+                    surfaceScalarField phiS(fvc::interpolate(Us) & mesh.Sf());
+                    phi += rUAf*(fvc::interpolate(Ksl/rho) * phiS);
 
                     if (modelType=="A")
                         rUAvoidfraction = volScalarField("(voidfraction2|A(U))",rUA*voidfraction*voidfraction);
 
+                    // Update the fixedFluxPressure BCs to ensure flux consistency
+                    #ifndef versionExt32
+                    #ifndef version40
+                        if (modelType=="A")
+                        {
+                            setSnGrad<fixedFluxPressureFvPatchScalarField>
+                            (
+                                #ifdef versionv1612plus
+                                    p.boundaryFieldRef(),
+                                #else
+                                    p.boundaryField(),
+                                #endif
+                                (
+                                    phi.boundaryField()
+                                  - (mesh.Sf().boundaryField() & U.boundaryField())
+                                )/(mesh.magSf().boundaryField()*rUAf.boundaryField()*voidfractionf.boundaryField())
+                            );
+                        }else
+                        {
+                            setSnGrad<fixedFluxPressureFvPatchScalarField>
+                            (
+                                #ifdef versionv1612plus
+                                    p.boundaryFieldRef(),
+                                #else
+                                    p.boundaryField(),
+                                #endif
+                                (
+                                    phi.boundaryField()
+                                  - (mesh.Sf().boundaryField() & U.boundaryField())
+                                )/(mesh.magSf().boundaryField()*rUAf.boundaryField())
+                            );
+                        }
+                    #endif
+                    #endif
+                    
+
                     // Non-orthogonal pressure corrector loop
                     #if defined(version30)
                         while (piso.correctNonOrthogonal())
@@ -190,7 +237,7 @@ int main(int argc, char *argv[])
                         // Pressure corrector
                         fvScalarMatrix pEqn
                         (
-                            fvm::laplacian(rUAvoidfraction, p) == fvc::div(phiGes) + particleCloud.ddtVoidfraction()
+                            fvm::laplacian(rUAvoidfraction, p) == fvc::div(voidfractionf*phi) + particleCloud.ddtVoidfraction()
                         );
                         pEqn.setReference(pRefCell, pRefValue);
 
@@ -198,8 +245,7 @@ int main(int argc, char *argv[])
                             pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
                             if (piso.finalNonOrthogonalIter())
                             {
-                                phiGes -= pEqn.flux();
-                                phi = phiGes;
+                                phiByVoidfraction = phi - pEqn.flux()/voidfractionf;
                             }
                         #else
                             if( corr == nCorr-1 && nonOrth == nNonOrthCorr )
@@ -213,13 +259,13 @@ int main(int argc, char *argv[])
 
                             if (nonOrth == nNonOrthCorr)
                             {
-                                phiGes -= pEqn.flux();
-                                phi = phiGes;
+                                phiByVoidfraction = phi - pEqn.flux()/voidfractionf;
                             }
                         #endif
 
                     } // end non-orthogonal corrector loop
 
+                    phi = voidfractionf*phiByVoidfraction;
                     #include "continuityErrorPhiPU.H"
 
                     if (modelType=="B" || modelType=="Bfull")
@@ -228,6 +274,7 @@ int main(int argc, char *argv[])
                         U -= voidfraction*rUA*fvc::grad(p) - Ksl/rho*Us*rUA;
 
                     U.correctBoundaryConditions();
+                    fvOptions.correct(U);
 
                 } // end piso loop
             }

applications/solvers/cfdemSolverPiso/createFields.H

@@ -60,7 +60,7 @@
         mesh
     );
 
-    Info<< "\nCreating dummy density field rho\n" << endl;
+    Info<< "\nCreating density field rho\n" << endl;
     volScalarField rho
     (
         IOobject
@@ -109,7 +109,19 @@ surfaceScalarField phi
  );
 #endif
 
-
+Info<< "Generating interstitial face flux field phiByVoidfraction\n" << endl;
+surfaceScalarField phiByVoidfraction
+(
+ IOobject
+ (
+    "phiByVoidfraction",
+    runTime.timeName(),
+    mesh,
+    IOobject::NO_READ,
+    IOobject::NO_WRITE
+ ),
+ linearInterpolate(U) & mesh.Sf()
+);
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;

applications/solvers/cfdemSolverPisoSTM/Make/options

@@ -1,10 +1,12 @@
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
 include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME)
 
 PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)"
 
 EXE_INC = \
      $(PFLAGS) \
-    $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
+     $(PINC) \
+     $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -12,6 +14,7 @@ EXE_INC = \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
     -I$(CFDEM_SRC_DIR)/eulerian/scalarTransportModelsCFDEM/lnInclude \
+    -I$(CFDEM_LIGGGHTS_SRC_DIR)
 
 EXE_LIBS = \
     -L$(CFDEM_LIB_DIR)\

applications/solvers/cfdemSolverPisoSTM/cfdemSolverPisoSTM.C

@@ -44,7 +44,11 @@ Description
     #include "turbulenceModel.H"
 #endif
 #include "fixedFluxPressureFvPatchScalarField.H"
-#include "cfdemCloud.H"
+#ifdef MS
+    #include "cfdemCloudMS.H"
+#else
+    #include "cfdemCloud.H"
+#endif
 #if defined(anisotropicRotation)
     #include "cfdemCloudRotation.H"
 #endif
@@ -70,10 +74,15 @@ int main(int argc, char *argv[])
 
     // create cfdemCloud
     #include "readGravitationalAcceleration.H"
+    #include "checkImCoupleM.H"
     #if defined(anisotropicRotation)
         cfdemCloudRotation particleCloud(mesh);
     #else
-        cfdemCloud particleCloud(mesh);
+        #ifdef MS
+            cfdemCloudMS particleCloud(mesh);
+        #else
+            cfdemCloud particleCloud(mesh);
+        #endif
     #endif
     #include "checkModelType.H"
 
@@ -106,13 +115,16 @@ int main(int argc, char *argv[])
 
         if(hasEvolved)
         {
-            particleCloud.smoothingM().smoothen(particleCloud.forceM(0).impParticleForces());
+            particleCloud.smoothingM().smoothenAbsolutField(particleCloud.forceM(0).impParticleForces());
         }
     
         Info << "update Ksl.internalField()" << endl;
-        Ksl = particleCloud.momCoupleM(0).impMomSource();
+        Ksl = particleCloud.momCoupleM(particleCloud.registryM().getProperty("implicitCouple_index")).impMomSource();
         Ksl.correctBoundaryConditions();
 
+        surfaceScalarField voidfractionf = fvc::interpolate(voidfraction);
+        phi = voidfractionf*phiByVoidfraction;
+
         //Force Checks
         #include "forceCheckIm.H"
 
@@ -121,26 +133,9 @@ int main(int argc, char *argv[])
 
         particleCloud.clockM().start(26,"Flow");
 
-        /*// get scalar source from DEM        
-        particleCloud.forceM(1).manipulateScalarField(Tsource);
-        Tsource.correctBoundaryConditions();*/
-
+        //Scalar transport if desired. Use "none" (noTransport) if no scalar transport is desired
         stm().update();
 
-        /*// solve scalar transport equation
-        fvScalarMatrix TEqn
-        (
-           fvm::ddt(voidfraction,T) - fvm::Sp(fvc::ddt(voidfraction),T)
-         + fvm::div(phi, T) - fvm::Sp(fvc::div(phi),T)
-         - fvm::laplacian(DT*voidfraction, T)
-         ==
-           Tsource
-        );
-        TEqn.relax();
-        TEqn.solve();*/
-
-        particleCloud.clockM().start(26,"Flow");
-
         if(particleCloud.solveFlow())
         {
             // Pressure-velocity PISO corrector
@@ -186,26 +181,30 @@ int main(int argc, char *argv[])
                     U = rUA*UEqn.H();
 
                     #ifdef version23
-                        phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() )
-                            + rUAfvoidfraction*fvc::ddtCorr(U, phi);
+                        phi = ( fvc::interpolate(U) & mesh.Sf() )
+                            + rUAfvoidfraction*fvc::ddtCorr(U, phiByVoidfraction);
                     #else
-                        phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() )
-                            + fvc::ddtPhiCorr(rUAvoidfraction, U, phi);
+                        phi = ( fvc::interpolate(U) & mesh.Sf() )
+                            + fvc::ddtPhiCorr(rUAvoidfraction, U, phiByVoidfraction);
                     #endif
-                    surfaceScalarField phiS(fvc::interpolate(Us*voidfraction) & mesh.Sf());
-                    surfaceScalarField phiGes = phi + rUAf*(fvc::interpolate(Ksl/rho) * phiS);
+                    surfaceScalarField phiS(fvc::interpolate(Us) & mesh.Sf());
+                    phi += rUAf*(fvc::interpolate(Ksl/rho) * phiS);
 
                     if (modelType=="A")
                         rUAvoidfraction = volScalarField("(voidfraction2|A(U))",rUA*voidfraction*voidfraction);
 
                     // Update the fixedFluxPressure BCs to ensure flux consistency
                     #ifndef versionExt32
+                    #ifndef version40
                         if (modelType=="A")
                         {
-                            surfaceScalarField voidfractionf(fvc::interpolate(voidfraction));
                             setSnGrad<fixedFluxPressureFvPatchScalarField>
                             (
-                                p.boundaryField(),
+                                #ifdef versionv1612plus
+                                    p.boundaryFieldRef(),
+                                #else
+                                    p.boundaryField(),
+                                #endif
                                 (
                                     phi.boundaryField()
                                   - (mesh.Sf().boundaryField() & U.boundaryField())
@@ -215,7 +214,11 @@ int main(int argc, char *argv[])
                         {
                             setSnGrad<fixedFluxPressureFvPatchScalarField>
                             (
-                                p.boundaryField(),
+                                #ifdef versionv1612plus
+                                    p.boundaryFieldRef(),
+                                #else
+                                    p.boundaryField(),
+                                #endif
                                 (
                                     phi.boundaryField()
                                   - (mesh.Sf().boundaryField() & U.boundaryField())
@@ -223,6 +226,8 @@ int main(int argc, char *argv[])
                             );
                         }
                     #endif
+                    #endif
+                    
 
                     // Non-orthogonal pressure corrector loop
                     #if defined(version30)
@@ -234,7 +239,7 @@ int main(int argc, char *argv[])
                         // Pressure corrector
                         fvScalarMatrix pEqn
                         (
-                            fvm::laplacian(rUAvoidfraction, p) == fvc::div(phiGes) + particleCloud.ddtVoidfraction()
+                            fvm::laplacian(rUAvoidfraction, p) == fvc::div(voidfractionf*phi) + particleCloud.ddtVoidfraction()
                         );
                         pEqn.setReference(pRefCell, pRefValue);
 
@@ -242,8 +247,7 @@ int main(int argc, char *argv[])
                             pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
                             if (piso.finalNonOrthogonalIter())
                             {
-                                phiGes -= pEqn.flux();
-                                phi = phiGes;
+                                phiByVoidfraction = phi - pEqn.flux()/voidfractionf;
                             }
                         #else
                             if( corr == nCorr-1 && nonOrth == nNonOrthCorr )
@@ -257,13 +261,13 @@ int main(int argc, char *argv[])
 
                             if (nonOrth == nNonOrthCorr)
                             {
-                                phiGes -= pEqn.flux();
-                                phi = phiGes;
+                                phiByVoidfraction = phi - pEqn.flux()/voidfractionf;
                             }
                         #endif
 
                     } // end non-orthogonal corrector loop
 
+                    phi = voidfractionf*phiByVoidfraction;
                     #include "continuityErrorPhiPU.H"
 
                     if (modelType=="B" || modelType=="Bfull")

applications/solvers/cfdemSolverPisoSTM/createFields.H

@@ -105,7 +105,7 @@
         ),
         mesh//,
         //dimensionedScalar("0", dimensionSet(0, 0, -1, 1, 0), 273.15)
-    );
+    );*/
 
     Info<< "\nCreating fluid-particle heat flux field\n" << endl;
     volScalarField Tsource
@@ -115,14 +115,14 @@
             "Tsource",
             runTime.timeName(),
             mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
         ),
-        mesh//,
-        //dimensionedScalar("0", dimensionSet(0, 0, -1, 1, 0), 0.0)
+        mesh,
+        dimensionedScalar("0", dimensionSet(0, 0, -1, 1, 0), 0.0)
     );
 
-    IOdictionary transportProperties
+    /*IOdictionary transportProperties
     (
         IOobject
         (
@@ -159,7 +159,19 @@ surfaceScalarField phi
  );
 #endif
 
-
+Info<< "Generating interstitial face flux field phiByVoidfraction\n" << endl;
+surfaceScalarField phiByVoidfraction
+(
+ IOobject
+ (
+    "phiByVoidfraction",
+    runTime.timeName(),
+    mesh,
+    IOobject::NO_READ,
+    IOobject::NO_WRITE
+ ),
+ linearInterpolate(U) & mesh.Sf()
+);
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;

applications/solvers/cfdemSolverPisoScalar/Make/options

@@ -1,22 +1,27 @@
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
 include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME)
 
 PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)"
 
 EXE_INC = \
      $(PFLAGS) \
-    $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
+     $(PINC) \
+     $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
+    -I$(CFDEM_LIGGGHTS_SRC_DIR)
 
 EXE_LIBS = \
     -L$(CFDEM_LIB_DIR)\
     $(CFDEM_ADD_INCOMPTURBMOD_LIBS) \
     -lincompressibleTransportModels \
     -lfiniteVolume \
+    -lradiationModels \
     -lmeshTools \
     -l$(CFDEM_LIB_NAME) \
      $(CFDEM_ADD_LIB_PATHS) \

applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C

@@ -44,6 +44,7 @@ Description
 #else
     #include "turbulenceModel.H"
 #endif
+#include "radiationModel.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "cfdemCloud.H"
 #if defined(anisotropicRotation)
@@ -66,10 +67,12 @@ int main(int argc, char *argv[])
         #include "createTimeControls.H"
     #endif
     #include "createFields.H"
+    #include "createIncompressibleRadiationModel.H"
     #include "initContinuityErrs.H"
 
     // create cfdemCloud
     #include "readGravitationalAcceleration.H"
+    #include "checkImCoupleM.H"
     #if defined(anisotropicRotation)
         cfdemCloudRotation particleCloud(mesh);
     #else
@@ -100,13 +103,16 @@ int main(int argc, char *argv[])
 
         if(hasEvolved)
         {
-            particleCloud.smoothingM().smoothen(particleCloud.forceM(0).impParticleForces());
+            particleCloud.smoothingM().smoothenAbsolutField(particleCloud.forceM(0).impParticleForces());
         }
     
         Info << "update Ksl.internalField()" << endl;
-        Ksl = particleCloud.momCoupleM(0).impMomSource();
+        Ksl = particleCloud.momCoupleM(particleCloud.registryM().getProperty("implicitCouple_index")).impMomSource();
         Ksl.correctBoundaryConditions();
 
+        surfaceScalarField voidfractionf = fvc::interpolate(voidfraction);
+        phi = voidfractionf*phiByVoidfraction;
+
         //Force Checks
         #include "forceCheckIm.H"
 
@@ -118,18 +124,26 @@ int main(int argc, char *argv[])
         // get scalar source from DEM        
         particleCloud.forceM(1).manipulateScalarField(Tsource);
         Tsource.correctBoundaryConditions();
+        particleCloud.forceM(1).commToDEM();
 
         // solve scalar transport equation
+        {
+        alphat = turbulence->nut()/Prt;
+        alphat.correctBoundaryConditions();
+        volScalarField alphaEff("alphaEff", turbulence->nu()/Pr + alphat);
         fvScalarMatrix TEqn
         (
            fvm::ddt(voidfraction,T) - fvm::Sp(fvc::ddt(voidfraction),T)
          + fvm::div(phi, T) - fvm::Sp(fvc::div(phi),T)
-         - fvm::laplacian(DT*voidfraction, T)
+         - fvm::laplacian(alphaEff*voidfraction, T)
          ==
            Tsource
+         + radiation->ST(rhoCpRef, T)
         );
         TEqn.relax();
         TEqn.solve();
+        radiation->correct();
+        }
 
         if(particleCloud.solveFlow())
         {
@@ -176,26 +190,30 @@ int main(int argc, char *argv[])
                     U = rUA*UEqn.H();
 
                     #ifdef version23
-                        phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() )
-                            + rUAfvoidfraction*fvc::ddtCorr(U, phi);
+                        phi = ( fvc::interpolate(U) & mesh.Sf() )
+                            + rUAfvoidfraction*fvc::ddtCorr(U, phiByVoidfraction);
                     #else
-                        phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() )
-                            + fvc::ddtPhiCorr(rUAvoidfraction, U, phi);
+                        phi = ( fvc::interpolate(U) & mesh.Sf() )
+                            + fvc::ddtPhiCorr(rUAvoidfraction, U, phiByVoidfraction);
                     #endif
-                    surfaceScalarField phiS(fvc::interpolate(Us*voidfraction) & mesh.Sf());
-                    surfaceScalarField phiGes = phi + rUAf*(fvc::interpolate(Ksl/rho) * phiS);
+                    surfaceScalarField phiS(fvc::interpolate(Us) & mesh.Sf());
+                    phi += rUAf*(fvc::interpolate(Ksl/rho) * phiS);
 
                     if (modelType=="A")
                         rUAvoidfraction = volScalarField("(voidfraction2|A(U))",rUA*voidfraction*voidfraction);
 
                     // Update the fixedFluxPressure BCs to ensure flux consistency
                     #ifndef versionExt32
+                    #ifndef version40
                         if (modelType=="A")
                         {
-                            surfaceScalarField voidfractionf(fvc::interpolate(voidfraction));
                             setSnGrad<fixedFluxPressureFvPatchScalarField>
                             (
-                                p.boundaryField(),
+                                #ifdef versionv1612plus
+                                    p.boundaryFieldRef(),
+                                #else
+                                    p.boundaryField(),
+                                #endif
                                 (
                                     phi.boundaryField()
                                   - (mesh.Sf().boundaryField() & U.boundaryField())
@@ -205,7 +223,11 @@ int main(int argc, char *argv[])
                         {
                             setSnGrad<fixedFluxPressureFvPatchScalarField>
                             (
-                                p.boundaryField(),
+                                #ifdef versionv1612plus
+                                    p.boundaryFieldRef(),
+                                #else
+                                    p.boundaryField(),
+                                #endif
                                 (
                                     phi.boundaryField()
                                   - (mesh.Sf().boundaryField() & U.boundaryField())
@@ -213,6 +235,8 @@ int main(int argc, char *argv[])
                             );
                         }
                     #endif
+                    #endif
+                    
 
                     // Non-orthogonal pressure corrector loop
                     #if defined(version30)
@@ -224,7 +248,7 @@ int main(int argc, char *argv[])
                         // Pressure corrector
                         fvScalarMatrix pEqn
                         (
-                            fvm::laplacian(rUAvoidfraction, p) == fvc::div(phiGes) + particleCloud.ddtVoidfraction()
+                            fvm::laplacian(rUAvoidfraction, p) == fvc::div(voidfractionf*phi) + particleCloud.ddtVoidfraction()
                         );
                         pEqn.setReference(pRefCell, pRefValue);
 
@@ -232,8 +256,7 @@ int main(int argc, char *argv[])
                             pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
                             if (piso.finalNonOrthogonalIter())
                             {
-                                phiGes -= pEqn.flux();
-                                phi = phiGes;
+                                phiByVoidfraction = phi - pEqn.flux()/voidfractionf;
                             }
                         #else
                             if( corr == nCorr-1 && nonOrth == nNonOrthCorr )
@@ -247,13 +270,13 @@ int main(int argc, char *argv[])
 
                             if (nonOrth == nNonOrthCorr)
                             {
-                                phiGes -= pEqn.flux();
-                                phi = phiGes;
+                                phiByVoidfraction = phi - pEqn.flux()/voidfractionf;
                             }
                         #endif
 
                     } // end non-orthogonal corrector loop
 
+                    phi = voidfractionf*phiByVoidfraction;
                     #include "continuityErrorPhiPU.H"
 
                     if (modelType=="B" || modelType=="Bfull")

applications/solvers/cfdemSolverPisoScalar/createFields.H

@@ -92,7 +92,7 @@
 //========================
 // scalar field modelling
 //========================
-    Info<< "\nCreating dummy density field rho = 1\n" << endl;
+    Info<< "\nCreating T field\n" << endl;
     volScalarField T
     (
         IOobject
@@ -134,11 +134,27 @@
         )
     );
 
-    dimensionedScalar DT
+    // kinematic turbulent thermal thermal conductivity m2/s
+    Info<< "Reading field alphat\n" << endl;
+    volScalarField alphat
     (
-        transportProperties.lookup("DT")
+        IOobject
+        (
+            "alphat",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
     );
 
+    // Laminar Prandtl number
+    dimensionedScalar Pr("Pr", dimless, transportProperties);
+
+    // Turbulent Prandtl number
+    dimensionedScalar Prt("Prt", dimless, transportProperties);
+
 //========================
 
 //#   include "createPhi.H"
@@ -159,7 +175,19 @@ surfaceScalarField phi
  );
 #endif
 
-
+Info<< "Generating interstitial face flux field phiByVoidfraction\n" << endl;
+surfaceScalarField phiByVoidfraction
+(
+ IOobject
+ (
+    "phiByVoidfraction",
+    runTime.timeName(),
+    mesh,
+    IOobject::NO_READ,
+    IOobject::NO_WRITE
+ ),
+ linearInterpolate(U) & mesh.Sf()
+);
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;

applications/utilities/cfdemPostproc/Make/options

@@ -1,15 +1,18 @@
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
 include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME)
 
 PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)"
 
 EXE_INC = \
      $(PFLAGS) \
-    $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
+     $(PINC) \
+     $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(CFDEM_LIGGGHTS_SRC_DIR)
 
 
 EXE_LIBS = \

applications/utilities/cfdemPostproc/cfdemPostproc.C

@@ -71,14 +71,14 @@ int main(int argc, char *argv[])
     int DEM_dump_Interval=1000;
     particleCloud.reAllocArrays();
 
-    double **positions_;
-    double **velocities_;
-    double **radii_;
-    double **voidfractions_;
-    double **particleWeights_;
-    double **particleVolumes_;
-    double **particleV_;
-    double **cellIDs_;
+    double **positions_(NULL);
+    double **velocities_(NULL);
+    double **radii_(NULL);
+    double **voidfractions_(NULL);
+    double **particleWeights_(NULL);
+    double **particleVolumes_(NULL);
+    double **particleV_(NULL);
+    double **cellIDs_(NULL);
     
     particleCloud.dataExchangeM().allocateArray(positions_,0.,3);
     particleCloud.dataExchangeM().allocateArray(velocities_,0.,3);
@@ -114,8 +114,11 @@ int main(int argc, char *argv[])
         particleCloud.setPos(positions_);
 
         particleCloud.voidFractionM().setvoidFraction(NULL,voidfractions_,particleWeights_,particleVolumes_,particleV_);
-
-        voidfraction.internalField() = particleCloud.voidFractionM().voidFractionInterp();
+        #if defined(versionv1612plus) || defined(version40) 
+            voidfraction = particleCloud.voidFractionM().voidFractionInterp();
+        #else
+            voidfraction.internalField() = particleCloud.voidFractionM().voidFractionInterp();
+        #endif
         voidfraction.correctBoundaryConditions();
 
         particleCloud.averagingM().setVectorAverage

doc/.gitignore

@@ -1,3 +1,7 @@
+#ignore .rst build files
+*.rst
+_tmp/*
+
 # C++.gitignore from github
 # Compiled Object files
 *.slo

doc/CFDEMcoupling_Manual.html

@@ -1,245 +0,0 @@
-<HTML>
-<CENTER><A HREF = "http://www.cfdem.com">CFDEMproject WWW Site</A> 
-</CENTER>
-
-
-
-
-
-
-
-
-<HR>
-
-<H2><CENTER>CFDEMcoupling Documentation 
-</CENTER></H2>
-<HR>
-
-<CENTER><IMG SRC = "Portfolio_CFDEMcoupling.png">
-</CENTER>
-<HR>
-
-<H3>1. Contents 
-</H3>
-<P>The CFDEMcoupling documentation is organized into the following sections. If you find any errors or omissions in this manual or have suggestions for useful information to add, please send an email to the developers so the CFDEMcoupling documentation can be improved.
-</P>
-1.1 <A HREF = "#1_1">About CFDEMcoupling</A><BR>
-1.2 <A HREF = "#1_2">Installation</A><BR>
-1.3 <A HREF = "#1_3">Tutorials</A><BR>
-1.4 <A HREF = "#1_4">couplingProperties dictionary</A><BR>
-1.5 <A HREF = "#1_5">liggghtsCommands dictionary</A><BR>
-1.6 <A HREF = "#cmd_5">Models and solvers</A> <BR>
-
-<HR>
-
-<A NAME = "1_1"></A><H4>1.1 About CFDEMcoupling 
-</H4>
-<P>CFDEM coupling provides an open source parallel coupled CFD-DEM framework combining the strengths of <A HREF = "http://www.cfdem.com">LIGGGHTS</A> DEM code and the Open Source CFD package <A HREF = "http://www.openfoam.com">OpenFOAM(R)(*)</A>. The CFDEMcoupling toolbox allows to expand standard CFD solvers of <A HREF = "http://www.openfoam.com">OpenFOAM(R)(*)</A> to include a coupling to the DEM code <A HREF = "http://www.cfdem.com">LIGGGHTS</A>. In this toolbox the particle representation within the CFD solver is organized by "cloud" classes. Key functionalities are organised in sub-models (e.g. force models, data exchange models, etc.) which can easily be selected and combined by dictionary settings.
-</P>
-<P>The coupled solvers run fully parallel on distributed-memory clusters. Features are:
-</P>
-<UL><LI>its modular approach allows users to easily implement new models 
-
-<LI>its MPI parallelization enables to use it for large scale problems 
-
-<LI>the <A HREF = "http://www.cfdem.com">forum</A> on CFD-DEM gives the possibility to exchange with other users / developers 
-
-<LI>the use of GIT allows to easily update to the latest version 
-
-<LI>basic documentation is provided 
-
-
-</UL>
-<P>The file structure:
-</P>
-<UL><LI><I>src</I> directory including the source files of the coupling toolbox and models 
-
-<LI><I>applications</I> directory including the solver files for coupled CFD-DEM simulations 
-
-<LI><I>doc</I> directory including the documentation of CFDEMcoupling 
-
-<LI><I>tutorials</I> directory including basic tutorial cases showing the functionality  
-
-
-</UL>
-<P>Details on installation are given on the <A HREF = "http://www.cfdem.com">CFDEMproject WWW Site</A> .
-The functionality of this CFD-DEM framework is described via <A HREF = "#_1_2">tutorial cases</A> showing how to use different solvers and models.
-</P>
-<P>CFDEMcoupling stands for Computational Fluid Dynamics (CFD) -Discrete Element Method (DEM) coupling.
-</P>
-<P>CFDEMcoupling is an open-source code, distributed freely under the terms of the GNU Public License (GPL).
-</P>
-<P>Core development of CFDEMcoupling is done by Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012
-</P>
-<P>This documentation was written by Christoph Goniva, DCS Computing GmbH, 2012
-</P>
-<HR>
-
-<P>(*) This offering is not approved or endorsed by OpenCFD Limited, the producer of the OpenFOAM software and owner of the OPENFOAM®  and OpenCFD®  trade marks.
-</P>
-<HR>
-
-<A NAME = "1_2"></A><H4>1.2 Installation 
-</H4>
-<P>Please follow the installation routine provided at www.cfdem.com.
-In order to get the latest code version, please use the git repository at http://github.com (<A HREF = "githubAccess_public.html">githubAccess</A>). 
-</P>
-<HR>
-
-<A NAME = "1_3"></A><H4>1.3 Tutorials 
-</H4>
-<P><B>General:</B>
-</P>
-<P>Each solver of the CFDEMcoupling comes with at least one tutorial example, showing its functionality and correct usage. Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell scripts. These scripts perform all necessary steps (preprocessing, run, postprocessing, visualization).
-</P>
-<P><B>Location:</B>
-</P>
-<P>The tutorials can be found in the directory $CFDEM_PROJECT_DIR/tutorials, which can be reached by typing "cfdemTut"
-</P>
-<P><B>Structure:</B>
-</P>
-<P>Each case is structured in a directory called "CFD" covering the CFD relevant settings and data, and a dirctory called "DEM" covering the DEM relevant settings and data. This allows to easily expand a pure CFD or DEM simulation case to a coupled case.
-</P>
-<P><B>Usage:</B>
-</P>
-<P>Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell script, executed by typing "./Allrun.sh". The successful run of the script might need some third party software (e.g. octave, evince, etc.).
-</P>
-<P><B>Settings:</B>
-</P>
-<P>The main settings of a simulation are done via dictionaries:
-</P>
-<P>The DEM setup of each case is defined by a <A HREF = "http://www.cfdem.com">LIGGGHTS</A> input file located in $caseDir/DEM (e.g. in.liggghts_init). For details on the <A HREF = "http://www.cfdem.com">LIGGGHTS</A> setup, please have a look at the <A HREF = "http://www.cfdem.com">LIGGGHTS</A> manual.
-</P>
-<P>Standard CFD settings are defined in $caseDir/CFD/constant (e.g. transportProperties, RASproperties, etc.) and $caseDir/CFD/system (e.g. fvSchemes, controlDict). You can find more information on that in <A HREF = "http://www.openfoam.com">OpenFOAM(R)(*)</A> documentations (www.openFoam.com)(*).
-</P>
-<P>Settings of the coupling routines are defined in $caseDir/CFD/constant/<A HREF = "#1_3">couplingProperies</A> (e.g. force models, data exchange model, etc.) and $caseDir/CFD/constant/<A HREF = "#1_3">liggghtsCommands</A> (allows to execute a LIGGGHTS command during a coupled simulation).
-</P>
-<HR>
-
-<A NAME = "1_4"></A><H4>1.4 "couplingProperties" dictionary 
-</H4>
-<P><B>General:</B>
-</P>
-<P>In the "couplingProperties" dictionary the setup of the coupling routines of the CFD-DEM simulation are defined.
-</P>
-<P><B>Location:</B> $caseDir/CFD/constant
-</P>
-<P><B>Structure:</B>
-</P>
-<P>The dictionary is divided into two parts, "sub-models & settings" and "sub-model properties".
-</P>
-<P>In "sub-models & settings" the following routines must be specified:
-</P>
-<UL><LI>modelType 
-
-<LI>couplingInterval 
-
-<LI>voidFractionModel 
-
-<LI>locateModel 
-
-<LI>meshMotionModel 
-
-<LI>regionModel 
-
-<LI>IOModel 
-
-<LI>dataExchangeModel 
-
-<LI>averagingModel 
-
-<LI>forceModels 
-
-<LI>momCoupleModels 
-
-<LI>turbulenceModelType 
-
-
-</UL>
-<P>In "sub-model properties" sub-dictionaries might be defined to specify model specific parameters.
-</P>
-<P><B>Settings:</B>
-</P>
-<P>Reasonable example settings for the "couplingProperties" dictionary are given in the tutorial cases.
-</P>
-<PRE>modelType 
-</PRE>
-<P>"modelType" refers to the formulation of the equations to be solved. Choose "A", "B" or "Bfull", according to Zhou et al. (2010): "Discrete particle simulation of particle-fluid flow: model formulations and their applicability", JFM. "A" requires the use of the force models gradPForce and viscForce, whereas "B" requires the force model "Archimedes". "Bfull" refers to model type I.
-</P>
-<PRE>couplingInterval 
-</PRE>
-<P>The coupling interval determines the time passing between two CFD-DEM data exchanges.
-</P>
-<P>A useful procedure would be:
-1) Set the DEM timestep in the in.xxx file according to the needs of the pure DEM problem.
-2) Set the "couplingInterval", which refers to the DEM timesteps. Depending on the problem you will need to have a close (small couplingInterval) or loose coupling.
-3) Choose the CFD timestep in the controlDict. It must be equal to or smaller than the coupling time, otherwise you will get the error: "Error - TS bigger than coupling interval!".
-</P>
-<P>Example: DEMts=0.00001s, couplingInterval=10 exchange data (=couple) will happen every 0.0001s.
-</P>
-<HR>
-
-<H4><A NAME = "1_5"></A>1.5 "liggghtsCommands" dictionary 
-</H4>
-<P><B>General:</B>
-</P>
-<P>In the "liggghtsCommands" dictionary liggghts commands being executed during a coupled CFD-DEM simulation are specified.
-</P>
-<P><B>Location:</B> $caseDir/CFD/constant
-</P>
-<P><B>Structure:</B>
-</P>
-<P>The dictionary is divided into two parts, first a list of "liggghtsCommandModels" is defined, then the settings for each model must be specified.
-</P>
-<P><B>Settings:</B>
-</P>
-<P>Reasonable example settings for the "liggghtsCommands" dictionary are given in the tutorial cases.
-</P>
-<HR>
-
-<H4><A NAME = "cmd_5"></A><A NAME = "comm"></A>1.6 Models/Solvers 
-</H4>
-<P>This section lists all CFDEMcoupling sub-models and solvers alphabetically, with a separate
-listing below of styles within certain commands.
-</P>
-<DIV ALIGN=center><TABLE  BORDER=1 >
-<TR ALIGN="center"><TD ><A HREF = "IOModel.html">IOModel</A></TD><TD ><A HREF = "IOModel_basicIO.html">IOModel_basicIO</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "IOModel_noIO.html">IOModel_noIO</A></TD><TD ><A HREF = "IOModel_sophIO.html">IOModel_sophIO</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "IOModel_trackIO.html">IOModel_trackIO</A></TD><TD ><A HREF = "averagingModel.html">averagingModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "averagingModel_dense.html">averagingModel_dense</A></TD><TD ><A HREF = "averagingModel_dilute.html">averagingModel_dilute</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "cfdemSolverIB.html">cfdemSolverIB</A></TD><TD ><A HREF = "cfdemSolverPiso.html">cfdemSolverPiso</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "cfdemSolverPisoScalar.html">cfdemSolverPisoScalar</A></TD><TD ><A HREF = "clockModel.html">clockModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "clockModel_noClock.html">clockModel_noClock</A></TD><TD ><A HREF = "clockModel_standardClock.html">clockModel_standardClock</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "dataExchangeModel.html">dataExchangeModel</A></TD><TD ><A HREF = "dataExchangeModel_noDataExchange.html">dataExchangeModel_noDataExchange</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "dataExchangeModel_oneWayVTK.html">dataExchangeModel_oneWayVTK</A></TD><TD ><A HREF = "dataExchangeModel_twoWayFiles.html">dataExchangeModel_twoWayFiles</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "dataExchangeModel_twoWayMPI.html">dataExchangeModel_twoWayMPI</A></TD><TD ><A HREF = "forceModel.html">forceModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_Archimedes.html">forceModel_Archimedes</A></TD><TD ><A HREF = "forceModel_ArchimedesIB.html">forceModel_ArchimedesIB</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_DiFeliceDrag.html">forceModel_DiFeliceDrag</A></TD><TD ><A HREF = "forceModel_GidaspowDrag.html">forceModel_GidaspowDrag</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_KochHillDrag.html">forceModel_KochHillDrag</A></TD><TD ><A HREF = "forceModel_LaEuScalarTemp.html">forceModel_LaEuScalarTemp</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_MeiLift.html">forceModel_MeiLift</A></TD><TD ><A HREF = "forceModel_SchillerNaumannDrag.html">forceModel_SchillerNaumannDrag</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_ShirgaonkarIB.html">forceModel_ShirgaonkarIB</A></TD><TD ><A HREF = "forceModel_fieldStore.html">forceModel_fieldStore</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_fieldTimeAverage.html">forceModel_fieldTimeAverage</A></TD><TD ><A HREF = "forceModel_gradPForce.html">forceModel_gradPForce</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_noDrag.html">forceModel_noDrag</A></TD><TD ><A HREF = "forceModel_particleCellVolume.html">forceModel_particleCellVolume</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_particleVolume.html">forceModel_particleVolume</A></TD><TD ><A HREF = "forceModel_scalarGeneralExchange.html">forceModel_scalarGeneralExchange</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_virtualMassForce.html">forceModel_virtualMassForce</A></TD><TD ><A HREF = "forceModel_viscForce.html">forceModel_viscForce</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceModel_volWeightedAverage.html">forceModel_volWeightedAverage</A></TD><TD ><A HREF = "forceSubModel.html">forceSubModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "forceSubModel_ImEx.html">forceSubModel_ImEx</A></TD><TD ><A HREF = "liggghtsCommandModel.html">liggghtsCommandModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "liggghtsCommandModel_execute.html">liggghtsCommandModel_execute</A></TD><TD ><A HREF = "liggghtsCommandModel_readLiggghtsData.html">liggghtsCommandModel_readLiggghtsData</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "liggghtsCommandModel_runLiggghts.html">liggghtsCommandModel_runLiggghts</A></TD><TD ><A HREF = "liggghtsCommandModel_writeLiggghts.html">liggghtsCommandModel_writeLiggghts</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "locateModel.html">locateModel</A></TD><TD ><A HREF = "locateModel_engineSearch.html">locateModel_engineSearch</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "locateModel_engineSearchIB.html">locateModel_engineSearchIB</A></TD><TD ><A HREF = "locateModel_standardSearch.html">locateModel_standardSearch</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "meshMotionModel.html">meshMotionModel</A></TD><TD ><A HREF = "meshMotionModel_noMeshMotion.html">meshMotionModel_noMeshMotion</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "momCoupleModel.html">momCoupleModel</A></TD><TD ><A HREF = "momCoupleModel_explicitCouple.html">momCoupleModel_explicitCouple</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "momCoupleModel_implicitCouple.html">momCoupleModel_implicitCouple</A></TD><TD ><A HREF = "momCoupleModel_noCouple.html">momCoupleModel_noCouple</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "probeModel.html">probeModel</A></TD><TD ><A HREF = "probeModel_noProbe.html">probeModel_noProbe</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "probeModel_particleProbe.html">probeModel_particleProbe</A></TD><TD ><A HREF = "regionModel.html">regionModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "regionModel_allRegion.html">regionModel_allRegion</A></TD><TD ><A HREF = "scalarTransportModel.html">scalarTransportModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "smoothingModel.html">smoothingModel</A></TD><TD ><A HREF = "smoothingModel_constDiffSmoothing.html">smoothingModel_constDiffSmoothing</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "smoothingModel_noSmoothing.html">smoothingModel_noSmoothing</A></TD><TD ><A HREF = "voidFractionModel.html">voidfractionModel</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "voidFractionModel_GaussVoidFraction.html">voidfractionModel_GaussVoidFraction</A></TD><TD ><A HREF = "voidFractionModel_IBVoidFraction.html">voidfractionModel_IBVoidFraction</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "voidFractionModel_bigParticleVoidFraction.html">voidfractionModel_bigParticleVoidFraction</A></TD><TD ><A HREF = "voidFractionModel_centreVoidFraction.html">voidfractionModel_centreVoidFraction</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "voidFractionModel_dividedVoidFraction.html">voidfractionModel_dividedVoidFraction</A></TD><TD ><A HREF = "voidFractionModel_noVoidFraction.html">voidfractionModel_noVoidFractionVoidFraction</A></TD></TR>
-<TR ALIGN="center"><TD ><A HREF = "voidFractionModel_trilinearVoidFraction.html">voidfractionModel_trilinearVoidFraction</A> 
-</TD></TR></TABLE></DIV>
-
-</HTML>

doc/CFDEMcoupling_Manual.html

@@ -0,0 +1 @@
+_build/html/CFDEMcoupling_Manual.html

doc/CFDEMcoupling_Manual.txt

@@ -0,0 +1,585 @@
+"CFDEM®project WWW Site"_lws :c
+
+:line
+CFDEM®coupling Documentation :h2,c
+:line
+:c,image(Portfolio_CFDEMcoupling.png)
+:line
+
+:link(lws,http://www.cfdem.com)
+:link(lc,CFDEMcoupling_Manual.html#comm)
+:link(of,http://www.openfoam.com)
+:link(lig,https://www.cfdem.com/liggghtsr-open-source-discrete-element-method-particle-simulation-code)
+
+1. Contents :h3
+
+The CFDEM®coupling documentation is organized into the following sections. If you find any errors or omissions in this manual or have suggestions for useful information to add, please send an email to the developers so the CFDEM®coupling documentation can be improved.
+
+1.1 "About CFDEM®coupling"_#1_1
+1.2 "Installation"_#1_2
+1.3 "Tutorials"_#1_3
+1.4 "couplingProperties dictionary"_#1_4
+1.5 "liggghtsCommands dictionary"_#1_5
+1.6 "Models and solvers"_#cmd_5 :all(b)
+
+:line
+
+1.1 About CFDEM®coupling :link(1_1),h4
+
+CFDEM®coupling provides an open source parallel coupled CFD-DEM framework combining the strengths of "LIGGGHTS®"_lig DEM code and the Open Source CFD package "OpenFOAM®(*)"_of. The CFDEM®coupling toolbox allows to expand standard CFD solvers of "OpenFOAM®(*)"_of to include a coupling to the DEM code "LIGGGHTS®"_lig. In this toolbox the particle representation within the CFD solver is organized by "cloud" classes. Key functionalities are organised in sub-models (e.g. force models, data exchange models, etc.) which can easily be selected and combined by dictionary settings.
+
+The coupled solvers run fully parallel on distributed-memory clusters. Features are:
+
+its modular approach allows users to easily implement new models :ulb,l
+its MPI parallelization enables to use it for large scale problems :l
+the "forum"_lws on CFD-DEM gives the possibility to exchange with other users / developers :l
+the use of GIT allows to easily update to the latest version :l
+basic documentation is provided :l
+:ule
+
+The file structure:
+
+{src} directory contains the source-code files of the CFDEM®coupling toolbox library and models :ulb,l
+{applications} directory contains the solver source files for coupled CFD-DEM simulations :l
+{doc} directory including the documentation of CFDEM®coupling :l
+{tutorials} directory including basic tutorial cases showing the functionality  :l
+:ule
+
+The functionality of this CFD-DEM framework is described via "tutorial cases"_#1_3 showing how to use different solvers and models.
+
+CFDEM®coupling stands for Computational Fluid Dynamics (CFD) -Discrete Element Method (DEM) coupling.
+
+CFDEM®coupling is an open-source code, distributed freely under the terms of the GNU Public License (GPL).
+
+Core development of CFDEM®coupling is done by Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012
+
+This documentation was written by DCS Computing GmbH, 2017
+
+:line
+How CFDEM®coupling works, a short description:
+
+The launched applications are CFDEM®coupling solvers, e.g. cfdemSolverPiso. Its job is to solve the Navier-Stokes equations with a solid phase present.
+A general formulation with a solid phase:
+
+:c,image(Eqs/NavierStokesLiquSoli.png)
+
+In general "l" denotes liquid and "s" solid properties. AlphaL is the fluid (liquid) content of a calculation-cell, the voidfraction. "rhoL" is the fluid (liquid) density, uL the fluid (liquid) velocity, p the pressure, Ksl the implicit momentum exchange term between solid and liquid phase, us the solid velocity, tau the liquid-stress-tensor, g the gravity vector and t the time. "f" is a general explicit term which can be used to explicitely exchange momentum from the solid to the liquid phase.
+
+All cfdemSolvers use a "cfdemCloud" object, which takes care of many things. The most important are:
+
+Control and communicate with the LIGGGHTS® library object. (liggghtsCommandModel and dataExchangeModel)
+Find the cell ID of a certain position, e.g. the particle center. (locateModel)
+Calculate the voidfraction field from particle positions, particle volumes and cell volumes. (voidFractionModel)
+Calculate the forces on the CFD field and the particle forces. These may be assembled by various forceModels, e.g. buyoancy and a drag-law. (forceModel and forceSubModel)
+Calculate the implicit and if necessary explicit source terms from the force fields for the Navier-Stokes-Equations, the solver needs to solve. (momCoupleModel)
+Calculate the "Us" field from particle data, map the particle data to the CFD-field. (averagingModel) :ul
+
+In the standard setting the momentum coupling model takes the calculated forces of forceModels and produces the implicit momentum source term Ksl with
+
+:c,image(Eqs/Ksl.png)
+
+More advanced solvers have also an explicit source term field f which is assembled from those forces which have the treatForceExplicit=true flag (see forceSubModels).  
+
+:line
+(*) This offering is not approved or endorsed by OpenCFD Limited, the producer of the OpenFOAM software and owner of the OPENFOAM®  and OpenCFD®  trade marks.
+
+:line
+
+1.2 Installation :link(1_2),h4
+
+:link(github,http://github.com/)
+:link(gitHelp,http://help.github.com/linux-set-up-git)
+:link(gitCFDEM,http://github.com/CFDEMproject)
+:link(gitscm,http://git-scm.com/downloads)
+:link(compOF,https://github.com/CFDEMproject/CFDEMcoupling-PUBLIC/blob/master/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H)
+:link(bashrc,https://github.com/CFDEMproject/CFDEMcoupling-PUBLIC/blob/master/src/lagrangian/cfdemParticle/etc/bashrc)
+:link(downOF,https://openfoam.org/download/source/)
+:link(vtklink,http://www.vtk.org/)
+:link(ParaViewlink,https://www.paraview.org/)
+
+:line
+
+This section describes how to download repositories of the CFDEM®project from "github.com"_github .
+After setting some environment variables, LIGGGHTS® and CFDEM®coupling can be compiled.
+
+
+[Procedure:]
+
+Short summary:
+
+"Install git"_#install_1
+"Download CFDEM®project software"_#install_2
+"Download the correct OpenFOAM® version"_#install_3
+"Setup prerequisites"_#install_4
+"Setup and compile OpenFOAM®"_#install_5
+"Set environment variables and paths"_#install_6
+"Compile LIGGGHTS® and CFDEM®coupling"_#install_7
+"Additional information"_additionalInstall
+"Run your own cases"_#install_8 :ul
+
+:line
+[Install git:] :link(install_1) 
+This step is optional, but recommended. Git allows you to update the source code very easily with the git pull command.
+On debian based systems you can run
+
+sudo apt-get install git-core :pre
+
+Similar packages are available on other systems too:
+
+sudo zypper install git-core
+sudo yum install git :pre
+
+NOTE: In this tutorial the git protocol is used to transfer files. If port 9418 is closed for internet connections, please switch to "https://" instead of "git://" for git clone commands.
+
+:line
+[Download CFDEMproject software:] :link(install_2)
+With git you can clone git repositories from "github"_github . The following terminal commands will download the CFDEM®project software to your machine in the typical folder structure. The download of the post-processing tool LPP is optional and requires python-numpy.
+
+cd $HOME
+mkdir CFDEM
+cd CFDEM
+git clone git://github.com/CFDEMproject/CFDEMcoupling-PUBLIC.git
+cd $HOME
+mkdir LIGGGHTS
+cd LIGGGHTS
+git clone git://github.com/CFDEMproject/LIGGGHTS-PUBLIC.git
+git clone git://github.com/CFDEMproject/LPP.git lpp :pre
+
+If you do not have git, you can use the download buttons after visiting a repository in the "CFDEMproject project page"_gitCFDEM and unzip the archives to the proper locations. Typically github tags the folders with "-master", please rename them with
+
+cd $HOME/CFDEM
+mv CFDEMcoupling-PUBLIC-master CFDEMcoupling-PUBLIC
+cd $HOME/LIGGGHTS
+mv LIGGGHTS-PUBLIC-master LIGGGHTS-PUBLIC
+mv LPP-master lpp :pre
+
+:line
+[Download the correct OpenFOAM® version:] :link(install_3)
+All mentions of OpenFOAM® refer to "this"_footnotes . It is strongly recommended to compile OpenFOAM® yourself with the latest compatible version.
+The latest compatible OpenFOAM®-version can be found in  the in your local copy of CFDEM®coupling in src/lagrangian/cfdemParticle/cfdTools/versionInfo.H, or directly at "github"_compOF .
+Look for the git commit hashtag in the following line:
+
+word OFversion="<OF-Release>-commit-<commitHashtag>";
+e.g. word OFversion="3.0.x-commit-ac3f6c67e02f0aac3777c27f9fb7558fc3536e37"; :pre
+
+With git you can use the following recipe to get the correct version:
+
+cd $HOME
+mkdir OpenFOAM
+cd OpenFOAM
+git clone git://github.com/OpenFOAM/OpenFOAM-<OF-Release>.git
+git clone git://github.com/OpenFOAM/ThirdParty-<OF-Release>.git
+cd OpenFOAM-<OF-Release>
+git checkout <commitHashtag> :pre
+
+Without git you can visit git://github.com/OpenFOAM/OpenFOAM-<OF-Release>/tree/<commitHashtag> and use the download button.
+
+Other OpenFOAM® versions can be used for compilation, but aren't officially supported. The list includes 4.x, 2.4.x, 1612+, 1606+ and extend-3.2
+
+:line
+[Setup prerequisites for CFDEM®project:] :link(install_4)
+Prerequisites for OpenFOAM® can be found "here"_downOF .
+On an Ubuntu system (14.04+), you can use the following
+
+sudo apt-get install build-essential flex bison cmake zlib1g-dev libboost-system-dev libboost-thread-dev libopenmpi-dev openmpi-bin gnuplot libreadline-dev libncurses-dev libxt-dev libscotch-dev libptscotch-dev :pre
+
+CFDEM®project requires OpenFOAM® with a working MPI version.
+Optional, but strongly recommended is the use of "VTK"_vtklink . VTK is used to directly write data in vtk format, which is readable by "ParaView"_ParaViewlink . The minimum version is VTK 5.8, recommended is 6.3. On debian-based systems it is sufficient to run
+
+sudo apt-get install libvtk6-dev :pre
+
+For manual VTK compilation, please read the "additional installation hints"_additionalInstall .
+
+The post-processing tool lpp requires the python numpy package.
+
+sudo apt-get install python-numpy :pre
+
+:line
+[Setup and compile OpenFOAM®] :link(install_5)
+You can follow the OpenFOAM® git compilation "instructions"_downOF , with a small number of exceptions:
+CFDEM®coupling requires the WM_LABEL_SIZE=32 , which is the standard setting.
+
+On an Ubuntu system (14.04+), you can use the following steps to install OpenFOAM®:
+
+gedit ~/.bashrc 
+add the following two lines in the end, where <NofProcs> is the integer number of the processors you want to compile with. Save and exit gedit.
+"export WM_NCOMPPROCS=<NofProcs>"
+"source $HOME/OpenFOAM/OpenFOAM-<OF-Release>/etc/bashrc"
+now again in the terminal:
+source ~/.bashrc
+cd $WM_PROJECT_DIR
+foamSystemCheck
+./Allwmake :pre
+
+Additional OpenFOAM® installation hints can be found "here"_additionalInstall .
+
+:line
+[Set environment variables and paths] :link(install_6)
+Typically the CFDEM®coupling folder is tagged with the OpenFOAM® version number. To do this, perform the following steps:
+
+cd $HOME/CFDEM
+mv CFDEMcoupling-PUBLIC CFDEMcoupling-PUBLIC-$WM_PROJECT_VERSION :pre
+
+You need to set some environment variables in ~/.bashrc (if you use c-shell, manipulate ~/.cshrc accordingly). Open your .bashrc and the CFDEM®coupling bashrc file.
+
+gedit ~/.bashrc $HOME/CFDEM/CFDEMcoupling-PUBLIC-$WM_PROJECT_VERSION/src/lagrangian/cfdemParticle/etc/bashrc :pre
+
+Add the STANDARD block to the end of your bashrc and modify entries if necessary. Make sure the statements are not comments; remove the "#". Similar to:
+
+#================================================#
+#- source cfdem env vars
+export CFDEM_VERSION=PUBLIC
+export CFDEM_PROJECT_DIR=$HOME/CFDEM/CFDEMcoupling-$CFDEM_VERSION-$WM_PROJECT_VERSION
+export CFDEM_PROJECT_USER_DIR=$HOME/CFDEM/$LOGNAME-$CFDEM_VERSION-$WM_PROJECT_VERSION
+export CFDEM_bashrc=$CFDEM_PROJECT_DIR/src/lagrangian/cfdemParticle/etc/bashrc
+export CFDEM_LIGGGHTS_SRC_DIR=$HOME/LIGGGHTS/LIGGGHTS-PUBLIC/src
+export CFDEM_LIGGGHTS_MAKEFILE_NAME=auto
+export CFDEM_LPP_DIR=$HOME/LIGGGHTS/lpp/src
+. $CFDEM_bashrc
+#================================================# :pre
+
+You may insert the EXTENDED block above ". $CFDEM_bashrc" for further customization.
+The detailed description for allowed entries can be found "here"_additionalInstall .
+
+To load and check the environment you can run now
+
+source ~/.bashrc
+cfdemSysTest :pre
+
+NOTE: Many useful aliases are set with sourcing of the CFDEMcoupling bashrc, e.g. cfdemEtc . Make use of them!
+
+:line
+[Compile LIGGGHTS® and CFDEM®coupling] :link(install_7)
+To compile CFDEM®project open a new terminal and run
+
+cfdemCompCFDEMall :pre
+
+It compiles the LIGGGHTS® executable, LIGGGHTS® as a shared library, the CFDEM®coupling libraries, CFDEM®coupling solvers and CFDEM®coupling utilities. The compilation will stop, if build errors occur. Having a previous manually compiled LIGGGHTS® is not enough, it needs to be compiled as shared library with the cfdemCompLIG command. 
+
+As step by step compilation of only specific parts, the following commands are available:
+
+cfdemCompLIG
+cfdemCompCFDEMsrc
+cfdemCompCFDEmsol
+cfdenCompCFDEMuti :pre
+
+The compilation is automatically logged and the logs can be found in:
+
+$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/log :pre
+
+In case questions concerning the installation arise, please feel free to contact our forum at "www.cfdem.com"_lws .
+
+:line
+[Run your own cases] :link(install_8)
+
+If you want to run your own cases, please do so in {$CFDEM_PROJECT_USER_DIR/run} which is automatically being generated. E.g. copy one of the tutorial cases there, adapt it to your needs.
+Changes in $CFDEM_TUT_DIR might be lost after every {git stash}.
+
+You can run all the tutorial cases by executing the alias cfdemTestTUT.
+Alternatively you can run each tutorial using the {Allrun.sh} scripts in the tutorial directories.
+
+:line
+[Backwards Compatibility:]
+
+Basically CFDEM®coupling supports one OpenFOAM® version therefore all settings are prepared for that. Nevertheless we try to maintain backwards compatibility as long as it works with reasonable effort.
+
+The supported OpenFOAM® and LIGGGHTS® versions are stated in:
+src/lagrangian/cfdemParticle/cfdTools/versionInfo.H
+
+For using other versions you can manipulate:
+src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H
+(still not all functionality might work then!)
+
+:link(VTK63,http://www.vtk.org/files/release/6.3/VTK-6.3.0.zip)
+:link(VTKinst,http://www.vtk.org/Wiki/VTK/Configure_and_Build#On_Unix-like_systems)
+
+:line
+[Installation, additional information] :link(additionalInstall)
+:line
+
+[Procedure:]
+
+"Setup prerequisites"_#ainstall_4
+"Setup and compile OpenFOAM®"_#ainstall_5
+"Set environment variables and paths"_#ainstall_6
+"Compile LIGGGHTS® and CFDEM®coupling"_#ainstall_7 :ul
+
+:line
+
+[Setup prerequisites for CFDEM®project:] :link(ainstall_4)
+
+If you need to compile VTK on your machine yourself, we recommend version 6.3, which is available "here"_VTK63 . The installation guide is available "here"_VTKinst .
+
+Please note the VTK components necessary need cmake, MPI and some X11 libraries on your machine. Compilation using ccmake is recommended. In the standard configuration MPI related packages are disabled. Enable Parallel / MPI packages during configuration. For VTK-6.3 set VTK_Group_MPI:BOOL=ON .
+
+:line
+[Setup and compile OpenFOAM®] :link(ainstall_5)
+All mentions of OpenFOAM® refer to "this"_afootnotes .
+
+Often problems arise configuring OpenFOAM® to work with a specific MPI installation on a cluster. However it has built-in capability to work with nearly any MPI implementation.
+Set the following variable in the OpenFOAM® bashrc:
+
+export WM_MPLIB=SYSTEMMPI :pre
+
+Defining the following variables in your ~/.bashrc BEFORE the sourcing of OpenFOAM® will take care of the rest. This is an example for older MVAPICH installations where there is no libmpi.so, only libmpich.so :
+
+export MPI_ROOT=<path/to/mpi/installation>
+export MPI_ARCH_PATH=$MPI_ROOT
+export MPI_ARCH_FLAGS="-DMPICH_SKIP_MPICXX"
+export MPI_ARCH_INC="-I$MPI_ARCH_PATH/include"
+export MPI_ARCH_LIBS='-L$(MPI_ARCH_PATH)/lib -lmpich -lmpichcxx -lmpl -lopa -lrt' :pre
+
+:line
+[Set environment variables and paths] :link(ainstall_6)
+Detailed description of the environment variables:
+
+standard block:
+
+CFDEM_VERSION, CFDEMcoupling branch name; e.g. PUBLIC
+CFDEM_PROJECT_DIR, path to the installation directory of CFDEM®coupling
+CFDEM_PROJECT_USER_DIR, path to the user directory; used to store users simulation cases and source-code
+CFDEM_bashrc, location of the CFDEM®coupling bashrc (or cshrc)\, which sets up the environment
+CFDEM_LIGGGHTS_SRC_DIR, path to the LIGGGHTS src directory
+CFDEM_LIGGGHTS_MAKEFILE_NAME, Name of the LIGGGHTS® Makefile which defines how to compile LIGGGHTS®; more information on which Makefile to select is within the LIGGGHTS® documentation; standard is auto
+CFDEM_LPP_DIR path, to the src directory of the local lpp installation :tb
+
+extended block may be inserted above ". $CFDEM_bashrc":
+
+CFDEM_SRC_DIR, can be used to use alternative src directory
+CFDEM_SOLVER_DIR, can be used to use alternative solver directory
+CFDEM_DOC_DIR, can be used to use alternative doc directory
+CFDEM_UT_DIR, can be used to use alternative utilities directory
+CFDEM_TUT_DIR, can be used to use alternative tutorials directory
+CFDEM_LIGGGHTS_MAKEFILE_POSTIFX, if you wish to compile LIGGGHTS® to CFDEM®coupling with a postfix auto Makefile; for more information on postfixes please read the LIGGGHTS® documentation
+CFDEM_VERBOSE, if set to false\, standard output of environment variables is suppressed :tb
+
+:line
+additionalLibs:
+
+The additionalLibs are used as a centralized system for adding libraries and paths to CFDEM®coupling compilations. There is and automated detection of your OpenFOAM® version, which should select the proper additionalLibs file.
+If the automated selection of the additionalLibs fails or if you wish to set it manually to a specific file, you may set the following environment variables above ". $CFDEM_bashrc":
+
+CFDEM_ADD_LIBS_DIR, path containing the user-defined additionalLibs file
+CFDEM_ADD_LIBS_NAME, filename of the user-defined additionalLibs file :tb
+
+even further customization with variables:
+
+CFDEM_LAMMPS_LIB_DIR, alternative path to LIGGGHTS® lib folder containing additional LIGGGHTS® packages; e.g. ASPHERE
+CFDEM_LIGGGHTS_LIB_PATH, path to compiled LIGGGHTS® library; useful if the compiled LIGGGHTS® library has manually been moved from the LIGGGHTS® src path to an alternative location
+CFDEM_LIB_DIR, alternative target directory for CFDEM®coupling libraries
+CFDEM_USER_LIB_DIR, alternative target directory for CFDEM®coupling user-libraries
+CFDEM_APP_DIR, alternative target directory for CFDEMcoupling executables
+CFDEM_USER_APP_DIR, alternative target directory for CFDEM®coupling user-executables :tb
+
+:line
+[Compile LIGGGHTS® and CFDEM®coupling] :link(ainstall_7)
+
+LIGGGHTS® needs to be compiled as library with the cfdemCompLIG command. You can compile LIGGGHTS® manually as a shared library with "make -f Makefile.shlib <Makefilename>" within your LIGGGHTS® src directory.
+LIGGGHTS® is included into CFDEM®coupling by the creation of a symbolic link in $CFDEM_LIB_DIR to the LIGGGHTS shared library. This link is automatically created during the compilation of the CFDEM®coupling lagrangian library at the beginning of the make phase. This means even if you compile the lagrangian library manually with "wmake libso", the link is created.
+
+
+:line
+[Footnotes:] :link(footnotes)
+
+OPENFOAM®  is a registered trade mark of OpenCFD Limited, producer and distributor of the OpenFOAM software via wwww.openfoam.com.
+
+:line
+1.3 Tutorials :link(1_3),h4
+
+[General:]
+
+Each solver of the CFDEM®coupling comes with at least one tutorial example, showing its functionality and correct usage. Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell scripts. These scripts perform all necessary steps (preprocessing, run, postprocessing, visualization).
+
+[Location:]
+
+The tutorials can be found in the directory $CFDEM_PROJECT_DIR/tutorials, which can be reached by typing "cfdemTut"
+
+[Structure:]
+
+Each case is structured in a directory called "CFD" covering the CFD relevant settings and data, and a dirctory called "DEM" covering the DEM relevant settings and data. This allows to easily expand a pure CFD or DEM simulation case to a coupled case.
+
+[Usage:]
+
+Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell script, executed by typing "./Allrun.sh". The successful run of the script might need some third party software (e.g. octave, evince, etc.).
+
+A typical Allrun.sh script executes the following steps:
+
+DEM: LIGGGHTS init run 
+CFD: mesh generation (blockMesh)
+CFD: mesh decomposition (decomposePar)
+CFDEM: parallel CFDEM run; mpirun -np X cfdemSolverXXX -parallel
+post-processing :ul
+
+[Settings:]
+
+The main settings of a simulation are done via dictionaries:
+
+The DEM setup of each case is defined by a "LIGGGHTS®"_lig input file located in $caseDir/DEM (e.g. in.liggghts_init). For details on the "LIGGGHTS®"_lig setup, please have a look at the "LIGGGHTS®"_lig manual.
+
+Standard CFD settings are defined in $caseDir/CFD/constant (e.g. transportProperties, RASproperties, etc.) and $caseDir/CFD/system (e.g. fvSchemes, controlDict). For settings related to the solver such as discretization schemes, solution settings for the equations and solver control (e.g. corrector or non-orthogonal corrector steps for non-orthogonal meshes) you can find more information in "OpenFOAM®(*)"_of documentations (www.openFoam.com)(*).
+
+Settings of the coupling routines are defined in $caseDir/CFD/constant/"couplingProperies"_#1_4 (e.g. force models, data exchange model, etc.) and $caseDir/CFD/constant/"liggghtsCommands"_#1_5 (allows to execute a LIGGGHTS® command during a coupled simulation).
+
+:line
+
+1.4 "couplingProperties" dictionary :link(1_4),h4
+
+[General:]
+
+In the "couplingProperties" dictionary the setup of the coupling routines of the CFD-DEM simulation are defined.
+
+[Location:] $caseDir/CFD/constant
+
+[Structure:]
+
+The dictionary is divided into two parts, "sub-models & settings" and "sub-model properties".
+
+In "sub-models & settings" the following routines must be specified:
+
+modelType
+couplingInterval
+voidFractionModel
+locateModel
+meshMotionModel
+IOModel
+probeModel
+dataExchangeModel
+averagingModel
+clockModel
+smoothingModel
+forceModels
+momCoupleModels
+turbulenceModelType :ul
+
+In "sub-model properties" sub-dictionaries might be defined to specify model specific parameters.
+
+[Settings:]
+
+Reasonable example settings for the "couplingProperties" dictionary are given in the tutorial cases.
+
+modelType :pre
+
+"modelType" refers to the formulation of the equations to be solved. Choose "A", "B" or "Bfull", according to Zhou et al. (2010): "Discrete particle simulation of particle-fluid flow: model formulations and their applicability", JFM. "A" requires the use of the force models gradPForce and viscForce, whereas "B" requires the force model "Archimedes". "Bfull" refers to model type I, "A" refers to model type II and "B" refers to type III in the nomenclature used by Zhou et al.
+
+couplingInterval :pre
+
+The coupling interval determines the time passing between two CFD-DEM data exchanges.
+
+A useful procedure would be:
+
+Set the DEM timestep in the in.xxx file according to the needs of the pure DEM problem.
+Set the "couplingInterval", which refers to the DEM timesteps. Depending on the problem you will need to have a close (small couplingInterval) or loose coupling.
+Choose the CFD timestep in the controlDict. It must be equal to or smaller than the coupling time, otherwise you will get the error: "Error - TS bigger than coupling interval!".
+To ensure a synchronous run, the coupling time should be a multiple of the CFD timestep, or you'll get a warning "Warning - Coupling time (= DEM time step * coupling interval) is not a multiple of  CFD time-step!" :ol
+
+Example: DEMts=1.0e-5s, couplingInterval=10 exchange data (=couple) will happen every 1.0e-4s.
+
+:line
+
+1.5 "liggghtsCommands" dictionary :h4,link(1_5)
+
+[General:]
+
+In the "liggghtsCommands" dictionary LIGGGHTS® commands being executed during a coupled CFD-DEM simulation are specified.
+The most important command is the "run" command. After the start-up read of the LIGGGHTS®-input-script it is fed by CFDEM®coupling
+with commands. User-defined commands may be added.
+
+[Location:] $caseDir/CFD/constant
+
+[Structure:]
+
+The dictionary is divided into two parts, first a list of "liggghtsCommandModels" is defined, then the settings for each model must be specified.
+
+[Settings:]
+
+Reasonable example settings for the "liggghtsCommands" dictionary are given in the tutorial cases.
+
+:line
+
+
+
+
+1.6 Models/Solvers :h4,link(cmd_5),link(comm)
+
+This section lists all CFDEMcoupling sub-models and solvers alphabetically, with a separate
+listing below of styles within certain commands.
+
+
+"IOModel"_IOModel.html,
+"IOModel_basicIO"_IOModel_basicIO.html,
+"IOModel_noIO"_IOModel_noIO.html,
+"IOModel_sophIO"_IOModel_sophIO.html,
+"IOModel_trackIO"_IOModel_trackIO.html,
+"averagingModel"_averagingModel.html,
+"averagingModel_dense"_averagingModel_dense.html,
+"averagingModel_dilute"_averagingModel_dilute.html,
+"cfdemSolverIB"_cfdemSolverIB.html,
+"cfdemSolverPiso"_cfdemSolverPiso.html,
+"cfdemSolverPisoSTM"_cfdemSolverPisoSTM.html,
+"cfdemSolverPisoScalar"_cfdemSolverPisoScalar.html,
+"clockModel"_clockModel.html,
+"clockModel_noClock"_clockModel_noClock.html,
+"clockModel_standardClock"_clockModel_standardClock.html,
+"couple/cfd"_fix_couple_cfd.html,
+"couple/cfd/force"_fix_couple_cfd_force.html,
+"couple/cfd/force/implicit"_fix_couple_cfd_force_implicit.html,
+"dataExchangeModel"_dataExchangeModel.html,
+"dataExchangeModel_noDataExchange"_dataExchangeModel_noDataExchange.html,
+"dataExchangeModel_oneWayVTK"_dataExchangeModel_oneWayVTK.html,
+"dataExchangeModel_twoWayFiles"_dataExchangeModel_twoWayFiles.html,
+"dataExchangeModel_twoWayMPI"_dataExchangeModel_twoWayMPI.html,
+"forceModel"_forceModel.html,
+"forceModel_Archimedes"_forceModel_Archimedes.html,
+"forceModel_ArchimedesIB"_forceModel_ArchimedesIB.html,
+"forceModel_DiFeliceDrag"_forceModel_DiFeliceDrag.html,
+"forceModel_GidaspowDrag"_forceModel_GidaspowDrag.html,
+"forceModel_KochHillDrag"_forceModel_KochHillDrag.html,
+"forceModel_LaEuScalarTemp"_forceModel_LaEuScalarTemp.html,
+"forceModel_MeiLift"_forceModel_MeiLift.html,
+"forceModel_SchillerNaumannDrag"_forceModel_SchillerNaumannDrag.html,
+"forceModel_ShirgaonkarIB"_forceModel_ShirgaonkarIB.html,
+"forceModel_checkCouplingInterval"_forceModel_checkCouplingInterval.html,
+"forceModel_fieldStore"_forceModel_fieldStore.html,
+"forceModel_fieldTimeAverage"_forceModel_fieldTimeAverage.html,
+"forceModel_gradPForce"_forceModel_gradPForce.html,
+"forceModel_noDrag"_forceModel_noDrag.html,
+"forceModel_particleCellVolume"_forceModel_particleCellVolume.html,
+"forceModel_particleVolume"_forceModel_particleVolume.html,
+"forceModel_scalarGeneralExchange"_forceModel_scalarGeneralExchange.html,
+"forceModel_virtualMassForce"_forceModel_virtualMassForce.html,
+"forceModel_viscForce"_forceModel_viscForce.html,
+"forceModel_volWeightedAverage"_forceModel_volWeightedAverage.html,
+"forceSubModel"_forceSubModel.html,
+"forceSubModel_ImEx"_forceSubModel_ImEx.html,
+"liggghtsCommandModel"_liggghtsCommandModel.html,
+"liggghtsCommandModel_execute"_liggghtsCommandModel_execute.html,
+"liggghtsCommandModel_readLiggghtsData"_liggghtsCommandModel_readLiggghtsData.html,
+"liggghtsCommandModel_runLiggghts"_liggghtsCommandModel_runLiggghts.html,
+"liggghtsCommandModel_setDEMGravity"_liggghtsCommandModel_setDEMGravity.html,
+"liggghtsCommandModel_writeLiggghts"_liggghtsCommandModel_writeLiggghts.html,
+"locateModel"_locateModel.html,
+"locateModel_engineSearch"_locateModel_engineSearch.html,
+"locateModel_engineSearchIB"_locateModel_engineSearchIB.html,
+"locateModel_standardSearch"_locateModel_standardSearch.html,
+"meshMotionModel"_meshMotionModel.html,
+"meshMotionModel_noMeshMotion"_meshMotionModel_noMeshMotion.html,
+"momCoupleModel"_momCoupleModel.html,
+"momCoupleModel_explicitCouple"_momCoupleModel_explicitCouple.html,
+"momCoupleModel_implicitCouple"_momCoupleModel_implicitCouple.html,
+"momCoupleModel_noCouple"_momCoupleModel_noCouple.html,
+"probeModel"_probeModel.html,
+"probeModel_noProbe"_probeModel_noProbe.html,
+"probeModel_particleProbe"_probeModel_particleProbe.html,
+"scalarTransportModel"_scalarTransportModel.html,
+"scalarTransportModel_generalManual"_scalarTransportModel_generalManual.html,
+"smoothingModel"_smoothingModel.html,
+"smoothingModel_constDiffSmoothing"_smoothingModel_constDiffSmoothing.html,
+"smoothingModel_noSmoothing"_smoothingModel_noSmoothing.html,
+"voidfractionModel"_voidFractionModel.html,
+"voidfractionModel_GaussVoidFraction"_voidFractionModel_GaussVoidFraction.html,
+"voidfractionModel_IBVoidFraction"_voidFractionModel_IBVoidFraction.html,
+"voidfractionModel_bigParticleVoidFraction"_voidFractionModel_bigParticleVoidFraction.html,
+"voidfractionModel_centreVoidFraction"_voidFractionModel_centreVoidFraction.html,
+"voidfractionModel_dividedVoidFraction"_voidFractionModel_dividedVoidFraction.html,
+"voidfractionModel_noVoidFractionVoidFraction"_voidFractionModel_noVoidFraction.html,
+"voidfractionModel_trilinearVoidFraction"_voidFractionModel_trilinearVoidFraction.html :tb(c=2,ea=c)

doc/IOModel.html

@@ -1,40 +0,0 @@
-<HTML>
-<CENTER><A HREF = "http://www.cfdem.com">CFDEMproject WWW Site</A> - <A HREF = "CFDEMcoupling_Manual.html#comm">CFDEM Commands</A> 
-</CENTER>
-
-
-
-
-<HR>
-
-<H3>IOModel command 
-</H3>
-<P><B>Syntax:</B>
-</P>
-<P>Defined in couplingProperties dictionary.
-</P>
-<PRE>IOModel "model"; 
-</PRE>
-<UL><LI>model = name of IO-model to be applied 
-</UL>
-<P><B>Examples:</B>
-</P>
-<P>IOModel "off";
-</P>
-<P>Note: This examples list might not be complete - please look for other models (IOModel_XY) in this documentation.
-</P>
-<P><B>Description:</B>
-</P>
-<P>The IO-model is the base class to write data (e.g. particle properties) to files.
-</P>
-<P><B>Restrictions:</B>
-</P>
-<P>none.
-</P>
-<P><B>Related commands:</B>
-</P>
-<P>Note: This examples list may be incomplete - please look for other models (IOModel_XY) in this documentation.
-</P>
-<P><B>Default:</B> none.
-</P>
-</HTML>

doc/IOModel.txt

@@ -0,0 +1,36 @@
+"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c
+
+:link(lws,http://www.cfdem.com)
+:link(lc,CFDEMcoupling_Manual.html#comm)
+
+:line
+
+IOModel command :h3
+
+[Syntax:]
+
+Defined in couplingProperties dictionary.
+
+IOModel "model"; :pre
+
+model = name of IO-model to be applied :ul
+
+[Examples:]
+
+IOModel "off";
+
+NOTE: This examples list might not be complete - please look for other models (IOModel_XY) in this documentation.
+
+[Description:]
+
+The IO-model is the base class to write data (e.g. particle properties) to files within the CFD file-structure.
+
+[Restrictions:]
+
+none.
+
+[Related commands:]
+
+"basicIO"_IOModel_basicIO.html, "noIO"_IOModel_noIO.html, "sophIO"_IOModel_sophIO.html, "trackIO"_IOModel_trackIO.html
+
+[Default:] none.

doc/IOModel_basicIO.html

@@ -1,32 +0,0 @@
-<HTML>
-<CENTER><A HREF = "http://www.cfdem.com">CFDEMproject WWW Site</A> - <A HREF = "CFDEMcoupling_Manual.html#comm">CFDEM Commands</A> 
-</CENTER>
-
-
-
-
-<HR>
-
-<H3>IOModel_basicIO command 
-</H3>
-<P><B>Syntax:</B>
-</P>
-<P>Defined in couplingProperties dictionary.
-</P>
-<PRE>IOModel "basicIO"; 
-</PRE>
-<P><B>Examples:</B>
-</P>
-<PRE>IOModel "basicIO"; 
-</PRE>
-<P><B>Description:</B>
-</P>
-<P>The basic IO-model writes particle positions velocities and radii to files. The default output directory ($casePath/CFD/proc*/time/lagrangian). Using the keyword "serialOutput;" in couplingProperties the IO is serial to the directory ($casePath/CFD/lagrangian). In the latter case only the data on processor 0 is written! Data is written every write time of the CFD simulation.
-</P>
-<P><B>Restrictions:</B> None.
-</P>
-<P><B>Related commands:</B>
-</P>
-<P><A HREF = "IOModel.html">IOModel</A>
-</P>
-</HTML>

doc/IOModel_basicIO.txt

@@ -0,0 +1,29 @@
+"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c
+
+:link(lws,http://www.cfdem.com)
+:link(lc,CFDEMcoupling_Manual.html#comm)
+
+:line
+
+IOModel_basicIO command :h3
+
+[Syntax:]
+
+Defined in couplingProperties dictionary.
+
+IOModel "basicIO"; :pre
+
+[Examples:]
+
+IOModel "basicIO"; :pre
+
+[Description:]
+
+The basic IO-model writes particle positions velocities and radii to files. The default output directory ($casePath/CFD/proc*/time/lagrangian). Using the keyword "serialOutput;" in couplingProperties the IO is serial to the directory ($casePath/CFD/lagrangian). In the latter case only the data on processor 0 is written! Data is written every write time of the CFD simulation.
+
+[Restrictions:] None.
+
+[Related commands:]
+
+"IOModel"_IOModel.html
+

doc/IOModel_noIO.html

@@ -1,32 +0,0 @@
-<HTML>
-<CENTER><A HREF = "http://www.cfdem.com">CFDEMproject WWW Site</A> - <A HREF = "CFDEMcoupling_Manual.html#comm">CFDEM Commands</A> 
-</CENTER>
-
-
-
-
-<HR>
-
-<H3>IOModel_noIO command 
-</H3>
-<P><B>Syntax:</B>
-</P>
-<P>Defined in couplingProperties dictionary.
-</P>
-<PRE>IOModel "off"; 
-</PRE>
-<P><B>Examples:</B>
-</P>
-<PRE>IOModel "off"; 
-</PRE>
-<P><B>Description:</B>
-</P>
-<P>The noIO-model is a dummy IO model.
-</P>
-<P><B>Restrictions:</B> None.
-</P>
-<P><B>Related commands:</B>
-</P>
-<P><A HREF = "IOModel.html">IOModel</A>
-</P>
-</HTML>

doc/IOModel_noIO.txt

@@ -0,0 +1,29 @@
+"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c
+
+:link(lws,http://www.cfdem.com)
+:link(lc,CFDEMcoupling_Manual.html#comm)
+
+:line
+
+IOModel_noIO command :h3
+
+[Syntax:]
+
+Defined in couplingProperties dictionary.
+
+IOModel "off"; :pre
+
+[Examples:]
+
+IOModel "off"; :pre
+
+[Description:]
+
+The noIO-model is a dummy IO model.
+
+[Restrictions:] None.
+
+[Related commands:]
+
+"IOModel"_IOModel.html
+

doc/IOModel_sophIO.html

@@ -1,32 +0,0 @@
-<HTML>
-<CENTER><A HREF = "http://www.cfdem.com">CFDEMproject WWW Site</A> - <A HREF = "CFDEMcoupling_Manual.html#comm">CFDEM Commands</A> 
-</CENTER>
-
-
-
-
-<HR>
-
-<H3>IOModel_sophIO command 
-</H3>
-<P><B>Syntax:</B>
-</P>
-<P>Defined in couplingProperties dictionary.
-</P>
-<PRE>IOModel "sophIO"; 
-</PRE>
-<P><B>Examples:</B>
-</P>
-<PRE>IOModel "sophIO"; 
-</PRE>
-<P><B>Description:</B>
-</P>
-<P>The sophIO-model is based on basicIO model and additionally writes voidfraction, implicit forces, explicit forces. Data is written every write time of the CFD simulation.
-</P>
-<P><B>Restrictions:</B> None.
-</P>
-<P><B>Related commands:</B>
-</P>
-<P><A HREF = "IOModel.html">IOModel</A>
-</P>
-</HTML>

doc/IOModel_sophIO.txt

@@ -0,0 +1,29 @@
+"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c
+
+:link(lws,http://www.cfdem.com)
+:link(lc,CFDEMcoupling_Manual.html#comm)
+
+:line
+
+IOModel_sophIO command :h3
+
+[Syntax:]
+
+Defined in couplingProperties dictionary.
+
+IOModel "sophIO"; :pre
+
+[Examples:]
+
+IOModel "sophIO"; :pre
+
+[Description:]
+
+The sophIO-model is based on basicIO model and additionally writes voidfraction, implicit forces, explicit forces. Data is written every write time of the CFD simulation.
+
+[Restrictions:] None.
+
+[Related commands:]
+
+"IOModel"_IOModel.html
+

doc/IOModel_trackIO.html

@@ -1,32 +0,0 @@
-<HTML>
-<CENTER><A HREF = "http://www.cfdem.com">CFDEMproject WWW Site</A> - <A HREF = "CFDEMcoupling_Manual.html#comm">CFDEM Commands</A> 
-</CENTER>
-
-
-
-
-<HR>
-
-<H3>IOModel_trackIO command 
-</H3>
-<P><B>Syntax:</B>
-</P>
-<P>Defined in couplingProperties dictionary.
-</P>
-<PRE>IOModel "trackIO"; 
-</PRE>
-<P><B>Examples:</B>
-</P>
-<PRE>IOModel "trackIO"; 
-</PRE>
-<P><B>Description:</B>
-</P>
-<P>The trackIO-model is based on sophIO model and additionally writes fields necessary to use the particleTracks utility (which needs a particleTrackProperties file in the constant dir). The particleTracks utility generates tracks of the particles and writes them to a vtk file.
-</P>
-<P><B>Restrictions:</B> None.
-</P>
-<P><B>Related commands:</B>
-</P>
-<P><A HREF = "IOModel.html">IOModel</A>
-</P>
-</HTML>

doc/IOModel_trackIO.txt

@@ -0,0 +1,29 @@
+"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c
+
+:link(lws,http://www.cfdem.com)
+:link(lc,CFDEMcoupling_Manual.html#comm)
+
+:line
+
+IOModel_trackIO command :h3
+
+[Syntax:]
+
+Defined in couplingProperties dictionary.
+
+IOModel "trackIO"; :pre
+
+[Examples:]
+
+IOModel "trackIO"; :pre
+
+[Description:]
+
+The trackIO-model is based on sophIO model and additionally writes fields necessary to use the particleTracks utility (which needs a particleTrackProperties file in the constant dir). The particleTracks utility generates tracks of the particles and writes them to a vtk file.
+
+[Restrictions:] None.
+
+[Related commands:]
+
+"IOModel"_IOModel.html
+