zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Henry Weller
2018-05-25 23:45:10 +01:00
parent 332f94b724 93c1b5644f
commit 507f3a5768
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
View File

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

13
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
View File

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