zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2014-01-23 09:52:29 +00:00
parent 81670ff8e0 7e7e47942f
commit 8cb6853072
21 changed files with 137 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
View File

@ -1,6 +1,4 @@
{
rho = thermo.rho();
// Thermodynamic density needs to be updated by psi*d(p) after the
// pressure solution - done in 2 parts. Part 1:
thermo.rho() -= psi*p;
@ -54,6 +52,7 @@
rho = thermo.rho();
rho = max(rho, rhoMin);
rho = min(rho, rhoMax);
rho.relax();
Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl;
}

26
src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,9 +108,27 @@ Foam::scalar Foam::layerAdditionRemoval::readOldThickness
void Foam::layerAdditionRemoval::clearAddressing() const
{
// Layer removal data
deleteDemandDrivenData(pointsPairingPtr_);
deleteDemandDrivenData(facesPairingPtr_);
if (pointsPairingPtr_)
{
if (debug)
{
Pout<< "layerAdditionRemoval::clearAddressing()" << nl
<< " clearing pointsPairingPtr_" << endl;
}
deleteDemandDrivenData(pointsPairingPtr_);
}
if (facesPairingPtr_)
{
if (debug)
{
Pout<< "layerAdditionRemoval::clearAddressing()" << nl
<< " clearing facesPairingPtr_" << endl;
}
deleteDemandDrivenData(facesPairingPtr_);
}
}

8
tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
View File

@ -43,16 +43,16 @@ solvers
"(U.air|k|omega)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}
"(U.air|k|omega)Final"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}

4
tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
View File

@ -29,12 +29,12 @@ divSchemes
{
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phi,U) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}

18
tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
View File

@ -24,10 +24,16 @@ solvers
p
{
solver PCG;
preconditioner DIC;
tolerance 1e-6;
relTol 0.1;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
pFinal
@ -38,8 +44,8 @@ solvers
"(U|h|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-6;
relTol 0.1;
}

2
tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
View File

@ -23,7 +23,7 @@ startTime 0;
stopAt endTime;
endTime 10;
endTime 5;
deltaT 2e-4;

16
tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
View File

@ -43,26 +43,30 @@ solvers
"(U.air|k|omega)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}
"(U.air|k|omega)Final"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}
kinematicCloud:alpha
{
solver PCG; //PBiCG;
preconditioner DIC; //DILU;
solver GAMG;
tolerance 1e-06;
relTol 0;
smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
}

24
tutorials/lagrangian/MPPICFoam/column/system/fvSolution
View File

@ -19,10 +19,16 @@ solvers
{
p
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
solver GAMG;
tolerance 0;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
pFinal
@ -33,24 +39,24 @@ solvers
U.air
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}
U.airFinal
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0;
}
kinematicCloud:alpha
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
}

4
tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
View File

@ -43,8 +43,8 @@ solvers
"(U|k|omega).*"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

11
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
View File

@ -56,8 +56,8 @@ solvers
"(U|h|R|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}
@ -71,16 +71,12 @@ solvers
"(Yi|CO2|O2|N2|CH4|H2|H2O|CO)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-06;
relTol 0.1;
$h;
}
"(Yi|CO2|O2|N2|CH4|H2|H2O|CO)Final"
{
$Yi;
preconditioner DILU;
tolerance 1e-06;
relTol 0;
}
@ -107,4 +103,5 @@ relaxationFactors
}
}
// ************************************************************************* //

16
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
View File

@ -34,8 +34,8 @@ solvers
"(U|h)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
}
@ -54,10 +54,16 @@ solvers
p_rgh
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
p_rghFinal
@ -73,6 +79,7 @@ solvers
}
}
PIMPLE
{
nCorrectors 2;
@ -80,6 +87,7 @@ PIMPLE
momentumPredictor yes;
}
relaxationFactors
{
fields

8
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
View File

@ -19,15 +19,15 @@ solvers
{
"(Uf|hf|deltaf\*rhof)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-10;
relTol 0;
}
deltaf
{
solver PBiCG; // PCG;
preconditioner DILU; // DIC;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-10;
relTol 0;
}

6
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
View File

@ -34,8 +34,8 @@ solvers
"(U|h|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
}
@ -49,7 +49,7 @@ solvers
p_rgh
{
solver GAMG;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother DICGaussSeidel;

14
tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
View File

@ -34,8 +34,8 @@ solvers
"(U|h)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
}
@ -54,10 +54,16 @@ solvers
p_rgh
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
p_rghFinal

8
tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
View File

@ -19,15 +19,15 @@ solvers
{
"(Uf|hf|deltaf\*rhof)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-10;
relTol 0;
}
deltaf
{
solver PBiCG; // PCG;
preconditioner DILU; // DIC;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-10;
relTol 0;
}

14
tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
View File

@ -34,8 +34,8 @@ solvers
"(U|h)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 0;
relTol 0.1;
}
@ -54,10 +54,16 @@ solvers
p_rgh
{
solver PCG;
preconditioner DIC;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
p_rghFinal

8
tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
View File

@ -19,15 +19,15 @@ solvers
{
"(Uf|hf|deltaf\*rhof)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-10;
relTol 0;
}
deltaf
{
solver PBiCG; // PCG;
preconditioner DILU; // DIC;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-10;
relTol 0;
}

4
tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
View File

@ -34,8 +34,8 @@ solvers
"(U|h|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0.1;
}

4
tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
View File

@ -34,8 +34,8 @@ solvers
"(U|h|k|epsilon)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}

4
tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
View File

@ -34,8 +34,8 @@ solvers
"(U|h|k|omega)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0.1;
}

16
tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
View File

@ -34,18 +34,24 @@ solvers
"(U|h)"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-05;
relTol 0.1;
}
p
{
solver PCG;
preconditioner DIC;
tolerance 1e-06;
solver GAMG;
tolerance 0;
relTol 0.1;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
pFinal