From 27715169021806805253d146436fb164175f89b6 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 30 Jul 2014 14:55:36 +0100
Subject: [PATCH 1/8] ENH: AMI - early exit if no source faces present

---
 .../AMIInterpolation/AMIInterpolation.C               | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 2440c1f8..ea79e069 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -805,6 +805,17 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
     label srcTotalSize = returnReduce(srcPatch.size(), sumOp<label>());
     label tgtTotalSize = returnReduce(tgtPatch.size(), sumOp<label>());
 
+    if (srcTotalSize == 0)
+    {
+        if (debug)
+        {
+            Info<< "AMI: no source faces present - no addressing constructed"
+                << endl;
+        }
+
+        return;
+    }
+
     Info<< indent
         << "AMI: Creating addressing and weights between "
         << srcTotalSize << " source faces and "

From 4052d2fec0c7e790074adcb7d80342e668bfc312 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 4 Aug 2014 15:50:14 +0100
Subject: [PATCH 2/8] ENH: Radiation P-1 model - added protection for divide by
 zero

---
 .../radiationModels/radiationModel/P1/P1.C                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
index 6a8bafa9..546a0da8 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,6 +217,8 @@ void Foam::radiation::P1::calculate()
     E_ = absorptionEmission_->E();
     const volScalarField sigmaEff(scatter_->sigmaEff());
 
+    const dimensionedScalar a0 ("a0", a_.dimensions(), ROOTVSMALL);
+
     // Construct diffusion
     const volScalarField gamma
     (
@@ -228,7 +230,7 @@ void Foam::radiation::P1::calculate()
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        1.0/(3.0*a_ + sigmaEff)
+        1.0/(3.0*a_ + sigmaEff + a0)
     );
 
     // Solve G transport equation

From 941999150704877d5b2ace6c9d2e937d2c895087 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 5 Aug 2014 15:25:14 +0100
Subject: [PATCH 3/8] BUG: faceSource: #1364

---
 .../field/fieldValues/faceSource/faceSource.C  | 18 ++++++++++++++++--
 .../faceSource/faceSourceTemplates.C           | 16 ++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index 5a862378..83e56780 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -444,6 +444,20 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
     if (dict.readIfPresent("weightField", weightFieldName_))
     {
         Info<< "    weight field = " << weightFieldName_ << nl;
+
+        if (source_ == stSampledSurface)
+        {
+            FatalIOErrorIn
+            (
+                "void Foam::fieldValues::faceSource::initialise"
+                "("
+                    "const dictionary&"
+                ")",
+                dict
+            )
+                << "Cannot use weightField for a sampledSurface"
+                << exit(FatalIOError);
+        }
     }
 
     if (dict.found("orientedWeightField"))
@@ -664,8 +678,8 @@ void Foam::fieldValues::faceSource::write()
             file() << obr_.time().value() << tab << totalArea;
         }
 
-        // construct weight field
-        scalarField weightField(faceId_.size(), 1.0);
+        // construct weight field. Note: zero size means weight = 1
+        scalarField weightField;
         if (weightFieldName_ != "none")
         {
             weightField =
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index 584a0e03..ec5b8934 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -195,7 +195,14 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
         }
         case opWeightedAverage:
         {
-            result = sum(values)/sum(weightField);
+            if (weightField.size())
+            {
+                result = sum(values)/sum(weightField);
+            }
+            else
+            {
+                result = sum(values)/values.size();
+            }
             break;
         }
         case opAreaAverage:
@@ -329,8 +336,13 @@ bool Foam::fieldValues::faceSource::writeValues
             }
         }
 
+
         // apply scale factor and weight field
-        values *= scaleFactor_*weightField;
+        values *= scaleFactor_;
+        if (weightField.size())
+        {
+            values *= weightField;
+        }
 
         if (Pstream::master())
         {

From e859f35a6d88397840f060eb3ca30f1cb28eab86 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 6 Aug 2014 10:47:59 +0100
Subject: [PATCH 4/8] BUG: turbulenceFields function object - removed execute
 from read ENH: turbulenceFields function object - Updated usage documentation

---
 .../utilities/turbulenceFields/postProcessingDict           | 2 +-
 .../utilities/turbulenceFields/turbulenceFields.C           | 4 +---
 .../utilities/turbulenceFields/turbulenceFields.H           | 6 +++---
 .../utilities/turbulenceFields/turbulenceFieldsTemplates.C  | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
index 4b817216..931c6ccf 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
@@ -19,7 +19,7 @@ functions
     turbulenceFields1
     {
         type            turbulenceFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        functionObjectLibs ("libutilityFunctionObjects.so");
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
index 9f25e517..3d89600c 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
@@ -143,7 +143,7 @@ void Foam::turbulenceFields::read(const dictionary& dict)
             Info<< "storing fields:" << nl;
             forAllConstIter(wordHashSet, fieldSet_, iter)
             {
-                Info<< "    " << modelName << '.' << iter.key() << nl;
+                Info<< "    " << modelName << ':' << iter.key() << nl;
             }
             Info<< endl;
         }
@@ -151,8 +151,6 @@ void Foam::turbulenceFields::read(const dictionary& dict)
         {
             Info<< "no fields requested to be stored" << nl << endl;
         }
-
-        execute();
     }
 }
 
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index 2ff4476d..45e581ce 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -32,16 +32,16 @@ Description
     further manipulation.
 
     Fields are stored as copies of the original, with the prefix
-    "tubulenceModel::", e.g.
+    "tubulenceModel:", e.g.
 
-        turbulenceModel::R
+        turbulenceModel:R
 
     Example of function object specification:
     \verbatim
     turbulenceFields1
     {
         type        turbulenceFields;
-        functionObjectLibs ("libfieldFunctionObjects.so");
+        functionObjectLibs ("libutilityFunctionObjects.so");
         ...
         fields
         (
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
index a3bcd713..0d067cc1 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
@@ -36,7 +36,7 @@ void Foam::turbulenceFields::processField
 {
     typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
 
-    const word scopedName = modelName + '.' + fieldName;
+    const word scopedName = modelName + ':' + fieldName;
 
     if (obr_.foundObject<FieldType>(scopedName))
     {

From f7fee26a16894011f16cc336b06bd11a9b0d399b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 6 Aug 2014 17:00:25 +0100
Subject: [PATCH 5/8] ENH: refineHexMesh: add -region option

---
 .../mesh/advanced/refineHexMesh/refineHexMesh.C       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index 1f91954e..dc797fdc 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -53,7 +53,8 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-#   include "addOverwriteOption.H"
+    #include "addOverwriteOption.H"
+    #include "addRegionOption.H"
     argList::validArgs.append("cellSet");
     argList::addBoolOption
     (
@@ -62,10 +63,10 @@ int main(int argc, char *argv[])
         " (default is to extend set)"
     );
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+    #include "setRootCase.H"
+    #include "createTime.H"
     runTime.functionObjects().off();
-#   include "createMesh.H"
+    #include "createNamedMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
     word cellSetName(args.args()[1]);
@@ -181,7 +182,7 @@ int main(int argc, char *argv[])
         mesh.movePoints(map().preMotionPoints());
     }
 
-    Pout<< "Refined from " << returnReduce(map().nOldCells(), sumOp<label>())
+    Info<< "Refined from " << returnReduce(map().nOldCells(), sumOp<label>())
         << " to " << mesh.globalData().nTotalCells() << " cells." << nl << endl;
 
     if (overwrite)

From b9839e576d57f1ad96da36b681db2da81daf36b2 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 8 Aug 2014 10:26:47 +0100
Subject: [PATCH 6/8] uniformFixedGradientFvPatchField: Correct constructor to
 initialize patch field Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1368

---
 .../inletOutletTotalTemperatureFvPatchScalarField.C             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index a1c7e2ad..607f8893 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -77,7 +77,7 @@ inletOutletTotalTemperatureFvPatchScalarField
 :
     inletOutletFvPatchScalarField(p, iF),
     UName_(dict.lookupOrDefault<word>("U", "U")),
-    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
     gamma_(readScalar(dict.lookup("gamma"))),
     T0_("T0", dict, p.size())
 {

From 3ad9f0cb628817b4016509ceef6952c7c0e80990 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 13 Aug 2014 17:16:21 +0100
Subject: [PATCH 7/8] ENH: patchSummary: support point fields

---
 .../miscellaneous/patchSummary/patchSummary.C | 89 +++++++++++++------
 .../patchSummary/patchSummaryTemplates.C      | 27 +++---
 .../patchSummary/patchSummaryTemplates.H      | 16 ++--
 3 files changed, 85 insertions(+), 47 deletions(-)

diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
index e26fc109..01b2137f 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,7 @@ Description
 
 #include "fvCFD.H"
 #include "volFields.H"
+#include "pointFields.H"
 #include "IOobjectList.H"
 #include "patchSummaryTemplates.H"
 
@@ -87,6 +88,12 @@ int main(int argc, char *argv[])
         PtrList<volSymmTensorField> vsytf(objNames.size());
         PtrList<volTensorField> vtf(objNames.size());
 
+        PtrList<pointScalarField> psf(objNames.size());
+        PtrList<pointVectorField> pvf(objNames.size());
+        PtrList<pointSphericalTensorField> psptf(objNames.size());
+        PtrList<pointSymmTensorField> psytf(objNames.size());
+        PtrList<pointTensorField> ptf(objNames.size());
+
         Info<< "Valid fields:" << endl;
 
         forAll(objNames, objI)
@@ -101,11 +108,17 @@ int main(int argc, char *argv[])
 
             if (obj.headerOk())
             {
-                addToFieldList<scalar>(vsf, obj, objI, mesh);
-                addToFieldList<vector>(vvf, obj, objI, mesh);
-                addToFieldList<sphericalTensor>(vsptf, obj, objI, mesh);
-                addToFieldList<symmTensor>(vsytf, obj, objI, mesh);
-                addToFieldList<tensor>(vtf, obj, objI, mesh);
+                addToFieldList(vsf, obj, objI, mesh);
+                addToFieldList(vvf, obj, objI, mesh);
+                addToFieldList(vsptf, obj, objI, mesh);
+                addToFieldList(vsytf, obj, objI, mesh);
+                addToFieldList(vtf, obj, objI, mesh);
+
+                addToFieldList(psf, obj, objI, pointMesh::New(mesh));
+                addToFieldList(pvf, obj, objI, pointMesh::New(mesh));
+                addToFieldList(psptf, obj, objI, pointMesh::New(mesh));
+                addToFieldList(psytf, obj, objI, pointMesh::New(mesh));
+                addToFieldList(ptf, obj, objI, pointMesh::New(mesh));
             }
         }
 
@@ -119,11 +132,17 @@ int main(int argc, char *argv[])
             forAll(bm, patchI)
             {
                 Info<< bm[patchI].type() << "\t: " << bm[patchI].name() << nl;
-                outputFieldList<scalar>(vsf, patchI);
-                outputFieldList<vector>(vvf, patchI);
-                outputFieldList<sphericalTensor>(vsptf, patchI);
-                outputFieldList<symmTensor>(vsytf, patchI);
-                outputFieldList<tensor>(vtf, patchI);
+                outputFieldList(vsf, patchI);
+                outputFieldList(vvf, patchI);
+                outputFieldList(vsptf, patchI);
+                outputFieldList(vsytf, patchI);
+                outputFieldList(vtf, patchI);
+
+                outputFieldList(psf, patchI);
+                outputFieldList(pvf, patchI);
+                outputFieldList(psptf, patchI);
+                outputFieldList(psytf, patchI);
+                outputFieldList(ptf, patchI);
                 Info<< endl;
             }
         }
@@ -139,11 +158,17 @@ int main(int argc, char *argv[])
             forAll(bm, patchI)
             {
                 HashTable<word> fieldToType;
-                collectFieldList<scalar>(vsf, patchI, fieldToType);
-                collectFieldList<vector>(vvf, patchI, fieldToType);
-                collectFieldList<sphericalTensor>(vsptf, patchI, fieldToType);
-                collectFieldList<symmTensor>(vsytf, patchI, fieldToType);
-                collectFieldList<tensor>(vtf, patchI, fieldToType);
+                collectFieldList(vsf, patchI, fieldToType);
+                collectFieldList(vvf, patchI, fieldToType);
+                collectFieldList(vsptf, patchI, fieldToType);
+                collectFieldList(vsytf, patchI, fieldToType);
+                collectFieldList(vtf, patchI, fieldToType);
+
+                collectFieldList(psf, patchI, fieldToType);
+                collectFieldList(pvf, patchI, fieldToType);
+                collectFieldList(psptf, patchI, fieldToType);
+                collectFieldList(psytf, patchI, fieldToType);
+                collectFieldList(ptf, patchI, fieldToType);
 
                 label groupI = findIndex(fieldToTypes, fieldToType);
                 if (groupI == -1)
@@ -184,11 +209,17 @@ int main(int argc, char *argv[])
                             Info<< "group\t: " << groups[i] << nl;
                         }
                     }
-                    outputFieldList<scalar>(vsf, patchIDs[0]);
-                    outputFieldList<vector>(vvf, patchIDs[0]);
-                    outputFieldList<sphericalTensor>(vsptf, patchIDs[0]);
-                    outputFieldList<symmTensor>(vsytf, patchIDs[0]);
-                    outputFieldList<tensor>(vtf, patchIDs[0]);
+                    outputFieldList(vsf, patchIDs[0]);
+                    outputFieldList(vvf, patchIDs[0]);
+                    outputFieldList(vsptf, patchIDs[0]);
+                    outputFieldList(vsytf, patchIDs[0]);
+                    outputFieldList(vtf, patchIDs[0]);
+
+                    outputFieldList(psf, patchIDs[0]);
+                    outputFieldList(pvf, patchIDs[0]);
+                    outputFieldList(psptf, patchIDs[0]);
+                    outputFieldList(psytf, patchIDs[0]);
+                    outputFieldList(ptf, patchIDs[0]);
                     Info<< endl;
                 }
                 else
@@ -199,11 +230,17 @@ int main(int argc, char *argv[])
                         label patchI = patchIDs[i];
                         Info<< bm[patchI].type()
                             << "\t: " << bm[patchI].name() << nl;
-                        outputFieldList<scalar>(vsf, patchI);
-                        outputFieldList<vector>(vvf, patchI);
-                        outputFieldList<sphericalTensor>(vsptf, patchI);
-                        outputFieldList<symmTensor>(vsytf, patchI);
-                        outputFieldList<tensor>(vtf, patchI);
+                        outputFieldList(vsf, patchI);
+                        outputFieldList(vvf, patchI);
+                        outputFieldList(vsptf, patchI);
+                        outputFieldList(vsytf, patchI);
+                        outputFieldList(vtf, patchI);
+
+                        outputFieldList(psf, patchI);
+                        outputFieldList(pvf, patchI);
+                        outputFieldList(psptf, patchI);
+                        outputFieldList(psytf, patchI);
+                        outputFieldList(ptf, patchI);
                         Info<< endl;
                     }
                 }
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
index bc0eee1e..4f130eed 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,33 +28,33 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type>
+template<class GeoField>
 void Foam::addToFieldList
 (
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& fieldList,
+    PtrList<GeoField>& fieldList,
     const IOobject& obj,
     const label fieldI,
-    const fvMesh& mesh
+    const typename GeoField::Mesh& mesh
 )
 {
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+    typedef GeoField fieldType;
 
-    if (obj.headerClassName() == fieldType::typeName)
+    if (obj.headerClassName() == GeoField::typeName)
     {
         fieldList.set
         (
             fieldI,
-            new fieldType(obj, mesh)
+            new GeoField(obj, mesh)
         );
-        Info<< "    " << fieldType::typeName << tab << obj.name() << endl;
+        Info<< "    " << GeoField::typeName << tab << obj.name() << endl;
     }
 }
 
 
-template<class Type>
+template<class GeoField>
 void Foam::outputFieldList
 (
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& fieldList,
+    const PtrList<GeoField>& fieldList,
     const label patchI
 )
 {
@@ -62,7 +62,8 @@ void Foam::outputFieldList
     {
         if (fieldList.set(fieldI))
         {
-            Info<< "    " << pTraits<Type>::typeName << tab << tab
+            Info<< "    " << pTraits<typename GeoField::value_type>::typeName
+                << tab << tab
                 << fieldList[fieldI].name() << tab << tab
                 << fieldList[fieldI].boundaryField()[patchI].type() << nl;
         }
@@ -70,10 +71,10 @@ void Foam::outputFieldList
 }
 
 
-template<class Type>
+template<class GeoField>
 void Foam::collectFieldList
 (
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& fieldList,
+    const PtrList<GeoField>& fieldList,
     const label patchI,
     HashTable<word>& fieldToType
 )
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H
index d61a416a..8689ed84 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,26 +33,26 @@ License
 
 namespace Foam
 {
-    template<class Type>
+    template<class GeoField>
     void addToFieldList
     (
-        PtrList<GeometricField<Type, fvPatchField, volMesh> >& fieldList,
+        PtrList<GeoField>& fieldList,
         const IOobject& obj,
         const label fieldI,
-        const fvMesh& mesh
+        const typename GeoField::Mesh& mesh
     );
 
-    template<class Type>
+    template<class GeoField>
     void outputFieldList
     (
-        const PtrList<GeometricField<Type, fvPatchField, volMesh> >& fieldList,
+        const PtrList<GeoField>& fieldList,
         const label patchI
     );
 
-    template<class Type>
+    template<class GeoField>
     void collectFieldList
     (
-        const PtrList<GeometricField<Type, fvPatchField, volMesh> >& fieldList,
+        const PtrList<GeoField>& fieldList,
         const label patchI,
         HashTable<word>& fieldToType
     );

From f41ec09b3ed1b715e570618cc4ef1da6b1692545 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 14 Aug 2014 11:15:16 +0100
Subject: [PATCH 8/8] BUG: mapNearest: fix re-start

---
 .../AMIMethod/mapNearestAMI/mapNearestAMI.C               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
index 59d8c5cd..4f4f8e5a 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
@@ -97,11 +97,13 @@ void Foam::mapNearestAMI<SourcePatch, TargetPatch>::setNextNearestFaces
         }
     }
 
-    forAll(mapFlag, srcFaceI)
+    forAll(mapFlag, faceI)
     {
-        if (!mapFlag[srcFaceI])
+        if (mapFlag[faceI])
         {
-            tgtFaceI = this->findTargetFace(srcFaceI);
+            srcFaceI = faceI;
+            tgtFaceI = this->findTargetFace(faceI);
+
             if (tgtFaceI == -1)
             {
                 const vectorField& srcCf = this->srcPatch_.faceCentres();