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

BUG: processorMeshes removeFiles does not remove collated (fixes #2607)

Browse Source 
ENH: extend rmDir to handle removal of empty directories only

- recursively remove directories that only contain other directories
  but no other contents. Treats dead links as non-content.
This commit is contained in:
Mark Olesen
2022-10-05 16:24:46 +02:00
parent 779a2ca084
commit d5cdc60a54
17 changed files with 313 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
View File

@ -69,7 +69,7 @@ Foam::boolList Foam::haveMeshFile
void Foam::removeProcAddressing(const faMesh& mesh)
{
IOobject ioAddr
IOobject io
(
"procAddressing",
mesh.facesInstance(),
@ -79,9 +79,9 @@ void Foam::removeProcAddressing(const faMesh& mesh)
for (const auto prefix : {"boundary", "edge", "face", "point"})
{
ioAddr.rename(prefix + word("ProcAddressing"));
io.rename(prefix + word("ProcAddressing"));
const fileName procFile(ioAddr.objectPath());
const fileName procFile(io.objectPath());
Foam::rm(procFile);
}
}
@ -89,7 +89,7 @@ void Foam::removeProcAddressing(const faMesh& mesh)
void Foam::removeProcAddressing(const polyMesh& mesh)
{
IOobject ioAddr
IOobject io
(
"procAddressing",
mesh.facesInstance(),
@ -99,89 +99,18 @@ void Foam::removeProcAddressing(const polyMesh& mesh)
for (const auto prefix : {"boundary", "cell", "face", "point"})
{
ioAddr.rename(prefix + word("ProcAddressing"));
io.rename(prefix + word("ProcAddressing"));
const fileName procFile(ioAddr.objectPath());
const fileName procFile(io.objectPath());
Foam::rm(procFile);
}
}
bool Foam::removeEmptyDir(const fileName& path)
void Foam::removeEmptyDir(const fileName& path)
{
// Return true if empty directory. Note bypass of fileHandler to be
// consistent with polyMesh.removeFiles for now.
{
fileNameList files
(
Foam::readDir
(
path,
fileName::FILE,
false, // filterGz
false // followLink
)
);
if (files.size())
{
return false;
}
}
{
fileNameList dirs
(
Foam::readDir
(
path,
fileName::DIRECTORY,
false, // filterGz
false // followLink
)
);
if (dirs.size())
{
return false;
}
}
{
fileNameList links
(
Foam::readDir
(
path,
fileName::SYMLINK,
false, // filterGz
false // followLink
)
);
if (links.size())
{
return false;
}
}
{
fileNameList other
(
Foam::readDir
(
path,
fileName::UNDEFINED,
false, // filterGz
false // followLink
)
);
if (other.size())
{
return false;
}
}
// Avoid checking success of deletion since initial path might not
// exist (e.g. contain 'region0'). Will stop when trying to delete
// parent directory anyway since now not empty.
Foam::rm(path);
return true;
// Remove directory: silent, emptyOnly
Foam::rmDir(path, true, true);
}