zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Mark Olesen
2017-03-10 13:30:39 +01:00
parent 9faf186b9f 215349aa69
commit 31555346cc
17 changed files with 64 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/functionObjects/solvers/scalarTransport/scalarTransport.C
View File

@ -277,13 +277,13 @@ bool Foam::functionObjects::scalarTransport::execute()
const volScalarField& alpha =
mesh_.lookupObject<volScalarField>(phaseName_);
const surfaceScalarField& limitedPhiAlpa =
const surfaceScalarField& limitedPhiAlpha =
mesh_.lookupObject<surfaceScalarField>(phasePhiCompressedName_);
D *= pos(alpha - 0.99);
// Reset D dimensions consistent with limitedPhiAlpa
D.dimensions().reset(limitedPhiAlpa.dimensions()/dimLength);
// Reset D dimensions consistent with limitedPhiAlpha
D.dimensions().reset(limitedPhiAlpha.dimensions()/dimLength);
// Solve
tmp<surfaceScalarField> tTPhiUD;
@ -292,7 +292,7 @@ bool Foam::functionObjects::scalarTransport::execute()
fvScalarMatrix sEqn
(
fvm::ddt(s)
+ fvm::div(limitedPhiAlpa, s, divScheme)
+ fvm::div(limitedPhiAlpha, s, divScheme)
- fvm::laplacian(D, s, laplacianScheme)
==
alpha*fvOptions_(s)