Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
8d21b380
Commit
8d21b380
authored
Sep 11, 2015
by
Henry Weller
Browse files
Renamed phiAlpha -P alphaPhi for consistency with Euler-Euler solvers
parent
85b27f67
Changes
11
Hide whitespace changes
Inline
Side-by-side
applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
View file @
8d21b380
...
...
@@ -45,7 +45,7 @@
}
surfaceScalarField
phiA
lpha1
surfaceScalarField
a
lpha
Phi
1
(
fvc
::
flux
(
...
...
@@ -66,7 +66,7 @@
geometricOneField
(),
alpha1
,
phi
,
phiA
lpha1
,
a
lpha
Phi
1
,
Sp
,
Su
,
1
,
...
...
@@ -75,7 +75,7 @@
surfaceScalarField
rho1f
(
fvc
::
interpolate
(
rho1
));
surfaceScalarField
rho2f
(
fvc
::
interpolate
(
rho2
));
rhoPhi
=
phiA
lpha1
*
(
rho1f
-
rho2f
)
+
phi
*
rho2f
;
rhoPhi
=
a
lpha
Phi
1
*
(
rho1f
-
rho2f
)
+
phi
*
rho2f
;
alpha2
=
scalar
(
1
)
-
alpha1
;
}
...
...
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
View file @
8d21b380
...
...
@@ -942,14 +942,14 @@ void Foam::multiphaseMixtureThermo::solveAlphas
surfaceScalarField
phic
(
mag
(
phi_
/
mesh_
.
magSf
()));
phic
=
min
(
cAlpha
*
phic
,
max
(
phic
));
PtrList
<
surfaceScalarField
>
phiA
lphaCorrs
(
phases_
.
size
());
PtrList
<
surfaceScalarField
>
a
lpha
Phi
Corrs
(
phases_
.
size
());
int
phasei
=
0
;
forAllIter
(
PtrDictionary
<
phaseModel
>
,
phases_
,
phase
)
{
phaseModel
&
alpha
=
phase
();
phiA
lphaCorrs
.
set
a
lpha
Phi
Corrs
.
set
(
phasei
,
new
surfaceScalarField
...
...
@@ -964,7 +964,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
)
);
surfaceScalarField
&
phiA
lphaCorr
=
phiA
lphaCorrs
[
phasei
];
surfaceScalarField
&
a
lpha
Phi
Corr
=
a
lpha
Phi
Corrs
[
phasei
];
forAllIter
(
PtrDictionary
<
phaseModel
>
,
phases_
,
phase2
)
{
...
...
@@ -974,7 +974,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
surfaceScalarField
phir
(
phic
*
nHatf
(
alpha
,
alpha2
));
phiA
lphaCorr
+=
fvc
::
flux
a
lpha
Phi
Corr
+=
fvc
::
flux
(
-
fvc
::
flux
(
-
phir
,
alpha2
,
alpharScheme
),
alpha
,
...
...
@@ -988,7 +988,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
geometricOneField
(),
alpha
,
phi_
,
phiA
lphaCorr
,
a
lpha
Phi
Corr
,
zeroField
(),
zeroField
(),
1
,
...
...
@@ -999,7 +999,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
phasei
++
;
}
MULES
::
limitSum
(
phiA
lphaCorrs
);
MULES
::
limitSum
(
a
lpha
Phi
Corrs
);
rhoPhi_
=
dimensionedScalar
(
"0"
,
dimensionSet
(
1
,
0
,
-
1
,
0
,
0
),
0
);
...
...
@@ -1025,8 +1025,8 @@ void Foam::multiphaseMixtureThermo::solveAlphas
{
phaseModel
&
alpha
=
phase
();
surfaceScalarField
&
phiAlpha
=
phiA
lphaCorrs
[
phasei
];
phiA
lpha
+=
upwind
<
scalar
>
(
mesh_
,
phi_
).
flux
(
alpha
);
surfaceScalarField
&
alphaPhi
=
a
lpha
Phi
Corrs
[
phasei
];
a
lpha
Phi
+=
upwind
<
scalar
>
(
mesh_
,
phi_
).
flux
(
alpha
);
volScalarField
::
DimensionedInternalField
Sp
(
...
...
@@ -1096,12 +1096,12 @@ void Foam::multiphaseMixtureThermo::solveAlphas
(
geometricOneField
(),
alpha
,
phiA
lpha
,
a
lpha
Phi
,
Sp
,
Su
);
rhoPhi_
+=
fvc
::
interpolate
(
alpha
.
thermo
().
rho
())
*
phiA
lpha
;
rhoPhi_
+=
fvc
::
interpolate
(
alpha
.
thermo
().
rho
())
*
a
lpha
Phi
;
Info
<<
alpha
.
name
()
<<
" volume fraction, min, max = "
<<
alpha
.
weightedAverage
(
mesh_
.
V
()).
value
()
...
...
applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
View file @
8d21b380
...
...
@@ -23,32 +23,32 @@
<<
" Max("
<<
alpha1
.
name
()
<<
") = "
<<
max
(
alpha1
).
value
()
<<
endl
;
tmp
<
surfaceScalarField
>
t
phiA
lphaUD
(
alpha1Eqn
.
flux
());
phiA
lpha
=
t
phiA
lphaUD
();
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
UD
(
alpha1Eqn
.
flux
());
a
lpha
Phi
=
t
a
lpha
Phi
UD
();
if
(
alphaApplyPrevCorr
&&
t
phiA
lphaCorr0
.
valid
())
if
(
alphaApplyPrevCorr
&&
t
a
lpha
Phi
Corr0
.
valid
())
{
Info
<<
"Applying the previous iteration correction flux"
<<
endl
;
MULES
::
correct
(
alpha1
,
phiA
lpha
,
t
phiA
lphaCorr0
(),
a
lpha
Phi
,
t
a
lpha
Phi
Corr0
(),
mixture
.
alphaMax
(),
0
);
phiA
lpha
+=
t
phiA
lphaCorr0
();
a
lpha
Phi
+=
t
a
lpha
Phi
Corr0
();
}
// Cache the upwind-flux
t
phiA
lphaCorr0
=
t
phiA
lphaUD
;
t
a
lpha
Phi
Corr0
=
t
a
lpha
Phi
UD
;
}
for
(
int
aCorr
=
0
;
aCorr
<
nAlphaCorr
;
aCorr
++
)
{
tmp
<
surfaceScalarField
>
t
phiA
lphaUn
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
Un
(
fvc
::
flux
(
...
...
@@ -66,14 +66,14 @@
if
(
MULESCorr
)
{
tmp
<
surfaceScalarField
>
t
phiA
lphaCorr
(
t
phiA
lphaUn
()
-
phiA
lpha
);
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
Corr
(
t
a
lpha
Phi
Un
()
-
a
lpha
Phi
);
volScalarField
alpha10
(
"alpha10"
,
alpha1
);
MULES
::
correct
(
alpha1
,
t
phiA
lphaUn
(),
t
phiA
lphaCorr
(),
t
a
lpha
Phi
Un
(),
t
a
lpha
Phi
Corr
(),
mixture
.
alphaMax
(),
0
);
...
...
@@ -81,23 +81,23 @@
// Under-relax the correction for all but the 1st corrector
if
(
aCorr
==
0
)
{
phiA
lpha
+=
t
phiA
lphaCorr
();
a
lpha
Phi
+=
t
a
lpha
Phi
Corr
();
}
else
{
alpha1
=
0
.
5
*
alpha1
+
0
.
5
*
alpha10
;
phiA
lpha
+=
0
.
5
*
t
phiA
lphaCorr
();
a
lpha
Phi
+=
0
.
5
*
t
a
lpha
Phi
Corr
();
}
}
else
{
phiA
lpha
=
t
phiA
lphaUn
;
a
lpha
Phi
=
t
a
lpha
Phi
Un
;
MULES
::
explicitSolve
(
alpha1
,
phi
,
phiA
lpha
,
a
lpha
Phi
,
mixture
.
alphaMax
(),
0
);
...
...
@@ -106,7 +106,7 @@
if
(
alphaApplyPrevCorr
&&
MULESCorr
)
{
t
phiA
lphaCorr0
=
phiA
lpha
-
t
phiA
lphaCorr0
;
t
a
lpha
Phi
Corr0
=
a
lpha
Phi
-
t
a
lpha
Phi
Corr0
;
}
alpha2
=
1
.
0
-
alpha1
;
...
...
applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
View file @
8d21b380
{
surfaceScalarField
phiA
lpha
surfaceScalarField
a
lpha
Phi
(
IOobject
(
"
phiA
lpha"
,
"
a
lpha
Phi
"
,
runTime
.
timeName
(),
mesh
),
...
...
@@ -19,11 +19,11 @@
if
(
nAlphaSubCycles
>
1
)
{
dimensionedScalar
totalDeltaT
=
runTime
.
deltaT
();
surfaceScalarField
phiA
lphaSum
surfaceScalarField
a
lpha
Phi
Sum
(
IOobject
(
"
phiA
lphaSum"
,
"
a
lpha
Phi
Sum"
,
runTime
.
timeName
(),
mesh
),
...
...
@@ -38,10 +38,10 @@
)
{
#include
"alphaEqn.H"
phiA
lphaSum
+=
(
runTime
.
deltaT
()
/
totalDeltaT
)
*
phiA
lpha
;
a
lpha
Phi
Sum
+=
(
runTime
.
deltaT
()
/
totalDeltaT
)
*
a
lpha
Phi
;
}
phiAlpha
=
phiA
lphaSum
;
alphaPhi
=
a
lpha
Phi
Sum
;
}
else
{
...
...
@@ -59,7 +59,7 @@
alpha1Eqn
.
solve
(
mesh
.
solver
(
"alpha1Diffusion"
));
phiA
lpha
+=
alpha1Eqn
.
flux
();
a
lpha
Phi
+=
alpha1Eqn
.
flux
();
alpha2
=
1
.
0
-
alpha1
;
Info
<<
"Phase-1 volume fraction = "
...
...
@@ -69,6 +69,6 @@
<<
endl
;
}
rhoPhi
=
phiA
lpha
*
(
rho1
-
rho2
)
+
phi
*
rho2
;
rhoPhi
=
a
lpha
Phi
*
(
rho1
-
rho2
)
+
phi
*
rho2
;
rho
=
mixture
.
rho
();
}
applications/solvers/multiphase/driftFluxFoam/createFields.H
View file @
8d21b380
...
...
@@ -135,4 +135,4 @@ mesh.setFluxRequired(p_rgh.name());
mesh
.
setFluxRequired
(
alpha1
.
name
());
// MULES Correction
tmp
<
surfaceScalarField
>
t
phiA
lphaCorr0
;
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
Corr0
;
applications/solvers/multiphase/interFoam/alphaEqn.H
View file @
8d21b380
...
...
@@ -98,19 +98,19 @@
<<
" Max("
<<
alpha1
.
name
()
<<
") = "
<<
max
(
alpha1
).
value
()
<<
endl
;
tmp
<
surfaceScalarField
>
t
phiA
lphaUD
(
alpha1Eqn
.
flux
());
phiA
lpha
=
t
phiA
lphaUD
();
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
UD
(
alpha1Eqn
.
flux
());
a
lpha
Phi
=
t
a
lpha
Phi
UD
();
if
(
alphaApplyPrevCorr
&&
t
phiA
lphaCorr0
.
valid
())
if
(
alphaApplyPrevCorr
&&
t
a
lpha
Phi
Corr0
.
valid
())
{
Info
<<
"Applying the previous iteration compression flux"
<<
endl
;
MULES
::
correct
(
alpha1
,
phiAlpha
,
tphiA
lphaCorr0
(),
1
,
0
);
MULES
::
correct
(
alpha1
,
alphaPhi
,
ta
lpha
Phi
Corr0
(),
1
,
0
);
phiA
lpha
+=
t
phiA
lphaCorr0
();
a
lpha
Phi
+=
t
a
lpha
Phi
Corr0
();
}
// Cache the upwind-flux
t
phiA
lphaCorr0
=
t
phiA
lphaUD
;
t
a
lpha
Phi
Corr0
=
t
a
lpha
Phi
UD
;
alpha2
=
1
.
0
-
alpha1
;
...
...
@@ -122,7 +122,7 @@
{
surfaceScalarField
phir
(
phic
*
mixture
.
nHatf
());
tmp
<
surfaceScalarField
>
t
phiA
lphaUn
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
Un
(
fvc
::
flux
(
...
...
@@ -141,33 +141,33 @@
// Calculate the Crank-Nicolson off-centred alpha flux
if
(
ocCoeff
>
0
)
{
t
phiA
lphaUn
=
cnCoeff
*
t
phiA
lphaUn
+
(
1
.
0
-
cnCoeff
)
*
phiA
lpha
.
oldTime
();
t
a
lpha
Phi
Un
=
cnCoeff
*
t
a
lpha
Phi
Un
+
(
1
.
0
-
cnCoeff
)
*
a
lpha
Phi
.
oldTime
();
}
if
(
MULESCorr
)
{
tmp
<
surfaceScalarField
>
t
phiA
lphaCorr
(
t
phiA
lphaUn
()
-
phiA
lpha
);
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
Corr
(
t
a
lpha
Phi
Un
()
-
a
lpha
Phi
);
volScalarField
alpha10
(
"alpha10"
,
alpha1
);
MULES
::
correct
(
alpha1
,
t
phiA
lphaUn
(),
t
phiA
lphaCorr
(),
1
,
0
);
MULES
::
correct
(
alpha1
,
t
a
lpha
Phi
Un
(),
t
a
lpha
Phi
Corr
(),
1
,
0
);
// Under-relax the correction for all but the 1st corrector
if
(
aCorr
==
0
)
{
phiA
lpha
+=
t
phiA
lphaCorr
();
a
lpha
Phi
+=
t
a
lpha
Phi
Corr
();
}
else
{
alpha1
=
0
.
5
*
alpha1
+
0
.
5
*
alpha10
;
phiA
lpha
+=
0
.
5
*
t
phiA
lphaCorr
();
a
lpha
Phi
+=
0
.
5
*
t
a
lpha
Phi
Corr
();
}
}
else
{
phiA
lpha
=
t
phiA
lphaUn
;
a
lpha
Phi
=
t
a
lpha
Phi
Un
;
MULES
::
explicitSolve
(
alpha1
,
phiCN
,
phiA
lpha
,
1
,
0
);
MULES
::
explicitSolve
(
alpha1
,
phiCN
,
a
lpha
Phi
,
1
,
0
);
}
alpha2
=
1
.
0
-
alpha1
;
...
...
@@ -177,7 +177,7 @@
if
(
alphaApplyPrevCorr
&&
MULESCorr
)
{
t
phiA
lphaCorr0
=
phiA
lpha
-
t
phiA
lphaCorr0
;
t
a
lpha
Phi
Corr0
=
a
lpha
Phi
-
t
a
lpha
Phi
Corr0
;
}
if
...
...
@@ -186,18 +186,18 @@
==
fv
::
EulerDdtScheme
<
vector
>::
typeName
)
{
rhoPhi
=
phiA
lpha
*
(
rho1
-
rho2
)
+
phiCN
*
rho2
;
rhoPhi
=
a
lpha
Phi
*
(
rho1
-
rho2
)
+
phiCN
*
rho2
;
}
else
{
if
(
ocCoeff
>
0
)
{
// Calculate the end-of-time-step alpha flux
phiA
lpha
=
(
phiA
lpha
-
(
1
.
0
-
cnCoeff
)
*
phiA
lpha
.
oldTime
())
/
cnCoeff
;
a
lpha
Phi
=
(
a
lpha
Phi
-
(
1
.
0
-
cnCoeff
)
*
a
lpha
Phi
.
oldTime
())
/
cnCoeff
;
}
// Calculate the end-of-time-step mass flux
rhoPhi
=
phiA
lpha
*
(
rho1
-
rho2
)
+
phi
*
rho2
;
rhoPhi
=
a
lpha
Phi
*
(
rho1
-
rho2
)
+
phi
*
rho2
;
}
Info
<<
"Phase-1 volume fraction = "
...
...
applications/solvers/multiphase/interFoam/createFields.H
View file @
8d21b380
...
...
@@ -121,11 +121,11 @@ mesh.setFluxRequired(p_rgh.name());
mesh
.
setFluxRequired
(
alpha1
.
name
());
// MULES flux from previous time-step
surfaceScalarField
phiA
lpha
surfaceScalarField
a
lpha
Phi
(
IOobject
(
"
phiA
lpha"
,
"
a
lpha
Phi
"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
READ_IF_PRESENT
,
...
...
@@ -135,4 +135,4 @@ surfaceScalarField phiAlpha
);
// MULES Correction
tmp
<
surfaceScalarField
>
t
phiA
lphaCorr0
;
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
Corr0
;
applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
View file @
8d21b380
...
...
@@ -40,7 +40,7 @@
// Create the complete convection flux for alpha1
surfaceScalarField
phiA
lpha1
surfaceScalarField
a
lpha
Phi
1
(
fvc
::
flux
(
...
...
@@ -63,13 +63,13 @@
);
// Create the bounded (upwind) flux for alpha1
surfaceScalarField
phiA
lpha1BD
surfaceScalarField
a
lpha
Phi
1BD
(
upwind
<
scalar
>
(
mesh
,
phi
).
flux
(
alpha1
)
);
// Calculate the flux correction for alpha1
phiA
lpha1
-=
phiA
lpha1BD
;
a
lpha
Phi
1
-=
a
lpha
Phi
1BD
;
// Calculate the limiter for alpha1
if
(
LTS
)
...
...
@@ -83,8 +83,8 @@
rDeltaT
,
geometricOneField
(),
alpha1
,
phiA
lpha1BD
,
phiA
lpha1
,
a
lpha
Phi
1BD
,
a
lpha
Phi
1
,
zeroField
(),
zeroField
(),
1
,
...
...
@@ -99,8 +99,8 @@
1
.
0
/
runTime
.
deltaT
().
value
(),
geometricOneField
(),
alpha1
,
phiA
lpha1BD
,
phiA
lpha1
,
a
lpha
Phi
1BD
,
a
lpha
Phi
1
,
zeroField
(),
zeroField
(),
1
,
...
...
@@ -109,7 +109,7 @@
}
// Create the complete flux for alpha2
surfaceScalarField
phiA
lpha2
surfaceScalarField
a
lpha
Phi
2
(
fvc
::
flux
(
...
...
@@ -126,13 +126,13 @@
);
// Create the bounded (upwind) flux for alpha2
surfaceScalarField
phiA
lpha2BD
surfaceScalarField
a
lpha
Phi
2BD
(
upwind
<
scalar
>
(
mesh
,
phi
).
flux
(
alpha2
)
);
// Calculate the flux correction for alpha2
phiA
lpha2
-=
phiA
lpha2BD
;
a
lpha
Phi
2
-=
a
lpha
Phi
2BD
;
// Further limit the limiter for alpha2
if
(
LTS
)
...
...
@@ -146,8 +146,8 @@
rDeltaT
,
geometricOneField
(),
alpha2
,
phiA
lpha2BD
,
phiA
lpha2
,
a
lpha
Phi
2BD
,
a
lpha
Phi
2
,
zeroField
(),
zeroField
(),
1
,
...
...
@@ -162,8 +162,8 @@
1
.
0
/
runTime
.
deltaT
().
value
(),
geometricOneField
(),
alpha2
,
phiA
lpha2BD
,
phiA
lpha2
,
a
lpha
Phi
2BD
,
a
lpha
Phi
2
,
zeroField
(),
zeroField
(),
1
,
...
...
@@ -172,32 +172,32 @@
}
// Construct the limited fluxes
phiA
lpha1
=
phiA
lpha1BD
+
lambda
*
phiA
lpha1
;
phiA
lpha2
=
phiA
lpha2BD
+
lambda
*
phiA
lpha2
;
a
lpha
Phi
1
=
a
lpha
Phi
1BD
+
lambda
*
a
lpha
Phi
1
;
a
lpha
Phi
2
=
a
lpha
Phi
2BD
+
lambda
*
a
lpha
Phi
2
;
// Solve for alpha1
solve
(
fvm
::
ddt
(
alpha1
)
+
fvc
::
div
(
phiA
lpha1
));
solve
(
fvm
::
ddt
(
alpha1
)
+
fvc
::
div
(
a
lpha
Phi
1
));
// Create the diffusion coefficients for alpha2<->alpha3
volScalarField
Dc23
(
D23
*
max
(
alpha3
,
scalar
(
0
))
*
pos
(
alpha2
));
volScalarField
Dc32
(
D23
*
max
(
alpha2
,
scalar
(
0
))
*
pos
(
alpha3
));
// Add the diffusive flux for alpha3->alpha2
phiA
lpha2
-=
fvc
::
interpolate
(
Dc32
)
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
alpha1
);
a
lpha
Phi
2
-=
fvc
::
interpolate
(
Dc32
)
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
alpha1
);
// Solve for alpha2
fvScalarMatrix
alpha2Eqn
(
fvm
::
ddt
(
alpha2
)
+
fvc
::
div
(
phiA
lpha2
)
+
fvc
::
div
(
a
lpha
Phi
2
)
-
fvm
::
laplacian
(
Dc23
+
Dc32
,
alpha2
)
);
alpha2Eqn
.
solve
();
// Construct the complete mass flux
rhoPhi
=
phiA
lpha1
*
(
rho1
-
rho3
)
+
(
phiA
lpha2
+
alpha2Eqn
.
flux
())
*
(
rho2
-
rho3
)
a
lpha
Phi
1
*
(
rho1
-
rho3
)
+
(
a
lpha
Phi
2
+
alpha2Eqn
.
flux
())
*
(
rho2
-
rho3
)
+
phi
*
rho3
;
alpha3
=
1
.
0
-
alpha1
-
alpha2
;
...
...
applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
View file @
8d21b380
...
...
@@ -10,7 +10,7 @@
const
volScalarField
&
vDotvAlphal
=
vDotAlphal
[
1
]();
const
volScalarField
vDotvmcAlphal
(
vDotvAlphal
-
vDotcAlphal
);
tmp
<
surfaceScalarField
>
t
phiA
lpha
;
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
;
if
(
MULESCorr
)
{
...
...
@@ -37,14 +37,14 @@
<<
" Max("
<<
alpha1
.
name
()
<<
") = "
<<
max
(
alpha1
).
value
()
<<
endl
;
t
phiA
lpha
=
alpha1Eqn
.
flux
();
t
a
lpha
Phi
=
alpha1Eqn
.
flux
();
}
volScalarField
alpha10
(
"alpha10"
,
alpha1
);
for
(
int
aCorr
=
0
;
aCorr
<
nAlphaCorr
;
aCorr
++
)
{
tmp
<
surfaceScalarField
>
t
phiA
lphaCorr
tmp
<
surfaceScalarField
>
t
a
lpha
Phi
Corr
(
fvc
::
flux
(
...
...
@@ -62,7 +62,7 @@
if
(
MULESCorr
)
{
t
phiA
lphaCorr
()
-=
t
phiA
lpha
();
t
a
lpha
Phi
Corr
()
-=
t
a
lpha
Phi
();
volScalarField
alpha100
(
"alpha100"
,
alpha10
);
alpha10
=
alpha1
;
...
...
@@ -71,8 +71,8 @@
(
geometricOneField
(),
alpha1
,
t
phiA
lpha
(),
t
phiA
lphaCorr
(),
t
a
lpha
Phi
(),
t
a
lpha
Phi
Corr
(),
vDotvmcAlphal
,
(
divU
*
(
alpha10
-
alpha100
)
...
...
@@ -85,12 +85,12 @@
// Under-relax the correction for all but the 1st corrector
if
(
aCorr
==
0
)
{
t
phiA
lpha
()
+=
t
phiA
lphaCorr
();
t
a
lpha
Phi
()
+=
t
a
lpha
Phi
Corr
();
}
else
{
alpha1
=
0
.
5
*
alpha1
+
0
.
5
*
alpha10
;
t
phiA
lpha
()
+=
0
.
5
*
t
phiA
lphaCorr
();
t
a
lpha
Phi
()
+=
0
.
5
*
t
a
lpha
Phi
Corr
();
}
}
else
...
...
@@ -100,20 +100,20 @@
geometricOneField
(),
alpha1
,
phi
,
t
phiA
lphaCorr
(),
t
a
lpha
Phi
Corr
(),
vDotvmcAlphal
,
(
divU
*
alpha1
+
vDotcAlphal
)(),
1
,
0
);
t
phiA
lpha
=
t
phiA
lphaCorr
;
t
a
lpha
Phi
=
t
a
lpha
Phi
Corr
;
}
alpha2
=
1
.
0
-
alpha1
;
}
rhoPhi
=
t
phiA
lpha
()
*
(
rho1
-
rho2
)
+
phi
*
rho2
;