From 079a02437408456a733edd1b71ab14c9e92297f2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 10 Jun 2016 10:37:37 +0100
Subject: [PATCH] functionObjects::fieldValue: Added support for 'field' entry
 Added patchIntegrate configuration

---
 .../postProcessing/faceSource/patchAverage    |  6 ++++--
 .../postProcessing/faceSource/patchIntegrate  | 21 +++++++++++++++++++
 .../field/fieldValues/fieldValue/fieldValue.C | 16 +++++++++-----
 3 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 etc/caseDicts/postProcessing/faceSource/patchIntegrate

diff --git a/etc/caseDicts/postProcessing/faceSource/patchAverage b/etc/caseDicts/postProcessing/faceSource/patchAverage
index cab266e03c..25c03e5fcf 100644
--- a/etc/caseDicts/postProcessing/faceSource/patchAverage
+++ b/etc/caseDicts/postProcessing/faceSource/patchAverage
@@ -9,10 +9,12 @@
 patchAverage
 {
     patch  <patchName>;
-    fields (p);
+    fields (<field names>);
 
     operation average;
-    #includeEtc "caseDicts/postProcessing/faceSource/patchSource.cfg;"
+    #includeEtc "caseDicts/postProcessing/faceSource/patchSource.cfg"
+
+    log    true;
 }
 
 
diff --git a/etc/caseDicts/postProcessing/faceSource/patchIntegrate b/etc/caseDicts/postProcessing/faceSource/patchIntegrate
new file mode 100644
index 0000000000..6caffbb119
--- /dev/null
+++ b/etc/caseDicts/postProcessing/faceSource/patchIntegrate
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+patchIntegrate
+{
+    patch  <patchName>;
+    fields (<field names>);
+
+    operation areaIntegrate;
+    #includeEtc "caseDicts/postProcessing/faceSource/patchSource.cfg"
+
+    log    true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C
index a82b5b9954..9dda194126 100644
--- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C
+++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C
@@ -52,8 +52,6 @@ Foam::functionObjects::fieldValue::fieldValue
     writeFiles(name, runTime, dict, name),
     dict_(dict),
     sourceName_(word::null),
-    fields_(dict.lookup("fields")),
-    valueOutput_(dict.lookup("valueOutput")),
     resultDict_(fileName("name"), dictionary::null)
 {
     read(dict);
@@ -72,8 +70,6 @@ Foam::functionObjects::fieldValue::fieldValue
     writeFiles(name, obr, dict, name),
     dict_(dict),
     sourceName_(word::null),
-    fields_(dict.lookup("fields")),
-    valueOutput_(dict.lookup("valueOutput")),
     resultDict_(fileName("name"), dictionary::null)
 {
     read(dict);
@@ -93,7 +89,17 @@ bool Foam::functionObjects::fieldValue::read(const dictionary& dict)
 {
     dict_ = dict;
     writeFiles::read(dict);
-    dict.lookup("fields") >> fields_;
+
+    if (dict.found("field"))
+    {
+        fields_.setSize(1);
+        dict.lookup("field") >> fields_[0];
+    }
+    else if (dict.found("fields"))
+    {
+        dict.lookup("fields") >> fields_;
+    }
+
     dict.lookup("valueOutput") >> valueOutput_;
 
     return true;