From a6f4bf60b8dc40feba7d099effa5cda257a30ee4 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 3 Dec 2015 13:12:10 +0000 Subject: [PATCH] LRR: Added support for fvOptions --- src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C index 2b8be52762..a955b9a205 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "LRR.H" +#include "fvOptions.H" #include "wallFvPatch.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -40,6 +41,7 @@ void LRR::correctNut() { this->nut_ = this->Cmu_*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); + fv::options::New(this->mesh_).correct(this->nut_); BasicTurbulenceModel::correctNut(); } @@ -280,6 +282,7 @@ void LRR::correct() const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_; const volVectorField& U = this->U_; volSymmTensorField& R = this->R_; + fv::options& fvOptions(fv::options::New(this->mesh_)); ReynoldsStress >::correct(); @@ -301,13 +304,14 @@ void LRR::correct() == Ceps1_*alpha*rho*G*epsilon_/k_ - fvm::Sp(Ceps2_*alpha*rho*epsilon_/k_, epsilon_) + + fvOptions(alpha, rho, epsilon_) ); epsEqn().relax(); - + fvOptions.constrain(epsEqn()); epsEqn().boundaryManipulate(epsilon_.boundaryField()); - solve(epsEqn); + fvOptions.correct(epsilon_); bound(epsilon_, this->epsilonMin_); @@ -344,6 +348,7 @@ void LRR::correct() alpha*rho*P - (2.0/3.0*(1 - C1_)*I)*alpha*rho*epsilon_ - C2_*alpha*rho*dev(P) + + fvOptions(alpha, rho, R) ); // Optionally add wall-refection term @@ -363,7 +368,9 @@ void LRR::correct() } REqn().relax(); + fvOptions.constrain(REqn()); solve(REqn); + fvOptions.correct(R); this->boundNormalStress(R);