Skip to content
This repository has been archived by the owner on May 9, 2022. It is now read-only.

Commit

Permalink
Fix several errors of the clang static analyzer (#242)
Browse files Browse the repository at this point in the history
  • Loading branch information
David Blom committed Apr 13, 2016
1 parent e884c63 commit 4a8b829
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
20 changes: 10 additions & 10 deletions src/fsi/fluidSolvers/SDCFluidSolver.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,13 @@ SDCFluidSolver::~SDCFluidSolver()

void SDCFluidSolver::continuityErrs()
{
volScalarField contErr = fvc::div( phi );
tmp<volScalarField> 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;

Expand All @@ -276,18 +276,18 @@ void SDCFluidSolver::courantNo()

if ( mesh.nInternalFaces() )
{
surfaceScalarField magPhi = mag( phi );
tmp<surfaceScalarField> magPhi = mag( phi );

surfaceScalarField SfUfbyDelta =
mesh.surfaceInterpolation::deltaCoeffs() * magPhi;
mesh.surfaceInterpolation::deltaCoeffs() * magPhi();

const scalar deltaT = runTime->deltaT().value();

CoNum = max( SfUfbyDelta / mesh.magSf() ).value() * deltaT;

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
Expand All @@ -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<volVectorField> 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() ) );
}

Expand Down
26 changes: 13 additions & 13 deletions src/fsi/fluidSolvers/SteadyStateFluidSolver.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,13 @@ void SteadyStateFluidSolver::checkTimeDiscretisationScheme()

void SteadyStateFluidSolver::continuityErrs()
{
volScalarField contErr = fvc::div( phi );
tmp<volScalarField> 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;

Expand All @@ -237,18 +237,18 @@ void SteadyStateFluidSolver::courantNo()
{
if ( mesh.nInternalFaces() )
{
surfaceScalarField magPhi = mag( phi );
tmp<surfaceScalarField> magPhi = mag( phi );

surfaceScalarField SfUfbyDelta =
mesh.surfaceInterpolation::deltaCoeffs() * magPhi;
mesh.surfaceInterpolation::deltaCoeffs() * magPhi();

CoNum = max( SfUfbyDelta / mesh.magSf() )
.value() * runTime->deltaT().value();

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
Expand All @@ -259,14 +259,14 @@ void SteadyStateFluidSolver::courantNo()

scalar SteadyStateFluidSolver::evaluateMomentumResidual()
{
volVectorField residual = fvc::div( phi, U ) + fvc::grad( p );
tmp<volVectorField> 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();
Expand Down Expand Up @@ -302,14 +302,14 @@ void SteadyStateFluidSolver::getTractionLocal( matrix & traction )
{
int size = mesh.boundaryMesh()[movingPatchIDs[patchI]].faceCentres().size();

vectorField tractionFieldPatchI = -rho.value() * nu.value()
tmp<vectorField> 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;
Expand Down
6 changes: 3 additions & 3 deletions src/fsi/solidSolvers/SolidSolver.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ void SolidSolver::solve()
{
U.storePrevIter();

surfaceTensorField shearGradU =
tmp<surfaceTensorField> shearGradU =
( (I - n * n) & fvc::interpolate( gradU ) );

fvVectorMatrix UEqn
Expand All @@ -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() ) ) )
Expand Down
6 changes: 3 additions & 3 deletions src/fsi/solidSolvers/SteadyStateSolidSolver.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ void SteadyStateSolidSolver::solve()
{
U.storePrevIter();

surfaceTensorField shearGradU =
tmp<surfaceTensorField> shearGradU =
( (I - n * n) & fvc::interpolate( gradU ) );

fvVectorMatrix UEqn
Expand All @@ -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() ) ) )
Expand Down

0 comments on commit 4a8b829

Please sign in to comment.