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
078c4275
Commit
078c4275
authored
Dec 21, 2010
by
Mark Olesen
Browse files
COMP: avoid ambiguous construct from tmp - solvers/ multiphase
parent
5a8f9252
Changes
68
Hide whitespace changes
Inline
Side-by-side
applications/solvers/multiphase/bubbleFoam/UEqns.H
View file @
078c4275
...
...
@@ -2,12 +2,14 @@ fvVectorMatrix UaEqn(Ua, Ua.dimensions()*dimVol/dimTime);
fvVectorMatrix
UbEqn
(
Ub
,
Ub
.
dimensions
()
*
dimVol
/
dimTime
);
{
volTensorField
Rca
=
-
nuEffa
*
(
fvc
::
grad
(
Ua
)().
T
());
volTensorField
Rca
(
-
nuEffa
*
(
fvc
::
grad
(
Ua
)().
T
())
)
;
Rca
=
Rca
+
(
2
.
0
/
3
.
0
)
*
sqr
(
Ct
)
*
I
*
k
-
(
2
.
0
/
3
.
0
)
*
I
*
tr
(
Rca
);
surfaceScalarField
phiRa
=
surfaceScalarField
phiRa
(
-
fvc
::
interpolate
(
nuEffa
)
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
alpha
)
/
fvc
::
interpolate
(
alpha
+
scalar
(
0
.
001
));
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
alpha
)
/
fvc
::
interpolate
(
alpha
+
scalar
(
0
.
001
))
);
UaEqn
=
(
...
...
@@ -34,12 +36,14 @@ fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime);
UaEqn
.
relax
();
volTensorField
Rcb
=
-
nuEffb
*
fvc
::
grad
(
Ub
)().
T
();
volTensorField
Rcb
(
-
nuEffb
*
fvc
::
grad
(
Ub
)().
T
()
)
;
Rcb
=
Rcb
+
(
2
.
0
/
3
.
0
)
*
I
*
k
-
(
2
.
0
/
3
.
0
)
*
I
*
tr
(
Rcb
);
surfaceScalarField
phiRb
=
surfaceScalarField
phiRb
(
-
fvc
::
interpolate
(
nuEffb
)
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
beta
)
/
fvc
::
interpolate
(
beta
+
scalar
(
0
.
001
));
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
beta
)
/
fvc
::
interpolate
(
beta
+
scalar
(
0
.
001
))
);
UbEqn
=
(
...
...
applications/solvers/multiphase/bubbleFoam/alphaEqn.H
View file @
078c4275
{
word
scheme
(
"div(phi,alpha)"
);
surfaceScalarField
phir
=
phia
-
phib
;
surfaceScalarField
phir
(
phia
-
phib
)
;
Info
<<
"Max Ur Courant Number = "
<<
(
...
...
applications/solvers/multiphase/bubbleFoam/createFields.H
View file @
078c4275
...
...
@@ -171,15 +171,19 @@
Info
<<
"Calculating field DDtUa and DDtUb
\n
"
<<
endl
;
volVectorField
DDtUa
=
volVectorField
DDtUa
(
fvc
::
ddt
(
Ua
)
+
fvc
::
div
(
phia
,
Ua
)
-
fvc
::
div
(
phia
)
*
Ua
;
-
fvc
::
div
(
phia
)
*
Ua
);
volVectorField
DDtUb
=
volVectorField
DDtUb
(
fvc
::
ddt
(
Ub
)
+
fvc
::
div
(
phib
,
Ub
)
-
fvc
::
div
(
phib
)
*
Ub
;
-
fvc
::
div
(
phib
)
*
Ub
);
Info
<<
"Calculating field g.h
\n
"
<<
endl
;
...
...
applications/solvers/multiphase/bubbleFoam/kEpsilon.H
View file @
078c4275
...
...
@@ -6,7 +6,7 @@ if (turbulence)
}
tmp
<
volTensorField
>
tgradUb
=
fvc
::
grad
(
Ub
);
volScalarField
G
=
2
*
nutb
*
(
tgradUb
()
&&
dev
(
symm
(
tgradUb
())));
volScalarField
G
(
2
*
nutb
*
(
tgradUb
()
&&
dev
(
symm
(
tgradUb
())))
)
;
tgradUb
.
clear
();
#include
"wallFunctions.H"
...
...
applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H
View file @
078c4275
volVectorField
Ur
=
Ua
-
Ub
;
volScalarField
magUr
=
mag
(
Ur
);
volVectorField
Ur
(
Ua
-
Ub
)
;
volScalarField
magUr
(
mag
(
Ur
)
)
;
volScalarField
CdaMagUr
=
(
24
.
0
*
nub
/
da
)
*
(
scalar
(
1
)
+
0
.
15
*
pow
(
da
*
magUr
/
nub
,
0
.
687
));
volScalarField
CdaMagUr
(
(
24
.
0
*
nub
/
da
)
*
(
scalar
(
1
)
+
0
.
15
*
pow
(
da
*
magUr
/
nub
,
0
.
687
))
);
volScalarField
CdbMagUr
=
(
24
.
0
*
nua
/
db
)
*
(
scalar
(
1
)
+
0
.
15
*
pow
(
db
*
magUr
/
nua
,
0
.
687
));
volScalarField
CdbMagUr
(
(
24
.
0
*
nua
/
db
)
*
(
scalar
(
1
)
+
0
.
15
*
pow
(
db
*
magUr
/
nua
,
0
.
687
))
);
volScalarField
dragCoef
(
...
...
@@ -13,4 +17,7 @@
0
.
75
*
(
beta
*
rhob
*
CdaMagUr
/
da
+
alpha
*
rhoa
*
CdbMagUr
/
db
)
);
volVectorField
liftCoeff
=
Cl
*
(
beta
*
rhob
+
alpha
*
rhoa
)
*
(
Ur
^
fvc
::
curl
(
U
));
volVectorField
liftCoeff
(
Cl
*
(
beta
*
rhob
+
alpha
*
rhoa
)
*
(
Ur
^
fvc
::
curl
(
U
))
);
applications/solvers/multiphase/bubbleFoam/pEqn.H
View file @
078c4275
{
surfaceScalarField
alphaf
=
fvc
::
interpolate
(
alpha
);
surfaceScalarField
betaf
=
scalar
(
1
)
-
alphaf
;
surfaceScalarField
alphaf
(
fvc
::
interpolate
(
alpha
)
)
;
surfaceScalarField
betaf
(
scalar
(
1
)
-
alphaf
)
;
volScalarField
rUaA
=
1
.
0
/
UaEqn
.
A
();
volScalarField
rUbA
=
1
.
0
/
UbEqn
.
A
();
volScalarField
rUaA
(
1
.
0
/
UaEqn
.
A
()
)
;
volScalarField
rUbA
(
1
.
0
/
UbEqn
.
A
()
)
;
surfaceScalarField
rUaAf
=
fvc
::
interpolate
(
rUaA
);
surfaceScalarField
rUbAf
=
fvc
::
interpolate
(
rUbA
);
surfaceScalarField
rUaAf
(
fvc
::
interpolate
(
rUaA
)
)
;
surfaceScalarField
rUbAf
(
fvc
::
interpolate
(
rUbA
)
)
;
Ua
=
rUaA
*
UaEqn
.
H
();
Ub
=
rUbA
*
UbEqn
.
H
();
surfaceScalarField
phiDraga
=
fvc
::
interpolate
(
beta
/
rhoa
*
dragCoef
*
rUaA
)
*
phib
+
rUaAf
*
(
g
&
mesh
.
Sf
());
surfaceScalarField
phiDragb
=
fvc
::
interpolate
(
alpha
/
rhob
*
dragCoef
*
rUbA
)
*
phia
+
rUbAf
*
(
g
&
mesh
.
Sf
());
surfaceScalarField
phiDraga
(
fvc
::
interpolate
(
beta
/
rhoa
*
dragCoef
*
rUaA
)
*
phib
+
rUaAf
*
(
g
&
mesh
.
Sf
())
);
surfaceScalarField
phiDragb
(
fvc
::
interpolate
(
alpha
/
rhob
*
dragCoef
*
rUbA
)
*
phia
+
rUbAf
*
(
g
&
mesh
.
Sf
())
);
forAll
(
p
.
boundaryField
(),
patchi
)
{
...
...
@@ -50,7 +54,7 @@
if
(
nonOrth
==
nNonOrthCorr
)
{
surfaceScalarField
SfGradp
=
pEqn
.
flux
()
/
Dp
;
surfaceScalarField
SfGradp
(
pEqn
.
flux
()
/
Dp
)
;
phia
-=
rUaAf
*
SfGradp
/
rhoa
;
phib
-=
rUbAf
*
SfGradp
/
rhob
;
...
...
applications/solvers/multiphase/bubbleFoam/wallFunctions.H
View file @
078c4275
...
...
@@ -34,7 +34,7 @@
{
const
scalarField
&
nuw
=
nutb
.
boundaryField
()[
patchi
];
scalarField
magFaceGradU
=
mag
(
U
.
boundaryField
()[
patchi
].
snGrad
());
scalarField
magFaceGradU
(
mag
(
U
.
boundaryField
()[
patchi
].
snGrad
())
)
;
forAll
(
currPatch
,
facei
)
{
...
...
applications/solvers/multiphase/cavitatingFoam/CourantNo.H
View file @
078c4275
...
...
@@ -35,8 +35,10 @@ scalar acousticCoNum = 0.0;
if
(
mesh
.
nInternalFaces
())
{
scalarField
sumPhi
=
fvc
::
surfaceSum
(
mag
(
phiv
))().
internalField
();
scalarField
sumPhi
(
fvc
::
surfaceSum
(
mag
(
phiv
))().
internalField
()
);
CoNum
=
0
.
5
*
gMax
(
sumPhi
/
mesh
.
V
().
field
())
*
runTime
.
deltaTValue
();
...
...
applications/solvers/multiphase/cavitatingFoam/pEqn.H
View file @
078c4275
...
...
@@ -9,18 +9,18 @@
)
/
psi
;
}
surfaceScalarField
rhof
=
fvc
::
interpolate
(
rho
,
"rhof"
);
surfaceScalarField
rhof
(
fvc
::
interpolate
(
rho
,
"rhof"
)
)
;
volScalarField
rAU
=
1
.
0
/
UEqn
.
A
();
volScalarField
rAU
(
1
.
0
/
UEqn
.
A
()
)
;
surfaceScalarField
rAUf
(
"rAUf"
,
rhof
*
fvc
::
interpolate
(
rAU
));
volVectorField
HbyA
=
rAU
*
UEqn
.
H
();
volVectorField
HbyA
(
rAU
*
UEqn
.
H
()
)
;
phiv
=
(
fvc
::
interpolate
(
HbyA
)
&
mesh
.
Sf
())
+
fvc
::
ddtPhiCorr
(
rAU
,
rho
,
U
,
phiv
);
p
.
boundaryField
().
updateCoeffs
();
surfaceScalarField
phiGradp
=
rAUf
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
p
);
surfaceScalarField
phiGradp
(
rAUf
*
mesh
.
magSf
()
*
fvc
::
snGrad
(
p
)
)
;
phiv
-=
phiGradp
/
rhof
;
...
...
applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
View file @
078c4275
...
...
@@ -2,7 +2,7 @@
word
alphaScheme
(
"div(phi,alpha)"
);
word
alpharScheme
(
"div(phirb,alpha)"
);
surfaceScalarField
phir
=
phic
*
interface
.
nHatf
();
surfaceScalarField
phir
(
phic
*
interface
.
nHatf
()
)
;
for
(
int
gCorr
=
0
;
gCorr
<
nAlphaCorr
;
gCorr
++
)
{
...
...
@@ -45,7 +45,8 @@
}
surfaceScalarField
phiAlpha1
=
surfaceScalarField
phiAlpha1
(
fvc
::
flux
(
phi
,
...
...
@@ -57,7 +58,8 @@
-
fvc
::
flux
(
-
phir
,
alpha2
,
alpharScheme
),
alpha1
,
alpharScheme
);
)
);
MULES
::
explicitSolve
(
...
...
@@ -71,8 +73,8 @@
0
);
surfaceScalarField
rho1f
=
fvc
::
interpolate
(
rho1
);
surfaceScalarField
rho2f
=
fvc
::
interpolate
(
rho2
);
surfaceScalarField
rho1f
(
fvc
::
interpolate
(
rho1
)
)
;
surfaceScalarField
rho2f
(
fvc
::
interpolate
(
rho2
)
)
;
rhoPhi
=
phiAlpha1
*
(
rho1f
-
rho2f
)
+
phi
*
rho2f
;
alpha2
=
scalar
(
1
)
-
alpha1
;
...
...
applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
View file @
078c4275
...
...
@@ -9,15 +9,15 @@
readLabel
(
piso
.
lookup
(
"nAlphaSubCycles"
))
);
surfaceScalarField
phic
=
mag
(
phi
/
mesh
.
magSf
());
surfaceScalarField
phic
(
mag
(
phi
/
mesh
.
magSf
())
)
;
phic
=
min
(
interface
.
cAlpha
()
*
phic
,
max
(
phic
));
volScalarField
divU
=
fvc
::
div
(
phi
);
volScalarField
divU
(
fvc
::
div
(
phi
)
)
;
if
(
nAlphaSubCycles
>
1
)
{
dimensionedScalar
totalDeltaT
=
runTime
.
deltaT
();
surfaceScalarField
rhoPhiSum
=
0
.
0
*
rhoPhi
;
surfaceScalarField
rhoPhiSum
(
0
.
0
*
rhoPhi
)
;
for
(
...
...
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/alphaEqnsSubCycle.H
View file @
078c4275
...
...
@@ -9,17 +9,17 @@
readLabel
(
piso
.
lookup
(
"nAlphaSubCycles"
))
);
surfaceScalarField
phic
=
mag
(
phi
/
mesh
.
magSf
());
surfaceScalarField
phic
(
mag
(
phi
/
mesh
.
magSf
())
)
;
phic
=
min
(
interface
.
cAlpha
()
*
phic
,
max
(
phic
));
fvc
::
makeAbsolute
(
phi
,
U
);
volScalarField
divU
=
fvc
::
div
(
phi
);
volScalarField
divU
(
fvc
::
div
(
phi
)
)
;
fvc
::
makeRelative
(
phi
,
U
);
if
(
nAlphaSubCycles
>
1
)
{
dimensionedScalar
totalDeltaT
=
runTime
.
deltaT
();
surfaceScalarField
rhoPhiSum
=
0
.
0
*
rhoPhi
;
surfaceScalarField
rhoPhiSum
(
0
.
0
*
rhoPhi
)
;
for
(
...
...
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
View file @
078c4275
...
...
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
{
// Store divU from the previous mesh for the correctPhi
volScalarField
divU
=
fvc
::
div
(
phi
);
volScalarField
divU
(
fvc
::
div
(
phi
)
)
;
scalar
timeBeforeMeshUpdate
=
runTime
.
elapsedCpuTime
();
...
...
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
View file @
078c4275
{
volScalarField
rAU
=
1
.
0
/
UEqn
.
A
();
surfaceScalarField
rAUf
=
fvc
::
interpolate
(
rAU
);
volScalarField
rAU
(
1
.
0
/
UEqn
.
A
()
)
;
surfaceScalarField
rAUf
(
fvc
::
interpolate
(
rAU
)
)
;
tmp
<
fvScalarMatrix
>
p_rghEqnComp
;
...
...
applications/solvers/multiphase/compressibleInterFoam/createFields.H
View file @
078c4275
...
...
@@ -105,8 +105,8 @@
)
);
volScalarField
rho1
=
rho10
+
psi1
*
p
;
volScalarField
rho2
=
rho20
+
psi2
*
p
;
volScalarField
rho1
(
rho10
+
psi1
*
p
)
;
volScalarField
rho2
(
rho20
+
psi2
*
p
)
;
volScalarField
rho
(
...
...
@@ -138,8 +138,10 @@
fvc
::
interpolate
(
rho
)
*
phi
);
volScalarField
dgdt
=
pos
(
alpha2
)
*
fvc
::
div
(
phi
)
/
max
(
alpha2
,
scalar
(
0
.
0001
));
volScalarField
dgdt
(
pos
(
alpha2
)
*
fvc
::
div
(
phi
)
/
max
(
alpha2
,
scalar
(
0
.
0001
))
);
// Construct interface from alpha1 distribution
interfaceProperties
interface
(
alpha1
,
U
,
twoPhaseProperties
);
...
...
applications/solvers/multiphase/compressibleInterFoam/pEqn.H
View file @
078c4275
{
volScalarField
rAU
=
1
.
0
/
UEqn
.
A
();
surfaceScalarField
rAUf
=
fvc
::
interpolate
(
rAU
);
volScalarField
rAU
(
1
.
0
/
UEqn
.
A
()
)
;
surfaceScalarField
rAUf
(
fvc
::
interpolate
(
rAU
)
)
;
tmp
<
fvScalarMatrix
>
p_rghEqnComp
;
...
...
applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
View file @
078c4275
...
...
@@ -56,7 +56,7 @@ void Foam::MULES::explicitLTSSolve
const
fvMesh
&
mesh
=
psi
.
mesh
();
psi
.
correctBoundaryConditions
();
surfaceScalarField
phiBD
=
upwind
<
scalar
>
(
psi
.
mesh
(),
phi
).
flux
(
psi
);
surfaceScalarField
phiBD
(
upwind
<
scalar
>
(
psi
.
mesh
(),
phi
).
flux
(
psi
)
)
;
surfaceScalarField
&
phiCorr
=
phiPsi
;
phiCorr
-=
phiBD
;
...
...
@@ -168,9 +168,11 @@ void Foam::MULES::implicitSolve
scalarField
allCoLambda
(
mesh
.
nFaces
());
{
surfaceScalarField
Cof
=
surfaceScalarField
Cof
(
mesh
.
time
().
deltaT
()
*
mesh
.
surfaceInterpolation
::
deltaCoeffs
()
*
mag
(
phi
)
/
mesh
.
magSf
();
*
mag
(
phi
)
/
mesh
.
magSf
()
);
slicedSurfaceScalarField
CoLambda
(
...
...
@@ -226,7 +228,7 @@ void Foam::MULES::implicitSolve
-
Su
);
surfaceScalarField
phiBD
=
psiConvectionDiffusion
.
flux
();
surfaceScalarField
phiBD
(
psiConvectionDiffusion
.
flux
()
)
;
surfaceScalarField
&
phiCorr
=
phiPsi
;
phiCorr
-=
phiBD
;
...
...
@@ -408,7 +410,7 @@ void Foam::MULES::limiter
if
(
psiPf
.
coupled
())
{
scalarField
psiPNf
=
psiPf
.
patchNeighbourField
();
scalarField
psiPNf
(
psiPf
.
patchNeighbourField
()
)
;
forAll
(
phiCorrPf
,
pFacei
)
{
...
...
applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqn.H
View file @
078c4275
...
...
@@ -2,13 +2,14 @@
word
alphaScheme
(
"div(phi,alpha)"
);
word
alpharScheme
(
"div(phirb,alpha)"
);
surfaceScalarField
phic
=
mag
(
phi
/
mesh
.
magSf
());
surfaceScalarField
phic
(
mag
(
phi
/
mesh
.
magSf
())
)
;
phic
=
min
(
interface
.
cAlpha
()
*
phic
,
max
(
phic
));
surfaceScalarField
phir
=
phic
*
interface
.
nHatf
();
surfaceScalarField
phir
(
phic
*
interface
.
nHatf
()
)
;
for
(
int
aCorr
=
0
;
aCorr
<
nAlphaCorr
;
aCorr
++
)
{
surfaceScalarField
phiAlpha
=
surfaceScalarField
phiAlpha
(
fvc
::
flux
(
phi
,
...
...
@@ -20,7 +21,8 @@
-
fvc
::
flux
(
-
phir
,
scalar
(
1
)
-
alpha1
,
alpharScheme
),
alpha1
,
alpharScheme
);
)
);
MULES
::
explicitLTSSolve
(
alpha1
,
phi
,
phiAlpha
,
1
,
0
);
//MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
...
...
applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqnSubCycle.H
View file @
078c4275
...
...
@@ -11,7 +11,7 @@ label nAlphaSubCycles
if
(
nAlphaSubCycles
>
1
)
{
dimensionedScalar
totalDeltaT
=
runTime
.
deltaT
();
surfaceScalarField
rhoPhiSum
=
0
.
0
*
rhoPhi
;
surfaceScalarField
rhoPhiSum
(
0
.
0
*
rhoPhi
)
;
for
(
...
...
applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
View file @
078c4275
{
volScalarField
rAU
=
1
.
0
/
UEqn
.
A
();
surfaceScalarField
rAUf
=
fvc
::
interpolate
(
rAU
);
volScalarField
rAU
(
1
.
0
/
UEqn
.
A
()
)
;
surfaceScalarField
rAUf
(
fvc
::
interpolate
(
rAU
)
)
;
U
=
rAU
*
UEqn
.
H
();
surfaceScalarField
phiU
...
...
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment