From 850474d2739ad1677f053c1fa305ac5b25a151c6 Mon Sep 17 00:00:00 2001 From: laurence Date: Fri, 10 May 2013 01:00:52 +0100 Subject: [PATCH] STYLE: Change name from cvMesh to foamyHexMesh --- .../utilities/mesh/generation/Allwmake | 2 +- .../mesh/generation/cvMesh/Make/files | 3 - .../{cvMesh => foamyHexMesh}/Allwclean | 0 .../{cvMesh => foamyHexMesh}/Allwmake | 0 .../mesh/generation/foamyHexMesh/Make/files | 3 + .../{cvMesh => foamyHexMesh}/Make/options | 0 .../cellSizeAndAlignmentGrid/Make/files | 0 .../cellSizeAndAlignmentGrid/Make/options | 0 .../cellSizeAndAlignmentGrid.C | 0 .../DelaunayMesh/DelaunayMesh.C | 2 +- .../DelaunayMesh/DelaunayMesh.H | 0 .../DelaunayMesh/DelaunayMeshI.H | 2 +- .../DelaunayMesh/DelaunayMeshIO.C | 2 +- .../DelaunayMesh/DistributedDelaunayMesh.C | 2 +- .../DelaunayMesh/DistributedDelaunayMesh.H | 2 +- .../conformalVoronoiMesh/Make/files | 0 .../conformalVoronoiMesh/Make/options | 0 .../PrintTable/PrintTable.C | 0 .../PrintTable/PrintTable.H | 0 .../PrintTable/PrintTableI.H | 2 +- .../backgroundMeshDecomposition.C | 5 +- .../backgroundMeshDecomposition.H | 2 +- .../backgroundMeshDecompositionI.H | 2 +- .../cellAspectRatioControl.C | 0 .../cellAspectRatioControl.H | 2 +- .../cellShapeControl/cellShapeControl.C | 11 +- .../cellShapeControl/cellShapeControl.H | 2 +- .../cellShapeControl/cellShapeControlI.H | 0 .../cellShapeControlMesh.C | 2 +- .../cellShapeControlMesh.H | 0 .../cellShapeControlMeshI.H | 2 +- .../cellSizeAndAlignmentControl.C | 0 .../cellSizeAndAlignmentControl.H | 0 .../cellSizeAndAlignmentControls.C | 0 .../cellSizeAndAlignmentControls.H | 0 .../fileControl/fileControl.C | 0 .../fileControl/fileControl.H | 0 .../searchableSurfaceControl.C | 0 .../searchableSurfaceControl.H | 0 .../controlMeshRefinement.C | 0 .../controlMeshRefinement.H | 0 .../smoothAlignmentSolver.C | 0 .../smoothAlignmentSolver.H | 0 .../cellSizeFunction/cellSizeFunction.C | 0 .../cellSizeFunction/cellSizeFunction.H | 0 .../linearDistance/linearDistance.C | 0 .../linearDistance/linearDistance.H | 0 .../linearSpatial/linearSpatial.C | 0 .../linearSpatial/linearSpatial.H | 0 .../surfaceOffsetLinearDistance.C | 0 .../surfaceOffsetLinearDistance.H | 0 .../cellSizeFunction/uniform/uniform.C | 0 .../cellSizeFunction/uniform/uniform.H | 0 .../uniformDistance/uniformDistance.C | 0 .../uniformDistance/uniformDistance.H | 0 .../automatic/automatic.C | 0 .../automatic/automatic.H | 0 .../cellSizeCalculationType.C | 0 .../cellSizeCalculationType.H | 0 .../fieldFromFile/fieldFromFile.C | 0 .../fieldFromFile/fieldFromFile.H | 0 .../nonUniformField/nonUniformField.C | 0 .../nonUniformField/nonUniformField.H | 0 .../surfaceCellSizeFunction.C | 0 .../surfaceCellSizeFunction.H | 0 .../uniformValue/uniformValue.C | 0 .../uniformValue/uniformValue.H | 0 .../CGALTriangulation3DKernel.H | 2 +- .../CGALTriangulation3Ddefs.H | 2 +- .../conformalVoronoiMesh.C | 79 ++++--- .../conformalVoronoiMesh.H | 10 +- .../conformalVoronoiMeshCalcDualMesh.C | 41 ++-- .../conformalVoronoiMeshConformToSurface.C | 19 +- ...alVoronoiMeshFeaturePointSpecialisations.C | 4 +- .../conformalVoronoiMeshFeaturePoints.C | 10 +- .../conformalVoronoiMeshI.H | 26 ++- .../conformalVoronoiMeshIO.C | 14 +- .../conformalVoronoiMeshTemplates.C | 2 +- .../indexedCell/indexedCell.C | 2 +- .../indexedCell/indexedCell.H | 0 .../indexedCell/indexedCellChecks.C | 6 +- .../indexedCell/indexedCellChecks.H | 4 +- .../indexedCell/indexedCellEnum.C | 2 +- .../indexedCell/indexedCellEnum.H | 2 +- .../indexedCell/indexedCellI.H | 2 +- .../indexedVertex/indexedVertex.C | 2 +- .../indexedVertex/indexedVertex.H | 0 .../indexedVertex/indexedVertexEnum.C | 2 +- .../indexedVertex/indexedVertexEnum.H | 2 +- .../indexedVertex/indexedVertexI.H | 0 .../conformalVoronoiMesh/pointConversion.H | 2 +- .../pointFeatureEdgesTypes.H | 2 +- .../conformationSurfaces.C | 0 .../conformationSurfaces.H | 0 .../conformationSurfacesI.H | 0 .../cvControls/cvControls.C | 16 +- .../cvControls/cvControls.H | 10 +- .../cvControls/cvControlsI.H | 4 +- .../faceAreaWeightModel/faceAreaWeightModel.C | 2 +- .../faceAreaWeightModel/faceAreaWeightModel.H | 2 +- .../piecewiseLinearRamp/piecewiseLinearRamp.C | 2 +- .../piecewiseLinearRamp/piecewiseLinearRamp.H | 2 +- .../autoDensity/autoDensity.C | 55 ++--- .../autoDensity/autoDensity.H | 4 +- .../bodyCentredCubic/bodyCentredCubic.C | 36 +-- .../bodyCentredCubic/bodyCentredCubic.H | 4 +- .../faceCentredCubic/faceCentredCubic.C | 40 ++-- .../faceCentredCubic/faceCentredCubic.H | 4 +- .../initialPointsMethod/initialPointsMethod.C | 14 +- .../initialPointsMethod/initialPointsMethod.H | 12 +- .../initialPointsMethod/pointFile/pointFile.C | 18 +- .../initialPointsMethod/pointFile/pointFile.H | 4 +- .../uniformGrid/uniformGrid.C | 29 +-- .../uniformGrid/uniformGrid.H | 4 +- .../adaptiveLinear/adaptiveLinear.C | 2 +- .../adaptiveLinear/adaptiveLinear.H | 2 +- .../rampHoldFall/rampHoldFall.C | 2 +- .../rampHoldFall/rampHoldFall.H | 2 +- .../relaxationModel/relaxationModel.C | 2 +- .../relaxationModel/relaxationModel.H | 2 +- .../cvMeshBackgroundMesh/Make/files | 0 .../cvMeshBackgroundMesh/Make/options | 0 .../cvMeshBackgroundMesh.C | 2 +- .../cvMeshSurfaceSimplify/Allwmake | 0 .../cvMeshSurfaceSimplify/Make/files | 0 .../cvMeshSurfaceSimplify/Make/options | 0 .../cvMeshSurfaceSimplify.C | 2 +- .../cvMeshSurfaceSimplify_non_octree.C | 2 +- .../cvMesh.C => foamyHexMesh/foamyHexMesh.C} | 12 +- .../foamyHexMeshDict} | 8 +- .../vectorTools/vectorTools.H | 0 tutorials/mesh/cvMesh/blob/system/cvMeshDict | 212 ------------------ .../{cvMesh => foamyHexMesh}/blob/Allclean | 0 .../mesh/{cvMesh => foamyHexMesh}/blob/Allrun | 2 +- .../blob/Allrun-parallel | 2 +- .../{cvMesh => foamyHexMesh}/blob/Alltest | 2 +- .../blob/constant/polyMesh/blockMeshDict | 0 .../blob/constant/polyMesh/boundary | 0 .../blob/constant/triSurface/blob.stl | 0 .../blob/system/collapseDict | 0 .../blob/system/controlDict | 0 .../blob/system/decomposeParDict | 0 .../foamyHexMesh/blob/system/foamyHexMeshDict | 122 ++++++++++ .../blob/system/fvSchemes | 0 .../blob/system/fvSolution | 0 .../blob/system/meshQualityDict | 0 .../blob/system/snappyHexMeshDict | 0 .../blob/system/topoSetDict | 0 .../{cvMesh => foamyHexMesh}/flange/Allclean | 0 .../{cvMesh => foamyHexMesh}/flange/Allrun | 0 .../flange/Allrun-parallel | 0 .../{cvMesh => foamyHexMesh}/flange/Alltest | 0 .../flange/constant/polyMesh/blockMeshDict | 0 .../flange/constant/polyMesh/boundary | 0 .../flange/constant/triSurface/flange.obj | 0 .../flange/system/collapseDict | 0 .../flange/system/controlDict | 0 .../flange/system/decomposeParDict | 0 .../flange/system/faceSetDict | 0 .../flange/system/foamyHexMeshDict} | 97 +------- .../flange/system/fvSchemes | 0 .../flange/system/fvSolution | 0 .../flange/system/meshQualityDict | 0 .../flange/system/snappyHexMeshDict | 0 .../flange/system/surfaceFeatureExtractDict | 0 .../flange/system/topoSetDict-background | 0 .../flange/system/topoSetDict-slices | 0 .../simpleShapes/Allclean | 0 .../simpleShapes/Allrun | 0 .../simpleShapes/constant/triSurface/cone.stl | 0 .../constant/triSurface/coneAndSphere.obj | 0 .../constant/triSurface/domain.stl | 0 .../constant/triSurface/sphere.stl | 0 .../simpleShapes/system/collapseDict | 0 .../simpleShapes/system/controlDict | 0 .../simpleShapes/system/cvMeshDict | 0 .../simpleShapes/system/fvSchemes | 0 .../simpleShapes/system/fvSolution | 0 .../simpleShapes/system/meshQualityDict | 0 .../system/surfaceFeatureExtractDict | 0 .../simpleShapes/system/topoSetDict | 0 181 files changed, 449 insertions(+), 573 deletions(-) delete mode 100644 applications/utilities/mesh/generation/cvMesh/Make/files rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/Allwclean (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/Allwmake (100%) create mode 100644 applications/utilities/mesh/generation/foamyHexMesh/Make/files rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/Make/options (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cellSizeAndAlignmentGrid/Make/files (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cellSizeAndAlignmentGrid/Make/options (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/Make/files (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/Make/options (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/PrintTable/PrintTable.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/PrintTable/PrintTable.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/PrintTable/PrintTableI.H (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H (96%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H (96%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H (96%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H (96%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H (96%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H (96%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C (96%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cvControls/cvControls.C (93%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cvControls/cvControls.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/cvControls/cvControlsI.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C (93%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C (85%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C (87%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C (90%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H (92%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C (89%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C (86%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H (95%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C (97%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H (98%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshBackgroundMesh/Make/files (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshBackgroundMesh/Make/options (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshSurfaceSimplify/Allwmake (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshSurfaceSimplify/Make/files (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshSurfaceSimplify/Make/options (100%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C (99%) rename applications/utilities/mesh/generation/{cvMesh/cvMesh.C => foamyHexMesh/foamyHexMesh.C} (92%) rename applications/utilities/mesh/generation/{cvMesh/cvMeshDict => foamyHexMesh/foamyHexMeshDict} (99%) rename applications/utilities/mesh/generation/{cvMesh => foamyHexMesh}/vectorTools/vectorTools.H (100%) delete mode 100644 tutorials/mesh/cvMesh/blob/system/cvMeshDict rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/Allclean (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/Allrun (92%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/Allrun-parallel (94%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/Alltest (94%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/constant/polyMesh/blockMeshDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/constant/polyMesh/boundary (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/constant/triSurface/blob.stl (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/collapseDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/controlDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/decomposeParDict (100%) create mode 100644 tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/fvSchemes (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/fvSolution (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/meshQualityDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/snappyHexMeshDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/blob/system/topoSetDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/Allclean (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/Allrun (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/Allrun-parallel (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/Alltest (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/constant/polyMesh/blockMeshDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/constant/polyMesh/boundary (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/constant/triSurface/flange.obj (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/collapseDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/controlDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/decomposeParDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/faceSetDict (100%) rename tutorials/mesh/{cvMesh/flange/system/cvMeshDict => foamyHexMesh/flange/system/foamyHexMeshDict} (57%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/fvSchemes (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/fvSolution (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/meshQualityDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/snappyHexMeshDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/surfaceFeatureExtractDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/topoSetDict-background (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/flange/system/topoSetDict-slices (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/Allclean (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/Allrun (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/constant/triSurface/cone.stl (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/constant/triSurface/coneAndSphere.obj (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/constant/triSurface/domain.stl (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/constant/triSurface/sphere.stl (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/collapseDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/controlDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/cvMeshDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/fvSchemes (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/fvSolution (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/meshQualityDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/surfaceFeatureExtractDict (100%) rename tutorials/mesh/{cvMesh => foamyHexMesh}/simpleShapes/system/topoSetDict (100%) diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake index 48ca530c96..1e4d6a3041 100755 --- a/applications/utilities/mesh/generation/Allwmake +++ b/applications/utilities/mesh/generation/Allwmake @@ -11,7 +11,7 @@ wmake snappyHexMesh if [ -d "$CGAL_ARCH_PATH" ] then - cvMesh/Allwmake + foamyHexMesh/Allwmake cv2DMesh/Allwmake fi diff --git a/applications/utilities/mesh/generation/cvMesh/Make/files b/applications/utilities/mesh/generation/cvMesh/Make/files deleted file mode 100644 index 425e0f5b83..0000000000 --- a/applications/utilities/mesh/generation/cvMesh/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -cvMesh.C - -EXE = $(FOAM_APPBIN)/cvMesh diff --git a/applications/utilities/mesh/generation/cvMesh/Allwclean b/applications/utilities/mesh/generation/foamyHexMesh/Allwclean similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/Allwclean rename to applications/utilities/mesh/generation/foamyHexMesh/Allwclean diff --git a/applications/utilities/mesh/generation/cvMesh/Allwmake b/applications/utilities/mesh/generation/foamyHexMesh/Allwmake similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/Allwmake rename to applications/utilities/mesh/generation/foamyHexMesh/Allwmake diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/Make/files new file mode 100644 index 0000000000..58ec50cdc6 --- /dev/null +++ b/applications/utilities/mesh/generation/foamyHexMesh/Make/files @@ -0,0 +1,3 @@ +foamyHexMesh.C + +EXE = $(FOAM_APPBIN)/foamyHexMesh diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/Make/options similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/Make/options rename to applications/utilities/mesh/generation/foamyHexMesh/Make/options diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/files similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/files rename to applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/files diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/Make/options rename to applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/Make/options diff --git a/applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C rename to applications/utilities/mesh/generation/foamyHexMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C similarity index 98% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C index a0327ce04f..fd0b574b3b 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H similarity index 97% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H index 841e5c9024..733f1230f7 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C similarity index 99% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C index c3102f531b..250dd062c1 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C @@ -345,7 +345,7 @@ Foam::DelaunayMesh::createMesh labelList owner(Triangulation::number_of_finite_facets()); labelList neighbour(Triangulation::number_of_finite_facets()); - wordList patchNames(1, "cvMesh_defaultPatch"); + wordList patchNames(1, "foamyHexMesh_defaultPatch"); wordList patchTypes(1, wallPolyPatch::typeName); PtrList patchDicts(1); diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C similarity index 99% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C index b2ed781b8b..53b332749b 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H similarity index 98% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H index fcc5d8c2ba..1eaa483c74 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTable.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTable.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H similarity index 95% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H index 6c093bc13a..786ec97158 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C similarity index 99% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C index 1774ead3a4..c02ff6ffb4 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C @@ -608,7 +608,8 @@ bool Foam::backgroundMeshDecomposition::refineCell } else if (volType == volumeType::INSIDE) { - // scalar s = cvMesh_.cellShapeControl_.cellSize(cellBb.midpoint()); + // scalar s = + // foamyHexMesh_.cellShapeControl_.cellSize(cellBb.midpoint()); // Estimate the number of points in the cell by the size at the cell // midpoint @@ -835,7 +836,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition "Foam::backgroundMeshDecomposition::backgroundMeshDecomposition" "(" "const dictionary& coeffsDict, " - "const conformalVoronoiMesh& cvMesh" + "const conformalVoronoiMesh& foamyHexMesh" ")" ) << "This cannot be used when not running in parallel." diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H similarity index 99% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H index b93064d216..97b270a606 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H @@ -197,7 +197,7 @@ public: // Constructors - //- Construct from components in cvMesh operation + //- Construct from components in foamyHexMesh operation backgroundMeshDecomposition ( const Time& runTime, diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H similarity index 96% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H index 1f8b7b0a32..f7f981e547 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.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-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H similarity index 97% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H index ac47311940..cdc7510f23 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C similarity index 97% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C index 07c4a6e34c..17ac184f19 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C @@ -47,17 +47,20 @@ defineTypeNameAndDebug(cellShapeControl, 0); Foam::cellShapeControl::cellShapeControl ( const Time& runTime, - const cvControls& cvMeshControls, + const cvControls& foamyHexMeshControls, const searchableSurfaces& allGeometry, const conformationSurfaces& geometryToConformTo ) : - dictionary(cvMeshControls.cvMeshDict().subDict("motionControl")), + dictionary + ( + foamyHexMeshControls.foamyHexMeshDict().subDict("motionControl") + ), runTime_(runTime), allGeometry_(allGeometry), geometryToConformTo_(geometryToConformTo), - defaultCellSize_(cvMeshControls.defaultCellSize()), - minimumCellSize_(cvMeshControls.minimumCellSize()), + defaultCellSize_(foamyHexMeshControls.defaultCellSize()), + minimumCellSize_(foamyHexMeshControls.minimumCellSize()), shapeControlMesh_(runTime), aspectRatio_(*this), sizeAndAlignment_ diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H similarity index 98% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H index a25d5b8fe7..c9a3ae67bf 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H @@ -105,7 +105,7 @@ public: cellShapeControl ( const Time& runTime, - const cvControls& cvMeshControls, + const cvControls& foamyHexMeshControls, const searchableSurfaces& allGeometry, const conformationSurfaces& geometryToConformTo ); diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControlI.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C similarity index 99% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C index f4e3317bfe..42e8a161f9 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C @@ -90,7 +90,7 @@ defineTypeNameAndDebug(cellShapeControlMesh, 0); // // const tensor Rp = rotationTensor(vector(0,0,1), np); // -// const label s = 36;//cvMeshControls().alignmentSearchSpokes(); +// const label s = 36;//foamyHexMeshControls().alignmentSearchSpokes(); // // scalar closestSpokeHitDistance = GREAT; // diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H similarity index 96% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H index 305256d4cc..8bceb79ed4 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMeshI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H similarity index 100% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H similarity index 96% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H index e80b3fb8f4..b3cc3dd5a3 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H similarity index 96% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H index 4e7dd48c38..59c627c946 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C similarity index 95% rename from applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C rename to applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C index 805140fde3..2b422996de 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C @@ -78,7 +78,7 @@ void Foam::conformalVoronoiMesh::cellSizeMeshOverlapsBackground() const << endl; Pout<< "Cell Size Mesh Bounds = " << cellSizeMesh.bounds() << endl; - Pout<< "cvMesh Bounds = " << bb << endl; + Pout<< "foamyHexMesh Bounds = " << bb << endl; fullyContained = false; } @@ -251,7 +251,7 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs insertPoints(pts, true); - if (cvMeshControls().objOutput() && fName != fileName::null) + if (foamyHexMeshControls().objOutput() && fName != fileName::null) { writePoints(fName, pts); } @@ -291,7 +291,7 @@ void Foam::conformalVoronoiMesh::insertEdgePointGroups insertPoints(pts, true); - if (cvMeshControls().objOutput() && fName != fileName::null) + if (foamyHexMeshControls().objOutput() && fName != fileName::null) { writePoints(fName, pts); } @@ -337,7 +337,7 @@ void Foam::conformalVoronoiMesh::distribute() { if (!Pstream::parRun()) { - return ; + return; } autoPtr mapDist = @@ -439,12 +439,12 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh() } } + const dictionary& motionControlDict + = foamyHexMeshControls().foamyHexMeshDict().subDict("motionControl"); + label nMaxIter = readLabel ( - cvMeshControls().cvMeshDict().subDict("motionControl").lookup - ( - "maxRefinementIterations" - ) + motionControlDict.lookup("maxRefinementIterations") ); Info<< "Maximum number of refinement iterations : " << nMaxIter << endl; @@ -481,10 +481,7 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh() label maxSmoothingIterations = readLabel ( - cvMeshControls().cvMeshDict().subDict("motionControl").lookup - ( - "maxSmoothingIterations" - ) + motionControlDict.lookup("maxSmoothingIterations") ); meshAlignmentSmoother.smoothAlignments(maxSmoothingIterations); @@ -501,10 +498,18 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh() cellSizeMesh.write(); } - if (cvMeshControls().printVertexInfo()) + if (foamyHexMeshControls().printVertexInfo()) { cellSizeMesh.printVertexInfo(Info); } + +// Info<< "Estimated number of cells in final mesh = " +// << returnReduce +// ( +// cellSizeMesh.estimateCellCount(decomposition_), +// sumOp