From 91b6f37c731d8e8d16ba624b098f0cf7643b8ae3 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 7 Jul 2017 11:49:14 +0100
Subject: [PATCH] ENH: wallHeatFlux FO - removed hard-coding of qr name

---
 src/functionObjects/field/wallHeatFlux/wallHeatFlux.C | 9 ++++++---
 src/functionObjects/field/wallHeatFlux/wallHeatFlux.H | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
index e41c11de1e..c0b7ea4f51 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
@@ -75,9 +75,9 @@ void Foam::functionObjects::wallHeatFlux::calcHeatFlux
         wallHeatFluxBf[patchi] = heatFluxBf[patchi];
     }
 
-    if (foundObject<volScalarField>("qr"))
+    if (foundObject<volScalarField>(qrName_))
     {
-        const volScalarField& qr = lookupObject<volScalarField>("qr");
+        const volScalarField& qr = lookupObject<volScalarField>(qrName_);
 
         const volScalarField::Boundary& radHeatFluxBf = qr.boundaryField();
 
@@ -100,7 +100,8 @@ Foam::functionObjects::wallHeatFlux::wallHeatFlux
 :
     fvMeshFunctionObject(name, runTime, dict),
     writeFile(obr_, name, typeName, dict),
-    patchSet_()
+    patchSet_(),
+    qrName_("qr")
 {
     volScalarField* wallHeatFluxPtr
     (
@@ -148,6 +149,8 @@ bool Foam::functionObjects::wallHeatFlux::read(const dictionary& dict)
             wordReList(dict.lookupOrDefault("patches", wordReList()))
         );
 
+    dict.readIfPresent("qr", qrName_);
+
     Info<< type() << " " << name() << ":" << nl;
 
     if (patchSet_.empty())
diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
index fbf459c7ca..c5530f057e 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H
@@ -51,6 +51,7 @@ Usage
         Property | Description                | Required   | Default value
         type     | type name: wallHeatFlux    | yes        |
         patches  | list of patches to process | no         | all wall patches
+        qr       | name of radiative heat flux field | no  | qr
     \endtable
 
 See also
@@ -96,6 +97,9 @@ protected:
         //- Optional list of patches to process
         labelHashSet patchSet_;
 
+        //- Name of radiative heat flux name, default = qr
+        word qrName_;
+
 
     // Protected Member Functions