zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

domainDecomposition: Prevent overwriting existing meshes

Browse Source
This commit is contained in:
Will Bainbridge
2022-08-09 13:23:44 +01:00
parent cd829836eb
commit a84bcc98ff
2 changed files with 116 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/parallel/parallel/domainDecomposition.C
View File

@ -604,7 +604,7 @@ void Foam::domainDecomposition::readProcs()
}
void Foam::domainDecomposition::readAddressing()
void Foam::domainDecomposition::readCompleteAddressing()
{
cellProc_ =
labelIOList
@ -620,7 +620,11 @@ void Foam::domainDecomposition::readAddressing()
false
)
);
}
void Foam::domainDecomposition::readProcsAddressing()
{
for (label proci = 0; proci < nProcs(); proci++)
{
const fvMesh& procMesh = procMeshes_[proci];
@ -673,6 +677,13 @@ void Foam::domainDecomposition::readAddressing()
}
void Foam::domainDecomposition::readAddressing()
{
readCompleteAddressing();
readProcsAddressing();
}
Foam::fvMesh::readUpdateState Foam::domainDecomposition::readUpdate()
{
validateComplete();
@ -695,7 +706,7 @@ Foam::fvMesh::readUpdateState Foam::domainDecomposition::readUpdate()
}
void Foam::domainDecomposition::writeAddressing() const
void Foam::domainDecomposition::writeCompleteAddressing() const
{
labelIOList cellProc
(
@ -710,8 +721,13 @@ void Foam::domainDecomposition::writeAddressing() const
),
cellProc_
);
cellProc.write();
cellProc.write();
}
void Foam::domainDecomposition::writeProcsAddressing() const
{
for (label proci = 0; proci < nProcs(); proci++)
{
const fvMesh& procMesh = procMeshes_[proci];
@ -764,6 +780,13 @@ void Foam::domainDecomposition::writeAddressing() const
}
void Foam::domainDecomposition::writeAddressing() const
{
writeCompleteAddressing();
writeProcsAddressing();
}
void Foam::domainDecomposition::writeProcPoints(const fileName& inst)
{
IOobject completePointsIo
@ -862,6 +885,7 @@ Foam::domainDecomposition::domainDecomposition
regionName_(regionName),
completeMesh_(nullptr),
procMeshes_(nProcs()),
cellProc_(),
procPointAddressing_(nProcs()),
procFaceAddressing_(nProcs()),
procCellAddressing_(nProcs()),
@ -888,6 +912,13 @@ bool Foam::domainDecomposition::readDecompose(const bool doSets)
completeMesh().meshDir(),
completeMesh()
);
IOobject procFaceIo
(
"faces",
completeMesh().facesInstance(),
completeMesh().meshDir(),
runTimes_.procTimes()[0]
);
typeIOobject<labelIOList> procAddrIo
(
"cellProcAddressing",
@ -896,13 +927,30 @@ bool Foam::domainDecomposition::readDecompose(const bool doSets)
runTimes_.procTimes()[0]
);
const bool addrOk = addrIo.headerOk() && procAddrIo.headerOk();
const bool load = addrIo.headerOk() && procFaceIo.headerOk();
if (addrOk)
if (load)
{
readProcs();
readAddressing();
if (procAddrIo.headerOk())
{
readAddressing();
}
else
{
readCompleteAddressing();
FatalErrorInFunction
<< nl << " Processor meshes exist but have no addressing."
<< nl << nl << " This could be because the processor meshes "
<< "have changed. Decomposing the" << nl << " mesh would "
<< "overwrite that change. If you are sure that this is "
<< "appropriate," << nl << " then delete the "
<< fileName("processor*")/procFaceIo.relativePath().c_str()
<< " directories and re-run this" << nl << " command."
<< exit(FatalError);
}
decomposePoints();
}
@ -937,12 +985,12 @@ bool Foam::domainDecomposition::readDecompose(const bool doSets)
writeProcs(doSets);
if (!addrOk)
if (!load)
{
writeProcPoints(completeMesh().facesInstance());
}
return !addrOk;
return !load;
}
@ -950,6 +998,13 @@ bool Foam::domainDecomposition::readReconstruct(const bool doSets)
{
readProcs();
IOobject faceIo
(
"faces",
procMeshes()[0].facesInstance(),
procMeshes()[0].meshDir(),
runTimes_.completeTime()
);
typeIOobject<labelIOList> addrIo
(
"cellProc",
@ -965,13 +1020,48 @@ bool Foam::domainDecomposition::readReconstruct(const bool doSets)
procMeshes()[0]
);
const bool addrOk = addrIo.headerOk() && procAddrIo.headerOk();
const bool load = faceIo.headerOk() && procAddrIo.headerOk();
if (addrOk)
if (load)
{
readComplete();
readAddressing();
if (addrIo.headerOk())
{
readAddressing();
}
else
{
readProcsAddressing();
WarningInFunction
<< nl << " A complete mesh exists but has no "
<< addrIo.name() << " addressing." << nl << nl << " This "
<< "could be because the complete mesh has changed. "
<< "Reconstructing the" << nl << " mesh would overwrite "
<< "that change. If you are sure that this is appropriate,"
<< nl << " then delete the " << faceIo.relativePath()
<< " directory and re-run this command." << nl << nl
<< " Or, it could be because the complete and processor "
<< "meshes were decomposed" << nl << " by a version of "
<< "OpenFOAM that pre-dates the automatic generation of "
<< nl << " " << addrIo.name() << " addressing. This will be "
<< "assumed and the " << addrIo.name() << " addressing will"
<< nl << " be re-built" << nl << endl;
cellProc_ = labelList(completeMesh().nCells(), -1);
for (label proci = 0; proci < nProcs(); proci++)
{
UIndirectList<label>
(
cellProc_,
procCellAddressing_[proci]
) = proci;
}
writeCompleteAddressing();
}
reconstructPoints();
}
@ -1006,12 +1096,12 @@ bool Foam::domainDecomposition::readReconstruct(const bool doSets)
writeComplete(doSets);
if (!addrOk)
if (!load)
{
writeCompletePoints(procMeshes()[0].facesInstance());
}
return !addrOk;
return !load;
}

14
src/parallel/parallel/domainDecomposition.H
View File

@ -83,7 +83,7 @@ class domainDecomposition
// Note: Face turning index is stored as the sign on addressing
// Only the processor boundary faces are affected: if the sign of
// the index is negative, the processor face is the reverse of the
// original face. In order to do this properly, all face
// originae face. In order to do this properly, all face
// indices will be incremented by 1 and the decremented as
// necessary to avoid the problem of face number zero having no
// sign.
@ -182,6 +182,12 @@ class domainDecomposition
//- Read the processor meshes
void readProcs();
//- Read the addressing
void readCompleteAddressing();
//- Read the addressing
void readProcsAddressing();
//- Read the addressing
void readAddressing();
@ -196,6 +202,12 @@ class domainDecomposition
// populate the addressing
void reconstruct();
//- Write the decomposition addressing
void writeCompleteAddressing() const;
//- Write the decomposition addressing
void writeProcsAddressing() const;
//- Write the decomposition addressing
void writeAddressing() const;