From c1ef233e5d848eb7fe0c0575d5f09f7c726641ec Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 31 Aug 2012 12:57:17 +0100
Subject: [PATCH] ENH: pointMesh: use MeshObject form

---
 .../test/pointField/Test-PointField.C         |  4 +-
 .../advanced/refineHexMesh/refineHexMesh.C    | 11 ++----
 .../decomposePar/decomposePar.C               |  2 +-
 .../reconstructPar/reconstructPar.C           |  2 +-
 .../vtkPV3Foam/vtkPV3FoamFields.C             |  4 +-
 .../fieldview9Reader/fieldview9Reader.C       |  4 +-
 .../streamFunction/streamFunction.C           |  4 +-
 .../displacementSBRStressFvMotionSolver.C     | 37 ++++++++----------
 .../displacementLaplacianFvMotionSolver.C     | 38 ++++++++-----------
 9 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C
index 8646d87801..56528228e1 100644
--- a/applications/test/pointField/Test-PointField.C
+++ b/applications/test/pointField/Test-PointField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 
-    pointMesh pMesh(mesh);
+    const pointMesh& pMesh = pointMesh::New(mesh);
 
     pointVectorField U
     (
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index 876d46d984..94aecd2ffc 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,8 +60,6 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    pointMesh pMesh(mesh);
-
     word cellSetName(args.args()[1]);
     const bool overwrite = args.optionFound("overwrite");
 
@@ -114,11 +112,10 @@ int main(int argc, char *argv[])
 
     // Read point fields
     PtrList<pointScalarField> psFlds;
-    ReadFields(pMesh, objects, psFlds);
+    ReadFields(pointMesh::New(mesh), objects, psFlds);
 
     PtrList<pointVectorField> pvFlds;
-    ReadFields(pMesh, objects, pvFlds);
-
+    ReadFields(pointMesh::New(mesh), objects, pvFlds);
 
 
     // Construct refiner without unrefinement. Read existing point/cell level.
@@ -164,7 +161,6 @@ int main(int argc, char *argv[])
 
     // Update fields
     mesh.updateMesh(map);
-    pMesh.updateMesh(map);
 
     // Update numbering of cells/vertices.
     meshCutter.updateMesh(map);
@@ -173,7 +169,6 @@ int main(int argc, char *argv[])
     if (map().hasMotionPoints())
     {
         mesh.movePoints(map().preMotionPoints());
-        pMesh.movePoints(map().preMotionPoints());
     }
 
     Pout<< "Refined from " << returnReduce(map().nOldCells(), sumOp<label>())
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 49304aadcd..26d3813004 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -395,7 +395,7 @@ int main(int argc, char *argv[])
 
         // Construct the point fields
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-        pointMesh pMesh(mesh);
+        const pointMesh& pMesh = pointMesh::New(mesh);
 
         PtrList<pointScalarField> pointScalarFields;
         readFields(pMesh, objects, pointScalarFields);
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 916a0845e5..5c354531b7 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
         {
             Info<< "Reconstructing point fields" << nl << endl;
 
-            pointMesh pMesh(mesh);
+            const pointMesh& pMesh = pointMesh::New(mesh);
             PtrList<pointMesh> pMeshes(procMeshes.meshes().size());
 
             forAll(pMeshes, procI)
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
index 9a869d37b5..6d0e98dd40 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -195,7 +195,7 @@ void Foam::vtkPV3Foam::convertPointFields
     }
 
     // Construct interpolation on the raw mesh
-    pointMesh pMesh(mesh);
+    const pointMesh& pMesh = pointMesh::New(mesh);
 
 
     convertPointFields<scalar>
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
index 6369396278..301f2e66f7 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1133,7 +1133,7 @@ void user_read_one_grid_function
     // Set fieldvalues
     //
 
-    pointMesh pMesh(mesh);
+    const pointMesh& pMesh = pointMesh::New(mesh);
 
     volPointInterpolation pInterp(mesh, pMesh);
 
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
index c5c024b3ef..69ba83ee92 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 
 #   include "createNamedMesh.H"
 
-    pointMesh pMesh(mesh);
+    const pointMesh& pMesh = pointMesh::New(mesh);
 
     forAll(timeDirs, timeI)
     {
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index 1f0ebf8c0e..04edda45ee 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -42,7 +42,7 @@ namespace Foam
 
     addToRunTimeSelectionTable
     (
-        fvMotionSolver,
+        motionSolver,
         displacementSBRStressFvMotionSolver,
         dictionary
     );
@@ -54,22 +54,11 @@ namespace Foam
 Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
 (
     const polyMesh& mesh,
-    Istream& is
+    const IOdictionary& dict
 )
 :
-    displacementFvMotionSolver(mesh, is),
-    pointDisplacement_
-    (
-        IOobject
-        (
-            "pointDisplacement",
-            fvMesh_.time().timeName(),
-            fvMesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        pointMesh::New(fvMesh_)
-    ),
+    displacementMotionSolver(mesh, dict, typeName),
+    fvMotionSolverCore(mesh),
     cellDisplacement_
     (
         IOobject
@@ -84,14 +73,14 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
         dimensionedVector
         (
             "cellDisplacement",
-            pointDisplacement_.dimensions(),
+            pointDisplacement().dimensions(),
             vector::zero
         ),
-        cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
+        cellMotionBoundaryTypes<vector>(pointDisplacement().boundaryField())
     ),
     diffusivityPtr_
     (
-        motionDiffusivity::New(fvMesh_, lookup("diffusivity"))
+        motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
     )
 {}
 
@@ -116,7 +105,7 @@ Foam::displacementSBRStressFvMotionSolver::curPoints() const
 
     tmp<pointField> tcurPoints
     (
-        points0() + pointDisplacement_.internalField()
+        points0() + pointDisplacement().internalField()
     );
 
     twoDCorrectPoints(tcurPoints());
@@ -128,7 +117,7 @@ Foam::displacementSBRStressFvMotionSolver::curPoints() const
 void Foam::displacementSBRStressFvMotionSolver::solve()
 {
     // The points have moved so before interpolation update
-    // the motionSolver accordingly
+    // the mtionSolver accordingly
     movePoints(fvMesh_.points());
 
     diffusivityPtr_->correct();
@@ -192,12 +181,16 @@ void Foam::displacementSBRStressFvMotionSolver::updateMesh
     const mapPolyMesh& mpm
 )
 {
-    displacementFvMotionSolver::updateMesh(mpm);
+    displacementMotionSolver::updateMesh(mpm);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
     diffusivityPtr_.reset(NULL);
-    diffusivityPtr_ = motionDiffusivity::New(fvMesh_, lookup("diffusivity"));
+    diffusivityPtr_ = motionDiffusivity::New
+    (
+        fvMesh_,
+        coeffDict().lookup("diffusivity")
+    );
 }
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index 043bcb114d..35db99fe0d 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -40,7 +40,7 @@ namespace Foam
 
     addToRunTimeSelectionTable
     (
-        fvMotionSolver,
+        motionSolver,
         displacementLaplacianFvMotionSolver,
         dictionary
     );
@@ -52,22 +52,11 @@ namespace Foam
 Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
 (
     const polyMesh& mesh,
-    Istream& is
+    const IOdictionary& dict
 )
 :
-    displacementFvMotionSolver(mesh, is),
-    pointDisplacement_
-    (
-        IOobject
-        (
-            "pointDisplacement",
-            fvMesh_.time().timeName(),
-            fvMesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        pointMesh::New(fvMesh_)
-    ),
+    displacementMotionSolver(mesh, dict, typeName),
+    fvMotionSolverCore(mesh),
     cellDisplacement_
     (
         IOobject
@@ -90,12 +79,12 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
     pointLocation_(NULL),
     diffusivityPtr_
     (
-        motionDiffusivity::New(fvMesh_, lookup("diffusivity"))
+        motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
     ),
     frozenPointsZone_
     (
-        found("frozenPointsZone")
-      ? fvMesh_.pointZones().findZoneID(lookup("frozenPointsZone"))
+        coeffDict().found("frozenPointsZone")
+      ? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
       : -1
     )
 {
@@ -131,7 +120,8 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
         {
             Info<< "displacementLaplacianFvMotionSolver :"
                 << " Read pointVectorField "
-                << io.name() << " to be used for boundary conditions on points."
+                << io.name()
+                << " to be used for boundary conditions on points."
                 << nl
                 << "Boundary conditions:"
                 << pointLocation_().boundaryField().types() << endl;
@@ -217,7 +207,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
 void Foam::displacementLaplacianFvMotionSolver::solve()
 {
     // The points have moved so before interpolation update
-    // the fvMotionSolver accordingly
+    // the motionSolver accordingly
     movePoints(fvMesh_.points());
 
     diffusivityPtr_->correct();
@@ -240,12 +230,16 @@ void Foam::displacementLaplacianFvMotionSolver::updateMesh
     const mapPolyMesh& mpm
 )
 {
-    displacementFvMotionSolver::updateMesh(mpm);
+    displacementMotionSolver::updateMesh(mpm);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
     diffusivityPtr_.reset(NULL);
-    diffusivityPtr_ = motionDiffusivity::New(fvMesh_, lookup("diffusivity"));
+    diffusivityPtr_ = motionDiffusivity::New
+    (
+        fvMesh_,
+        coeffDict().lookup("diffusivity")
+    );
 }