Merge branch 'master' of ssh://opencfd:8007/home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry
2013-01-24 22:10:49 +00:00
170 changed files with 7368 additions and 2402 deletions

View File

@ -22,62 +22,6 @@ collapseEdgesCoeffs
// The maximum angle between two edges that share a point attached to
// no other edges
maximumMergeAngle 5;
// The amount that minimumEdgeLength will be reduced by for each
// edge if that edge's collapse generates a poor quality face
reductionFactor 0.5;
}
collapseFacesCoeffs
{
// The initial face length factor
initialFaceLengthFactor 0.5;
// The amount that initialFaceLengthFactor will be reduced by for each
// face if its collapse generates a poor quality face
reductionFactor $initialFaceLengthFactor;
// If the face can't be collapsed to an edge, and it has a span less than
// the target face length multiplied by this coefficient, collapse it
// to a point.
maxCollapseFaceToPointSideLengthCoeff 0.3;
// Allow early collapse of edges to a point
allowEarlyCollapseToPoint on;
// Fraction to premultiply maxCollapseFaceToPointSideLengthCoeff by if
// allowEarlyCollapseToPoint is enabled
allowEarlyCollapseCoeff 0.2;
// Defining how close to the midpoint (M) of the projected
// vertices line a projected vertex (X) can be before making this
// an invalid edge collapse
//
// X---X-g----------------M----X-----------g----X--X
//
// Only allow a collapse if all projected vertices are outwith
// guardFraction (g) of the distance form the face centre to the
// furthest vertex in the considered direction
guardFraction 0.1;
}
meshQualityCoeffs
{
// Name of the dictionary that has the mesh quality coefficients used
// by motionSmoother::checkMesh
#include "meshQualityDict";
// Maximum number of smoothing iterations for the reductionFactors
maximumSmoothingIterations 2;
// Maximum number of outer iterations is mesh quality checking is enabled
maximumIterations 10;
// Maximum number of iterations deletion of a point can cause a bad face
// to be constructed before it is forced to not be deleted
maxPointErrorCount 5;
}

View File

@ -1,67 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object meshQualityDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//- Maximum non-orthogonality allowed. Set to 180 to disable.
maxNonOrtho 180;
//- Max skewness allowed. Set to <0 to disable.
maxBoundarySkewness 50;
//- Max skewness allowed. Set to <0 to disable.
maxInternalSkewness 10;
//- Max concaveness allowed. Is angle (in degrees) below which concavity
// is allowed. 0 is straight face, <0 would be convex face.
// Set to 180 to disable.
maxConcave 80;
//- Minimum pyramid volume. Is absolute volume of cell pyramid.
// Set to a sensible fraction of the smallest cell volume expected.
// Set to very negative number (e.g. -1E30) to disable.
minVol 1e-20;
//- Minimum quality of the tet formed by the face-centre
// and variable base point minimum decomposition triangles and
// the cell centre. This has to be a positive number for tracking
// to work. Set to very negative number (e.g. -1E30) to
// disable.
// <0 = inside out tet,
// 0 = flat tet
// 1 = regular tet
minTetQuality 1e-30;
//- Minimum face area. Set to <0 to disable.
minArea -1;
//- Minimum face twist. Set to <-1 to disable. dot product of face normal
//- and face centre triangles normal
minTwist 0.0;
//- minimum normalised cell determinant
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
//- minFaceWeight (0 -> 0.5)
minFaceWeight 0.02;
//- minVolRatio (0 -> 1)
minVolRatio 0.01;
//must be >0 for Fluent compatibility
minTriangleTwist -1;
// ************************************************************************* //

View File

@ -33,12 +33,18 @@ porosity1
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}
************************************************************************* //
//************************************************************************* //

View File

@ -10,28 +10,41 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object porosityProperties;
location "system";
object fvOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
porosity1
{
type DarcyForchheimer;
active yes;
type explicitPorositySource;
active true;
selectionMode cellZone;
cellZone porosity;
DarcyForchheimerCoeffs
explicitPorositySourceCoeffs
{
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
type DarcyForchheimer;
coordinateSystem
DarcyForchheimerCoeffs
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}
// ************************************************************************* //
//************************************************************************* //

View File

@ -57,7 +57,7 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
rhoMin rhoMin [ 1 -3 0 0 0 ] 0.5;
rhoMax rhoMax [ 1 -3 0 0 0 ] 2.0;
rhoMax rhoMax [ 1 -3 0 0 0 ] 1.5;
residualControl
{
@ -76,7 +76,7 @@ relaxationFactors
fields
{
"p.*" 0.3;
"rho.*" 1;
"rho.*" 0.01;
}
equations
{

View File

@ -1,37 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
porosity1
{
type DarcyForchheimer;
active yes;
cellZone stator;
DarcyForchheimerCoeffs
{
d d [0 -2 0 0 0 0 0] (1e5 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
e1 (1 0 0);
e2 (0 1 0);
}
}
}
// ************************************************************************* //

View File

@ -0,0 +1,69 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
porosity1
{
type explicitPorositySource;
active yes;
selectionMode cellZone;
cellZone stator;
explicitPorositySourceCoeffs
{
type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d d [0 -2 0 0 0 0 0] (1e5 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (1 0 0);
e2 (0 1 0);
}
}
}
}
}
MRF1
{
type MRFSource;
active yes;
selectionMode cellZone;
cellZone rotor;
MRFSourceCoeffs
{
// Fixed patches (by default they 'move' with the MRF zone)
nonRotatingPatches ();
origin (0 0 0);
axis (0 0 1);
omega constant 1047.2;
}
}
// ************************************************************************* //

View File

@ -10,26 +10,38 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object porosityProperties;
location "system";
object fvOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
porosity1
{
type DarcyForchheimer;
active yes;
type explicitPorositySource;
active true;
selectionMode cellZone;
cellZone porosity;
DarcyForchheimerCoeffs
explicitPorositySourceCoeffs
{
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
type DarcyForchheimer;
coordinateSystem
DarcyForchheimerCoeffs
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}

View File

@ -1,20 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// none
// ************************************************************************* //

View File

@ -28,8 +28,14 @@ porosity1
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}

View File

@ -51,12 +51,18 @@ porosity1
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}
************************************************************************* //
//***************************************************************************//

View File

@ -76,7 +76,7 @@ relaxationFactors
fields
{
p 0.3;
rho 0.05;
rho 0.02;
}
equations
{

View File

@ -23,7 +23,7 @@ internalFacesOnly true;
// Baffles to create.
baffles
{
baffleFaces
baffleFacesThermoBaffle1D
{
//- Use predefined faceZone to select faces and orientation.
type faceZone;
@ -52,61 +52,27 @@ baffles
{
T
{
type compressible::thermoBaffle;
// Coupled BC.
neighbourFieldName T;
kappa fluidThermo;
kappaName none;
// Thermo baffle model
thermoBaffleModel thermoBaffle;
regionName baffleRegion;
infoOutput no;
active yes;
thermoBaffleCoeffs
type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]
specie
{
nMoles 1;
molWeight 20;
}
// Solid thermo
thermoType
transport
{
type heSolidThermo;
mixture pureMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
kappa 1;
}
mixture
thermodynamics
{
specie
{
nMoles 1;
molWeight 20;
}
transport
{
kappa 0.01;
}
thermodynamics
{
Hf 0;
Cp 15;
}
equationOfState
{
rho 80;
}
Hf 0;
Cp 10;
}
radiation
equationOfState
{
radiationModel opaqueSolid;
absorptionEmissionModel none;
scatterModel none;
rho 10;
}
value uniform 300;
@ -160,7 +126,10 @@ baffles
offsetMode uniform;
offset (0 0 0);
${..master.patchFields}
patchFields
{
${...master.patchFields}
}
}
}
}

View File

@ -69,7 +69,7 @@ MRF1
{
origin (0.25 0.25 0.25);
axis (0 0 1);
omega 5.305; // 500 rpm
omega 477.5; // 500 rpm
}
}

View File

@ -1,31 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
zone1
{
cellZone rotor;
active yes;
// Fixed patches (by default they 'move' with the MRF zone)
nonRotatingPatches ();
origin (0 0 0);
axis (0 0 1);
omega constant 104.72;
}
// ************************************************************************* //

View File

@ -28,8 +28,14 @@ porosity1
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}

View File

@ -10,8 +10,7 @@ forceCoeffs1
{
type forceCoeffs;
functionObjectLibs ( "libforces.so" );
outputControl timeStep;
outputInterval 1;
outputControl outputTime;
log yes;
patches ( "motorBike.*" );

View File

@ -89,7 +89,7 @@ subModels
duration 10.0;
parcelsPerSecond 200;
}
]
}
dispersionModel none;

View File

@ -13,7 +13,7 @@ runApplication blockMesh
runApplication topoSet
# create baffles and fields
createBaffles -overwrite
runApplication createBaffles -overwrite
runApplication $application

View File

@ -1,38 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object porosityProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
filter1
{
cellZone filter;
active true;
type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
e1 (1 0 0);
e2 (0 1 0);
}
}
}
// ************************************************************************* //

View File

@ -15,6 +15,32 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
filter1
{
type explicitPorositySource;
selectionMode cellZone;
cellZone filter;
active true;
explicitPorositySourceCoeffs
{
type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
e1 (1 0 0);
e2 (0 1 0);
}
}
}
}
massSource1
{
type scalarSemiImplicitSource;

View File

@ -41,6 +41,10 @@ boundaryField
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
defaultFaces
{
type empty;
}
porous_half0
{
type cyclic;
@ -49,10 +53,6 @@ boundaryField
{
type cyclic;
}
defaultFaces
{
type empty;
}
}

View File

@ -39,6 +39,10 @@ boundaryField
inletValue uniform 0;
value uniform 0;
}
defaultFaces
{
type empty;
}
porous_half0
{
type cyclic;
@ -47,10 +51,6 @@ boundaryField
{
type cyclic;
}
defaultFaces
{
type empty;
}
}

View File

@ -24,16 +24,25 @@ boundaryField
leftWall
{
type epsilonWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0.1;
}
rightWall
{
type epsilonWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0.1;
}
lowerWall
{
type epsilonWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0.1;
}
atmosphere
@ -42,6 +51,10 @@ boundaryField
inletValue uniform 0.1;
value uniform 0.1;
}
defaultFaces
{
type empty;
}
porous_half0
{
type cyclic;
@ -50,10 +63,6 @@ boundaryField
{
type cyclic;
}
defaultFaces
{
type empty;
}
}

View File

@ -42,6 +42,10 @@ boundaryField
inletValue uniform 0.1;
value uniform 0.1;
}
defaultFaces
{
type empty;
}
porous_half0
{
type cyclic;
@ -50,10 +54,6 @@ boundaryField
{
type cyclic;
}
defaultFaces
{
type empty;
}
}

View File

@ -39,6 +39,10 @@ boundaryField
inletValue uniform 0;
value uniform 0;
}
defaultFaces
{
type empty;
}
porous_half0
{
type cyclic;
@ -47,10 +51,6 @@ boundaryField
{
type cyclic;
}
defaultFaces
{
type empty;
}
}

View File

@ -24,16 +24,25 @@ boundaryField
leftWall
{
type nutkWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
}
rightWall
{
type nutkWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
}
lowerWall
{
type nutkWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
}
atmosphere
@ -41,6 +50,10 @@ boundaryField
type calculated;
value uniform 0;
}
defaultFaces
{
type empty;
}
porous_half0
{
type cyclic;
@ -49,10 +62,6 @@ boundaryField
{
type cyclic;
}
defaultFaces
{
type empty;
}
}

View File

@ -25,19 +25,16 @@ boundaryField
{
type fixedFluxPressure;
gradient uniform 0;
value uniform 0;
}
rightWall
{
type fixedFluxPressure;
gradient uniform 0;
value uniform 0;
}
lowerWall
{
type fixedFluxPressure;
gradient uniform 0;
value uniform 0;
}
atmosphere
{
@ -48,29 +45,28 @@ boundaryField
p0 uniform 0;
value uniform 0;
}
defaultFaces
{
type empty;
}
porous_half0
{
type porousBafflePressure;
patchType cyclic;
jump uniform 0;
value uniform 0;
D 700;
I 500;
length 1.05;
value uniform 0;
}
porous_half1
{
type porousBafflePressure;
patchType cyclic;
jump uniform 0;
value uniform 0;
D 700;
I 500;
length 1.05;
value uniform 0;
}
defaultFaces
{
type empty;
}
}

View File

@ -0,0 +1,73 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
7
(
leftWall
{
type wall;
nFaces 50;
startFace 4419;
}
rightWall
{
type wall;
nFaces 50;
startFace 4469;
}
lowerWall
{
type wall;
nFaces 62;
startFace 4519;
}
atmosphere
{
type patch;
nFaces 46;
startFace 4581;
}
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 4536;
startFace 4627;
}
porous_half0
{
type cyclic;
inGroups 1(cyclic);
nFaces 13;
startFace 9163;
matchTolerance 0.0001;
transform unknown;
neighbourPatch porous_half1;
}
porous_half1
{
type cyclic;
inGroups 1(cyclic);
nFaces 13;
startFace 9176;
matchTolerance 0.0001;
transform unknown;
neighbourPatch porous_half0;
}
)
// ************************************************************************* //

View File

@ -65,7 +65,10 @@ baffles
type cyclic;
neighbourPatch porous_half0;
${..master.patchFields}
patchFields
{
${...master.patchFields}
}
}
}
}