From 37cd5434a62e22f32c094ba18d94a45c58444a71 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 21 Apr 2017 10:38:53 +0100 Subject: [PATCH] Merged the edgeMesh library into the meshTools library --- .../Make/options | 6 +-- .../cellSizeAndAlignmentGrid/Make/options | 2 - .../conformalVoronoiMesh/Make/options | 2 - .../foamyMesh/foamyHexMesh/Make/options | 2 - .../foamyHexMeshBackgroundMesh/Make/options | 2 - .../foamyHexMeshSurfaceSimplify/Make/options | 2 - .../foamyMesh/foamyQuadMesh/Make/options | 2 - .../generation/snappyHexMesh/Make/options | 1 - .../miscellaneous/foamList/Make/options | 1 - .../surfaceBooleanFeatures/Make/options | 2 - .../surfaceFeatureConvert/Make/options | 6 +-- .../surfaceFeatureExtract/Make/options | 2 - .../surfaceLambdaMuSmooth/Make/options | 4 +- src/Allwmake | 1 - src/mesh/blockMesh/Make/options | 2 - src/mesh/snappyHexMesh/Make/options | 2 - src/meshTools/Make/files | 42 +++++++++++++++++++ src/{ => meshTools}/edgeMesh/Make/files | 0 src/{ => meshTools}/edgeMesh/Make/options | 0 src/{ => meshTools}/edgeMesh/edgeMesh.C | 2 +- src/{ => meshTools}/edgeMesh/edgeMesh.H | 2 +- .../edgeMeshFormats/edgeMesh/edgeMeshFormat.C | 2 +- .../edgeMeshFormats/edgeMesh/edgeMeshFormat.H | 2 +- .../edgeMesh/edgeMeshFormatRunTime.C | 2 +- .../edgeMeshFormats/edgeMeshFormatsCore.C | 2 +- .../edgeMeshFormats/edgeMeshFormatsCore.H | 2 +- .../extendedFeatureEdgeMeshFormat.C | 2 +- .../extendedFeatureEdgeMeshFormat.H | 2 +- .../extendedFeatureEdgeMeshFormatRunTime.C | 2 +- .../edgeMeshFormats/nas/NASedgeFormat.C | 2 +- .../edgeMeshFormats/nas/NASedgeFormat.H | 2 +- .../nas/NASedgeFormatRunTime.C | 2 +- .../edgeMeshFormats/obj/OBJedgeFormat.C | 2 +- .../edgeMeshFormats/obj/OBJedgeFormat.H | 2 +- .../obj/OBJedgeFormatRunTime.C | 2 +- .../edgeMeshFormats/starcd/STARCDedgeFormat.C | 2 +- .../edgeMeshFormats/starcd/STARCDedgeFormat.H | 2 +- .../starcd/STARCDedgeFormatRunTime.C | 2 +- .../edgeMeshFormats/vtk/VTKedgeFormat.C | 2 +- .../edgeMeshFormats/vtk/VTKedgeFormat.H | 2 +- .../vtk/VTKedgeFormatRunTime.C | 2 +- src/{ => meshTools}/edgeMesh/edgeMeshI.H | 2 +- src/{ => meshTools}/edgeMesh/edgeMeshIO.C | 2 +- src/{ => meshTools}/edgeMesh/edgeMeshNew.C | 2 +- .../extendedEdgeMesh/extendedEdgeMesh.C | 2 +- .../extendedEdgeMesh/extendedEdgeMesh.H | 2 +- .../extendedEdgeMeshFormat.C | 2 +- .../extendedEdgeMeshFormat.H | 2 +- .../extendedEdgeMeshFormatRunTime.C | 2 +- .../extendedEdgeMesh/extendedEdgeMeshI.H | 2 +- .../extendedEdgeMesh/extendedEdgeMeshNew.C | 2 +- .../extendedEdgeMeshTemplates.C | 2 +- .../extendedFeatureEdgeMesh.C | 2 +- .../extendedFeatureEdgeMesh.H | 2 +- .../extendedFeatureEdgeMeshI.H | 2 +- .../extendedFeatureEdgeMeshTemplates.C | 2 +- .../featureEdgeMesh/featureEdgeMesh.C | 2 +- .../featureEdgeMesh/featureEdgeMesh.H | 2 +- .../searchableExtrudedCircle.C | 0 .../searchableExtrudedCircle.H | 0 60 files changed, 86 insertions(+), 73 deletions(-) rename src/{ => meshTools}/edgeMesh/Make/files (100%) rename src/{ => meshTools}/edgeMesh/Make/options (100%) rename src/{ => meshTools}/edgeMesh/edgeMesh.C (99%) rename src/{ => meshTools}/edgeMesh/edgeMesh.H (99%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormatRunTime.C (96%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.H (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C (96%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H (97%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C (95%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C (99%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H (97%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C (96%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C (99%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/obj/OBJedgeFormatRunTime.C (96%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C (99%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormatRunTime.C (96%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormatRunTime.C (96%) rename src/{ => meshTools}/edgeMesh/edgeMeshI.H (97%) rename src/{ => meshTools}/edgeMesh/edgeMeshIO.C (98%) rename src/{ => meshTools}/edgeMesh/edgeMeshNew.C (97%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C (99%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H (99%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C (97%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H (97%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C (95%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H (98%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C (97%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C (99%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C (99%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H (98%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H (98%) rename src/{ => meshTools}/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C (99%) rename src/{ => meshTools}/edgeMesh/featureEdgeMesh/featureEdgeMesh.C (97%) rename src/{ => meshTools}/edgeMesh/featureEdgeMesh/featureEdgeMesh.H (97%) rename src/{edgeMesh => meshTools}/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C (100%) rename src/{edgeMesh => meshTools}/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H (100%) diff --git a/applications/test/findSphereFeatureEdges-octree/Make/options b/applications/test/findSphereFeatureEdges-octree/Make/options index 6069034514..d27c95d033 100644 --- a/applications/test/findSphereFeatureEdges-octree/Make/options +++ b/applications/test/findSphereFeatureEdges-octree/Make/options @@ -1,9 +1,7 @@ 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 diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options index d3473481fd..258f5ccd2d 100644 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options @@ -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 \ diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options index c935426f09..6276148173 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options @@ -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 \ diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options index 841143804e..ecf9cc2b3b 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options @@ -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 \ diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options index dae842a311..701bea14b7 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options @@ -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 \ diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options index 5cb1f8676d..c0eac65238 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options @@ -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 \ diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options index ede07dde71..37dda18569 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options @@ -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 \ diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index fb480c5221..b50c6396e8 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -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 = \ diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options index 1835b22397..96e74a80ac 100644 --- a/applications/utilities/miscellaneous/foamList/Make/options +++ b/applications/utilities/miscellaneous/foamList/Make/options @@ -28,7 +28,6 @@ EXE_LIBS = \ -lDSMC \ -ldynamicFvMesh \ -ldynamicMesh \ - -ledgeMesh \ -lengine \ -lextrudeModel \ -lfieldFunctionObjects \ diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/Make/options index 727dbd1c2b..70a8e71089 100644 --- a/applications/utilities/surface/surfaceBooleanFeatures/Make/options +++ b/applications/utilities/surface/surfaceBooleanFeatures/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/edgeMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -ltriSurface \ - -ledgeMesh \ -lmeshTools diff --git a/applications/utilities/surface/surfaceFeatureConvert/Make/options b/applications/utilities/surface/surfaceFeatureConvert/Make/options index e71834f99e..54c035b8f5 100644 --- a/applications/utilities/surface/surfaceFeatureConvert/Make/options +++ b/applications/utilities/surface/surfaceFeatureConvert/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/edgeMesh/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ledgeMesh + -lmeshTools diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/options b/applications/utilities/surface/surfaceFeatureExtract/Make/options index b733d5fde9..e96fbb3687 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/Make/options +++ b/applications/utilities/surface/surfaceFeatureExtract/Make/options @@ -1,13 +1,11 @@ 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 diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/Make/options b/applications/utilities/surface/surfaceLambdaMuSmooth/Make/options index c35bf55e39..a504dd8617 100644 --- a/applications/utilities/surface/surfaceLambdaMuSmooth/Make/options +++ b/applications/utilities/surface/surfaceLambdaMuSmooth/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/edgeMesh/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude EXE_LIBS = \ - -ledgeMesh \ -lsurfMesh diff --git a/src/Allwmake b/src/Allwmake index 29d16a1528..0e0ef5692a 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -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 diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options index 5467dc3ce3..bf6ca71abf 100644 --- a/src/mesh/blockMesh/Make/options +++ b/src/mesh/blockMesh/Make/options @@ -1,11 +1,9 @@ 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 diff --git a/src/mesh/snappyHexMesh/Make/options b/src/mesh/snappyHexMesh/Make/options index d37a26a9dd..7a33cbc962 100644 --- a/src/mesh/snappyHexMesh/Make/options +++ b/src/mesh/snappyHexMesh/Make/options @@ -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 diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index a4ae8ef58f..fdeaa2eaba 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -1,3 +1,44 @@ +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 diff --git a/src/edgeMesh/Make/files b/src/meshTools/edgeMesh/Make/files similarity index 100% rename from src/edgeMesh/Make/files rename to src/meshTools/edgeMesh/Make/files diff --git a/src/edgeMesh/Make/options b/src/meshTools/edgeMesh/Make/options similarity index 100% rename from src/edgeMesh/Make/options rename to src/meshTools/edgeMesh/Make/options diff --git a/src/edgeMesh/edgeMesh.C b/src/meshTools/edgeMesh/edgeMesh.C similarity index 99% rename from src/edgeMesh/edgeMesh.C rename to src/meshTools/edgeMesh/edgeMesh.C index 937a8a373c..4188e738ec 100644 --- a/src/edgeMesh/edgeMesh.C +++ b/src/meshTools/edgeMesh/edgeMesh.C @@ -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 diff --git a/src/edgeMesh/edgeMesh.H b/src/meshTools/edgeMesh/edgeMesh.H similarity index 99% rename from src/edgeMesh/edgeMesh.H rename to src/meshTools/edgeMesh/edgeMesh.H index 0af0332ebc..343a27b0f1 100644 --- a/src/edgeMesh/edgeMesh.H +++ b/src/meshTools/edgeMesh/edgeMesh.H @@ -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 diff --git a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C similarity index 98% rename from src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C rename to src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C index e07e3f3185..19b4732f2c 100644 --- a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H similarity index 98% rename from src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H rename to src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H index 99ea8c5434..8f9d1a6bf6 100644 --- a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormatRunTime.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormatRunTime.C similarity index 96% rename from src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormatRunTime.C rename to src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormatRunTime.C index 2f191be35e..b552638ae8 100644 --- a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormatRunTime.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C similarity index 98% rename from src/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C rename to src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C index 9cd5e35fda..45ea4229c7 100644 --- a/src/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.H b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.H similarity index 98% rename from src/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.H rename to src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.H index 0f5bbb83ce..fa68510084 100644 --- a/src/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.H +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C similarity index 96% rename from src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C rename to src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C index 3c72541702..a25999ecb9 100644 --- a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H similarity index 97% rename from src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H rename to src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H index cabc9beec0..3582b2f59f 100644 --- a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H +++ b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C similarity index 95% rename from src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C rename to src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C index 958f99facb..5d64582de6 100644 --- a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C similarity index 99% rename from src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C rename to src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C index 643c161cb1..6eaab19965 100644 --- a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C @@ -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 diff --git a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H similarity index 97% rename from src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H rename to src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H index 4ed631bc42..03f403f8ab 100644 --- a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H +++ b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C similarity index 96% rename from src/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C rename to src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C index c2932e179d..018934d33d 100644 --- a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C similarity index 99% rename from src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C rename to src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C index af52b56c59..f6730baf12 100644 --- a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C @@ -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 diff --git a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H similarity index 98% rename from src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H rename to src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H index 11affeddb0..baa8787731 100644 --- a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H +++ b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormatRunTime.C b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormatRunTime.C similarity index 96% rename from src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormatRunTime.C rename to src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormatRunTime.C index 5bda1bb6b4..ef56e7525d 100644 --- a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormatRunTime.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C similarity index 99% rename from src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C rename to src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C index 0c270cd006..6ee3117146 100644 --- a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C @@ -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 diff --git a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H similarity index 98% rename from src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H rename to src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H index dd88579e95..fe30fa44ac 100644 --- a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H +++ b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H @@ -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 diff --git a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormatRunTime.C b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormatRunTime.C similarity index 96% rename from src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormatRunTime.C rename to src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormatRunTime.C index 63f690609b..c03bb42293 100644 --- a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormatRunTime.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C similarity index 98% rename from src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C rename to src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C index fe18c897f4..4accc8044e 100644 --- a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C @@ -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 diff --git a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H similarity index 98% rename from src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H rename to src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H index 2285cf61a0..b85e134d75 100644 --- a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H +++ b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormatRunTime.C b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormatRunTime.C similarity index 96% rename from src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormatRunTime.C rename to src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormatRunTime.C index 3572004026..891804b4ee 100644 --- a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormatRunTime.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/edgeMeshI.H b/src/meshTools/edgeMesh/edgeMeshI.H similarity index 97% rename from src/edgeMesh/edgeMeshI.H rename to src/meshTools/edgeMesh/edgeMeshI.H index 5ccff22321..b5034362de 100644 --- a/src/edgeMesh/edgeMeshI.H +++ b/src/meshTools/edgeMesh/edgeMeshI.H @@ -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 diff --git a/src/edgeMesh/edgeMeshIO.C b/src/meshTools/edgeMesh/edgeMeshIO.C similarity index 98% rename from src/edgeMesh/edgeMeshIO.C rename to src/meshTools/edgeMesh/edgeMeshIO.C index 6b4dd6f382..0ae4b9b469 100644 --- a/src/edgeMesh/edgeMeshIO.C +++ b/src/meshTools/edgeMesh/edgeMeshIO.C @@ -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 diff --git a/src/edgeMesh/edgeMeshNew.C b/src/meshTools/edgeMesh/edgeMeshNew.C similarity index 97% rename from src/edgeMesh/edgeMeshNew.C rename to src/meshTools/edgeMesh/edgeMeshNew.C index 8258da4b57..3ceb973f44 100644 --- a/src/edgeMesh/edgeMeshNew.C +++ b/src/meshTools/edgeMesh/edgeMeshNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C similarity index 99% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C index 19d9e903f6..120d2c5e6e 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C @@ -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 diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H similarity index 99% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H index 414c312928..6c324b87a9 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H @@ -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 diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C similarity index 97% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C index a046a1221d..b737724a92 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H similarity index 97% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H index 0bd618e073..8c3e2d95bc 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C similarity index 95% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C index a98e8ecbe1..e35744a557 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H similarity index 98% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H index 098f7e399e..8067971c03 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H @@ -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 diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C similarity index 97% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C index ad0c52966e..3f0732a559 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C similarity index 99% rename from src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C index 1f2051a336..3cb86ec3a6 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C @@ -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 diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C similarity index 99% rename from src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C index 1ef5765dd3..a88df6b447 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H similarity index 98% rename from src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H index 3026f15b4e..602cf4326b 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H similarity index 98% rename from src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H index 55cc8ffa62..6eead24de3 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H @@ -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 diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C similarity index 99% rename from src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C rename to src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C index 8aba7d0b59..5b7eec3c5a 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C @@ -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 diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.C similarity index 97% rename from src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C rename to src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.C index f34c29745f..c1e013eaf8 100644 --- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C +++ b/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.C @@ -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 diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H b/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.H similarity index 97% rename from src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H rename to src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.H index 2792abf670..02ebc126a3 100644 --- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H +++ b/src/meshTools/edgeMesh/featureEdgeMesh/featureEdgeMesh.H @@ -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 diff --git a/src/edgeMesh/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C similarity index 100% rename from src/edgeMesh/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C rename to src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C diff --git a/src/edgeMesh/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H similarity index 100% rename from src/edgeMesh/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H rename to src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.H