From a494ec35a17bb1ecce7383fc7aba66bbbd7c6189 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 21 Dec 2010 09:44:19 +0100 Subject: [PATCH] COMP: avoid ambiguous construct from tmp - finiteVolume, thermophysicalModels, turbulenceModels - missed on these on the first sweep --- src/dynamicFvMesh/include/meshCourantNo.H | 6 ++++-- .../cfdTools/compressible/compressibleCourantNo.H | 6 ++++-- .../SRFVelocityFvPatchVectorField.C | 2 +- src/finiteVolume/cfdTools/incompressible/CourantNo.H | 6 ++++-- .../cfdTools/incompressible/continuityErrs.H | 2 +- .../movingWallVelocityFvPatchVectorField.C | 6 ++++-- .../ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C | 6 +++--- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C | 6 +++--- src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C | 6 +++--- .../fvMatrices/fvScalarMatrix/fvScalarMatrix.C | 10 +++++----- ...wideBandDiffusiveRadiationMixedFvPatchScalarField.C | 6 ++++-- .../incompressible/LES/Smagorinsky2/Smagorinsky2.C | 4 ++-- 12 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/dynamicFvMesh/include/meshCourantNo.H b/src/dynamicFvMesh/include/meshCourantNo.H index 501611db18..ad8f679657 100644 --- a/src/dynamicFvMesh/include/meshCourantNo.H +++ b/src/dynamicFvMesh/include/meshCourantNo.H @@ -34,8 +34,10 @@ scalar meanMeshCoNum = 0.0; if (mesh.nInternalFaces()) { - scalarField sumPhi = - fvc::surfaceSum(mag(mesh.phi()))().internalField(); + scalarField sumPhi + ( + fvc::surfaceSum(mag(mesh.phi()))().internalField() + ); meshCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H b/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H index c96ddeb22f..cd5e92ed3d 100644 --- a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H +++ b/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H @@ -34,9 +34,11 @@ scalar meanCoNum = 0.0; if (mesh.nInternalFaces()) { - scalarField sumPhi = + scalarField sumPhi + ( fvc::surfaceSum(mag(phi))().internalField() - /rho.internalField(); + / rho.internalField() + ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C index 177a6ce049..2f00ad181e 100644 --- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C @@ -137,7 +137,7 @@ void Foam::SRFVelocityFvPatchVectorField::updateCoeffs() db().lookupObject("SRFProperties"); // Determine patch velocity due to SRF - const vectorField SRFVelocity = srf.velocity(patch().Cf()); + const vectorField SRFVelocity(srf.velocity(patch().Cf())); operator==(-SRFVelocity + inletValue_); } diff --git a/src/finiteVolume/cfdTools/incompressible/CourantNo.H b/src/finiteVolume/cfdTools/incompressible/CourantNo.H index 8b917e1f89..d5198141a3 100644 --- a/src/finiteVolume/cfdTools/incompressible/CourantNo.H +++ b/src/finiteVolume/cfdTools/incompressible/CourantNo.H @@ -34,8 +34,10 @@ scalar meanCoNum = 0.0; if (mesh.nInternalFaces()) { - scalarField sumPhi = - fvc::surfaceSum(mag(phi))().internalField(); + scalarField sumPhi + ( + fvc::surfaceSum(mag(phi))().internalField() + ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/src/finiteVolume/cfdTools/incompressible/continuityErrs.H b/src/finiteVolume/cfdTools/incompressible/continuityErrs.H index 181cd251eb..06287750bd 100644 --- a/src/finiteVolume/cfdTools/incompressible/continuityErrs.H +++ b/src/finiteVolume/cfdTools/incompressible/continuityErrs.H @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ { - volScalarField contErr = fvc::div(phi); + volScalarField contErr(fvc::div(phi)); scalar sumLocalContErr = runTime.deltaTValue()* mag(contErr)().weightedAverage(mesh.V()).value(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C index 89e9cf9dc3..aefa37b8f5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C @@ -120,8 +120,10 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs() const vectorField Up((pp.faceCentres() - oldFc)/mesh.time().deltaTValue()); const volVectorField& U = db().lookupObject(UName_); - scalarField phip = - p.patchField(fvc::meshPhi(U)); + scalarField phip + ( + p.patchField(fvc::meshPhi(U)) + ); const vectorField n(p.nf()); const scalarField& magSf = p.magSf(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C index 691522364c..2c0e5f1e0b 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C @@ -382,7 +382,7 @@ CoEulerDdtScheme::fvmDdt fvMatrix& fvm = tfvm(); - scalarField rDeltaT = CorDeltaT()().internalField(); + scalarField rDeltaT(CorDeltaT()().internalField()); fvm.diag() = rDeltaT*mesh().V(); @@ -417,7 +417,7 @@ CoEulerDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm(); - scalarField rDeltaT = CorDeltaT()().internalField(); + scalarField rDeltaT(CorDeltaT()().internalField()); fvm.diag() = rDeltaT*rho.value()*mesh().V(); @@ -454,7 +454,7 @@ CoEulerDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm(); - scalarField rDeltaT = CorDeltaT()().internalField(); + scalarField rDeltaT(CorDeltaT()().internalField()); fvm.diag() = rDeltaT*rho.internalField()*mesh().V(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C index 567df96452..af50dc93ce 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C @@ -385,7 +385,7 @@ SLTSDdtScheme::fvmDdt fvMatrix& fvm = tfvm(); - scalarField rDeltaT = SLrDeltaT()().internalField(); + scalarField rDeltaT(SLrDeltaT()().internalField()); Info<< "max/min rDeltaT " << max(rDeltaT) << " " << min(rDeltaT) << endl; @@ -422,7 +422,7 @@ SLTSDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm(); - scalarField rDeltaT = SLrDeltaT()().internalField(); + scalarField rDeltaT(SLrDeltaT()().internalField()); fvm.diag() = rDeltaT*rho.value()*mesh().V(); @@ -459,7 +459,7 @@ SLTSDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm(); - scalarField rDeltaT = SLrDeltaT()().internalField(); + scalarField rDeltaT(SLrDeltaT()().internalField()); fvm.diag() = rDeltaT*rho.internalField()*mesh().V(); diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C index 0b6f3f7d69..bc320829cd 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C @@ -71,9 +71,9 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix::solve psi.name() ); - scalarField saveDiag = diag(); + scalarField saveDiag(diag()); - Field source = source_; + Field source(source_); // At this point include the boundary source from the coupled boundaries. // This is corrected for the implict part by updateMatrixInterfaces within @@ -227,7 +227,7 @@ Foam::tmp > Foam::fvMatrix::residual() const // Loop over field components for (direction cmpt=0; cmpt::solver << endl; } - scalarField saveDiag = diag(); + scalarField saveDiag(diag()); addBoundaryDiag(diag(), 0); autoPtr::fvSolver> solverPtr @@ -102,10 +102,10 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix::fvSolver::solve const_cast&> (fvMat_.psi()); - scalarField saveDiag = fvMat_.diag(); + scalarField saveDiag(fvMat_.diag()); fvMat_.addBoundaryDiag(fvMat_.diag(), 0); - scalarField totalSource = fvMat_.source(); + scalarField totalSource(fvMat_.source()); fvMat_.addBoundarySource(totalSource, false); // assign new solver controls @@ -145,10 +145,10 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix::solve GeometricField& psi = const_cast&>(psi_); - scalarField saveDiag = diag(); + scalarField saveDiag(diag()); addBoundaryDiag(diag(), 0); - scalarField totalSource = source_; + scalarField totalSource(source_); addBoundarySource(totalSource, false); // Solver call diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index e18684d9f4..8de1c8a2b2 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -169,8 +169,10 @@ updateCoeffs() ray.Qr().boundaryField()[patchI] += Iw*(n & ray.dAve()); - const scalarField Eb = - dom.blackBody().bLambda(lambdaId).boundaryField()[patchI]; + const scalarField Eb + ( + dom.blackBody().bLambda(lambdaId).boundaryField()[patchI] + ); forAll(Iw, faceI) { diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C index 95574f28ef..cfd9e55058 100644 --- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C +++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C @@ -75,7 +75,7 @@ Smagorinsky2::Smagorinsky2 tmp Smagorinsky2::B() const { - volSymmTensorField D = dev(symm(fvc::grad(U()))); + volSymmTensorField D(dev(symm(fvc::grad(U())))); return (((2.0/3.0)*I)*k() - 2.0*nuSgs_*D - (2.0*cD2_)*delta()*(D&D)); } @@ -86,7 +86,7 @@ tmp Smagorinsky2::divDevBeff volVectorField& U ) const { - volTensorField gradU = fvc::grad(U); + volTensorField gradU(fvc::grad(U)); volSymmTensorField aniNuEff (