From 4eb034477060a9847e6b8b4234763a297a2ecef6 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 7 Mar 2011 15:08:45 +0000
Subject: [PATCH] fvMesh not required

---
 src/dynamicMesh/dynamicMesh/Make/files              |  7 ++-----
 src/dynamicMesh/dynamicMesh/Make/options            |  3 +--
 .../directTopoChange/directTopoChange.C             | 13 ++++++-------
 .../directTopoChange/directTopoChange.H             |  5 ++---
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/dynamicMesh/dynamicMesh/Make/files b/src/dynamicMesh/dynamicMesh/Make/files
index 06cc2f2f4..25faf6db0 100644
--- a/src/dynamicMesh/dynamicMesh/Make/files
+++ b/src/dynamicMesh/dynamicMesh/Make/files
@@ -86,15 +86,12 @@ $(modifiers)/undoableMeshCutter/undoableMeshCutter.C
 $(modifiers)/refinementIterator/refinementIterator.C
 $(modifiers)/multiDirRefinement/multiDirRefinement.C
 
-meshAdder = directTopoChange/meshAdder
-$(meshAdder)/polyMeshAdder/faceCoupleInfo.C
-$(meshAdder)/polyMeshAdder/polyMeshAdder.C
-$(meshAdder)/fvMeshAdder/fvMeshAdder.C
+directTopoChange/polyMeshAdder/faceCoupleInfo.C
+directTopoChange/polyMeshAdder/polyMeshAdder.C
 
 directTopoChange/boundaryMesh/octreeDataFaceList.C
 directTopoChange/boundaryMesh/boundaryPatch.C
 directTopoChange/boundaryMesh/boundaryMesh.C
-directTopoChange/fvMeshDistribute/fvMeshDistribute.C
 
 directTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
 
diff --git a/src/dynamicMesh/dynamicMesh/Make/options b/src/dynamicMesh/dynamicMesh/Make/options
index f168589ea..e6dffb360 100644
--- a/src/dynamicMesh/dynamicMesh/Make/options
+++ b/src/dynamicMesh/dynamicMesh/Make/options
@@ -1,8 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 LIB_LIBS = \
-    -lfiniteVolume \
+    -lmeshTools \
     -ltriSurface
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
index fe3e727d7..50642316f 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.C
@@ -38,7 +38,6 @@ License
 #include "polyRemoveCell.H"
 #include "objectMap.H"
 #include "processorPolyPatch.H"
-#include "fvMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -3215,9 +3214,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::changeMesh
 
 Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::makeMesh
 (
-    autoPtr<fvMesh>& newMeshPtr,
+    autoPtr<polyMesh>& newMeshPtr,
     const IOobject& io,
-    const fvMesh& mesh,
+    const polyMesh& mesh,
     const bool syncParallel,
     const bool orderCells,
     const bool orderPoints
@@ -3226,7 +3225,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::makeMesh
     if (debug)
     {
         Pout<< "directTopoChange::changeMesh"
-            << "(autoPtr<fvMesh>&, const IOobject&, const fvMesh&"
+            << "(autoPtr<polyMesh>&, const IOobject&, const polyMesh&"
             << ", const bool, const bool, const bool)"
             << endl;
     }
@@ -3296,7 +3295,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::makeMesh
 
     newMeshPtr.reset
     (
-        new fvMesh
+        new polyMesh
         (
             io,
             xferMove(newPoints),
@@ -3305,7 +3304,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::makeMesh
             faceNeighbour_.xfer()
         )
     );
-    fvMesh& newMesh = newMeshPtr();
+    polyMesh& newMesh = newMeshPtr();
 
     if (debug)
     {
@@ -3369,7 +3368,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::directTopoChange::makeMesh
                 patchStarts[patchI]
             ).ptr();
         }
-        newMesh.addFvPatches(newBoundary);
+        newMesh.addPatches(newBoundary);
     }
 
 
diff --git a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.H b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.H
index 94c859063..92f95dc05 100644
--- a/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.H
+++ b/src/dynamicMesh/dynamicMesh/directTopoChange/directTopoChange/directTopoChange.H
@@ -87,7 +87,6 @@ namespace Foam
 class face;
 class primitiveMesh;
 class polyMesh;
-class fvMesh;
 class Time;
 class fileName;
 class polyBoundaryMesh;
@@ -582,9 +581,9 @@ public:
             //- Create new mesh with old mesh patches
             autoPtr<mapPolyMesh> makeMesh
             (
-                autoPtr<fvMesh>& newMesh,
+                autoPtr<polyMesh>& newMesh,
                 const IOobject& io,
-                const fvMesh& mesh,
+                const polyMesh& mesh,
                 const bool syncParallel = true,
                 const bool orderCells = false,
                 const bool orderPoints = false