From 6a9101990eed518a439c22f59c5fcd7747724827 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 22 Apr 2016 15:13:45 +0100
Subject: [PATCH] JohnsonJacksonSchaefferFrictionalStress: Updated I2D
 expression

---
 .../JohnsonJacksonSchaefferFrictionalStress.C    | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index 4f05634d6f..91b49b30e0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -126,7 +126,6 @@ JohnsonJacksonSchaeffer::nu
 ) const
 {
     const volScalarField& alpha = phase;
-    const scalar I2Dsmall = 1.0e-15;
 
     tmp<volScalarField> tnu
     (
@@ -155,17 +154,8 @@ JohnsonJacksonSchaeffer::nu
             nuf[celli] =
                 0.5*pf[celli]*sin(phi_.value())
                /(
-                    sqrt
-                    (
-                        1.0/6.0
-                       *(
-                            sqr(D[celli].xx() - D[celli].yy())
-                          + sqr(D[celli].yy() - D[celli].zz())
-                          + sqr(D[celli].zz() - D[celli].xx())
-                        )
-                      + sqr(D[celli].xy()) + sqr(D[celli].xz()
-                    )
-                  + sqr(D[celli].yz())) + I2Dsmall
+                    sqrt((1.0/3.0)*sqr(tr(D[celli])) - invariantII(D[celli]))
+                  + SMALL
                 );
         }
     }
@@ -182,7 +172,7 @@ JohnsonJacksonSchaeffer::nu
                     pf.boundaryField()[patchi]*sin(phi_.value())
                    /(
                         mag(U.boundaryField()[patchi].snGrad())
-                      + I2Dsmall
+                      + SMALL
                     )
                 );
         }
-- 
GitLab