GIT: Resolved conflict

2025-11-28 03:28:01 +00:00 · 2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 0e01c44129
2311 changed files with 44974 additions and 26547 deletions
--- a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
@ -0,0 +1,69 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1.0;
+
+xmin -1.3;
+xmax  0.65;
+ymin -1.1;
+ymax  0.8;
+zmin -1.4;
+zmax  0.55;
+
+vertices
+(
+    ($xmin $ymin $zmin)
+    ($xmax $ymin $zmin)
+    ($xmax $ymax $zmin)
+    ($xmin $ymax $zmin)
+    ($xmin $ymin $zmax)
+    ($xmax $ymin $zmax)
+    ($xmax $ymax $zmax)
+    ($xmin $ymax $zmax)
+
+);
+
+blocks
+(
+    hex (0 1 2  3 4 5 6 7) (11 11 9) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    walls
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //