From c4bbc00dd3bfb4bd9251d394b678539ff731a3fa Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 17 Dec 2010 17:00:21 +0100
Subject: [PATCH] COMP: avoid ambiguous construct from tmp - fvMatrices, fvMesh

---
 src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C      |  6 +++---
 src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C |  2 +-
 .../fvMatrices/solvers/MULES/MULESTemplates.C        |  8 ++++----
 .../fvPatches/constraint/cyclic/cyclicFvPatch.C      | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index cbcb357441..a5c2933949 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -735,7 +735,7 @@ Foam::fvMatrix<Type>::H() const
     // Loop over field components
     for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
     {
-        scalarField psiCmpt = psi_.internalField().component(cmpt);
+        scalarField psiCmpt(psi_.internalField().component(cmpt));
 
         scalarField boundaryDiagCmpt(psi_.size(), 0.0);
         addBoundaryDiag(boundaryDiagCmpt, cmpt);
@@ -802,7 +802,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
     /*
     for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
     {
-        scalarField psiCmpt = psi_.internalField().component(cmpt);
+        scalarField psiCmpt(psi_.internalField().component(cmpt));
 
         scalarField boundaryDiagCmpt(psi_.size(), 0.0);
         addBoundaryDiag(boundaryDiagCmpt, cmpt);
@@ -2259,7 +2259,7 @@ Foam::operator&
     // Loop over field components
     for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
     {
-        scalarField psiCmpt = psi.field().component(cmpt);
+        scalarField psiCmpt(psi.field().component(cmpt));
         scalarField boundaryDiagCmpt(M.diag());
         M.addBoundaryDiag(boundaryDiagCmpt, cmpt);
         Mphi.internalField().replace(cmpt, -boundaryDiagCmpt*psiCmpt);
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index 7c3baeebca..0b6f3f7d69 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -98,7 +98,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
         scalarField psiCmpt(psi.internalField().component(cmpt));
         addBoundaryDiag(diag(), cmpt);
 
-        scalarField sourceCmpt = source.component(cmpt);
+        scalarField sourceCmpt(source.component(cmpt));
 
         FieldField<Field, scalar> bouCoeffsCmpt
         (
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index eafec93b65..964c55f717 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -56,7 +56,7 @@ void Foam::MULES::explicitSolve
     const fvMesh& mesh = psi.mesh();
     psi.correctBoundaryConditions();
 
-    surfaceScalarField phiBD = upwind<scalar>(psi.mesh(), phi).flux(psi);
+    surfaceScalarField phiBD(upwind<scalar>(psi.mesh(), phi).flux(psi));
 
     surfaceScalarField& phiCorr = phiPsi;
     phiCorr -= phiBD;
@@ -167,7 +167,7 @@ void Foam::MULES::implicitSolve
     scalarField allCoLambda(mesh.nFaces());
 
     {
-        surfaceScalarField Cof =
+        tmp<surfaceScalarField> Cof =
             mesh.time().deltaT()*mesh.surfaceInterpolation::deltaCoeffs()
            *mag(phi)/mesh.magSf();
 
@@ -225,7 +225,7 @@ void Foam::MULES::implicitSolve
       - Su
     );
 
-    surfaceScalarField phiBD = psiConvectionDiffusion.flux();
+    surfaceScalarField phiBD(psiConvectionDiffusion.flux());
 
     surfaceScalarField& phiCorr = phiPsi;
     phiCorr -= phiBD;
@@ -405,7 +405,7 @@ void Foam::MULES::limiter
 
         if (psiPf.coupled())
         {
-            scalarField psiPNf = psiPf.patchNeighbourField();
+            const scalarField psiPNf(psiPf.patchNeighbourField());
 
             forAll(phiCorrPf, pFacei)
             {
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
index d5b149ecff..89149a06b7 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
@@ -47,8 +47,8 @@ void Foam::cyclicFvPatch::makeWeights(scalarField& w) const
     const scalarField& magFa = magSf();
     const scalarField& nbrMagFa = nbrPatch.magSf();
 
-    scalarField deltas = nf() & fvPatch::delta();
-    scalarField nbrDeltas = nbrPatch.nf() & nbrPatch.fvPatch::delta();
+    const scalarField deltas(nf() & fvPatch::delta());
+    const scalarField nbrDeltas(nbrPatch.nf() & nbrPatch.fvPatch::delta());
 
     forAll(magFa, facei)
     {
@@ -77,8 +77,8 @@ void Foam::cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const
     //const cyclicPolyPatch& nbrPatch = cyclicPolyPatch_.neighbPatch();
     const cyclicFvPatch& nbrPatch = neighbFvPatch();
 
-    scalarField deltas = nf() & fvPatch::delta();
-    scalarField nbrDeltas = nbrPatch.nf() & nbrPatch.fvPatch::delta();
+    const scalarField deltas(nf() & fvPatch::delta());
+    const scalarField nbrDeltas(nbrPatch.nf() & nbrPatch.fvPatch::delta());
 
     forAll(deltas, facei)
     {
@@ -93,8 +93,8 @@ void Foam::cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const
 // Return delta (P to N) vectors across coupled patch
 Foam::tmp<Foam::vectorField> Foam::cyclicFvPatch::delta() const
 {
-    vectorField patchD = fvPatch::delta();
-    vectorField nbrPatchD = neighbFvPatch().fvPatch::delta();
+    const vectorField patchD(fvPatch::delta());
+    const vectorField nbrPatchD(neighbFvPatch().fvPatch::delta());
 
     tmp<vectorField> tpdv(new vectorField(patchD.size()));
     vectorField& pdv = tpdv();