diff --git a/applications/test/decomposePar/Make/options b/applications/test/decomposePar/Make/options index 1f62e3ffa8..a81cfd44fc 100644 --- a/applications/test/decomposePar/Make/options +++ b/applications/test/decomposePar/Make/options @@ -8,5 +8,6 @@ EXE_INC = \ EXE_LIBS = \ -ldecompose \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp -lkahipDecomp \ + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lscotchDecomp \ -lregionModels diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options index 386b669083..703a72fcc0 100644 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options @@ -28,5 +28,6 @@ EXE_LIBS = \ -lmeshTools \ -lsampling \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \ + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options index 40373bec9d..772de8d78a 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options @@ -31,5 +31,6 @@ EXE_LIBS = \ -lsampling \ -ldecompositionMethods \ -ldecompose \ - -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \ + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options index 66ddf81aac..67cd78a01a 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options @@ -18,6 +18,8 @@ EXE_LIBS = \ -L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \ -lGL \ -lconformalVoronoiMesh \ - -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \ + -ldecompositionMethods \ + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lscotchDecomp \ -lmeshTools \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options index 1b509ac9df..ed15cdf94e 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options @@ -31,4 +31,5 @@ EXE_LIBS = \ -lsampling \ -ldynamicMesh \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index bb863797fa..ed8acb579c 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -13,9 +13,8 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ - /* note: scotch < 6.0 does not like both scotch and ptscotch together */ \ - -lscotchDecomp \ + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \ -lmeshTools \ -ldynamicMesh \ -ldecompose \ diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options index 5803e893aa..e2343e6ee6 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options +++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options @@ -18,4 +18,5 @@ EXE_LIBS = \ -lreconstruct \ $(LINK_FLAGS) \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp -lkahipDecomp + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lscotchDecomp diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options index 34f3e5de33..7e74790e00 100644 --- a/applications/utilities/parallelProcessing/decomposePar/Make/options +++ b/applications/utilities/parallelProcessing/decomposePar/Make/options @@ -12,7 +12,8 @@ EXE_LIBS = \ -ldecompose \ -lgenericPatchFields \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp -lkahipDecomp \ + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lscotchDecomp \ -llagrangian \ -ldynamicMesh \ -lregionModels diff --git a/applications/utilities/parallelProcessing/redistributePar/Make/options b/applications/utilities/parallelProcessing/redistributePar/Make/options index 189902467f..46f67054e2 100644 --- a/applications/utilities/parallelProcessing/redistributePar/Make/options +++ b/applications/utilities/parallelProcessing/redistributePar/Make/options @@ -11,7 +11,8 @@ EXE_LIBS = \ -lfiniteVolume \ -lgenericPatchFields \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \ + -L$(FOAM_LIBBIN)/dummy \ + -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \ -ldecompose \ -lmeshTools \ -llagrangian \ diff --git a/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C b/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C index a5dffec83c..232a351f59 100644 --- a/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C +++ b/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C @@ -181,7 +181,7 @@ Foam::labelList Foam::metisLikeDecomp::decompose mesh, identity(mesh.nCells()), mesh.nCells(), - false, + true, cellCells ); @@ -214,7 +214,14 @@ Foam::labelList Foam::metisLikeDecomp::decompose // xadj(celli) : start of information in adjncy for celli CompactListList