zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: relocate triSurface classes into surfMesh library (issue #294)

Browse Source 
- simplifies organization, includes, linkage etc.
This commit is contained in:
Mark Olesen
2017-05-18 10:42:05 +02:00
committed by Andrew Heather
parent abe6121311
commit 3814762785
103 changed files with 179 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/combustion/PDRFoam/Make/options
View File

@ -15,8 +15,8 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lengine \ -lengine \

6
applications/test/dynamicIndexedOctree/Make/options
View File

@ -1,3 +1,5 @@
EXE_INC = -I$(LIB_SRC)/meshTools/lnInclude EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = -lmeshTools EXE_LIBS = \
-lmeshTools

10
applications/test/ensightFile/Make/options
View File

@ -1,10 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lconversion \ -lmeshTools \
-lfileFormats \ -lconversion
-lmeshTools

4
applications/test/momentOfInertia/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools -lmeshTools

8
applications/utilities/mesh/advanced/selectCells/Make/options
View File

@ -1,12 +1,10 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude -I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ldynamicMesh \
-lmeshTools \ -lmeshTools \
-ltriSurface \ -ldynamicMesh \
-llagrangian -llagrangian

3
applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
View File

@ -1,11 +1,10 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude -I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ldynamicMesh \ -ldynamicMesh \
-lmeshTools \ -lmeshTools \
-ltriSurface \
-llagrangian -llagrangian

4
applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options
View File

@ -1,9 +1,9 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/conversion/ccm/lnInclude \ -I$(LIB_SRC)/conversion/ccm/lnInclude
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \

4
applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options
View File

@ -1,8 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/conversion/ccm/lnInclude \ -I$(LIB_SRC)/conversion/ccm/lnInclude
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \

4
applications/utilities/mesh/conversion/fireToFoam/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lconversion -lconversion

4
applications/utilities/mesh/conversion/foamToFireMesh/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lconversion -lconversion

4
applications/utilities/mesh/conversion/foamToStarMesh/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lconversion -lconversion

4
applications/utilities/mesh/conversion/star4ToFoam/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lconversion -lconversion

3
applications/utilities/mesh/generation/blockMesh/Make/options
View File

@ -1,11 +1,10 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \ -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lblockMesh \ -lblockMesh \
-lmeshTools \ -lmeshTools \
-lfileFormats \
-ldynamicMesh -ldynamicMesh

13
applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
View File

@ -6,7 +6,6 @@ CGAL_INEXACT = -DCGAL_INEXACT
include $(GENERAL_RULES)/CGAL include $(GENERAL_RULES)/CGAL
EXE_INC = \ EXE_INC = \
${ROUNDING_MATH} \ ${ROUNDING_MATH} \
${EXE_NDEBUG} \ ${EXE_NDEBUG} \
@ -14,10 +13,10 @@ EXE_INC = \
${CGAL_INC} \ ${CGAL_INC} \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I../conformalVoronoiMesh/lnInclude -I../conformalVoronoiMesh/lnInclude
@ -25,11 +24,9 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \ $(CGAL_LIBS) \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-lsampling \
-ldecompositionMethods \ -ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \ -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
-ltriSurface \ -ldynamicMesh
-ldynamicMesh \
-lsampling \
-lfileFormats

14
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
View File

@ -14,24 +14,20 @@ EXE_INC = \
${CGAL_INC} \ ${CGAL_INC} \
${c++LESSWARN} \ ${c++LESSWARN} \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-IPrintTable -IPrintTable
LIB_LIBS = \ LIB_LIBS = \
${CGAL_LIBS} \ ${CGAL_LIBS} \
-lmeshTools \ -lmeshTools \
-ldecompose \
-lfileFormats \
-ltriSurface \
-ldynamicMesh \
-lsurfMesh \
-lsampling \ -lsampling \
-ldecompose \
-ldynamicMesh \
-lsnappyHexMesh -lsnappyHexMesh

14
applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
View File

@ -15,12 +15,12 @@ EXE_INC = \
${c++LESSWARN} \ ${c++LESSWARN} \
-I../conformalVoronoiMesh/lnInclude \ -I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-IvectorTools -IvectorTools
@ -28,10 +28,8 @@ EXE_LIBS = \
${CGAL_LIBS} \ ${CGAL_LIBS} \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-lmeshTools \ -lmeshTools \
-lsampling \
-ldecompositionMethods \ -ldecompositionMethods \
-ldecompose \ -ldecompose \
-L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \ -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \
-lfileFormats \ -ldynamicMesh
-ltriSurface \
-ldynamicMesh \
-lsampling

8
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
View File

@ -11,11 +11,11 @@ EXE_INC = \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I../vectorTools -I../vectorTools
@ -24,9 +24,7 @@ EXE_LIBS = \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \ -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
-ldecompose \ -ldecompose \
-ltriSurface \
-lmeshTools \ -lmeshTools \
-lfileFormats \
-lsampling \ -lsampling \
-ldynamicMesh \ -ldynamicMesh \
-lfiniteVolume -lfiniteVolume

4
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
View File

@ -10,7 +10,7 @@ EXE_INC = \
-I../conformalVoronoiMesh/lnInclude \ -I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
@ -19,7 +19,5 @@ EXE_LIBS = \
-lGL \ -lGL \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \ -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
-lfileFormats \
-ltriSurface \
-lmeshTools \ -lmeshTools \
-ldynamicMesh -ldynamicMesh

14
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
View File

@ -13,13 +13,12 @@ EXE_INC = \
-I../conformalVoronoiMesh/lnInclude \ -I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
@ -29,10 +28,7 @@ EXE_LIBS = \
-lcv2DMesh \ -lcv2DMesh \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-lmeshTools \ -lmeshTools \
-lsurfMesh \ -lsampling \
-ltriSurface \
-ldynamicMesh \ -ldynamicMesh \
-ldecompositionMethods \ -ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \ -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp
-lsampling \
-lfileFormats

5
applications/utilities/mesh/generation/snappyHexMesh/Make/options
View File

@ -2,10 +2,9 @@ EXE_INC = \
/* -g -DFULLDEBUG -O0 */ \ /* -g -DFULLDEBUG -O0 */ \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
@ -18,8 +17,6 @@ EXE_LIBS = \
/* note: scotch < 6.0 does not like both scotch and ptscotch together */ \ /* note: scotch < 6.0 does not like both scotch and ptscotch together */ \
-lscotchDecomp \ -lscotchDecomp \
-lmeshTools \ -lmeshTools \
-lsurfMesh \
-lfileFormats \
-ldynamicMesh \ -ldynamicMesh \
-ldecompose \ -ldecompose \
-lreconstruct \ -lreconstruct \

6
applications/utilities/mesh/manipulation/insideCells/Make/options
View File

@ -1,8 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltriSurface \
-lmeshTools -lmeshTools

7
applications/utilities/mesh/manipulation/orientFaceZone/Make/options
View File

@ -1,9 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lsnappyHexMesh \ -lsnappyHexMesh
-ltriSurface

1
applications/utilities/miscellaneous/foamList/Make/options
View File

@ -89,7 +89,6 @@ EXE_LIBS = \
-lsurfMesh \ -lsurfMesh \
-lthermalBaffleModels \ -lthermalBaffleModels \
-ltopoChangerFvMesh \ -ltopoChangerFvMesh \
-ltriSurface \
-lturbulenceModels \ -lturbulenceModels \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseMixtureThermo \ -ltwoPhaseMixtureThermo \

9
applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
View File

@ -1,14 +1,13 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude -I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ldynamicMesh \ -ldynamicMesh \
-lfileFormats \
-lgenericPatchFields \ -lgenericPatchFields \
-llagrangian \ -llagrangian \
-lconversion -lconversion

11
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options
View File

@ -1,14 +1,13 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude -I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-llagrangian \ -llagrangian \
-lmeshTools \ -lmeshTools \
-lfileFormats \ -lconversion \
-lgenericPatchFields \ -lgenericPatchFields
-lconversion

3
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
View File

@ -2,8 +2,8 @@ sinclude $(GENERAL_RULES)/paraview
EXE_INC = \ EXE_INC = \
${c++LESSWARN} \ ${c++LESSWARN} \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \ -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(ParaView_INCLUDE_DIR) \ -I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml \ -I$(ParaView_INCLUDE_DIR)/vtkkwiml \
@ -12,7 +12,6 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-lmeshTools \ -lmeshTools \
-lfileFormats \
-lblockMesh \ -lblockMesh \
-L$(FOAM_LIBBIN) -lfoamPv-pv${ParaView_MAJOR} \ -L$(FOAM_LIBBIN) -lfoamPv-pv${ParaView_MAJOR} \
$(GLIBS) $(GLIBS)

3
applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
View File

@ -1,12 +1,11 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude -I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-lfileFormats \
-lgenericPatchFields \ -lgenericPatchFields \
-llagrangian -llagrangian

4
applications/utilities/preProcessing/faceAgglomerate/Make/options
View File

@ -5,6 +5,4 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lpairPatchAgglomeration \ -lpairPatchAgglomeration
-ltriSurface \
-lmeshTools

5
applications/utilities/preProcessing/viewFactorsGen/Make/options
View File

@ -1,12 +1,11 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/parallel/distributed/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/distributed/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-ltriSurface \
-ldistributed \ -ldistributed \
-lradiationModels -lradiationModels

5
applications/utilities/surface/surfaceAdd/Make/options
View File

@ -1,6 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltriSurface \ -lsurfMesh
-lmeshTools

6
applications/utilities/surface/surfaceBooleanFeatures/Make/options
View File

@ -1,7 +1,6 @@
EXE_NDEBUG = -DNDEBUG EXE_NDEBUG = -DNDEBUG
/* EXE_NDEBUG = -g -O0 -DFULLDEBUG */ /* EXE_NDEBUG = -g -O0 -DFULLDEBUG */
c++CGALWARN = -Wno-old-style-cast c++CGALWARN = -Wno-old-style-cast
/*-- Define NO_CGAL to avoid using CGAL altogether */ /*-- Define NO_CGAL to avoid using CGAL altogether */
@ -15,12 +14,9 @@ EXE_INC = \
${CGAL_INC} \ ${CGAL_INC} \
${c++CGALWARN} \ ${c++CGALWARN} \
$(COMP_FLAGS) \ $(COMP_FLAGS) \
-I$(FOAM_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lsurfMesh \
-ltriSurface \
-lmeshTools \ -lmeshTools \
$(LINK_FLAGS) $(LINK_FLAGS)

3
applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
View File

@ -14,11 +14,10 @@ EXE_INC = \
${c++CGALWARN} \ ${c++CGALWARN} \
-I.. \ -I.. \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I/usr/include/Qt -I/usr/include/Qt
LIB_LIBS = \ LIB_LIBS = \
-L$(CGAL_ARCH_PATH)/lib \ -L$(CGAL_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-ltriSurface -lmeshTools

10
applications/utilities/surface/surfaceCheck/Make/options
View File

@ -1,10 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lsampling \ -lmeshTools \
-ltriSurface \ -lsampling
-lmeshTools

5
applications/utilities/surface/surfaceClean/Make/options
View File

@ -1,7 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-ltriSurface

5
applications/utilities/surface/surfaceCoarsen/Make/options
View File

@ -1,7 +1,6 @@
EXE_INC = \ EXE_INC = \
-Ibunnylod \ -Ibunnylod \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltriSurface \ -lsurfMesh
-lmeshTools

5
applications/utilities/surface/surfaceConvert/Make/options
View File

@ -1,6 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lsurfMesh
-ltriSurface

4
applications/utilities/surface/surfaceFeatureExtract/Make/options
View File

@ -1,11 +1,9 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-ltriSurface \
-lsampling -lsampling

8
applications/utilities/surface/surfaceHookUp/Make/options
View File

@ -1,9 +1,7 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-lfileFormats \
-ltriSurface

7
applications/utilities/surface/surfaceInertia/Make/options
View File

@ -1,7 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-ltriSurface

3
applications/utilities/surface/surfaceInflate/Make/options
View File

@ -1,9 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltriSurface \
-lsurfMesh \
-lmeshTools -lmeshTools

4
applications/utilities/surface/surfaceMeshConvertTesting/Make/options
View File

@ -1,5 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = -ltriSurface -lsurfMesh EXE_LIBS = \
-lsurfMesh

5
applications/utilities/surface/surfaceOrient/Make/options
View File

@ -1,7 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-ltriSurface

4
applications/utilities/surface/surfacePatch/Make/options
View File

@ -1,10 +1,8 @@
EXE_INC = \ EXE_INC = \
-IsearchableSurfaceModifier \ -IsearchableSurfaceModifier \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltriSurface \
-lmeshTools -lmeshTools

7
applications/utilities/surface/surfacePointMerge/Make/options
View File

@ -1,7 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-ltriSurface

5
applications/utilities/surface/surfaceRedistributePar/Make/options
View File

@ -1,12 +1,11 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
-I$(LIB_SRC)/parallel/distributed/lnInclude -I$(LIB_SRC)/parallel/distributed/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ldistributed \
-lmeshTools \ -lmeshTools \
-ltriSurface \ -ldistributed \
-ldecompose -ldecompose

7
applications/utilities/surface/surfaceRefineRedGreen/Make/options
View File

@ -1,7 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-ltriSurface

6
applications/utilities/surface/surfaceSplitByPatch/Make/options
View File

@ -1,7 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lsurfMesh
-ltriSurface

6
applications/utilities/surface/surfaceSplitByTopology/Make/options
View File

@ -1,7 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lsurfMesh
-ltriSurface

7
applications/utilities/surface/surfaceSplitNonManifolds/Make/options
View File

@ -1,7 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-ltriSurface

6
applications/utilities/surface/surfaceSubset/Make/options
View File

@ -1,8 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ -lmeshTools
-ltriSurface

4
applications/utilities/surface/surfaceToPatch/Make/options
View File

@ -1,10 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltriSurface \
-lmeshTools \ -lmeshTools \
-ldynamicMesh -ldynamicMesh

1
src/Allwmake
View File

@ -28,7 +28,6 @@ wmake $targetType OpenFOAM
wmake $targetType fileFormats wmake $targetType fileFormats
wmake $targetType surfMesh wmake $targetType surfMesh
wmake $targetType triSurface
wmake $targetType meshTools wmake $targetType meshTools
# Decomposition methods needed by dummyThirdParty # Decomposition methods needed by dummyThirdParty

3
src/conversion/Make/options
View File

@ -1,9 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfileFormats \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools -lmeshTools

2
src/conversion/ccm/Make/options
View File

@ -3,9 +3,9 @@ EXE_INC = \
/* -DDEBUG_BAFFLES */ \ /* -DDEBUG_BAFFLES */ \
/* -DDEBUG_CCMIOREAD */ \ /* -DDEBUG_CCMIOREAD */ \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(CCMIO_ARCH_PATH)/include -I$(CCMIO_ARCH_PATH)/include
LIB_LIBS = \ LIB_LIBS = \

3
src/dynamicFvMesh/Make/options
View File

@ -1,11 +1,10 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ltriSurface \
-lmeshTools \ -lmeshTools \
-ldynamicMesh \ -ldynamicMesh \
-lfiniteVolume -lfiniteVolume

4
src/dynamicMesh/Make/options
View File

@ -1,10 +1,10 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-ltriSurface \ -lsurfMesh \
-lextrudeModel -lextrudeModel

5
src/finiteVolume/Make/options
View File

@ -1,8 +1,7 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lOpenFOAM \ -lOpenFOAM \
-ltriSurface \
-lmeshTools -lmeshTools

5
src/functionObjects/forces/Make/options
View File

@ -1,13 +1,13 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
@ -17,6 +17,5 @@ LIB_LIBS = \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lspecie \ -lspecie \
-lfileFormats \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools -lmeshTools

4
src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt
View File

@ -13,7 +13,7 @@ endif()
include_directories( include_directories(
$ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
$ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
$ENV{WM_PROJECT_DIR}/src/triSurface/lnInclude $ENV{WM_PROJECT_DIR}/src/surfMesh/lnInclude
$ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -70,7 +70,7 @@ file(GLOB SOURCE_FILES
set(OPENFOAM_LIBRARIES set(OPENFOAM_LIBRARIES
OpenFOAM OpenFOAM
triSurface surfMesh
finiteVolume finiteVolume
) )

8
src/fvMotionSolver/Make/options
View File

@ -1,15 +1,13 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/functionObjects/forces/lnInclude \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \
LIB_LIBS = \ LIB_LIBS = \
-ltriSurface \
-lmeshTools \ -lmeshTools \
-ldynamicMesh \ -ldynamicMesh \
-lfiniteVolume \ -lfiniteVolume
-lfileFormats
/*-lforces include in controlDict if needed */ /*-lforces include in controlDict if needed */

8
src/mesh/blockMesh/Make/options
View File

@ -1,9 +1,7 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lmeshTools \ -lmeshTools
-lfileFormats \
-lsurfMesh

2
src/mesh/extrudeModel/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude -I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \ LIB_LIBS = \

5
src/mesh/snappyHexMesh/Make/options
View File

@ -3,17 +3,14 @@ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ldynamicMesh \ -ldynamicMesh \
-lfiniteVolume \ -lfiniteVolume \
-llagrangian \ -llagrangian \
-lmeshTools \ -lmeshTools \
-lsurfMesh \
-ltriSurface \
-lfvMotionSolvers \ -lfvMotionSolvers \
-ldistributed -ldistributed

6
src/meshTools/Make/options
View File

@ -1,8 +1,6 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude
-I$(LIB_SRC)/fileFormats/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ltriSurface \
-lsurfMesh -lsurfMesh

10
src/parallel/distributed/Make/options
View File

@ -1,10 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ltriSurface \ -lmeshTools \
-ldecompositionMethods \ -ldecompositionMethods
-lmeshTools

3
src/rigidBodyMeshMotion/Make/options
View File

@ -1,14 +1,13 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/rigidBodyDynamics/lnInclude \ -I$(LIB_SRC)/rigidBodyDynamics/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/functionObjects/forces/lnInclude \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude -I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lrigidBodyDynamics \ -lrigidBodyDynamics \
-lforces \ -lforces \
-lmeshTools \ -lmeshTools \
-lfileFormats \
-ldynamicMesh -ldynamicMesh

14
src/sampling/Make/options
View File

@ -1,19 +1,15 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude -I$(LIB_SRC)/lagrangian/basic/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-lsurfMesh \ -lconversion \
-ltriSurface \
-llagrangian \
-ldynamicMesh \ -ldynamicMesh \
-lconversion -llagrangian

5
src/sixDoFRigidBodyMotion/Make/options
View File

@ -1,12 +1,11 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/functionObjects/forces/lnInclude \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude -I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lforces \
-lmeshTools \ -lmeshTools \
-lfileFormats \ -lforces \
-ldynamicMesh -ldynamicMesh

26
src/surfMesh/Make/files
View File

@ -40,4 +40,30 @@ $(surfaceFormats)/vtk/VTKsurfaceFormatRunTime.C
$(surfaceFormats)/x3d/X3DsurfaceFormatCore.C $(surfaceFormats)/x3d/X3DsurfaceFormatCore.C
$(surfaceFormats)/x3d/X3DsurfaceFormatRunTime.C $(surfaceFormats)/x3d/X3DsurfaceFormatRunTime.C
triSurface/triSurface.C
triSurface/triSurfaceAddressing.C
triSurface/stitchTriangles.C
triSurface/fields/triSurfaceFields.C
triSurface/patches/geometricSurfacePatch.C
triSurface/patches/surfacePatch.C
interfaces = triSurface/interfaces
$(interfaces)/STL/writeSTL.C
$(interfaces)/STL/readSTL.C
$(interfaces)/GTS/writeGTS.C
$(interfaces)/GTS/readGTS.C
$(interfaces)/OBJ/readOBJ.C
$(interfaces)/OBJ/writeOBJ.C
$(interfaces)/SMESH/writeSMESH.C
$(interfaces)/OFF/readOFF.C
$(interfaces)/OFF/writeOFF.C
$(interfaces)/TRI/writeTRI.C
$(interfaces)/TRI/readTRI.C
$(interfaces)/AC3D/readAC.C
$(interfaces)/AC3D/writeAC.C
$(interfaces)/VTK/readVTK.C
$(interfaces)/VTK/writeVTK.C
$(interfaces)/NAS/readNAS.C
LIB = $(FOAM_LIBBIN)/libsurfMesh LIB = $(FOAM_LIBBIN)/libsurfMesh

0
src/triSurface/triSurfaceFields/triSurfaceFields.C → src/surfMesh/triSurface/fields/triSurfaceFields.C
View File

0
src/triSurface/triSurfaceFields/triSurfaceFields.H → src/surfMesh/triSurface/fields/triSurfaceFields.H
View File

0
src/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H → src/surfMesh/triSurface/fields/triSurfaceFieldsFwd.H
View File

0
src/triSurface/triSurfaceFields/triSurfaceGeoMesh.H → src/surfMesh/triSurface/fields/triSurfaceGeoMesh.H
View File

0
src/triSurface/triSurfaceFields/triSurfacePointGeoMesh.H → src/surfMesh/triSurface/fields/triSurfacePointGeoMesh.H
View File

0
src/triSurface/triSurface/interfaces/AC3D/readAC.C → src/surfMesh/triSurface/interfaces/AC3D/readAC.C
View File

0
src/triSurface/triSurface/interfaces/AC3D/writeAC.C → src/surfMesh/triSurface/interfaces/AC3D/writeAC.C
View File

0
src/triSurface/triSurface/interfaces/GTS/readGTS.C → src/surfMesh/triSurface/interfaces/GTS/readGTS.C
View File

0
src/triSurface/triSurface/interfaces/GTS/writeGTS.C → src/surfMesh/triSurface/interfaces/GTS/writeGTS.C
View File

0
src/triSurface/triSurface/interfaces/NAS/readNAS.C → src/surfMesh/triSurface/interfaces/NAS/readNAS.C
View File

0
src/triSurface/triSurface/interfaces/OBJ/readOBJ.C → src/surfMesh/triSurface/interfaces/OBJ/readOBJ.C
View File

0
src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C → src/surfMesh/triSurface/interfaces/OBJ/writeOBJ.C
View File

0
src/triSurface/triSurface/interfaces/OFF/readOFF.C → src/surfMesh/triSurface/interfaces/OFF/readOFF.C
View File

0
src/triSurface/triSurface/interfaces/OFF/writeOFF.C → src/surfMesh/triSurface/interfaces/OFF/writeOFF.C
View File

0
src/triSurface/triSurface/interfaces/SMESH/writeSMESH.C → src/surfMesh/triSurface/interfaces/SMESH/writeSMESH.C
View File

0
src/triSurface/triSurface/interfaces/STL/readSTL.C → src/surfMesh/triSurface/interfaces/STL/readSTL.C
View File

0
src/triSurface/triSurface/interfaces/STL/writeSTL.C → src/surfMesh/triSurface/interfaces/STL/writeSTL.C
View File

0
src/triSurface/triSurface/interfaces/TRI/readTRI.C → src/surfMesh/triSurface/interfaces/TRI/readTRI.C
View File

0
src/triSurface/triSurface/interfaces/TRI/writeTRI.C → src/surfMesh/triSurface/interfaces/TRI/writeTRI.C
View File

0
src/triSurface/triSurface/interfaces/VTK/readVTK.C → src/surfMesh/triSurface/interfaces/VTK/readVTK.C
View File

0
src/triSurface/triSurface/interfaces/VTK/writeVTK.C → src/surfMesh/triSurface/interfaces/VTK/writeVTK.C
View File

0
src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C → src/surfMesh/triSurface/patches/geometricSurfacePatch.C
View File

0
src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H → src/surfMesh/triSurface/patches/geometricSurfacePatch.H
View File

0
src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H → src/surfMesh/triSurface/patches/geometricSurfacePatchList.H
View File

0
src/triSurface/triSurface/surfacePatch/surfacePatch.C → src/surfMesh/triSurface/patches/surfacePatch.C
View File

0
src/triSurface/triSurface/surfacePatch/surfacePatch.H → src/surfMesh/triSurface/patches/surfacePatch.H
View File

0
src/triSurface/triSurface/surfacePatch/surfacePatchList.H → src/surfMesh/triSurface/patches/surfacePatchList.H
View File

0
src/triSurface/triSurface/stitchTriangles.C → src/surfMesh/triSurface/stitchTriangles.C
View File

0
src/triSurface/triSurface/triSurface.C → src/surfMesh/triSurface/triSurface.C
View File

0
src/triSurface/triSurface/triSurface.H → src/surfMesh/triSurface/triSurface.H
View File

0
src/triSurface/triSurface/triSurfaceAddressing.C → src/surfMesh/triSurface/triSurfaceAddressing.C
View File

Some files were not shown because too many files have changed in this diff Show More