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

ENH: add IOobject::objectRelPath() for compact output (#2195)

Browse Source
This commit is contained in:
Mark Olesen
2021-09-02 16:12:17 +02:00
parent 610711ac47
commit 96adf3ae80
10 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H
View File

@ -11,7 +11,7 @@ License
This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
Description
Search for the appropriate faMeshDefinition dictionary....
Search for the appropriate faMeshDefinition dictionary...
\*---------------------------------------------------------------------------*/
@ -86,7 +86,7 @@ autoPtr<IOdictionary> meshDictPtr;
}
Info<< "Creating faMesh from definition: "
<< runTime.relativePath(meshDictIO.objectPath()) << endl;
<< meshDictIO.objectRelPath() << endl;
meshDictPtr = autoPtr<IOdictionary>::New(meshDictIO);
}

4
applications/utilities/mesh/generation/PDRblockMesh/PDRblockMesh.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -165,7 +165,7 @@ int main(int argc, char *argv[])
IOdictionary meshDict(dictIO);
Info<< "Creating PDRblockMesh from "
<< runTime.relativePath(dictIO.objectPath()) << endl;
<< dictIO.objectRelPath() << endl;
// Always start from a PDRblock
PDRblock blkMesh(meshDict, true);

22
applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H
View File

@ -1,3 +1,20 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
Description
Search for the appropriate blockMeshDict dictionary...
\*---------------------------------------------------------------------------*/
// Search for the appropriate blockMesh dictionary....
const word dictName("blockMeshDict");
@ -64,9 +81,12 @@ autoPtr<IOdictionary> meshDictPtr;
}
Info<< "Creating block mesh from "
<< runTime.relativePath(meshDictIO.objectPath()) << endl;
<< meshDictIO.objectRelPath() << endl;
meshDictPtr = autoPtr<IOdictionary>::New(meshDictIO);
}
const IOdictionary& meshDict = *meshDictPtr;
// ************************************************************************* //

2
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -647,7 +647,7 @@ int main(int argc, char *argv[])
cellDecomposition.write();
Info<< nl << "Wrote decomposition to "
<< runTime.relativePath(cellDecomposition.objectPath())
<< cellDecomposition.objectRelPath()
<< " for use in manual decomposition." << endl;
}

2
applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRun.C
View File

@ -160,7 +160,7 @@ void Foam::domainDecompositionDryRun::execute
// cellDecomposition.write();
//
// Info<< nl << "Wrote decomposition to "
// << runTime.relativePath(cellDecomposition.objectPath())
// << cellDecomposition.objectRelPath()
// << " for use in manual decomposition." << endl;
Info<< nl;

2
applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
View File

@ -64,7 +64,7 @@ void Foam::domainDecompositionDryRun::writeVolField
cellDist.write();
Info<< nl << "Wrote decomposition to "
<< this->mesh().time().relativePath(cellDist.objectPath())
<< cellDist.objectRelPath()
<< " (volScalarField) for visualization."
<< endl;
}

2
applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
View File

@ -65,7 +65,7 @@ void Foam::domainDecomposition::writeVolField
cellDist.write();
Info<< nl << "Wrote decomposition to "
<< this->mesh().time().relativePath(cellDist.objectPath())
<< cellDist.objectRelPath()
<< " (volScalarField) for visualization."
<< endl;
}

4
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -396,7 +396,7 @@ void writeDistribution
cellDecomposition.write();
Info<< nl << "Wrote decomposition to "
<< runTime.relativePath(cellDecomposition.objectPath())
<< cellDecomposition.objectRelPath()
<< " for use in manual decomposition." << endl;
// Write as volScalarField for postprocessing. Change time to 0
@ -434,7 +434,7 @@ void writeDistribution
cellDist.write();
Info<< nl << "Wrote decomposition to "
<< runTime.relativePath(cellDist.objectPath())
<< cellDist.objectRelPath()
<< " (volScalarField) for visualization."
<< endl;

23
src/OpenFOAM/db/IOobject/IOobject.C
View File

@ -542,6 +542,29 @@ Foam::fileName Foam::IOobject::path
}
Foam::fileName Foam::IOobject::objectRelPath() const
{
// A file is 'outside' of the case if it has been specified using an
// absolute path
const auto first = instance().find('/');
if
(
first == 0
#ifdef _WIN32
|| (first == 2 && instance()[1] == ':') // Eg, d:/path
#endif
)
{
// Absolute path (starts with '/' or 'd:/')
return instance()/name();
}
return instance()/db_.dbDir()/local()/name();
}
Foam::fileName Foam::IOobject::localFilePath
(
const word& typeName,

3
src/OpenFOAM/db/IOobject/IOobject.H
View File

@ -539,6 +539,9 @@ public:
//- The complete path + object name
inline fileName objectPath() const;
//- The object path relative to the root
fileName objectRelPath() const;
//- Helper for filePath that searches locally.
// When search is false, simply use the current instance,
// otherwise search previous instances.