songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STYLE: can use objectRegistry::checkOut() directly with a pointer

Browse Source
This commit is contained in:
Mark Olesen 2019-06-27 19:24:54 +02:00 committed by Andrew Heather
parent def4e2b7fd
commit 1fed2bc2b2
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenFOAM/db/regIOobject/regIOobject.C
View File

@ -239,7 +239,7 @@ bool Foam::regIOobject::checkOut()
{
registered_ = false;
return db().checkOut(*this);
return db().checkOut(this);
}
return false;

27
src/OpenFOAM/meshes/MeshObject/MeshObject.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -94,7 +94,7 @@ bool Foam::MeshObject<Mesh, MeshObjectType, Type>::Delete(const Mesh& mesh)
<< Type::typeName << endl;
}
return mesh.thisDb().checkOut(*ptr);
return mesh.thisDb().checkOut(ptr);
}
return false;
@ -118,9 +118,8 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
forAllIters(meshObjects, iter)
{
// Same as (isA<MoveableMeshObject<Mesh>>(*iter()))
auto* objectPtr = dynamic_cast<MoveableMeshObject<Mesh>*>(iter());
// isA<MoveableMeshObject<Mesh>>
auto* objectPtr = dynamic_cast<MoveableMeshObject<Mesh>*>(*iter);
if (objectPtr)
{
@ -136,7 +135,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
{
Pout<< " Destroying " << iter->name() << endl;
}
obr.checkOut(*iter());
obr.checkOut(*iter);
}
}
}
@ -159,9 +158,8 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
forAllIters(meshObjects, iter)
{
// Same as (isA<UpdateableMeshObject<Mesh>>(*iter()))
auto* objectPtr = dynamic_cast<UpdateableMeshObject<Mesh>*>(iter());
// isA<MoveableMeshObject<Mesh>>
auto* objectPtr = dynamic_cast<UpdateableMeshObject<Mesh>*>(*iter);
if (objectPtr)
{
@ -177,7 +175,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
{
Pout<< " Destroying " << iter->name() << endl;
}
obr.checkOut(*iter());
obr.checkOut(*iter);
}
}
}
@ -204,7 +202,7 @@ void Foam::meshObject::clear(objectRegistry& obr)
{
Pout<< " Destroying " << iter->name() << endl;
}
obr.checkOut(*iter());
obr.checkOut(*iter);
}
}
@ -231,13 +229,16 @@ void Foam::meshObject::clearUpto(objectRegistry& obr)
forAllIters(meshObjects, iter)
{
if (!isA<ToType<Mesh>>(*iter()))
// isA<ToType<Mesh>
auto* objectPtr = dynamic_cast<ToType<Mesh>*>(*iter);
if (!objectPtr)
{
if (meshObject::debug)
{
Pout<< " Destroying " << iter->name() << endl;
}
obr.checkOut(*iter());
obr.checkOut(*iter);
}
}
}

16
src/sampling/sampledSurface/sampledSurface/sampledSurfaceRegister.C
View File

@ -77,13 +77,7 @@ bool Foam::sampledSurface::removeRegistrySurface
) const
{
polySurface* surfptr = getRegistrySurface(obr, lookupName);
if (surfptr)
{
return obr.checkOut(*surfptr);
}
return false;
return obr.checkOut(surfptr);
}
@ -124,13 +118,7 @@ Foam::surfMesh* Foam::sampledSurface::storeSurfMesh(word lookupName) const
bool Foam::sampledSurface::removeSurfMesh(word lookupName) const
{
surfMesh* surfptr = getSurfMesh(lookupName);
if (surfptr)
{
return mesh().checkOut(*surfptr);
}
return false;
return mesh().checkOut(surfptr);
}