Skip to content
Snippets Groups Projects
Commit d12b64a2 authored by mattijs's avatar mattijs
Browse files

COMP: moved distributedTriSurfaceMesh to break cyclic dependency

structuredDecomp uses finiteVolume which uses meshTools which
used to use decompositionMethods
parent bc21e258
Branches
Tags
No related merge requests found
...@@ -32,14 +32,12 @@ parallel/decompose/AllwmakeLnInclude ...@@ -32,14 +32,12 @@ parallel/decompose/AllwmakeLnInclude
# dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
dummyThirdParty/Allwmake dummyThirdParty/Allwmake
# Build the proper scotchDecomp, metisDecomp etc.
parallel/decompose/Allwmake
wmake libso meshTools wmake libso meshTools
wmake libso finiteVolume wmake libso finiteVolume
wmake libso genericPatchFields wmake libso genericPatchFields
parallel/reconstruct/Allwmake # Build the proper scotchDecomp, metisDecomp etc.
parallel/Allwmake
wmake libso sampling wmake libso sampling
......
...@@ -55,7 +55,6 @@ indexedOctree/treeDataPrimitivePatchName.C ...@@ -55,7 +55,6 @@ indexedOctree/treeDataPrimitivePatchName.C
indexedOctree/treeDataTriSurface.C indexedOctree/treeDataTriSurface.C
searchableSurface = searchableSurface searchableSurface = searchableSurface
$(searchableSurface)/distributedTriSurfaceMesh.C
$(searchableSurface)/searchableBox.C $(searchableSurface)/searchableBox.C
$(searchableSurface)/searchableCylinder.C $(searchableSurface)/searchableCylinder.C
$(searchableSurface)/searchablePlane.C $(searchableSurface)/searchablePlane.C
......
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude -I$(LIB_SRC)/lagrangian/basic/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ltriSurface \ -ltriSurface \
-ldecompositionMethods \
-llagrangian -llagrangian
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
set -x
decompose/Allwmake
reconstruct/Allwmake
wmake libso distributed
# ----------------------------------------------------------------- end-of-file
distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
LIB = $(FOAM_LIBBIN)/libdistributed
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-ltriSurface \
-ldecompositionMethods \
-lmeshTools
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment