From 4a8b8294e4f8e6533a3a3fa9083a43280081ec5a Mon Sep 17 00:00:00 2001 From: David Blom Date: Wed, 13 Apr 2016 13:53:45 +0200 Subject: [PATCH] Fix several errors of the clang static analyzer (#242) --- src/fsi/fluidSolvers/SDCFluidSolver.C | 20 +++++++------- src/fsi/fluidSolvers/SteadyStateFluidSolver.C | 26 +++++++++---------- src/fsi/solidSolvers/SolidSolver.C | 6 ++--- src/fsi/solidSolvers/SteadyStateSolidSolver.C | 6 ++--- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/fsi/fluidSolvers/SDCFluidSolver.C b/src/fsi/fluidSolvers/SDCFluidSolver.C index 02155aba..5a95af82 100644 --- a/src/fsi/fluidSolvers/SDCFluidSolver.C +++ b/src/fsi/fluidSolvers/SDCFluidSolver.C @@ -252,13 +252,13 @@ SDCFluidSolver::~SDCFluidSolver() void SDCFluidSolver::continuityErrs() { - volScalarField contErr = fvc::div( phi ); + tmp contErr = fvc::div( phi ); sumLocalContErr = runTime->deltaT().value() * - mag( contErr ) ().weightedAverage( mesh.V() ).value(); + mag( contErr() ) ().weightedAverage( mesh.V() ).value(); globalContErr = runTime->deltaT().value() * - contErr.weightedAverage( mesh.V() ).value(); + contErr->weightedAverage( mesh.V() ).value(); cumulativeContErr += globalContErr; @@ -276,10 +276,10 @@ void SDCFluidSolver::courantNo() if ( mesh.nInternalFaces() ) { - surfaceScalarField magPhi = mag( phi ); + tmp magPhi = mag( phi ); surfaceScalarField SfUfbyDelta = - mesh.surfaceInterpolation::deltaCoeffs() * magPhi; + mesh.surfaceInterpolation::deltaCoeffs() * magPhi(); const scalar deltaT = runTime->deltaT().value(); @@ -287,7 +287,7 @@ void SDCFluidSolver::courantNo() meanCoNum = ( sum( SfUfbyDelta ) / sum( mesh.magSf() ) ).value() * deltaT; - velMag = max( magPhi / mesh.magSf() ).value(); + velMag = max( magPhi() / mesh.magSf() ).value(); } Info << "Courant Number mean: " << meanCoNum @@ -308,14 +308,14 @@ void SDCFluidSolver::createFields() scalar SDCFluidSolver::evaluateMomentumResidual() { dimensionedScalar rDeltaT = 1.0 / mesh.time().deltaT(); - volVectorField residual = fvc::ddt( U ) + fvc::div( phi, U ) + fvc::grad( p ) - rDeltaT * rhsU; + tmp residual = fvc::ddt( U ) + fvc::div( phi, U ) + fvc::grad( p ) - rDeltaT * rhsU; if ( turbulenceSwitch ) - residual += turbulence->divDevReff( U ) & U; + residual() += turbulence->divDevReff( U ) & U; else - residual += -fvc::laplacian( nu, U ); + residual() += -fvc::laplacian( nu, U ); - scalarField magResU = mag( residual.internalField() ); + scalarField magResU = mag( residual->internalField() ); return std::sqrt( gSumSqr( magResU ) / ( mesh.globalData().nTotalCells() * mesh.nGeometricD() ) ); } diff --git a/src/fsi/fluidSolvers/SteadyStateFluidSolver.C b/src/fsi/fluidSolvers/SteadyStateFluidSolver.C index f04de662..30de50e4 100644 --- a/src/fsi/fluidSolvers/SteadyStateFluidSolver.C +++ b/src/fsi/fluidSolvers/SteadyStateFluidSolver.C @@ -217,13 +217,13 @@ void SteadyStateFluidSolver::checkTimeDiscretisationScheme() void SteadyStateFluidSolver::continuityErrs() { - volScalarField contErr = fvc::div( phi ); + tmp contErr = fvc::div( phi ); sumLocalContErr = runTime->deltaT().value() * - mag( contErr ) ().weightedAverage( mesh.V() ).value(); + mag( contErr() ) ().weightedAverage( mesh.V() ).value(); globalContErr = runTime->deltaT().value() * - contErr.weightedAverage( mesh.V() ).value(); + contErr->weightedAverage( mesh.V() ).value(); cumulativeContErr += globalContErr; @@ -237,10 +237,10 @@ void SteadyStateFluidSolver::courantNo() { if ( mesh.nInternalFaces() ) { - surfaceScalarField magPhi = mag( phi ); + tmp magPhi = mag( phi ); surfaceScalarField SfUfbyDelta = - mesh.surfaceInterpolation::deltaCoeffs() * magPhi; + mesh.surfaceInterpolation::deltaCoeffs() * magPhi(); CoNum = max( SfUfbyDelta / mesh.magSf() ) .value() * runTime->deltaT().value(); @@ -248,7 +248,7 @@ void SteadyStateFluidSolver::courantNo() meanCoNum = ( sum( SfUfbyDelta ) / sum( mesh.magSf() ) ) .value() * runTime->deltaT().value(); - velMag = max( magPhi / mesh.magSf() ).value(); + velMag = max( magPhi() / mesh.magSf() ).value(); } Info << "Courant Number mean: " << meanCoNum @@ -259,14 +259,14 @@ void SteadyStateFluidSolver::courantNo() scalar SteadyStateFluidSolver::evaluateMomentumResidual() { - volVectorField residual = fvc::div( phi, U ) + fvc::grad( p ); + tmp residual = fvc::div( phi, U ) + fvc::grad( p ); if ( turbulenceSwitch ) - residual += turbulence->divDevReff( U ) & U; + residual() += turbulence->divDevReff( U ) & U; else - residual += -fvc::laplacian( nu, U ); + residual() += -fvc::laplacian( nu, U ); - scalarField magResU = mag( residual.internalField() ); + scalarField magResU = mag( residual->internalField() ); scalar momentumResidual = std::sqrt( gSumSqr( magResU ) / mesh.globalData().nTotalCells() ); scalar rmsU = std::sqrt( gSumSqr( mag( U.internalField() ) ) / mesh.globalData().nTotalCells() ); rmsU /= runTime->deltaT().value(); @@ -302,14 +302,14 @@ void SteadyStateFluidSolver::getTractionLocal( matrix & traction ) { int size = mesh.boundaryMesh()[movingPatchIDs[patchI]].faceCentres().size(); - vectorField tractionFieldPatchI = -rho.value() * nu.value() + tmp tractionFieldPatchI = -rho.value() * nu.value() * U.boundaryField()[movingPatchIDs[patchI]].snGrad() + rho.value() * p.boundaryField()[movingPatchIDs[patchI]] * mesh.boundary()[movingPatchIDs[patchI]].nf(); - forAll( tractionFieldPatchI, i ) + forAll( tractionFieldPatchI(), i ) { - tractionField[i + offset] = tractionFieldPatchI[i]; + tractionField[i + offset] = tractionFieldPatchI()[i]; } offset += size; diff --git a/src/fsi/solidSolvers/SolidSolver.C b/src/fsi/solidSolvers/SolidSolver.C index f16b98b6..76081626 100644 --- a/src/fsi/solidSolvers/SolidSolver.C +++ b/src/fsi/solidSolvers/SolidSolver.C @@ -290,7 +290,7 @@ void SolidSolver::solve() { U.storePrevIter(); - surfaceTensorField shearGradU = + tmp shearGradU = ( (I - n * n) & fvc::interpolate( gradU ) ); fvVectorMatrix UEqn @@ -302,8 +302,8 @@ void SolidSolver::solve() mesh.magSf() * ( -(muf + lambdaf) * ( fvc::snGrad( U ) & (I - n * n) ) - + lambdaf * tr( shearGradU & (I - n * n) ) * n - + muf * (shearGradU & n) + + lambdaf * tr( shearGradU() & (I - n * n) ) * n + + muf * (shearGradU() & n) + muf * ( n & fvc::interpolate( gradU & gradU.T() ) ) + 0.5 * lambdaf * ( n * tr( fvc::interpolate( gradU & gradU.T() ) ) ) diff --git a/src/fsi/solidSolvers/SteadyStateSolidSolver.C b/src/fsi/solidSolvers/SteadyStateSolidSolver.C index 4eb0475d..58a07a95 100644 --- a/src/fsi/solidSolvers/SteadyStateSolidSolver.C +++ b/src/fsi/solidSolvers/SteadyStateSolidSolver.C @@ -287,7 +287,7 @@ void SteadyStateSolidSolver::solve() { U.storePrevIter(); - surfaceTensorField shearGradU = + tmp shearGradU = ( (I - n * n) & fvc::interpolate( gradU ) ); fvVectorMatrix UEqn @@ -298,8 +298,8 @@ void SteadyStateSolidSolver::solve() mesh.magSf() * ( -(muf + lambdaf) * ( fvc::snGrad( U ) & (I - n * n) ) - + lambdaf * tr( shearGradU & (I - n * n) ) * n - + muf * (shearGradU & n) + + lambdaf * tr( shearGradU() & (I - n * n) ) * n + + muf * (shearGradU() & n) + muf * ( n & fvc::interpolate( gradU & gradU.T() ) ) + 0.5 * lambdaf * ( n * tr( fvc::interpolate( gradU & gradU.T() ) ) )