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

Commit 4a8b829

Browse files
author
David Blom
committed
Fix several errors of the clang static analyzer (#242)
1 parent e884c63 commit 4a8b829

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎src/fsi/fluidSolvers/SDCFluidSolver.C

+10-10
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,13 @@ SDCFluidSolver::~SDCFluidSolver()
252252

253253
void SDCFluidSolver::continuityErrs()
254254
{
255-
volScalarField contErr = fvc::div( phi );
255+
tmp<volScalarField> contErr = fvc::div( phi );
256256

257257
sumLocalContErr = runTime->deltaT().value() *
258-
mag( contErr ) ().weightedAverage( mesh.V() ).value();
258+
mag( contErr() ) ().weightedAverage( mesh.V() ).value();
259259

260260
globalContErr = runTime->deltaT().value() *
261-
contErr.weightedAverage( mesh.V() ).value();
261+
contErr->weightedAverage( mesh.V() ).value();
262262

263263
cumulativeContErr += globalContErr;
264264

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

277277
if ( mesh.nInternalFaces() )
278278
{
279-
surfaceScalarField magPhi = mag( phi );
279+
tmp<surfaceScalarField> magPhi = mag( phi );
280280

281281
surfaceScalarField SfUfbyDelta =
282-
mesh.surfaceInterpolation::deltaCoeffs() * magPhi;
282+
mesh.surfaceInterpolation::deltaCoeffs() * magPhi();
283283

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

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

288288
meanCoNum = ( sum( SfUfbyDelta ) / sum( mesh.magSf() ) ).value() * deltaT;
289289

290-
velMag = max( magPhi / mesh.magSf() ).value();
290+
velMag = max( magPhi() / mesh.magSf() ).value();
291291
}
292292

293293
Info << "Courant Number mean: " << meanCoNum
@@ -308,14 +308,14 @@ void SDCFluidSolver::createFields()
308308
scalar SDCFluidSolver::evaluateMomentumResidual()
309309
{
310310
dimensionedScalar rDeltaT = 1.0 / mesh.time().deltaT();
311-
volVectorField residual = fvc::ddt( U ) + fvc::div( phi, U ) + fvc::grad( p ) - rDeltaT * rhsU;
311+
tmp<volVectorField> residual = fvc::ddt( U ) + fvc::div( phi, U ) + fvc::grad( p ) - rDeltaT * rhsU;
312312

313313
if ( turbulenceSwitch )
314-
residual += turbulence->divDevReff( U ) & U;
314+
residual() += turbulence->divDevReff( U ) & U;
315315
else
316-
residual += -fvc::laplacian( nu, U );
316+
residual() += -fvc::laplacian( nu, U );
317317

318-
scalarField magResU = mag( residual.internalField() );
318+
scalarField magResU = mag( residual->internalField() );
319319
return std::sqrt( gSumSqr( magResU ) / ( mesh.globalData().nTotalCells() * mesh.nGeometricD() ) );
320320
}
321321

‎src/fsi/fluidSolvers/SteadyStateFluidSolver.C

+13-13
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,13 @@ void SteadyStateFluidSolver::checkTimeDiscretisationScheme()
217217

218218
void SteadyStateFluidSolver::continuityErrs()
219219
{
220-
volScalarField contErr = fvc::div( phi );
220+
tmp<volScalarField> contErr = fvc::div( phi );
221221

222222
sumLocalContErr = runTime->deltaT().value() *
223-
mag( contErr ) ().weightedAverage( mesh.V() ).value();
223+
mag( contErr() ) ().weightedAverage( mesh.V() ).value();
224224

225225
globalContErr = runTime->deltaT().value() *
226-
contErr.weightedAverage( mesh.V() ).value();
226+
contErr->weightedAverage( mesh.V() ).value();
227227

228228
cumulativeContErr += globalContErr;
229229

@@ -237,18 +237,18 @@ void SteadyStateFluidSolver::courantNo()
237237
{
238238
if ( mesh.nInternalFaces() )
239239
{
240-
surfaceScalarField magPhi = mag( phi );
240+
tmp<surfaceScalarField> magPhi = mag( phi );
241241

242242
surfaceScalarField SfUfbyDelta =
243-
mesh.surfaceInterpolation::deltaCoeffs() * magPhi;
243+
mesh.surfaceInterpolation::deltaCoeffs() * magPhi();
244244

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

248248
meanCoNum = ( sum( SfUfbyDelta ) / sum( mesh.magSf() ) )
249249
.value() * runTime->deltaT().value();
250250

251-
velMag = max( magPhi / mesh.magSf() ).value();
251+
velMag = max( magPhi() / mesh.magSf() ).value();
252252
}
253253

254254
Info << "Courant Number mean: " << meanCoNum
@@ -259,14 +259,14 @@ void SteadyStateFluidSolver::courantNo()
259259

260260
scalar SteadyStateFluidSolver::evaluateMomentumResidual()
261261
{
262-
volVectorField residual = fvc::div( phi, U ) + fvc::grad( p );
262+
tmp<volVectorField> residual = fvc::div( phi, U ) + fvc::grad( p );
263263

264264
if ( turbulenceSwitch )
265-
residual += turbulence->divDevReff( U ) & U;
265+
residual() += turbulence->divDevReff( U ) & U;
266266
else
267-
residual += -fvc::laplacian( nu, U );
267+
residual() += -fvc::laplacian( nu, U );
268268

269-
scalarField magResU = mag( residual.internalField() );
269+
scalarField magResU = mag( residual->internalField() );
270270
scalar momentumResidual = std::sqrt( gSumSqr( magResU ) / mesh.globalData().nTotalCells() );
271271
scalar rmsU = std::sqrt( gSumSqr( mag( U.internalField() ) ) / mesh.globalData().nTotalCells() );
272272
rmsU /= runTime->deltaT().value();
@@ -302,14 +302,14 @@ void SteadyStateFluidSolver::getTractionLocal( matrix & traction )
302302
{
303303
int size = mesh.boundaryMesh()[movingPatchIDs[patchI]].faceCentres().size();
304304

305-
vectorField tractionFieldPatchI = -rho.value() * nu.value()
305+
tmp<vectorField> tractionFieldPatchI = -rho.value() * nu.value()
306306
* U.boundaryField()[movingPatchIDs[patchI]].snGrad()
307307
+ rho.value() * p.boundaryField()[movingPatchIDs[patchI]]
308308
* mesh.boundary()[movingPatchIDs[patchI]].nf();
309309

310-
forAll( tractionFieldPatchI, i )
310+
forAll( tractionFieldPatchI(), i )
311311
{
312-
tractionField[i + offset] = tractionFieldPatchI[i];
312+
tractionField[i + offset] = tractionFieldPatchI()[i];
313313
}
314314

315315
offset += size;

‎src/fsi/solidSolvers/SolidSolver.C

+3-3
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ void SolidSolver::solve()
290290
{
291291
U.storePrevIter();
292292

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

296296
fvVectorMatrix UEqn
@@ -302,8 +302,8 @@ void SolidSolver::solve()
302302
mesh.magSf()
303303
* (
304304
-(muf + lambdaf) * ( fvc::snGrad( U ) & (I - n * n) )
305-
+ lambdaf * tr( shearGradU & (I - n * n) ) * n
306-
+ muf * (shearGradU & n)
305+
+ lambdaf * tr( shearGradU() & (I - n * n) ) * n
306+
+ muf * (shearGradU() & n)
307307
+ muf * ( n & fvc::interpolate( gradU & gradU.T() ) )
308308
+ 0.5 * lambdaf
309309
* ( n * tr( fvc::interpolate( gradU & gradU.T() ) ) )

‎src/fsi/solidSolvers/SteadyStateSolidSolver.C

+3-3
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ void SteadyStateSolidSolver::solve()
287287
{
288288
U.storePrevIter();
289289

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

293293
fvVectorMatrix UEqn
@@ -298,8 +298,8 @@ void SteadyStateSolidSolver::solve()
298298
mesh.magSf()
299299
* (
300300
-(muf + lambdaf) * ( fvc::snGrad( U ) & (I - n * n) )
301-
+ lambdaf * tr( shearGradU & (I - n * n) ) * n
302-
+ muf * (shearGradU & n)
301+
+ lambdaf * tr( shearGradU() & (I - n * n) ) * n
302+
+ muf * (shearGradU() & n)
303303
+ muf * ( n & fvc::interpolate( gradU & gradU.T() ) )
304304
+ 0.5 * lambdaf
305305
* ( n * tr( fvc::interpolate( gradU & gradU.T() ) ) )

0 commit comments

Comments
 (0)