Feature: Rewrite of GGI comms on AMG agglomeration

src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixAgglomeration/BlockMatrixAgglomeration.C

@@ -950,6 +950,7 @@ Foam::BlockMatrixAgglomeration<Type>::restrictMatrix() const
                 AMGInterface::New
                 (
                     coarseAddrPtr(),
+                    coarseInterfaces,
                     fineInterface,
                     fineInterface.interfaceInternalField(agglomIndex_),
                     fineInterfaceAddr[intI]

src/foam/matrices/lduMatrix/solvers/AMG/AMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C

@@ -292,6 +292,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
                     AMGInterface::New
                     (
                         meshLevels_[fineLevelIndex],
+                        coarseInterfaces,
                         fineInterfaces[inti],
                         fineInterfaces[inti].interfaceInternalField
                         (

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterface/AMGInterface.H

@@ -129,12 +129,14 @@ public:
             lduInterface,
             (
                 const lduPrimitiveMesh& lduMesh,
+                const lduInterfacePtrsList& coarseInterfaces,
                 const lduInterface& fineInterface,
                 const labelField& localRestrictAddressing,
                 const labelField& neighbourRestrictAddressing
             ),
             (
                 lduMesh,
+                coarseInterfaces,
                 fineInterface,
                 localRestrictAddressing,
                 neighbourRestrictAddressing
@@ -149,6 +151,7 @@ public:
         static autoPtr<AMGInterface> New
         (
             const lduPrimitiveMesh& lduMesh,
+            const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
             const labelField& neighbourRestrictAddressing
@@ -165,6 +168,11 @@ public:
         {}
 
 
+    //- Destructor
+    virtual ~AMGInterface()
+    {}
+
+
     // Member Functions
 
         // Access

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterface/newAMGInterface.C

@@ -32,6 +32,7 @@ License
 Foam::autoPtr<Foam::AMGInterface> Foam::AMGInterface::New
 (
     const lduPrimitiveMesh& lduMesh,
+    const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
     const labelField& neighbourRestrictAddressing
@@ -46,11 +47,14 @@ Foam::autoPtr<Foam::AMGInterface> Foam::AMGInterface::New
     {
         FatalErrorIn
         (
-            "AMGInterface::New"
+            "AMGInterface::New\n"
-            "(const lduPrimitiveMesh& lduMesh,"
+            "(\n"
-            "const lduInterface& fineInterface,"
+            "    const lduPrimitiveMesh& lduMesh,\n"
-            "const labelField& localRestrictAddressing,"
+            "    const lduInterfacePtrsList& coarseInterfaces,\n"
-            "const labelField& neighbourRestrictAddressing)"
+            "    const lduInterface& fineInterface,\n"
+            "    const labelField& localRestrictAddressing,\n"
+            "    const labelField& neighbourRestrictAddressing\n"
+            ")"
         )   << "Unknown AMGInterface type " << coupleType << ".\n"
             << "Valid AMGInterface types are :"
             << lduInterfaceConstructorTablePtr_->sortedToc()
@@ -62,6 +66,7 @@ Foam::autoPtr<Foam::AMGInterface> Foam::AMGInterface::New
         cstrIter()
         (
             lduMesh,
+            coarseInterfaces,
             fineInterface,
             localRestrictAddressing,
             neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/cyclicAMGInterface/cyclicAMGInterface.C

@@ -45,6 +45,7 @@ namespace Foam
 Foam::cyclicAMGInterface::cyclicAMGInterface
 (
     const lduPrimitiveMesh& lduMesh,
+    const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
     const labelField& neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/cyclicAMGInterface/cyclicAMGInterface.H

@@ -81,6 +81,7 @@ public:
         cyclicAMGInterface
         (
             const lduPrimitiveMesh& lduMesh,
+            const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
             const labelField& neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/cyclicGGIAMGInterface/cyclicGGIAMGInterface.C

@@ -45,6 +45,7 @@ namespace Foam
 Foam::cyclicGGIAMGInterface::cyclicGGIAMGInterface
 (
     const lduPrimitiveMesh& lduMesh,
+    const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
     const labelField& neighbourRestrictAddressing
@@ -53,6 +54,7 @@ Foam::cyclicGGIAMGInterface::cyclicGGIAMGInterface
     ggiAMGInterface
     (
         lduMesh,
+        coarseInterfaces,
         fineInterface,
         localRestrictAddressing,
         neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/cyclicGGIAMGInterface/cyclicGGIAMGInterface.H

@@ -67,6 +67,7 @@ public:
         cyclicGGIAMGInterface
         (
             const lduPrimitiveMesh& lduMesh,
+            const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
             const labelField& neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/ggiAMGInterface/ggiAMGInterface.H

@@ -68,6 +68,11 @@ class ggiAMGInterface
         //- Zone addressing
         labelList zoneAddressing_;
 
+        //- Processor master faces
+        //  Per-processor insertion list of local faces into global zone
+        //  The list is created on the master side and passed onto the slave
+        //  to allow the slave to insert faces in the same order
+        labelListList procMasterFaces_;
 
         // Parallel communication
 
@@ -110,15 +115,15 @@ public:
         ggiAMGInterface
         (
             const lduPrimitiveMesh& lduMesh,
+            const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
             const labelField& neighbourRestrictAddressing
         );
 
 
-    // Destructor
+    //- Destructor
-
+    virtual ~ggiAMGInterface();
-        virtual ~ggiAMGInterface();
 
 
     // Member Functions
@@ -240,6 +245,9 @@ public:
             //- Is the patch localised on a single processor
             virtual bool localParallel() const;
 
+            //- Processor master face insertion list
+            const labelListList& procMasterFaces() const;
+
             //- Return weights
             virtual const scalarListList& weights() const;
 

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.C

@@ -51,6 +51,7 @@ namespace Foam
 Foam::mixingPlaneAMGInterface::mixingPlaneAMGInterface
 (
     const lduPrimitiveMesh& lduMesh,
+    const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
     const labelField& neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.H

@@ -93,6 +93,7 @@ public:
         mixingPlaneAMGInterface
         (
             const lduPrimitiveMesh& lduMesh,
+            const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
             const labelField& neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/processorAMGInterface/processorAMGInterface.C

@@ -45,6 +45,7 @@ namespace Foam
 Foam::processorAMGInterface::processorAMGInterface
 (
     const lduPrimitiveMesh& lduMesh,
+    const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
     const labelField& neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/processorAMGInterface/processorAMGInterface.H

@@ -81,6 +81,7 @@ public:
         processorAMGInterface
         (
             const lduPrimitiveMesh& lduMesh,
+            const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
             const labelField& neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/regionCoupleAMGInterface/regionCoupleAMGInterface.C

@@ -45,6 +45,7 @@ namespace Foam
 Foam::regionCoupleAMGInterface::regionCoupleAMGInterface
 (
     const lduPrimitiveMesh& lduMesh,
+    const lduInterfacePtrsList& coarseInterfaces,
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,
     const labelField& neighbourRestrictAddressing
@@ -53,6 +54,7 @@ Foam::regionCoupleAMGInterface::regionCoupleAMGInterface
     ggiAMGInterface
     (
         lduMesh,
+        coarseInterfaces,
         fineInterface,
         localRestrictAddressing,
         neighbourRestrictAddressing

src/foam/matrices/lduMatrix/solvers/AMG/interfaces/regionCoupleAMGInterface/regionCoupleAMGInterface.H

@@ -73,6 +73,7 @@ public:
         regionCoupleAMGInterface
         (
             const lduPrimitiveMesh& lduMesh,
+            const lduInterfacePtrsList& coarseInterfaces,
             const lduInterface& fineInterface,
             const labelField& localRestrictAddressing,
             const labelField& neighbourRestrictAddressing

src/lduSolvers/amg/amgPolicy/pamgPolicy.C

@@ -648,6 +648,7 @@ Foam::autoPtr<Foam::amgMatrix> Foam::pamgPolicy::restrictMatrix
                 AMGInterface::New
                 (
                     *coarseAddrPtr,
+                    coarseInterfaces,
                     fineInterface,
                     fineInterface.interfaceInternalField(child_),
                     fineInterfaceAddr[intI]