ENH: Split src/parallel into decompse and reconstruct to remove cyclic build dependency

applications/utilities/mesh/generation/snappyHexMesh/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 */ \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \

applications/utilities/mesh/manipulation/renumberMesh/Make/options

@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \

applications/utilities/parallelProcessing/decomposePar/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude

applications/utilities/parallelProcessing/reconstructPar/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/lnInclude
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \

applications/utilities/parallelProcessing/redistributeMeshPar/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude

src/Allwmake

@@ -28,16 +28,18 @@ wmake libso surfMesh
 wmake libso triSurface
 
 # Decomposition methods needed by dummyThirdParty
-parallel/AllwmakeLnInclude
+parallel/decompose/AllwmakeLnInclude
 # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
 dummyThirdParty/Allwmake
 
+# Build the proper scotchDecomp, metisDecomp etc.
+parallel/decompose/Allwmake
+
 wmake libso meshTools
 wmake libso finiteVolume
 wmake libso genericPatchFields
 
-# Build the proper scotchDecomp, metisDecomp etc.
+parallel/reconstruct/Allwmake
-parallel/Allwmake
 
 wmake libso sampling
 
@@ -52,7 +54,6 @@ thermophysicalModels/Allwmake
 transportModels/Allwmake
 turbulenceModels/Allwmake
 lagrangian/Allwmake
-parallel/Allwmake
 postProcessing/Allwmake
 conversion/Allwmake
 mesh/Allwmake

src/dummyThirdParty/metisDecomp/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/metisDecomp/lnInclude
+    -I$(FOAM_SRC)/parallel/decompose/metisDecomp/lnInclude
 
 LIB_LIBS =

src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C

@@ -34,8 +34,8 @@ static const char* notImplementedMessage =
 "\n"
 "Please install metis and make sure that libmetis.so is in your "
 "LD_LIBRARY_PATH.\n"
-"The metisDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
+"The metisDecomp library can then be built in "
-"metisDecomp\n";
+"$FOAM_SRC/parallel/decompose/decompositionMethods/metisDecomp\n";
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/dummyThirdParty/parMetisDecomp/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/parMetisDecomp/lnInclude
+    -I$(FOAM_SRC)/parallel/decompose/parMetisDecomp/lnInclude
 
 LIB_LIBS =

src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C

@@ -50,8 +50,8 @@ static const char* notImplementedMessage =
 "\n"
 "Please install parMetis and make sure that libparMetis.so is in your "
 "LD_LIBRARY_PATH.\n"
-"The parMetisDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
+"The parMetisDecomp library can then be built in "
-"parMetisDecomp\n";
+"$FOAM_SRC/parallel/decompose/decompositionMethods/parMetisDecomp\n";
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/dummyThirdParty/scotchDecomp/Make/options

@@ -1,6 +1,5 @@
 EXE_INC = \ 
-    -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/scotchDecomp/lnInclude
+    -I$(FOAM_SRC)/parallel/decompose/scotchDecomp/lnInclude
 
 LIB_LIBS =
- 

src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C

@@ -115,8 +115,8 @@ static const char* notImplementedMessage =
 "\n"
 "Please install scotch and make sure that libscotch.so is in your "
 "LD_LIBRARY_PATH.\n"
-"The scotchDecomp library can then be built in $FOAM_SRC/decompositionMethods/"
+"The scotchDecomp library can then be built in "
-"scotchDecomp\n";
+"$FOAM_SRC/parallel/decompose/decompositionMethods/scotchDecomp\n";
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/autoMesh/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \

src/meshTools/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 LIB_LIBS = \

src/parallel/decompose/Allwmake

@@ -6,7 +6,6 @@ wmakeLnInclude decompositionMethods
 
 wmake libso scotchDecomp
 wmake libso metisDecomp
-wmake libso reconstruct
 
 if [ -d "$FOAM_MPI_LIBBIN" ]
 then

src/parallel/reconstruct/Allwmake

@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake libso reconstruct
+
+
+# ----------------------------------------------------------------- end-of-file