exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'nextRelease' of ssh://git.code.sf.net/p/openfoam-extend/foam-extend-3.1 into nextRelease

Browse source
This commit is contained in:
Hrvoje Jasak 2014-06-12 08:48:26 +01:00
commit 6a18db4aa3
23 changed files with 13072 additions and 8023 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/0_orig/U
View file

@ -29,13 +29,9 @@ boundaryField
{ {
type ggi; type ggi;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
}
GVCYCLIC2
{
type cyclicGgi;
} }
GVBLADE GVBLADE
{ {
@ -44,10 +40,7 @@ boundaryField
} }
GVHUB GVHUB
{ {
type rotatingWallVelocity; type fixedValue;
origin (0 0 0);
axis (0 0 1);
omega -10;
value uniform (0 0 0); value uniform (0 0 0);
} }
GVSHROUD GVSHROUD

9
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/0_orig/epsilon
View file

@ -31,14 +31,9 @@ boundaryField
type ggi; type ggi;
value uniform 14.855; value uniform 14.855;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
value uniform 14.855;
}
GVCYCLIC2
{
type cyclicGgi;
value uniform 14.855; value uniform 14.855;
} }
GVBLADE GVBLADE

9
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/0_orig/k
View file

@ -31,14 +31,9 @@ boundaryField
type ggi; type ggi;
value uniform 0.375; value uniform 0.375;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
value uniform 0.375;
}
GVCYCLIC2
{
type cyclicGgi;
value uniform 0.375; value uniform 0.375;
} }
GVBLADE GVBLADE

9
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/0_orig/nut
View file

@ -31,14 +31,9 @@ boundaryField
type ggi; type ggi;
value uniform 0; value uniform 0;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
value uniform 0;
}
GVCYCLIC2
{
type cyclicGgi;
value uniform 0; value uniform 0;
} }
GVBLADE GVBLADE

8
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/0_orig/p
View file

@ -28,13 +28,9 @@ boundaryField
{ {
type ggi; type ggi;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
}
GVCYCLIC2
{
type cyclicGgi;
} }
GVBLADE GVBLADE
{ {

10392
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/allBlades.pvsm
View file

File diff suppressed because it is too large Load diff

71
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/constant/polyMesh/blockMeshDict.m4
View file

@ -290,50 +290,31 @@ boundary
); );
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
shadowPatch GVCYCLIC2; featureCos 0.9;
zone GVCYCLIC1Zone; //MUST specify transformation since cyclic is not flat.
bridgeOverlap false; //Set global debugSwitch cyclic to 1 to check that it is correct!
rotationAxis (0 0 1); transform rotational;
rotationAngle 72; rotationAxis (0 0 1);
separationOffset (0 0 0); rotationCentre (0 0 0);
rotationAngle -72; //Degrees from second half to first half
//Face numbering must be same on both halfs/sides. The numbering
//is determined by the block definition, not by the faces list
//below. Just make sure that each face definition is according
//to the rule "clockwise when looking from inside the block".
faces faces
( (
//First half, left side:
quad2D(GV1l, GV0l) quad2D(GV1l, GV0l)
quad2D(GV3l, GV2l) quad2D(GV3l, GV2l)
); //Second half, right side:
}
GVCYCLIC2
{
type cyclicGgi;
shadowPatch GVCYCLIC1;
zone GVCYCLIC2Zone;
bridgeOverlap false;
rotationAxis (0 0 1);
rotationAngle -72;
separationOffset (0 0 0);
faces
(
quad2D(GV0r, GV1r) quad2D(GV0r, GV1r)
quad2D(GV2r, GV3r) quad2D(GV2r, GV3r)
); );
} }
//GVCYCLIC
//{
// type cyclic;
// faces
// (
// quad2D(GV1l, GV0l)
// quad2D(GV3l, GV2l)
// quad2D(GV0r, GV1r)
// quad2D(GV2r, GV3r)
// );
//}
GVBLADE GVBLADE
{ {
type wall; type wall;
@ -422,18 +403,6 @@ boundary
); );
} }
//RUCYCLIC
//{
// type cyclic;
// faces
// (
// quad2D(RU1l, RU0l)
// quad2D(RU3l, RU2l)
// quad2D(RU0r, RU1r)
// quad2D(RU2r, RU3r)
// );
//}
RUBLADE RUBLADE
{ {
type wall; type wall;
@ -517,16 +486,6 @@ boundary
); );
} }
//DTCYCLIC
//{
// type cyclic;
// faces
// (
// quad2D(DT1l, DT0l)
// quad2D(DT0r, DT1r)
// );
//}
DTHUB DTHUB
{ {
type wall; type wall;

2
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/setBatchGgi
View file

@ -1,5 +1,3 @@
faceSet GVCYCLIC1Zone new patchToFace GVCYCLIC1
faceSet GVCYCLIC2Zone new patchToFace GVCYCLIC2
faceSet RUCYCLIC1Zone new patchToFace RUCYCLIC1 faceSet RUCYCLIC1Zone new patchToFace RUCYCLIC1
faceSet RUCYCLIC2Zone new patchToFace RUCYCLIC2 faceSet RUCYCLIC2Zone new patchToFace RUCYCLIC2
faceSet DTCYCLIC1Zone new patchToFace DTCYCLIC1 faceSet DTCYCLIC1Zone new patchToFace DTCYCLIC1

2
tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/system/decomposeParDict
View file

@ -21,14 +21,12 @@ method patchConstrained;
globalFaceZones globalFaceZones
( (
GVCYCLIC2Zone
RUCYCLIC1Zone RUCYCLIC1Zone
RUINLETZone RUINLETZone
RUCYCLIC2Zone RUCYCLIC2Zone
RUOUTLETZone RUOUTLETZone
GVOUTLETZone GVOUTLETZone
DTINLETZone DTINLETZone
GVCYCLIC1Zone
DTCYCLIC1Zone DTCYCLIC1Zone
DTCYCLIC2Zone DTCYCLIC2Zone
); );

13
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/0_orig/U
View file

@ -30,13 +30,9 @@ boundaryField
{ {
type mixingPlane; type mixingPlane;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
}
GVCYCLIC2
{
type cyclicGgi;
} }
GVBLADE GVBLADE
{ {
@ -45,10 +41,7 @@ boundaryField
} }
GVHUB GVHUB
{ {
type rotatingWallVelocity; type fixedValue;
origin ( 0 0 0 );
axis ( 0 0 1 );
omega -10;
value uniform ( 0 0 0 ); value uniform ( 0 0 0 );
} }
GVSHROUD GVSHROUD

9
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/0_orig/epsilon
View file

@ -31,14 +31,9 @@ boundaryField
type mixingPlane; type mixingPlane;
value uniform 14.855; value uniform 14.855;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
value uniform 14.855;
}
GVCYCLIC2
{
type cyclicGgi;
value uniform 14.855; value uniform 14.855;
} }
GVBLADE GVBLADE

9
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/0_orig/k
View file

@ -31,14 +31,9 @@ boundaryField
type mixingPlane; type mixingPlane;
value uniform 0.375; value uniform 0.375;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
value uniform 0.375;
}
GVCYCLIC2
{
type cyclicGgi;
value uniform 0.375; value uniform 0.375;
} }
GVBLADE GVBLADE

9
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/0_orig/nut
View file

@ -31,14 +31,9 @@ boundaryField
type mixingPlane; type mixingPlane;
value uniform 0; value uniform 0;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
value uniform 0;
}
GVCYCLIC2
{
type cyclicGgi;
value uniform 0; value uniform 0;
} }
GVBLADE GVBLADE

8
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/0_orig/p
View file

@ -29,13 +29,9 @@ boundaryField
{ {
type mixingPlane; type mixingPlane;
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
}
GVCYCLIC2
{
type cyclicGgi;
} }
GVBLADE GVBLADE
{ {

5
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/Allrun
View file

@ -8,9 +8,8 @@ application=`getApplication`
#Create the mesh: #Create the mesh:
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh runApplication blockMesh
runApplication transformPoints -scale "(1 20 1)" transformPoints -scale "(1 20 1)"
\rm -f log.transformPoints transformPoints -cylToCart "((0 0 0) (0 0 1) (1 0 0))"
runApplication transformPoints -cylToCart "((0 0 0) (0 0 1) (1 0 0))"
# Set 0-directory and create GGI set: # Set 0-directory and create GGI set:
cp -r 0_orig 0 cp -r 0_orig 0

10392
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/allBlades.pvsm
View file

File diff suppressed because it is too large Load diff

105
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/constant/polyMesh/blockMeshDict.m4
View file

@ -20,7 +20,7 @@ define(calc, [esyscmd(perl -e 'printf ($1)')])
//define(calc, [esyscmd(echo $1 | bc | tr -d \\n)]) //define(calc, [esyscmd(echo $1 | bc | tr -d \\n)])
define(VCOUNT, 0) define(VCOUNT, 0)
define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))]) define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
define(pi, 3.14159265) define(pi, calc(3.14159265/20))
define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t)) define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
define(quad2D, ($1b $2b $2t $1t)) define(quad2D, ($1b $2b $2t $1t))
@ -285,13 +285,15 @@ boundary
zone GVOUTLETZone; zone GVOUTLETZone;
coordinateSystem coordinateSystem
{ {
//type cylindrical; type cylindrical;
//name mixingCS; name mixingCS;
origin (0 0 0); origin (0 0 0);
axis (0 0 1); axis (0 0 1);
direction (1 0 0); direction (1 0 0);
//e1 (1 0 0); degrees false; //Use radians
//Equivalent axis/direction definition:
//e3 (0 0 1); //e3 (0 0 1);
//e1 (1 0 0);
} }
ribbonPatch ribbonPatch
{ {
@ -305,50 +307,31 @@ boundary
); );
} }
GVCYCLIC1 GVCYCLIC
{ {
type cyclicGgi; type cyclic;
shadowPatch GVCYCLIC2; featureCos 0.9;
zone GVCYCLIC1Zone; //MUST specify transformation since cyclic is not flat.
bridgeOverlap false; //Set global debugSwitch cyclic to 1 to check that it is correct!
rotationAxis (0 0 1); transform rotational;
rotationAngle 72; rotationAxis (0 0 1);
separationOffset (0 0 0); rotationCentre (0 0 0);
rotationAngle -72; //Degrees from second half to first half
//Face numbering must be same on both halfs/sides. The numbering
//is determined by the block definition, not by the faces list
//below. Just make sure that each face definition is according
//to the rule "clockwise when looking from inside the block".
faces faces
( (
//First half, left side:
quad2D(GV1l, GV0l) quad2D(GV1l, GV0l)
quad2D(GV3l, GV2l) quad2D(GV3l, GV2l)
); //Second half, right side:
}
GVCYCLIC2
{
type cyclicGgi;
shadowPatch GVCYCLIC1;
zone GVCYCLIC2Zone;
bridgeOverlap false;
rotationAxis (0 0 1);
rotationAngle -72;
separationOffset (0 0 0);
faces
(
quad2D(GV0r, GV1r) quad2D(GV0r, GV1r)
quad2D(GV2r, GV3r) quad2D(GV2r, GV3r)
); );
} }
//GVCYCLIC
//{
// type cyclic;
// faces
// (
// quad2D(GV1l, GV0l)
// quad2D(GV3l, GV2l)
// quad2D(GV0r, GV1r)
// quad2D(GV2r, GV3r)
// );
//}
GVBLADE GVBLADE
{ {
type wall; type wall;
@ -388,13 +371,15 @@ boundary
zone RUINLETZone; zone RUINLETZone;
coordinateSystem coordinateSystem
{ {
//type cylindrical; type cylindrical;
//name mixingCS; name mixingCS;
origin (0 0 0); origin (0 0 0);
axis (0 0 1); axis (0 0 1);
direction (1 0 0); direction (1 0 0);
//e1 (1 0 0); degrees false; //Use radians
//Equivalent axis/direction definition:
//e3 (0 0 1); //e3 (0 0 1);
//e1 (1 0 0);
} }
ribbonPatch ribbonPatch
{ {
@ -415,13 +400,15 @@ boundary
zone RUOUTLETZone; zone RUOUTLETZone;
coordinateSystem coordinateSystem
{ {
//type cylindrical; type cylindrical;
//name mixingCS; name mixingCS;
origin (0 0 0); origin (0 0 0);
axis (0 0 1); axis (0 0 1);
direction (1 0 0); direction (1 0 0);
//e1 (1 0 0); degrees false; //Use radians
//Equivalent axis/direction definition:
//e3 (0 0 1); //e3 (0 0 1);
//e1 (1 0 0);
} }
ribbonPatch ribbonPatch
{ {
@ -467,18 +454,6 @@ boundary
); );
} }
//RUCYCLIC
//{
// type cyclic;
// faces
// (
// quad2D(RU1l, RU0l)
// quad2D(RU3l, RU2l)
// quad2D(RU0r, RU1r)
// quad2D(RU2r, RU3r)
// );
//}
RUBLADE RUBLADE
{ {
type wall; type wall;
@ -518,13 +493,15 @@ boundary
zone DTINLETZone; zone DTINLETZone;
coordinateSystem coordinateSystem
{ {
//type cylindrical; type cylindrical;
//name mixingCS; name mixingCS;
origin (0 0 0); origin (0 0 0);
axis (0 0 1); axis (0 0 1);
direction (1 0 0); direction (1 0 0);
//e1 (1 0 0); degrees false; //Use radians
//Equivalent axis/direction definition:
//e3 (0 0 1); //e3 (0 0 1);
//e1 (1 0 0);
} }
ribbonPatch ribbonPatch
{ {
@ -577,16 +554,6 @@ boundary
); );
} }
//DTCYCLIC
//{
// type cyclic;
// faces
// (
// quad2D(DT1l, DT0l)
// quad2D(DT0r, DT1r)
// );
//}
DTHUB DTHUB
{ {
type wall; type wall;

2
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/setBatchGgi
View file

@ -1,5 +1,3 @@
faceSet GVCYCLIC1Zone new patchToFace GVCYCLIC1
faceSet GVCYCLIC2Zone new patchToFace GVCYCLIC2
faceSet RUCYCLIC1Zone new patchToFace RUCYCLIC1 faceSet RUCYCLIC1Zone new patchToFace RUCYCLIC1
faceSet RUCYCLIC2Zone new patchToFace RUCYCLIC2 faceSet RUCYCLIC2Zone new patchToFace RUCYCLIC2
faceSet DTCYCLIC1Zone new patchToFace DTCYCLIC1 faceSet DTCYCLIC1Zone new patchToFace DTCYCLIC1

2
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/decomposeParDict
View file

@ -21,14 +21,12 @@ method patchConstrained;
globalFaceZones globalFaceZones
( (
GVCYCLIC2Zone
RUCYCLIC1Zone RUCYCLIC1Zone
RUINLETZone RUINLETZone
RUCYCLIC2Zone RUCYCLIC2Zone
RUOUTLETZone RUOUTLETZone
GVOUTLETZone GVOUTLETZone
DTINLETZone DTINLETZone
GVCYCLIC1Zone
DTCYCLIC1Zone DTCYCLIC1Zone
DTCYCLIC2Zone DTCYCLIC2Zone
); );

11
tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/fvSchemes
View file

@ -63,9 +63,14 @@ fluxRequired
mixingPlane mixingPlane
{ {
default areaAveraging; default areaAveraging;
//U fluxAveragingAdjustMassFlow; U areaAveraging;
//p zeroGradientAreaAveragingMix; p areaAveraging;
k fluxAveraging; //Transported variable
epsilon fluxAveraging; //Transported variable
//NOTE: Ideally, tangential velocity components should also be
//fluxAveraged, while keeping areaAveraging for normal velocity
//component (to preserve perfect mass conservation)
} }
// ************************************************************************* // // ************************************************************************* //

1
tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/boundary
View file

@ -55,6 +55,7 @@ FoamFile
origin (0 0 0); origin (0 0 0);
e1 (1 0 0); e1 (1 0 0);
e3 (0 0 1); e3 (0 0 1);
degrees false; //Use radians
} }
ribbonPatch ribbonPatch
{ {

2
tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/constant/polyMesh/boundary
View file

@ -55,6 +55,7 @@ FoamFile
origin (0 0 0); origin (0 0 0);
e1 (1 0 0); e1 (1 0 0);
e3 (0 0 1); e3 (0 0 1);
degrees false; //Use radians
} }
ribbonPatch ribbonPatch
{ {
@ -62,6 +63,7 @@ FoamFile
stackAxis Z; stackAxis Z;
discretisation bothPatches; discretisation bothPatches;
} }
} }
inletDomB inletDomB
{ {

12
tutorials/incompressible/simpleSRFFoam/axialTurbine/constant/polyMesh/blockMeshDict.m4
View file

@ -196,18 +196,6 @@ boundary
); );
} }
//RUCYCLIC
//{
// type cyclic;
// faces
// (
// quad2D(RU1l, RU0l)
// quad2D(RU3l, RU2l)
// quad2D(RU0r, RU1r)
// quad2D(RU2r, RU3r)
// );
//}
RUBLADE RUBLADE
{ {
type wall; type wall;