From e99857f4beaab48dde22982b8211fbde92b01914 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 30 Jan 2009 15:03:33 +0000
Subject: [PATCH] Corrected fv2 for consistency with the choice of fv3.

---
 .../compressible/LES/SpalartAllmaras/SpalartAllmaras.C    | 8 +++-----
 .../compressible/RAS/SpalartAllmaras/SpalartAllmaras.C    | 3 +--
 .../incompressible/LES/SpalartAllmaras/SpalartAllmaras.C  | 3 +--
 .../incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C  | 3 +--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 92d15f5cd80..9e2949b976e 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -47,22 +47,20 @@ addToRunTimeSelectionTable(LESModel, SpalartAllmaras, dictionary);
 
 tmp<volScalarField> SpalartAllmaras::fv1() const
 {
-    volScalarField chi3 = pow3(nuTilda_/(mu()/rho()));
+    volScalarField chi3 = pow3(rho()*nuTilda_/mu());
     return chi3/(chi3 + pow3(Cv1_));
 }
 
 
 tmp<volScalarField> SpalartAllmaras::fv2() const
 {
-    volScalarField chi = nuTilda_/(mu()/rho());
-    //return scalar(1) - chi/(scalar(1) + chi*fv1());
-    return 1.0/pow3(scalar(1) + chi/Cv2_);
+    return 1.0/pow3(scalar(1) + rho()*nuTilda_/(mu()*Cv2_));
 }
 
 
 tmp<volScalarField> SpalartAllmaras::fv3() const
 {
-    volScalarField chi = nuTilda_/(mu()/rho());
+    volScalarField chi = rho()*nuTilda_/mu();
     volScalarField chiByCv2 = (1/Cv2_)*chi;
 
     return
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 74f5d8c5ab9..fe78e344caa 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -63,8 +63,7 @@ tmp<volScalarField> SpalartAllmaras::fv2
     const volScalarField& fv1
 ) const
 {
-    return 1.0 - chi/(1.0 + chi*fv1);
-    //return 1.0/pow3(scalar(1) + chi/Cv2);
+    return 1.0/pow3(scalar(1) + chi/Cv2_);
 }
 
 
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
index a6d7b44bb57..6dfaa35ef1a 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -52,8 +52,7 @@ tmp<volScalarField> SpalartAllmaras::fv1() const
 
 tmp<volScalarField> SpalartAllmaras::fv2() const
 {
-    volScalarField chi = nuTilda_/nu();
-    return 1/pow3(scalar(1) + chi/Cv2_);
+    return 1/pow3(scalar(1) + nuTilda_/(Cv2_*nu()));
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 8da6cd8d618..d1fa78134ad 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -63,8 +63,7 @@ tmp<volScalarField> SpalartAllmaras::fv2
     const volScalarField& fv1
 ) const
 {
-    return 1.0 - chi/(1.0 + chi*fv1);
-    //return 1.0/pow3(scalar(1) + chi/Cv2);
+    return 1.0/pow3(scalar(1) + chi/Cv2_);
 }
 
 
-- 
GitLab