Skip to content
Snippets Groups Projects
Commit 5e3be3a4 authored by william's avatar william
Browse files

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

parents 55ac19dc cad94eb9
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 80 additions and 69 deletions
src/OpenFOAM/matrices/solution/solution.C
+ 12
− 5
View file @ 5e3be3a4
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -35,7 +35,7 @@ License
namespace Foam
{
defineDebugSwitchWithName(solution, "solution", 0);
defineDebugSwitchWithName(solution, "solution", 0);
}
// List of sub-dictionaries to rewrite
......@@ -60,10 +60,17 @@ void Foam::solution::read(const dictionary& dict)
if (dict.found("relaxationFactors"))
{
const dictionary& relaxDict(dict.subDict("relaxationFactors"));
if (relaxDict.found("fields"))
if (relaxDict.found("fields") || relaxDict.found("equations"))
{
fieldRelaxDict_ = relaxDict.subDict("fields");
eqnRelaxDict_ = relaxDict.subDict("equations");
if (relaxDict.found("fields"))
{
fieldRelaxDict_ = relaxDict.subDict("fields");
}
if (relaxDict.found("equations"))
{
eqnRelaxDict_ = relaxDict.subDict("equations");
}
}
else
{
......
tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
+ 2
− 2
View file @ 5e3be3a4
......@@ -47,8 +47,8 @@ runTimeModifiable yes;
adjustTimeStep on;
maxCo 0.2;
maxAlphaCo 0.2;
maxCo 1;
maxAlphaCo 1;
maxDeltaT 1;
......
tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
+ 2
− 5
View file @ 5e3be3a4
......@@ -27,14 +27,11 @@ gradSchemes
divSchemes
{
div(rhoPhi,U) Gauss linear;
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phi,nuTilda) Gauss upwind;
div((muEff*dev(T(grad(U))))) Gauss linear;
}
......@@ -58,7 +55,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
alpha;
alpha.water;
}
......
tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+ 29
− 21
View file @ 5e3be3a4
......@@ -17,18 +17,27 @@ FoamFile
solvers
{
alpha.water
"alpha.water.*"
{
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
nAlphaCorr 2;
nAlphaSubCycles 1;
alphaOuterCorrectors yes;
cAlpha 1;
MULESCorr yes;
nLimiterIter 3;
solver PBiCG;
preconditioner DILU;
tolerance 1e-8;
relTol 0;
}
pcorr
{
solver PCG;
preconditioner DIC;
tolerance 1e-10;
tolerance 1e-5;
relTol 0;
}
......@@ -42,35 +51,34 @@ solvers
p_rghFinal
{
solver PCG;
preconditioner DIC;
tolerance 1e-07;
$p_rgh;
relTol 0;
}
"(U|k|epsilon)"
"(U|k|epsilon).*"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
}
"(U|k|epsilon)Final"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-08;
relTol 0;
minIter 1;
}
}
PIMPLE
{
momentumPredictor no;
nCorrectors 3;
momentumPredictor no;
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
}
relaxationFactors
{
equations
{
".*" 1;
}
}
// ************************************************************************* //
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+ 4
− 4
View file @ 5e3be3a4
......@@ -58,18 +58,18 @@ boundaryField
patchType cyclic;
jump uniform 0;
value uniform 0;
D 700;
D 1000;
I 500;
length 1.05;
length 0.15;
}
porous_half1
{
type porousBafflePressure;
patchType cyclic;
value uniform 0;
D 700;
D 1000;
I 500;
length 1.05;
length 0.15;
}
}
......
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
+ 1
− 1
View file @ 5e3be3a4
......@@ -29,7 +29,7 @@ deltaT 0.001;
writeControl adjustableRunTime;
writeInterval 0.1;
writeInterval 0.05;
purgeWrite 0;
......
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
+ 2
− 2
View file @ 5e3be3a4
......@@ -49,9 +49,9 @@ baffles
{
type porousBafflePressure;
patchType cyclic;
D 700;
D 1000;
I 500;
length 1.05;
length 0.15;
jump uniform 0;
value uniform 0;
}
......
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
+ 2
− 5
View file @ 5e3be3a4
......@@ -27,14 +27,11 @@ gradSchemes
divSchemes
{
div(rhoPhi,U) Gauss linear;
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss linear;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phi,nuTilda) Gauss upwind;
div((muEff*dev(T(grad(U))))) Gauss linear;
}
......@@ -58,7 +55,7 @@ fluxRequired
default no;
p_rgh;
pcorr;
alpha;
alpha.water;
}
......
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
+ 26
− 24
View file @ 5e3be3a4
......@@ -17,18 +17,27 @@ FoamFile
solvers
{
alpha.water
"alpha.water.*"
{
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
nAlphaCorr 2;
nAlphaSubCycles 1;
alphaOuterCorrectors yes;
cAlpha 1;
MULESCorr yes;
nLimiterIter 3;
solver PBiCG;
preconditioner DILU;
tolerance 1e-8;
relTol 0;
}
pcorr
{
solver PCG;
preconditioner DIC;
tolerance 1e-10;
tolerance 1e-5;
relTol 0;
}
......@@ -42,41 +51,34 @@ solvers
p_rghFinal
{
solver PCG;
preconditioner DIC;
tolerance 1e-08;
$p_rgh;
relTol 0;
}
"(U|k|epsilon)"
"(U|k|epsilon).*"
{
solver PBiCG;
preconditioner DILU;
solver smoothSolver;
smoother symGaussSeidel;
tolerance 1e-06;
relTol 0;
}
"(U|k|epsilon)Final"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-07;
relTol 0;
minIter 1;
}
}
PIMPLE
{
momentumPredictor yes;
nCorrectors 3;
momentumPredictor no;
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
}
relaxationFactors
{
"U.*" 1;
"k.*" 1;
"epsilon.*" 1;
equations
{
".*" 1;
}
}
// ************************************************************************* //
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment