Commit 052d8178 authored by Henry's avatar Henry
Browse files

multiphase: move alpha solution controls into the appropriate sub-dictionary of fvSolution:solvers

parent f8673223
......@@ -812,7 +812,7 @@ void Foam::multiphaseSystem::solve()
const Time& runTime = mesh_.time();
const dictionary& alphaControls = mesh_.solverDict(phases_.first().name());
const dictionary& alphaControls = mesh_.solverDict("alpha");
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
if (nAlphaSubCycles > 1)
......
......@@ -246,7 +246,7 @@ void Foam::multiphaseMixture::solve()
volScalarField& alpha = phases_.first();
const dictionary& alphaControls = mesh_.solverDict(alpha.name());
const dictionary& alphaControls = mesh_.solverDict("alpha");
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
scalar cAlpha(readScalar(alphaControls.lookup("cAlpha")));
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 1;
cAlpha 1;
}
pcorr
{
solver PCG;
......@@ -79,10 +86,6 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cAlpha 1;
maxCo 0.9;
maxAlphaCo 0.2;
nAlphaSweepIter 1;
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 2;
cAlpha 1;
}
pcorr
{
solver PCG;
......@@ -55,9 +62,7 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 2;
cAlpha 1;
pRefCell 0;
pRefValue 0;
}
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha
{
nAlphaCorr 4;
nAlphaSubCycles 4;
cAlpha 2;
}
pcorr
{
solver PCG;
......@@ -55,10 +62,7 @@ PIMPLE
momentumPredictor no;
nCorrectors 4;
nNonOrthogonalCorrectors 0;
nAlphaCorr 4;
nAlphaSubCycles 4;
cycleAlpha yes;
cAlpha 2;
pRefCell 0;
pRefValue 0;
}
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alphawater
{
nAlphaCorr 1;
nAlphaSubCycles 1;
cAlpha 1;
}
pcorr
{
solver PCG;
......@@ -107,9 +114,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cAlpha 1;
}
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alphawater
{
nAlphaCorr 1;
nAlphaSubCycles 1;
cAlpha 1;
}
pcorr
{
solver PCG;
......@@ -107,9 +114,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cAlpha 1;
}
......
......@@ -17,6 +17,12 @@ FoamFile
solvers
{
alphaair
{
nAlphaCorr 1;
nAlphaSubCycles 2;
}
p
{
solver GAMG;
......@@ -55,14 +61,6 @@ solvers
relTol 0;
}
"alpha.*"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
"(k|epsilon|Theta).*"
{
solver PBiCG;
......@@ -77,8 +75,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 2;
}
relaxationFactors
......
......@@ -17,6 +17,12 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 2;
}
p
{
solver GAMG;
......@@ -67,8 +73,7 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 2;
pRefCell 0;
pRefValue 0;
}
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
pcorr
{
solver PCG;
......@@ -102,9 +109,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
pRefPoint (0.51 0.51 0.51);
pRefValue 0;
......
......@@ -29,6 +29,13 @@ solvers
mergeLevels 1;
}
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
pcorr
{
solver PCG;
......@@ -115,9 +122,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
correctPhi yes;
}
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
}
pcorr
{
solver PCG;
......@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
}
pcorr
{
solver PCG;
......@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
}
pcorr
{
solver PCG;
......@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
}
pcorr
{
solver PCG;
......@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
}
pcorr
{
solver PCG;
......@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
}
pcorr
{
solver PCG;
......@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1.5;
correctPhi no;
pRefPoint (0.0013 0.0017 0.0017);
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
}
pcorr
{
solver PCG;
......@@ -100,9 +107,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 1;
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
}
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
}
pcorr
{
solver PCG;
......@@ -63,9 +70,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
}
......
......@@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
}
pcorr
{
solver PCG;
......@@ -63,9 +70,6 @@ PIMPLE
momentumPredictor yes;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 4;
cAlpha 2;
}
relaxationFactors
......
Markdown is supported
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