From fc01f7a40930b8142dfe334ca72b2550c52c0d27 Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Wed, 8 Jun 2016 20:38:42 +0200
Subject: [PATCH] Allow for wall-film effects.

---
 .../SyamlalThermCond/SyamlalThermCond.C       | 33 +++++++++++++++++--
 .../SyamlalThermCond/SyamlalThermCond.H       |  3 ++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C b/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C
index 1844b802..f17f9d88 100644
--- a/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C
+++ b/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C
@@ -53,8 +53,12 @@ SyamlalThermCond::SyamlalThermCond
     voidfractionFieldName_(propsDict_.lookupOrDefault<word>("voidfractionFieldName","voidfraction")),
     voidfraction_(sm.mesh().lookupObject<volScalarField> (voidfractionFieldName_)),
     rhoFieldName_(propsDict_.lookupOrDefault<word>("rhoFieldName","rho")),
-    rho_(sm.mesh().lookupObject<volScalarField> (rhoFieldName_))
-{}
+    rho_(sm.mesh().lookupObject<volScalarField> (rhoFieldName_)),
+    wallLayerFactor_(1.0)
+{
+    if (propsDict_.found("wallLayerFactor"))
+         wallLayerFactor_=readScalar(propsDict_.lookup ("wallLayerFactor"));
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -67,7 +71,30 @@ SyamlalThermCond::~SyamlalThermCond()
 
 tmp<volScalarField> SyamlalThermCond::thermCond() const
 {
-    return (1-sqrt(1-voidfraction_)) / (voidfraction_) * kf0_;
+    tmp<volScalarField> tvf
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "tmpThCond",
+                voidfraction_.instance(),
+                voidfraction_.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            voidfraction_.mesh(),
+	    dimensionedScalar("zero", dimensionSet(1,1,-3,-1,0,0,0), 0.0)
+        )
+    );
+    volScalarField& svf = tvf();
+    
+    svf = (1-sqrt(1-voidfraction_)) / (voidfraction_) * kf0_;
+    
+    forAll(voidfraction_.boundaryField(), patchi)
+        svf.boundaryField()[patchi] *= wallLayerFactor_;
+  
+    return tvf;
 }
 
 tmp<volScalarField> SyamlalThermCond::thermDiff() const
diff --git a/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H b/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H
index c9bb75fa..e32c0625 100644
--- a/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H
+++ b/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H
@@ -60,6 +60,9 @@ private:
     word rhoFieldName_;
     
     const volScalarField& rho_;
+    
+    // ratio of half-cell-size and near-wall film
+    scalar wallLayerFactor_;
 
 public: