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/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2013-05-03 17:58:04 +01:00
parent 92dcc69fa8 7310d0911d
commit 926357f55c
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
View File

@ -174,8 +174,10 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
( (
readScalar readScalar
( (
mixture.U().mesh().solutionDict().subDict("PIMPLE"). mixture.U().mesh().solverDict
lookup("cAlpha") (
mixture_.alpha1().name()
).lookup("cAlpha")
) )
), ),
sigma12_(mixture.lookup("sigma12")), sigma12_(mixture.lookup("sigma12")),

2
src/finiteVolume/cfdTools/general/include/alphaControls.H
View File

@ -1,7 +1,7 @@
const dictionary& alphaControls = mesh.solverDict(alpha1.name()); const dictionary& alphaControls = mesh.solverDict(alpha1.name());
label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr"))); label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles"))); label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
Switch MULESCorr(alphaControls.lookup("MULESCorr")); Switch MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1) if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1)
{ {

10
tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
View File

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

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

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

7
tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
View File

@ -19,6 +19,10 @@ solvers
{ {
"alpha." "alpha."
{ {
nAlphaCorr 1;
nAlphaSubCycles 2;
cAlpha 1;
solver smoothSolver; solver smoothSolver;
smoother GaussSeidel; smoother GaussSeidel;
tolerance 1e-06; tolerance 1e-06;
@ -64,9 +68,6 @@ PIMPLE
momentumPredictor no; momentumPredictor no;
nCorrectors 3; nCorrectors 3;
nNonOrthogonalCorrectors 0; nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 2;
cAlpha 1;
} }