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

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

Browse Source
This commit is contained in:
Henry
2013-06-20 16:32:39 +01:00
parent f867322323
commit 052d81785a
34 changed files with 220 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -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)

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -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")));

11
tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
View File

@ -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;

11
tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}

12
tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
View File

@ -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;
}

16
tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
View File

@ -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

9
tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
View File

@ -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;

10
tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
View File

@ -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

19
tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
View File

@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
pcorr
{
solver PCG;
@ -39,14 +46,6 @@ solvers
maxIter 100;
}
/* pcorr
{
solver PCG;
preconditioner DIC;
tolerance 1e-10;
relTol 0;
};
*/
p_rgh
{
$pcorr;
@ -79,10 +78,6 @@ PIMPLE
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
maxCo 0.5;
maxAlphaCo 0.2;
nAlphaSweepIter 1;

11
tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
View File

@ -17,6 +17,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
pcorr
{
solver PCG;
@ -68,10 +75,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
cAlpha 1;
}
relaxationFactors

10
tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
View File

@ -16,6 +16,13 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 2;
cAlpha 1;
}
pcorr
{
solver PCG;
@ -58,9 +65,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 2;
cAlpha 1;
}

6
tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 2;
}
p
{
solver GAMG;
@ -92,7 +97,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 2;
}
relaxationFactors

6
tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 3;
}
p
{
solver GAMG;
@ -83,7 +88,6 @@ PIMPLE
{
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 3;
}
relaxationFactors

6
tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 3;
}
p
{
solver GAMG;
@ -83,7 +88,6 @@ PIMPLE
{
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 3;
}
relaxationFactors

7
tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 2;
}
p
{
solver GAMG;
@ -84,7 +89,7 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 2;
pRefCell 0;
pRefValue 0;
}

8
tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
View File

@ -17,6 +17,12 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 4;
cAlpha 2;
}
pcorr
{
solver PCG;
@ -98,8 +104,6 @@ PIMPLE
{
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 4;
cAlpha 2;
}
relaxationFactors

8
tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
View File

@ -17,6 +17,12 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 4;
cAlpha 2;
}
pcorr
{
solver PCG;
@ -92,8 +98,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 4;
cAlpha 2;
}
relaxationFactors

6
tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
View File

@ -19,6 +19,9 @@ solvers
{
"alpha1.*"
{
nAlphaSubCycles 2;
nAlphaCorr 1;
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-9;
@ -66,8 +69,7 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 2;
nAlphaCorr 1;
pRefValue 0;
pRefPoint (0.1 0.1 1);
}

32
tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
View File

@ -17,6 +17,17 @@ FoamFile
solvers
{
"alpha1.*"
{
nAlphaCorr 1;
nAlphaSubCycles 3;
solver PCG;
preconditioner DIC;
tolerance 1e-10;
relTol 0.1;
}
p
{
solver GAMG;
@ -52,26 +63,6 @@ solvers
$k;
relTol 0;
}
alpha1
{
nAlphaCorr 2;
nAlphaSubCycles 3;
}
alpha
{
solver PCG;
preconditioner DIC;
tolerance 1e-10;
relTol 0.1;
}
alpha1Final
{
$alpha;
relTol 0;
}
}
PIMPLE
@ -79,6 +70,7 @@ PIMPLE
nCorrectors 2;
nNonOrthogonalCorrectors 0;
correctAlpha yes;
pRefCell 0;
pRefValue 0;
}

25
tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
View File

@ -17,6 +17,12 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
}
p
{
solver GAMG;
@ -54,31 +60,14 @@ solvers
tolerance 1e-05;
relTol 0;
}
alpha
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0.1;
}
alpha1Final
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
}
PIMPLE
{
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
correctAlpha yes;
pRefCell 0;
pRefValue 0;
}

25
tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
View File

@ -17,6 +17,12 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 2;
}
p
{
solver GAMG;
@ -54,31 +60,14 @@ solvers
tolerance 1e-05;
relTol 0;
}
alpha
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0.1;
}
alpha1Final
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
}
PIMPLE
{
nCorrectors 2;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 2;
correctAlpha yes;
pRefCell 0;
pRefValue 0;
}

17
tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
View File

@ -17,6 +17,12 @@ FoamFile
solvers
{
alpha1
{
nAlphaCorr 1;
nAlphaSubCycles 3;
}
p
{
solver GAMG;
@ -53,14 +59,6 @@ solvers
relTol 0;
}
"alpha.*"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-10;
relTol 0;
}
"(k|epsilon|Theta|T).*"
{
solver PBiCG;
@ -75,9 +73,8 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 3;
correctAlpha yes;
pRefCell 0;
pRefValue 0;
}