diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake index 1e4d6a3041..55623189f5 100755 --- a/applications/utilities/mesh/generation/Allwmake +++ b/applications/utilities/mesh/generation/Allwmake @@ -12,7 +12,7 @@ wmake snappyHexMesh if [ -d "$CGAL_ARCH_PATH" ] then foamyHexMesh/Allwmake - cv2DMesh/Allwmake + foamyHex2DMesh/Allwmake fi # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/mesh/generation/cv2DMesh/Allwclean b/applications/utilities/mesh/generation/foamyHex2DMesh/Allwclean similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/Allwclean rename to applications/utilities/mesh/generation/foamyHex2DMesh/Allwclean diff --git a/applications/utilities/mesh/generation/cv2DMesh/Allwmake b/applications/utilities/mesh/generation/foamyHex2DMesh/Allwmake similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/Allwmake rename to applications/utilities/mesh/generation/foamyHex2DMesh/Allwmake diff --git a/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2DKernel.H b/applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2DKernel.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2DKernel.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2DKernel.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H b/applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2Ddefs.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/CGALTriangulation2Ddefs.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2Ddefs.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2D.C b/applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/CV2D.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2D.H b/applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/CV2D.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2DI.H b/applications/utilities/mesh/generation/foamyHex2DMesh/CV2DI.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/CV2DI.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/CV2DI.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/CV2DIO.C b/applications/utilities/mesh/generation/foamyHex2DMesh/CV2DIO.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/CV2DIO.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/CV2DIO.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/Make/files b/applications/utilities/mesh/generation/foamyHex2DMesh/Make/files similarity index 76% rename from applications/utilities/mesh/generation/cv2DMesh/Make/files rename to applications/utilities/mesh/generation/foamyHex2DMesh/Make/files index f7f70afa2a..01dfc1e22f 100755 --- a/applications/utilities/mesh/generation/cv2DMesh/Make/files +++ b/applications/utilities/mesh/generation/foamyHex2DMesh/Make/files @@ -7,6 +7,6 @@ insertSurfaceNearPointPairs.C insertBoundaryConformPointPairs.C CV2DIO.C shortEdgeFilter2D.C -cv2DMesh.C +foamyHex2DMesh.C -EXE = $(FOAM_APPBIN)/cv2DMesh +EXE = $(FOAM_APPBIN)/foamyHex2DMesh diff --git a/applications/utilities/mesh/generation/cv2DMesh/Make/options b/applications/utilities/mesh/generation/foamyHex2DMesh/Make/options similarity index 93% rename from applications/utilities/mesh/generation/cv2DMesh/Make/options rename to applications/utilities/mesh/generation/foamyHex2DMesh/Make/options index 37c8ed4aea..d1a5bfde54 100755 --- a/applications/utilities/mesh/generation/cv2DMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHex2DMesh/Make/options @@ -12,7 +12,7 @@ EXE_INC = \ -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \ -I../cvMesh/vectorTools \ -IconformalVoronoi2DMesh/lnInclude \ - -I$(FOAM_APP)/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/lnInclude \ + -I$(FOAM_APP)/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/Make/files b/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/files similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/Make/files rename to applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/files diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/Make/options b/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/options similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/Make/options rename to applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/options diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C b/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H b/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H b/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C b/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMesh.C similarity index 99% rename from applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMesh.C index e44a249f28..319f53691f 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C +++ b/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMesh.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - cv2DMesh + foamyHex2DMesh Description Conformal-Voronoi 2D extruding automatic mesher with grid or read diff --git a/applications/utilities/mesh/generation/cv2DMesh/cv2DMeshDict b/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMeshDict similarity index 86% rename from applications/utilities/mesh/generation/cv2DMesh/cv2DMeshDict rename to applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMeshDict index 0ef6d2a0c4..81bd5bca0c 100644 --- a/applications/utilities/mesh/generation/cv2DMesh/cv2DMeshDict +++ b/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMeshDict @@ -5,21 +5,14 @@ | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { version 2.0; format ascii; - - root ""; - case ""; - instance ""; - local ""; - class dictionary; - object cv2DMeshDict; + location "system"; + object foamyHex2DMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -47,42 +40,41 @@ geometry surfaceConformation { - locationInMesh (-2.8 0.7 0.5); + locationInMesh (-2.8 0.7 0.5); - pointPairDistanceCoeff 0.005; + pointPairDistanceCoeff 0.005; - minEdgeLenCoeff 0.005; + minEdgeLenCoeff 0.005; - maxNotchLenCoeff 0.003; + maxNotchLenCoeff 0.003; - minNearPointDistCoeff 0.0025; + minNearPointDistCoeff 0.0025; - maxQuadAngle 125; + maxQuadAngle 125; // Insert near-boundary point mirror or point-pairs insertSurfaceNearestPointPairs yes; // Mirror near-boundary points rather than insert point-pairs - mirrorPoints no; + mirrorPoints no; // Insert point-pairs vor dual-cell vertices very near the surface insertSurfaceNearPointPairs yes; // Maximum number of iterations used in boundaryConform. - maxBoundaryConformingIter 5; + maxBoundaryConformingIter 5; geometryToConformTo { laurence_clean_preciser { - featureMethod extendedFeatureEdgeMesh; + featureMethod extendedFeatureEdgeMesh; extendedFeatureEdgeMesh "laurence_clean_preciser.extendedFeatureEdgeMesh"; } } additionalFeatures - { - } + {} // Choose if to randomise the initial grid created by insertGrid. randomiseInitialGrid yes; @@ -148,27 +140,26 @@ motionControl adaptiveLinearCoeffs { - relaxationStart 0.5; + relaxationStart 1.0; relaxationEnd 0.0; } - objOutput no; + objOutput no; // Near-wall region where cells are aligned with the wall specified as a number // of cell layers nearWallAlignedDist 3; - } shortEdgeFilter { // Factor to multiply the average of a face's edge lengths by. // If an edge of that face is smaller than that value then delete it. - shortEdgeFilterFactor 0.2; + shortEdgeFilterFactor 0.2; // Weighting for the lengths of edges that are attached to the boundaries. // Used when calculating the length of an edge. Default 2.0. - edgeAttachedToBoundaryFactor 2.0; + edgeAttachedToBoundaryFactor 2.0; } extrusion @@ -206,3 +197,6 @@ extrusion thickness 0.1; } + + +// ************************************************************************* // diff --git a/applications/utilities/mesh/generation/cv2DMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyHex2DMesh/indexedFace.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/indexedFace.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/indexedFace.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/indexedFaceI.H b/applications/utilities/mesh/generation/foamyHex2DMesh/indexedFaceI.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/indexedFaceI.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/indexedFaceI.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertex.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/indexedVertex.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertex.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/indexedVertexI.H b/applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertexI.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/indexedVertexI.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertexI.H diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertBoundaryConformPointPairs.C b/applications/utilities/mesh/generation/foamyHex2DMesh/insertBoundaryConformPointPairs.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/insertBoundaryConformPointPairs.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/insertBoundaryConformPointPairs.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertFeaturePoints.C b/applications/utilities/mesh/generation/foamyHex2DMesh/insertFeaturePoints.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/insertFeaturePoints.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/insertFeaturePoints.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C b/applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearPointPairs.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearPointPairs.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearestPointPairs.C b/applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearestPointPairs.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearestPointPairs.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearestPointPairs.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.C similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.C rename to applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.C diff --git a/applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.H b/applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.H similarity index 100% rename from applications/utilities/mesh/generation/cv2DMesh/shortEdgeFilter2D.H rename to applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.H diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/0.org/T b/tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/T similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/0.org/T rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/T diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/0.org/U b/tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/U similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/0.org/U rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/U diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/0.org/p b/tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/p similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/0.org/p rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/p diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/Allclean b/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allclean similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/Allclean rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/Allclean diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/Allrun b/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun similarity index 91% rename from tutorials/mesh/cv2DMesh/OpenCFD/Allrun rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun index c86f5608da..05750d2d75 100755 --- a/tutorials/mesh/cv2DMesh/OpenCFD/Allrun +++ b/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory cp system/controlDict.mesher system/controlDict runApplication surfaceFeatureExtract -runApplication cv2DMesh -overwrite +runApplication foamyHex2DMesh -overwrite runApplication extrude2DMesh -overwrite polyMesh2D runApplication checkMesh -allGeometry -allTopology -constant -noZero diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun-rhoCentralFoam similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/Allrun-rhoCentralFoam rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun-rhoCentralFoam diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/constant/polyMesh/boundary b/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/polyMesh/boundary similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/constant/polyMesh/boundary rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/polyMesh/boundary diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/constant/thermophysicalProperties b/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/thermophysicalProperties similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/constant/thermophysicalProperties rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/thermophysicalProperties diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/constant/triSurface/opencfd_box.stl b/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_box.stl similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/constant/triSurface/opencfd_box.stl rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_box.stl diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/constant/triSurface/opencfd_text.stl b/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_text.stl similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/constant/triSurface/opencfd_text.stl rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_text.stl diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/constant/turbulenceProperties b/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/turbulenceProperties similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/constant/turbulenceProperties rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/turbulenceProperties diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/controlDict b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/controlDict rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/controlDict.mesher b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.mesher similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/controlDict.mesher rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.mesher diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/controlDict.rhoCentralFoam b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.rhoCentralFoam similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/controlDict.rhoCentralFoam rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.rhoCentralFoam diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/decomposeParDict b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/decomposeParDict similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/decomposeParDict rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/decomposeParDict diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/extrude2DMeshDict b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/extrude2DMeshDict similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/extrude2DMeshDict rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/extrude2DMeshDict diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/cv2DMeshDict b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/foamyHex2DMeshDict similarity index 97% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/cv2DMeshDict rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/foamyHex2DMeshDict index 5ceb886e15..821769aa5a 100644 --- a/tutorials/mesh/cv2DMesh/OpenCFD/system/cv2DMeshDict +++ b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/foamyHex2DMeshDict @@ -10,7 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - object cv2DMeshDict; + location "system"; + object foamyHex2DMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -98,7 +99,7 @@ motionControl { type searchableSurfaceControl; priority 1; - mode bothSides; + mode inside; cellSizeFunction uniform; linearDistanceCoeffs diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/fvSchemes b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSchemes similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/fvSchemes rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSchemes diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/fvSolution b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSolution similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/fvSolution rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSolution diff --git a/tutorials/mesh/cv2DMesh/OpenCFD/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/surfaceFeatureExtractDict similarity index 100% rename from tutorials/mesh/cv2DMesh/OpenCFD/system/surfaceFeatureExtractDict rename to tutorials/mesh/foamyHex2DMesh/OpenCFD/system/surfaceFeatureExtractDict diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/Allclean b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allclean similarity index 100% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/Allclean rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allclean diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/Allrun b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allrun similarity index 90% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/Allrun rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allrun index cda5a63e28..087447c2fb 100755 --- a/tutorials/mesh/cv2DMesh/jaggedBoundary/Allrun +++ b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication surfaceFeatureExtract -runApplication cv2DMesh -overwrite +runApplication foamyHex2DMesh -overwrite runApplication extrude2DMesh -overwrite MeshedSurface runApplication checkMesh -allGeometry -allTopology -constant -noZero diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl similarity index 100% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/system/controlDict b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/controlDict similarity index 100% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/system/controlDict rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/controlDict diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/system/extrude2DMeshDict b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/extrude2DMeshDict similarity index 100% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/system/extrude2DMeshDict rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/extrude2DMeshDict diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/system/cv2DMeshDict b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/foamyHex2DMeshDict similarity index 98% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/system/cv2DMeshDict rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/foamyHex2DMeshDict index f23fbc6c5b..fee67e55fe 100644 --- a/tutorials/mesh/cv2DMesh/jaggedBoundary/system/cv2DMeshDict +++ b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/foamyHex2DMeshDict @@ -10,7 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - object cv2DMeshDict; + location "system"; + object foamyHex2DMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/system/fvSchemes b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSchemes similarity index 100% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/system/fvSchemes rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSchemes diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/system/fvSolution b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSolution similarity index 100% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/system/fvSolution rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSolution diff --git a/tutorials/mesh/cv2DMesh/jaggedBoundary/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/surfaceFeatureExtractDict similarity index 100% rename from tutorials/mesh/cv2DMesh/jaggedBoundary/system/surfaceFeatureExtractDict rename to tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/surfaceFeatureExtractDict diff --git a/tutorials/mesh/cv2DMesh/square/Allclean b/tutorials/mesh/foamyHex2DMesh/square/Allclean similarity index 100% rename from tutorials/mesh/cv2DMesh/square/Allclean rename to tutorials/mesh/foamyHex2DMesh/square/Allclean diff --git a/tutorials/mesh/cv2DMesh/square/Allrun b/tutorials/mesh/foamyHex2DMesh/square/Allrun similarity index 90% rename from tutorials/mesh/cv2DMesh/square/Allrun rename to tutorials/mesh/foamyHex2DMesh/square/Allrun index 469561f159..c12f0325db 100755 --- a/tutorials/mesh/cv2DMesh/square/Allrun +++ b/tutorials/mesh/foamyHex2DMesh/square/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication surfaceFeatureExtract -runApplication cv2DMesh -overwrite +runApplication foamyHex2DMesh -overwrite runApplication extrude2DMesh -overwrite polyMesh2D runApplication checkMesh -allGeometry -allTopology -constant -noZero diff --git a/tutorials/mesh/cv2DMesh/square/constant/triSurface/unit_cube.stl b/tutorials/mesh/foamyHex2DMesh/square/constant/triSurface/unit_cube.stl similarity index 100% rename from tutorials/mesh/cv2DMesh/square/constant/triSurface/unit_cube.stl rename to tutorials/mesh/foamyHex2DMesh/square/constant/triSurface/unit_cube.stl diff --git a/tutorials/mesh/cv2DMesh/square/system/controlDict b/tutorials/mesh/foamyHex2DMesh/square/system/controlDict similarity index 100% rename from tutorials/mesh/cv2DMesh/square/system/controlDict rename to tutorials/mesh/foamyHex2DMesh/square/system/controlDict diff --git a/tutorials/mesh/cv2DMesh/square/system/extrude2DMeshDict b/tutorials/mesh/foamyHex2DMesh/square/system/extrude2DMeshDict similarity index 100% rename from tutorials/mesh/cv2DMesh/square/system/extrude2DMeshDict rename to tutorials/mesh/foamyHex2DMesh/square/system/extrude2DMeshDict diff --git a/tutorials/mesh/cv2DMesh/square/system/cv2DMeshDict b/tutorials/mesh/foamyHex2DMesh/square/system/foamyHex2DMeshDict similarity index 98% rename from tutorials/mesh/cv2DMesh/square/system/cv2DMeshDict rename to tutorials/mesh/foamyHex2DMesh/square/system/foamyHex2DMeshDict index 3f7c4d3bac..76645c4fba 100644 --- a/tutorials/mesh/cv2DMesh/square/system/cv2DMeshDict +++ b/tutorials/mesh/foamyHex2DMesh/square/system/foamyHex2DMeshDict @@ -10,7 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - object DMeshDict; + location "system"; + object foamyHex2DMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/mesh/cv2DMesh/square/system/fvSchemes b/tutorials/mesh/foamyHex2DMesh/square/system/fvSchemes similarity index 100% rename from tutorials/mesh/cv2DMesh/square/system/fvSchemes rename to tutorials/mesh/foamyHex2DMesh/square/system/fvSchemes diff --git a/tutorials/mesh/cv2DMesh/square/system/fvSolution b/tutorials/mesh/foamyHex2DMesh/square/system/fvSolution similarity index 100% rename from tutorials/mesh/cv2DMesh/square/system/fvSolution rename to tutorials/mesh/foamyHex2DMesh/square/system/fvSolution diff --git a/tutorials/mesh/cv2DMesh/square/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHex2DMesh/square/system/surfaceFeatureExtractDict similarity index 100% rename from tutorials/mesh/cv2DMesh/square/system/surfaceFeatureExtractDict rename to tutorials/mesh/foamyHex2DMesh/square/system/surfaceFeatureExtractDict