Merge remote-tracking branch 'origin/master' into develop

src/functionObjects/lagrangian/vtkCloud/vtkCloud.C

@@ -139,7 +139,7 @@ bool Foam::functionObjects::vtkCloud::writeCloud
     label nTotParcels = pointsPtr->size();
     reduce(nTotParcels, sumOp<label>());
 
-    if (!nTotParcels)
+    if (pruneEmpty_ && !nTotParcels)
     {
         return false;
     }
@@ -331,6 +331,7 @@ Foam::functionObjects::vtkCloud::vtkCloud
     writeOpts_(vtk::formatType::INLINE_BASE64),
     printf_(),
     useVerts_(false),
+    pruneEmpty_(false),
     selectClouds_(),
     selectFields_(),
     dirName_("VTK"),
@@ -396,6 +397,7 @@ bool Foam::functionObjects::vtkCloud::read(const dictionary& dict)
     // useTimeName_ = dict.lookupOrDefault<bool>("useTimeName", false);
 
     useVerts_ = dict.lookupOrDefault<bool>("cellData", false);
+    pruneEmpty_ = dict.lookupOrDefault<bool>("prune", false);
 
 
     //

src/functionObjects/lagrangian/vtkCloud/vtkCloud.H

@@ -59,6 +59,7 @@ Usage
         directory    | The output directory name        | no          | VTK
         width        | Padding width for file name      | no          | 8
         format       | ascii or binary format           | no          | binary
+        prune        | suppress writing of empty clouds | no          | false
         writePrecision | write precision in ascii       | no | same as IOstream
     \endtable
 
@@ -125,6 +126,9 @@ class vtkCloud
         //- Write lagrangian as cell data (verts) instead of point data
         bool useVerts_;
 
+        //- Suppress writing of empty clouds
+        bool pruneEmpty_;
+
         //- Requested names of clouds to process
         wordRes selectClouds_;