Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck

@@ -1,3 +0,0 @@
-makeCells.C
-
-EXE = $(FOAM_USER_APPBIN)/makeCells

applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck

@@ -1,12 +0,0 @@
-EXE_INC = \
-    -g -DFULLDEBUG -O0 \
-    -I$(LIB_SRC)/LESmodels \
-    -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lincompressibleLESmodels \
-    -lincompressibleTransportModels \
-    -lfiniteVolume \
-    -lfoamUtil

applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt

@@ -1,13 +0,0 @@
-EXE_INC = \
-    -I$(FOAM_UTILITIES)/parallelProcessing/decompositionMethods/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -ldecompositionMethods \
-    -lmeshTools \
-    -ldynamicMesh \
-    -lparMetisDecompositionMethod \
-    -lfoamUtil

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

@@ -322,15 +322,15 @@ int main(int argc, char *argv[])
     // Current mesh.
 #   include "createNamedMesh.H"
 
+    // VTK/ directory in the case
+    fileName fvPath(runTime.path()/"VTK");
     // Directory of mesh (region0 gets filtered out)
     fileName regionPrefix = "";
 
-    // make a directory called VTK in the case
-    fileName fvPath(runTime.path()/"VTK");
-
-    if (args.options().found("region"))
+    if (regionName != polyMesh::defaultRegion)
     {
         fvPath = fvPath/regionName;
+        regionPrefix = regionName;
     }
 
     if (dir(fvPath))
@@ -340,6 +340,7 @@ int main(int argc, char *argv[])
             args.options().found("time")
          || args.options().found("latestTime")
          || cellSetName.size() > 0
+         || regionName != polyMesh::defaultRegion
         )
         {
             Info<< "Keeping old VTK files in " << fvPath << nl << endl;

applications/utilities/surface/surfaceTransformPoints/Make/files_bak

@@ -1,4 +0,0 @@
-
-surfaceScale.C
-
-EXE = $(FOAM_APPBIN)/surfaceScale

src/OpenFOAM/primitives/pTraits/pTraits.H

@@ -53,6 +53,11 @@ class pTraits
 
 public:
 
+    pTraits(const primitive& p)
+    :
+        primitive(p)
+    {}
+
     pTraits(Istream& is)
     :
         primitive(is)