PLB with clouds

src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/fvFieldDecomposer.C

@@ -155,6 +155,9 @@ fvFieldDecomposer::fvFieldDecomposer
         static_cast<processorSurfacePatchFieldDecomposer*>(NULL)
     )
 {
+    // HR 25.06.18: Weights may be required for some mappings and might hang in parallel.
+    completeMesh_.weights();
+
     forAll (boundaryAddressing_, patchi)
     {
         if (boundaryAddressing_[patchi] >= 0)

src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesRebuild.C

@@ -1147,7 +1147,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                                      != masterPpAddr[curMF[pointI]]
                                     )
                                     {
-                                        WarningIn
+                                        FatalErrorIn
                                         (
                                             "autoPtr<fvMesh> "
                                             "processorMeshesReconstructor::"
@@ -1213,7 +1213,7 @@ Foam::processorMeshesReconstructor::reconstructMesh(const Time& db)
                      != ppAddr[curSpl[splI]]
                     )
                     {
-                        WarningIn
+                        FatalErrorIn
                         (
                             "autoPtr<fvMesh> "
                             "processorMeshesReconstructor::"

src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.C

@@ -115,21 +115,32 @@ Foam::processorMeshesReconstructor::readUpdate()
             {
                 stat = procStat;
             }
-            else
+            else if (stat != procStat)
             {
-                if (stat != procStat)
+                if (
+                    (
+                        stat == polyMesh::TOPO_CHANGE
+                     && procStat == polyMesh::TOPO_PATCH_CHANGE
+                    )
+                 || (
+                        procStat == polyMesh::TOPO_CHANGE
+                     && stat == polyMesh::TOPO_PATCH_CHANGE
+                    )
+                )
                 {
-                    FatalErrorIn("processorMeshesReconstructor::readUpdate()")
+                    continue;
-                        << "Processor " << procI
-                        << " has a different polyMesh at time "
-                        << meshes_[procI].time().timeName()
-                        << " compared to any previous processors." << nl
-                        << "Please check time "
-                        << meshes_[procI].time().timeName()
-                        << " directories on all processors for consistent"
-                        << " mesh files."
-                        << exit(FatalError);
                 }
+
+                FatalErrorIn("processorMeshesReconstructor::readUpdate()")
+                    << "Processor " << procI
+                    << " has a different polyMesh at time "
+                    << meshes_[procI].time().timeName()
+                    << " compared to any previous processors." << nl
+                    << "Please check time "
+                    << meshes_[procI].time().timeName()
+                    << " directories on all processors for consistent"
+                    << " mesh files."
+                    << exit(FatalError);
             }
         }
     }

src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C

@@ -30,6 +30,8 @@ License
 #include "fvFieldReconstructor.H"
 #include "passiveProcessorPolyPatch.H"
 #include "addToRunTimeSelectionTable.H"
+#include "cloud.H"
+#include "cloudDistribute.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -87,7 +89,7 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
 
     // forAll(cellToProc, celli)
     // {
-    //    cellDist[celli] = cellToProc[celli];
+    //     cellDist[celli] = cellToProc[celli];
     // }
 
     // cellDist.write();
@@ -102,8 +104,29 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
     Pstream::gatherList(migratedCells);
     Pstream::scatterList(migratedCells);
     Info<< "Migrated cells per processor: " << migratedCells << endl;
+
     // Reading through second index now tells how many cells will arrive
     // from which processor
+    forAll (migratedCells, i)
+    {
+        bool allZero = true;
+        forAll (migratedCells, j)
+        {
+            if (migratedCells[j][i] > 0)
+            {
+                allZero = false;
+                break;
+            }
+        }
+
+        if (allZero)
+        {
+            FatalErrorIn("bool topoChangerFvMesh::loadBalance()")
+                << "Reconstructed mesh must have at least one cell "
+                    "on each processor"
+                << abort(FatalError);
+        }
+    }
 
     // Find out which processor faces will become local internal faces
     // by comparing decomposition index from the other side
@@ -135,6 +158,14 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
     HashTable<const surfaceVectorField*> surfaceVectorFields =
         thisDb().lookupClass<surfaceVectorField>();
 
+    // Particles
+    HashTable<const cloud*> clouds = thisDb().lookupClass<cloud>();
+
+    forAllConstIter(HashTable<const cloud*>, clouds, iter)
+    {
+        cloud& c = const_cast<cloud&>(*iter());
+    }
+
     //HJ, HERE: remove the fields that should not be load balanced
 
     // Prepare fields for reconstruction
@@ -180,6 +211,26 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
         receivedSurfaceVectorFields[fieldI].setSize(Pstream::nProcs());
     }
 
+    PtrList<cloudDistribute> cloudDistributes(clouds.size());
+    {
+        label cloudI = 0;
+        forAllConstIter(HashTable<const cloud*>, clouds, iter)
+        {
+            cloud& c = const_cast<cloud&>(*iter());
+            cloudDistributes.set
+            (
+                cloudI++,
+                c.cloudDist
+                (
+                    meshDecomp.cellToProc(),
+                    meshDecomp.procCellAddressing(),
+                    meshDecomp.procFaceAddressing()
+                )
+            );
+        }
+    }
+
+
     for (label procI = 0; procI < meshDecomp.nProcs(); procI++)
     {
         // Check if there is a mesh to send
@@ -225,6 +276,12 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
                 sendFields(volVectorFields, fieldDecomposer, toProc);
                 sendFields(surfaceScalarFields, fieldDecomposer, toProc);
                 sendFields(surfaceVectorFields, fieldDecomposer, toProc);
+
+                // Send clouds
+                forAll(cloudDistributes, cloudI)
+                {
+                    cloudDistributes[cloudI].send(toProc, procI);
+                }
             }
             else
             {
@@ -343,6 +400,11 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
                     procMeshes[procI],
                     fromProc
                 );
+
+                forAll(cloudDistributes, cloudI)
+                {
+                    cloudDistributes[cloudI].receive(fromProc, procI);
+                }
             }
         }
     }
@@ -368,6 +430,8 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
 
     Pout<< "Reconstructed mesh stats: "
         << " nCells: " << reconMesh.nCells()
+        << " nFaces: " << reconMesh.nFaces()
+        << " nIntFaces: " << reconMesh.nInternalFaces()
         << " polyPatches: "
         << reconMesh.boundaryMesh().size()
         << " patches: "
@@ -623,7 +687,6 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
         oldPatchNMeshPoints         // oldPatchNMeshPoints
     );
 
-
     // Reset fvMesh and patches
     resetFvPrimitives
     (
@@ -681,6 +744,15 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict)
         meshMap
     );
 
+    forAll(cloudDistributes, cloudI)
+    {
+        cloudDistributes[cloudI].rebuild
+        (
+            meshRecon.cellProcAddressing(),
+            meshRecon.faceProcAddressing()
+        );
+    }
+
     // Debug
     checkMesh(true);
 

src/finiteVolume/cfdTools/incompressible/CourantNo.H

@@ -33,7 +33,12 @@ scalar CoNum = 0.0;
 scalar meanCoNum = 0.0;
 scalar velMag = 0.0;
 
-if (mesh.nInternalFaces())
+// HR 26.06.28: A parallel run has at least two cells and therefore at least
+// one internal face in the global mesh. It may be a processor boundary, but
+// this is captured by max(mag(phi)).
+// Old formulation hangs on parallel cases where one partition is degenerated
+// to a single cell.
+if (mesh.nInternalFaces() || Pstream::parRun())
 {
     surfaceScalarField magPhi = mag(phi);
 
@@ -48,6 +53,20 @@ if (mesh.nInternalFaces())
 
     velMag = max(magPhi/mesh.magSf()).value();
 }
+else
+{
+    // Single cell mesh: Co is still defined; use cell formulation
+
+    const scalar deltaT = runTime.deltaT().value();
+
+    const scalar deltaX = Foam::cbrt(mesh.V()[0]);
+
+    velMag = mag(U[0]);
+
+    CoNum = velMag*deltaT/deltaX;
+
+    meanCoNum = CoNum;
+}
 
 Info<< "Courant Number mean: " << meanCoNum
     << " max: " << CoNum

src/foam/CMakeLists.txt

@@ -712,6 +712,7 @@ list(APPEND SOURCES
   ${meshTools}/mergePoints.C
   fields/UniformDimensionedFields/uniformDimensionedFields.C
   fields/cloud/cloud.C
+  fields/cloudDistribute/cloudDistribute.C
 )
 
 set(Fields fields/Fields)

src/foam/Make/files

@@ -567,6 +567,7 @@ $(meshTools)/mergePoints.C
 
 fields/UniformDimensionedFields/uniformDimensionedFields.C
 fields/cloud/cloud.C
+fields/cloudDistribute/cloudDistribute.C
 
 Fields = fields/Fields
 $(Fields)/labelField/labelField.C

src/foam/fields/cloud/cloud.C

@@ -52,10 +52,37 @@ Foam::cloud::cloud(const objectRegistry& obr, const word& cloudName)
 {}
 
 
+Foam::autoPtr<Foam::cloudDistribute> Foam::cloud::cloudDist
+(
+    const labelList& cellToProc,
+    const labelListList& procCellAddressing,
+    const labelListList& procFaceAddressing
+)
+{
+    NotImplemented;
+    return autoPtr<cloudDistribute>(NULL);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::cloud::~cloud()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::cloud::size() const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+void Foam::cloud::autoMap(const mapPolyMesh&)
+{
+    NotImplemented;
+}
+
+
 // ************************************************************************* //

src/foam/fields/cloud/cloud.H

@@ -36,6 +36,7 @@ SourceFiles
 #define cloud_H
 
 #include "objectRegistry.H"
+#include "cloudDistribute.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,7 @@ namespace Foam
 
 // Forward declaration of classes
 class mapPolyMesh;
+class polyMesh;
 
 /*---------------------------------------------------------------------------*\
                             Class cloud Declaration
@@ -80,6 +82,13 @@ public:
         //- Construct for the given objectRegistry and named cloud instance
         cloud(const objectRegistry&, const word& cloudName = "");
 
+        virtual autoPtr<cloudDistribute> cloudDist
+        (
+            const labelList& cellToProc,
+            const labelListList& procCellAddressing,
+            const labelListList& procFaceAddressing
+        );
+
 
     //- Destructor
         virtual ~cloud();
@@ -87,11 +96,17 @@ public:
 
     // Member Functions
 
+        // Access
+
+            //- Return size of the cloud
+            virtual label size() const;
+
+    
         // Edit
 
             //- Remap the cells of particles corresponding to the
             //  mesh topology change
-            virtual void autoMap(const mapPolyMesh&) = 0;
+            virtual void autoMap(const mapPolyMesh&);
 };
 
 

src/foam/fields/cloudDistribute/cloudDistribute.C

@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.1
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Lagrangian field decomposer.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cloudDistribute.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+cloudDistribute::cloudDistribute()
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+cloudDistribute::~cloudDistribute()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void cloudDistribute::send(Ostream& toProc, const label procIndex)
+{
+    NotImplemented;
+}
+
+
+void cloudDistribute::receive(Istream& fromProc, const label procIndex)
+{
+    NotImplemented;
+}
+
+
+void cloudDistribute::rebuild
+(
+    const PtrList<labelIOList>& cellProcAddressing,
+    const PtrList<labelIOList>& faceProcAddressing
+)
+{
+    NotImplemented;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //

src/foam/fields/cloudDistribute/cloudDistribute.H

@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.1
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::cloudDistribute
+
+Description
+    Lagrangian field decomposer.
+
+SourceFiles
+    cloudDistribute.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cloudDistribute_H
+#define cloudDistribute_H
+
+#include "labelIOList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class cloudDistribute Declaration
+\*---------------------------------------------------------------------------*/
+
+class cloudDistribute
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        cloudDistribute(const cloudDistribute&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const cloudDistribute&);
+
+
+public:
+
+    // Constructors
+
+        //- Null constructor
+        cloudDistribute();
+
+
+    //- Destructor
+    virtual ~cloudDistribute();
+
+
+    // Member Functions
+
+        // Send particles
+        virtual void send(Ostream& toProc, const label procIndex);
+
+        // Receive particles
+        virtual void receive(Istream& fromProc, const label procIndex);
+
+        // Receive particles
+        virtual void rebuild
+        (
+            const PtrList<labelIOList>& cellProcAddressing,
+            const PtrList<labelIOList>& faceProcAddressing
+        );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/foam/meshes/polyMesh/polyMesh.C

@@ -739,15 +739,24 @@ void Foam::polyMesh::resetPrimitives
         // Faces will be reset in initMesh(), using size of owner list
     }
 
+    // HR 25.06.18: A mesh with a single cell has an empty neighbour list and
+    // we need to be able reset to such a mesh eg. during load balancing
     if (!own().empty())
     {
+        // Mesh has at least one face in owner list. Reset both lists even if
+        // neighbours are empty (single cell mesh).
         owner_.transfer(own());
-    }
-
-    if (!nei().empty())
-    {
         neighbour_.transfer(nei());
     }
+    else
+    {
+        if (!nei().empty())
+        {
+            // This mesh is invalid, but the operation was valid before.
+            // Therefore we do what was done before.
+            neighbour_.transfer(nei());
+        }
+    }
 
 
     // Reset patch sizes and starts

src/lagrangian/basic/CloudDistributeTemplate/CloudDistributeTemplate.C

@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.1
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CloudDistributeTemplate.H"
+#include "CloudTemplate.H"
+#include "cloud.H"
+#include "polyMesh.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::CloudDistribute<ParticleType>::CloudDistribute
+(
+    const labelList& cellToProc,
+    const labelListList& procCellAddressing,
+    const labelListList& procFaceAddressing,
+    cloud& cloud
+)
+:
+    cloudDistribute(),
+    cloud_(reinterpret_cast<Cloud<ParticleType>& >(cloud)),
+    transferList_(Pstream::nProcs())
+{
+    cloud_.split
+    (
+        cellToProc,
+        procCellAddressing,
+        procFaceAddressing,
+        transferList_
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParticleType>
+void Foam::CloudDistribute<ParticleType>::send
+(
+    Ostream& toProc,
+    const label procIndex
+)
+{
+    // Send transfer list prepared in constructor
+    toProc << transferList_[procIndex] << nl;
+
+    // Clear the list for particles to be received
+    transferList_[procIndex].clear();
+}
+
+
+template<class ParticleType>
+void Foam::CloudDistribute<ParticleType>::receive
+(
+    Istream& fromProc,
+    const label procIndex
+)
+{
+    // Receive particles and transfer into transfer list
+    IDLList<ParticleType> newParticles
+    (
+        fromProc,
+        typename ParticleType::iNew(cloud_)
+    );
+
+    transferList_[procIndex].DLListBase::transfer(newParticles);
+}
+
+
+template<class ParticleType>
+void Foam::CloudDistribute<ParticleType>::rebuild
+(
+    const PtrList<labelIOList>& cellProcAddressing,
+    const PtrList<labelIOList>& faceProcAddressing
+)
+{
+    cloud_.rebuild
+    (
+        transferList_,
+        cellProcAddressing,
+        faceProcAddressing
+    );
+}
+
+
+// ************************************************************************* //

src/lagrangian/basic/CloudDistributeTemplate/CloudDistributeTemplate.H

@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     4.1
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend 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.
+
+    foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::Cloud
+
+Description
+
+SourceFiles
+    CloudDistributeTemplate.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CloudDistributeTemplate_H
+#define CloudDistributeTemplate_H
+
+#include "CloudTemplate.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of functions
+template<class ParticleType>
+class Cloud;
+
+class polyMesh;
+class cloud;
+    
+/*---------------------------------------------------------------------------*\
+                           Class Cloud Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParticleType>
+class CloudDistribute
+:
+    public cloudDistribute
+{
+    // Private data
+
+        //- Reference to the cloud
+        Cloud<ParticleType>& cloud_;
+
+        //- Transfer buffer for ordering by procID (for sending) and receiving
+        List<IDLList<ParticleType> > transferList_;
+
+public:
+
+    // Constructors
+
+        //- Construct from components and fill the transfer list
+        CloudDistribute
+        (
+            const labelList& cellToProc,
+            const labelListList& procCellAddressing,
+            const labelListList& procFaceAddressing,
+            cloud& cloud
+        );
+
+
+    // Member Functions
+
+        //- Send particles in the transfer list
+        void send(Ostream& toProc, const label procIndex);
+
+        //- Receive particles into the transfer list
+        void receive(Istream& fromProc, const label procIndex);
+
+        //- Rebuild the cloud by adding the particles in the transfer list
+        void rebuild
+        (
+            const PtrList<labelIOList>& cellProcAddressing,
+            const PtrList<labelIOList>& faceProcAddressing
+        );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CloudDistributeTemplate.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/lagrangian/basic/CloudTemplate/CloudTemplate.C

@@ -339,6 +339,172 @@ void Foam::Cloud<ParticleType>::autoMap(const mapPolyMesh& mapper)
 }
 
 
+template<class ParticleType>
+void Foam::Cloud<ParticleType>::split
+(
+    const labelList& cellToProc,
+    const labelListList& procCellAddressing,
+    const labelListList& procFaceAddressing,
+    List<IDLList<ParticleType> >& procParticles
+)
+{
+    // Create addressing old cell ID to new cell ID from procCellAddressing
+    labelList reverseCellMap(cellToProc.size());
+    forAll(procCellAddressing, procI)
+    {
+        const labelList& procCell = procCellAddressing[procI];
+
+        forAll(procCell, cellI)
+        {
+            reverseCellMap[procCell[cellI]] = cellI;
+        }
+    }
+
+    labelList reverseFaceMap(polyMesh_.nFaces());
+    forAll(procFaceAddressing, procI)
+    {
+        const labelList& procFace = procFaceAddressing[procI];
+
+        forAll(procFace, faceI)
+        {
+            reverseFaceMap[mag(procFace[faceI])-1] = faceI;
+        }
+    }
+
+    if (cloud::debug)
+    {
+        Pout << "printing cloud before splitting" << endl;
+
+        forAllConstIter(typename Cloud<ParticleType>, *this, pIter)
+        {
+            const ParticleType& p = pIter();
+
+            Pout << p.celli_ << " "
+                << p.facei_ << " "
+                << p.position() << " "
+                << p.inCell() << endl;
+        }
+    }
+
+    // Loop over all particles
+    forAllIter(typename Cloud<ParticleType>, *this, pIter)
+    {
+        ParticleType& p = pIter();
+
+        const label newProc = cellToProc[p.celli_];
+
+        // Map cellID and faceID of the particle to new mesh
+        p.celli_ = reverseCellMap[p.celli_];
+
+        if (p.facei_ >= 0)
+        {
+            // HR 29.06.17: face mapping not tested. Did not occur in test cases.
+            p.facei_ = reverseFaceMap[p.facei_];
+        }
+
+        if (newProc != Pstream::myProcNo())
+        {
+            // Add for transfer to new processor and delete from local cloud
+            procParticles[newProc].append(this->remove(&p));
+        }
+    }
+}
+
+
+template<class ParticleType>
+void Foam::Cloud<ParticleType>::rebuild
+(
+    List<IDLList<ParticleType> >& receivedClouds,
+    const PtrList<labelIOList>& cellProcAddressing,
+    const PtrList<labelIOList>& faceProcAddressing
+)
+{
+    {
+        const labelList& procCell = cellProcAddressing[Pstream::myProcNo()];
+        const labelList& procFace = faceProcAddressing[Pstream::myProcNo()];
+
+        // Particles in local cloud. Map cellID and faceID in-place
+        forAllIter
+        (
+            typename Cloud<ParticleType>,
+            *this,
+            pIter
+        )
+        {
+            ParticleType& p = pIter();
+
+            // Map cellID and faceID of the particle to new mesh
+            p.celli_ = procCell[p.celli_];
+
+            if (p.facei_ >= 0)
+            {
+                // HR 29.06.17: face mapping not tested. Did not occur in test cases.
+                p.facei_ = procFace[p.facei_];
+            }
+        }
+    }
+
+    forAll(cellProcAddressing, procI)
+    {
+        if (!cellProcAddressing.set(procI))
+        {
+            continue;
+        }
+
+        const labelList& procCell = cellProcAddressing[procI];
+        const labelList& procFace = faceProcAddressing[procI];
+
+        IDLList<ParticleType>& receivedCloud = receivedClouds[procI];
+
+        // Particles received from other processors. To be added to local cloud
+        forAllIter
+        (
+            typename Cloud<ParticleType>,
+            receivedCloud,
+            newpIter
+        )
+        {
+            ParticleType& newp = newpIter();
+
+            // Map cellID and faceID of the particle to new mesh
+            newp.celli_ = procCell[newp.celli_];
+
+            if (newp.facei_ >= 0)
+            {
+                // HR 29.06.17: face mapping not tested. Did not occur in test cases.
+                newp.facei_ = procFace[newp.facei_];
+            }
+
+            // Add to cloud and remove from transfer list
+            this->addParticle(receivedCloud.remove(&newp));
+        }
+    }
+
+
+    if (cloud::debug)
+    {
+        Pout << "printing cloud after rebuild" << endl;
+
+        forAllIter
+        (
+            typename Cloud<ParticleType>,
+            *this,
+            pIter
+        )
+        {
+            const ParticleType& p = pIter();
+
+            Pout << p.celli_ << " "
+                << p.facei_ << " "
+                << p.position() << " "
+                << p.inCell() << endl;
+        }
+    }
+
+    this->updateMesh();
+}
+
+
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::writePositions() const
 {

src/lagrangian/basic/CloudTemplate/CloudTemplate.H

@@ -39,6 +39,7 @@ SourceFiles
 #include "IDLList.H"
 #include "IOField.H"
 #include "polyMesh.H"
+#include "CloudDistributeTemplate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -150,6 +151,25 @@ public:
             const bool checkClass = true
         );
 
+        autoPtr<cloudDistribute> cloudDist
+        (
+            const labelList& cellToProc,
+            const labelListList& procCellAddressing,
+            const labelListList& procFaceAddressing
+        )
+        {
+            return autoPtr<cloudDistribute>
+            (
+                new CloudDistribute<ParticleType>
+                (
+                    cellToProc,
+                    procCellAddressing,
+                    procFaceAddressing,
+                    *this
+                )
+            );
+        }
+
 
     // Member Functions
 
@@ -245,10 +265,31 @@ public:
             template<class TrackingData>
             void move(TrackingData& td);
 
+            //- Update mesh
+            virtual void updateMesh()
+            {}
+
             //- Remap the cells of particles corresponding to the
             //  mesh topology change
             virtual void autoMap(const mapPolyMesh&);
 
+            //- Split cloud in load balancing
+            virtual void split
+            (
+                const labelList& cellToProc,
+                const labelListList& procCellAddressing,
+                const labelListList& procFaceAddressing,
+                List<IDLList<ParticleType> >& procClouds
+            );
+
+            //- Rebuild cloud in load balancing
+            virtual void rebuild
+            (
+                List<IDLList<ParticleType> >& receivedClouds,
+                const PtrList<labelIOList>& cellProcAddressing,
+                const PtrList<labelIOList>& faceProcAddressing
+            );
+
 
         // Read
 

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudTemplate.C

@@ -266,6 +266,28 @@ void Foam::KinematicCloud<ParcelType>::evolve()
 }
 
 
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::updateMesh()
+{
+    UTrans_.setSize(this->pMesh().nCells());
+
+    injection().updateMesh();
+}
+
+
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::autoMap(const mapPolyMesh& mapper)
+{
+    //typedef typename particle::TrackingData<KinematicCloud<CloudType>> tdType;
+
+    //tdType td(*this);
+
+    //Cloud<parcelType>::template autoMap<tdType>(td, mapper);
+
+    updateMesh();
+}
+
+
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::info() const
 {

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudTemplate.H

@@ -375,6 +375,15 @@ public:
 
             //- Evolve the spray (inject, inject)
             void evolve();
+
+        // Mapping
+
+            //- Update mesh
+            virtual void updateMesh();
+
+            //- Remap the cells of particles corresponding to the
+            //  mesh topology change with a default tracking data object
+            virtual void autoMap(const mapPolyMesh&);
 };
 
 

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C

@@ -147,8 +147,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     // Set total volume to inject
     this->volumeTotal_ = volumeFlowRate_().integrate(0.0, duration_);
 
-    // Set/cache the injector cell
+    updateMesh();
-    this->findCellAtPosition(injectorCell_, position_);
 }
 
 
@@ -168,6 +167,14 @@ bool Foam::ConeInjection<CloudType>::active() const
 }
 
 
+template<class CloudType>
+void Foam::ConeInjection<CloudType>::updateMesh()
+{
+    // Set/cache the injector cell
+    this->findCellAtPosition(injectorCell_, position_);
+}
+
+
 template<class CloudType>
 Foam::scalar Foam::ConeInjection<CloudType>::timeEnd() const
 {

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H

@@ -152,6 +152,9 @@ public:
         //- Flag to indicate whether model activates injection model
         bool active() const;
 
+        //- Set injector locations when mesh is updated
+        virtual void updateMesh();
+
         //- Return the end-of-injection time
         scalar timeEnd() const;
 

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C

@@ -347,6 +347,12 @@ Foam::InjectionModel<CloudType>::~InjectionModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::updateMesh()
+{
+    // do nothing
+}
+
 template<class CloudType>
 template<class TrackData>
 void Foam::InjectionModel<CloudType>::inject(TrackData& td)
@@ -360,6 +366,11 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const scalar carrierDt = owner_.db().time().deltaTValue();
     const polyMesh& mesh = owner_.mesh();
 
+    // BUGFIX HR 23.06.18: Force recalculation of global data because
+    // constrainToMeshCentre is inside of an if-statement
+    mesh.geometricD();
+    mesh.bounds();
+    
     // Prepare for next time step
     label parcelsAdded = 0;
     scalar massAdded = 0.0;

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H

@@ -260,6 +260,12 @@ public:
         virtual bool active() const = 0;
 
 
+        // Mapping
+
+            //- Update mesh
+            virtual void updateMesh();
+
+
         // Global information
 
             //- Return the start-of-injection time