Merge branch 'master' into cvm

This commit is contained in:
graham
2011-05-31 16:18:03 +01:00
482 changed files with 20601 additions and 49813 deletions

View File

@ -38,32 +38,56 @@ edges
(
);
patches
boundary
(
patch maxX
(
(3 7 6 2)
)
patch minZ
(
(0 4 7 3)
)
patch maxZ
(
(2 6 5 1)
)
patch minX
(
(1 5 4 0)
)
patch minY
(
(0 3 2 1)
)
patch maxY
(
(4 5 6 7)
)
maxX
{
type patch;
faces
(
(3 7 6 2)
);
}
minZ
{
type patch;
faces
(
(0 4 7 3)
);
}
maxZ
{
type patch;
faces
(
(2 6 5 1)
);
}
minX
{
type patch;
faces
(
(1 5 4 0)
);
}
minY
{
type patch;
faces
(
(0 3 2 1)
);
}
maxY
{
type patch;
faces
(
(4 5 6 7)
);
}
);
mergePatchPairs

View File

@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
@ -19,37 +19,37 @@ FoamFile
(
maxX
{
type wall;
type patch;
nFaces 1200;
startFace 210000;
}
minZ
{
type wall;
type patch;
nFaces 3600;
startFace 211200;
}
maxZ
{
type wall;
type patch;
nFaces 3600;
startFace 214800;
}
minX
{
type wall;
type patch;
nFaces 1200;
startFace 218400;
}
minY
{
type wall;
type patch;
nFaces 1200;
startFace 219600;
}
maxY
{
type wall;
type patch;
nFaces 1200;
startFace 220800;
}

View File

@ -37,19 +37,26 @@ edges
(
);
patches
boundary
(
patch stationaryWalls
(
(0 3 2 1)
(2 6 5 1)
(1 5 4 0)
(3 7 6 2)
(0 4 7 3)
(4 5 6 7)
)
patch movingBlock
()
stationaryWalls
{
type patch;
faces
(
(0 3 2 1)
(2 6 5 1)
(1 5 4 0)
(3 7 6 2)
(0 4 7 3)
(4 5 6 7)
);
}
movingBlock
{
type patch;
faces ();
}
);
mergePatchPairs

View File

@ -19,15 +19,15 @@ FoamFile
(
stationaryWalls
{
type wall;
type patch;
nFaces 666;
startFace 2994;
startFace 3069;
}
movingBlock
{
type patch;
nFaces 42;
startFace 3660;
nFaces 0;
startFace 3735;
}
)

View File

@ -37,17 +37,21 @@ edges
(
);
patches
boundary
(
patch allBoundary
(
(3 7 6 2)
(0 4 7 3)
(2 6 5 1)
(1 5 4 0)
(0 3 2 1)
(4 5 6 7)
)
allBoundary
{
type patch;
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)
);
}
);
// ************************************************************************* //