moved metis into src/other; moved decomposition libraries into src/

src/Allwmake

@@ -18,7 +18,7 @@ wmake libso meshTools
 
 wmake libso finiteVolume
 
-( cd MGridGenGamgAgglomeration && ./Allwmake )
+( cd decompositionAgglomeration && ./Allwmake )
 
 wmake libso sampling
 

src/autoMesh/Make/options

@@ -2,13 +2,13 @@
 
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 $(CGAL_CXXFLAGS) */ \
-    -I$(FOAM_UTILITIES)/parallelProcessing/decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(FOAM_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude
 
 LIB_LIBS = \
     -ldecompositionMethods \

src/decompositionAgglomeration/Allwmake

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -x
+
+wmake libso decompositionMethods
+
+if [ -d $FOAM_MPI_LIBBIN ]
+then
+    wmake libso parMetisDecomp
+fi
+
+( cd MGridGenGamgAgglomeration && ./Allwmake )
+
+
+# ----------------------------------------------------------------- end-of-file

src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomerate.C

@@ -31,10 +31,10 @@ Description
 #include "fvMesh.H"
 #include "syncTools.H"
 
-extern "C"
-{
-#   include "mgridgen.h"
-}
+//extern "C"
+//{
+//#   include "mgridgen.h"
+//}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -42,8 +42,8 @@ void Foam::MGridGenGAMGAgglomeration::
 makeCompactCellFaceAddressingAndFaceWeights
 (
     const lduAddressing& fineAddressing,
-    labelList& cellCells,
-    labelList& cellCellOffsets,
+    List<idxtype>& cellCells,
+    List<idxtype>& cellCellOffsets,
     const vectorField& Si,
     List<scalar>& faceWeights
 )
@@ -113,8 +113,8 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
     const label nFineCells = fineAddressing.size();
 
     // Compact addressing for cellCells
-    labelList cellCells;
-    labelList cellCellOffsets;
+    List<idxtype> cellCells;
+    List<idxtype> cellCellOffsets;
 
     // Face weights = face areas of the internal faces
     List<scalar> faceWeights;
@@ -130,7 +130,7 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
     );
 
     // agglomeration options.
-    labelList options(4, 0);
+    List<int> options(4, 0);
     options[0] = 4;                   // globular agglom
     options[1] = 6;                   // objective F3 and F2
     options[2] = 128;                 // debugging output level
@@ -138,8 +138,8 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
 
 
     // output: cell -> processor addressing
-    tmp<labelField> tfinalAgglom(new labelField(nFineCells));
-    label nMoves = -1;
+    List<int> finalAgglom(nFineCells);
+    int nMoves = -1;
         
     MGridGen
     (
@@ -154,10 +154,10 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
         options.begin(),
         &nMoves,
         &nCoarseCells,
-        tfinalAgglom->begin()
+        finalAgglom.begin()
     );
 
-    return tfinalAgglom;
+    return tmp<labelField>(new labelField(finalAgglom));
 }
 
 

src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/MGridGenGAMGAgglomeration.H

@@ -37,8 +37,15 @@ SourceFiles
 #ifndef MGridGenGAMGAgglomeration_H
 #define MGridGenGAMGAgglomeration_H
 
+#include "fvMesh.H"
 #include "GAMGAgglomeration.H"
 
+extern "C"
+{
+#   include "mgridgen.h"
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -65,8 +72,8 @@ class MGridGenGAMGAgglomeration
         void makeCompactCellFaceAddressingAndFaceWeights
         (
             const lduAddressing& fineAddressing,
-            labelList& cellCells,
-            labelList& cellCellOffsets,
+            List<idxtype>& cellCells,
+            List<idxtype>& cellCellOffsets,
             const vectorField& Si,
             List<scalar>& faceWeights
         );

src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options

@@ -1,4 +1,4 @@
-ParMGridGen = $(LIB_SRC)/MGridGenGamgAgglomeration/ParMGridGen-1.0
+ParMGridGen = $(LIB_SRC)/decompositionAgglomeration/MGridGenGamgAgglomeration/ParMGridGen-1.0
 
 TYPE_REAL=
 #if defined(SP)