diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index d2ae5219d3..77932a8cdc 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/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 \ diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options index 3b3b8ad48f..b5e293282a 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options +++ b/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 \ diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options index 58cb426daf..b79ab555e8 100644 --- a/applications/utilities/parallelProcessing/decomposePar/Make/options +++ b/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 diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options index cfa9eb8dfc..fcfc86483d 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/Make/options +++ b/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 \ diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options b/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options index 8f8010fff7..b691383cf6 100644 --- a/applications/utilities/parallelProcessing/redistributeMeshPar/Make/options +++ b/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 diff --git a/src/Allwmake b/src/Allwmake index 6822aac23b..0801bd4ba7 100755 --- a/src/Allwmake +++ b/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/Allwmake +parallel/reconstruct/Allwmake wmake libso sampling @@ -52,7 +54,6 @@ thermophysicalModels/Allwmake transportModels/Allwmake turbulenceModels/Allwmake lagrangian/Allwmake -parallel/Allwmake postProcessing/Allwmake conversion/Allwmake mesh/Allwmake diff --git a/src/dummyThirdParty/metisDecomp/Make/options b/src/dummyThirdParty/metisDecomp/Make/options index 05ee5feb98..1dc3af297c 100644 --- a/src/dummyThirdParty/metisDecomp/Make/options +++ b/src/dummyThirdParty/metisDecomp/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \ - -I$(FOAM_SRC)/parallel/metisDecomp/lnInclude + -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \ + -I$(FOAM_SRC)/parallel/decompose/metisDecomp/lnInclude LIB_LIBS = diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C index 6167a7aa09..b1ebe1c1ff 100644 --- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C +++ b/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/" -"metisDecomp\n"; +"The metisDecomp library can then be built in " +"$FOAM_SRC/parallel/decompose/decompositionMethods/metisDecomp\n"; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/dummyThirdParty/parMetisDecomp/Make/options b/src/dummyThirdParty/parMetisDecomp/Make/options index 2267e7a542..2b87d62057 100644 --- a/src/dummyThirdParty/parMetisDecomp/Make/options +++ b/src/dummyThirdParty/parMetisDecomp/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \ - -I$(FOAM_SRC)/parallel/parMetisDecomp/lnInclude + -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \ + -I$(FOAM_SRC)/parallel/decompose/parMetisDecomp/lnInclude LIB_LIBS = diff --git a/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C b/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C index 7cf3663e6c..2898907047 100644 --- a/src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C +++ b/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/" -"parMetisDecomp\n"; +"The parMetisDecomp library can then be built in " +"$FOAM_SRC/parallel/decompose/decompositionMethods/parMetisDecomp\n"; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/dummyThirdParty/scotchDecomp/Make/options b/src/dummyThirdParty/scotchDecomp/Make/options index e109fb6fce..775799dce9 100644 --- a/src/dummyThirdParty/scotchDecomp/Make/options +++ b/src/dummyThirdParty/scotchDecomp/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(FOAM_SRC)/parallel/decompositionMethods/lnInclude \ - -I$(FOAM_SRC)/parallel/scotchDecomp/lnInclude + -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \ + -I$(FOAM_SRC)/parallel/decompose/scotchDecomp/lnInclude LIB_LIBS = - diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C index cefc26c582..b9a7ba73e2 100644 --- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C +++ b/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/" -"scotchDecomp\n"; +"The scotchDecomp library can then be built in " +"$FOAM_SRC/parallel/decompose/decompositionMethods/scotchDecomp\n"; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options index 28c3d5fdf0..cee5c10104 100644 --- a/src/mesh/autoMesh/Make/options +++ b/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 \ diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options index 0ff2202926..c082d2f359 100644 --- a/src/meshTools/Make/options +++ b/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 = \ diff --git a/src/parallel/Allwmake b/src/parallel/decompose/Allwmake similarity index 94% rename from src/parallel/Allwmake rename to src/parallel/decompose/Allwmake index 5309e3481e..2adc739cf1 100755 --- a/src/parallel/Allwmake +++ b/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 diff --git a/src/parallel/AllwmakeLnInclude b/src/parallel/decompose/AllwmakeLnInclude similarity index 100% rename from src/parallel/AllwmakeLnInclude rename to src/parallel/decompose/AllwmakeLnInclude diff --git a/src/parallel/decompositionMethods/Make/files b/src/parallel/decompose/decompositionMethods/Make/files similarity index 100% rename from src/parallel/decompositionMethods/Make/files rename to src/parallel/decompose/decompositionMethods/Make/files diff --git a/src/parallel/decompositionMethods/Make/options b/src/parallel/decompose/decompositionMethods/Make/options similarity index 100% rename from src/parallel/decompositionMethods/Make/options rename to src/parallel/decompose/decompositionMethods/Make/options diff --git a/src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C similarity index 100% rename from src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.C rename to src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C diff --git a/src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H similarity index 100% rename from src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.H rename to src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H diff --git a/src/parallel/decompositionMethods/geomDecomp/geomDecomp.C b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C similarity index 100% rename from src/parallel/decompositionMethods/geomDecomp/geomDecomp.C rename to src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C diff --git a/src/parallel/decompositionMethods/geomDecomp/geomDecomp.H b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H similarity index 100% rename from src/parallel/decompositionMethods/geomDecomp/geomDecomp.H rename to src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.H diff --git a/src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C similarity index 100% rename from src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C rename to src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C diff --git a/src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H similarity index 100% rename from src/parallel/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H rename to src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H diff --git a/src/parallel/decompositionMethods/manualDecomp/manualDecomp.C b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C similarity index 100% rename from src/parallel/decompositionMethods/manualDecomp/manualDecomp.C rename to src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C diff --git a/src/parallel/decompositionMethods/manualDecomp/manualDecomp.H b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H similarity index 100% rename from src/parallel/decompositionMethods/manualDecomp/manualDecomp.H rename to src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H diff --git a/src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C similarity index 100% rename from src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C rename to src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C diff --git a/src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H similarity index 100% rename from src/parallel/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H rename to src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H diff --git a/src/parallel/metisDecomp/Make/files b/src/parallel/decompose/metisDecomp/Make/files similarity index 100% rename from src/parallel/metisDecomp/Make/files rename to src/parallel/decompose/metisDecomp/Make/files diff --git a/src/parallel/metisDecomp/Make/options b/src/parallel/decompose/metisDecomp/Make/options similarity index 100% rename from src/parallel/metisDecomp/Make/options rename to src/parallel/decompose/metisDecomp/Make/options diff --git a/src/parallel/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C similarity index 100% rename from src/parallel/metisDecomp/metisDecomp.C rename to src/parallel/decompose/metisDecomp/metisDecomp.C diff --git a/src/parallel/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H similarity index 100% rename from src/parallel/metisDecomp/metisDecomp.H rename to src/parallel/decompose/metisDecomp/metisDecomp.H diff --git a/src/parallel/parMetisDecomp/Make/files b/src/parallel/decompose/parMetisDecomp/Make/files similarity index 100% rename from src/parallel/parMetisDecomp/Make/files rename to src/parallel/decompose/parMetisDecomp/Make/files diff --git a/src/parallel/parMetisDecomp/Make/options b/src/parallel/decompose/parMetisDecomp/Make/options similarity index 100% rename from src/parallel/parMetisDecomp/Make/options rename to src/parallel/decompose/parMetisDecomp/Make/options diff --git a/src/parallel/parMetisDecomp/parMetisDecomp.C b/src/parallel/decompose/parMetisDecomp/parMetisDecomp.C similarity index 100% rename from src/parallel/parMetisDecomp/parMetisDecomp.C rename to src/parallel/decompose/parMetisDecomp/parMetisDecomp.C diff --git a/src/parallel/parMetisDecomp/parMetisDecomp.H b/src/parallel/decompose/parMetisDecomp/parMetisDecomp.H similarity index 100% rename from src/parallel/parMetisDecomp/parMetisDecomp.H rename to src/parallel/decompose/parMetisDecomp/parMetisDecomp.H diff --git a/src/parallel/parMetisDecomp/parMetisDecompTemplates.C b/src/parallel/decompose/parMetisDecomp/parMetisDecompTemplates.C similarity index 100% rename from src/parallel/parMetisDecomp/parMetisDecompTemplates.C rename to src/parallel/decompose/parMetisDecomp/parMetisDecompTemplates.C diff --git a/src/parallel/scotchDecomp/Make/files b/src/parallel/decompose/scotchDecomp/Make/files similarity index 100% rename from src/parallel/scotchDecomp/Make/files rename to src/parallel/decompose/scotchDecomp/Make/files diff --git a/src/parallel/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options similarity index 100% rename from src/parallel/scotchDecomp/Make/options rename to src/parallel/decompose/scotchDecomp/Make/options diff --git a/src/parallel/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C similarity index 100% rename from src/parallel/scotchDecomp/scotchDecomp.C rename to src/parallel/decompose/scotchDecomp/scotchDecomp.C diff --git a/src/parallel/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H similarity index 100% rename from src/parallel/scotchDecomp/scotchDecomp.H rename to src/parallel/decompose/scotchDecomp/scotchDecomp.H diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake new file mode 100755 index 0000000000..c4badc5067 --- /dev/null +++ b/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 diff --git a/src/parallel/reconstruct/Make/files b/src/parallel/reconstruct/reconstruct/Make/files similarity index 100% rename from src/parallel/reconstruct/Make/files rename to src/parallel/reconstruct/reconstruct/Make/files diff --git a/src/parallel/reconstruct/Make/options b/src/parallel/reconstruct/reconstruct/Make/options similarity index 100% rename from src/parallel/reconstruct/Make/options rename to src/parallel/reconstruct/reconstruct/Make/options diff --git a/src/parallel/reconstruct/fvFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C similarity index 100% rename from src/parallel/reconstruct/fvFieldReconstructor.C rename to src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C diff --git a/src/parallel/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H similarity index 100% rename from src/parallel/reconstruct/fvFieldReconstructor.H rename to src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H diff --git a/src/parallel/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C similarity index 100% rename from src/parallel/reconstruct/fvFieldReconstructorReconstructFields.C rename to src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C diff --git a/src/parallel/reconstruct/pointFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C similarity index 100% rename from src/parallel/reconstruct/pointFieldReconstructor.C rename to src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C diff --git a/src/parallel/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H similarity index 100% rename from src/parallel/reconstruct/pointFieldReconstructor.H rename to src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H diff --git a/src/parallel/reconstruct/pointFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C similarity index 100% rename from src/parallel/reconstruct/pointFieldReconstructorReconstructFields.C rename to src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C diff --git a/src/parallel/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C similarity index 100% rename from src/parallel/reconstruct/processorMeshes.C rename to src/parallel/reconstruct/reconstruct/processorMeshes.C diff --git a/src/parallel/reconstruct/processorMeshes.H b/src/parallel/reconstruct/reconstruct/processorMeshes.H similarity index 100% rename from src/parallel/reconstruct/processorMeshes.H rename to src/parallel/reconstruct/reconstruct/processorMeshes.H diff --git a/src/parallel/reconstruct/reconstructLagrangian.H b/src/parallel/reconstruct/reconstruct/reconstructLagrangian.H similarity index 100% rename from src/parallel/reconstruct/reconstructLagrangian.H rename to src/parallel/reconstruct/reconstruct/reconstructLagrangian.H diff --git a/src/parallel/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C similarity index 100% rename from src/parallel/reconstruct/reconstructLagrangianFields.C rename to src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C diff --git a/src/parallel/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C similarity index 100% rename from src/parallel/reconstruct/reconstructLagrangianPositions.C rename to src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C