From 25efaffdd2ea86ca66589fb5cc02c99e46edcc01 Mon Sep 17 00:00:00 2001
From: tlichtenegger <thomas.lichtenegger@jku.at>
Date: Mon, 2 Nov 2020 10:27:05 +0100
Subject: [PATCH] Lookup turbulent kinetic energy in execution loop.

---
 .../turbulentDispersion/turbulentDispersion.C          | 10 +++++-----
 .../turbulentDispersion/turbulentDispersion.H          |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.C b/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.C
index a4005324..678e7139 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.C
@@ -73,8 +73,6 @@ turbulentDispersion::turbulentDispersion
         sm.mesh(),
         dimensionedScalar("zero", dimensionSet(0,0,0,0,0,0,0), 0.0)
     ),
-    turbKinetcEnergyFieldName_(propsDict_.lookupOrDefault<word>("turbKinetcEnergyFieldName","k")),
-    turbKinetcEnergy_(sm.mesh().lookupObject<volScalarField> (turbKinetcEnergyFieldName_)),
     minTurbKinetcEnergy_(propsDict_.lookupOrDefault<scalar>("minTurbKinetcEnergy", 0.0)),
     voidfractionFieldName_(propsDict_.lookupOrDefault<word>("voidfractionFieldName","voidfraction")),
     voidfraction_(sm.mesh().lookupObject<volScalarField> (voidfractionFieldName_)),
@@ -130,13 +128,15 @@ bool turbulentDispersion::ignoreCell(label cell) const
 
 void turbulentDispersion::setForce() const
 {
+    const volScalarField turbKinetcEnergy(particleCloud_.turbulence().k());
+
     vector position(0,0,0);
     scalar k = 0.0;
 
     vector flucU(0,0,0);
     label cellI = 0;
 
-    interpolationCellPoint<scalar> turbKinetcEnergyInterpolator_(turbKinetcEnergy_);
+    interpolationCellPoint<scalar> turbKinetcEnergyInterpolator_(turbKinetcEnergy);
 
     for(int index = 0;index <  particleCloud_.numberOfParticles(); ++index)
     {
@@ -156,7 +156,7 @@ void turbulentDispersion::setForce() const
                 }
                 else
                 {
-                    k = turbKinetcEnergy_[cellI];
+                    k = turbKinetcEnergy[cellI];
                 }
 
                 if (k < minTurbKinetcEnergy_) k = minTurbKinetcEnergy_;
@@ -175,7 +175,7 @@ void turbulentDispersion::setForce() const
                 }
             }
         }
-    }   
+    }
 }
 
 vector turbulentDispersion::unitFlucDir() const
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H b/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H
index 4e106214..64546048 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H
@@ -58,10 +58,6 @@ protected:
 
     mutable volScalarField wallIndicatorField_;
 
-    word turbKinetcEnergyFieldName_;
-
-    const volScalarField& turbKinetcEnergy_;
-
     scalar minTurbKinetcEnergy_;
 
     word voidfractionFieldName_;