From 1643f8d908d53fbbb13fd7ac667731e2f175f1ef Mon Sep 17 00:00:00 2001
From: danielque <daniel.queteschiner@jku.at>
Date: Wed, 13 Nov 2019 13:05:19 +0100
Subject: [PATCH] [OF6] fix volScalarField for heat release rate

OF4 -> OF5/OF6:
dimension of dQ() = dimEnergy/dimTime
->
dimension of Qdot() = dimEnergy/dimVolume/dimTime
---
 .../solvers/cfdemSolverRhoPimpleChem/YEqn.H      |  3 ++-
 .../cfdemSolverRhoPimpleChem/createFields.H      | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H
index d8edde75..e4d58344 100644
--- a/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H
+++ b/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H
@@ -16,7 +16,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 #if OPENFOAM_VERSION_MAJOR < 5
     dQ = combustion->dQ();
 #else
-    dQ = combustion->Qdot();
+    Qdot = combustion->Qdot();
 #endif
     label inertIndex = -1;
     volScalarField Yt(0.0*Y[0]);
@@ -76,4 +76,5 @@ tmp<fv::convectionScheme<scalar> > mvConvection
         Y[inertIndex].max(0.0);
     }
 }
+
 particleCloud.clockM().stop("Y");
diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H
index 64693a47..4cda15ee 100644
--- a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H
+++ b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H
@@ -230,6 +230,7 @@
     Info<< "Creating field kinetic energy K\n" << endl;
     volScalarField K("K", 0.5*magSqr(U));
 
+#if OPENFOAM_VERSION_MAJOR < 5
     volScalarField dQ
     (
         IOobject
@@ -243,6 +244,21 @@
         mesh,
         dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
     );
+#else
+    volScalarField Qdot
+    (
+        IOobject
+        (
+            "Qdot",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0)
+    );
+#endif
 
     Info<< "\nReading momentum exchange field Ksl\n" << endl;
     volScalarField Ksl