ENH: redistributePar: handle -overwrite. Fixes #1450.

applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C

@@ -135,6 +135,8 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
 {
     //Debug(lpi.size());
 
+    const label oldLpi = lpi.size();
+
     labelListList subMap;
 
 
@@ -229,8 +231,13 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
             }
         }
 
+        if (lagrangianPositions.size())
+        {
             // Write coordinates file
-        IOPosition<passivePositionParticleCloud>(lagrangianPositions).write();
+            IOPosition<passivePositionParticleCloud>
+            (
+                lagrangianPositions
+            ).write();
 
             // Optionally write positions file in v1706 format and earlier
             if (particle::writeLagrangianPositions)
@@ -241,6 +248,33 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
                      cloud::geometryType::POSITIONS
                  ).write();
             }
+        }
+        else if (oldLpi)
+        {
+            // When running with -overwrite it should also delete the old
+            // files. Below works but is not optimal.
+
+            // Remove any existing coordinates
+            const fileName oldCoords
+            (
+                IOPosition<passivePositionParticleCloud>
+                (
+                    lagrangianPositions
+                ).objectPath()
+            );
+            Foam::rm(oldCoords);
+
+            // Remove any existing positions
+            const fileName oldPos
+            (
+                IOPosition<passivePositionParticleCloud>
+                (
+                    lagrangianPositions,
+                    cloud::geometryType::POSITIONS
+                ).objectPath()
+            );
+            Foam::rm(oldPos);
+        }
 
         // Restore cloud name
         lpi.rename(cloudName);

applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorFields.C

@@ -111,11 +111,7 @@ Foam::label Foam::parLagrangianRedistributor::redistributeFields
         map.distribute(field);
 
 
-        if (field.size())
+        const IOobject fieldIO
-        {
-            IOField<Type>
-            (
-                IOobject
         (
             objectName,
             tgtMesh_.time().timeName(),
@@ -124,10 +120,24 @@ Foam::label Foam::parLagrangianRedistributor::redistributeFields
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
-                ),
+        );
+
+        if (field.size())
+        {
+            IOField<Type>
+            (
+                fieldIO,
                 std::move(field)
             ).write();
         }
+        else
+        {
+            // When running with -overwrite it should also delete the old
+            // files. Below works but is not optimal.
+
+            const fileName fldName(fieldIO.objectPath());
+            Foam::rm(fldName);
+        }
     }
 
     return nFields;
@@ -197,11 +207,7 @@ Foam::label Foam::parLagrangianRedistributor::redistributeFieldFields
         map.distribute(field);
 
         // Write
-        if (field.size())
+        const IOobject fieldIO
-        {
-            CompactIOField<Field<Type>, Type>
-            (
-                IOobject
         (
             objectName,
             tgtMesh_.time().timeName(),
@@ -210,10 +216,24 @@ Foam::label Foam::parLagrangianRedistributor::redistributeFieldFields
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
-                ),
+        );
+
+        if (field.size())
+        {
+            CompactIOField<Field<Type>, Type>
+            (
+                fieldIO,
                 std::move(field)
             ).write();
         }
+        else
+        {
+            // When running with -overwrite it should also delete the old
+            // files. Below works but is not optimal.
+
+            const fileName fldName(fieldIO.objectPath());
+            Foam::rm(fldName);
+        }
     }
 
     if (nFields) Info<< endl;
@@ -297,11 +317,7 @@ Foam::label Foam::parLagrangianRedistributor::redistributeStoredFields
 
         map.distribute(field);
 
-        if (field.size())
+        const IOobject fieldIO
-        {
-            Container
-            (
-                IOobject
         (
             field.name(),
             tgtMesh_.time().timeName(),
@@ -310,10 +326,24 @@ Foam::label Foam::parLagrangianRedistributor::redistributeStoredFields
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
-                ),
+        );
+
+        if (field.size())
+        {
+            Container
+            (
+                fieldIO,
                 std::move(field)
             ).write();
         }
+        else
+        {
+            // When running with -overwrite it should also delete the old
+            // files. Below works but is not optimal.
+
+            const fileName fldName(fieldIO.objectPath());
+            Foam::rm(fldName);
+        }
     }
 
     return nFields;

applications/utilities/parallelProcessing/redistributePar/passivePositionParticle.H

@@ -58,7 +58,7 @@ class passivePositionParticle
     // Private Member Data
 
         //- Cached position
-        point position_;
+        point cachedPosition_;
 
 
 public:
@@ -75,7 +75,7 @@ public:
         )
         :
             passiveParticle(mesh, is, readFields, newFormat),
-            position_(position())
+            cachedPosition_(position())
         {}
 
         //- Construct from a position and a cell.
@@ -88,14 +88,14 @@ public:
         )
         :
             passiveParticle(mesh, position, celli),
-            position_(position)
+            cachedPosition_(position)
         {}
 
         //- Construct as copy
         passivePositionParticle(const passivePositionParticle& p)
         :
             passiveParticle(p),
-            position_(p.position_)
+            cachedPosition_(p.cachedPosition_)
         {}
 
         //- Construct and return a clone
@@ -128,6 +128,12 @@ public:
         };
 
 
+        const point& cachedPosition() const
+        {
+            return cachedPosition_;
+        }
+
+
     // Friend Operators
 
         friend Ostream& operator<<
@@ -140,7 +146,7 @@ public:
             // particleIO.C reading old format.
             particle::positionsCompat1706 p;
 
-            p.position = ppi.position_;
+            p.position = ppi.cachedPosition_;
             p.celli = ppi.cell();
             p.facei = ppi.face();
             p.stepFraction = ppi.stepFraction();