From eb79a51fa6a059b3cc253b22b3f9d07f6a8a44b0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 22 May 2016 17:07:53 +0100
Subject: [PATCH] fvcCellReduce: Correct signature and implementation of
 'cellReduce' of a 'tmp' field

---
 .../finiteVolume/fvc/fvcCellReduce.C          | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index 19753c8eba..de0119fe46 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -31,18 +31,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace fvc
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 template<class Type, class CombineOp>
-tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
+Foam::fvc::cellReduce
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf,
     const CombineOp& cop
@@ -93,14 +84,14 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
 
 
 template<class Type, class CombineOp>
-tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
+Foam::fvc::cellReduce
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>&> tssf,
+    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf,
     const CombineOp& cop
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>>
-        tvf(cellReduce(cop, tssf));
+    tmp<GeometricField<Type, fvPatchField, volMesh>> tvf(cellReduce(tssf, cop));
 
     tssf.clear();
 
@@ -108,12 +99,4 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace fvc
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //