diff --git a/src/Allwmake b/src/Allwmake index e1589a4046..33966ddb97 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -32,14 +32,12 @@ 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 -parallel/reconstruct/Allwmake +# Build the proper scotchDecomp, metisDecomp etc. +parallel/Allwmake wmake libso sampling diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index 30e68c56a7..14e561fcba 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -55,7 +55,6 @@ indexedOctree/treeDataPrimitivePatchName.C indexedOctree/treeDataTriSurface.C searchableSurface = searchableSurface -$(searchableSurface)/distributedTriSurfaceMesh.C $(searchableSurface)/searchableBox.C $(searchableSurface)/searchableCylinder.C $(searchableSurface)/searchablePlane.C diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options index c082d2f359..ef1033b0e8 100644 --- a/src/meshTools/Make/options +++ b/src/meshTools/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude LIB_LIBS = \ -ltriSurface \ - -ldecompositionMethods \ -llagrangian diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake new file mode 100755 index 0000000000..08ca4923f2 --- /dev/null +++ b/src/parallel/Allwmake @@ -0,0 +1,10 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +set -x + +decompose/Allwmake +reconstruct/Allwmake +wmake libso distributed + + +# ----------------------------------------------------------------- end-of-file diff --git a/src/parallel/distributed/Make/files b/src/parallel/distributed/Make/files new file mode 100644 index 0000000000..31a58d43f5 --- /dev/null +++ b/src/parallel/distributed/Make/files @@ -0,0 +1,3 @@ +distributedTriSurfaceMesh/distributedTriSurfaceMesh.C + +LIB = $(FOAM_LIBBIN)/libdistributed diff --git a/src/parallel/distributed/Make/options b/src/parallel/distributed/Make/options new file mode 100644 index 0000000000..f003a7fed9 --- /dev/null +++ b/src/parallel/distributed/Make/options @@ -0,0 +1,9 @@ +EXE_INC = \ + -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +LIB_LIBS = \ + -ltriSurface \ + -ldecompositionMethods \ + -lmeshTools diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C similarity index 100% rename from src/meshTools/searchableSurface/distributedTriSurfaceMesh.C rename to src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H similarity index 100% rename from src/meshTools/searchableSurface/distributedTriSurfaceMesh.H rename to src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMeshTemplates.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMeshTemplates.C similarity index 100% rename from src/meshTools/searchableSurface/distributedTriSurfaceMeshTemplates.C rename to src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMeshTemplates.C