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: check autoPtr as plain bool instead of valid()

Browse Source 
- cleaner code, more similarity with unique_ptr

  Now
      if (ptr)
      if (!ptr)

  instead
      if (ptr.valid())
      if (!ptr.valid())
This commit is contained in:
Mark Olesen
2020-07-15 08:50:57 +02:00
parent 9af3f85cf9
commit 12c91b9472
144 changed files with 483 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
View File

@ -399,9 +399,9 @@ combineSurfaceGeometry
points = s.points();
}
}
else if (sampledPtr_.valid())
else if (sampledPtr_)
{
const sampledSurface& s = sampledPtr_();
const sampledSurface& s = *sampledPtr_;
if (Pstream::parRun())
{
@ -443,9 +443,9 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::totalArea() const
totalArea = gSum(s.magSf());
}
else if (sampledPtr_.valid())
else if (sampledPtr_)
{
totalArea = gSum(sampledPtr_().magSf());
totalArea = gSum(sampledPtr_->magSf());
}
else
{
@ -482,7 +482,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::usesSf() const
bool Foam::functionObjects::fieldValues::surfaceFieldValue::update()
{
if (sampledPtr_.valid())
if (sampledPtr_)
{
sampledPtr_->update();
}
@ -1022,9 +1022,9 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
const polySurface& s = dynamicCast<const polySurface>(obr());
Sf = s.Sf();
}
else if (sampledPtr_.valid())
else if (sampledPtr_)
{
Sf = sampledPtr_().Sf();
Sf = sampledPtr_->Sf();
}
else
{
@ -1036,7 +1036,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
faceList faces;
pointField points;
if (surfaceWriterPtr_.valid())
if (surfaceWriterPtr_)
{
if (withTopologicalMerge())
{