COMP: avoid ambiguous construct from tmp - solvers/ lagrangian

applications/solvers/lagrangian/coalChemistryFoam/YEqn.H

@@ -12,7 +12,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
 {
     label inertIndex = -1;
-    volScalarField Yt = 0.0*Y[0];
+    volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
     {

applications/solvers/lagrangian/coalChemistryFoam/chemistry.H

@@ -10,10 +10,14 @@
     // turbulent time scale
     if (turbulentReaction)
     {
-        DimensionedField<scalar, volMesh> tk =
+        DimensionedField<scalar, volMesh> tk
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
+        (
-        DimensionedField<scalar, volMesh> tc =
+            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-            chemistry.tc()().dimensionedInternalField();
+        );
+        DimensionedField<scalar, volMesh> tc
+        (
+            chemistry.tc()().dimensionedInternalField()
+        );
 
         // Chalmers PaSR model
         kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);

applications/solvers/lagrangian/coalChemistryFoam/pEqn.H

@@ -1,6 +1,6 @@
 rho = thermo.rho();
 
-volScalarField rAU = 1.0/UEqn.A();
+volScalarField rAU(1.0/UEqn.A());
 U = rAU*UEqn.H();
 
 if (transonic)

applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H

@@ -51,7 +51,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    const volScalarField nu = laminarTransport.nu();
+    const volScalarField nu(laminarTransport.nu());
 
     autoPtr<incompressible::turbulenceModel> turbulence
     (

applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H

@@ -51,7 +51,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    const volScalarField nu = laminarTransport.nu();
+    const volScalarField nu(laminarTransport.nu());
 
     autoPtr<incompressible::turbulenceModel> turbulence
     (

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H

@@ -13,7 +13,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
 {
     label inertIndex = -1;
-    volScalarField Yt = 0.0*Y[0];
+    volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
     {

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H

@@ -10,10 +10,14 @@
     // turbulent time scale
     if (turbulentReaction)
     {
-        DimensionedField<scalar, volMesh> tk =
+        DimensionedField<scalar, volMesh> tk
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
+        (
-        DimensionedField<scalar, volMesh> tc =
+            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-            chemistry.tc()().dimensionedInternalField();
+        );
+        DimensionedField<scalar, volMesh> tc
+        (
+            chemistry.tc()().dimensionedInternalField()
+        );
 
         // Chalmers PaSR model
         kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H

@@ -5,7 +5,7 @@
     // pressure solution - done in 2 parts. Part 1:
     thermo.rho() -= psi*p;
 
-    volScalarField rAU = 1.0/UEqn.A();
+    volScalarField rAU(1.0/UEqn.A());
     U = rAU*UEqn.H();
 
     if (pZones.size() > 0)

applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H

@@ -12,7 +12,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
 {
     label inertIndex = -1;
-    volScalarField Yt = 0.0*Y[0];
+    volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
     {

applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H

@@ -10,10 +10,14 @@
     // turbulent time scale
     if (turbulentReaction)
     {
-        DimensionedField<scalar, volMesh> tk =
+        DimensionedField<scalar, volMesh> tk
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
+        (
-        DimensionedField<scalar, volMesh> tc =
+            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-            chemistry.tc()().dimensionedInternalField();
+        );
+        DimensionedField<scalar, volMesh> tc
+        (
+            chemistry.tc()().dimensionedInternalField()
+        );
 
         // Chalmers PaSR model
         kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);

applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H

@@ -1,6 +1,6 @@
 rho = thermo.rho();
 
-volScalarField rAU = 1.0/UEqn.A();
+volScalarField rAU(1.0/UEqn.A());
 U = rAU*UEqn.H();
 
 if (transonic)

applications/solvers/lagrangian/reactingParcelFoam/YEqn.H

@@ -12,7 +12,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
 {
     label inertIndex = -1;
-    volScalarField Yt = 0.0*Y[0];
+    volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
     {

applications/solvers/lagrangian/reactingParcelFoam/chemistry.H

@@ -10,10 +10,14 @@
     // turbulent time scale
     if (turbulentReaction)
     {
-        DimensionedField<scalar, volMesh> tk =
+        DimensionedField<scalar, volMesh> tk
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
+        (
-        DimensionedField<scalar, volMesh> tc =
+            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-            chemistry.tc()().dimensionedInternalField();
+        );
+        DimensionedField<scalar, volMesh> tc
+        (
+            chemistry.tc()().dimensionedInternalField()
+        );
 
         // Chalmers PaSR model
         kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);

applications/solvers/lagrangian/reactingParcelFoam/pEqn.H

@@ -1,6 +1,6 @@
 rho = thermo.rho();
 
-volScalarField rAU = 1.0/UEqn.A();
+volScalarField rAU(1.0/UEqn.A());
 U = rAU*UEqn.H();
 
 if (transonic)

applications/solvers/lagrangian/steadyReactingParcelFoam/YEqn.H

@@ -14,7 +14,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 if (solveSpecies)
 {
     label inertIndex = -1;
-    volScalarField Yt = 0.0*Y[0];
+    volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
     {

applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H

@@ -5,7 +5,7 @@
     // pressure solution - done in 2 parts. Part 1:
     thermo.rho() -= psi*p;
 
-    volScalarField rAU = 1.0/UEqn.A();
+    volScalarField rAU(1.0/UEqn.A());
     U = rAU*UEqn.H();
 
     if (pZones.size() > 0)

applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H

@@ -59,7 +59,8 @@ Info<< "Time scales min/max:" << endl;
 
         invTauFlow.max(1.0/maxDeltaT);
 
-        Info<< "    Flow        = " << gMin(1/invTauFlow.internalField()) << ", "
+        Info<< "    Flow        = "
+            << gMin(1/invTauFlow.internalField()) << ", "
             << gMax(1/invTauFlow.internalField()) << endl;
     }
 
@@ -68,13 +69,16 @@ Info<< "Time scales min/max:" << endl;
     // ~~~~~~~~~~~~~~~~~~~~~~
 
     {
-        scalarField tau =
+        scalarField tau
-            runTime.deltaTValue()*mag(parcels.Srho() + massSource.SuTot());
+        (
+            runTime.deltaTValue()*mag(parcels.Srho() + massSource.SuTot())
+        );
 
         tau = alphaTauRho*rho/(tau + ROOTVSMALL);
 
-        Info<< "    Density     = " << min(maxDeltaT, gMin(tau)) << ", "
+        Info<< "    Density     = "
-             << min(maxDeltaT, gMax(tau)) << endl;
+            << min(maxDeltaT, gMin(tau)) << ", "
+            << min(maxDeltaT, gMax(tau)) << endl;
 
         invTauFlow.internalField() = max(invTauFlow.internalField(), 1/tau);
     }
@@ -86,7 +90,8 @@ Info<< "Time scales min/max:" << endl;
     {
 /*
         // Method 1 - mag(U) limit using 'small' nominal velocity
-        scalarField tau =
+        scalarField tau
+        (
             runTime.deltaTValue()
            *mag
             (
@@ -94,7 +99,8 @@ Info<< "Time scales min/max:" << endl;
               + parcels.UTrans()/(mesh.V()*runTime.deltaT())
               + momentumSource.Su()
             )
-           /rho;
+           /rho
+        );
 
         const scalar nomMagU(dimensionedScalar("1", dimVelocity, 1));
         tau = alphaTauU*(nomMagU + mag(U))/(tau + ROOTVSMALL);
@@ -128,13 +134,15 @@ Info<< "Time scales min/max:" << endl;
             fvc::interpolate(runTime.deltaT()*UEqnRhs) & mesh.Sf()
         );
 
-        scalarField tau =
+        scalarField tau
+        (
             alphaTauU*rho
            /fvc::surfaceSum
             (
                 mag(phi + phiSU)*mesh.deltaCoeffs()/mesh.magSf()
               + dimensionedScalar("SMALL", dimDensity/dimTime, ROOTVSMALL)
-            );
+            )
+        );
 
 */
 /*
@@ -150,7 +158,8 @@ Info<< "Time scales min/max:" << endl;
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     {
-        scalarField tau =
+        scalarField tau
+        (
             runTime.deltaTValue()
            *mag
             (
@@ -159,7 +168,8 @@ Info<< "Time scales min/max:" << endl;
               + energySource.Su()
               + chemistrySh
             )
-           /rho;
+           /rho
+        );
 
         tau = alphaTauTemp*thermo.Cp()*T/(tau + ROOTVSMALL);
 
@@ -178,7 +188,8 @@ Info<< "Time scales min/max:" << endl;
         forAll(Y, fieldI)
         {
             const volScalarField& Yi = Y[fieldI];
-            const scalarField deltaYi =
+            const scalarField deltaYi
+            (
                 runTime.deltaTValue()
                *mag
                 (
@@ -186,7 +197,8 @@ Info<< "Time scales min/max:" << endl;
                   + massSource.Su(fieldI)
                   + parcels.Srho(fieldI)
                 )
-               /rho;
+               /rho
+            );
             tau =
                 min
                 (

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H

@@ -57,5 +57,7 @@
 
 
     Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt =
+    volScalarField DpDt
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+    (
+        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
+    );

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H

@@ -1,6 +1,6 @@
 rho = thermo.rho();
 
-volScalarField rAU = 1.0/UEqn.A();
+volScalarField rAU(1.0/UEqn.A());
 U = rAU*UEqn.H();
 
 if (transonic)