diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
new file mode 100755
index 0000000000000000000000000000000000000000..3521f6377af76b6eb0362379bd09020082dde119
--- /dev/null
+++ b/applications/utilities/mesh/generation/Allwmake
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+set -x
+
+wmake blockMesh
+wmake extrude
+wmake extrude2DMesh
+wmake snappyHexMesh
+
+if [ -d "$CGAL_ARCH_PATH" ]
+then
+ wmake cvMesh
+fi
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/cvMesh/Allwclean b/applications/utilities/mesh/generation/cvMesh/Allwclean
new file mode 100755
index 0000000000000000000000000000000000000000..6dd3690c256b786353f55a4a9aad5f01cfbf135c
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/Allwclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+set -x
+
+wclean libso conformalVoronoiMesh
+wclean
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/cvMesh/Allwmake b/applications/utilities/mesh/generation/cvMesh/Allwmake
new file mode 100755
index 0000000000000000000000000000000000000000..688b3be475c5d9b2a0edb096018b01042de929cc
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/Allwmake
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+set -x
+
+wmake libso conformalVoronoiMesh
+wmake
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index 65996f338e2a9d47f6088335b7e6b23c6a02babe..a0a776d977b1f754a01560aa9e671c9b108dd7c7 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -8,7 +8,7 @@ EXE_INC = \
${EXE_FROUNDING_MATH} \
${EXE_NDEBUG} \
${CGAL_INC} \
- -I$(LIB_SRC)/mesh/conformalVoronoiMesh/lnInclude \
+ -IconformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
diff --git a/src/mesh/conformalVoronoiMesh/Make/files b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/Make/files
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files
diff --git a/src/mesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/Make/options
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
diff --git a/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
diff --git a/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
diff --git a/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
diff --git a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
diff --git a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
diff --git a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cvControls/cvControls.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/cvControls/cvControlsI.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
diff --git a/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
diff --git a/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
diff --git a/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
diff --git a/src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
diff --git a/src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
diff --git a/src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
diff --git a/src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
diff --git a/src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
diff --git a/src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
diff --git a/src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
similarity index 100%
rename from src/mesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
rename to applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
deleted file mode 100644
index 22c87008f9df11e1c271de388ba9981d0b74f16d..0000000000000000000000000000000000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
+++ /dev/null
@@ -1,203 +0,0 @@
-#ifndef CGAL_PSURF_RINGS_H_
-#define CGAL_PSURF_RINGS_H_
-
-// This file adapted from
-// CGAL-3.7/examples/Jet_fitting_3//PolyhedralSurf_rings.h
-// Licensed under CGAL-3.7/LICENSE.FREE_USE
-
-// Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007
-// Utrecht University (The Netherlands), ETH Zurich (Switzerland), Freie
-// Universitaet Berlin (Germany), INRIA Sophia-Antipolis (France),
-// Martin-Luther-University Halle-Wittenberg (Germany), Max-Planck-Institute
-// Saarbruecken (Germany), RISC Linz (Austria), and Tel-Aviv University
-// (Israel). All rights reserved.
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-
-#include <cassert>
-
-using namespace std;
-
-template
-<
- class TPoly,
- class VertexPropertyMap
->
-
-class T_PolyhedralSurf_rings
-{
-
-protected:
-
- //Polyhedron
- typedef typename TPoly::Vertex Vertex;
- typedef typename TPoly::Halfedge Halfedge;
- typedef typename TPoly::Facet Facet;
- typedef typename TPoly::Halfedge_around_vertex_circulator
- Halfedge_around_vertex_circulator;
- typedef typename TPoly::Vertex_iterator Vertex_iterator;
-
- //vertex indices are initialised to -1
- static void reset_ring_indices(std::vector < Vertex * >&vces,
- VertexPropertyMap& vpm);
-
- // i >= 1; from a start vertex on the current i-1 ring, push non-visited
- // neighbors of start in the nextRing and set indices to i. Also add these
- // vertices in all.
- static void push_neighbours_of(Vertex * start, int ith,
- std::vector < Vertex * >&nextRing,
- std::vector < Vertex * >&all,
- VertexPropertyMap& vpm);
-
- // i >= 1, from a currentRing i-1, collect all neighbors, set indices
- // to i and store them in nextRing and all.
- static void collect_ith_ring(int ith,
- std::vector < Vertex * >¤tRing,
- std::vector < Vertex * >&nextRing,
- std::vector < Vertex * >&all,
- VertexPropertyMap& vpm);
-
- public:
-
- // collect i>=1 rings : all neighbours up to the ith ring,
- static void
- collect_i_rings(Vertex* v,
- int ring_i,
- std::vector < Vertex * >& all,
- VertexPropertyMap& vpm);
-
- //collect enough rings (at least 1), to get at least min_nb of neighbors
- static void
- collect_enough_rings(Vertex* v,
- unsigned int min_nb,
- std::vector < Vertex * >& all,
- VertexPropertyMap& vpm);
-};
-
-
-////IMPLEMENTATION////////////////////////////////////////////////////
-
-template < class TPoly , class VertexPropertyMap>
-void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
-push_neighbours_of(Vertex * start, int ith,
- std::vector < Vertex * >&nextRing,
- std::vector < Vertex * >&all,
- VertexPropertyMap& vpm)
-{
- Vertex *v;
- Halfedge_around_vertex_circulator
- hedgeb = start->vertex_begin(), hedgee = hedgeb;
-
- CGAL_For_all(hedgeb, hedgee)
- {
- v = &*(hedgeb->opposite()->vertex());
- if(get(vpm, v) != -1) continue;//if visited: next
-
- put(vpm, v, ith);
- nextRing.push_back(v);
- all.push_back(v);
- }
-}
-
-
-template <class TPoly, class VertexPropertyMap>
-void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
-collect_ith_ring(int ith, std::vector < Vertex * >¤tRing,
- std::vector < Vertex * >&nextRing,
- std::vector < Vertex * >&all,
- VertexPropertyMap& vpm)
-{
- typename std::vector < Vertex * >::iterator
- itb = currentRing.begin(), ite = currentRing.end();
-
- CGAL_For_all(itb, ite) push_neighbours_of(*itb, ith, nextRing, all, vpm);
-}
-
-
-template <class TPoly, class VertexPropertyMap>
- void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
-reset_ring_indices(std::vector < Vertex * >&vces,
- VertexPropertyMap& vpm)
-{
- typename std::vector < Vertex * >::iterator
- itb = vces.begin(), ite = vces.end();
- CGAL_For_all(itb, ite) put(vpm, *itb, -1);
-}
-
-
-template <class TPoly, class VertexPropertyMap>
- void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
-collect_i_rings(Vertex* v,
- int ring_i,
- std::vector < Vertex * >& all,
- VertexPropertyMap& vpm)
-{
- std::vector<Vertex*> current_ring, next_ring;
- std::vector<Vertex*> *p_current_ring, *p_next_ring;
- assert(ring_i >= 1);
- //initialize
- p_current_ring = ¤t_ring;
- p_next_ring = &next_ring;
- put(vpm, v, 0);
- current_ring.push_back(v);
- all.push_back(v);
-
- for (int i=1; i<=ring_i; i++)
- {
- collect_ith_ring(i, *p_current_ring, *p_next_ring, all, vpm);
- //next round must be launched from p_nextRing...
- p_current_ring->clear();
- std::swap(p_current_ring, p_next_ring);
- }
- //clean up
- reset_ring_indices(all, vpm);
-}
-
-
-template <class TPoly, class VertexPropertyMap>
- void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
-collect_enough_rings(Vertex* v,
- unsigned int min_nb,
- std::vector < Vertex * >& all,
- VertexPropertyMap& vpm)
-{
- std::vector<Vertex*> current_ring, next_ring;
- std::vector<Vertex*> *p_current_ring, *p_next_ring;
-
- //initialize
- p_current_ring = ¤t_ring;
- p_next_ring = &next_ring;
- put(vpm, v, 0);
- current_ring.push_back(v);
- all.push_back(v);
-
- int i = 1;
-
- while ( (all.size() < min_nb) && (p_current_ring->size() != 0) )
- {
- collect_ith_ring(i, *p_current_ring, *p_next_ring, all, vpm);
- //next round must be launched from p_nextRing...
- p_current_ring->clear();
- std::swap(p_current_ring, p_next_ring);
- i++;
- }
- //clean up
- reset_ring_indices(all, vpm);
-}
-
-
-#endif
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
deleted file mode 100644
index 369d712ab1d39d69b0a2dbb93b885ec63663d578..0000000000000000000000000000000000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
+++ /dev/null
@@ -1,89 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "buildCGALPolyhedron.H"
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::buildCGALPolyhedron::buildCGALPolyhedron
-(
- const Foam::triSurface& surf
-)
-:
- CGAL::Modifier_base<HalfedgeDS>(),
- surf_(surf)
-{}
-
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::buildCGALPolyhedron::~buildCGALPolyhedron()
-{}
-
-
-// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
-
-void Foam::buildCGALPolyhedron::operator()
-(
- HalfedgeDS& hds
-)
-{
- typedef HalfedgeDS::Traits Traits;
- typedef Traits::Point_3 Point;
-
- // Postcondition: `hds' is a valid polyhedral surface.
- CGAL::Polyhedron_incremental_builder_3<HalfedgeDS> B(hds, false);
-
- B.begin_surface
- (
- surf_.points().size(), // n points
- surf_.size(), // n facets
- 2*surf_.edges().size() // n halfedges
- );
-
- forAll(surf_.points(), pI)
- {
- const Foam::point& p = surf_.points()[pI];
-
- B.add_vertex(Point(p.x(), p.y(), p.z()));
- }
-
- forAll(surf_, fI)
- {
- B.begin_facet();
-
- B.add_vertex_to_facet(surf_[fI][0]);
- B.add_vertex_to_facet(surf_[fI][1]);
- B.add_vertex_to_facet(surf_[fI][2]);
-
- B.end_facet();
- }
-
- B.end_surface();
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
deleted file mode 100644
index 4a5082de7a7c293e1ba6749b9ffc0e3e88b03965..0000000000000000000000000000000000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
+++ /dev/null
@@ -1,106 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Class
- Foam::buildCGALPolyhedron
-
-Description
- Convert a triSurface into a CGAL Polyhedron
-
-SourceFiles
- buildCGALPolyhedron.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef buildCGALPolyhedron_H
-#define buildCGALPolyhedron_H
-
-#include "triSurface.H"
-#include <CGAL/Simple_cartesian.h>
-#include <CGAL/Polyhedron_incremental_builder_3.h>
-#include <CGAL/Polyhedron_3.h>
-
-typedef CGAL::Simple_cartesian<double> Kernel;
-typedef CGAL::Polyhedron_3<Kernel> Polyhedron;
-typedef Polyhedron::HalfedgeDS HalfedgeDS;
-typedef Polyhedron::Vertex Vertex;
-typedef Polyhedron::Vertex_iterator Vertex_iterator;
-typedef Kernel::Point_3 Point_3;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class buildCGALPolyhedron Declaration
-\*---------------------------------------------------------------------------*/
-
-class buildCGALPolyhedron
-:
- public CGAL::Modifier_base<HalfedgeDS>
-{
- // Private data
-
- //- Reference to triSurface to convert
- const Foam::triSurface& surf_;
-
-
- // Private Member Functions
-
- //- Disallow default bitwise copy construct
- buildCGALPolyhedron(const buildCGALPolyhedron&);
-
- //- Disallow default bitwise assignment
- void operator=(const buildCGALPolyhedron&);
-
-
-public:
-
- // Constructors
-
- //- Construct with reference to triSurface
- buildCGALPolyhedron(const triSurface& surf);
-
-
- //- Destructor
- ~buildCGALPolyhedron();
-
-
- // Member Operators
-
- //- operator() of this `modifier' called by delegate function of
- // Polyhedron
- void operator()(HalfedgeDS& hds);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/files b/applications/utilities/surface/surfaceFeatureExtract/Make/files
index 94ddc1e7e28dd97db2de1a6232b8d564ef6b1b51..a57125cd6a7c24a2892c292ee358cce52a6529ce 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/Make/files
+++ b/applications/utilities/surface/surfaceFeatureExtract/Make/files
@@ -1,4 +1,3 @@
surfaceFeatureExtract.C
-/* CGALPolyhedron/buildCGALPolyhedron.C */
EXE = $(FOAM_APPBIN)/surfaceFeatureExtract
diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/options b/applications/utilities/surface/surfaceFeatureExtract/Make/options
index cedd70cc1727c6a471df2958b125fdafd02e3ba5..b733d5fde961f788415c0aa33e9e74bd1caa539d 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/Make/options
+++ b/applications/utilities/surface/surfaceFeatureExtract/Make/options
@@ -1,37 +1,3 @@
-#if false
-
-EXE_FROUNDING_MATH = -frounding-math
-EXE_NDEBUG = -DNDEBUG
-USE_F2C = -DCGAL_USE_F2C
-include $(GENERAL_RULES)/CGAL
-
-EXE_INC = \
- -DENABLE_CURVATURE \
- ${EXE_FROUNDING_MATH} \
- ${EXE_NDEBUG} \
- ${USE_F2C} \
- ${CGAL_INC} \
- -ICGALPolyhedron \
- -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 = \
- $(CGAL_LIBS) \
- -L$(CGAL_ARCH_PATH)/lib \
- -llapack \
- -lblas \
- -lCGAL \
- -lmeshTools \
- -ledgeMesh \
- -ltriSurface \
- -lsampling
-
-#else
-
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
@@ -45,5 +11,3 @@ EXE_LIBS = \
-ledgeMesh \
-ltriSurface \
-lsampling
-
-#endif
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 2536dd3504e9abf8a7ef191ca63b82d4c164459c..3e60e2c6a4e3129a16f1deb2106280919c82c86c 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -45,14 +45,6 @@ Description
#include "treeDataEdge.H"
#include "unitConversion.H"
-#ifdef ENABLE_CURVATURE
-#include "buildCGALPolyhedron.H"
-#include "CGALPolyhedronRings.H"
-#include <CGAL/Monge_via_jet_fitting.h>
-#include <CGAL/Lapack/Linear_algebra_lapack.h>
-#include <CGAL/property_map.h>
-#endif
-
using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -149,155 +141,6 @@ void drawHitProblem
}
-#ifdef ENABLE_CURVATURE
-scalarField calcCurvature(const triSurface& surf)
-{
- scalarField k(surf.points().size(), 0);
-
- Polyhedron P;
-
- buildCGALPolyhedron convert(surf);
- P.delegate(convert);
-
- // Info<< "Created CGAL Polyhedron with " << label(P.size_of_vertices())
- // << " vertices and " << label(P.size_of_facets())
- // << " facets. " << endl;
-
- // The rest of this function adapted from
- // CGAL-3.7/examples/Jet_fitting_3/Mesh_estimation.cpp
- // Licensed under CGAL-3.7/LICENSE.FREE_USE
-
- // Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007
- // Utrecht University (The Netherlands), ETH Zurich (Switzerland), Freie
- // Universitaet Berlin (Germany), INRIA Sophia-Antipolis (France),
- // Martin-Luther-University Halle-Wittenberg (Germany), Max-Planck-Institute
- // Saarbruecken (Germany), RISC Linz (Austria), and Tel-Aviv University
- // (Israel). All rights reserved.
-
- // Permission is hereby granted, free of charge, to any person obtaining a
- // copy of this software and associated documentation files (the
- // "Software"), to deal in the Software without restriction, including
- // without limitation the rights to use, copy, modify, merge, publish,
- // distribute, sublicense, and/or sell copies of the Software, and to permit
- // persons to whom the Software is furnished to do so, subject to the
- // following conditions:
-
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- // OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- // THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- //Vertex property map, with std::map
- typedef std::map<Vertex*, int> Vertex2int_map_type;
- typedef boost::associative_property_map< Vertex2int_map_type >
- Vertex_PM_type;
- typedef T_PolyhedralSurf_rings<Polyhedron, Vertex_PM_type > Poly_rings;
-
- typedef CGAL::Monge_via_jet_fitting<Kernel> Monge_via_jet_fitting;
- typedef Monge_via_jet_fitting::Monge_form Monge_form;
-
- std::vector<Point_3> in_points; //container for data points
-
- // default parameter values and global variables
- unsigned int d_fitting = 2;
- unsigned int d_monge = 2;
- unsigned int min_nb_points = (d_fitting + 1)*(d_fitting + 2)/2;
-
- //initialize the tag of all vertices to -1
- Vertex_iterator vitb = P.vertices_begin();
- Vertex_iterator vite = P.vertices_end();
-
- Vertex2int_map_type vertex2props;
- Vertex_PM_type vpm(vertex2props);
-
- CGAL_For_all(vitb, vite)
- {
- put(vpm, &(*vitb), -1);
- }
-
- vite = P.vertices_end();
-
- label vertI = 0;
-
- for (vitb = P.vertices_begin(); vitb != vite; vitb++)
- {
- //initialize
- Vertex* v = &(*vitb);
-
- //gather points around the vertex using rings
- // From: gather_fitting_points(v, in_points, vpm);
- {
- std::vector<Vertex*> gathered;
- in_points.clear();
-
- Poly_rings::collect_enough_rings(v, min_nb_points, gathered, vpm);
-
- //store the gathered points
- std::vector<Vertex*>::iterator itb = gathered.begin();
- std::vector<Vertex*>::iterator ite = gathered.end();
-
- CGAL_For_all(itb, ite)
- {
- in_points.push_back((*itb)->point());
- }
- }
-
- //skip if the nb of points is to small
- if ( in_points.size() < min_nb_points )
- {
- std::cerr
- << "not enough pts for fitting this vertex"
- << in_points.size()
- << std::endl;
-
- continue;
- }
-
- // perform the fitting
- Monge_via_jet_fitting monge_fit;
-
- Monge_form monge_form = monge_fit
- (
- in_points.begin(),
- in_points.end(),
- d_fitting,
- d_monge
- );
-
- // std::cout<< monge_form << std::endl;
-
- // std::cout<< "k1 " << monge_form.principal_curvatures(0) << std::endl;
- // std::cout<< "k2 " << monge_form.principal_curvatures(1) << std::endl;
-
- // std::vector<Point_3>::iterator itbp = in_points.begin();
- // std::vector<Point_3>::iterator itep = in_points.end();
-
- // std::cout << "in_points list : " << std::endl;
-
- // for (; itbp != itep; itbp++)
- // {
- // std::cout << *itbp << std::endl;
- // }
-
- // std::cout << "--- vertex " << vertI
- // << " : " << v->point() << std::endl
- // << "number of points used : " << in_points.size()
- // << std::endl;
-
- k[vertI++] = Foam::sqrt
- (
- sqr(monge_form.principal_curvatures(0))
- + sqr(monge_form.principal_curvatures(1))
- );
- }
-
- return k;
-}
-#endif
-
// Unmark non-manifold edges if individual triangles are not features
void unmarkBaffles
(
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index 89aed61a4666305cb29e67cf0547d66e8cd1411a..712094055c7ab0be1d0b397d567e62be4b98e2a8 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -5,6 +5,5 @@ set -x
wmake $makeType autoMesh
wmake $makeType blockMesh
-wmake $makeType conformalVoronoiMesh
# ----------------------------------------------------------------- end-of-file