From 59eb7962f4e4b36da892abb4ca40c564c56c5d78 Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Fri, 3 Jun 2016 10:33:38 +0200
Subject: [PATCH] Removed comments for testing purposes.

---
 .../thermCondModel/SyamlalThermCond/SyamlalThermCond.C      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C b/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C
index 3651de31..1844b802 100644
--- a/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C
+++ b/src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.C
@@ -68,15 +68,11 @@ SyamlalThermCond::~SyamlalThermCond()
 tmp<volScalarField> SyamlalThermCond::thermCond() const
 {
     return (1-sqrt(1-voidfraction_)) / (voidfraction_) * kf0_;
-  
-  	// just testing: throw away void fraction near boundaries...
-  //return kf0_/voidfraction_;
 }
 
 tmp<volScalarField> SyamlalThermCond::thermDiff() const
 {
-    // return (1-sqrt(1-voidfraction_+SMALL)) / (voidfraction_+SMALL) * kEff0_/(rho_*Cp_);
-  return thermCond()/(rho_*Cp_);
+    return thermCond()/(rho_*Cp_);
 }