BUG: fixed referencing of drag model in two phase system

This commit is contained in:
william
2014-01-03 11:49:00 +00:00
parent 0e135f4f07
commit b842081c35
3 changed files with 9 additions and 7 deletions

View File

@ -55,8 +55,6 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
phase_(phase), phase_(phase),
draga_(phase.fluid().drag1()),
viscosityModel_ viscosityModel_
( (
kineticTheoryModels::viscosityModel::New kineticTheoryModels::viscosityModel::New
@ -401,7 +399,11 @@ void Foam::RASModels::kineticTheoryModel::correct()
( (
alpha*(1.0 - alpha), alpha*(1.0 - alpha),
phase_.fluid().residualPhaseFraction() phase_.fluid().residualPhaseFraction()
)*draga_.K(magUr + phase_.fluid().residualSlip())/rho )
*phase_.fluid().drag(phase_).K
(
magUr + phase_.fluid().residualSlip()
)/rho
); );
// Eq. 3.25, p. 50 Js = J1 - J2 // Eq. 3.25, p. 50 Js = J1 - J2

View File

@ -82,8 +82,8 @@ class kineticTheoryModel
const phaseModel& phase_; const phaseModel& phase_;
//- Drag model ////- Drag model
const dragModel& draga_; //const dragModel& draga_;
// Sub-models // Sub-models

View File

@ -82,7 +82,7 @@ class twoPhaseSystem
//- Total volumetric flux //- Total volumetric flux
surfaceScalarField phi_; surfaceScalarField phi_;
//- //- Dilatation term
volScalarField dgdt_; volScalarField dgdt_;
//- Surface tension coefficient //- Surface tension coefficient
@ -224,7 +224,7 @@ public:
return phi_; return phi_;
} }
//- Return //- Return the dilatation term
const volScalarField& dgdt() const const volScalarField& dgdt() const
{ {
return dgdt_; return dgdt_;