From 922c17235213fac9f5eecf2a4abb4d01f97e72fb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 12 Nov 2020 18:10:30 +0000
Subject: [PATCH] thermophysicalTransportModels::FickianEddyDiffusivity:
 Updated diffusivity coefficients to Function2

The specie and Soret diffusivity coefficients are now functions of pressure and
temperature utilising the new run-time selectable Function2.
---
 .../FickianEddyDiffusivity.C                   | 18 +++++++++++++-----
 .../FickianEddyDiffusivity.H                   |  6 +++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C b/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C
index aa9f941079..cadbdd44cf 100644
--- a/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C
+++ b/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C
@@ -29,7 +29,7 @@ License
 #include "fvcSnGrad.H"
 #include "fvmSup.H"
 #include "surfaceInterpolate.H"
-#include "Function1Evaluate.H"
+#include "Function2Evaluate.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -97,7 +97,7 @@ FickianEddyDiffusivity<TurbulenceThermophysicalTransportModel>::read()
 
         forAll(species, i)
         {
-            D_.set(i, Function1<scalar>::New(species[i], Ddict).ptr());
+            D_.set(i, Function2<scalar>::New(species[i], Ddict).ptr());
         }
 
         if (this->coeffDict_.found("DT"))
@@ -106,7 +106,7 @@ FickianEddyDiffusivity<TurbulenceThermophysicalTransportModel>::read()
 
             forAll(species, i)
             {
-                DT_.set(i, Function1<scalar>::New(species[i], DTdict).ptr());
+                DT_.set(i, Function2<scalar>::New(species[i], DTdict).ptr());
             }
         }
 
@@ -133,7 +133,13 @@ FickianEddyDiffusivity<TurbulenceThermophysicalTransportModel>::DEff
     (
         "DEff",
         this->momentumTransport().rho()
-       *evaluate(D_[composition.index(Yi)], dimViscosity, this->thermo().T())
+       *evaluate
+        (
+            D_[composition.index(Yi)],
+            dimViscosity,
+            this->thermo().p(),
+            this->thermo().T()
+        )
       + (this->Prt_/Sct_)*this->alphat()
     );
 }
@@ -154,6 +160,7 @@ FickianEddyDiffusivity<TurbulenceThermophysicalTransportModel>::DEff
         this->momentumTransport().rho().boundaryField()[patchi]
        *D_[composition.index(Yi)].value
         (
+            this->thermo().p().boundaryField()[patchi],
             this->thermo().T().boundaryField()[patchi]
         )
       + this->Prt_.value()/Sct_.value()*this->alphat(patchi);
@@ -170,6 +177,7 @@ FickianEddyDiffusivity<TurbulenceThermophysicalTransportModel>::j
     if (DT_.size())
     {
         const basicSpecieMixture& composition = this->thermo().composition();
+        const volScalarField& p = this->thermo().T();
         const volScalarField& T = this->thermo().T();
 
         return
@@ -177,7 +185,7 @@ FickianEddyDiffusivity<TurbulenceThermophysicalTransportModel>::j
             j(Yi)
           - fvc::interpolate
             (
-                evaluate(DT_[composition.index(Yi)], dimDynamicViscosity, T)
+                evaluate(DT_[composition.index(Yi)], dimDynamicViscosity, p, T)
             )
            *fvc::snGrad(T)/fvc::interpolate(T);
     }
diff --git a/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H b/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H
index 8edf8083ad..77cf22d80b 100644
--- a/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H
+++ b/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H
@@ -54,7 +54,7 @@ SourceFiles
 \*---------------------------------------------------------------------------*/
 
 #include "unityLewisEddyDiffusivity.H"
-#include "Function1.H"
+#include "Function2.H"
 
 #ifndef FickianEddyDiffusivity_H
 #define FickianEddyDiffusivity_H
@@ -87,11 +87,11 @@ protected:
 
             //- List of specie mass diffusion coefficient functions
             //  w.r.t the mixture [m^2/s]
-            PtrList<Function1<scalar>> D_;
+            PtrList<Function2<scalar>> D_;
 
             //- List of specie Soret thermal diffusion coefficient
             //  functions [kg/m/s]
-            PtrList<Function1<scalar>> DT_;
+            PtrList<Function2<scalar>> DT_;
 
 
 public: