From d28ecb867d62fda5668e54b7ac3d83e82324db32 Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Thu, 28 Apr 2016 11:59:58 +0200
Subject: [PATCH 1/2] Particle temperature field.

---
 .../heatTransferGunn/heatTransferGunn.C       | 22 +++++++++++++++++++
 .../heatTransferGunn/heatTransferGunn.H       |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
index 443bd5a5..b20fd9c0 100644
--- a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
+++ b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
@@ -57,6 +57,18 @@ heatTransferGunn::heatTransferGunn
         sm.mesh(),
         dimensionedScalar("zero", dimensionSet(1,1,-3,0,0,0,0), 0.0)
     ),
+    partTempField_
+    (   IOobject
+        (
+            "particleTemp",
+            sm.mesh().time().timeName(),
+            sm.mesh(),
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        sm.mesh(),
+        dimensionedScalar("zero", dimensionSet(0,0,0,1,0,0,0), 0.0)
+    ),
     tempFieldName_(propsDict_.lookupOrDefault<word>("tempFieldName","T")),
     tempField_(sm.mesh().lookupObject<volScalarField> (tempFieldName_)),
     voidfractionFieldName_(propsDict_.lookupOrDefault<word>("voidfractionFieldName","voidfraction")),
@@ -110,6 +122,16 @@ void heatTransferGunn::calcEnergyContribution()
 
     // get DEM data
     particleCloud_.dataExchangeM().getData(partTempName_,"scalar-atom",partTemp_);
+    
+    particleCloud_.averagingM().resetWeightFields();
+    particleCloud_.averagingM().setScalarAverage
+    (
+        partTempField_,
+        partTemp_,
+        particleCloud_.particleWeights(),
+        particleCloud_.averagingM().UsWeightField(),
+        NULL
+    );
 
     #ifdef compre
        const volScalarField mufField = particleCloud_.turbulence().mu();
diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.H b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.H
index 6e73fb42..0edd2d75 100644
--- a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.H
+++ b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.H
@@ -50,6 +50,8 @@ private:
     word QPartFluidName_;
         
     volScalarField QPartFluid_;
+    
+    volScalarField partTempField_;
 
     word tempFieldName_;
 

From bb3f463352c3904732e4cc22ab1bc5b2cb82c4a6 Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Thu, 28 Apr 2016 12:15:15 +0200
Subject: [PATCH 2/2] Particle temperature field.

---
 .../subModels/energyModel/heatTransferGunn/heatTransferGunn.C  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
index b20fd9c0..34018a6a 100644
--- a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
+++ b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
@@ -123,12 +123,13 @@ void heatTransferGunn::calcEnergyContribution()
     // get DEM data
     particleCloud_.dataExchangeM().getData(partTempName_,"scalar-atom",partTemp_);
     
+    double **particleWeights=particleCloud_.particleWeights();
     particleCloud_.averagingM().resetWeightFields();
     particleCloud_.averagingM().setScalarAverage
     (
         partTempField_,
         partTemp_,
-        particleCloud_.particleWeights(),
+        particleWeights,
         particleCloud_.averagingM().UsWeightField(),
         NULL
     );