release on 2014-02-12_09-39-12

2025-12-08 06:37:44 +00:00 · 2014-02-12 09:39:12 +01:00
parent 6f405f84ae
commit 0e78266b87
163 changed files with 2574 additions and 1459 deletions
--- a/81
+++ b/81
@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+    CFDEMcoupling - Open Source CFD-DEM coupling
+
+    CFDEMcoupling is part of the CFDEMproject
+    www.cfdem.com
+                                Christoph Goniva, christoph.goniva@cfdem.com
+                                Copyright 2009-2012 JKU Linz
+                                Copyright 2012-     DCS Computing GmbH, Linz
+-------------------------------------------------------------------------------
+License
+    This file is part of CFDEMcoupling.
+
+    CFDEMcoupling is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+    CFDEMcoupling is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with CFDEMcoupling; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Description
+    This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS
+    and OpenFOAM. Note: this code is not part of OpenFOAM (see DISCLAIMER).
+\*---------------------------------------------------------------------------*/
+
+
+CFDEM coupling provides an open source parallel coupled CFD-DEM framework 
+combining the strengths of LIGGGHTS DEM code and the Open Source 
+CFD package OpenFOAM(R)(*). The CFDEMcoupling toolbox allows to expand 
+standard CFD solvers of OpenFOAM(R)(*) to include a coupling to the DEM 
+code LIGGGHTS. 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
+- its MPI parallelization enables to use it for large scale problems
+- the "forum"_lws on CFD-DEM gives the possibility to exchange with other 
+  users / developers
+- the use of GIT allows to easily update to the latest version
+- basic documentation is provided
+
+The file structure:
+
+- "src" directory including the source files of the coupling toolbox and models
+- "applications" directory including the solver files for coupled CFD-DEM simulations
+- "doc" directory including the documentation of CFDEMcoupling
+- "tutorials" directory including basic tutorial cases showing the functionality
+
+
+
+Details on installation are given on the "www.cfdem.com"
+
+The functionality of this CFD-DEM framwork is described via "tutorial cases" showing 
+how to use different solvers and models.
+
+CFDEMcoupling stands for Computational Fluid Dynamics (CFD) -
+Discrete Element Method (DEM) coupling.
+
+CFDEMcoupling is an open-source code, distributed freely under the terms of the 
+GNU Public License (GPL).
+
+Core development of CFDEMcoupling is done by 
+Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012
+
+
+\*---------------------------------------------------------------------------*/
+(*) "OpenFOAM(R)"_of is a registered trade mark of the ESI Group.
+This offering is not affiliated, approved or endorsed by ESI Group, 
+the producer of the OpenFOAM® software and owner of the OpenFOAM® trade mark.
+\*---------------------------------------------------------------------------*/
--- a/applications/solvers/cfdemSolverIB/Make/options
+++ b/applications/solvers/cfdemSolverIB/Make/options
@ -3,11 +3,14 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(CFDEM_SRC_DIR)/lnInclude \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude 
+    -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude

 EXE_LIBS = \
    -L$(FOAM_USER_LIBBIN)\
@ -17,4 +20,5 @@ EXE_LIBS = \
    -lfiniteVolume \
    -ldynamicFvMesh \
    -ldynamicMesh \
+    -lfvOptions \
    -l$(CFDEM_LIB_NAME)
--- a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
+++ b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
@ -50,6 +50,10 @@ Contributions

 #include "dynamicFvMesh.H" //dyM

+#include "cellSet.H"
+#include "meshToMeshNew.H"
+#include "fvIOoptionList.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 int main(int argc, char *argv[])
@ -64,6 +68,8 @@ int main(int argc, char *argv[])

    #include "initContinuityErrs.H"

+    #include "createFvOptions.H"
+
    // create cfdemCloud
    #include "readGravitationalAcceleration.H"
    cfdemCloudIB particleCloud(mesh);
@ -96,10 +102,14 @@ int main(int argc, char *argv[])
                fvm::ddt(voidfraction,U)
              + fvm::div(phi, U)
              + turbulence->divDevReff(U)
+                ==
+                fvOptions(U)
            );

            UEqn.relax();

+            fvOptions.constrain(UEqn);
+
            if (momentumPredictor)
            {
                solve(UEqn == -fvc::grad(p));
@ -116,6 +126,8 @@ int main(int argc, char *argv[])

                adjustPhi(phi, U, p);

+                fvOptions.relativeFlux(phi);
+
                // Non-orthogonal pressure corrector loop
                for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
                {
@ -160,6 +172,8 @@ int main(int argc, char *argv[])
        volScalarField voidfractionNext=mesh.lookupObject<volScalarField>("voidfractionNext");
        particleCloud.calcVelocityCorrection(p,U,phiIB,voidfractionNext);

+        fvOptions.correct(U);
+
        runTime.write();

        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
--- a/applications/solvers/cfdemSolverPimple/Make/options
+++ b/applications/solvers/cfdemSolverPimple/Make/options
@ -6,8 +6,8 @@ EXE_INC = \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/fvOptions/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(CFDEM_SRC_DIR)/lnInclude \
-    -I$(CFDEM_SRC_DIR)/cfdTools \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \

 EXE_LIBS = \
    -L$(FOAM_USER_LIBBIN)\
--- a/applications/solvers/cfdemSolverPimple/pEqn.H
+++ b/applications/solvers/cfdemSolverPimple/pEqn.H
@ -27,7 +27,7 @@ while (pimple.correctNonOrthogonal())
    // Pressure corrector
    fvScalarMatrix pEqn
    (
-        fvm::laplacian(rUAvoidfraction, p) == fvc::div(phiGes) + particleCloud.ddtVoidfraction()
+        fvm::laplacian(rUAvoidfraction, p) == fvc::div(phiGes) //+ particleCloud.ddtVoidfraction()
    );

    pEqn.setReference(pRefCell, pRefValue);
--- a/applications/solvers/cfdemSolverPiso/Make/options
+++ b/applications/solvers/cfdemSolverPiso/Make/options
@ -3,8 +3,8 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(CFDEM_SRC_DIR)/lnInclude \
-    -I$(CFDEM_SRC_DIR)/cfdTools \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \

 EXE_LIBS = \
    -L$(FOAM_USER_LIBBIN)\
--- a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
+++ b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
@ -73,10 +73,9 @@ int main(int argc, char *argv[])
        // do particle stuff
        particleCloud.clockM().start(2,"Coupling");
        particleCloud.evolve(voidfraction,Us,U);
-        voidfraction.oldTime().internalField() = voidfraction;
      
        Info << "update Ksl.internalField()" << endl;
-        Ksl.oldTime().internalField() = particleCloud.momCoupleM(0).impMomSource();
+        Ksl = particleCloud.momCoupleM(0).impMomSource();
        particleCloud.smoothingM().smoothen(Ksl);
        Ksl.correctBoundaryConditions();

@ -89,7 +88,7 @@ int main(int argc, char *argv[])
            // Momentum predictor
            fvVectorMatrix UEqn
            (
-                fvm::ddt(voidfraction,U)
+                fvm::ddt(voidfraction,U) //particleCloud.ddtVoidfractionU(U,voidfraction) //
              + fvm::div(phi, U)
 //              + turbulence->divDevReff(U)
              + particleCloud.divVoidfractionTau(U, voidfraction)
@ -121,8 +120,8 @@ int main(int argc, char *argv[])

                U = rUA*UEqn.H();

-                phi = (fvc::interpolate(U*voidfraction) & mesh.Sf() )
-                     + fvc::ddtPhiCorr(rUAvoidfraction, U, phi);
+                phi = (fvc::interpolate(U*voidfraction) & mesh.Sf() );
+                     //+ fvc::ddtPhiCorr(rUAvoidfraction, U, phi);
                surfaceScalarField phiS(fvc::interpolate(Us*voidfraction) & mesh.Sf());
                surfaceScalarField phiGes = phi + rUAf*(fvc::interpolate(Ksl/rho) * phiS);

--- a/applications/solvers/cfdemSolverPisoMS/Make/options
+++ b/applications/solvers/cfdemSolverPisoMS/Make/options
@ -1,11 +1,11 @@
 EXE_INC = \
-    -I$(CFDEM_SRC_DIR)/lnInclude \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
    -I ../cfdemSolverPiso \
    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(CFDEM_SRC_DIR)/cfdTools \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \

 EXE_LIBS = \
    -L$(FOAM_USER_LIBBIN)\
--- a/applications/solvers/cfdemSolverPisoMS/cfdemSolverPisoMS.C
+++ b/applications/solvers/cfdemSolverPisoMS/cfdemSolverPisoMS.C
@ -40,6 +40,8 @@ Description

 #include "cfdemCloudMS.H"
 #include "implicitCouple.H"
+#include "clockModel.H"
+#include "smoothingModel.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

@ -49,50 +51,44 @@ int main(int argc, char *argv[])
    #include "createTime.H"
    #include "createMesh.H"
    #include "createFields.H"
-
    #include "initContinuityErrs.H"

    // create cfdemCloud
    #include "readGravitationalAcceleration.H"
    cfdemCloudMS particleCloud(mesh);
-
    #include "checkModelType.H"
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-    Info<< "\nStarting time loop\n" << endl;
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

    while (runTime.loop())
    {
+        Info<< "\nStarting time loop\n" << endl;
+            particleCloud.clockM().start(1,"Global");
+
        Info<< "Time = " << runTime.timeName() << nl << endl;

        #include "readPISOControls.H"
        #include "CourantNo.H"

        // do particle stuff
-        Info << "- evolve()" << endl;
+        particleCloud.clockM().start(2,"Coupling");
        particleCloud.evolve(voidfraction,Us,U);
      
        Info << "update Ksl.internalField()" << endl;
-        Ksl.internalField() = particleCloud.momCoupleM(0).impMomSource();
+        Ksl = particleCloud.momCoupleM(0).impMomSource();
+        particleCloud.smoothingM().smoothen(Ksl);
        Ksl.correctBoundaryConditions();

-        // debug info
-        //Info << "totaldragforceEuler calculus" << endl;
-        //vector totaldragforceEuler(0,0,0);
-        //forAll(Ksl,cellI)
-        //{
-        //    totaldragforceEuler += Ksl[cellI]*(Us[cellI]-U[cellI])/rho[cellI] * Ksl.mesh().V()[cellI];
-        //}
-        //Pout <<"totaldragforceEuler = "<< mag(totaldragforceEuler) << endl;
-        //Pout << "dv/dt =" << sum(fvc::ddt(voidfraction)) << endl;
-        //-----------
+        #include "solverDebugInfo.H"
+        particleCloud.clockM().stop("Coupling");

+        particleCloud.clockM().start(26,"Flow");
        // Pressure-velocity PISO corrector
        {
            // Momentum predictor
            fvVectorMatrix UEqn
            (
-                fvm::ddt(voidfraction,U)
+                fvm::ddt(voidfraction,U) //particleCloud.ddtVoidfractionU(U,voidfraction) //
              + fvm::div(phi, U)
 //              + turbulence->divDevReff(U)
              + particleCloud.divVoidfractionTau(U, voidfraction)
@ -100,34 +96,35 @@ int main(int argc, char *argv[])
              - fvm::Sp(Ksl/rho,U)
            );

+            if (modelType=="B")
+                UEqn == - fvc::grad(p) + Ksl/rho*Us;
+            else
+                UEqn == - voidfraction*fvc::grad(p) + Ksl/rho*Us;
+
            UEqn.relax();

            if (momentumPredictor)
-            {
-                //solve UEqn
-                if (modelType=="B")
-                    solve(UEqn == - fvc::grad(p) + Ksl/rho*Us);
-                else
-                    solve(UEqn == - voidfraction*fvc::grad(p) + Ksl/rho*Us);
-            }
+                solve(UEqn);

            // --- PISO loop

            //for (int corr=0; corr<nCorr; corr++)
            int nCorrSoph = nCorr + 5 * pow((1-particleCloud.dataExchangeM().timeStepFraction()),1);
+
            for (int corr=0; corr<nCorrSoph; corr++)
            {
                volScalarField rUA = 1.0/UEqn.A();
+
                surfaceScalarField rUAf("(1|A(U))", fvc::interpolate(rUA));
+                volScalarField rUAvoidfraction("(voidfraction2|A(U))",rUA*voidfraction);

                U = rUA*UEqn.H();

-                phi = fvc::interpolate(U*voidfraction) & mesh.Sf();
-                                      //+ fvc::ddtPhiCorr(rUA, U, phi)
+                phi = (fvc::interpolate(U*voidfraction) & mesh.Sf() );
+                     //+ fvc::ddtPhiCorr(rUAvoidfraction, U, phi);
                surfaceScalarField phiS(fvc::interpolate(Us*voidfraction) & mesh.Sf());
                surfaceScalarField phiGes = phi + rUAf*(fvc::interpolate(Ksl/rho) * phiS);

-                volScalarField rUAvoidfraction("(voidfraction2|A(U))",rUA*voidfraction);
                if (modelType=="A")
                    rUAvoidfraction = volScalarField("(voidfraction2|A(U))",rUA*voidfraction*voidfraction);

@ -180,6 +177,9 @@ int main(int argc, char *argv[])
        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
            << nl << endl;
+
+        particleCloud.clockM().stop("Flow");
+        particleCloud.clockM().stop("Global");
    }

    Info<< "End\n" << endl;
--- a/applications/solvers/cfdemSolverPisoScalar/Make/options
+++ b/applications/solvers/cfdemSolverPisoScalar/Make/options
@ -3,8 +3,8 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(CFDEM_SRC_DIR)/lnInclude \
-    -I$(CFDEM_SRC_DIR)/cfdTools \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \

 EXE_LIBS = \
    -L$(FOAM_USER_LIBBIN)\
--- a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
+++ b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
@ -75,7 +75,7 @@ int main(int argc, char *argv[])
        Info << "- evolve()" << endl;
        particleCloud.evolve(voidfraction,Us,U);

-        Ksl.oldTime().internalField() = particleCloud.momCoupleM(0).impMomSource();
+        Ksl.internalField() = particleCloud.momCoupleM(0).impMomSource();
        particleCloud.smoothingM().smoothen(Ksl);
        Ksl.correctBoundaryConditions();

--- a/applications/utilities/cfdemPostproc/Make/options
+++ b/applications/utilities/cfdemPostproc/Make/options
@ -3,7 +3,7 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(CFDEM_SRC_DIR)/lnInclude \
+    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \


--- a/doc/CFDEMcoupling_Manual.pdf
+++ b/doc/CFDEMcoupling_Manual.pdf
--- a/doc/forceModel_GidaspowDrag.html
+++ b/doc/forceModel_GidaspowDrag.html
@ -21,12 +21,15 @@ GidaspowDragProps
 {
    velFieldName "U";
    densityFieldName "density";
+    phi "scalar";
 }; 
 </PRE>
 <UL><LI><I>U</I> = name of the finite volume fluid velocity field 

 <LI><I>density</I> = name of the finite volume gravity field 

+<LI><I>phi</I> = drag correction factor (in doubt 1) 
+

 </UL>
 <P><B>Examples:</B>
--- a/doc/forceModel_GidaspowDrag.txt
+++ b/doc/forceModel_GidaspowDrag.txt
@ -19,10 +19,12 @@ GidaspowDragProps
 \{
    velFieldName "U";
    densityFieldName "density";
+    phi "scalar";
 \}; :pre

 {U} = name of the finite volume fluid velocity field :ulb,l
 {density} = name of the finite volume gravity field :l
+{phi} = drag correction factor (in doubt 1) :l
 :ule

 [Examples:]
--- a/doc/forceModel_noDrag.html
+++ b/doc/forceModel_noDrag.html
@ -15,19 +15,24 @@
 </P>
 <PRE>forceModels
 (
-    off
+    noDrag
 ); 
 </PRE>
 <P><B>Examples:</B>
 </P>
 <PRE>forceModels
 (
-    off
+    noDrag
 ); 
 </PRE>
+<PRE>noDragProps (optional)
+{
+    noDEMForce; (optional)
+}; 
+</PRE>
 <P><B>Description:</B>
 </P>
-<P>The force model performs the calculation of forces (e.g. fluid-particle interaction forces) acting on each DEM particle. The noDrag model sets the forces acting on the particle to zero. If several force models are selected and noDrag is the last model being executed, the fluid particle force will be set to zero.
+<P>The force model performs the calculation of forces (e.g. fluid-particle interaction forces) acting on each DEM particle. The noDrag model sets the forces acting on the particle to zero. If several force models are selected and noDrag is the last model being executed, the fluid particle force will be set to zero. If the variable noDEMForce is set, then the forces communicated to the DEM solver are also set to zero.
 </P>
 <P><B>Restrictions:</B>
 </P>
--- a/doc/forceModel_noDrag.txt
+++ b/doc/forceModel_noDrag.txt
@ -13,19 +13,24 @@ Defined in couplingProperties dictionary.

 forceModels
 (
-    off
+    noDrag
 ); :pre

 [Examples:]

 forceModels
 (
-    off
+    noDrag
 ); :pre

+noDragProps (optional)
+\{
+    noDEMForce; (optional)
+\}; :pre
+
 [Description:]

-The force model performs the calculation of forces (e.g. fluid-particle interaction forces) acting on each DEM particle. The noDrag model sets the forces acting on the particle to zero. If several force models are selected and noDrag is the last model being executed, the fluid particle force will be set to zero.
+The force model performs the calculation of forces (e.g. fluid-particle interaction forces) acting on each DEM particle. The noDrag model sets the forces acting on the particle to zero. If several force models are selected and noDrag is the last model being executed, the fluid particle force will be set to zero. If the variable noDEMForce is set, then the forces communicated to the DEM solver are also set to zero.

 [Restrictions:]

--- a/doc/forceModel_particleCellVolume.html
+++ b/doc/forceModel_particleCellVolume.html
@ -45,8 +45,8 @@ particleCellVolumeProps
 </PRE>
 <P><B>Description:</B>
 </P>
-<P>This "forceModel" does not influence the particles or the simulation - it is a postprocessing tool! The total volume of the particles as they are represented on the CFD mesh is calculated.
-At "writeTime" a field named particleCellVolume , where scalarField is the name of the original field, is written. This can be can the be probed using standard function object probes. Using the verbose option a screen output is given.
+<P>This "forceModel" does not influence the particles or the simulation - it is a postprocessing tool! The total volume of the particles as they are represented on the CFD mesh is calculated. Further the total volume of the cells particles are in is calculated.
+At "writeTime" a field named particleCellVolume , where scalarField is the name of the original field, is written. This can be can the be probed using standard function object probes. Analogously a field named cellVolume is written. Using the verbose option a screen output is given.
 </P>
 <P><B>Restrictions:</B>
 </P>
--- a/doc/forceModel_particleCellVolume.txt
+++ b/doc/forceModel_particleCellVolume.txt
@ -41,8 +41,8 @@ particleCellVolumeProps

 [Description:]

-This "forceModel" does not influence the particles or the simulation - it is a postprocessing tool! The total volume of the particles as they are represented on the CFD mesh is calculated.
-At "writeTime" a field named particleCellVolume , where scalarField is the name of the original field, is written. This can be can the be probed using standard function object probes. Using the verbose option a screen output is given.
+This "forceModel" does not influence the particles or the simulation - it is a postprocessing tool! The total volume of the particles as they are represented on the CFD mesh is calculated. Further the total volume of the cells particles are in is calculated.
+At "writeTime" a field named particleCellVolume , where scalarField is the name of the original field, is written. This can be can the be probed using standard function object probes. Analogously a field named cellVolume is written. Using the verbose option a screen output is given.

 [Restrictions:]

--- a/doc/githubAccess_public.pdf
+++ b/doc/githubAccess_public.pdf
--- a/doc/probeModel.html
+++ b/doc/probeModel.html
@ -15,10 +15,8 @@
 </P>
 <PRE>probeModel myProbeModel; 
 </PRE>
-<P>Use "off" for "myProbeModel" to disable this feature.
+<P>Use probe model "off" to disable this feature.
 </P>
-<PRE>particleIDsToSample (ID1 ID2 ID3 ...); 
-</PRE>
 <PRE>myProbeModelProps 
 </PRE>
 <PRE>{ 
--- a/doc/probeModel.txt
+++ b/doc/probeModel.txt
@ -13,9 +13,8 @@ To be activated via couplingProperties dictionary.

 probeModel myProbeModel; :pre

-Use "off" for "myProbeModel" to disable this feature.
+Use probe model "off" to disable this feature.

-particleIDsToSample (ID1 ID2 ID3 ...); :pre
 myProbeModelProps :pre
 \{ :pre

--- a/doc/probeModel_noProbe.html
+++ b/doc/probeModel_noProbe.html
@ -13,8 +13,7 @@
 </P>
 <P>To be activated via couplingProperties dictionary.
 </P>
-<PRE>particleIDsToSample (ID1 ID2 ID3 ...);
-forceModels
+<PRE>forceModels
 {
    myForceModel1
    myForceModel2
@ -23,10 +22,6 @@ forceModels
 </PRE>
 <P><B>Examples:</B>
 </P>
-<PRE>probeModel noProbe; 
-</PRE>
-<P>Alternatively use:
-</P>
 <PRE>probeModel off; 
 </PRE>
 <P>Note: This examples list might not be complete - please check below for the list of force models that can perform particle probing.
--- a/doc/probeModel_noProbe.txt
+++ b/doc/probeModel_noProbe.txt
@ -11,7 +11,6 @@ probeModel_noProbe command :h3

 To be activated via couplingProperties dictionary.

-particleIDsToSample (ID1 ID2 ID3 ...);
 forceModels
 \{
    myForceModel1
@ -21,9 +20,6 @@ forceModels

 [Examples:]

-probeModel noProbe; :pre
-Alternatively use:
-
 probeModel off; :pre

 Note: This examples list might not be complete - please check below for the list of force models that can perform particle probing.
--- a/src/lagrangian/cfdemParticle/Make/files
+++ b/src/lagrangian/cfdemParticle/Make/files
@ -6,7 +6,6 @@ voidFractionModels = subModels/voidFractionModel
 locateModels = subModels/locateModel
 meshMotionModels = subModels/meshMotionModel
 momCoupleModels = subModels/momCoupleModel
-regionModels = subModels/regionModel
 dataExchangeModels = subModels/dataExchangeModel
 averagingModels = subModels/averagingModel
 clockModels = subModels/clockModel
@ -15,6 +14,7 @@ smoothingModels = subModels/smoothingModel
 probeModels = subModels/probeModel

 $(cfdemCloud)/cfdemCloud.C
+derived/cfdemCloudBiDisperse/cfdemCloudBiDisperse.C
 derived/cfdemCloudIB/cfdemCloudIB.C
 derived/cfdemCloudMS/cfdemCloudMS.C

@ -23,26 +23,43 @@ $(forceModels)/forceModel/newForceModel.C
 $(forceModels)/noDrag/noDrag.C
 $(forceModels)/checkCouplingInterval/checkCouplingInterval.C
 $(forceModels)/DiFeliceDrag/DiFeliceDrag.C
+$(forceModels)/DiFeliceDragNLift/DiFeliceDragNLift.C
 $(forceModels)/GidaspowDrag/GidaspowDrag.C
 $(forceModels)/SchillerNaumannDrag/SchillerNaumannDrag.C
 $(forceModels)/Archimedes/Archimedes.C
 $(forceModels)/ArchimedesIB/ArchimedesIB.C
 $(forceModels)/interface/interface.C
 $(forceModels)/ShirgaonkarIB/ShirgaonkarIB.C
+$(forceModels)/fieldTimeAverage/fieldTimeAverage.C
+$(forceModels)/fieldBound/fieldBound.C
+$(forceModels)/volWeightedAverage/volWeightedAverage.C
+$(forceModels)/totalMomentumExchange/totalMomentumExchange.C
 $(forceModels)/KochHillDrag/KochHillDrag.C
 $(forceModels)/KochHillRWDrag/KochHillRWDrag.C
+$(forceModels)/BeetstraDrag/multiphaseFlowBasic/multiphaseFlowBasic.C
+$(forceModels)/BeetstraDrag/BeetstraDrag.C
+$(forceModels)/LaEuScalarLiquid/LaEuScalarLiquid.C
 $(forceModels)/LaEuScalarTemp/LaEuScalarTemp.C
+$(forceModels)/LaEuScalarDust/LaEuScalarDust.C
 $(forceModels)/virtualMassForce/virtualMassForce.C
 $(forceModels)/gradPForce/gradPForce.C
+$(forceModels)/gradULiftForce/gradULiftForce.C
+$(forceModels)/HollowayDrag/HollowayDrag.C
 $(forceModels)/viscForce/viscForce.C
 $(forceModels)/MeiLift/MeiLift.C
+$(forceModels)/melting/melting.C
+$(forceModels)/KochHillDragNLift/KochHillDragNLift.C
+$(forceModels)/solidsPressureForce/solidsPressureForce.C
+$(forceModels)/periodicPressure/periodicPressure.C
+$(forceModels)/periodicPressureControl/periodicPressureControl.C
+$(forceModels)/averageSlipVel/averageSlipVel.C
 $(forceModels)/particleCellVolume/particleCellVolume.C
-$(forceModels)/fieldTimeAverage/fieldTimeAverage.C
-$(forceModels)/volWeightedAverage/volWeightedAverage.C

 $(forceModelsMS)/forceModelMS/forceModelMS.C
 $(forceModelsMS)/forceModelMS/newForceModelMS.C
 $(forceModelsMS)/DiFeliceDragMS/DiFeliceDragMS.C
+$(forceModelsMS)/GidaspowDragMS/GidaspowDragMS.C
+$(forceModelsMS)/noDragMS/noDragMS.C

 $(probeModels)/probeModel/probeModel.C
 $(probeModels)/probeModel/newProbeModel.C
@ -60,10 +77,12 @@ $(voidFractionModels)/voidFractionModel/voidFractionModel.C
 $(voidFractionModels)/voidFractionModel/newVoidFractionModel.C
 $(voidFractionModels)/centreVoidFraction/centreVoidFraction.C
 $(voidFractionModels)/dividedVoidFraction/dividedVoidFraction.C
+$(voidFractionModels)/dividedVoidFractionBiDi/dividedVoidFractionBiDi.C
 $(voidFractionModels)/dividedVoidFractionMS/dividedVoidFractionMS.C
 $(voidFractionModels)/bigParticleVoidFraction/bigParticleVoidFraction.C
 $(voidFractionModels)/GaussVoidFraction/GaussVoidFraction.C
 $(voidFractionModels)/IBVoidFraction/IBVoidFraction.C
+$(voidFractionModels)/weightedNeigbhorsVoidFraction/weightedNeigbhorsVoidFraction.C

 $(locateModels)/locateModel/locateModel.C
 $(locateModels)/locateModel/newLocateModel.C
@ -73,21 +92,18 @@ $(locateModels)/turboEngineSearch/turboEngineSearch.C
 $(locateModels)/turboEngineSearchM2M/turboEngineSearchM2M.C
 $(locateModels)/engineSearchIB/engineSearchIB.C

-
 $(meshMotionModels)/meshMotionModel/meshMotionModel.C
 $(meshMotionModels)/meshMotionModel/newMeshMotionModel.C
 $(meshMotionModels)/noMeshMotion/noMeshMotion.C
+$(meshMotionModels)/DEMdrivenMeshMotion/DEMdrivenMeshMotion.C

 $(momCoupleModels)/momCoupleModel/momCoupleModel.C
 $(momCoupleModels)/momCoupleModel/newMomCoupleModel.C
 $(momCoupleModels)/explicitCouple/explicitCouple.C
+$(momCoupleModels)/explicitCoupleSource/explicitCoupleSource.C
 $(momCoupleModels)/implicitCouple/implicitCouple.C
 $(momCoupleModels)/noCouple/noCouple.C

-$(regionModels)/regionModel/regionModel.C
-$(regionModels)/regionModel/newRegionModel.C
-$(regionModels)/allRegion/allRegion.C
-
 $(dataExchangeModels)/dataExchangeModel/dataExchangeModel.C
 $(dataExchangeModels)/dataExchangeModel/newDataExchangeModel.C
 $(dataExchangeModels)/oneWayVTK/oneWayVTK.C
@ -100,6 +116,7 @@ $(averagingModels)/averagingModel/averagingModel.C
 $(averagingModels)/averagingModel/newAveragingModel.C
 $(averagingModels)/dilute/dilute.C
 $(averagingModels)/dense/dense.C
+$(averagingModels)/denseBiDi/denseBiDi.C

 $(clockModels)/clockModel/clockModel.C
 $(clockModels)/clockModel/newClockModel.C
@ -117,5 +134,6 @@ $(smoothingModels)/smoothingModel/smoothingModel.C
 $(smoothingModels)/smoothingModel/newSmoothingModel.C
 $(smoothingModels)/noSmoothing/noSmoothing.C
 $(smoothingModels)/constDiffSmoothing/constDiffSmoothing.C
+$(smoothingModels)/localPSizeDiffSmoothing/localPSizeDiffSmoothing.C

-LIB = $(FOAM_USER_LIBBIN)/lib$(CFDEM_LIB_NAME)
+LIB = $(CFDEM_LIB_DIR)/lib$(CFDEM_LIB_NAME)
--- a/src/lagrangian/cfdemParticle/Make/options
+++ b/src/lagrangian/cfdemParticle/Make/options
@ -14,6 +14,7 @@ EXE_INC = \
    -I$(LIB_SRC)/OpenFOAM/containers/HashTables/labelHashSet \
    -I$(CFDEM_LIGGGHTS_SRC_DIR) \
    -I$(CFDEM_M2MLIB_PATH) \
+    -I$(CFDEM_SRC_DIR)/cfdTools \

 LIB_LIBS = \
     $(PLIBS) \
--- a/src/lagrangian/cfdemParticle/cfdTools/setupProbeModel.H
+++ b/src/lagrangian/cfdemParticle/cfdTools/setupProbeModel.H
@ -0,0 +1,3 @@
+ //set probeModel parameters for this force model
+ particleCloud_.probeM().setOutputFile();
+ particleCloud_.probeM().setCounter();
--- a/src/lagrangian/cfdemParticle/cfdTools/setupProbeModelfields.H
+++ b/src/lagrangian/cfdemParticle/cfdTools/setupProbeModelfields.H
@ -0,0 +1,4 @@
+Field<vector> vValues;
+vValues.clear();
+Field<scalar> sValues;
+sValues.clear();
--- a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H
+++ b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H
@ -1,6 +1,6 @@
-word CFDEMversion="cfdem-2.5.7";
-word compatibleLIGGGHTSversion="2.3.7";
-word OFversion="2.1.x";
+word CFDEMversion="cfdem-2.6.0";
+word compatibleLIGGGHTSversion="3.0.0";
+word OFversion="2.2.x - commit 7c405a31b2f7299f5e2669fa18fb251ea219dd03";

 Info << "\nCFDEMcoupling version: " << CFDEMversion << "\n" <<  endl;
 Info << "\n, compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << "\n" <<  endl;
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
@ -452,7 +452,8 @@ bool Foam::cfdemCloud::evolve

            // reset vol Fields
            clockM().start(16,"resetVolFields");
-            if(verbose_){
+            if(verbose_)
+            {
                Info << "couplingStep:" << dataExchangeM().couplingStep() 
                     << "\n- resetVolFields()" << endl;
            }
@ -530,19 +531,42 @@ bool Foam::cfdemCloud::evolve
        // update smoothing model
        smoothingM().dSmoothing();

-        // update voidFractionField
-        alpha.oldTime().internalField() = voidFractionM().voidFractionInterp();
+        //============================================
+        // update voidFractionField V1
+        alpha = voidFractionM().voidFractionInterp();
        smoothingM().smoothen(alpha);
+        if(dataExchangeM().couplingStep() < 2)
+        {
+            alpha.oldTime() = alpha; // supress volume src
+            alpha.oldTime().correctBoundaryConditions();
+        }
        alpha.correctBoundaryConditions();

        // calc ddt(voidfraction)
-        if (doCouple) calcDdtVoidfraction(voidFractionM().voidFractionNext());
+        //calcDdtVoidfraction(voidFractionM().voidFractionNext());
+        calcDdtVoidfraction(alpha);
+
+        // update particle velocity Field
+        Us = averagingM().UsInterp();
+        //smoothingM().smoothenReferenceField(Us);
+        Us.correctBoundaryConditions();
+        /*//============================================
+        // update voidFractionField
+        volScalarField oldAlpha = alpha.oldTime(); //save old (smooth) alpha field
+        alpha.oldTime().internalField() = voidFractionM().voidFractionInterp();
+        smoothingM().smoothen(alpha);
+        alpha.correctBoundaryConditions();
+        alpha.oldTime() = oldAlpha; //set old (smooth) alpha field to allow correct computation of ddt
+
+        // calc ddt(voidfraction)
+        if (doCouple) calcDdtVoidfraction(alpha);
        //calcDdtVoidfraction(alpha); // alternative with scale=1! (does not see change in alpha?)

        // update particle velocity Field
        Us.oldTime().internalField() = averagingM().UsInterp();
        smoothingM().smoothenReferenceField(Us);
        Us.correctBoundaryConditions();
+        //============================================*/
        clockM().stop("interpolateEulerFields");

        if(verbose_){
@ -592,7 +616,7 @@ tmp<fvVectorMatrix> cfdemCloud::divVoidfractionTau(volVectorField& U,volScalarFi

 tmp<volScalarField> cfdemCloud::ddtVoidfraction() const
 {
-    if (dataExchangeM().couplingStep() <= 2 || !useDDTvoidfraction_)
+    if (!useDDTvoidfraction_)
    {
        Info << "suppressing ddt(voidfraction)" << endl;
        return tmp<volScalarField> (ddtVoidfraction_ * 0.);
@ -602,11 +626,21 @@ tmp<volScalarField> cfdemCloud::ddtVoidfraction() const

 void cfdemCloud::calcDdtVoidfraction(volScalarField& voidfraction) const
 {
-    Info << "calculating ddt(voidfraction) based on couplingTime" << endl;
-    scalar scale=mesh().time().deltaT().value()/dataExchangeM().couplingTime();
-    ddtVoidfraction_ = fvc::ddt(voidfraction) * scale;
+    // version if ddt is calculated only at coupling time
+    //Info << "calculating ddt(voidfraction) based on couplingTime" << endl;
+    //scalar scale=mesh().time().deltaT().value()/dataExchangeM().couplingTime();
+    //ddtVoidfraction_ = fvc::ddt(voidfraction) * scale;
+
+    ddtVoidfraction_ = fvc::ddt(voidfraction);
 }

+/*tmp<fvVectorMatrix> cfdemCloud::ddtVoidfractionU(volVectorField& U,volScalarField& voidfraction) const
+{
+    if (dataExchangeM().couplingStep() <= 2) return fvm::ddt(U);
+    
+    return fvm::ddt(voidfraction,U);
+}*/
+
 tmp<volScalarField> cfdemCloud::voidfractionNuEff(volScalarField& voidfraction) const
 {
    if (modelType_=="A")
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
@ -342,6 +342,8 @@ public:

        void calcDdtVoidfraction(volScalarField& voidfraction) const;

+        //tmp<fvVectorMatrix> ddtVoidfractionU(volVectorField& ,volScalarField&) const;
+
        tmp<volScalarField> voidfractionNuEff(volScalarField&) const;

        void resetArray(double**&,int,int,double resetVal=0.);
--- a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C
+++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C
@ -53,7 +53,9 @@ cfdemCloudIB::cfdemCloudIB
 )
 :
    cfdemCloud(mesh),
-    angularVelocities_(NULL)
+    angularVelocities_(NULL),
+    pRefCell_(readLabel(mesh.solutionDict().subDict("PISO").lookup("pRefCell"))),
+    pRefValue_(readScalar(mesh.solutionDict().subDict("PISO").lookup("pRefValue")))
 {}


@ -146,6 +148,7 @@ void Foam::cfdemCloudIB::calcVelocityCorrection
    vector rVec(0,0,0);
    vector velRot(0,0,0);
    vector angVel(0,0,0);
+
    for(int index=0; index< numberOfParticles(); index++)
    {
        //if(regionM().inRegion()[index][0])
@ -170,8 +173,17 @@ void Foam::cfdemCloudIB::calcVelocityCorrection
        //}
    }

-    // make field divergence free
-    solve(fvm::laplacian(phiIB) == fvc::div(U) + fvc::ddt(voidfraction));
+    // make field divergence free - set reference value in case it is needed
+    fvScalarMatrix phiIBEqn
+    (
+        fvm::laplacian(phiIB) == fvc::div(U) + fvc::ddt(voidfraction)
+    );
+     if(phiIB.needReference()) 
+     {
+         phiIBEqn.setReference(pRefCell_, pRefValue_);
+     }
+    
+    phiIBEqn.solve();

    U=U-fvc::grad(phiIB);
    U.correctBoundaryConditions();
--- a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.H
+++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.H
@ -59,6 +59,8 @@ class cfdemCloudIB
 protected:

    mutable double **angularVelocities_;
+    label pRefCell_;
+    scalar pRefValue_;

 public:

--- a/src/lagrangian/cfdemParticle/derived/cfdemCloudMS/cfdemCloudMS.C
+++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudMS/cfdemCloudMS.C
@ -144,13 +144,14 @@ void cfdemCloudMS::getDEMdata()

 void Foam::cfdemCloudMS::giveDEMdata()
 {
-    for(int index = 0;index < numberOfClumps(); ++index)
+    /*for(int index = 0;index < numberOfClumps(); ++index)
    {
        for(int i=0;i<3;i++){
            impForcesCM()[index][i] += expForcesCM()[index][i] + DEMForcesCM()[index][i];
        }
    }
-    if(forceM(0).coupleForce()) dataExchangeM().giveData("dragforce","vector-multisphere",impForcesCM());
+    if(forceM(0).coupleForce()) dataExchangeM().giveData("dragforce","vector-multisphere",impForcesCM());*/
+    if(forceM(0).coupleForce()) dataExchangeM().giveData("dragforce_cm","vector-multisphere",DEMForcesCM());
    if(verbose_) Info << "giveDEMdata done." << endl;
 }

--- a/src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H
+++ b/src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H
@ -6,6 +6,8 @@
 // choose comp/incomp
 //#define comp   // if comp is on - you must use Make/options_comp!

+//define multi sphere
+#define multisphere

 // features of 2.1 work also in 2.2
 #if defined(version22)
--- a/src/lagrangian/cfdemParticle/etc/bashrc
+++ b/src/lagrangian/cfdemParticle/etc/bashrc
@ -24,7 +24,7 @@
 #export CFDEM_UT_DIR=$CFDEM_PROJECT_DIR/applications/utilities
 #export CFDEM_TUT_DIR=$CFDEM_PROJECT_DIR/tutorials
 #export CFDEM_PROJECT_USER_DIR=$HOME/CFDEM/$LOGNAME-$CFDEM_VERSION-$WM_PROJECT_VERSION
-#export CFDEM_bashrc=$CFDEM_SRC_DIR/etc/bashrc
+#export CFDEM_bashrc=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/bashrc
 #export CFDEM_LIGGGHTS_SRC_DIR=$HOME/LIGGGHTS/LIGGGHTS-PUBLIC/src
 #export CFDEM_LIGGGHTS_MAKEFILE_NAME=fedora_fpic
 #export CFDEM_LPP_DIR=$HOME/LIGGGHTS/mylpp/src
@ -44,7 +44,7 @@ export CFDEM_LIGGGHTS_LIB_NAME=lmp_$CFDEM_LIGGGHTS_MAKEFILE_NAME
 export CFDEM_LIB_NAME=lagrangianCFDEM-$CFDEM_VERSION-$WM_PROJECT_VERSION

 #- LMP M2M lib path
-export CFDEM_M2MLIB_PATH=$CFDEM_SRC_DIR/subModels/dataExchangeModel/twoWayM2M/library
+export CFDEM_M2MLIB_PATH=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library

 #- path to test harness
 export CFDEM_TEST_HARNESS_PATH=$CFDEM_PROJECT_USER_DIR/log/logFilesCFDEM-$CFDEM_VERSION-$WM_PROJECT_VERSION
@ -56,7 +56,7 @@ export CFDEM_LIB_DIR=$FOAM_USER_LIBBIN
 export CFDEM_APP_DIR=$FOAM_USER_APPBIN

 #- path to OF version flag file
-export CFDEM_OFVERSION_DIR=$CFDEM_SRC_DIR/etc/OFversion
+export CFDEM_OFVERSION_DIR=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/OFversion
 #------------------------------------------------------------------------------
 #- settings for lpp postproc tool
 #------------------------------------------------------------------------------
@ -101,37 +101,40 @@ alias cfdemDox='firefox $CFDEM_DOC_DIR/doxygen/html/index.html'
 alias cfdemLIG='cd $CFDEM_LIGGGHTS_SRC_DIR'

 #- shortcut to system test
-alias cfdemSysTest='bash $CFDEM_SRC_DIR/etc/cfdemSystemTest.sh'
+alias cfdemSysTest='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh'

 #- shortcut to pull LIGGGHTS
-alias cfdemPullLIG='bash $CFDEM_SRC_DIR/etc/pullLIGGGHTS.sh'
+alias cfdemPullLIG='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/pullLIGGGHTS.sh'
+
+#- shortcut to pull CFDEMcoupling
+alias cfdemPullCFDEMcoupling='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/pullCFDEMcoupling.sh'

 #- shortcut to clean CFDEM
-alias cfdemCleanCFDEM='bash $CFDEM_SRC_DIR/etc/cleanCFDEMcoupling.sh'
+alias cfdemCleanCFDEM='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/cleanCFDEMcoupling.sh'

 #- shortcut to compile LIGGGHTS
-alias cfdemCompLIG='bash $CFDEM_SRC_DIR/etc/compileLIGGGHTS.sh'
+alias cfdemCompLIG='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileLIGGGHTS.sh'

 #- shortcut to compile CFDEMcoupling +LIGGGHTS
-alias cfdemCompCFDEMall='bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_all.sh'
+alias cfdemCompCFDEMall='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_all.sh'

 #- shortcut to compile CFDEMcoupling (src+solvers)
-alias cfdemCompCFDEM='bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling.sh'
+alias cfdemCompCFDEM='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling.sh'

 #- shortcut to compile CFDEMcoupling src
-alias cfdemCompCFDEMsrc='bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_src.sh'
+alias cfdemCompCFDEMsrc='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh'

 #- shortcut to compile CFDEMcoupling solvers
-alias cfdemCompCFDEMsol='bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_sol.sh'
+alias cfdemCompCFDEMsol='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh'

 #- shortcut to compile CFDEMcoupling utilities
-alias cfdemCompCFDEMuti='bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_uti.sh'
+alias cfdemCompCFDEMuti='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh'

 #- shortcut to compile couple library
-alias cfdemCompM2M='bash $CFDEM_SRC_DIR/etc/compileM2Mlib.sh'
+alias cfdemCompM2M='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileM2Mlib.sh'

 #- shortcut to test basic tutorials
-alias cfdemTestTUT='bash $CFDEM_SRC_DIR/etc/testTutorials.sh'
+alias cfdemTestTUT='bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/testTutorials.sh'

 #- recursive touch of current directory
 alias touchRec='find ./* -exec touch {} \;'
--- a/src/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh
+++ b/src/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh
@ -6,7 +6,7 @@
 #===================================================================#

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 #- show gcc settings
 checkGPP="true"
@ -18,6 +18,7 @@ echo "*******************"

 echo "CFDEM_VERSION=$CFDEM_VERSION"
 echo "couple to OF_VERSION=$WM_PROJECT_VERSION"
+echo "compile option=$WM_COMPILE_OPTION"

 echo
 echo "check if paths are set correctly"
--- a/src/lagrangian/cfdemParticle/etc/cleanCFDEMcoupling.sh
+++ b/src/lagrangian/cfdemParticle/etc/cleanCFDEMcoupling.sh
@ -6,7 +6,7 @@
 #===================================================================#

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 #================================================================================#
 # clean src remove object files
--- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling.sh
+++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling.sh
@ -6,26 +6,26 @@
 #===================================================================#

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 NOW="$(date +"%Y-%m-%d-%H:%M")"
 logDir="log"


-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir

 #================================================================================#
 # compile src
 #================================================================================#
-bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_src.sh
+bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh

 #================================================================================#
 # compile solvers
 #================================================================================#
-bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_sol.sh
+bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh

 #================================================================================#
 # compile utilities
 #================================================================================#
-bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_uti.sh
+bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh
--- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_all.sh
+++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_all.sh
@ -6,21 +6,21 @@
 #===================================================================#

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 NOW="$(date +"%Y-%m-%d-%H:%M")"
 logDir="log"


-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir

 #================================================================================#
 # compile LIGGGHTS
 #================================================================================#
-bash $CFDEM_SRC_DIR/etc/compileLIGGGHTS.sh
+bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileLIGGGHTS.sh

 #================================================================================#
 # compile CFDEMcoupling
 #================================================================================#
-bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling.sh
+bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling.sh
--- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh
+++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh
@ -8,9 +8,9 @@
 whitelist="solver-list.txt"

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
 logDir="log"
-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir

 CWD="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
@ -19,13 +19,13 @@ NOW="$(date +"%Y-%m-%d-%H:%M")"
 echo ""
 echo "This routine will compile the solvers specified in solver-list.txt"
 echo ""
-echo "Are the variables CFDEM_SOLVER_DIR=$CFDEM_SOLVER_DIR"
-echo "and CFDEM_SRC_DIR=$CFDEM_SRC_DIR correct? (y/n)"
-read YN
-if [ "$YN" != "y" ];then
-  	echo "Aborted by user."
-  	exit 1
-fi
+#echo "Are the variables CFDEM_SOLVER_DIR=$CFDEM_SOLVER_DIR"
+#echo "and CFDEM_SRC_DIR=$CFDEM_SRC_DIR/lagrangian/cfdemParticle correct? (y/n)"
+#read YN
+#if [ "$YN" != "y" ];then
+#  	echo "Aborted by user."
+#  	exit 1
+#fi

 echo ""
 echo "Please provide the solvers to be compiled in the $CWD/$whitelist file."
--- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh
+++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh
@ -3,28 +3,63 @@
 #===================================================================#
 # compile routine for CFDEMcoupling source, part of CFDEMproject 
 # Christoph Goniva - May. 2012, DCS Computing GmbH
+# update: Stefan Radl (TU Graz, Jan 2014)
 #===================================================================#
 
 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 NOW="$(date +"%Y-%m-%d-%H:%M")"
 logDir="log"


-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir


 #================================================================================#
 # compile src
 #================================================================================#
+    whitelist="$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/library-list.txt"
+    echo ""
+    echo "Please provide the libraries to be compiled in the $CWD/$whitelist file."
+
+    if [ ! -f "$CWD/$whitelist" ];then
+        echo "$whitelist does not exist in $CWD. Nothing will be done."
+        NLINES=0
+        COUNT=0
+    else
+        NLINES=`wc -l < $CWD/$whitelist`
+        COUNT=0
+    fi
+
+    while [ $COUNT -lt $NLINES ]
+    do
+            let COUNT++  
+            LINE=`head -n $COUNT $CWD/$whitelist | tail -1`
+  
+            # white lines
+            if [[ "$LINE" == "" ]]; then
+                echo "compile $LINE"
+                continue
+            # comments
+            elif [[ "$LINE" == \#* ]]; then
+                continue
+             # paths
+            elif [[ "$LINE" == */dir ]]; then
+                echo "will change path..."
+                LINE=$(echo "${LINE%????}")
+                path="$CFDEM_SRC_DIR/$LINE"
+                cd $path
+                #continue
+            fi
+            #--------------------------------------------------------------------------------#
+            #- define variables
+            logpath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")/$logDir"
+            logfileName="log_compileCFDEMcoupling_"$(basename $LINE)""
+            casePath="$path"
+            headerText="$logfileName""-$NOW"
+            #--------------------------------------------------------------------------------#
+            compileLib $logpath $logfileName $casePath $headerText
+    done

-#--------------------------------------------------------------------------------#
-#- define variables
-logpath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")/$logDir"
-logfileName="log_compileCFDEMcoupling_src" #alternative: logfileName="log_compileLIGGGHTS_$NOW"
-casePath="$CFDEM_SRC_DIR"
-headerText="$logfileName""-$NOW"
-#--------------------------------------------------------------------------------#
-compileLib $logpath $logfileName $casePath $headerText
--- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh
+++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh
@ -6,13 +6,13 @@
 #===================================================================#

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 NOW="$(date +"%Y-%m-%d-%H:%M")"
 logDir="log"


-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir

 #================================================================================#
--- a/src/lagrangian/cfdemParticle/etc/compileLIGGGHTS.sh
+++ b/src/lagrangian/cfdemParticle/etc/compileLIGGGHTS.sh
@ -6,12 +6,12 @@
 #===================================================================

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 NOW="$(date +"%Y-%m-%d-%H:%M")"
 logDir="log"

-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir

 #--------------------------------------------------------------------------------#
--- a/src/lagrangian/cfdemParticle/etc/compileM2Mlib.sh
+++ b/src/lagrangian/cfdemParticle/etc/compileM2Mlib.sh
@ -6,12 +6,12 @@
 #===================================================================

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 NOW="$(date +"%Y-%m-%d-%H:%M")"
 logDir="log"

-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir

 #--------------------------------------------------------------------------------#
--- a/src/lagrangian/cfdemParticle/etc/controlDict_cgs_2.2.x
+++ b/src/lagrangian/cfdemParticle/etc/controlDict_cgs_2.2.x
--- a/src/lagrangian/cfdemParticle/etc/cshrc
+++ b/src/lagrangian/cfdemParticle/etc/cshrc
@ -24,7 +24,7 @@
 #setenv CFDEM_UT_DIR $CFDEM_PROJECT_DIR/applications/utilities
 #setenv CFDEM_TUT_DIR $CFDEM_PROJECT_DIR/tutorials
 #setenv CFDEM_PROJECT_USER_DIR $HOME/CFDEM/$LOGNAME-$CFDEM_VERSION-$WM_PROJECT_VERSION
-#setenv CFDEM_bashrc $CFDEM_SRC_DIR/etc/cshrc
+#setenv CFDEM_bashrc $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/cshrc
 #setenv CFDEM_LIGGGHTS_SRC_DIR $HOME/LIGGGHTS/LIGGGHTS-PUBLIC/src
 #setenv CFDEM_LIGGGHTS_MAKEFILE_NAME fedora_fpic
 #setenv CFDEM_LPP_DIR $HOME/LIGGGHTS/mylpp/src
@ -44,7 +44,7 @@ setenv CFDEM_LIGGGHTS_LIB_NAME lmp_$CFDEM_LIGGGHTS_MAKEFILE_NAME
 setenv CFDEM_LIB_NAME lagrangianCFDEM-$CFDEM_VERSION-$WM_PROJECT_VERSION

 #- LMP M2M lib path
-setenv CFDEM_M2MLIB_PATH $CFDEM_SRC_DIR/subModels/dataExchangeModel/twoWayM2M/library
+setenv CFDEM_M2MLIB_PATH $CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library

 #- path to test harness
 setenv CFDEM_TEST_HARNESS_PATH $CFDEM_PROJECT_USER_DIR/log/logFilesCFDEM-$CFDEM_VERSION-$WM_PROJECT_VERSION
@ -99,37 +99,40 @@ alias cfdemDox 'firefox $CFDEM_DOC_DIR/doxygen/html/index.html'
 alias cfdemLIG 'cd $CFDEM_LIGGGHTS_SRC_DIR'

 #- shortcut to system test
-alias cfdemSysTest 'bash $CFDEM_SRC_DIR/etc/cfdemSystemTest.sh'
+alias cfdemSysTest 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh'

 #- shortcut to pull LIGGGHTS
-alias cfdemPullLIG 'bash $CFDEM_SRC_DIR/etc/pullLIGGGHTS.sh'
+alias cfdemPullLIG 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/pullLIGGGHTS.sh'
+
+#- shortcut to pull CFDEMcoupling
+alias cfdemPullCFDEMcoupling 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/pullCFDEMcoupling.sh'

 #- shortcut to clean CFDEM
-alias cfdemCleanCFDEM 'bash $CFDEM_SRC_DIR/etc/cleanCFDEMcoupling.sh'
+alias cfdemCleanCFDEM 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/cleanCFDEMcoupling.sh'

 #- shortcut to compile LIGGGHTS
-alias cfdemCompLIG 'bash $CFDEM_SRC_DIR/etc/compileLIGGGHTS.sh'
+alias cfdemCompLIG 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileLIGGGHTS.sh'

 #- shortcut to compile CFDEMcoupling +LIGGGHTS
-alias cfdemCompCFDEMall 'bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_all.sh'
+alias cfdemCompCFDEMall 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_all.sh'

 #- shortcut to compile CFDEMcoupling (src+solvers)
-alias cfdemCompCFDEM 'bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling.sh'
+alias cfdemCompCFDEM 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling.sh'

 #- shortcut to compile CFDEMcoupling src
-alias cfdemCompCFDEMsrc 'bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_src.sh'
+alias cfdemCompCFDEMsrc 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh'

 #- shortcut to compile CFDEMcoupling solvers
-alias cfdemCompCFDEMsol 'bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_sol.sh'
+alias cfdemCompCFDEMsol 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh'

 #- shortcut to compile CFDEMcoupling utilities
-alias cfdemCompCFDEMuti 'bash $CFDEM_SRC_DIR/etc/compileCFDEMcoupling_uti.sh'
+alias cfdemCompCFDEMuti 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh'

 #- shortcut to compile couple library
-alias cfdemCompM2M 'bash $CFDEM_SRC_DIR/etc/compileM2Mlib.sh'
+alias cfdemCompM2M 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileM2Mlib.sh'

 #- shortcut to test basic tutorials
-alias cfdemTestTUT 'bash $CFDEM_SRC_DIR/etc/testTutorials.sh'
+alias cfdemTestTUT 'bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/testTutorials.sh'

 #- shortcut to run liggghts in serial
 alias cfdemLiggghts '$CFDEM_LIGGGHTS_SRC_DIR/lmp_$CFDEM_LIGGGHTS_MAKEFILE_NAME'
--- a/src/lagrangian/cfdemParticle/etc/functions.sh
+++ b/src/lagrangian/cfdemParticle/etc/functions.sh
@ -27,7 +27,8 @@ pullRepo()

    #- header
    echo 2>&1 | tee -a $logpath/$logfileName
-    echo "//   $headerText   //" 2>&1 | tee -a $logpath/$logfileName
+    echo 2>&1 | tee -a $logpath/$logfileName
+    echo "//=== $headerText ===//" 2>&1 | tee -a $logpath/$logfileName
    echo 2>&1 | tee -a $logpath/$logfileName

    #- write path
@ -149,6 +150,8 @@ compileLIGGGHTS()
    echo 2>&1 | tee -a $logpath/$logfileName

    #- wclean and wmake
+    rm $CFDEM_LIGGGHTS_SRC_DIR/"lmp_"$CFDEM_LIGGGHTS_MAKEFILE_NAME
+    rm $CFDEM_LIGGGHTS_SRC_DIR/"lib"$CFDEM_LIGGGHTS_LIB_NAME".a"
    make clean-all 2>&1 | tee -a $logpath/$logfileName
    make $CFDEM_LIGGGHTS_MAKEFILE_NAME -j $WM_NCOMPPROCS  2>&1 | tee -a $logpath/$logfileName
    make makelib 2>&1 | tee -a $logpath/$logfileName
@ -206,32 +209,97 @@ cleanCFDEM()
    echo "if not, abort with ctrl-C"
    read

+    #**********************************************
+    #cleaning libraries
+    whitelist="$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/library-list.txt"
    echo ""
+    echo "Please provide the libraries to be cleaned in the $CWD/$whitelist file."
+
+    if [ ! -f "$CWD/$whitelist" ];then
+        echo "$whitelist does not exist in $CWD. Nothing will be done."
+        NLINES=0
+        COUNT=0
+    else
+        NLINES=`wc -l < $CWD/$whitelist`
+        COUNT=0
+    fi
+
+    while [ $COUNT -lt $NLINES ]
+    do
+            let COUNT++  
+            LINE=`head -n $COUNT $CWD/$whitelist | tail -1`
+  
+            # white lines
+            if [[ "$LINE" == "" ]]; then
+                continue
+            # comments
+            elif [[ "$LINE" == \#* ]]; then
+                continue
+             # paths
+            elif [[ "$LINE" == */dir ]]; then
+                echo "will change path..."
+                LINE=$(echo "${LINE%????}")
+                path="$CFDEM_PROJECT_DIR/src/$LINE"
+                cd $path
+                #continue
+            fi
+
+            cd  $path
+            echo "cleaning library $PWD"
+            rmdepall
+            wclean    
+            rm -r ./Make/linux*
+            rm -r ./lnInclude
+    done
+
+
+    #**********************************************
+    #cleaning utilities
    echo "removing object files in"
-    echo "   $CFDEM_SRC_DIR"
-    echo "   and"
    echo "   $CFDEM_UT_DIR"
    rm -r $CFDEM_UT_DIR/*/Make/linux*
    rm -r $CFDEM_UT_DIR/*/Make/linux*
    rm -r $CFDEM_UT_DIR/*/*.dep

-    rm -r $CFDEM_SRC_DIR/Make/linux*
-    rm -r $CFDEM_SRC_DIR/lnInclude

-    rm -r $CFDEM_SRC_DIR/../../finiteVolume/Make/linux*
-    rm -r $CFDEM_SRC_DIR/../../finiteVolume/lnInclude

+    #**********************************************
+    #cleaning solvers
+    whitelist="$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/solver-list.txt"
    echo ""
-    echo "cleaning $CFDEM_SRC_DIR"
-    cd $CFDEM_SRC_DIR
-    rmdepall
-    wclean
+    echo "Please provide the solvers to be cleaned in the $CWD/$whitelist file."

-    for solver in  "cfdemSolverIB" "cfdemSolverPiso" "cfdemSolverPisoScalar"
+    if [ ! -f "$CWD/$whitelist" ];then
+        echo "$whitelist does not exist in $CWD. Nothing will be done."
+        NLINES=0
+        COUNT=0
+    else
+        NLINES=`wc -l < $CWD/$whitelist`
+        COUNT=0
+    fi
+
+    while [ $COUNT -lt $NLINES ]
    do
-        echo ""
-        echo "cleaning $CFDEM_SOLVER_DIRapplications/$solver"
-        cd $CFDEM_SOLVER_DIR/$solver
+            let COUNT++  
+            LINE=`head -n $COUNT $CWD/$whitelist | tail -1`
+  
+            # white lines
+            if [[ "$LINE" == "" ]]; then
+                continue
+            # comments
+            elif [[ "$LINE" == \#* ]]; then
+                continue
+             # paths
+            elif [[ "$LINE" == */dir ]]; then
+                echo "will change path..."
+                LINE=$(echo "${LINE%????}")
+                path="$CFDEM_SOLVER_DIR/$LINE"
+                cd $path
+                #continue
+            fi
+
+            cd  $path            
+            echo "cleaning solver $PWD"
            rmdepall
            wclean    
    done
--- a/src/lagrangian/cfdemParticle/etc/library-list.txt
+++ b/src/lagrangian/cfdemParticle/etc/library-list.txt
@ -0,0 +1,3 @@
+cylPorousMedia/dir
+finiteVolume/dir
+lagrangian/cfdemParticle/dir
--- a/src/lagrangian/cfdemParticle/etc/pullLIGGGHTS.sh
+++ b/src/lagrangian/cfdemParticle/etc/pullLIGGGHTS.sh
@ -6,12 +6,12 @@
 #===================================================================

 #- include functions
-source $CFDEM_SRC_DIR/etc/functions.sh
+source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh

 NOW="$(date +"%Y-%m-%d-%H:%M")"
 logDir="log"

-cd $CFDEM_SRC_DIR/etc
+cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc
 mkdir -p $logDir

 #--------------------------------------------------------------------------------#
--- a/src/lagrangian/cfdemParticle/etc/solver-list.txt
+++ b/src/lagrangian/cfdemParticle/etc/solver-list.txt
@ -1,5 +1,7 @@
+cfdemSolverInterDyM/dir
 cfdemSolverPimple/dir
 cfdemSolverPisoMS/dir
 cfdemSolverPiso/dir
 cfdemSolverIB/dir
 cfdemSolverPisoScalar/dir
+cfdemSolverPimpleDyM_22x/dir
--- a/src/lagrangian/cfdemParticle/etc/tutorial-list.txt
+++ b/src/lagrangian/cfdemParticle/etc/tutorial-list.txt
@ -17,3 +17,21 @@ cfdemSolverPiso/ErgunTestMPI_restart/dir
 cfdemSolverIB/twoSpheresGlowinskiMPI/dir

 cfdemSolverPisoScalar/packedBedTemp/dir
+
+#===================================================================#
+# not in release:
+
+#cfdemSolverPiso/settlingTestBigParticleMPI/dir
+#cfdemSolverPiso/ErgunTestCG/dir
+#cfdemSolverPiso/ErgunTestM2M/dir
+#cfdemSolverPiso/HopperEmptying/dir
+
+#cfdemSolverPisoMS/settlingTestMPI/dir
+#cfdemSolverPisoMS/ErgunTestMPI/dir
+
+#cfdemSolverPimple/ErgunTestMPI/dir
+
+#cfdemSolverInterDyM/twoPhaseSettlingTest/dir
+#cfdemSolverInterDyM/ErgunTestMPI/dir
+#cfdemSolverInterDyM/granularPiston/dir
+#cfdemSolverInterDyM/sugarNcoffee/dir
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
@ -210,10 +210,10 @@ public:
            }
        }

-        inline bool checkExactTiming() const
+        /*inline bool checkExactTiming() const
        {
-
-        }
+            return false;
+        }*/

        //void checkNClumpTypes() const {};

--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/error.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/error.d
@ -1,112 +1,31 @@
-error.o: error.cpp /usr/lib/openmpi/include/mpi.h \
+error.o: error.cpp \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
- /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/features.h /usr/include/bits/predefs.h \
- /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
- /usr/include/c++/4.6/bits/functexcept.h \
- /usr/include/c++/4.6/bits/exception_defines.h \
- /usr/include/c++/4.6/bits/cpp_type_traits.h \
- /usr/include/c++/4.6/ext/type_traits.h \
- /usr/include/c++/4.6/ext/numeric_traits.h \
- /usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
- /usr/include/c++/4.6/bits/concept_check.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_types.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/4.6/bits/stl_iterator.h \
- /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
- /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
- /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
- /usr/include/c++/4.6/backward/binders.h \
- /usr/include/c++/4.6/bits/stl_map.h \
- /usr/include/c++/4.6/initializer_list \
- /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ /usr/include/stdlib.h /usr/include/features.h \
+ /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/stdio.h \
 /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
- /usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
- /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/xlocale.h \
- /usr/include/bits/wchar2.h /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
- /usr/include/bits/sched.h /usr/include/bits/time.h /usr/include/signal.h \
- /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/include/string.h /usr/include/bits/string3.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
- /usr/include/stdlib.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/sys/types.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/sys/sysmacros.h /usr/include/alloca.h \
- /usr/include/bits/stdlib.h error.h
+ /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h error.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/error.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/error.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/files.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/files.d
@ -1,12 +1,17 @@
 files.o: files.cpp /usr/include/stdio.h /usr/include/features.h \
- /usr/include/bits/predefs.h /usr/include/sys/cdefs.h \
- /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
+ /usr/include/_G_config.h /usr/include/wchar.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string3.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h /usr/include/string.h \
+ /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string3.h \
 files.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/files.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/files.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/irregular.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/irregular.d
@ -1,112 +1,32 @@
 irregular.o: irregular.cpp /usr/include/stdio.h /usr/include/features.h \
- /usr/include/bits/predefs.h /usr/include/sys/cdefs.h \
- /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
+ /usr/include/_G_config.h /usr/include/wchar.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/stdlib.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
- /usr/include/xlocale.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/bits/sigset.h /usr/include/bits/time.h \
- /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
- /usr/include/alloca.h /usr/include/bits/stdlib.h /usr/include/string.h \
- /usr/include/bits/string3.h irregular.h /usr/lib/openmpi/include/mpi.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
- /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
- /usr/include/c++/4.6/bits/functexcept.h \
- /usr/include/c++/4.6/bits/exception_defines.h \
- /usr/include/c++/4.6/bits/cpp_type_traits.h \
- /usr/include/c++/4.6/ext/type_traits.h \
- /usr/include/c++/4.6/ext/numeric_traits.h \
- /usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
- /usr/include/c++/4.6/bits/concept_check.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_types.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/4.6/bits/stl_iterator.h \
- /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
- /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
- /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
- /usr/include/c++/4.6/backward/binders.h \
- /usr/include/c++/4.6/bits/stl_map.h \
- /usr/include/c++/4.6/initializer_list \
- /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h /usr/include/c++/4.6/iostream \
- /usr/include/c++/4.6/ostream /usr/include/c++/4.6/ios \
- /usr/include/c++/4.6/iosfwd /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/bits/wchar2.h \
- /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \
- /usr/include/signal.h /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h memory.h \
- error.h
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h /usr/include/stdlib.h \
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/string.h \
+ /usr/include/x86_64-linux-gnu/bits/string3.h irregular.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ memory.h error.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/irregular.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/irregular.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/lammps_data_write.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/lammps_data_write.d
@ -1,114 +1,32 @@
 lammps_data_write.o: lammps_data_write.cpp /usr/include/stdlib.h \
- /usr/include/features.h /usr/include/bits/predefs.h \
- /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/xlocale.h \
- /usr/include/sys/types.h /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h /usr/include/time.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/bits/sigset.h /usr/include/bits/time.h \
- /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
- /usr/include/alloca.h /usr/include/bits/stdlib.h /usr/include/string.h \
- /usr/include/bits/string3.h lammps_data_write.h send2one.h \
- /usr/lib/openmpi/include/mpi.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
- /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
- /usr/include/c++/4.6/bits/functexcept.h \
- /usr/include/c++/4.6/bits/exception_defines.h \
- /usr/include/c++/4.6/bits/cpp_type_traits.h \
- /usr/include/c++/4.6/ext/type_traits.h \
- /usr/include/c++/4.6/ext/numeric_traits.h \
- /usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
- /usr/include/c++/4.6/bits/concept_check.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_types.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/4.6/bits/stl_iterator.h \
- /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
- /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
- /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
- /usr/include/c++/4.6/backward/binders.h \
- /usr/include/c++/4.6/bits/stl_map.h \
- /usr/include/c++/4.6/initializer_list \
- /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
- /usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
- /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/bits/wchar2.h \
- /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \
- /usr/include/signal.h /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h memory.h \
- error.h
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/string.h \
+ /usr/include/x86_64-linux-gnu/bits/string3.h lammps_data_write.h \
+ send2one.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/wchar.h /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h memory.h error.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/lammps_data_write.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/lammps_data_write.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/libcouple.a
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/libcouple.a
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2many.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2many.d
@ -1,14 +1,27 @@
-many2many.o: many2many.cpp /usr/lib/openmpi/include/mpi.h \
+many2many.o: many2many.cpp \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ /usr/include/stdio.h /usr/include/features.h \
+ /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
+ /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h many2many.h irregular.h \
+ memory.h error.h /usr/include/c++/4.6/map \
+ /usr/include/c++/4.6/bits/stl_tree.h \
 /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/features.h /usr/include/bits/predefs.h \
- /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
 /usr/include/c++/4.6/bits/functexcept.h \
 /usr/include/c++/4.6/bits/exception_defines.h \
 /usr/include/c++/4.6/bits/cpp_type_traits.h \
@ -20,89 +33,11 @@ many2many.o: many2many.cpp /usr/lib/openmpi/include/mpi.h \
 /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
 /usr/include/c++/4.6/bits/stl_iterator.h \
 /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
 /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
 /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
 /usr/include/c++/4.6/backward/binders.h \
 /usr/include/c++/4.6/bits/stl_map.h \
 /usr/include/c++/4.6/initializer_list \
 /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
- /usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
- /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/xlocale.h \
- /usr/include/bits/wchar2.h /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
- /usr/include/bits/sched.h /usr/include/bits/time.h /usr/include/signal.h \
- /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/include/string.h /usr/include/bits/string3.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h many2many.h \
- irregular.h memory.h error.h
+ /usr/include/c++/4.6/bits/range_access.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2many.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2many.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2one.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2one.d
@ -1,112 +1,31 @@
-many2one.o: many2one.cpp /usr/lib/openmpi/include/mpi.h \
+many2one.o: many2one.cpp \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
- /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/features.h /usr/include/bits/predefs.h \
- /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
- /usr/include/c++/4.6/bits/functexcept.h \
- /usr/include/c++/4.6/bits/exception_defines.h \
- /usr/include/c++/4.6/bits/cpp_type_traits.h \
- /usr/include/c++/4.6/ext/type_traits.h \
- /usr/include/c++/4.6/ext/numeric_traits.h \
- /usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
- /usr/include/c++/4.6/bits/concept_check.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_types.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/4.6/bits/stl_iterator.h \
- /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
- /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
- /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
- /usr/include/c++/4.6/backward/binders.h \
- /usr/include/c++/4.6/bits/stl_map.h \
- /usr/include/c++/4.6/initializer_list \
- /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
- /usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
- /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/xlocale.h \
- /usr/include/bits/wchar2.h /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
- /usr/include/bits/sched.h /usr/include/bits/time.h /usr/include/signal.h \
- /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/include/string.h /usr/include/bits/string3.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
- /usr/include/stdlib.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/sys/types.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/sys/sysmacros.h /usr/include/alloca.h \
- /usr/include/bits/stdlib.h many2one.h memory.h
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ /usr/include/stdio.h /usr/include/features.h \
+ /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
+ /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h /usr/include/stdlib.h \
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h many2one.h memory.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2one.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/many2one.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/memory.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/memory.d
@ -1,112 +1,31 @@
-memory.o: memory.cpp /usr/lib/openmpi/include/mpi.h \
+memory.o: memory.cpp \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
- /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/features.h /usr/include/bits/predefs.h \
- /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
- /usr/include/c++/4.6/bits/functexcept.h \
- /usr/include/c++/4.6/bits/exception_defines.h \
- /usr/include/c++/4.6/bits/cpp_type_traits.h \
- /usr/include/c++/4.6/ext/type_traits.h \
- /usr/include/c++/4.6/ext/numeric_traits.h \
- /usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
- /usr/include/c++/4.6/bits/concept_check.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_types.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/4.6/bits/stl_iterator.h \
- /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
- /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
- /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
- /usr/include/c++/4.6/backward/binders.h \
- /usr/include/c++/4.6/bits/stl_map.h \
- /usr/include/c++/4.6/initializer_list \
- /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ /usr/include/stdlib.h /usr/include/features.h \
+ /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/stdio.h \
 /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
- /usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
- /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/xlocale.h \
- /usr/include/bits/wchar2.h /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
- /usr/include/bits/sched.h /usr/include/bits/time.h /usr/include/signal.h \
- /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/include/string.h /usr/include/bits/string3.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
- /usr/include/stdlib.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/sys/types.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/sys/sysmacros.h /usr/include/alloca.h \
- /usr/include/bits/stdlib.h memory.h error.h
+ /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h memory.h error.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/memory.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/memory.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/one2many.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/one2many.d
@ -1,14 +1,17 @@
-one2many.o: one2many.cpp /usr/lib/openmpi/include/mpi.h \
+one2many.o: one2many.cpp \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ one2many.h /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
 /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/features.h /usr/include/bits/predefs.h \
- /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++config.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/os_defines.h \
+ /usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/cpu_defines.h \
 /usr/include/c++/4.6/bits/functexcept.h \
 /usr/include/c++/4.6/bits/exception_defines.h \
 /usr/include/c++/4.6/bits/cpp_type_traits.h \
@ -20,89 +23,11 @@ one2many.o: one2many.cpp /usr/lib/openmpi/include/mpi.h \
 /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
 /usr/include/c++/4.6/bits/stl_iterator.h \
 /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
+ /usr/include/c++/4.6/x86_64-linux-gnu/./bits/c++allocator.h \
 /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
 /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
 /usr/include/c++/4.6/backward/binders.h \
 /usr/include/c++/4.6/bits/stl_map.h \
 /usr/include/c++/4.6/initializer_list \
 /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
- /usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
- /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/xlocale.h \
- /usr/include/bits/wchar2.h /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
- /usr/include/bits/sched.h /usr/include/bits/time.h /usr/include/signal.h \
- /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/include/string.h /usr/include/bits/string3.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h one2many.h \
- memory.h
+ /usr/include/c++/4.6/bits/range_access.h memory.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/one2many.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/one2many.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/send2one.d
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/send2one.d
@ -1,112 +1,31 @@
-send2one.o: send2one.cpp /usr/lib/openmpi/include/mpi.h \
+send2one.o: send2one.cpp \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi.h \
 /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/mpicxx.h \
- /usr/include/c++/4.6/map /usr/include/c++/4.6/bits/stl_tree.h \
- /usr/include/c++/4.6/bits/stl_algobase.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++config.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/os_defines.h \
- /usr/include/features.h /usr/include/bits/predefs.h \
- /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/cpu_defines.h \
- /usr/include/c++/4.6/bits/functexcept.h \
- /usr/include/c++/4.6/bits/exception_defines.h \
- /usr/include/c++/4.6/bits/cpp_type_traits.h \
- /usr/include/c++/4.6/ext/type_traits.h \
- /usr/include/c++/4.6/ext/numeric_traits.h \
- /usr/include/c++/4.6/bits/stl_pair.h /usr/include/c++/4.6/bits/move.h \
- /usr/include/c++/4.6/bits/concept_check.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_types.h \
- /usr/include/c++/4.6/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/4.6/bits/stl_iterator.h \
- /usr/include/c++/4.6/debug/debug.h /usr/include/c++/4.6/bits/allocator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++allocator.h \
- /usr/include/c++/4.6/ext/new_allocator.h /usr/include/c++/4.6/new \
- /usr/include/c++/4.6/exception /usr/include/c++/4.6/bits/stl_function.h \
- /usr/include/c++/4.6/backward/binders.h \
- /usr/include/c++/4.6/bits/stl_map.h \
- /usr/include/c++/4.6/initializer_list \
- /usr/include/c++/4.6/bits/stl_multimap.h \
- /usr/include/c++/4.6/bits/range_access.h /usr/include/c++/4.6/utility \
- /usr/include/c++/4.6/bits/stl_relops.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h /usr/include/stdio.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /home/goniva/OpenFOAM/ThirdParty-2.2.x/platforms/linux64Gcc/openmpi-1.6.3/include/mpi_portable_platform.h \
+ /usr/include/stdlib.h /usr/include/features.h \
+ /usr/include/x86_64-linux-gnu/bits/predefs.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/waitflags.h \
+ /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/endian.h \
+ /usr/include/x86_64-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
+ /usr/include/x86_64-linux-gnu/sys/types.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/time.h \
+ /usr/include/x86_64-linux-gnu/sys/select.h \
+ /usr/include/x86_64-linux-gnu/bits/select.h \
+ /usr/include/x86_64-linux-gnu/bits/sigset.h \
+ /usr/include/x86_64-linux-gnu/bits/time.h \
+ /usr/include/x86_64-linux-gnu/bits/select2.h \
+ /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
+ /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/x86_64-linux-gnu/bits/stdlib.h /usr/include/stdio.h \
 /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/include/c++/4.6/iostream /usr/include/c++/4.6/ostream \
- /usr/include/c++/4.6/ios /usr/include/c++/4.6/iosfwd \
- /usr/include/c++/4.6/bits/stringfwd.h \
- /usr/include/c++/4.6/bits/postypes.h /usr/include/c++/4.6/cwchar \
- /usr/include/bits/wchar.h /usr/include/xlocale.h \
- /usr/include/bits/wchar2.h /usr/include/c++/4.6/bits/char_traits.h \
- /usr/include/c++/4.6/bits/localefwd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/c++locale.h \
- /usr/include/c++/4.6/clocale /usr/include/locale.h \
- /usr/include/bits/locale.h /usr/include/c++/4.6/cctype \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/c++/4.6/bits/ios_base.h \
- /usr/include/c++/4.6/ext/atomicity.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/gthr-default.h \
- /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
- /usr/include/bits/sched.h /usr/include/bits/time.h /usr/include/signal.h \
- /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/setjmp.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/bits/unistd.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/atomic_word.h \
- /usr/include/c++/4.6/bits/locale_classes.h /usr/include/c++/4.6/string \
- /usr/include/c++/4.6/bits/ostream_insert.h \
- /usr/include/c++/4.6/bits/cxxabi_forced.h \
- /usr/include/c++/4.6/bits/basic_string.h \
- /usr/include/c++/4.6/bits/basic_string.tcc \
- /usr/include/c++/4.6/bits/locale_classes.tcc \
- /usr/include/c++/4.6/streambuf /usr/include/c++/4.6/bits/streambuf.tcc \
- /usr/include/c++/4.6/bits/basic_ios.h \
- /usr/include/c++/4.6/bits/locale_facets.h /usr/include/c++/4.6/cwctype \
- /usr/include/wctype.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_base.h \
- /usr/include/c++/4.6/bits/streambuf_iterator.h \
- /usr/include/c++/4.6/x86_64-linux-gnu/bits/ctype_inline.h \
- /usr/include/c++/4.6/bits/locale_facets.tcc \
- /usr/include/c++/4.6/bits/basic_ios.tcc \
- /usr/include/c++/4.6/bits/ostream.tcc /usr/include/c++/4.6/istream \
- /usr/include/c++/4.6/bits/istream.tcc \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/constants.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/exception.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/datatype_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/functions_inln.h \
- /usr/include/string.h /usr/include/bits/string3.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/request_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intracomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/intercomm_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/group_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/op_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/errhandler_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/status_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/info_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h \
- /usr/lib/openmpi/include/openmpi/ompi/mpi/cxx/file_inln.h \
- /usr/include/stdlib.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/sys/types.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/sys/sysmacros.h /usr/include/alloca.h \
- /usr/include/bits/stdlib.h send2one.h memory.h error.h
+ /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
+ /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio.h \
+ /usr/include/x86_64-linux-gnu/bits/stdio2.h send2one.h memory.h error.h
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/send2one.o
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library/send2one.o
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/twoWayM2M.C
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/twoWayM2M.C
@ -259,7 +259,7 @@ void twoWayM2M::giveData
        //}
        //==================
    }else{
-        Warning << "not implemented!"<<endl;
+        FatalError << "twoWayM2M::giveData requested type not implemented! \n"<< abort(FatalError);
    }
 }

@ -421,6 +421,9 @@ bool Foam::twoWayM2M::couple() const
        setCellIDs(nlocal_foam_,cellID_foam_);
        //free(cellID_foam_); // cannot free here?
        //free(pos_foam_); // cannot free here?
+
+        //MPI_Barrier(MPI_COMM_WORLD);
+        Info <<"Foam::twoWayM2M::couple() done." << endl;
    }
    return coupleNow;
 }
@ -451,16 +454,19 @@ void Foam::twoWayM2M::syncIDs() const

    // get data from lammps
    nlocal_lammps_ = *((int *) lammps_extract_global(lmp,"nlocal"));
+
    int*  id_lammpsSync=NULL;
    double** pos_lammpsSync=NULL;

    if(firstRun_ || particleLost_)
    {
        // get access to id array
+        id_lammps_ = NULL;
        id_lammps_ = (int *) lammps_extract_atom(lmp,"id");

        // genereate vector IDs
        allocateArray(id_lammpsVec_,0,nlocal_lammps_*3);
+        id_lammpsSync = NULL;
        allocateArray(id_lammpsSync,0,nlocal_lammps_);
        for (int i = 0; i < nlocal_lammps_; i++)
        {
@ -478,7 +484,10 @@ void Foam::twoWayM2M::syncIDs() const
        // re-arrange data using map
       
        // get access to id array
-        id_lammpsSync = (int *) lammps_extract_atom(lmp,"id");
+        id_lammps_ = (int *) lammps_extract_atom(lmp,"id");
+        allocateArray(id_lammpsSync,0,nlocal_lammps_);
+        for (int i = 0; i < nlocal_lammps_; i++)
+            id_lammpsSync[i] = id_lammps_[i];

        // generate vector IDs
        allocateArray(id_lammpsVec_,0,nlocal_lammps_*3);
@ -501,6 +510,7 @@ void Foam::twoWayM2M::syncIDs() const

        // get access to "x"
        pos_lammpsSync = (double **) lammps_extract_atom(lmp,"x");
+
        allocateArray(tmp_,-1.,nlocal_foam_*3);
        lmp2foam_vec_->exchange(pos_lammpsSync ? pos_lammpsSync[0] : NULL, tmp_);

@ -551,8 +561,8 @@ void Foam::twoWayM2M::syncIDs() const
        }
        MPI_Barrier(MPI_COMM_WORLD);
        Pout << couplingStep_ << "st nlocal_lammps_=" << nlocal_lammps_ << endl;
-        Pout << couplingStep_ << "st nlocal_foam_=" << nlocal_foam_ << endl;
-        //=======================================================================*/
+        Pout << couplingStep_ << "st nlocal_foam_=" << nlocal_foam_ << endl;*/
+        //=======================================================================

    // correct mapping
    particleCloud_.clockM().start(11,"setup_Comm");
@ -565,20 +575,25 @@ void Foam::twoWayM2M::syncIDs() const
    lmp2foam_vec_ = new Many2Many(MPI_COMM_WORLD);
    foam2lmp_vec_ = new Many2Many(MPI_COMM_WORLD);

-    if(firstRun_)
+    if(firstRun_ || particleLost_)
    {
        lmp2foam_->setup(nlocal_lammps_,id_lammps_,nlocal_foam_,id_foam_);
        lmp2foam_vec_->setup(nlocal_lammps_*3,id_lammpsVec_,nlocal_foam_*3,id_foamVec_);
        foam2lmp_vec_->setup(nlocal_foam_*3,id_foamVec_,nlocal_lammps_*3,id_lammpsVec_);
-        id_lammps_=NULL;    // free pointer from LIG
-        pos_lammps_ = NULL; // free pointer from LIG
    }else
    {
        lmp2foam_->setup(nlocal_lammps_,id_lammpsSync,nlocal_foam_,id_foam_);
        lmp2foam_vec_->setup(nlocal_lammps_*3,id_lammpsVec_,nlocal_foam_*3,id_foamVec_);
        foam2lmp_vec_->setup(nlocal_foam_*3,id_foamVec_,nlocal_lammps_*3,id_lammpsVec_);
    }
+    id_lammps_=NULL;    // free pointer from LIG
+    id_lammpsSync=NULL; // free pointer from LIG
+    pos_lammps_ = NULL; // free pointer from LIG
+
    particleCloud_.clockM().stop("setup_Comm");
+
+//MPI_Barrier(MPI_COMM_WORLD);
+//Info << "update communication - done." << endl;
 }

 void Foam::twoWayM2M::locateParticle(int* id_lammpsSync) const
@ -632,6 +647,7 @@ void Foam::twoWayM2M::locateParticle(int* id_lammpsSync) const

            nlocal_foam_ += 1;
            //Pout << couplingStep_ << "st stage1 found particle at pos=" << pos << " ,id_lammps_[i]=" << id_lammps_[i] << endl;
+
        }
        else
        {
@ -796,7 +812,7 @@ void Foam::twoWayM2M::locateParticle(int* id_lammpsSync) const
        }
        int nlocal_foam_lostAll = LAMMPS_NS::MPI_Allgather_Vector(lost_pos_, nlocal_foam_lost_*3, lost_posAll, MPI_COMM_WORLD)/3; // new[] für lost_posAll!!!
        LAMMPS_NS::MPI_Allgather_Vector(id_foamLost_, nlocal_foam_lost_, id_foamLostAll, MPI_COMM_WORLD);
-        //Info << couplingStep_ << "st nlocal_foam_lostAll=" << nlocal_foam_lostAll << endl;
+        Info << couplingStep_ << "st nlocal_foam_lostAll=" << nlocal_foam_lostAll << endl;

        // locate lost particles
        for (int i = 0; i < nlocal_foam_lostAll; i++)
@ -847,14 +863,14 @@ void Foam::twoWayM2M::locateParticle(int* id_lammpsSync) const
            {
                // a particle was found nowhere
                particleLost_=true;
-                Info << "running in particleLost_ mode" << endl;

                // delete liggghts particles which were not found from comm
                for (int j=0;j<nlocal_lammps_;j++)
                {
                    if (id_lammpsSync[j]==id_foam_nowhere_all[i])
                    {
-                        Pout << "lost ID: id_foam_nowhere_all[i]=" << id_foam_nowhere_all[i] << endl;
+
+                        //Pout << "lost ID: id_foam_nowhere_all[i]=" << id_foam_nowhere_all[i] << endl;
                        // re-arrange IDs
                        id_lammpsSync[j] = id_lammpsSync[nlocal_lammps_-1];

@ -870,9 +886,14 @@ void Foam::twoWayM2M::locateParticle(int* id_lammpsSync) const
            i++;
        }

-Pout << "after nlocal_lammps_ ==" << nlocal_lammps_ << endl;
+        // make cpy
+        id_lammps_=NULL;
+        allocateArray(id_lammps_,-1.,nlocal_lammps_);
+        for (int i = 0; i < nlocal_lammps_; i++)
+            id_lammps_[i]=id_lammpsSync[i];

 //    particleCloud_.clockM().stop("locate_Stage3");
+//Pout << "particleLost_=" << particleLost_ << endl;
    }

 //int gaga;
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
@ -411,9 +411,12 @@ int Foam::twoWayMPI::getNumberOfParticles() const

 int Foam::twoWayMPI::getNumberOfClumps() const
 {
+    #ifdef multisphere
+        return liggghts_get_maxtag_ms(lmp);
+    #endif
+
    Warning << "liggghts_get_maxtag_ms(lmp) is commented here!" << endl;
    return -1;       
-//    return liggghts_get_maxtag_ms(lmp);
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.C
@ -112,9 +112,7 @@ void Archimedes::setForce() const
 {
    vector force(0,0,0);

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); ++index)
    {
@ -135,16 +133,14 @@ void Archimedes::setForce() const
                }

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(force);           //first entry must the be the force
-
-                Field<scalar> sValues;
-                sValues.clear();
-                sValues.append(pow(dp,3)/6*M_PI);        //other are debug
-
+                    sValues.append(pow(dp,3)/6*M_PI);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
                }
+            }

            if(!treatDEM_)
            {            
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.C
@ -104,9 +104,7 @@ void ArchimedesIB::setForce() const
 {
    vector force;

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); ++index)
    {
@ -124,14 +122,12 @@ void ArchimedesIB::setForce() const
            }

            //Set value fields and write the probe
-             Field<vector> vValues;
-             vValues.clear();
+            if(probeIt_)
+            {
+                #include "setupProbeModelfields.H"
                vValues.append(force);           //first entry must the be the force
-
-             Field<scalar> sValues;
-             sValues.clear();
-
                particleCloud_.probeM().writeProbe(index, sValues, vValues);
+            }

            // set force on particle
            if(twoDimensional_) Warning<<"ArchimedesIB model doesn't work for 2D right now!!\n"<< endl;
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C
@ -115,7 +115,6 @@ void DiFeliceDrag::setForce() const
    vector Ufluid(0,0,0);
    vector drag(0,0,0);
    label cellI=0;
-
    vector Us(0,0,0);
    vector Ur(0,0,0);
    scalar ds(0);
@ -128,9 +127,7 @@ void DiFeliceDrag::setForce() const
    interpolationCellPoint<scalar> voidfractionInterpolator_(voidfraction_);
    interpolationCellPoint<vector> UInterpolator_(U_);

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); index++)
    {
@ -149,7 +146,7 @@ void DiFeliceDrag::setForce() const
                    Ufluid = UInterpolator_.interpolate(position,cellI);
                }else
                {
-                    voidfraction = particleCloud_.voidfraction(index);
+                    voidfraction = voidfraction_[cellI];
                    Ufluid = U_[cellI];
                }

@ -182,32 +179,29 @@ void DiFeliceDrag::setForce() const

                if(verbose_ && index >100 && index <102)
                {
-                    Info << "index = " << index << endl;
-                    Info << "Us = " << Us << endl;
-                    Info << "Ur = " << Ur << endl;
-                    Info << "ds = " << ds << endl;
-                    Info << "rho = " << rho << endl;
-                    Info << "nuf = " << nuf << endl;
-                    Info << "voidfraction = " << voidfraction << endl;
-                    Info << "Rep = " << Rep << endl;
-                    Info << "Cd = " << Cd << endl;
-                    Info << "drag = " << drag << endl;
+                    Pout << "index = " << index << endl;
+                    Pout << "Us = " << Us << endl;
+                    Pout << "Ur = " << Ur << endl;
+                    Pout << "ds = " << ds << endl;
+                    Pout << "rho = " << rho << endl;
+                    Pout << "nuf = " << nuf << endl;
+                    Pout << "voidfraction = " << voidfraction << endl;
+                    Pout << "Rep = " << Rep << endl;
+                    Pout << "Cd = " << Cd << endl;
+                    Pout << "drag = " << drag << endl;
                }

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(drag);   //first entry must the be the force
-                vValues.append(Ur);            //other are debug
-
-                Field<scalar> sValues;
-                sValues.clear();
-                sValues.append(Rep);        //other are debug
-                sValues.append(Cd);     //other are debug
-                sValues.append(voidfraction);     //other are debug
-
+                    vValues.append(Ur);
+                    sValues.append(Rep);
+                    sValues.append(Cd);
+                    sValues.append(voidfraction);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
-
+                }
            }
            // set force on particle
            if(treatExplicit_) for(int j=0;j<3;j++) expForces()[index][j] += drag[j];
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.C
@ -67,7 +67,8 @@ GidaspowDrag::GidaspowDrag
    velFieldName_(propsDict_.lookup("velFieldName")),
    U_(sm.mesh().lookupObject<volVectorField> (velFieldName_)),
    densityFieldName_(propsDict_.lookup("densityFieldName")),
-    rho_(sm.mesh().lookupObject<volScalarField> (densityFieldName_))
+    rho_(sm.mesh().lookupObject<volScalarField> (densityFieldName_)),
+    phi_(readScalar(propsDict_.lookup("phi")))
 {
    //Append the field names to be probed
    particleCloud_.probeM().initialize(typeName, "gidaspowDrag.logDat");
@ -100,9 +101,7 @@ void GidaspowDrag::setForce() const
        const volScalarField& nufField = particleCloud_.turbulence().nu();
    #endif

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); ++index)
    {
@ -116,7 +115,7 @@ void GidaspowDrag::setForce() const
                vector Us = particleCloud_.velocity(index);
                vector Ur = U_[cellI]-Us;
                scalar magUr = mag(Ur);
-                scalar ds = 2*particleCloud_.radius(index);
+                scalar ds = 2*particleCloud_.radius(index)*phi_;
                scalar voidfraction = particleCloud_.voidfraction(index);
                scalar rho = rho_[cellI];
                scalar nuf = nufField[cellI];
@ -149,18 +148,15 @@ void GidaspowDrag::setForce() const


                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(drag);   //first entry must the be the force
-                vValues.append(Ur);            //other are debug
-
-                Field<scalar> sValues;
-                sValues.clear();
-                sValues.append(KslLag);     //other are debug
-                sValues.append(voidfraction);     //other are debug
-
+                    vValues.append(Ur);
+                    sValues.append(KslLag);
+                    sValues.append(voidfraction);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
-
+                }
            }

            // set force on particle
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/GidaspowDrag/GidaspowDrag.H
@ -69,6 +69,8 @@ private:

    const volScalarField& rho_;

+    const scalar phi_;
+
 public:

    //- Runtime type information
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C
@ -144,9 +144,7 @@ void KochHillDrag::setForce() const
    interpolationCellPoint<scalar> voidfractionInterpolator_(voidfraction_);
    interpolationCellPoint<vector> UInterpolator_(U_);

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); index++)
    {
@ -171,7 +169,7 @@ void KochHillDrag::setForce() const
                    if(voidfraction<0.40) voidfraction = 0.40;
                }else
                {
-					voidfraction = particleCloud_.voidfraction(index);
+					voidfraction = voidfraction_[cellI];
                    Ufluid = U_[cellI];
                }

@ -222,6 +220,7 @@ void KochHillDrag::setForce() const

                if(verbose_ && index >=0 && index <2)
                {
+                    Pout << "cellI = " << cellI << endl;
                    Pout << "index = " << index << endl;
                    Pout << "Us = " << Us << endl;
                    Pout << "Ur = " << Ur << endl;
@ -235,19 +234,16 @@ void KochHillDrag::setForce() const
                }

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(drag);           //first entry must the be the force
-                vValues.append(Ur);            //other are debug
-
-                Field<scalar> sValues;
-                sValues.clear();
-                sValues.append(Rep);        //other are debug
-                sValues.append(betaP);     //other are debug
-                sValues.append(voidfraction);     //other are debug
-
+                    vValues.append(Ur);
+                    sValues.append(Rep);
+                    sValues.append(betaP);
+                    sValues.append(voidfraction);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
-    
+                }    
            }
            // set force on particle
            if(treatExplicit_) for(int j=0;j<3;j++) expForces()[index][j] += drag[j];
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
@ -136,6 +136,12 @@ void KochHillRWDrag::allocateMyArrays() const

 void KochHillRWDrag::setForce() const
 {
+
+    // realloc the arrays
+    reAllocArrays();
+
+Info << "huhu" << endl;
+
    if (scale_ > 1)
        Info << "KochHillRW using scale = " << scale_ << endl;
    else if (cg() > 1){
@ -212,7 +218,7 @@ void KochHillRWDrag::setForce() const
            Ufluid =vector(0,0,0);

            // Pout << "RW-TEST: cellI = " << cellI << endl; // TEST-Output
-
+Info << "haha1" << endl;
            if (cellI > -1) // particle Found
            {
                if(interpolation_)
@ -246,7 +252,7 @@ void KochHillRWDrag::setForce() const
                if(partTime_[index][0] > t+10*timeE)
                  partTime_[index][0] = t;
                // -------------------------
-
+Info << "haha2" << endl;
                //Pout << "RW-TEST: t = " << t << " partTime_ = " << partTime_[index][0] << endl; // TEST-Output
                if(t>=partTime_[index][0])
                {
@ -281,6 +287,7 @@ void KochHillRWDrag::setForce() const
                    } else {
                      minDeltaT = timeE;
                    }
+Info << "haha3" << endl;
                    //Pout << "RW-TEST: timeE = " << timeE << " timeCR = " << timeCr << endl; // TEST-Output

                    // calculate time step of next update
@ -295,9 +302,11 @@ void KochHillRWDrag::setForce() const
                        //Pout << "RW-TEST: Ufluid[" << dim << "] = " << Ufluid[dim] << " Ufluct = " << partUfluct_[index][dim] << " k = " << k << endl; // TEST-Output
                        Ufluid[dim] = Ufluid[dim] + partUfluct_[index][dim];
                    }
+Info << "haha4" << endl;
                }
                else
                {
+Info << "haha5" << endl;
                    // no update of the turbulent velocity part
                    // modify current fluid velocity
                    for(int dim=0;dim<3;dim++)
@ -315,7 +324,7 @@ void KochHillRWDrag::setForce() const
 				Rep = 0;
                Vs = ds*ds*ds*M_PI/6;
                volumefraction = 1-voidfraction+SMALL;
-
+Info << "haha6" << endl;
                if (magUr > 0)
                {
                    // calc particle Re Nr
@ -349,6 +358,7 @@ void KochHillRWDrag::setForce() const

                    if (modelType_=="B")
                        drag /= voidfraction;
+Info << "haha7" << endl;
                }

                if(verbose_ && index >=0 && index <2)
@ -364,7 +374,9 @@ void KochHillRWDrag::setForce() const
                    Pout << "Rep = " << Rep << endl;
                    Pout << "drag = " << drag << endl;
                }
+Info << "haha8" << endl;
            }
+Info << "haha9" << endl;
            // set force on particle
            if(treatExplicit_) for(int j=0;j<3;j++) expForces()[index][j] += drag[j];
            else  for(int j=0;j<3;j++) impForces()[index][j] += drag[j];
@ -382,9 +394,10 @@ void KochHillRWDrag::setForce() const
            }else{
                for(int j=0;j<3;j++) DEMForces()[index][j] += drag[j];
            }
-
+Info << "haha10" << endl;
        //}
    }
+Info << "haha11" << endl;
 }


--- a/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C
@ -138,9 +138,7 @@ void MeiLift::setForce() const
    interpolationCellPoint<vector> UInterpolator_(U_);
    interpolationCellPoint<vector> VorticityInterpolator_(vorticityField);

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); index++)
    {
@ -248,19 +246,17 @@ void MeiLift::setForce() const
                }

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(lift);   //first entry must the be the force
-                vValues.append(Ur);            //other are debug
-                vValues.append(vorticity);   //other are debug
-
-                Field<scalar> sValues;
-                sValues.clear();
-                sValues.append(Rep);        //other are debug
-                sValues.append(Rew);        //other are debug
-                sValues.append(J_star);     //other are debug
-
+                    vValues.append(Ur);
+                    vValues.append(vorticity);
+                    sValues.append(Rep);
+                    sValues.append(Rew);
+                    sValues.append(J_star);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
+                }
                // END OF SAMPLING AND VERBOSE OUTOUT
                //**********************************        

--- a/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C
@ -101,9 +101,7 @@ void SchillerNaumannDrag::setForce() const
        const volScalarField& nufField = particleCloud_.turbulence().nu();
    #endif

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); index++)
    {
@ -155,18 +153,15 @@ void SchillerNaumannDrag::setForce() const
                }

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(drag);           //first entry must the be the force
-                vValues.append(Ur);            //other are debug
-
-                Field<scalar> sValues;
-                sValues.clear();
-                sValues.append(Rep);        //other are debug
-                sValues.append(Cd);     //other are debug
-
+                    vValues.append(Ur);
+                    sValues.append(Rep);
+                    sValues.append(Cd);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
-
+                }
            }
            // set force on particle
            if(treatExplicit_) for(int j=0;j<3;j++) expForces()[index][j] += drag[j];
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C
@ -115,9 +115,7 @@ void ShirgaonkarIB::setForce() const
        volVectorField h = rho_*(nufField*fvc::laplacian(U_)-fvc::grad(p_));
    #endif

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index=0; index< particleCloud_.numberOfParticles(); index++)
    {
@ -141,13 +139,12 @@ void ShirgaonkarIB::setForce() const
            if(twoDimensional_) drag /= depth_;

            //Set value fields and write the probe
-           Field<vector> vValues;
-           vValues.clear();
+            if(probeIt_)
+            {
+                #include "setupProbeModelfields.H"
                vValues.append(drag);           //first entry must the be the force
-
-            Field<scalar> sValues;
-            sValues.clear();
                particleCloud_.probeM().writeProbe(index, sValues, vValues);
+            }

            if(treatExplicit_) for(int j=0;j<3;j++) expForces()[index][j] += drag[j];
            else  for(int j=0;j<3;j++) impForces()[index][j] += drag[j];
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.C
@ -85,7 +85,8 @@ forceModel::forceModel
    ),
    coupleForce_(true),
    modelType_(sm.modelType()),
-    cg_(1.)
+    cg_(1.),
+    probeIt_(sm.probeM().active())
 {}


--- a/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/forceModel/forceModel.H
@ -77,6 +77,8 @@ protected:

        mutable scalar cg_;

+        bool probeIt_;
+
 public:

    //- Runtime type information
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForce/gradPForce.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/gradPForce/gradPForce.C
@ -133,9 +133,7 @@ void gradPForce::setForce() const

    interpolationCellPoint<vector> gradPInterpolator_(gradPField);

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); index++)
    {
@ -174,15 +172,14 @@ void gradPForce::setForce() const
                }

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(force);           //first entry must the be the force
-                Field<scalar> sValues;
-                sValues.clear();
                    sValues.append(Vs);
                    sValues.append(rho);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
-
+                }
            }

            // set force on particle
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.C
@ -60,8 +60,18 @@ noDrag::noDrag
    cfdemCloud& sm
 )
 :
-    forceModel(dict,sm)
+    forceModel(dict,sm),
+    propsDict_(dict),
+    verbose_(false),
+    noDEMForce_(false)
 {
+    if(dict.found(word(typeName + "Props")))
+        propsDict_=dictionary(dict.subDict(typeName + "Props"));
+
+    if (propsDict_.found("noDEMForce")) noDEMForce_=true;
+
+    if (propsDict_.found("keepCFDForce")) keepCFDForce_=true;
+
    coupleForce_=false;
 }

@ -80,12 +90,14 @@ void noDrag::setForce() const
    Info << "noDrag::setForce" << endl;
    for(int index = 0;index <  particleCloud_.numberOfParticles(); ++index)
    {
-        //if(mask[index][0])
-        //{
        // set force on particle
+        if(!keepCFDForce_)
+        {
            if(treatExplicit_) for(int j=0;j<3;j++) expForces()[index][j] = 0.;
            else  for(int j=0;j<3;j++) impForces()[index][j] = 0.;
-        //}
+        }
+        if(noDEMForce_)for(int j=0;j<3;j++) DEMForces()[index][j] = 0.;
+        
    }
 }

--- a/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.H
@ -54,11 +54,19 @@ class noDrag
 :
    public forceModel
 {
+private:
+    dictionary propsDict_;
+
+    bool verbose_;
+
+    bool noDEMForce_;
+
+    bool keepCFDForce_;

 public:

    //- Runtime type information
-    TypeName("off");
+    TypeName("noDrag");


    // Constructors
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C
@ -79,6 +79,19 @@ particleCellVolume::particleCellVolume
        mesh_,
        dimensionedScalar("zero", dimensionSet(0,0,0,0,0), 0)
    ),
+    scalarField2_
+    (   
+        IOobject
+        (
+            "cellVolume",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero", dimensionSet(0,0,0,0,0), 0)
+    ),
    upperThreshold_(readScalar(propsDict_.lookup("upperThreshold"))),
    lowerThreshold_(readScalar(propsDict_.lookup("lowerThreshold"))),
    verbose_(false)
@ -122,20 +135,26 @@ void particleCellVolume::setForce() const
            {
                cellVol = mesh_.V()[cellI];
                scalarField_[cellI] = (1-fieldValue) * cellVol;
+                scalarField2_[cellI] = cellVol;
            }
            else
            {
                scalarField_[cellI] = 0.;
+                scalarField2_[cellI] = 0.;
            }
        }
        scalarField_.internalField() = gSum(scalarField_);
+        scalarField2_.internalField() = gSum(scalarField2_);

        if(verbose_)
        {
-           Info << "calculated integral of field: " << scalarFieldName_
+           Info << "calculated integral particle volume "
                << " = " << scalarField_[0]
                << ",\n considering cells where the field < " << upperThreshold_
-                << ", and > " << lowerThreshold_ << endl;
+                << ", and > " << lowerThreshold_
+                << ",\n the total volume of cells holding particles = " << scalarField2_[0]
+                << ",\n this results in an average volume fraction of:" << scalarField_[0]/(scalarField2_[0]+SMALL)
+                << endl;
        }
    }// end if time >= startTime_
 }
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.H
@ -66,6 +66,8 @@ private:

    mutable volScalarField scalarField_;

+    mutable volScalarField scalarField2_;
+
    mutable scalar upperThreshold_;

    mutable scalar lowerThreshold_;
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C
@ -107,9 +107,7 @@ void virtualMassForce::setForce() const

    scalar dt = U_.mesh().time().deltaT().value();

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); index++)
    {
@ -137,17 +135,16 @@ void virtualMassForce::setForce() const
                virtualMassForce = 0.5 * rho * Vs * ddtUrel;

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(virtualMassForce);           //first entry must the be the force
                    vValues.append(Ur);
                    vValues.append(UrelOld);
-                Field<scalar> sValues;
-                sValues.clear();
                    sValues.append(Vs);
                    sValues.append(rho);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
-
+                }
            }
            // set force on particle
            if(treatExplicit_) for(int j=0;j<3;j++) expForces()[index][j] += virtualMassForce[j];
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/viscForce/viscForce.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/viscForce/viscForce.C
@ -131,9 +131,7 @@ void viscForce::setForce() const

    interpolationCellPoint<vector> divTauInterpolator_(divTauField);

-    //set probeModel parameters for this force model
-    particleCloud_.probeM().setOutputFile();
-    particleCloud_.probeM().setCounter();
+    #include "setupProbeModel.H"

    for(int index = 0;index <  particleCloud_.numberOfParticles(); index++)
    {
@ -170,14 +168,13 @@ void viscForce::setForce() const
                }

                //Set value fields and write the probe
-                Field<vector> vValues;
-                vValues.clear();
+                if(probeIt_)
+                {
+                    #include "setupProbeModelfields.H"
                    vValues.append(force);  //first entry must the be the force
-                Field<scalar> sValues;
-                sValues.clear();
                    sValues.append(Vs);
                    particleCloud_.probeM().writeProbe(index, sValues, vValues);
-
+                }
            }

            // set force on particle
@ -191,7 +188,6 @@ void viscForce::setForce() const
    }
 }

-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 } // End namespace Foam
--- a/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C
@ -75,6 +75,15 @@ DiFeliceDragMS::DiFeliceDragMS
    //sphereToClump_(readScalar(propsDict_.lookup("sphereToClump")))
    dH_(readScalar(propsDict_.lookup("hydraulicDiameter")))
 {
+    //Append the field names to be probed
+    particleCloud_.probeM().initialize(typeName, "diFeliceDrag.logDat");
+    particleCloud_.probeM().vectorFields_.append("dragForce"); //first entry must the be the force
+    particleCloud_.probeM().vectorFields_.append("Urel");        //other are debug
+    particleCloud_.probeM().scalarFields_.append("Rep");          //other are debug
+    particleCloud_.probeM().scalarFields_.append("Cd");                 //other are debug
+    particleCloud_.probeM().scalarFields_.append("voidfraction");       //other are debug
+    particleCloud_.probeM().writeHeader();
+
    if (propsDict_.found("verbose")) verbose_=true;
    if (propsDict_.found("treatExplicit")) treatExplicit_=true;
    if (propsDict_.found("interpolation"))
@ -82,6 +91,7 @@ DiFeliceDragMS::DiFeliceDragMS
        Info << "using interpolated value of U." << endl;
        interpolation_=true;
    }
+    particleCloud_.checkCG(false);
 }


@ -102,11 +112,11 @@ void DiFeliceDragMS::setForce() const
        const volScalarField& nufField = cloudRefMS().turbulence().nu();
    #endif

-    interpolationCellPoint<vector> UInterpolator(U_);
-    interpolationCellPoint<scalar> voidfractionInterpolator(voidfraction_);
-    vector U(0,0,0);
    vector position(0,0,0);
    scalar voidfraction(1);
+    vector Ufluid(0,0,0);
+    vector drag(0,0,0);
+    label cellI=0;
    vector Us(0,0,0);
    vector Ur(0,0,0);
    scalar ds(0);
@ -116,32 +126,38 @@ void DiFeliceDragMS::setForce() const
    scalar Rep(0);
    scalar Cd(0);

+    interpolationCellPoint<scalar> voidfractionInterpolator(voidfraction_);
+    interpolationCellPoint<vector> UInterpolator(U_);
+
    cloudRefMS().resetArray(cloudRefMS().expForcesCM(),cloudRefMS().numberOfClumps(),3);
    cloudRefMS().resetArray(cloudRefMS().impForcesCM(),cloudRefMS().numberOfClumps(),3);
+    cloudRefMS().resetArray(cloudRefMS().DEMForcesCM(),cloudRefMS().numberOfClumps(),3);
+
+    #include "setupProbeModel.H"

    for(int index = 0;index <  cloudRefMS().numberOfClumps(); index++)
    {

        //if(mask[index][0])  // would have to be transformed from body ID to particle ID
        //{
-            vector drag(0,0,0);
-            label cellI = cloudRefMS().cellIDCM(index);
+            cellI = cloudRefMS().cellIDCM(index);
+			drag = vector(0,0,0);

            if (cellI > -1) // particle Found
            {
                if(interpolation_)
                {
                    position = cloudRefMS().positionCM(index);
-                    U = UInterpolator.interpolate(position,cellI);
+                    Ufluid = UInterpolator.interpolate(position,cellI);
                    voidfraction = voidfractionInterpolator.interpolate(position,cellI);
                }else
                {
-                    U = U_[cellI];
-                    voidfraction = voidfraction_[cellI];
+                    Ufluid = U_[cellI];
+                    voidfraction = voidfraction_[cellI]; //particleCloud_.voidfraction(index); ???//
                }

                Us = cloudRefMS().velocityCM(index);
-                Ur = U-Us;
+                Ur = Ufluid-Us;
                //ds = 2*cloudRefMS().radius(index)/sphereToClump_; // scale from particle diameter
                ds = dH_;                                           // use dict defined diameter

@ -156,7 +172,7 @@ void DiFeliceDragMS::setForce() const
                if (magUr > 0)
                {
                    // calc particle Re Nr
-                    Rep = ds*voidfraction*magUr/nuf;
+                    Rep = ds*voidfraction*magUr/(nuf+SMALL);

                    // calc fluid drag Coeff
 //                    phi=1; //AsurfAequi/Asurf;
@ -194,6 +210,7 @@ void DiFeliceDragMS::setForce() const
            // set force on bodies
            if(treatExplicit_) for(int j=0;j<3;j++) cloudRefMS().expForcesCM()[index][j] += drag[j];
            else  for(int j=0;j<3;j++) cloudRefMS().impForcesCM()[index][j] += drag[j];
+            for(int j=0;j<3;j++) cloudRefMS().DEMForcesCM()[index][j] += drag[j];
        //}
    }

--- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.C
+++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.C
@ -68,6 +68,7 @@ execute::execute
    commandList_(0),
    command_(""),
    scalarList_(0),
+    labelList_(0),
    runTimeModifiable_(true),
    timeStamp_(false)
 {
@ -83,9 +84,13 @@ execute::execute
    // read list of scalars
    if(propsDict_.found("scalars")) scalarList_ = scalarList(propsDict_.lookup("scalars"));

+    // read list of labels
+    if(propsDict_.found("labels")) labelList_ = labelList(propsDict_.lookup("labels"));
+
    bool addBlank = true;  // std no blanks after each word
    fileName add;
    label numberCount=0;   // nr of scalars inserted to command
+    label labelCount=0;   // nr of labels inserted to command

    forAll(commandList_,i)
    {
@ -125,6 +130,18 @@ execute::execute
            sprintf(h,"%f",scalarList_[numberCount]);
            add = h;
            numberCount ++;
+        }else if (add=="label") // next command will be a number read from scalarList_
+        {
+            if (!propsDict_.found("labels"))
+            {
+                FatalError<<"you want to use a label in the command\n - specify a label list with all numbers"
+                << abort(FatalError);
+
+            }
+            char h[50];
+            sprintf(h,"%d",labelList_[labelCount]);
+            add = h;
+            labelCount ++;
        }

        // compose command
--- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H
+++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H
@ -69,6 +69,8 @@ private:

    scalarList scalarList_;

+    labelList labelList_;
+
    bool runTimeModifiable_;

    bool timeStamp_;
--- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.C
+++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.C
@ -96,9 +96,9 @@ label engineSearch::findCell
        //if(mask[index][0] && particleCloud_.radius(index) > SMALL)
        if(particleCloud_.radius(index) > SMALL)
        {
-
            // create pos vector
            for(int i=0;i<3;i++) position[i] = positions[index][i];
+
            // find cell
            cellIDs[index][0] =searchEngine_.findCell(position,cellIDs[index][0],treeSearch_);
        }
--- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C
+++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C
@ -36,6 +36,7 @@ Description
 #include "addToRunTimeSelectionTable.H"
 #include "mathematicalConstants.H"

+#include "mpi.h"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

@ -66,8 +67,13 @@ engineSearchIB::engineSearchIB
    engineSearch(dict.subDict(typeName + "Props"),sm),
    propsDict_(dict.subDict(typeName + "Props")),
    zSplit_(readLabel(propsDict_.lookup("zSplit"))),
-    xySplit_(readLabel(propsDict_.lookup("xySplit")))
-{}
+    xySplit_(readLabel(propsDict_.lookup("xySplit"))),
+    checkPeriodicCells_(false)
+{
+
+    if(propsDict_.found("checkPeriodicCells")) checkPeriodicCells_=true;
+
+}


 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@ -87,6 +93,13 @@ label engineSearchIB::findCell
    int size
 ) const
 {
+
+    int numprocs, me;
+    MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
+    MPI_Comm_rank(MPI_COMM_WORLD, &me);
+    const boundBox& globalBb = particleCloud_.mesh().bounds();
+
+
    vector position;
    for(int index = 0;index < size; ++index)
    {
@ -118,7 +131,8 @@ label engineSearchIB::findCell
            			pos[2]+=radius;
            		else if(countPoints==1)
            			pos[2]-=radius;
-            		else {
+            		else 
+            		{
            			thetaLevel=(countPoints-2)/xySplit_;
            			theta=factor*thetaSize*thetaLevel;
            			phi=factor*phiSize*(countPoints-2-thetaLevel*xySplit_);
@ -128,6 +142,23 @@ label engineSearchIB::findCell
            		}

            		altStartPos=findSingleCell(pos,oldID); //particleCloud_.mesh().findCell(pos);//
+                    //check for periodic domains
+                    if(checkPeriodicCells_)
+                    {
+                        for(int iDir=0;iDir<3;iDir++)
+                        {
+                            if( pos[iDir] > globalBb.max()[iDir] )
+                            {
+                                pos[iDir]-=globalBb.max()[iDir]-globalBb.min()[iDir];
+                            }
+                            else if( pos[iDir] < globalBb.min()[iDir] )
+                            {
+                                pos[iDir]+=globalBb.max()[iDir]-globalBb.min()[iDir];
+                            }
+                        }
+                  		altStartPos=findSingleCell(pos,oldID); //particleCloud_.mesh().findCell(pos);//
+                    }
+                    
            		if(altStartPos>=0) foundPos=1;
            		countPoints++;
            	}
--- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H
+++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H
@ -63,6 +63,8 @@ private:

    	const label xySplit_;
    	
+    	bool checkPeriodicCells_;
+
 public:

    //- Runtime type information
--- a/src/lagrangian/cfdemParticle/subModels/probeModel/noProbe/noProbe.H
+++ b/src/lagrangian/cfdemParticle/subModels/probeModel/noProbe/noProbe.H
@ -80,7 +80,7 @@ public:
        ~noProbe();

    // Member Functions
-
+        bool active() const {return false;}; 
 };


--- a/Show More
+++ b/Show More