ENH: IOobjectOption isAnyRead() for checking against NO_READ

- encompasses isReadOptional or isReadRequired check

STYLE: allow LAZY_READ as a shorter synonym for READ_IF_PRESENT

- add helper for downgrading MUST_READ... to LAZY_READ
This commit is contained in:
Mark Olesen
2023-01-13 18:15:13 +01:00
parent c8a2d82094
commit bebc6195a8
15 changed files with 50 additions and 40 deletions

View File

@ -2606,11 +2606,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
searchableSurface::instance(),
searchableSurface::local(),
searchableSurface::db(),
(
searchableSurface::isReadRequired()
? IOobject::READ_IF_PRESENT
: searchableSurface::readOpt()
),
IOobjectOption::lazierRead(searchableSurface::readOpt()),
searchableSurface::writeOpt(),
searchableSurface::registerObject()
),
@ -2719,11 +2715,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
searchableSurface::instance(),
searchableSurface::local(),
searchableSurface::db(),
(
searchableSurface::isReadRequired()
? IOobject::READ_IF_PRESENT
: searchableSurface::readOpt()
),
IOobjectOption::lazierRead(searchableSurface::readOpt()),
searchableSurface::writeOpt(),
searchableSurface::registerObject()
),

View File

@ -568,7 +568,7 @@ Foam::faMeshReconstructor::faMeshReconstructor
// Use 'headerClassName' for checking
bool fileOk
(
(fvFaceProcAddr.readOpt() != IOobjectOption::NO_READ)
fvFaceProcAddr.isAnyRead()
&& fvFaceProcAddr.isHeaderClass<labelIOList>()
);