Skip to content
Snippets Groups Projects
Commit c085c5df authored by Henry Weller's avatar Henry Weller
Browse files

Merged the edgeMesh library into the meshTools library

parent ccc1a89c
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 48 additions and 35 deletions
applications/test/findSphereFeatureEdges-octree/Make/options
+ 2
− 4
View file @ c085c5df
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-ledgeMesh
-lmeshTools
applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
+ 0
− 2
View file @ c085c5df
......@@ -19,7 +19,6 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I../conformalVoronoiMesh/lnInclude
......@@ -32,7 +31,6 @@ EXE_LIBS = \
-lmeshTools \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
-ledgeMesh \
-ltriSurface \
-ldynamicMesh \
-lsampling \
......
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
+ 0
− 2
View file @ c085c5df
......@@ -16,7 +16,6 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
......@@ -28,7 +27,6 @@ EXE_INC = \
LIB_LIBS = \
${CGAL_LIBS} \
-lmeshTools \
-ledgeMesh \
-lfileFormats \
-ltriSurface \
-ldynamicMesh \
......
applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
+ 0
− 2
View file @ c085c5df
......@@ -17,7 +17,6 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
......@@ -31,7 +30,6 @@ EXE_LIBS = \
-lmeshTools \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
-ledgeMesh \
-lfileFormats \
-ltriSurface \
-ldynamicMesh \
......
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
+ 0
− 2
View file @ c085c5df
......@@ -9,7 +9,6 @@ EXE_INC = \
${CGAL_INC} \
-I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
......@@ -26,7 +25,6 @@ EXE_LIBS = \
-lgmp \
-lconformalVoronoiMesh \
-ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
-ledgeMesh \
-ltriSurface \
-lmeshTools \
-lfileFormats \
......
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
+ 0
− 2
View file @ c085c5df
......@@ -8,7 +8,6 @@ EXE_INC = \
/* -IMarchingCubes */ \
-I$(FASTDUALOCTREE_SRC_PATH) \
-I../conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
......@@ -22,7 +21,6 @@ EXE_LIBS = \
-lGL \
-lconformalVoronoiMesh \
-ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
-ledgeMesh \
-lfileFormats \
-ltriSurface \
-lmeshTools \
......
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+ 0
− 2
View file @ c085c5df
......@@ -15,7 +15,6 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
......@@ -31,7 +30,6 @@ EXE_LIBS = \
-lconformalVoronoiMesh \
-lmeshTools \
-lsurfMesh \
-ledgeMesh \
-ltriSurface \
-ldynamicMesh \
-ldecompositionMethods \
......
applications/utilities/mesh/generation/snappyHexMesh/Make/options
+ 0
− 1
View file @ c085c5df
......@@ -7,7 +7,6 @@ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
......
applications/utilities/miscellaneous/foamList/Make/options
+ 0
− 1
View file @ c085c5df
......@@ -28,7 +28,6 @@ EXE_LIBS = \
-lDSMC \
-ldynamicFvMesh \
-ldynamicMesh \
-ledgeMesh \
-lengine \
-lextrudeModel \
-lfieldFunctionObjects \
......
applications/utilities/surface/surfaceBooleanFeatures/Make/options
+ 0
− 2
View file @ c085c5df
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-ltriSurface \
-ledgeMesh \
-lmeshTools
applications/utilities/surface/surfaceFeatureConvert/Make/options
+ 2
− 4
View file @ c085c5df
EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lmeshTools \
-ledgeMesh
-lmeshTools
applications/utilities/surface/surfaceFeatureExtract/Make/options
+ 0
− 2
View file @ c085c5df
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-lmeshTools \
-ledgeMesh \
-ltriSurface \
-lsampling
applications/utilities/surface/surfaceLambdaMuSmooth/Make/options
+ 1
− 3
View file @ c085c5df
EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude
-I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = \
-ledgeMesh \
-lsurfMesh
src/Allwmake
+ 0
− 1
View file @ c085c5df
......@@ -32,7 +32,6 @@ wmake $targetType fileFormats
wmake $targetType surfMesh
wmake $targetType triSurface
wmake $targetType meshTools
wmake $targetType edgeMesh
# Decomposition methods needed by dummyThirdParty
# (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
......
src/mesh/blockMesh/Make/options
+ 0
− 2
View file @ c085c5df
EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude
LIB_LIBS = \
-lmeshTools \
-lfileFormats \
-ledgeMesh \
-lsurfMesh
src/mesh/snappyHexMesh/Make/options
+ 0
− 2
View file @ c085c5df
......@@ -5,7 +5,6 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude
......@@ -15,7 +14,6 @@ LIB_LIBS = \
-llagrangian \
-lmeshTools \
-lfileFormats \
-ledgeMesh \
-lsurfMesh \
-ltriSurface \
-ldistributed
src/meshTools/Make/files
+ 42
− 0
View file @ c085c5df
em = edgeMesh
$(em)/edgeMesh.C
$(em)/edgeMeshIO.C
$(em)/edgeMeshNew.C
edgeMeshFormats = $(em)/edgeMeshFormats
$(edgeMeshFormats)/edgeMeshFormatsCore.C
$(edgeMeshFormats)/edgeMesh/edgeMeshFormat.C
$(edgeMeshFormats)/edgeMesh/edgeMeshFormatRunTime.C
$(edgeMeshFormats)/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C
$(edgeMeshFormats)/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C
$(edgeMeshFormats)/nas/NASedgeFormat.C
$(edgeMeshFormats)/nas/NASedgeFormatRunTime.C
$(edgeMeshFormats)/obj/OBJedgeFormat.C
$(edgeMeshFormats)/obj/OBJedgeFormatRunTime.C
$(edgeMeshFormats)/starcd/STARCDedgeFormat.C
$(edgeMeshFormats)/starcd/STARCDedgeFormatRunTime.C
$(edgeMeshFormats)/vtk/VTKedgeFormat.C
$(edgeMeshFormats)/vtk/VTKedgeFormatRunTime.C
$(em)/featureEdgeMesh/featureEdgeMesh.C
eem = $(em)/extendedEdgeMesh
$(eem)/extendedEdgeMesh.C
$(eem)/extendedEdgeMeshNew.C
$(eem)/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
$(eem)/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C
efm = $(eem)/extendedFeatureEdgeMesh
$(efm)/extendedFeatureEdgeMesh.C
cellClassification/cellClassification.C
cellClassification/cellInfo.C
......@@ -74,6 +115,7 @@ searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
searchableSurfaces/closedTriSurfaceMesh/closedTriSurfaceMesh.C
searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C
topoSets = sets/topoSets
$(topoSets)/cellSet.C
......
src/edgeMesh/Make/files → src/meshTools/edgeMesh/Make/files
+ 0
− 0
View file @ c085c5df
File moved
src/edgeMesh/Make/options → src/meshTools/edgeMesh/Make/options
+ 0
− 0
View file @ c085c5df
File moved
src/edgeMesh/edgeMesh.C → src/meshTools/edgeMesh/edgeMesh.C
+ 1
− 1
View file @ c085c5df
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment