diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index 55623189f56b745b1bfa50a5bced9fdf19b566b7..8d8fa4ea77bef0ce1f89b23426ce6b3391c4829f 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
- foamyHex2DMesh/Allwmake
+ foamyQuadMesh/Allwmake
fi
# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C
index 9c32ce867a2e2fe8d201e6deb870d8ee8530f874..8133723819d8dbfa09084a3efe11540240906671 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/foamyHexMesh.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
(
IOobject
(
- "foamyHexMeshDict",
+ args.executable() + "Dict",
runTime.system(),
runTime,
IOobject::MUST_READ_IF_MODIFIED,
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/Allwclean b/applications/utilities/mesh/generation/foamyQuadMesh/Allwclean
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/Allwclean
rename to applications/utilities/mesh/generation/foamyQuadMesh/Allwclean
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/Allwmake b/applications/utilities/mesh/generation/foamyQuadMesh/Allwmake
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/Allwmake
rename to applications/utilities/mesh/generation/foamyQuadMesh/Allwmake
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2DKernel.H b/applications/utilities/mesh/generation/foamyQuadMesh/CGALTriangulation2DKernel.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2DKernel.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/CGALTriangulation2DKernel.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2Ddefs.H b/applications/utilities/mesh/generation/foamyQuadMesh/CGALTriangulation2Ddefs.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/CGALTriangulation2Ddefs.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/CGALTriangulation2Ddefs.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.C b/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/CV2D.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.H b/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/CV2D.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/CV2D.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/CV2DI.H b/applications/utilities/mesh/generation/foamyQuadMesh/CV2DI.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/CV2DI.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/CV2DI.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/CV2DIO.C b/applications/utilities/mesh/generation/foamyQuadMesh/CV2DIO.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/CV2DIO.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/CV2DIO.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/Make/files b/applications/utilities/mesh/generation/foamyQuadMesh/Make/files
similarity index 76%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/Make/files
rename to applications/utilities/mesh/generation/foamyQuadMesh/Make/files
index 01dfc1e22fb0c3fc4ca1ba19c5a158c7e58dbebf..0434c90c6632f87cad48bfae128d06f30c0d0adb 100755
--- a/applications/utilities/mesh/generation/foamyHex2DMesh/Make/files
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/Make/files
@@ -7,6 +7,6 @@ insertSurfaceNearPointPairs.C
insertBoundaryConformPointPairs.C
CV2DIO.C
shortEdgeFilter2D.C
-foamyHex2DMesh.C
+foamyQuadMesh.C
-EXE = $(FOAM_APPBIN)/foamyHex2DMesh
+EXE = $(FOAM_APPBIN)/foamyQuadMesh
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/Make/options
rename to applications/utilities/mesh/generation/foamyQuadMesh/Make/options
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/files b/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/files
rename to applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/files
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/Make/options
rename to applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/Make/options
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C b/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H b/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H b/applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControlsI.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMesh.C b/applications/utilities/mesh/generation/foamyQuadMesh/foamyQuadMesh.C
similarity index 99%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMesh.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/foamyQuadMesh.C
index 319f53691f6e830fd273505c0ba5d6776f059246..3fc2fb07f4951f3a7e5b7a7b60117da3ff65e6ba 100644
--- a/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMesh.C
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/foamyQuadMesh.C
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
- foamyHex2DMesh
+ foamyQuadMesh
Description
Conformal-Voronoi 2D extruding automatic mesher with grid or read
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMeshDict b/applications/utilities/mesh/generation/foamyQuadMesh/foamyQuadMeshDict
similarity index 88%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMeshDict
rename to applications/utilities/mesh/generation/foamyQuadMesh/foamyQuadMeshDict
index 81bd5bca0cc14238fcdd7a281fd9feb380099923..3d61b2fabdaba5502ed48920a1793b963843e5b1 100644
--- a/applications/utilities/mesh/generation/foamyHex2DMesh/foamyHex2DMeshDict
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/foamyQuadMeshDict
@@ -11,31 +11,18 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object foamyHex2DMeshDict;
+ object foamyQuadMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
geometry
{
- laurence_clean_preciser.stl
+ surfaceFile.stl
{
- name laurence_clean_preciser;
- type closedTriSurfaceMesh;
- //type triSurfaceMesh;
+ name surfaceFile;
+ type triSurfaceMesh;
}
-// refinementBox
-// {
-// type searchableBox;
-// min (-0.5 0.35 -1000);
-// max (-0.5 0.35 1000);
-// }
-// refinementSphere
-// {
-// type searchableSphere;
-// centre (0.85 0.4 0.0);
-// radius 0.01;
-// }
}
surfaceConformation
@@ -66,10 +53,10 @@ surfaceConformation
geometryToConformTo
{
- laurence_clean_preciser
+ surfaceFile
{
featureMethod extendedFeatureEdgeMesh;
- extendedFeatureEdgeMesh "laurence_clean_preciser.extendedFeatureEdgeMesh";
+ extendedFeatureEdgeMesh "surfaceFile.extendedFeatureEdgeMesh";
}
}
@@ -94,7 +81,7 @@ motionControl
cellSizeControlGeometry
{
- laurence_clean_preciser
+ surfaceFile
{
priority 1;
mode bothSides;
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyQuadMesh/indexedFace.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/indexedFace.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/indexedFace.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/indexedFaceI.H b/applications/utilities/mesh/generation/foamyQuadMesh/indexedFaceI.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/indexedFaceI.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/indexedFaceI.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyQuadMesh/indexedVertex.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertex.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/indexedVertex.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertexI.H b/applications/utilities/mesh/generation/foamyQuadMesh/indexedVertexI.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/indexedVertexI.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/indexedVertexI.H
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/insertBoundaryConformPointPairs.C b/applications/utilities/mesh/generation/foamyQuadMesh/insertBoundaryConformPointPairs.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/insertBoundaryConformPointPairs.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/insertBoundaryConformPointPairs.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/insertFeaturePoints.C b/applications/utilities/mesh/generation/foamyQuadMesh/insertFeaturePoints.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/insertFeaturePoints.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/insertFeaturePoints.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearPointPairs.C b/applications/utilities/mesh/generation/foamyQuadMesh/insertSurfaceNearPointPairs.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearPointPairs.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/insertSurfaceNearPointPairs.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearestPointPairs.C b/applications/utilities/mesh/generation/foamyQuadMesh/insertSurfaceNearestPointPairs.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/insertSurfaceNearestPointPairs.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/insertSurfaceNearestPointPairs.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyQuadMesh/shortEdgeFilter2D.C
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.C
rename to applications/utilities/mesh/generation/foamyQuadMesh/shortEdgeFilter2D.C
diff --git a/applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.H b/applications/utilities/mesh/generation/foamyQuadMesh/shortEdgeFilter2D.H
similarity index 100%
rename from applications/utilities/mesh/generation/foamyHex2DMesh/shortEdgeFilter2D.H
rename to applications/utilities/mesh/generation/foamyQuadMesh/shortEdgeFilter2D.H
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/T b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/T
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/T
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/T
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/U b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/U
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/p b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/p
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/0.org/p
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/p
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allclean b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/Allclean
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
similarity index 91%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
index 05750d2d751a6ef73d609681cc8891da43c21938..36e81e496f29362613b2a2051d8e905c05cc19fd 100755
--- a/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory
cp system/controlDict.mesher system/controlDict
runApplication surfaceFeatureExtract
-runApplication foamyHex2DMesh -overwrite
+runApplication foamyQuadMesh -overwrite
runApplication extrude2DMesh -overwrite polyMesh2D
runApplication checkMesh -allGeometry -allTopology -constant -noZero
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/Allrun-rhoCentralFoam
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/polyMesh/boundary b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/polyMesh/boundary
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/constant/polyMesh/boundary
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/thermophysicalProperties b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/thermophysicalProperties
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_box.stl b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/triSurface/opencfd_box.stl
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_box.stl
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/constant/triSurface/opencfd_box.stl
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_text.stl b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/triSurface/opencfd_text.stl
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/triSurface/opencfd_text.stl
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/constant/triSurface/opencfd_text.stl
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/turbulenceProperties b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/constant/turbulenceProperties
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.mesher b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.mesher
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/controlDict.rhoCentralFoam
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/decomposeParDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/decomposeParDict
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/extrude2DMeshDict
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/foamyHex2DMeshDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
similarity index 99%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/foamyHex2DMeshDict
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
index 821769aa5a4966c0c06d7d41c218568fda8cb242..a16e7f3fbc6f4486645c766d1f1697d47b16c243 100644
--- a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/foamyHex2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object foamyHex2DMeshDict;
+ object foamyQuadMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSchemes
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSolution b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/fvSolution
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
diff --git a/tutorials/mesh/foamyHex2DMesh/OpenCFD/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/OpenCFD/system/surfaceFeatureExtractDict
rename to tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allclean b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allclean
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allclean
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allrun b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
similarity index 90%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allrun
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
index 087447c2fb4a96b7c7da9732d1913eb8d31bb08c..5b5b21582d7d69deab59be87faa4af67a90bcffe 100755
--- a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication surfaceFeatureExtract
-runApplication foamyHex2DMesh -overwrite
+runApplication foamyQuadMesh -overwrite
runApplication extrude2DMesh -overwrite MeshedSurface
runApplication checkMesh -allGeometry -allTopology -constant -noZero
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/constant/triSurface/jaggedBoundary.stl
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/controlDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/controlDict
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/extrude2DMeshDict
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/foamyHex2DMeshDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
similarity index 99%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/foamyHex2DMeshDict
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
index fee67e55feb4b9b8a48ef3b10770b2b0ca85ea14..8cbfb7a94a328714df61bd753269b767b0f4bc8c 100644
--- a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/foamyHex2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object foamyHex2DMeshDict;
+ object foamyQuadMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSchemes
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSolution b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/fvSolution
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
diff --git a/tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/jaggedBoundary/system/surfaceFeatureExtractDict
rename to tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
diff --git a/tutorials/mesh/foamyHex2DMesh/square/Allclean b/tutorials/mesh/foamyQuadMesh/square/Allclean
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/square/Allclean
rename to tutorials/mesh/foamyQuadMesh/square/Allclean
diff --git a/tutorials/mesh/foamyHex2DMesh/square/Allrun b/tutorials/mesh/foamyQuadMesh/square/Allrun
similarity index 90%
rename from tutorials/mesh/foamyHex2DMesh/square/Allrun
rename to tutorials/mesh/foamyQuadMesh/square/Allrun
index c12f0325dbb47f9c16f3e3e605b68db8aa8e6234..1856290b9a9f5911864eca6ff6b0a295d74e7c47 100755
--- a/tutorials/mesh/foamyHex2DMesh/square/Allrun
+++ b/tutorials/mesh/foamyQuadMesh/square/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication surfaceFeatureExtract
-runApplication foamyHex2DMesh -overwrite
+runApplication foamyQuadMesh -overwrite
runApplication extrude2DMesh -overwrite polyMesh2D
runApplication checkMesh -allGeometry -allTopology -constant -noZero
diff --git a/tutorials/mesh/foamyHex2DMesh/square/constant/triSurface/unit_cube.stl b/tutorials/mesh/foamyQuadMesh/square/constant/triSurface/unit_cube.stl
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/square/constant/triSurface/unit_cube.stl
rename to tutorials/mesh/foamyQuadMesh/square/constant/triSurface/unit_cube.stl
diff --git a/tutorials/mesh/foamyHex2DMesh/square/system/controlDict b/tutorials/mesh/foamyQuadMesh/square/system/controlDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/square/system/controlDict
rename to tutorials/mesh/foamyQuadMesh/square/system/controlDict
diff --git a/tutorials/mesh/foamyHex2DMesh/square/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/square/system/extrude2DMeshDict
rename to tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
diff --git a/tutorials/mesh/foamyHex2DMesh/square/system/foamyHex2DMeshDict b/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
similarity index 99%
rename from tutorials/mesh/foamyHex2DMesh/square/system/foamyHex2DMeshDict
rename to tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
index 76645c4fba50e7b332a64d714bae40afd0f9136d..275822892214c52bf823e0fc730e366dc49dd059 100644
--- a/tutorials/mesh/foamyHex2DMesh/square/system/foamyHex2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object foamyHex2DMeshDict;
+ object foamyQuadMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/mesh/foamyHex2DMesh/square/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/square/system/fvSchemes
rename to tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
diff --git a/tutorials/mesh/foamyHex2DMesh/square/system/fvSolution b/tutorials/mesh/foamyQuadMesh/square/system/fvSolution
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/square/system/fvSolution
rename to tutorials/mesh/foamyQuadMesh/square/system/fvSolution
diff --git a/tutorials/mesh/foamyHex2DMesh/square/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
similarity index 100%
rename from tutorials/mesh/foamyHex2DMesh/square/system/surfaceFeatureExtractDict
rename to tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict