From 993a18af6350b7f7a2359cbef40bff1074926ce0 Mon Sep 17 00:00:00 2001
From: mattijs <m.janssens@opencfd.co.uk>
Date: Thu, 29 May 2008 12:02:36 +0100
Subject: [PATCH 1/4] constructor from primitive

---
 src/OpenFOAM/primitives/pTraits/pTraits.H | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/OpenFOAM/primitives/pTraits/pTraits.H b/src/OpenFOAM/primitives/pTraits/pTraits.H
index 9ba24049a7..bc03885bb6 100644
--- a/src/OpenFOAM/primitives/pTraits/pTraits.H
+++ b/src/OpenFOAM/primitives/pTraits/pTraits.H
@@ -53,6 +53,11 @@ class pTraits
 
 public:
 
+    pTraits(const primitive& p)
+    :
+        primitive(p)
+    {}
+
     pTraits(Istream& is)
     :
         primitive(is)

From 2f6a6be48bdb116ff09c2af68a61a94797a965c6 Mon Sep 17 00:00:00 2001
From: mattijs <m.janssens@opencfd.co.uk>
Date: Thu, 29 May 2008 13:25:51 +0100
Subject: [PATCH 2/4] region lagrangian handling

---
 .../postProcessing/dataConversion/foamToVTK/foamToVTK.C  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index c9d7409a02..d30a4dfd07 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/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;

From 2e0962685a9ccdd99f581369868cd2b9f1e54804 Mon Sep 17 00:00:00 2001
From: mattijs <m.janssens@opencfd.co.uk>
Date: Thu, 29 May 2008 13:26:21 +0100
Subject: [PATCH 3/4] strange triFace constructors

---
 .../meshes/meshShapes/triFace/triFace.H       |  7 +--
 .../meshes/meshShapes/triFace/triFaceI.H      | 60 +++++++------------
 2 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 9672b93147..7d60ea2bb8 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -81,11 +81,8 @@ public:
             const label c
         );
 
-        //- Construct from a face, discarding excess points
-        inline triFace(const face&);
-
-        //- Construct from a labelList, discarding excess points
-        explicit inline triFace(const labelList&);
+        //- Construct from a UList<label>
+        explicit inline triFace(const UList<label>&);
 
         //- Construct from Istream
         inline triFace(Istream&);
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index 9574a06cbf..5fdc0e1c29 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -28,15 +28,9 @@ License
 #include "face.H"
 #include "triPointRef.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-
-inline int triFace::compare(const triFace& a, const triFace& b)
+inline int Foam::triFace::compare(const triFace& a, const triFace& b)
 {
     if
     (
@@ -64,15 +58,14 @@ inline int triFace::compare(const triFace& a, const triFace& b)
     }
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct null
-inline triFace::triFace()
+inline Foam::triFace::triFace()
 {}
 
 
-// Construct from components
-inline triFace::triFace
+inline Foam::triFace::triFace
 (
     const label a,
     const label b,
@@ -84,20 +77,14 @@ inline triFace::triFace
     operator[](2) = c;
 }
 
-// Construct from a face
-inline triFace::triFace(const face& f)
-:
-    FixedList<label, 3>(SubList<label>(f,3))
-{}
 
-// Construct from a labelList
-inline triFace::triFace(const labelList& l)
+inline Foam::triFace::triFace(const UList<label>& l)
 :
-    FixedList<label, 3>(SubList<label>(l,3))
+    FixedList<label, 3>(l)
 {}
 
 
-inline triFace::triFace(Istream& is)
+inline Foam::triFace::triFace(Istream& is)
 :
     FixedList<label, 3>(is)
 {}
@@ -105,7 +92,6 @@ inline triFace::triFace(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 inline Foam::label Foam::triFace::collapse()
 {
     // we cannot resize a FixedList, so mark duplicates with '-1'
@@ -133,8 +119,7 @@ inline Foam::label Foam::triFace::collapse()
 }
 
 
-// Return the points associated with this face
-inline pointField triFace::points(const pointField& points) const
+inline Foam::pointField Foam::triFace::points(const pointField& points) const
 {
     pointField p(3);
 
@@ -146,8 +131,7 @@ inline pointField triFace::points(const pointField& points) const
 }
 
 
-// Return triagle as a face
-inline face triFace::triFaceFace() const
+inline Foam::face Foam::triFace::triFaceFace() const
 {
     face f(3);
 
@@ -159,13 +143,13 @@ inline face triFace::triFaceFace() const
 }
 
 
-inline label triFace::nEdges() const
+inline Foam::label Foam::triFace::nEdges() const
 {
     return 3;
 }
 
 
-inline edgeList triFace::edges() const
+inline Foam::edgeList Foam::triFace::edges() const
 {
     edgeList e(3);
 
@@ -186,7 +170,7 @@ inline edgeList triFace::edges() const
 //  - +1: forward (counter-clockwise) on the face
 //  - -1: reverse (clockwise) on the face
 //  -  0: edge not found on the face
-inline int triFace::edgeDirection(const edge& e) const
+inline int Foam::triFace::edgeDirection(const edge& e) const
 {
     if
     (
@@ -213,7 +197,7 @@ inline int triFace::edgeDirection(const edge& e) const
 }
 
 
-inline point triFace::centre(const pointField& points) const
+inline Foam::point Foam::triFace::centre(const pointField& points) const
 {
     return (1.0/3.0)*
     (
@@ -224,13 +208,13 @@ inline point triFace::centre(const pointField& points) const
 }
 
 
-inline scalar triFace::mag(const pointField& points) const
+inline Foam::scalar Foam::triFace::mag(const pointField& points) const
 {
     return ::Foam::mag(normal(points));
 }
 
 
-inline vector triFace::normal(const pointField& points) const
+inline Foam::vector Foam::triFace::normal(const pointField& points) const
 {
     return 0.5*
     (
@@ -240,7 +224,7 @@ inline vector triFace::normal(const pointField& points) const
 }
 
 
-inline scalar triFace::sweptVol
+inline Foam::scalar Foam::triFace::sweptVol
 (
     const pointField& opts,
     const pointField& npts
@@ -273,7 +257,7 @@ inline scalar triFace::sweptVol
 }
 
 
-inline pointHit triFace::ray
+inline Foam::pointHit Foam::triFace::ray
 (
     const point& p,
     const vector& q,
@@ -291,7 +275,7 @@ inline pointHit triFace::ray
 }
 
 
-inline triPointRef triFace::tri(const pointField& points) const
+inline Foam::triPointRef Foam::triFace::tri(const pointField& points) const
 {
     return triPointRef
     (
@@ -304,20 +288,16 @@ inline triPointRef triFace::tri(const pointField& points) const
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-inline bool operator==(const triFace& a, const triFace& b)
+inline bool Foam::operator==(const triFace& a, const triFace& b)
 {
     return triFace::compare(a,b) != 0;
 }
 
 
-inline bool operator!=(const triFace& a, const triFace& b)
+inline bool Foam::operator!=(const triFace& a, const triFace& b)
 {
     return triFace::compare(a,b) == 0;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //

From 451fa204fa94273886de2ff09ff4040db56f6a25 Mon Sep 17 00:00:00 2001
From: mattijs <m.janssens@opencfd.co.uk>
Date: Thu, 29 May 2008 14:05:42 +0100
Subject: [PATCH 4/4] cleanup backups

---
 .../redistributeMeshPar/Make/files.bck              |  3 ---
 .../redistributeMeshPar/Make/options.bck            | 12 ------------
 .../redistributeMeshPar/Make/options.txt            | 13 -------------
 .../surface/surfaceTransformPoints/Make/files_bak   |  4 ----
 4 files changed, 32 deletions(-)
 delete mode 100644 applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck
 delete mode 100644 applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck
 delete mode 100644 applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt
 delete mode 100644 applications/utilities/surface/surfaceTransformPoints/Make/files_bak

diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck
deleted file mode 100644
index ab882677c7..0000000000
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/files.bck
+++ /dev/null
@@ -1,3 +0,0 @@
-makeCells.C
-
-EXE = $(FOAM_USER_APPBIN)/makeCells
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck
deleted file mode 100644
index 7f7271b3af..0000000000
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.bck
+++ /dev/null
@@ -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
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt
deleted file mode 100644
index 6efcb1c0a0..0000000000
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options.txt
+++ /dev/null
@@ -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
diff --git a/applications/utilities/surface/surfaceTransformPoints/Make/files_bak b/applications/utilities/surface/surfaceTransformPoints/Make/files_bak
deleted file mode 100644
index fa405bffbc..0000000000
--- a/applications/utilities/surface/surfaceTransformPoints/Make/files_bak
+++ /dev/null
@@ -1,4 +0,0 @@
-
-surfaceScale.C
-
-EXE = $(FOAM_APPBIN)/surfaceScale