Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -1111,6 +1111,11 @@ int main(int argc, char *argv[])
             cellProcAddressing.writeOpt() = IOobject::NO_WRITE;
         }
     }
+    else
+    {
+        cellProcAddressing.writeOpt() = IOobject::NO_WRITE;
+    }
+
     if (faceProcAddressing.headerOk())
     {
         if (faceProcAddressing.size() == mesh.nFaces())
@@ -1146,6 +1151,11 @@ int main(int argc, char *argv[])
             faceProcAddressing.writeOpt() = IOobject::NO_WRITE;
         }
     }
+    else
+    {
+        faceProcAddressing.writeOpt() = IOobject::NO_WRITE;
+    }
+
     if (pointProcAddressing.headerOk())
     {
         if (pointProcAddressing.size() == mesh.nPoints())
@@ -1160,20 +1170,30 @@ int main(int argc, char *argv[])
         }
         else
         {
-            Info<< "Not writing consistent processor point decomposition"
+            Info<< "Not writing inconsistent processor point decomposition"
                 << " map " << pointProcAddressing.filePath() << endl;
             pointProcAddressing.writeOpt() = IOobject::NO_WRITE;
         }
     }
+    else
+    {
+        pointProcAddressing.writeOpt() = IOobject::NO_WRITE;
+    }
+
     if (boundaryProcAddressing.headerOk())
     {
         if (boundaryProcAddressing.size() != mesh.boundaryMesh().size())
         {
-            Info<< "Not writing consistent processor patch decomposition"
+            Info<< "Not writing inconsistent processor patch decomposition"
                 << " map " << boundaryProcAddressing.filePath() << endl;
             boundaryProcAddressing.writeOpt() = IOobject::NO_WRITE;
         }
     }
+    else
+    {
+        boundaryProcAddressing.writeOpt() = IOobject::NO_WRITE;
+    }
+
 
 
 

applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict

@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Write maps from renumbered back to original mesh
-writeMaps true;
+writeMaps false;
 
 // Optional entry: sort cells on coupled boundaries to last for use with
 // e.g. nonBlockingGaussSeidel.

applications/utilities/parallelProcessing/redistributePar/redistributePar.C

@@ -2532,14 +2532,40 @@ int main(int argc, char *argv[])
             bool haveAddressing = false;
             if (haveMesh[Pstream::myProcNo()])
             {
-                haveAddressing = IOobject
+                // Read faces (just to know their size)
+                faceCompactIOList faces
                 (
-                    "faceProcAddressing",
+                    IOobject
-                    facesInstance,
+                    (
-                    meshSubDir,
+                        "faces",
-                    runTime,
+                        facesInstance,
-                    IOobject::READ_IF_PRESENT
+                        meshSubDir,
-                ).typeHeaderOk<labelIOList>(true);
+                        runTime,
+                        IOobject::MUST_READ
+                    )
+                );
+
+                // Check faceProcAddressing
+                labelIOList faceProcAddressing
+                (
+                    IOobject
+                    (
+                        "faceProcAddressing",
+                        facesInstance,
+                        meshSubDir,
+                        runTime,
+                        IOobject::READ_IF_PRESENT
+                    ),
+                    labelList(0)
+                );
+                if
+                (
+                    faceProcAddressing.headerOk()
+                 && faceProcAddressing.size() == faces.size()
+                )
+                {
+                    haveAddressing = true;
+                }
             }
             else
             {

etc/config.csh/vtk

@@ -45,7 +45,7 @@ setenv MESA_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_v
 
 #------------------------------------------------------------------------------
 if ($?FOAM_VERBOSE && $?prompt) then
-    echo "Using vtk  ($vtk_version)  ->  $VTK_ARCH_PATH"
+    echo "Using vtk  ($vtk_version)  ->  $VTK_DIR"
     echo "Using mesa ($mesa_version)  ->  $MESA_ARCH_PATH"
 endif
 

etc/config.sh/vtk

@@ -44,7 +44,7 @@ export MESA_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_v
 #------------------------------------------------------------------------------
 if [ "$FOAM_VERBOSE" -a "$PS1" ]
 then
-    echo "Using vtk  ($vtk_version)  ->  $VTK_ARCH_PATH" 1>&2
+    echo "Using vtk  ($vtk_version)  ->  $VTK_DIR" 1>&2
     echo "Using mesa ($mesa_version)  ->  $MESA_ARCH_PATH" 1>&2
 fi