Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C

@@ -961,9 +961,14 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcAddressing
     {
         WarningIn
         (
-            "AMIInterpolation::calcAddressing"
-            "(const primitivePatch&, const primitivePatch&, "
-            " label, label)"
+            "void Foam::AMIInterpolation<SourcePatch, TargetPatch>::"
+            "calcAddressing"
+            "("
+                "const primitivePatch&, "
+                "const primitivePatch&, "
+                "label, "
+                "label"
+            ")"
         ) << "Have " << srcPatch.size() << " source faces but no target faces."
           << endl;
 
@@ -1614,7 +1619,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
             "AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation"
             "("
             "    const AMIInterpolation<SourcePatch, TargetPatch>&, "
-            "    const label, "
+            "    const labelList&, "
             "    const labelList&"
             ")"
         )   << "Size mismatch." << nl

src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H

@@ -310,6 +310,7 @@ class AMIInterpolation
                 const bool output
             );
 
+
         // Constructor helper
 
             static void agglomerate
@@ -328,6 +329,7 @@ class AMIInterpolation
                 autoPtr<mapDistribute>& tgtMap
             );
 
+
 public:
 
     // Constructors
@@ -385,9 +387,8 @@ public:
                 //- Return const access to source patch weights
                 inline const scalarListList& srcWeights() const;
 
-                //- Source map pointer - valid only if singlePatchProc=-1.
-                //  This gets
-                //  source data into a form to be consumed by
+                //- Source map pointer - valid only if singlePatchProc = -1
+                //  This gets source data into a form to be consumed by
                 //  tgtAddress, tgtWeights
                 inline const mapDistribute& srcMap() const;
 
@@ -403,9 +404,8 @@ public:
                 //- Return const access to target patch weights
                 inline const scalarListList& tgtWeights() const;
 
-                //- Target map pointer -  valid only if singlePatchProc=-1.
-                //  This gets
-                //  target data into a form to be consumed by
+                //- Target map pointer - valid only if singlePatchProc = -1
+                //  This gets target data into a form to be consumed by
                 //  srcAddress, srcWeights
                 inline const mapDistribute& tgtMap() const;
 

src/meshTools/cellDist/wallPoint/wallPoint.H

@@ -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
@@ -58,7 +58,7 @@ Istream& operator>>(Istream&, wallPoint&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class wallPoint Declaration
+                          Class wallPoint Declaration
 \*---------------------------------------------------------------------------*/
 
 class wallPoint
@@ -71,6 +71,7 @@ class wallPoint
         //- normal distance (squared) from cellcenter to origin
         scalar distSqr_;
 
+
     // Private Member Functions
 
         //- Evaluate distance to point. Update distSqr, origin from whomever
@@ -94,17 +95,10 @@ public:
         inline wallPoint();
 
         //- Construct from origin, distance
-        inline wallPoint
-        (
-            const point& origin,
-            const scalar distSqr
-        );
+        inline wallPoint(const point& origin, const scalar distSqr);
 
         //- Construct as copy
-        inline wallPoint
-        (
-            const wallPoint&
-        );
+        inline wallPoint(const wallPoint&);
 
 
     // Member Functions

src/meshTools/cellDist/wallPoint/wallPointI.H

@@ -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
@@ -82,7 +82,6 @@ inline bool Foam::wallPoint::update
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Null constructor
 inline Foam::wallPoint::wallPoint()
 :
     origin_(point::max),
@@ -90,17 +89,17 @@ inline Foam::wallPoint::wallPoint()
 {}
 
 
-// Construct from origin, distance
 inline Foam::wallPoint::wallPoint(const point& origin, const scalar distSqr)
 :
-    origin_(origin), distSqr_(distSqr)
+    origin_(origin),
+    distSqr_(distSqr)
 {}
 
 
-// Construct as copy
 inline Foam::wallPoint::wallPoint(const wallPoint& wpt)
 :
-    origin_(wpt.origin()), distSqr_(wpt.distSqr())
+    origin_(wpt.origin()),
+    distSqr_(wpt.distSqr())
 {}
 
 
@@ -133,7 +132,7 @@ inline Foam::scalar& Foam::wallPoint::distSqr()
 template<class TrackingData>
 inline bool Foam::wallPoint::valid(TrackingData& td) const
 {
-    return origin_ != point::max;
+    return distSqr_ > -SMALL;
 }