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

This commit is contained in:
andy
2012-08-10 18:19:33 +01:00
42 changed files with 815 additions and 680 deletions

View File

@ -22,6 +22,7 @@ active true;
infinitelyFastChemistryCoeffs
{
C 10;
semiImplicit false;
}
// ************************************************************************* //

View File

@ -31,9 +31,9 @@ FoamFile
radFluxName Qr;
minimumDelta 1e-8;
minimumDelta 1e-12;
reactionDeltaMin 1e-8;
reactionDeltaMin 1e-12;
moveMesh false;
}

View File

@ -33,7 +33,7 @@ fvDOMCoeffs
nPhi 3; // azimuthal angles in PI/2 on X-Y.(from Y to X)
nTheta 6; // polar angles in PI (from Z to X-Y plane)
convergence 1e-4; // convergence criteria for radiation iteration
maxIter 4; // maximum number of iterations
maxIter 2; // maximum number of iterations
}
// Number of flow iterations per radiation iteration

View File

@ -16,25 +16,25 @@ FoamFile
application fireFoam;
startFrom startTime;
startFrom latestTime;
startTime 0;
stopAt endTime;
endTime 15.0;
endTime 15;
deltaT 0.03;
writeControl adjustableRunTime;
writeInterval 0.5;
writeInterval 1
purgeWrite 0;
writeFormat ascii;
writePrecision 6;
writePrecision 12;
writeCompression off;

View File

@ -70,6 +70,7 @@ fluxRequired
{
default no;
p_rgh;
phiMesh;
}

View File

@ -32,7 +32,7 @@ solvers
relTol 0;
}
rhoThermo
rho
{
solver PCG;
preconditioner DIC;

View File

@ -30,7 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss linear;
div(phi,K) Gauss linear;
div(phi,k) Gauss limitedLinear 0.1;
div(phi,k) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss multivariateSelection
{
O2 limitedLinear01 1;

View File

@ -29,7 +29,7 @@ solvers
{
solver GAMG;
tolerance 1e-7;
relTol 0.01;
relTol 0.1;
smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
@ -88,7 +88,7 @@ PIMPLE
{
momentumPredictor yes;
nOuterCorrectors 1;
nCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
@ -100,7 +100,7 @@ relaxationFactors
equations
{
"(U|k).*" 1;
"(CH4|O2|H2O|CO2|h).*" 0.9;
"(CH4|O2|H2O|CO2|h).*" 1;
}
}

View File

@ -1,264 +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 volScalarField;
object Ma;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 3;
boundaryField
{
inlet
{
type calculated;
value uniform 3;
}
outlet
{
type calculated;
value uniform 3;
}
bottom
{
type symmetryPlane;
}
top
{
type symmetryPlane;
}
obstacle
{
type calculated;
value nonuniform List<scalar>
208
(
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
)
;
}
defaultFaces
{
type empty;
}
}
// ************************************************************************* //

View File

@ -27,7 +27,7 @@ disk1
actuationDiskSourceCoeffs
{
fieldNames (U);
diskDir (-1 0 0); // orientation of the disk
diskDir (1 0 0); // orientation of the disk
Cp 0.386; // Cp
Ct 0.58; // Ct
diskArea 40; // disk area
@ -47,7 +47,7 @@ disk2
actuationDiskSourceCoeffs
{
fieldNames (U);
diskDir (-1 0 0);
diskDir (1 0 0);
Cp 0.53;
Ct 0.58;
diskArea 40;

View File

@ -64,9 +64,9 @@ SIMPLE
residualControl
{
p 1e-2;
U 1e-3;
"(k|epsilon)" 1e-3;
p 1e-3;
U 1e-4;
"(k|epsilon)" 1e-4;
}
}