GIT: remove supplementary IOobjectOption handling for faMesh

- was previously used to suppress loading of faSchemes/faSolution,
  but now superfluous.
This commit is contained in:
Mark Olesen 2023-11-30 11:18:28 +00:00
parent 205719d449
commit 47062b614c
4 changed files with 6 additions and 45 deletions

View File

@ -93,13 +93,9 @@ Foam::faMeshDistributor::distribute
ListOps::findIndices(oldToNewConstruct, labelRange::ge0())
);
// Set up to read-if-present
IOobject io(tgtPolyMesh);
io.readOpt(IOobject::READ_IF_PRESENT);
newMeshPtr.reset
(
new faMesh(tgtPolyMesh, std::move(newFaceLabels), io)
new faMesh(tgtPolyMesh, std::move(newFaceLabels))
);
}

View File

@ -325,7 +325,7 @@ bool Foam::faMesh::init(const bool doInit)
Foam::faMesh::faMesh(const polyMesh& pMesh, const Foam::zero)
:
faMesh(pMesh, labelList(), static_cast<const IOobject&>(pMesh))
faMesh(pMesh, labelList())
{}
@ -449,17 +449,6 @@ Foam::faMesh::faMesh
const polyMesh& pMesh,
labelList&& faceLabels
)
:
faMesh(pMesh, std::move(faceLabels), static_cast<const IOobject&>(pMesh))
{}
Foam::faMesh::faMesh
(
const polyMesh& pMesh,
labelList&& faceLabels,
const IOobject& io
)
:
MeshObject<polyMesh, Foam::UpdateableMeshObject, faMesh>(pMesh),
edgeInterpolation(*this),

View File

@ -552,17 +552,6 @@ public:
// Boundary is added using addFaPatches() member function.
faMesh(const polyMesh& pMesh, labelList&& faceLabels);
//- Construct from components (face labels) without boundary,
//- using alternative IOobject properties
//- (primarily the readOption).
// Boundary is added using addFaPatches() member function.
faMesh
(
const polyMesh& pMesh,
labelList&& faceLabels,
const IOobject& io
);
//- Construct from single polyPatch
explicit faMesh(const polyPatch& pp, const bool doInit = true);

View File

@ -136,12 +136,9 @@ Foam::faMeshTools::newMesh
// Set up to read-if-present. Note: does not search for mesh so set
// instance explicitly
IOobject meshIO(io);
meshIO.instance() = facesInstance;
meshIO.readOpt(IOobject::READ_IF_PRESENT);
// For mesh components (faceLabels, ...)
IOobject cmptIO(meshIO, "faceLabels", meshSubDir);
IOobject cmptIO(io, "faceLabels", meshSubDir);
cmptIO.instance() = facesInstance;
cmptIO.readOpt(IOobject::MUST_READ);
cmptIO.writeOpt(IOobject::NO_WRITE);
cmptIO.registerObject(false);
@ -154,7 +151,6 @@ Foam::faMeshTools::newMesh
if (masterOnlyReading && !UPstream::master())
{
haveMesh = false;
meshIO.readOpt(IOobject::NO_READ);
}
if (!haveMesh)
@ -182,8 +178,7 @@ Foam::faMeshTools::newMesh
auto meshPtr = autoPtr<faMesh>::New
(
pMesh,
std::move(faceLabels),
meshIO
std::move(faceLabels)
);
auto& mesh = *meshPtr;
@ -354,15 +349,7 @@ Foam::faMeshTools::loadOrCreateMeshImpl
const int oldCache = fileOperation::cacheLevel(0);
// Create dummy mesh - on procs that don't already have a mesh
meshPtr.reset
(
new faMesh
(
pMesh,
labelList(),
IOobject(io, IOobject::NO_READ, IOobject::AUTO_WRITE)
)
);
meshPtr.reset(new faMesh(pMesh, labelList()));
faMesh& mesh = *meshPtr;
// Add patches