Merge remote branch 'OpenCFD/master' into olesenm

This commit is contained in:
Mark Olesen
2010-03-17 08:52:10 +01:00
44 changed files with 1906 additions and 158 deletions

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -37,7 +37,8 @@ boundaryField
centreOfMass (0.5 0.5 0.5);
momentOfInertia (0.08622222 0.08622222 0.144);
mass 9.6;
rhoInf 1; // for forces calculation
rhoInf 1;
report on;
value uniform (0 0 0);
}
}

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6.x |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -17,7 +17,7 @@ FoamFile
application interDyMFoam;
startFrom startTime;
startFrom latestTime;
startTime 0;
@ -29,7 +29,7 @@ deltaT 0.01;
writeControl adjustableRunTime;
writeInterval 0.025;
writeInterval 0.1;
purgeWrite 0;
@ -47,9 +47,9 @@ runTimeModifiable yes;
adjustTimeStep yes;
maxCo 0.2;
maxCo 0.5;
maxDeltaT 0.025;
maxDeltaT 0.01;
libs
(

View File

@ -20,7 +20,7 @@ solvers
cellDisplacement
{
solver GAMG;
tolerance 1e-08;
tolerance 1e-5;
relTol 0;
smoother GaussSeidel;
cacheAgglomeration true;
@ -35,7 +35,7 @@ solvers
preconditioner
{
preconditioner GAMG;
tolerance 1e-05;
tolerance 1e-5;
relTol 0;
smoother DICGaussSeidel;
nPreSweeps 0;
@ -55,7 +55,7 @@ solvers
p
{
solver GAMG;
tolerance 1e-08;
tolerance 1e-8;
relTol 0.01;
smoother DIC;
nPreSweeps 0;
@ -73,7 +73,7 @@ solvers
preconditioner
{
preconditioner GAMG;
tolerance 2e-09;
tolerance 1e-8;
relTol 0;
nVcycles 2;
smoother DICGaussSeidel;
@ -86,7 +86,7 @@ solvers
mergeLevels 1;
}
tolerance 2e-09;
tolerance 1e-8;
relTol 0;
maxIter 20;
}
@ -95,18 +95,18 @@ solvers
{
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-06;
tolerance 1e-6;
relTol 0;
nSweeps 1;
}
"(k|epsilon|R|nuTilda)"
"(k|epsilon|omega|R|nuTilda)"
{
$U;
tolerance 1e-08;
solver PBiCG;
preconditioner DILU;
tolerance 1e-8;
relTol 0;
}
}
PISO
@ -115,14 +115,14 @@ PISO
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cAlpha 1.5;
nAlphaSubCycles 3;
cAlpha 1;
correctPhi yes;
}
relaxationFactors
{
U 1;
"(U|k|epsilon|omega|R|nuTilda)" 1;
}