Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
dc06f24a
Commit
dc06f24a
authored
Mar 18, 2010
by
Andrew Heather
Browse files
ENH: Split src/parallel into decompse and reconstruct to remove cyclic build dependency
parent
0d4349bb
Changes
55
Hide whitespace changes
Inline
Side-by-side
applications/utilities/mesh/generation/snappyHexMesh/Make/options
View file @
dc06f24a
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
View file @
dc06f24a
...
...
@@ -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
View file @
dc06f24a
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
View file @
dc06f24a
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
View file @
dc06f24a
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
View file @
dc06f24a
...
...
@@ -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
...
...
src/dummyThirdParty/metisDecomp/Make/options
View file @
dc06f24a
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 =
src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
View file @
dc06f24a
...
...
@@ -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
"
;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/dummyThirdParty/parMetisDecomp/Make/options
View file @
dc06f24a
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 =
src/dummyThirdParty/parMetisDecomp/dummyParMetisDecomp.C
View file @
dc06f24a
...
...
@@ -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 * * * * * * * * * * * //
...
...
src/dummyThirdParty/scotchDecomp/Make/options
View file @
dc06f24a
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 =
src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
View file @
dc06f24a
...
...
@@ -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
"
;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/mesh/autoMesh/Make/options
View file @
dc06f24a
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
View file @
dc06f24a
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/Allwmake
→
src/parallel/
decompose/
Allwmake
View file @
dc06f24a
...
...
@@ -6,7 +6,6 @@ wmakeLnInclude decompositionMethods
wmake libso scotchDecomp
wmake libso metisDecomp
wmake libso reconstruct
if
[
-d
"
$FOAM_MPI_LIBBIN
"
]
then
...
...
src/parallel/AllwmakeLnInclude
→
src/parallel/
decompose/
AllwmakeLnInclude
View file @
dc06f24a
File moved
src/parallel/decompositionMethods/Make/files
→
src/parallel/
decompose/
decompositionMethods/Make/files
View file @
dc06f24a
File moved
src/parallel/decompositionMethods/Make/options
→
src/parallel/
decompose/
decompositionMethods/Make/options
View file @
dc06f24a
File moved
src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.C
→
src/parallel/
decompose/
decompositionMethods/decompositionMethod/decompositionMethod.C
View file @
dc06f24a
File moved
src/parallel/decompositionMethods/decompositionMethod/decompositionMethod.H
→
src/parallel/
decompose/
decompositionMethods/decompositionMethod/decompositionMethod.H
View file @
dc06f24a
File moved
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment