Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry Weller
2018-03-20 22:29:57 +00:00

View File

@ -189,8 +189,6 @@ void Foam::multiphaseSystem::solveAlphas()
);
volScalarField divU(fvc::div(fvc::absolute(phi_, phases().first().U())));
forAll(phases(), phasei)
{
phaseModel& phase = phases()[phasei];
@ -209,20 +207,13 @@ void Foam::multiphaseSystem::solveAlphas()
mesh_
),
mesh_,
dimensionedScalar("Sp", divU.dimensions(), 0.0)
dimensionedScalar("Sp", dimless/dimTime, 0)
);
volScalarField::Internal Su
(
IOobject
(
"Su",
mesh_.time().timeName(),
mesh_
),
// Divergence term is handled explicitly to be
// consistent with the explicit transport solution
divU*min(alpha, scalar(1))
min(alpha, scalar(1))*fvc::div(fvc::absolute(phi_, phase.U()))
);
if (phase.divU().valid())