Merge remote branch 'OpenCFD/master' into olesenm

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C

@@ -375,6 +375,44 @@ int main(int argc, char *argv[])
     // mesh wrapper; does subsetting and decomposition
     vtkMesh vMesh(mesh, cellSetName);
 
+
+    // Scan for all possible lagrangian clouds
+    HashSet<fileName> allCloudDirs;
+    forAll(timeDirs, timeI)
+    {
+        runTime.setTime(timeDirs[timeI], timeI);
+        fileNameList cloudDirs
+        (
+            readDir
+            (
+                runTime.timePath()/regionPrefix/cloud::prefix,
+                fileName::DIRECTORY
+            )
+        );
+        forAll(cloudDirs, i)
+        {
+            IOobjectList sprayObjs
+            (
+                mesh,
+                runTime.timeName(),
+                cloud::prefix/cloudDirs[i]
+            );
+
+            IOobject* positionsPtr = sprayObjs.lookup("positions");
+
+            if (positionsPtr)
+            {
+                if (allCloudDirs.insert(cloudDirs[i]))
+                {
+                    Info<< "At time: " << runTime.timeName()
+                        << " detected cloud directory : " << cloudDirs[i]
+                        << endl;
+                }
+            }
+        }
+    }
+
+
     forAll(timeDirs, timeI)
     {
         runTime.setTime(timeDirs[timeI], timeI);
@@ -926,38 +964,33 @@ int main(int argc, char *argv[])
         //
         //---------------------------------------------------------------------
 
-        fileNameList cloudDirs
+        forAllConstIter(HashSet<fileName>, allCloudDirs, iter)
-        (
-            readDir
-            (
-                runTime.timePath()/regionPrefix/cloud::prefix,
-                fileName::DIRECTORY
-            )
-        );
-
-        forAll(cloudDirs, i)
         {
+            const fileName& cloudName = iter.key();
+
+            // Always create the cloud directory.
+            mkDir(fvPath/cloud::prefix/cloudName);
+
+            fileName lagrFileName
+            (
+                fvPath/cloud::prefix/cloudName/cloudName
+              + "_" + timeDesc + ".vtk"
+            );
+
+            Info<< "    Lagrangian: " << lagrFileName << endl;
+
+
             IOobjectList sprayObjs
             (
                 mesh,
                 runTime.timeName(),
-                cloud::prefix/cloudDirs[i]
+                cloud::prefix/cloudName
             );
 
             IOobject* positionsPtr = sprayObjs.lookup("positions");
 
             if (positionsPtr)
             {
-                mkDir(fvPath/cloud::prefix/cloudDirs[i]);
-
-                fileName lagrFileName
-                (
-                    fvPath/cloud::prefix/cloudDirs[i]/cloudDirs[i]
-                  + "_" + timeDesc + ".vtk"
-                );
-
-                Info<< "    Lagrangian: " << lagrFileName << endl;
-
                 wordList labelNames(sprayObjs.names(labelIOField::typeName));
                 Info<< "        labels            :";
                 print(Info, labelNames);
@@ -999,18 +1032,19 @@ int main(int argc, char *argv[])
                     vMesh,
                     binary,
                     lagrFileName,
-                    cloudDirs[i]
+                    cloudName,
+                    false
                 );
 
                 // Write number of fields
                 writer.writeParcelHeader
                 (
                     labelNames.size()
-                + scalarNames.size()
+                  + scalarNames.size()
-                + vectorNames.size()
+                  + vectorNames.size()
-                + sphereNames.size()
+                  + sphereNames.size()
-                + symmNames.size()
+                  + symmNames.size()
-                + tensorNames.size()
+                  + tensorNames.size()
                 );
 
                 // Fields
@@ -1021,6 +1055,20 @@ int main(int argc, char *argv[])
                 writer.writeIOField<symmTensor>(symmNames);
                 writer.writeIOField<tensor>(tensorNames);
             }
+            else
+            {
+                lagrangianWriter writer
+                (
+                    vMesh,
+                    binary,
+                    lagrFileName,
+                    cloudName,
+                    true
+                );
+
+                // Write number of fields
+                writer.writeParcelHeader(0);
+            }
         }
     }
 

applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C

@@ -36,7 +36,8 @@ Foam::lagrangianWriter::lagrangianWriter
     const vtkMesh& vMesh,
     const bool binary,
     const fileName& fName,
-    const word& cloudName
+    const word& cloudName,
+    const bool dummyCloud
 )
 :
     vMesh_(vMesh),
@@ -51,19 +52,28 @@ Foam::lagrangianWriter::lagrangianWriter
     writeFuns::writeHeader(os_, binary_, mesh.time().caseName());
     os_ << "DATASET POLYDATA" << std::endl;
 
-    Cloud<passiveParticle> parcels(mesh, cloudName_, false);
+    if (dummyCloud)
-
-    nParcels_ = parcels.size();
-
-    os_ << "POINTS " << parcels.size() << " float" << std::endl;
-
-    DynamicList<floatScalar> partField(3*parcels.size());
-
-    forAllConstIter(Cloud<passiveParticle>, parcels, elmnt)
     {
-        writeFuns::insert(elmnt().position(), partField);
+        nParcels_ = 0;
+
+        os_ << "POINTS " << nParcels_ << " float" << std::endl;
+    }
+    else
+    {
+        Cloud<passiveParticle> parcels(mesh, cloudName_, false);
+
+        nParcels_ = parcels.size();
+
+        os_ << "POINTS " << nParcels_ << " float" << std::endl;
+
+        DynamicList<floatScalar> partField(3*parcels.size());
+
+        forAllConstIter(Cloud<passiveParticle>, parcels, elmnt)
+        {
+            writeFuns::insert(elmnt().position(), partField);
+        }
+        writeFuns::write(os_, binary_, partField);
     }
-    writeFuns::write(os_, binary_, partField);
 }
 
 

applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H

@@ -80,7 +80,8 @@ public:
             const vtkMesh&,
             const bool binary,
             const fileName&,
-            const word&
+            const word&,
+            const bool dummyCloud
         );
 
 

applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshConvert.C

@@ -165,11 +165,6 @@ void Foam::vtkPV3blockMesh::convertMeshEdges
             continue;
         }
 
-        OStringStream ostr;
-
-        ostr<< edges[edgeI].start() << ":" << edges[edgeI].end() << " - "
-            << edges[edgeI].type();
-
         // search each block
         forAll(blkMesh, blockI)
         {

src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrixTemplates.C

@@ -91,7 +91,7 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
             {
                 OPstream::write
                 (
-                    Pstream::blocking,
+                    Pstream::scheduled,
                     slave,
                     reinterpret_cast<const char*>
                     (
@@ -105,7 +105,7 @@ void Foam::LUscalarMatrix::solve(Field<Type>& sourceSol) const
         {
             IPstream::read
             (
-                Pstream::blocking,
+                Pstream::scheduled,
                 Pstream::masterNo(),
                 reinterpret_cast<char*>(sourceSol.begin()),
                 sourceSol.byteSize()