Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2012-04-02 18:10:01 +01:00
32 changed files with 1642 additions and 17 deletions

View File

@ -310,14 +310,21 @@
Info << "dispersedPhase is " << dispersedPhase << endl;
scalar minInterfaceAlpha
scalar residualPhaseFraction
(
readScalar
(
interfacialProperties.lookup("minInterfaceAlpha")
interfacialProperties.lookup("residualPhaseFraction")
)
);
dimensionedScalar residualSlip
(
"residualSlip",
dimVelocity,
interfacialProperties.lookup("residualSlip")
);
kineticTheoryModel kineticTheory
(
phase1,

View File

@ -36,7 +36,7 @@ volScalarField heatTransferCoeff
{
volVectorField Ur(U1 - U2);
volScalarField magUr(mag(Ur));
volScalarField magUr(mag(Ur) + residualSlip);
if (dispersedPhase == "1")
{
@ -69,12 +69,9 @@ volScalarField heatTransferCoeff
<< exit(FatalError);
}
volScalarField alpha1Coeff
(
(alpha1 + minInterfaceAlpha)*(alpha2 + minInterfaceAlpha)
);
dragCoeff *= alpha1Coeff;
heatTransferCoeff *= alpha1Coeff;
volScalarField alphaCoeff(max(alpha1*alpha2, residualPhaseFraction));
dragCoeff *= alphaCoeff;
heatTransferCoeff *= alphaCoeff;
liftForce = Cl*(alpha1*rho1 + alpha2*rho2)*(Ur ^ fvc::curl(U));