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

BrownianMotionForce: Updated interface to turbulence model

Browse Source
This commit is contained in:
Henry
2015-04-30 17:38:12 +01:00
parent 841b303a33
commit 933bf2ba8a
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
View File

@ -26,8 +26,7 @@ License
#include "BrownianMotionForce.H" #include "BrownianMotionForce.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"
#include "turbulentTransportModel.H" #include "turbulenceModel.H"
#include "turbulentFluidThermoModel.H"
using namespace Foam::constant; using namespace Foam::constant;
@ -57,18 +56,17 @@ Foam::tmp<Foam::volScalarField>
Foam::BrownianMotionForce<CloudType>::kModel() const Foam::BrownianMotionForce<CloudType>::kModel() const
{ {
const objectRegistry& obr = this->owner().mesh(); const objectRegistry& obr = this->owner().mesh();
const word turbName = turbulenceModel::propertiesName; const word turbName =
IOobject::groupName
(
turbulenceModel::propertiesName,
this->owner().U().group()
);
if (obr.foundObject<compressible::turbulenceModel>(turbName)) if (obr.foundObject<turbulenceModel>(turbName))
{ {
const compressible::turbulenceModel& model = const turbulenceModel& model =
obr.lookupObject<compressible::turbulenceModel>(turbName); obr.lookupObject<turbulenceModel>(turbName);
return model.k();
}
else if (obr.foundObject<incompressible::turbulenceModel>(turbName))
{
const incompressible::turbulenceModel& model =
obr.lookupObject<incompressible::turbulenceModel>(turbName);
return model.k(); return model.k();
} }
else else
@ -76,7 +74,7 @@ Foam::BrownianMotionForce<CloudType>::kModel() const
FatalErrorIn FatalErrorIn
( (
"Foam::tmp<Foam::volScalarField>" "Foam::tmp<Foam::volScalarField>"
"Foam::BrownianMotionForce<CloudType>::kModel() const" "Foam::DispersionRASModel<CloudType>::kModel() const"
) )
<< "Turbulence model not found in mesh database" << nl << "Turbulence model not found in mesh database" << nl
<< "Database objects include: " << obr.sortedToc() << "Database objects include: " << obr.sortedToc()