zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MRG: Integrated Foundation code to commit 7d6845d

Browse Source
This commit is contained in:
Andrew Heather
2017-03-23 14:33:33 +00:00
parent 436ec1cf1f 7d6845defa
commit dcb1a95e35
595 changed files with 7175 additions and 11727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -139,7 +139,11 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
return tmp<volScalarField>
(
new volScalarField(Dname, model.nuEff())
new volScalarField
(
Dname,
alphaD_*model.nu() + alphaDt_*model.nut()
)
);
}
else if (foundObject<cmpModel>(turbulenceModel::propertiesName))
@ -151,7 +155,11 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
return tmp<volScalarField>
(
new volScalarField(Dname, model.muEff())
new volScalarField
(
Dname,
alphaD_*model.mu() + alphaDt_*model.mut()
)
);
}
else
@ -236,6 +244,8 @@ bool Foam::functionObjects::scalarTransport::read(const dictionary& dict)
schemesField_ = dict.lookupOrDefault("schemesField", fieldName_);
constantD_ = dict.readIfPresent("D", D_);
alphaD_ = dict.lookupOrDefault("alphaD", 1.0);
alphaDt_ = dict.lookupOrDefault("alphaDt", 1.0);
dict.readIfPresent("nCorr", nCorr_);
dict.readIfPresent("resetOnStartUp", resetOnStartUp_);
@ -358,7 +368,7 @@ bool Foam::functionObjects::scalarTransport::execute()
FatalErrorInFunction
<< "Incompatible dimensions for phi: " << phi.dimensions() << nl
<< "Dimensions should be " << dimMass/dimTime << " or "
<< dimVolume/dimTime << endl;
<< dimVolume/dimTime << exit(FatalError);
}
Log << endl;