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

This commit is contained in:
Henry Weller
2018-05-25 23:45:10 +01:00
2 changed files with 5 additions and 10 deletions

View File

@ -149,7 +149,7 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::YiEqn(volScalarField& Yi)
{
const volScalarField& alpha = *this;
const surfaceScalarField alphaRhoPhi(this->alphaRhoPhi());
const volScalarField rho(this->rho());
const volScalarField& rho = this->thermo().rho();
return
(

View File

@ -26,7 +26,7 @@ inletMassFlowRate
operation sum;
writeControl timeStep;
writeControl timeStep;
}
outletMassFlowRate
@ -49,16 +49,16 @@ outletMassFlowRate
operation sum;
writeControl timeStep;
writeControl timeStep;
}
totalMass
{
type coded;
libs ("libutilityFunctionObjects.so");
name error;
name error;
code
codeExecute
#{
const volScalarField& alphaGas =
mesh().lookupObject<volScalarField>("alpha.gas");
@ -70,9 +70,6 @@ totalMass
const volScalarField& rhoLiquid =
mesh().lookupObject<volScalarField>("thermo:rho.liquid");
const volScalarField& dmdt =
mesh().lookupObject<volScalarField>("dmdt.gasAndLiquid");
const scalarField& v = mesh().V();
Info<< "coded totalMass output:" << endl
@ -80,8 +77,6 @@ totalMass
<< gSum(alphaGas*rhoGas*v) << endl
<< " volIntegrate(all) for alpha.liquid*rho.liquid = "
<< gSum(alphaLiquid*rhoLiquid*v) << endl
<< " volIntegrate(all) for dmdt = "
<< gSum(dmdt*v) << endl
<< endl;
#};
}