zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: simplify short-circuit involving autoPtr (#1775)

Browse Source 
- with '&&' conditions, often better to check for non-null autoPtr
  first (it is cheap)

- check as bool instead of valid() method for cleaner code, especially
  when the wrapped item itself has a valid/empty or good.
  Also when handling multiple checks.

  Now
      if (ptr && ptr->valid())
      if (ptr1 || ptr2)

  instead
      if (ptr.valid() && ptr->valid())
      if (ptr1.valid() || ptr2.valid())
This commit is contained in:
Mark Olesen
2020-07-15 08:50:57 +02:00
parent 3baebcb101
commit 9af3f85cf9
35 changed files with 118 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/db/regIOobject/regIOobjectRead.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2018 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -185,7 +185,7 @@ void Foam::regIOobject::close()
{
Pout<< "regIOobject::close() : "
<< "finished reading "
<< (isPtr_.valid() ? isPtr_().name() : "dummy")
<< (isPtr_ ? isPtr_->name() : "dummy")
<< endl;
}

10
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -128,8 +128,8 @@ void Foam::globalMeshData::calcSharedPoints() const
if
(
nGlobalPoints_ != -1
|| sharedPointLabelsPtr_.valid()
|| sharedPointAddrPtr_.valid()
|| sharedPointLabelsPtr_
|| sharedPointAddrPtr_
)
{
FatalErrorInFunction
@ -295,8 +295,8 @@ void Foam::globalMeshData::calcSharedEdges() const
if
(
nGlobalEdges_ != -1
|| sharedEdgeLabelsPtr_.valid()
|| sharedEdgeAddrPtr_.valid()
|| sharedEdgeLabelsPtr_
|| sharedEdgeAddrPtr_
)
{
FatalErrorInFunction

4
src/finiteVolume/expressions/base/fvExprDriver.C
View File

@ -190,7 +190,7 @@ bool Foam::expressions::fvExprDriver::readDict
{
ITstream& is = eptr->stream();
if (writer_.valid() && storedVariables_.size())
if (writer_ && !storedVariables_.empty())
{
WarningInFunction
// << "Context: " << driverContext_ << nl
@ -216,7 +216,7 @@ bool Foam::expressions::fvExprDriver::readDict
{
ITstream& is = eptr->stream();
if (writer_.valid() && delayedVariables_.size())
if (writer_ && !delayedVariables_.empty())
{
WarningInFunction
// << "Context: " << driverContext_ << nl

8
src/finiteVolume/expressions/base/fvExprDriverIO.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2010-2018 Bernhard Gschaider <bgschaid@hfd-research.com>
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -261,16 +261,16 @@ Foam::Ostream& Foam::expressions::fvExprDriver::writeCommon
void Foam::expressions::fvExprDriver::createWriterAndRead(const word& name)
{
if (hasDataToWrite() && !writer_.valid())
if (!writer_ && hasDataToWrite())
{
writer_.set(new exprDriverWriter(name + "_" + this->type(), *this));
writer_.reset(new exprDriverWriter(name + "_" + this->type(), *this));
}
}
void Foam::expressions::fvExprDriver::tryWrite() const
{
if (writer_.valid() && mesh().time().outputTime())
if (writer_ && mesh().time().outputTime())
{
writer_->write();
}

4
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2019 OpenCFD Ltd.
Copyright (C) 2017-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -38,7 +38,7 @@ withSurfaceFields() const
(
stFaceZone == regionType_
|| stPatch == regionType_
|| (sampledPtr_.valid() && sampledPtr_->withSurfaceFields())
|| (sampledPtr_ && sampledPtr_->withSurfaceFields())
);
}

2
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
View File

@ -370,7 +370,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues
Field<Type> values(getFieldValues<Type>(fieldName, true));
// Write raw values on surface if specified
if (surfaceWriterPtr_.valid() && surfaceWriterPtr_->enabled())
if (surfaceWriterPtr_ && surfaceWriterPtr_->enabled())
{
Field<Type> allValues(values);
combineFields(allValues);

2
src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
View File

@ -34,7 +34,7 @@ template<class chemistryType>
void Foam::functionObjects::reactionsSensitivityAnalysis<chemistryType>::
createFileNames()
{
if (writeToFile() && !prodFilePtr_.valid())
if (writeToFile() && !prodFilePtr_)
{
prodFilePtr_ = createFile("production");
writeHeader(prodFilePtr_(), "production");

4
src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
View File

@ -413,8 +413,8 @@ bool Foam::functionObjects::regionSizeDistribution::write()
const volScalarField& alpha =
(
alphaPtr.valid()
? alphaPtr()
alphaPtr
? *alphaPtr
: obr_.lookupObject<volScalarField>(alphaName_)
);

4
src/functionObjects/forces/forceCoeffs/forceCoeffs.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -54,7 +54,7 @@ void Foam::functionObjects::forceCoeffs::createFiles()
{
// Note: Only possible to create bin files after bins have been initialised
if (writeToFile() && !coeffFilePtr_.valid())
if (writeToFile() && !coeffFilePtr_)
{
coeffFilePtr_ = createFile("coefficient");
writeIntegratedHeader("Coefficients", coeffFilePtr_());

2
src/functionObjects/forces/forces/forces.C
View File

@ -58,7 +58,7 @@ void Foam::functionObjects::forces::createFiles()
{
// Note: Only possible to create bin files after bins have been initialised
if (writeToFile() && !forceFilePtr_.valid())
if (writeToFile() && !forceFilePtr_)
{
forceFilePtr_ = createFile("force");
writeIntegratedHeader("Force", forceFilePtr_());

4
src/functionObjects/utilities/vtkWrite/vtkWriteTemplates.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -126,7 +126,7 @@ Foam::label Foam::functionObjects::vtkWrite::writeVolFields
const auto& field = tfield();
// Internal
if (internalWriter.valid() && pInterp.valid())
if (internalWriter && pInterp)
{
ok = true;
internalWriter->write(field, *pInterp);

26
src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
View File

@ -1253,11 +1253,11 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
const point& pt = pp.localPoints()[pointi];
if (patchConstraints[pointi].first() == 2 && feStr.valid())
if (feStr && patchConstraints[pointi].first() == 2)
{
feStr().write(linePointRef(pt, pt+patchAttraction[pointi]));
}
else if (patchConstraints[pointi].first() == 3 && fpStr.valid())
else if (fpStr && patchConstraints[pointi].first() == 3)
{
fpStr().write(linePointRef(pt, pt+patchAttraction[pointi]));
}
@ -2580,11 +2580,7 @@ void Foam::snappySnapDriver::determineFeatures
hasSnapped = true;
// Debug: dump missed feature point
if
(
missedMP0Str.valid()
&& !nearInfo.second().hit()
)
if (missedMP0Str && !nearInfo.second().hit())
{
missedMP0Str().write
(
@ -2649,11 +2645,7 @@ void Foam::snappySnapDriver::determineFeatures
}
// Debug: dump missed feature point
if
(
missedMP1Str.valid()
&& !nearInfo.second().hit()
)
if (missedMP1Str && !nearInfo.second().hit())
{
missedMP1Str().write
(
@ -2693,8 +2685,8 @@ void Foam::snappySnapDriver::determineFeatures
{
if
(
patchConstraints[pointi].first() == 3
&& featurePointStr.valid()
featurePointStr
&& patchConstraints[pointi].first() == 3
)
{
featurePointStr().write
@ -2704,8 +2696,8 @@ void Foam::snappySnapDriver::determineFeatures
}
else if
(
patchConstraints[pointi].first() == 2
&& featureEdgeStr.valid()
featureEdgeStr
&& patchConstraints[pointi].first() == 2
)
{
featureEdgeStr().write
@ -2812,7 +2804,7 @@ void Foam::snappySnapDriver::determineFeatures
}
const pointIndexHit& info = nearInfo.second();
if (info.hit() && featurePointStr.valid())
if (featurePointStr && info.hit())
{
featurePointStr().write
(

2
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
View File

@ -763,7 +763,7 @@ const
{
const word surfType(surfDict_.getOrDefault<word>("type", "none"));
if (!surfPtr_.valid() && surfType != "none")
if (!surfPtr_ && surfType != "none")
{
word surfName(surfDict_.getOrDefault("name", patch_.name()));

2
src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
View File

@ -63,7 +63,7 @@ Foam::label Foam::NURBS3DVolume::getCPID
void Foam::NURBS3DVolume::findPointsInBox(const vectorField& meshPoints)
{
// It is considered an error to recompute points in the control boxes
if (mapPtr_.valid() || reverseMapPtr_.valid())
if (mapPtr_ || reverseMapPtr_)
{
FatalErrorInFunction
<< "Attempting to recompute points residing within control boxes"

4
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
View File

@ -7,7 +7,7 @@
-------------------------------------------------------------------------------
Copyright (C) 2007-2019 PCOpt/NTUA
Copyright (C) 2013-2019 FOSS GP
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -153,7 +153,7 @@ RASModelVariables::autoTmp
RASModelVariables::cloneAutoTmp(const autoTmp& source) const
{
autoTmp returnField(nullptr);
if (source.valid() && source().valid())
if (source && source->valid())
{
const volScalarField& sf = source()();
DebugInfo

12
src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
View File

@ -646,12 +646,12 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
if
(
CHFModel_.valid()
&& CHFSoobModel_.valid()
&& TDNBModel_.valid()
&& MHFModel_.valid()
&& LeidenfrostModel_.valid()
&& filmBoilingModel_.valid()
CHFModel_
&& CHFSoobModel_
&& TDNBModel_
&& MHFModel_
&& LeidenfrostModel_
&& filmBoilingModel_
)
{

11
src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2014-2018 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -106,7 +107,7 @@ Foam::BlendedInterfacialModel<ModelType>::evaluate
tmp<scalarGeoField> f1, f2;
if (model_.valid() || model1In2_.valid())
if (model_ || model1In2_)
{
f1 =
blendedInterfacialModel::interpolate<scalarGeoField>
@ -115,7 +116,7 @@ Foam::BlendedInterfacialModel<ModelType>::evaluate
);
}
if (model_.valid() || model2In1_.valid())
if (model_ || model2In1_)
{
f2 =
blendedInterfacialModel::interpolate<scalarGeoField>
@ -177,7 +178,7 @@ Foam::BlendedInterfacialModel<ModelType>::evaluate
if
(
correctFixedFluxBCs_
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
&& (model_ || model1In2_ || model2In1_)
)
{
correctFixedFluxBCs(x.ref());
@ -300,8 +301,8 @@ bool Foam::BlendedInterfacialModel<ModelType>::hasModel
{
return
&phase == &(phase1_)
? model1In2_.valid()
: model2In1_.valid();
? bool(model1In2_)
: bool(model2In1_);
}

2
src/sampling/sampledSet/shortestPath/shortestPathSet.C
View File

@ -969,7 +969,7 @@ void Foam::shortestPathSet::genSamples
markLeakPath,
iter,
mesh,
(isBlockedFace.valid() ? isBlockedFace() : isBoundaryFace),
(isBlockedFace ? *isBlockedFace : isBoundaryFace),
insidePoint,
insideCelli,
outsidePoint,

2
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
View File

@ -107,7 +107,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
}
const volScalarField& cellFld =
(fieldReadPtr.valid() ? *fieldReadPtr : *cellFldPtr);
(fieldReadPtr ? *fieldReadPtr : *cellFldPtr);
auto tpointFld = volPointInterpolation::New(fvm).interpolate(cellFld);

4
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTopo.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2018 OpenFOAM Foundation
Copyright (C) 2018-2019 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -107,7 +107,7 @@ bool Foam::sampledIsoSurfaceTopo::updateGeometry() const
}
const volScalarField& cellFld =
(fieldReadPtr.valid() ? *fieldReadPtr : *cellFldPtr);
(fieldReadPtr ? *fieldReadPtr : *cellFldPtr);
auto tpointFld = volPointInterpolation::New(fvm).interpolate(cellFld);

4
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
View File

@ -164,8 +164,8 @@ void Foam::sampledCuttingPlane::createGeometry()
// Select either the submesh or the underlying mesh
const fvMesh& mesh =
(
subMeshPtr_.valid()
? subMeshPtr_().subMesh()
subMeshPtr_
? subMeshPtr_->subMesh()
: fvm
);

4
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View File

@ -326,7 +326,7 @@ bool Foam::sampledSurfaces::read(const dictionary& dict)
surfDict
);
if (!surf.valid() || !surf->enabled())
if (!surf || !surf->enabled())
{
continue;
}
@ -392,7 +392,7 @@ bool Foam::sampledSurfaces::read(const dictionary& dict)
autoPtr<sampledSurface> surf = input.release(inputi);
if (!surf.valid() || !surf->enabled())
if (!surf || !surf->enabled())
{
continue;
}

3
src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
View File

@ -102,8 +102,9 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
fvm
);
}
const volScalarField& cellFld =
(fieldReadPtr.valid() ? *fieldReadPtr : *cellFldPtr);
(fieldReadPtr ? *fieldReadPtr : *cellFldPtr);
thresholdCellFaces surf

2
src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
View File

@ -439,7 +439,7 @@ void Foam::radiation::solarLoad::calculateQdiff
);
if (finalAgglom_.size() > 0 && coarseMesh_.empty())
if (!coarseMesh_ && !finalAgglom_.empty())
{
coarseMesh_.reset
(