ENH: Updated ACMI to allow fully disconnected regions

src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C

@@ -206,32 +206,40 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
 )
 {
     // Normalise the weights
-    wghtSum.setSize(wght.size());
+    wghtSum.setSize(wght.size(), 0.0);
     label nLowWeight = 0;
 
     forAll(wght, faceI)
     {
         scalarList& w = wght[faceI];
-        scalar denom = patchAreas[faceI];
 
-        scalar s = sum(w);
-        scalar t = s/denom;
-
-        if (conformal)
+        if (w.size())
         {
-            denom = s;
-        }
+            scalar denom = patchAreas[faceI];
 
-        forAll(w, i)
-        {
-            w[i] /= denom;
-        }
+            scalar s = sum(w);
+            scalar t = s/denom;
+
+            if (conformal)
+            {
+                denom = s;
+            }
 
-        wghtSum[faceI] = t;
+            forAll(w, i)
+            {
+                w[i] /= denom;
+            }
 
-        if (t < lowWeightTol)
+            wghtSum[faceI] = t;
+
+            if (t < lowWeightTol)
+            {
+                nLowWeight++;
+            }
+        }
+        else
         {
-            nLowWeight++;
+            wghtSum[faceI] = 0;
         }
     }
 
@@ -534,6 +542,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
     const SourcePatch& srcPatch,
     const TargetPatch& tgtPatch,
     const faceAreaIntersect::triangulationMode& triMode,
+    const bool requireMatch,
     const interpolationMethod& method,
     const scalar lowWeightCorrection,
     const bool reverseTarget
@@ -541,6 +550,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
 :
     method_(method),
     reverseTarget_(reverseTarget),
+    requireMatch_(requireMatch),
     singlePatchProc_(-999),
     lowWeightCorrection_(lowWeightCorrection),
     srcAddress_(),
@@ -564,6 +574,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
     const TargetPatch& tgtPatch,
     const autoPtr<searchableSurface>& surfPtr,
     const faceAreaIntersect::triangulationMode& triMode,
+    const bool requireMatch,
     const interpolationMethod& method,
     const scalar lowWeightCorrection,
     const bool reverseTarget
@@ -571,6 +582,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
 :
     method_(method),
     reverseTarget_(reverseTarget),
+    requireMatch_(requireMatch),
     singlePatchProc_(-999),
     lowWeightCorrection_(lowWeightCorrection),
     srcAddress_(),
@@ -654,6 +666,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
 :
     method_(fineAMI.method_),
     reverseTarget_(fineAMI.reverseTarget_),
+    requireMatch_(fineAMI.requireMatch_),
     singlePatchProc_(fineAMI.singlePatchProc_),
     lowWeightCorrection_(-1.0),
     srcAddress_(),
@@ -862,7 +875,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
                 srcMagSf_,
                 tgtMagSf_,
                 triMode_,
-                reverseTarget_
+                reverseTarget_,
+                requireMatch_
             )
         );
 
@@ -978,7 +992,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
                 srcMagSf_,
                 tgtMagSf_,
                 triMode_,
-                reverseTarget_
+                reverseTarget_,
+                requireMatch_
             )
         );
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H

@@ -116,6 +116,10 @@ private:
         //  that the orientation of the target patch should be reversed
         const bool reverseTarget_;
 
+        //- Flag to indicate that the two patches must be matched/an overlap
+        //  exists between them
+        const bool requireMatch_;
+
         //- Index of processor that holds all of both sides. -1 in all other
         //  cases
         label singlePatchProc_;
@@ -276,6 +280,7 @@ public:
             const SourcePatch& srcPatch,
             const TargetPatch& tgtPatch,
             const faceAreaIntersect::triangulationMode& triMode,
+            const bool requireMatch = true,
             const interpolationMethod& method = imFaceAreaWeight,
             const scalar lowWeightCorrection = -1,
             const bool reverseTarget = false
@@ -288,6 +293,7 @@ public:
             const TargetPatch& tgtPatch,
             const autoPtr<searchableSurface>& surf,
             const faceAreaIntersect::triangulationMode& triMode,
+            const bool requireMatch = true,
             const interpolationMethod& method = imFaceAreaWeight,
             const scalar lowWeightCorrection = -1,
             const bool reverseTarget = false

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C

@@ -98,6 +98,10 @@ bool Foam::AMIMethod<SourcePatch, TargetPatch>::initialise
         (
             "void Foam::AMIMethod<SourcePatch, TargetPatch>::initialise"
             "("
+                "labelListList&, "
+                "scalarListList&, "
+                "labelListList&, "
+                "scalarListList&, "
                 "label&, "
                 "label&"
             ")"
@@ -129,14 +133,24 @@ bool Foam::AMIMethod<SourcePatch, TargetPatch>::initialise
 
         if (!foundFace)
         {
-            FatalErrorIn
-            (
-                "void Foam::AMIMethod<SourcePatch, TargetPatch>::initialise"
-                "("
-                    "label&, "
-                    "label&"
-                ")"
-            )   << "Unable to find initial target face" << abort(FatalError);
+            if (requireMatch_)
+            {
+                FatalErrorIn
+                (
+                    "void Foam::AMIMethod<SourcePatch, TargetPatch>::initialise"
+                    "("
+                        "labelListList&, "
+                        "scalarListList&, "
+                        "labelListList&, "
+                        "scalarListList&, "
+                        "label&, "
+                        "label&"
+                    ")"
+                )   << "Unable to find initial target face"
+                    << abort(FatalError);
+            }
+
+            return false;
         }
     }
 
@@ -327,12 +341,14 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::AMIMethod
     const scalarField& srcMagSf,
     const scalarField& tgtMagSf,
     const faceAreaIntersect::triangulationMode& triMode,
-    const bool reverseTarget
+    const bool reverseTarget,
+    const bool requireMatch
 )
 :
     srcPatch_(srcPatch),
     tgtPatch_(tgtPatch),
     reverseTarget_(reverseTarget),
+    requireMatch_(requireMatch),
     srcMagSf_(srcMagSf),
     tgtMagSf_(tgtMagSf),
     srcNonOverlap_(),

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,6 +85,10 @@ protected:
         //  that the orientation of the target patch should be reversed
         const bool reverseTarget_;
 
+        //- Flag to indicate that the two patches must be matched/an overlap
+        //  exists between them
+        const bool requireMatch_;
+
         //- Source face areas
         const scalarField& srcMagSf_;
 
@@ -166,9 +170,18 @@ public:
             const scalarField& srcMagSf,
             const scalarField& tgtMagSf,
             const faceAreaIntersect::triangulationMode& triMode,
-            const bool reverseTarget
+            const bool reverseTarget,
+            const bool requireMatch
         ),
-        (srcPatch, tgtPatch, srcMagSf, tgtMagSf, triMode, reverseTarget)
+        (
+            srcPatch,
+            tgtPatch,
+            srcMagSf,
+            tgtMagSf,
+            triMode,
+            reverseTarget,
+            requireMatch
+        )
     );
 
     //- Construct from components
@@ -179,7 +192,8 @@ public:
         const scalarField& srcMagSf,
         const scalarField& tgtMagSf,
         const faceAreaIntersect::triangulationMode& triMode,
-        const bool reverseTarget
+        const bool reverseTarget,
+        const bool requireMatch
     );
 
     //- Selector
@@ -191,7 +205,8 @@ public:
         const scalarField& srcMagSf,
         const scalarField& tgtMagSf,
         const faceAreaIntersect::triangulationMode& triMode,
-        const bool reverseTarget
+        const bool reverseTarget,
+        const bool requireMatch
     );
 
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,8 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::New
     const scalarField& srcMagSf,
     const scalarField& tgtMagSf,
     const faceAreaIntersect::triangulationMode& triMode,
-    const bool reverseTarget
+    const bool reverseTarget,
+    const bool requireMatch
 )
 {
     if (debug)
@@ -58,6 +59,7 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::New
                 "const scalarField&, "
                 "const scalarField&, "
                 "const faceAreaIntersect::triangulationMode&, "
+                "const bool, "
                 "const bool"
             ")"
         )   << "Unknown AMIMethod type "
@@ -75,7 +77,8 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::New
             srcMagSf,
             tgtMagSf,
             triMode,
-            reverseTarget
+            reverseTarget,
+            requireMatch
         )
     );
 }

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,8 @@ Foam::directAMI<SourcePatch, TargetPatch>::directAMI
     const scalarField& srcMagSf,
     const scalarField& tgtMagSf,
     const faceAreaIntersect::triangulationMode& triMode,
-    const bool reverseTarget
+    const bool reverseTarget,
+    const bool requireMatch
 )
 :
     AMIMethod<SourcePatch, TargetPatch>
@@ -116,7 +117,8 @@ Foam::directAMI<SourcePatch, TargetPatch>::directAMI
         srcMagSf,
         tgtMagSf,
         triMode,
-        reverseTarget
+        reverseTarget,
+        requireMatch
     )
 {}
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,8 @@ public:
             const scalarField& srcMagSf,
             const scalarField& tgtMagSf,
             const faceAreaIntersect::triangulationMode& triMode,
-            const bool reverseTarget = false
+            const bool reverseTarget = false,
+            const bool requireMatch = true
         );
 
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C

@@ -482,6 +482,7 @@ Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::faceAreaWeightAMI
     const scalarField& tgtMagSf,
     const faceAreaIntersect::triangulationMode& triMode,
     const bool reverseTarget,
+    const bool requireMatch,
     const bool restartUncoveredSourceFace
 )
 :
@@ -492,7 +493,8 @@ Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::faceAreaWeightAMI
         srcMagSf,
         tgtMagSf,
         triMode,
-        reverseTarget
+        reverseTarget,
+        requireMatch
     ),
     restartUncoveredSourceFace_(restartUncoveredSourceFace)
 {}

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,6 +144,7 @@ public:
             const scalarField& tgtMagSf,
             const faceAreaIntersect::triangulationMode& triMode,
             const bool reverseTarget = false,
+            const bool requireMatch = true,
             const bool restartUncoveredSourceFace = true
         );
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C

@@ -183,7 +183,8 @@ Foam::mapNearestAMI<SourcePatch, TargetPatch>::mapNearestAMI
     const scalarField& srcMagSf,
     const scalarField& tgtMagSf,
     const faceAreaIntersect::triangulationMode& triMode,
-    const bool reverseTarget
+    const bool reverseTarget,
+    const bool requireMatch
 )
 :
     AMIMethod<SourcePatch, TargetPatch>
@@ -193,7 +194,8 @@ Foam::mapNearestAMI<SourcePatch, TargetPatch>::mapNearestAMI
         srcMagSf,
         tgtMagSf,
         triMode,
-        reverseTarget
+        reverseTarget,
+        requireMatch
     )
 {}
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,8 @@ public:
             const scalarField& srcMagSf,
             const scalarField& tgtMagSf,
             const faceAreaIntersect::triangulationMode& triMode,
-            const bool reverseTarget = false
+            const bool reverseTarget = false,
+            const bool requireMatch = true
         );
 
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,8 @@ partialFaceAreaWeightAMI
     const scalarField& srcMagSf,
     const scalarField& tgtMagSf,
     const faceAreaIntersect::triangulationMode& triMode,
-    const bool reverseTarget
+    const bool reverseTarget,
+    const bool requireMatch
 )
 :
     faceAreaWeightAMI<SourcePatch, TargetPatch>
@@ -73,7 +74,8 @@ partialFaceAreaWeightAMI
         srcMagSf,
         tgtMagSf,
         triMode,
-        reverseTarget
+        reverseTarget,
+        requireMatch
     )
 {}
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,8 @@ public:
             const scalarField& srcMagSf,
             const scalarField& tgtMagSf,
             const faceAreaIntersect::triangulationMode& triMode,
-            const bool reverseTarget = false
+            const bool reverseTarget = false,
+            const bool requireMatch = true
         );
 
 

src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C

@@ -208,6 +208,8 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
     tgtMask_(),
     updated_(false)
 {
+    AMIRequireMatch_ = false;
+
     // Non-overlapping patch might not be valid yet so cannot determine
     // associated patchID
 }
@@ -230,6 +232,8 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
     tgtMask_(),
     updated_(false)
 {
+    AMIRequireMatch_ = false;
+
     if (nonOverlapPatchName_ == name)
     {
         FatalIOErrorIn
@@ -267,6 +271,8 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
     tgtMask_(),
     updated_(false)
 {
+    AMIRequireMatch_ = false;
+
     // Non-overlapping patch might not be valid yet so cannot determine
     // associated patchID
 }
@@ -291,6 +297,8 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
     tgtMask_(),
     updated_(false)
 {
+    AMIRequireMatch_ = false;
+
     if (nonOverlapPatchName_ == name())
     {
         FatalErrorIn
@@ -328,7 +336,9 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
     srcMask_(),
     tgtMask_(),
     updated_(false)
-{}
+{
+    AMIRequireMatch_ = false;
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //

src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C

@@ -388,6 +388,7 @@ void Foam::cyclicAMIPolyPatch::resetAMI
                 nbrPatch0,
                 surfPtr(),
                 faceAreaIntersect::tmMesh,
+                AMIRequireMatch_,
                 AMIMethod,
                 AMILowWeightCorrection_,
                 AMIReverse_
@@ -501,6 +502,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     separationVector_(vector::zero),
     AMIPtr_(NULL),
     AMIReverse_(false),
+    AMIRequireMatch_(true),
     AMILowWeightCorrection_(-1.0),
     surfPtr_(NULL),
     surfDict_(fileName("surface"))
@@ -530,6 +532,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     separationVector_(vector::zero),
     AMIPtr_(NULL),
     AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
+    AMIRequireMatch_(true),
     AMILowWeightCorrection_(dict.lookupOrDefault("lowWeightCorrection", -1.0)),
     surfPtr_(NULL),
     surfDict_(dict.subOrEmptyDict("surface"))
@@ -639,6 +642,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     separationVector_(pp.separationVector_),
     AMIPtr_(NULL),
     AMIReverse_(pp.AMIReverse_),
+    AMIRequireMatch_(pp.AMIRequireMatch_),
     AMILowWeightCorrection_(pp.AMILowWeightCorrection_),
     surfPtr_(NULL),
     surfDict_(pp.surfDict_)
@@ -669,6 +673,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     separationVector_(pp.separationVector_),
     AMIPtr_(NULL),
     AMIReverse_(pp.AMIReverse_),
+    AMIRequireMatch_(pp.AMIRequireMatch_),
     AMILowWeightCorrection_(pp.AMILowWeightCorrection_),
     surfPtr_(NULL),
     surfDict_(pp.surfDict_)
@@ -713,6 +718,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     separationVector_(pp.separationVector_),
     AMIPtr_(NULL),
     AMIReverse_(pp.AMIReverse_),
+    AMIRequireMatch_(pp.AMIRequireMatch_),
     AMILowWeightCorrection_(pp.AMILowWeightCorrection_),
     surfPtr_(NULL),
     surfDict_(pp.surfDict_)

src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H

@@ -56,7 +56,24 @@ class cyclicAMIPolyPatch
 
 private:
 
-    // Private data
+    // Private Member Functions
+
+        //- Return normal of face at max distance from rotation axis
+        vector findFaceNormalMaxRadius(const pointField& faceCentres) const;
+
+        void calcTransforms
+        (
+            const primitivePatch& half0,
+            const pointField& half0Ctrs,
+            const vectorField& half0Areas,
+            const pointField& half1Ctrs,
+            const vectorField& half1Areas
+        );
+
+
+protected:
+
+    // Protected data
 
         //- Name of other half
         mutable word nbrPatchName_;
@@ -97,6 +114,9 @@ private:
         //- Flag to indicate that slave patch should be reversed for AMI
         const bool AMIReverse_;
 
+        //- Flag to indicate that patches should match/overlap
+        bool AMIRequireMatch_;
+
         //- Low weight correction threshold for AMI
         const scalar AMILowWeightCorrection_;
 
@@ -107,23 +127,6 @@ private:
         const dictionary surfDict_;