diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C index 0855c581dc7d0be6f0b114d874e4df2fb116a8d2..1fb0ea1c39d330605560057372c6e0e3ce56c47a 100644 --- a/src/parallel/decompose/metisDecomp/metisDecomp.C +++ b/src/parallel/decompose/metisDecomp/metisDecomp.C @@ -30,8 +30,8 @@ License extern "C" { -#define OMPI_SKIP_MPICXX -# include "metis.h" + #define OMPI_SKIP_MPICXX + #include "metis.h" } @@ -40,14 +40,12 @@ extern "C" namespace Foam { defineTypeNameAndDebug(metisDecomp, 0); - addToRunTimeSelectionTable(decompositionMethod, metisDecomp, dictionary); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Call Metis with options from dictionary. Foam::label Foam::metisDecomp::decompose ( const List<label>& adjncy, @@ -57,9 +55,6 @@ Foam::label Foam::metisDecomp::decompose List<label>& finalDecomp ) { - // C style numbering - //int numFlag = 0; - // Method of decomposition // recursive: multi-level recursive bisection (default) // k-way: multi-level k-way @@ -187,15 +182,15 @@ Foam::label Foam::metisDecomp::decompose //} } - int ncon = 1; + label ncon = 1; - int nProcs = nProcessors_; + label nProcs = nProcessors_; // output: cell -> processor addressing finalDecomp.setSize(numCells); // output: number of cut edges - int edgeCut = 0; + label edgeCut = 0; if (method == "recursive") { diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H index 5f928161249c1514c3ae26bd25f4ddb503150a5e..84dc04bd938d48ac0cb5c46ebed4ff1024741fbb 100644 --- a/src/parallel/decompose/metisDecomp/metisDecomp.H +++ b/src/parallel/decompose/metisDecomp/metisDecomp.H @@ -51,6 +51,7 @@ class metisDecomp // Private Member Functions + //- Call Metis with options from dictionary. label decompose ( const List<label>& adjncy, @@ -131,7 +132,6 @@ public: const pointField& cc, const scalarField& cWeights ); - };