Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy
2011-05-27 12:36:40 +01:00
249 changed files with 5829 additions and 48011 deletions

View File

@ -46,6 +46,7 @@ FoamFile
type cyclic;
nFaces 0;
startFace 24810;
matchTolerance 0.0001;
neighbourPatch baffleCyclic_half1;
}
baffleCyclic_half1
@ -53,6 +54,7 @@ FoamFile
type cyclic;
nFaces 0;
startFace 24810;
matchTolerance 0.0001;
neighbourPatch baffleCyclic_half0;
}
)

View File

@ -85,65 +85,85 @@ edges
(
);
patches
boundary
(
patch inlet
(
(0 22 23 1)
(1 23 24 2)
(2 24 25 3)
)
patch outlet
(
(16 17 39 38)
(17 18 40 39)
(18 19 41 40)
(19 20 42 41)
(20 21 43 42)
)
wall upperWall
(
(3 25 31 9)
(9 31 37 15)
(15 37 43 21)
)
wall lowerWall
(
(0 6 28 22)
(6 5 27 28)
(5 4 26 27)
(4 10 32 26)
(10 16 38 32)
)
empty frontAndBack
(
(22 28 29 23)
(23 29 30 24)
(24 30 31 25)
(26 32 33 27)
(27 33 34 28)
(28 34 35 29)
(29 35 36 30)
(30 36 37 31)
(32 38 39 33)
(33 39 40 34)
(34 40 41 35)
(35 41 42 36)
(36 42 43 37)
(0 1 7 6)
(1 2 8 7)
(2 3 9 8)
(4 5 11 10)
(5 6 12 11)
(6 7 13 12)
(7 8 14 13)
(8 9 15 14)
(10 11 17 16)
(11 12 18 17)
(12 13 19 18)
(13 14 20 19)
(14 15 21 20)
)
inlet
{
type patch;
faces
(
(0 22 23 1)
(1 23 24 2)
(2 24 25 3)
);
}
outlet
{
type patch;
faces
(
(16 17 39 38)
(17 18 40 39)
(18 19 41 40)
(19 20 42 41)
(20 21 43 42)
);
}
upperWall
{
type wall;
faces
(
(3 25 31 9)
(9 31 37 15)
(15 37 43 21)
);
}
lowerWall
{
type wall;
faces
(
(0 6 28 22)
(6 5 27 28)
(5 4 26 27)
(4 10 32 26)
(10 16 38 32)
);
}
frontAndBack
{
type empty;
faces
(
(22 28 29 23)
(23 29 30 24)
(24 30 31 25)
(26 32 33 27)
(27 33 34 28)
(28 34 35 29)
(29 35 36 30)
(30 36 37 31)
(32 38 39 33)
(33 39 40 34)
(34 40 41 35)
(35 41 42 36)
(36 42 43 37)
(0 1 7 6)
(1 2 8 7)
(2 3 9 8)
(4 5 11 10)
(5 6 12 11)
(6 7 13 12)
(7 8 14 13)
(8 9 15 14)
(10 11 17 16)
(11 12 18 17)
(12 13 19 18)
(13 14 20 19)
(14 15 21 20)
);
}
);
mergePatchPairs

View File

@ -40,11 +40,11 @@ boundaryField
{
type zeroGradient;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -42,11 +42,11 @@ boundaryField
type fixedValue;
value uniform 570;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -42,11 +42,11 @@ boundaryField
type fixedValue;
value uniform 570;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -44,11 +44,11 @@ boundaryField
type fixedValue;
value uniform ( 0 0 0 );
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -40,11 +40,11 @@ boundaryField
{
type zeroGradient;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -41,11 +41,11 @@ boundaryField
hs h;
value uniform 0;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -40,11 +40,11 @@ boundaryField
{
type zeroGradient;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -42,11 +42,11 @@ boundaryField
type zeroGradient;
value uniform 2e-05;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -39,11 +39,11 @@ boundaryField
type muSgsUSpaldingWallFunction;
value uniform 0;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -45,11 +45,11 @@ boundaryField
{
type zeroGradient;
}
frontAndBack_half0
front
{
type cyclic;
}
frontAndBack_half1
back
{
type cyclic;
}

View File

@ -16,7 +16,7 @@ FoamFile
convertToMeters 0.001;
vertices
vertices
(
(-20.6 0 0)
(-20.6 2 0)
@ -64,7 +64,7 @@ vertices
(290 16.6 38.1)
);
blocks
blocks
(
hex (0 6 7 1 22 28 29 23) (18 7 20) simpleGrading (1 1 1)
hex (1 7 8 2 23 29 30 24) (18 10 20) simpleGrading (1 4 1)
@ -81,69 +81,98 @@ blocks
hex (14 20 21 15 36 42 43 37) (25 13 20) simpleGrading (1 0.25 1)
);
edges
edges
(
);
patches
boundary
(
patch inlet
(
(0 22 23 1)
(1 23 24 2)
(2 24 25 3)
)
patch outlet
(
(16 17 39 38)
(17 18 40 39)
(18 19 41 40)
(19 20 42 41)
(20 21 43 42)
)
wall upperWall
(
(3 25 31 9)
(9 31 37 15)
(15 37 43 21)
)
wall lowerWall
(
(0 6 28 22)
(6 5 27 28)
(5 4 26 27)
(4 10 32 26)
(10 16 38 32)
)
cyclic frontAndBack
(
(22 28 29 23)
(23 29 30 24)
(24 30 31 25)
(26 32 33 27)
(27 33 34 28)
(28 34 35 29)
(29 35 36 30)
(30 36 37 31)
(32 38 39 33)
(33 39 40 34)
(34 40 41 35)
(35 41 42 36)
(36 42 43 37)
(0 1 7 6)
(1 2 8 7)
(2 3 9 8)
(4 5 11 10)
(5 6 12 11)
(6 7 13 12)
(7 8 14 13)
(8 9 15 14)
(10 11 17 16)
(11 12 18 17)
(12 13 19 18)
(13 14 20 19)
(14 15 21 20)
)
inlet
{
type patch;
faces
(
(0 22 23 1)
(1 23 24 2)
(2 24 25 3)
);
}
outlet
{
type patch;
faces
(
(16 17 39 38)
(17 18 40 39)
(18 19 41 40)
(19 20 42 41)
(20 21 43 42)
);
}
upperWall
{
type wall;
faces
(
(3 25 31 9)
(9 31 37 15)
(15 37 43 21)
);
}
lowerWall
{
type wall;
faces
(
(0 6 28 22)
(6 5 27 28)
(5 4 26 27)
(4 10 32 26)
(10 16 38 32)
);
}
front
{
type cyclic;
neighbourPatch back;
faces
(
(22 28 29 23)
(23 29 30 24)
(24 30 31 25)
(26 32 33 27)
(27 33 34 28)
(28 34 35 29)
(29 35 36 30)
(30 36 37 31)
(32 38 39 33)
(33 39 40 34)
(34 40 41 35)
(35 41 42 36)
(36 42 43 37)
);
}
back
{
type cyclic;
neighbourPatch front;
faces
(
(0 1 7 6)
(1 2 8 7)
(2 3 9 8)
(4 5 11 10)
(5 6 12 11)
(6 7 13 12)
(7 8 14 13)
(8 9 15 14)
(10 11 17 16)
(11 12 18 17)
(12 13 19 18)
(13 14 20 19)
(14 15 21 20)
);
}
);
mergePatchPairs

View File

@ -41,19 +41,21 @@ FoamFile
nFaces 5000;
startFace 721875;
}
frontAndBack_half0
front
{
type cyclic;
nFaces 12225;
startFace 726875;
neighbourPatch frontAndBack_half1;
matchTolerance 0.0001;
neighbourPatch back;
}
frontAndBack_half1
back
{
type cyclic;
nFaces 12225;
startFace 739100;
neighbourPatch frontAndBack_half0;
matchTolerance 0.0001;
neighbourPatch front;
}
)

View File

@ -37,29 +37,49 @@ edges
(
);
patches
boundary
(
symmetryPlane left
(
(0 4 5 1)
)
symmetryPlane right
(
(2 3 7 6)
)
symmetryPlane top
(
(1 5 7 3)
)
symmetryPlane bottom
(
(0 2 6 4)
)
empty frontAndBack
(
(4 5 7 6)
(0 1 3 2)
)
left
{
type symmetryPlane;
faces
(
(0 4 5 1)
);
}
right
{
type symmetryPlane;
faces
(
(2 3 7 6)
);
}
top
{
type symmetryPlane;
faces
(
(1 5 7 3)
);
}
bottom
{
type symmetryPlane;
faces
(
(0 2 6 4)
);
}
frontAndBack
{
type empty;
faces
(
(4 5 7 6)
(0 1 3 2)
);
}
);
mergePatchPairs

View File

@ -37,17 +37,21 @@ edges
(
);
patches
boundary
(
wall walls
(
(2 6 5 1)
(0 4 7 3)
(0 1 5 4)
(4 5 6 7)
(7 6 2 3)
(3 2 1 0)
)
walls
{
type wall;
faces
(
(2 6 5 1)
(0 4 7 3)
(0 1 5 4)
(4 5 6 7)
(7 6 2 3)
(3 2 1 0)
);
}
);
mergePatchPairs

View File

@ -38,26 +38,42 @@ edges
(
);
patches
boundary
(
patch base
(
(0 1 5 4)
)
patch outlet
(
(3 2 6 7)
)
patch sides
(
(1 5 6 2)
(0 4 7 3)
)
empty frontAndBack
(
(0 1 2 3)
(4 5 6 7)
)
base
{
type patch;
faces
(
(0 1 5 4)
);
}
outlet
{
type patch;
faces
(
(3 2 6 7)
);
}
sides
{
type patch;
faces
(
(1 5 6 2)
(0 4 7 3)
);
}
frontAndBack
{
type empty;
faces
(
(0 1 2 3)
(4 5 6 7)
);
}
);
mergePatchPairs

View File

@ -15,37 +15,31 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
4
(
base
{
type patch;
nFaces 134;
nFaces 150;
startFace 44700;
}
outlet
{
type patch;
nFaces 150;
startFace 44834;
startFace 44850;
}
sides
{
type patch;
nFaces 300;
startFace 44984;
startFace 45000;
}
frontAndBack
{
type empty;
nFaces 45000;
startFace 45284;
}
inlet
{
type patch;
nFaces 16;
startFace 90284;
startFace 45300;
}
)

View File

@ -38,23 +38,35 @@ edges
(
);
patches
boundary
(
patch base
(
(0 1 5 4)
)
patch outlet
(
(3 2 6 7)
)
patch sides
(
(0 4 7 3)
(0 1 2 3)
(1 5 6 2)
(4 5 6 7)
)
base
{
type patch;
faces
(
(0 1 5 4)
);
}
outlet
{
type patch;
faces
(
(3 2 6 7)
);
}
sides
{
type patch;
faces
(
(0 4 7 3)
(0 1 2 3)
(1 5 6 2)
(4 5 6 7)
);
}
);
mergePatchPairs

View File

@ -15,31 +15,25 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
3
(
base
{
type patch;
nFaces 3456;
nFaces 3600;
startFace 637200;
}
outlet
{
type patch;
nFaces 3600;
startFace 640656;
startFace 640800;
}
sides
{
type patch;
nFaces 14400;
startFace 644256;
}
inlet
{
type patch;
nFaces 144;
startFace 658656;
startFace 644400;
}
)

View File

@ -37,26 +37,42 @@ edges
(
);
patches
boundary
(
patch fuel
(
(0 4 7 3)
)
patch air
(
(1 2 6 5)
)
patch outlet
(
(0 1 5 4)
(7 6 2 3)
)
empty frontAndBack
(
(4 5 6 7)
(0 3 2 1)
)
fuel
{
type patch;
faces
(
(0 4 7 3)
);
}
air
{
type patch;
faces
(
(1 2 6 5)
);
}
outlet
{
type patch;
faces
(
(0 1 5 4)
(7 6 2 3)
);
}
frontAndBack
{
type empty;
faces
(
(4 5 6 7)
(0 3 2 1)
);
}
);
mergePatchPairs