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

Time::timeName(): no longer needed, calls replaced by name()

Browse Source 
The timeName() function simply returns the dimensionedScalar::name() which holds
the user-time name of the current time and now that timeName() is no longer
virtual the dimensionedScalar::name() can be called directly.  The timeName()
function implementation is maintained for backward-compatibility.
This commit is contained in:
Henry Weller
2022-11-30 15:53:51 +00:00
parent 262672ec10
commit ed7e703040
546 changed files with 1612 additions and 1613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -752,7 +752,7 @@ int main(int argc, char *argv[])
)();
// Read all fields in time and constant directories
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
IOobjectList timeObjects(IOobjectList(mesh, mesh.facesInstance()));
forAllConstIter(IOobjectList, timeObjects, iter)
{

10
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -538,7 +538,7 @@ void subsetMesh
if (writeMesh)
{
Info<< "Writing refined mesh to time " << runTime.timeName() << nl
Info<< "Writing refined mesh to time " << runTime.name() << nl
<< endl;
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
@ -744,7 +744,7 @@ int main(int argc, char *argv[])
IOobject
(
"refinementLevel",
runTime.timeName(),
runTime.name(),
polyMesh::defaultRegion,
mesh,
IOobject::READ_IF_PRESENT,
@ -907,7 +907,7 @@ int main(int argc, char *argv[])
if (writeMesh)
{
Info<< " Writing refined mesh to time " << runTime.timeName()
Info<< " Writing refined mesh to time " << runTime.name()
<< nl << endl;
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
@ -977,7 +977,7 @@ int main(int argc, char *argv[])
doRefinement(mesh, refineDict, hanging, refLevel);
Info<< "Writing refined mesh to time " << runTime.timeName() << nl
Info<< "Writing refined mesh to time " << runTime.name() << nl
<< endl;
// Write final mesh
@ -988,7 +988,7 @@ int main(int argc, char *argv[])
}
else if (!writeMesh)
{
Info<< "Writing refined mesh to time " << runTime.timeName() << nl
Info<< "Writing refined mesh to time " << runTime.name() << nl
<< endl;
// Write final mesh. (will have been written already if writeMesh=true)

6
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -128,7 +128,7 @@ int main(int argc, char *argv[])
IOobject
(
"pointPriority",
runTime.timeName(),
runTime.name(),
runTime,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
@ -241,7 +241,7 @@ int main(int argc, char *argv[])
}
Info<< nl << "Writing collapsed mesh to time "
<< runTime.timeName() << nl << endl;
<< runTime.name() << nl << endl;
mesh.write();
pointPriority.write();

2
applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
View File

@ -444,7 +444,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
}
Info<< "Writing morphed mesh to time " << runTime.timeName() << endl;
Info<< "Writing morphed mesh to time " << runTime.name() << endl;
mesh.write();
}

6
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View File

@ -549,7 +549,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
Info<< "Writing modified mesh to time " << runTime.name() << endl;
mesh.write();
}
else if (edgeToPos.size())
@ -623,7 +623,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
Info<< "Writing modified mesh to time " << runTime.name() << endl;
mesh.write();
}
else
@ -666,7 +666,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
Info<< "Writing modified mesh to time " << runTime.name() << endl;
mesh.write();
}

4
applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
View File

@ -92,7 +92,7 @@ int main(int argc, char *argv[])
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -164,7 +164,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
meshCutter.setInstance(oldInstance);
}
Info<< "Writing mesh to " << runTime.timeName() << endl;
Info<< "Writing mesh to " << runTime.name() << endl;
mesh.write();
meshCutter.write();

2
applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
View File

@ -258,7 +258,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info<< "Writing refined mesh to time " << runTime.timeName() << endl;
Info<< "Writing refined mesh to time " << runTime.name() << endl;
mesh.write();

10
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -208,7 +208,7 @@ int main(int argc, char *argv[])
IOobject
(
fvMesh::defaultRegion,
runTime.timeName(),
runTime.name(),
runTime
),
clone(mesh.points()), // could we safely re-use the data?
@ -233,7 +233,7 @@ int main(int argc, char *argv[])
typeIOobject<labelIOList> refHeader
(
"refinementLevel",
runTime.timeName(),
runTime.name(),
polyMesh::defaultRegion,
runTime
);
@ -254,7 +254,7 @@ int main(int argc, char *argv[])
IOobject
(
"refinementLevel",
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -273,7 +273,7 @@ int main(int argc, char *argv[])
IOobject
(
"refinementLevel",
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE

4
applications/utilities/mesh/advanced/removeFaces/removeFaces.C
View File

@ -113,7 +113,7 @@ int main(int argc, char *argv[])
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -159,7 +159,7 @@ int main(int argc, char *argv[])
}
// Take over refinement levels and write to new time directory.
Pout<< "Writing mesh to time " << runTime.timeName() << endl;
Pout<< "Writing mesh to time " << runTime.name() << endl;
mesh.write();
Pout<< "End\n" << endl;

2
applications/utilities/mesh/advanced/splitCells/splitCells.C
View File

@ -706,7 +706,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
}
Info<< "Writing refined morphMesh to time " << runTime.timeName()
Info<< "Writing refined morphMesh to time " << runTime.name()
<< endl;
mesh.write();

6
applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -1113,7 +1113,7 @@ int main(int argc, char *argv[])
IOobject
(
"cellId",
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -1133,7 +1133,7 @@ int main(int argc, char *argv[])
IOobject
(
"cellType",
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE

4
applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,7 +44,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
Info<< "Create mesh for time = "
<< runTime.timeName() << nl << endl;
<< runTime.name() << nl << endl;
fluentFvMesh mesh
(

2
applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
View File

@ -124,7 +124,7 @@ int main(int argc, char *argv[])
fileName meshName(exportName);
if (state != polyMesh::UNCHANGED)
{
meshName += '_' + runTime.timeName();
meshName += '_' + runTime.name();
}
writer.write(meshName);

12
applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
View File

@ -4,14 +4,14 @@
if
(
runTime.timeName() != runTime.constant()
&& runTime.timeName() != "0"
runTime.name() != runTime.constant()
&& runTime.name() != "0"
)
{
typeIOobject<IOdictionary> io
(
"time",
runTime.timeName(),
runTime.name(),
"uniform",
runTime,
IOobject::READ_IF_PRESENT,
@ -26,7 +26,7 @@
IOobject
(
"time",
runTime.timeName(),
runTime.name(),
"uniform",
runTime,
IOobject::MUST_READ_IF_MODIFIED,
@ -41,8 +41,8 @@
}
else
{
timeName = runTime.timeName();
timeName = runTime.name();
}
}
Info<< "\nTime [" << timeName << "] = " << runTime.timeName() << nl;
Info<< "\nTime [" << timeName << "] = " << runTime.name() << nl;

4
applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -105,7 +105,7 @@ int main(int argc, char *argv[])
else
{
exportName =
exportBase + '_' + runTime.timeName() + "." + exportExt;
exportBase + '_' + runTime.name() + "." + exportExt;
}
meshedSurface surf(mesh.boundaryMesh());

12
applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
View File

@ -4,14 +4,14 @@
if
(
runTime.timeName() != runTime.constant()
&& runTime.timeName() != "0"
runTime.name() != runTime.constant()
&& runTime.name() != "0"
)
{
typeIOobject<IOdictionary> io
(
"time",
runTime.timeName(),
runTime.name(),
"uniform",
runTime,
IOobject::READ_IF_PRESENT,
@ -26,7 +26,7 @@
IOobject
(
"time",
runTime.timeName(),
runTime.name(),
"uniform",
runTime,
IOobject::MUST_READ_IF_MODIFIED,
@ -41,10 +41,10 @@
}
else
{
timeName = runTime.timeName();
timeName = runTime.name();
// Info<< "skip ... missing entry " << io.objectPath() << endl;
// continue;
}
}
Info<< "\nTime [" << timeName << "] = " << runTime.timeName() << nl;
Info<< "\nTime [" << timeName << "] = " << runTime.name() << nl;

24
applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -456,23 +456,23 @@ int main(int argc, char *argv[])
{
if (patchFaces)
{
writePatchFaces(mesh, runTime.timeName());
writePatchFaces(mesh, runTime.name());
}
if (patchEdges)
{
writePatchBoundaryEdges(mesh, runTime.timeName());
writePatchBoundaryEdges(mesh, runTime.name());
}
if (doCell)
{
label celli = args.optionRead<label>("cell");
writePoints(mesh, celli, runTime.timeName());
writePoints(mesh, celli, runTime.name());
}
if (doPoint)
{
label pointi = args.optionRead<label>("point");
writePointCells(mesh, pointi, runTime.timeName());
writePointCells(mesh, pointi, runTime.name());
}
if (doFace)
{
@ -482,7 +482,7 @@ int main(int argc, char *argv[])
(
mesh.time().path()
/ "meshPoints_"
+ runTime.timeName()
+ runTime.name()
+ '_'
+ name(facei)
+ ".obj"
@ -505,7 +505,7 @@ int main(int argc, char *argv[])
Info<< "Read " << cells.size() << " cells from set " << setName
<< endl;
writePoints(mesh, cells.toc(), runTime.timeName());
writePoints(mesh, cells.toc(), runTime.name());
}
if (doFaceSet)
{
@ -520,7 +520,7 @@ int main(int argc, char *argv[])
(
mesh.time().path()
/ "meshPoints_"
+ runTime.timeName()
+ runTime.name()
+ '_'
+ setName
+ ".obj"
@ -550,16 +550,16 @@ int main(int argc, char *argv[])
)
{
// points & edges
writePoints(mesh, runTime.timeName());
writePoints(mesh, runTime.name());
// face centres
writeFaceCentres(mesh, runTime.timeName());
writeFaceCentres(mesh, runTime.name());
// cell centres
writeCellCentres(mesh, runTime.timeName());
writeCellCentres(mesh, runTime.name());
// Patch face centres
writePatchCentres(mesh, runTime.timeName());
writePatchCentres(mesh, runTime.name());
}
}
else

6
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
View File

@ -134,7 +134,7 @@ int main(int argc, char *argv[])
const bool overwrite = args.optionFound("overwrite");
Info<< "Extruding from " << ExtrudeModeNames[surfaceFormat]
<< " at time " << runTimeExtruded.timeName() << endl;
<< " at time " << runTimeExtruded.name() << endl;
IOdictionary extrude2DMeshDict
(
@ -234,7 +234,7 @@ int main(int argc, char *argv[])
Foam::IOobject
(
Foam::polyMesh::defaultRegion,
runTimeExtruded.timeName(),
runTimeExtruded.name(),
runTimeExtruded,
Foam::IOobject::MUST_READ
)
@ -318,7 +318,7 @@ int main(int argc, char *argv[])
}
// Take over refinement levels and write to new time directory.
Info<< "\nWriting extruded mesh to time = " << runTimeExtruded.timeName()
Info<< "\nWriting extruded mesh to time = " << runTimeExtruded.name()
<< nl << endl;
mesh().write();

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

@ -277,13 +277,13 @@ int main(int argc, char *argv[])
{
regionDir = regionName;
Info<< "Create mesh " << regionName << " for time = "
<< runTimeExtruded.timeName() << nl << endl;
<< runTimeExtruded.name() << nl << endl;
}
else
{
regionName = fvMesh::defaultRegion;
Info<< "Create mesh for time = "
<< runTimeExtruded.timeName() << nl << endl;
<< runTimeExtruded.name() << nl << endl;
}
const dictionary dict(systemDict("extrudeMeshDict", args, runTimeExtruded));

2
applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -1067,7 +1067,7 @@ int main(int argc, char *argv[])
if (!overwrite)
{
runTime++;
meshInstance = runTime.timeName();
meshInstance = runTime.name();
}
else
{

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,14 +56,14 @@ Foam::DelaunayMesh<Triangulation>::DelaunayMesh
cellCount_(0),
runTime_(runTime)
{
Info<< "Reading " << meshName << " from " << runTime.timeName() << endl;
Info<< "Reading " << meshName << " from " << runTime.name() << endl;
pointIOField pts
(
IOobject
(
"points",
runTime.timeName(),
runTime.name(),
meshName/polyMesh::meshSubDir,
runTime,
IOobject::READ_IF_PRESENT,
@ -78,7 +78,7 @@ Foam::DelaunayMesh<Triangulation>::DelaunayMesh
IOobject
(
"types",
runTime.timeName(),
runTime.name(),
meshName,
runTime,
IOobject::MUST_READ,
@ -92,7 +92,7 @@ Foam::DelaunayMesh<Triangulation>::DelaunayMesh
// IOobject
// (
// "indices",
// runTime.timeName(),
// runTime.name(),
// meshName,
// runTime,
// IOobject::MUST_READ,
@ -105,7 +105,7 @@ Foam::DelaunayMesh<Triangulation>::DelaunayMesh
IOobject
(
"processorIndices",
runTime.timeName(),
runTime.name(),
meshName,
runTime,
IOobject::MUST_READ,

10
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -367,7 +367,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
// IOobject
// (
// "indices",
// time().timeName(),
// time().name(),
// name,
// time(),
// IOobject::NO_READ,
@ -381,7 +381,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
IOobject
(
"types",
time().timeName(),
time().name(),
name,
time(),
IOobject::NO_READ,
@ -395,7 +395,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
IOobject
(
"processorIndices",
time().timeName(),
time().name(),
name,
time(),
IOobject::NO_READ,
@ -600,7 +600,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
IOobject
(
name,
time().timeName(),
time().name(),
time(),
IOobject::NO_READ,
IOobject::NO_WRITE

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View File

@ -134,7 +134,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
IOobject
(
"cellWeights",
mesh_.time().timeName(),
mesh_.time().name(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
@ -394,7 +394,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
if (debug)
{
// const_cast<Time&>(mesh_.time())++;
// Info<< "Time " << mesh_.time().timeName() << endl;
// Info<< "Time " << mesh_.time().name() << endl;
meshCutter_.write();
mesh_.write();
cellWeights.write();
@ -423,7 +423,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
printMeshData(mesh_);
// const_cast<Time&>(mesh_.time())++;
// Info<< "Time " << mesh_.time().timeName() << endl;
// Info<< "Time " << mesh_.time().name() << endl;
meshCutter_.write();
mesh_.write();
cellWeights.write();
@ -434,7 +434,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
if (debug)
{
// const_cast<Time&>(mesh_.time())++;
// Info<< "Time " << mesh_.time().timeName() << endl;
// Info<< "Time " << mesh_.time().name() << endl;
cellWeights.write();
mesh_.write();
}
@ -786,7 +786,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
IOobject
(
"backgroundMeshDecomposition",
runTime_.timeName(),
runTime_.name(),
runTime_,
IOobject::MUST_READ,
IOobject::AUTO_WRITE,
@ -850,7 +850,7 @@ Foam::backgroundMeshDecomposition::distribute
if (debug)
{
// const_cast<Time&>(mesh_.time())++;
// Info<< "Time " << mesh_.time().timeName() << endl;
// Info<< "Time " << mesh_.time().name() << endl;
cellWeights.write();
mesh_.write();
}
@ -960,7 +960,7 @@ Foam::backgroundMeshDecomposition::distribute
if (debug)
{
// const_cast<Time&>(mesh_.time())++;
// Info<< "Time " << mesh_.time().timeName() << endl;
// Info<< "Time " << mesh_.time().name() << endl;
cellWeights.write();
mesh_.write();
}
@ -1004,7 +1004,7 @@ Foam::backgroundMeshDecomposition::distribute
<< endl;
// const_cast<Time&>(mesh_.time())++;
// Info<< "Time " << mesh_.time().timeName() << endl;
// Info<< "Time " << mesh_.time().name() << endl;
mesh_.write();
cellWeights.write();
}

10
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
View File

@ -374,7 +374,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
IOobject
(
meshSubDir,
runTime.timeName(),
runTime.name(),
runTime,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE
@ -389,7 +389,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
IOobject
(
"sizes",
runTime.timeName(),
runTime.name(),
meshSubDir,
runTime,
IOobject::READ_IF_PRESENT,
@ -404,7 +404,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
IOobject
(
"alignments",
mesh.time().timeName(),
mesh.time().name(),
meshSubDir,
mesh.time(),
IOobject::READ_IF_PRESENT,
@ -654,7 +654,7 @@ void Foam::cellShapeControlMesh::write() const
IOobject
(
"sizes",
mesh.time().timeName(),
mesh.time().name(),
meshSubDir,
mesh.time(),
IOobject::NO_READ,
@ -669,7 +669,7 @@ void Foam::cellShapeControlMesh::write() const
IOobject
(
"alignments",
mesh.time().timeName(),
mesh.time().name(),
meshSubDir,
mesh.time(),
IOobject::NO_READ,

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -968,7 +968,7 @@ void Foam::conformalVoronoiMesh::initialiseForMotion()
{
DelaunayMeshTools::writeOBJ
(
time().path()/"internalPoints_" + time().timeName() + ".obj",
time().path()/"internalPoints_" + time().name() + ".obj",
*this,
Foam::indexedVertexEnum::vtUnassigned,
Foam::indexedVertexEnum::vtExternalFeaturePoint
@ -1527,7 +1527,7 @@ void Foam::conformalVoronoiMesh::move()
Info<< "Writing point displacement vectors to file." << endl;
OFstream str
(
time().path()/"displacements_" + runTime_.timeName() + ".obj"
time().path()/"displacements_" + runTime_.name() + ".obj"
);
for
@ -1613,7 +1613,7 @@ void Foam::conformalVoronoiMesh::move()
{
DelaunayMeshTools::writeOBJ
(
time().path()/"internalPoints_" + time().timeName() + ".obj",
time().path()/"internalPoints_" + time().name() + ".obj",
*this,
Foam::indexedVertexEnum::vtInternal
);
@ -1622,13 +1622,13 @@ void Foam::conformalVoronoiMesh::move()
{
DelaunayMeshTools::writeBoundaryPoints
(
time().path()/"boundaryPoints_" + time().timeName() + ".obj",
time().path()/"boundaryPoints_" + time().name() + ".obj",
*this
);
DelaunayMeshTools::writeOBJ
(
time().path()/"internalBoundaryPoints_" + time().timeName()
time().path()/"internalBoundaryPoints_" + time().name()
+ ".obj",
*this,
Foam::indexedVertexEnum::vtInternalSurface,
@ -1637,7 +1637,7 @@ void Foam::conformalVoronoiMesh::move()
DelaunayMeshTools::writeOBJ
(
time().path()/"externalBoundaryPoints_" + time().timeName()
time().path()/"externalBoundaryPoints_" + time().name()
+ ".obj",
*this,
Foam::indexedVertexEnum::vtExternalSurface,
@ -1647,7 +1647,7 @@ void Foam::conformalVoronoiMesh::move()
OBJstream multipleIntersections
(
"multipleIntersections_"
+ time().timeName()
+ time().name()
+ ".obj"
);
@ -1705,7 +1705,7 @@ void Foam::conformalVoronoiMesh::move()
if (time().writeTime())
{
writeMesh(time().timeName());
writeMesh(time().name());
}
Info<< nl

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -734,7 +734,7 @@ Foam::conformalVoronoiMesh::createPolyMeshFromPoints
IOobject
(
"foamyHexMesh_temporary",
runTime_.timeName(),
runTime_.name(),
runTime_,
IOobject::NO_READ,
IOobject::NO_WRITE

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
View File

@ -171,7 +171,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
// Have to explicitly update the mesh instance.
const_cast<fvMesh&>(decomposition_().mesh()).setInstance
(
time().timeName()
time().name()
);
decomposition_().mesh().write();
@ -1225,7 +1225,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
// IOobject
// (
// "ptTargetCellSize",
// runTime_.timeName(),
// runTime_.name(),
// tetMesh,
// IOobject::NO_READ,
// IOobject::AUTO_WRITE
@ -1310,7 +1310,7 @@ void Foam::conformalVoronoiMesh::writeCellCentres
) const
{
Info<< "Writing components of cellCentre positions to volScalarFields"
<< " ccx, ccy, ccz in " << runTime_.timeName() << endl;
<< " ccx, ccy, ccz in " << runTime_.name() << endl;
for (direction i=0; i<vector::nComponents; i++)
{
@ -1319,7 +1319,7 @@ void Foam::conformalVoronoiMesh::writeCellCentres
IOobject
(
"cc" + word(vector::componentNames[i]),
runTime_.timeName(),
runTime_.name(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
View File

@ -71,7 +71,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
IOobject
(
"cellWeights",
bMesh.time().timeName(),
bMesh.time().name(),
bMesh,
IOobject::NO_READ,
IOobject::NO_WRITE

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -80,7 +80,7 @@ List<Vb::Point> pointFile::initialPoints() const
IOobject
(
pointFileName_.name(),
time().timeName(),
time().name(),
time(),
IOobject::MUST_READ,
IOobject::NO_WRITE

8
applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -111,7 +111,7 @@ int main(int argc, char *argv[])
conformalVoronoiMesh::debug = true;
Info<< "Create mesh for time = " << runTime.timeName() << nl << endl;
Info<< "Create mesh for time = " << runTime.name() << nl << endl;
conformalVoronoiMesh mesh(runTime, foamyHexMeshDict);
@ -122,7 +122,7 @@ int main(int argc, char *argv[])
runTime++;
mesh.writeMesh(runTime.timeName());
mesh.writeMesh(runTime.name());
}
else
{
@ -132,7 +132,7 @@ int main(int argc, char *argv[])
{
runTime++;
Info<< nl << "Time = " << runTime.timeName() << endl;
Info<< nl << "Time = " << runTime.name() << endl;
mesh.move();

6
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View File

@ -576,7 +576,7 @@ int main(int argc, char *argv[])
if (writeMesh)
{
runTime++;
Info<< "Writing mesh to " << runTime.timeName() << endl;
Info<< "Writing mesh to " << runTime.name() << endl;
backgroundMesh.mesh().write();
}
@ -600,7 +600,7 @@ int main(int argc, char *argv[])
IOobject
(
"cellDistance",
mesh.time().timeName(),
mesh.time().name(),
mesh.time(),
IOobject::NO_READ,
IOobject::NO_WRITE,
@ -663,7 +663,7 @@ int main(int argc, char *argv[])
IOobject
(
"pointDistance",
mesh.time().timeName(),
mesh.time().name(),
mesh.time(),
IOobject::NO_READ,
IOobject::NO_WRITE,

6
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -979,7 +979,7 @@ void Foam::CV2D::write(const word& stage) const
(
stage
+ "Faces/allFaces_"
+ runTime_.timeName()
+ runTime_.name()
+ ".obj",
false
);
@ -988,7 +988,7 @@ void Foam::CV2D::write(const word& stage) const
(
stage
+ "Triangles/allTriangles_"
+ runTime_.timeName()
+ runTime_.name()
+ ".obj",
false
);

2
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
View File

@ -105,7 +105,7 @@ int main(int argc, char *argv[])
while (runTime.loop())
{
Info<< nl << "Time = " << runTime.timeName() << endl;
Info<< nl << "Time = " << runTime.name() << endl;
mesh.newPoints();
}

12
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -623,13 +623,13 @@ void writeMesh
const fvMesh& mesh = meshRefiner.mesh();
meshRefiner.printMeshInfo(debugLevel, msg);
Info<< "Writing mesh to time " << meshRefiner.timeName() << endl;
Info<< "Writing mesh to time " << meshRefiner.name() << endl;
meshRefiner.write
(
debugLevel,
meshRefinement::writeType(writeLevel | meshRefinement::WRITEMESH),
mesh.time().path()/meshRefiner.timeName()
mesh.time().path()/meshRefiner.name()
);
Info<< "Wrote mesh in = "
<< mesh.time().cpuTimeIncrement() << " s." << endl;
@ -677,7 +677,7 @@ int main(int argc, char *argv[])
{
Foam::Info
<< "Create mesh for time = "
<< runTime.timeName() << Foam::nl << Foam::endl;
<< runTime.name() << Foam::nl << Foam::endl;
meshPtr.set
(
@ -686,7 +686,7 @@ int main(int argc, char *argv[])
Foam::IOobject
(
Foam::fvMesh::defaultRegion,
runTime.timeName(),
runTime.name(),
runTime,
Foam::IOobject::MUST_READ
),
@ -1035,7 +1035,7 @@ int main(int argc, char *argv[])
(
meshRefinement::debugType(debugLevel&meshRefinement::OBJINTERSECTIONS),
meshRefinement::writeType(0),
mesh.time().path()/meshRefiner.timeName()
mesh.time().path()/meshRefiner.name()
);
@ -1441,7 +1441,7 @@ int main(int argc, char *argv[])
IOobject
(
"internalCellCentres",
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE

2
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
View File

@ -976,7 +976,7 @@ Foam::label Foam::checkGeometry
/functionObjects::writeFile::outputPrefix
/(mesh.name() != polyMesh::defaultRegion ? mesh.name() : word())
/"checkMesh"
/mesh.time().timeName();
/mesh.time().name();
const polyBoundaryMesh& patches = mesh.boundaryMesh();

4
applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
View File

@ -336,7 +336,7 @@ Foam::label Foam::checkTopology
Info<< " The mesh has multiple regions which are not connected "
"by any face." << endl
<< " <<Writing region information to "
<< mesh.time().timeName()/"cellToRegion"
<< mesh.time().name()/"cellToRegion"
<< endl;
labelIOList ctr
@ -344,7 +344,7 @@ Foam::label Foam::checkTopology
IOobject
(
"cellToRegion",
mesh.time().timeName(),
mesh.time().name(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE

4
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View File

@ -411,7 +411,7 @@ int main(int argc, char *argv[])
}
// Read fields
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
#include "readVolFields.H"
#include "readSurfaceFields.H"
@ -740,7 +740,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
}
Info<< "Writing mesh to " << runTime.timeName() << endl;
Info<< "Writing mesh to " << runTime.name() << endl;
mesh.write();

6
applications/utilities/mesh/manipulation/createNonConformalCouples/createNonConformalCouples.C
View File

@ -196,7 +196,7 @@ int main(int argc, char *argv[])
const word oldInstance = mesh.pointsInstance();
// Read the fields
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
#include "readVolFields.H"
#include "readSurfaceFields.H"
@ -470,7 +470,7 @@ int main(int argc, char *argv[])
}
}
mesh.setInstance(runTime.timeName());
mesh.setInstance(runTime.name());
// Set the precision of the points data to 10
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
@ -485,7 +485,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info<< "Writing mesh to " << runTime.timeName() << nl << endl;
Info<< "Writing mesh to " << runTime.name() << nl << endl;
mesh.write();
Info<< "End\n" << endl;

2
applications/utilities/mesh/manipulation/createPatch/createPatch.C
View File

@ -777,7 +777,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info<< "Writing repatched mesh to " << runTime.timeName() << nl << endl;
Info<< "Writing repatched mesh to " << runTime.name() << nl << endl;
mesh.write();
Info<< "End\n" << endl;

2
applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
View File

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
typeIOobject<volVectorField> Uheader
(
"U",
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ
);

4
applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
View File

@ -196,7 +196,7 @@ int main(int argc, char *argv[])
const word oldInstance = mesh.pointsInstance();
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -232,7 +232,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
}
Info<< "Writing mesh to time " << runTime.timeName() << endl;
Info<< "Writing mesh to time " << runTime.name() << endl;
mesh.write();
Info<< "End\n" << endl;

12
applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -105,7 +105,7 @@ int main(int argc, char *argv[])
#include "createTimes.H"
Info<< "Reading master mesh for time = " << runTimeMaster.timeName() << nl;
Info<< "Reading master mesh for time = " << runTimeMaster.name() << nl;
Info<< "Create mesh\n" << endl;
mergePolyMesh masterMesh
@ -113,14 +113,14 @@ int main(int argc, char *argv[])
IOobject
(
masterRegion,
runTimeMaster.timeName(),
runTimeMaster.name(),
runTimeMaster
)
);
const word oldInstance = masterMesh.pointsInstance();
Info<< "Reading mesh to add for time = " << runTimeToAdd.timeName() << nl;
Info<< "Reading mesh to add for time = " << runTimeToAdd.name() << nl;
Info<< "Create mesh\n" << endl;
polyMesh meshToAdd
@ -128,7 +128,7 @@ int main(int argc, char *argv[])
IOobject
(
addRegion,
runTimeToAdd.timeName(),
runTimeToAdd.name(),
runTimeToAdd
)
);
@ -138,7 +138,7 @@ int main(int argc, char *argv[])
runTimeMaster++;
}
Info<< "Writing combined mesh to " << runTimeMaster.timeName() << endl;
Info<< "Writing combined mesh to " << runTimeMaster.name() << endl;
masterMesh.addMesh(meshToAdd);
masterMesh.merge();

2
applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
View File

@ -78,7 +78,7 @@ int main(int argc, char *argv[])
if (!overwrite)
{
runTime++;
mesh.setInstance(runTime.timeName());
mesh.setInstance(runTime.name());
}

6
applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
View File

@ -56,14 +56,14 @@ int main(int argc, char *argv[])
{
Foam::Info
<< "Create mesh " << regionName << " for time = "
<< runTime.timeName() << Foam::nl << Foam::endl;
<< runTime.name() << Foam::nl << Foam::endl;
}
else
{
regionName = Foam::fvMesh::defaultRegion;
Foam::Info
<< "Create mesh for time = "
<< runTime.timeName() << Foam::nl << Foam::endl;
<< runTime.name() << Foam::nl << Foam::endl;
}
Foam::fvMesh mesh
@ -71,7 +71,7 @@ int main(int argc, char *argv[])
Foam::IOobject
(
regionName,
runTime.timeName(),
runTime.name(),
runTime,
Foam::IOobject::MUST_READ
)

4
applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
View File

@ -479,7 +479,7 @@ int main(int argc, char *argv[])
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -529,7 +529,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
}
Info<< "Writing dual mesh to " << runTime.timeName() << endl;
Info<< "Writing dual mesh to " << runTime.name() << endl;
mesh.write();

6
applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
View File

@ -301,7 +301,7 @@ int main(int argc, char *argv[])
}
string oldTimeName(runTime.timeName());
string oldTimeName(runTime.name());
if (!overwrite)
{
@ -358,7 +358,7 @@ int main(int argc, char *argv[])
IOobject
(
"cellMap",
runTime.timeName(),
runTime.name(),
polyMesh::meshSubDir,
mesh,
IOobject::NO_READ,
@ -368,7 +368,7 @@ int main(int argc, char *argv[])
);
newToOld.note() =
"From cells in mesh at "
+ runTime.timeName()
+ runTime.name()
+ " to cells in mesh at "
+ oldTimeName;

4
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -71,7 +71,7 @@ void writeCellLabels
IOobject
(
name,
mesh.time().timeName(),
mesh.time().name(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -799,7 +799,7 @@ int main(int argc, char *argv[])
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;

4
applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -118,7 +118,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.userTimeName() << endl;
// Search for list of objects for this time
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
RotateFields<volVectorField>(mesh, objects, T);
RotateFields<volSphericalTensorField>(mesh, objects, T);

6
applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
View File

@ -117,7 +117,7 @@ int main(int argc, char *argv[])
{
runTime.setTime(timeDirs[timeI], timeI);
Info<< nl << "Time = " << runTime.timeName() << endl;
Info<< nl << "Time = " << runTime.name() << endl;
// Check for new mesh
@ -144,7 +144,7 @@ int main(int argc, char *argv[])
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -159,7 +159,7 @@ int main(int argc, char *argv[])
// Write
Info<< "Writing mesh to time " << runTime.timeName() << endl;
Info<< "Writing mesh to time " << runTime.name() << endl;
scMesh().write();
}

4
applications/utilities/mesh/manipulation/splitBaffles/splitBaffles.C
View File

@ -72,7 +72,7 @@ int main(int argc, char *argv[])
const word oldInstance = mesh.pointsInstance();
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -128,7 +128,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
}
Info<< "Writing mesh to time " << runTime.timeName() << endl;
Info<< "Writing mesh to time " << runTime.name() << endl;
mesh.write();
refData.topoChange(map);

4
applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
View File

@ -274,10 +274,10 @@ int main(int argc, char *argv[])
}
else
{
mesh.setInstance(runTime.timeName());
mesh.setInstance(runTime.name());
}
Info<< "Writing mesh to " << runTime.timeName() << endl;
Info<< "Writing mesh to " << runTime.name() << endl;
if (!mesh.write())
{
FatalErrorInFunction

16
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
View File

@ -717,7 +717,7 @@ autoPtr<polyTopoChangeMap> createRegionMesh
IOobject
(
regionName,
mesh.time().timeName(),
mesh.time().name(),
mesh.time(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -1366,7 +1366,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
IOobject
(
"cellToRegion",
mesh.time().timeName(),
mesh.time().name(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
@ -1835,7 +1835,7 @@ int main(int argc, char *argv[])
// Read objects in time directory
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -1910,14 +1910,14 @@ int main(int argc, char *argv[])
if (!overwrite)
{
runTime++;
mesh.setInstance(runTime.timeName());
mesh.setInstance(runTime.name());
}
else
{
mesh.setInstance(oldInstance);
}
Info<< "Writing cellZones as new mesh to time " << runTime.timeName()
Info<< "Writing cellZones as new mesh to time " << runTime.name()
<< nl << endl;
mesh.write();
@ -2006,7 +2006,7 @@ int main(int argc, char *argv[])
faceToInterface,
interfacePatches,
regioni,
(overwrite ? oldInstance : runTime.timeName())
(overwrite ? oldInstance : runTime.name())
);
}
else if (largestOnly)
@ -2027,7 +2027,7 @@ int main(int argc, char *argv[])
faceToInterface,
interfacePatches,
regioni,
(overwrite ? oldInstance : runTime.timeName())
(overwrite ? oldInstance : runTime.name())
);
}
else
@ -2048,7 +2048,7 @@ int main(int argc, char *argv[])
faceToInterface,
interfacePatches,
regioni,
(overwrite ? oldInstance : runTime.timeName())
(overwrite ? oldInstance : runTime.name())
);
}
}

4
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -434,7 +434,7 @@ int main(int argc, char *argv[])
// Search for list of objects for this time
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
if (fields) Info<< "Reading geometric fields" << nl << endl;
@ -459,7 +459,7 @@ int main(int argc, char *argv[])
stitcher.instance() = oldInstance;
stitcher.writeOpt() = IOobject::NO_WRITE;
}
Info<< nl << "Writing polyMesh to time " << runTime.timeName() << endl;
Info<< nl << "Writing polyMesh to time " << runTime.name() << endl;
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));

18
applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -68,7 +68,7 @@ void subsetVolFields
IOobject
(
fieldName,
baseMesh.time().timeName(),
baseMesh.time().name(),
baseMesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -102,7 +102,7 @@ void subsetSurfaceFields
IOobject
(
fieldName,
baseMesh.time().timeName(),
baseMesh.time().name(),
baseMesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -137,7 +137,7 @@ void subsetPointFields
IOobject
(
fieldName,
baseMesh.time().timeName(),
baseMesh.time().name(),
baseMesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -171,7 +171,7 @@ void subsetDimensionedFields
IOobject
(
fieldName,
baseMesh.time().timeName(),
baseMesh.time().name(),
baseMesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -227,7 +227,7 @@ int main(int argc, char *argv[])
const word setName = args[1];
word meshInstance = mesh.pointsInstance();
word fieldsInstance = runTime.timeName();
word fieldsInstance = runTime.name();
const bool overwrite = args.optionFound("overwrite");
const bool specifiedInstance = args.optionReadIfPresent
@ -280,7 +280,7 @@ int main(int argc, char *argv[])
if (fields)
{
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
// Read vol fields and subset
// ~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -462,7 +462,7 @@ int main(int argc, char *argv[])
}
Info<< "Writing subsetted mesh and fields to time "
<< runTime.timeName() << endl;
<< runTime.name() << endl;
subsetter.subMesh().write();
@ -590,7 +590,7 @@ int main(int argc, char *argv[])
}
Info<< "Writing subsetted mesh to time "
<< runTime.timeName() << endl;
<< runTime.name() << endl;
subsetter.subMesh().write();
}

4
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,7 +49,7 @@ using namespace Foam;
void printMesh(const Time& runTime, const polyMesh& mesh)
{
Info<< "Time:" << runTime.timeName()
Info<< "Time:" << runTime.name()
<< " cells:" << mesh.globalData().nTotalCells()
<< " faces:" << mesh.globalData().nTotalFaces()
<< " points:" << mesh.globalData().nTotalPoints()

2
applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
View File

@ -105,7 +105,7 @@ void rotateFields(const argList& args, const Time& runTime, const tensor& T)
#include "createNamedMesh.H"
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
// Read vol fields.
PtrList<volScalarField> vsFlds;

12
applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
View File

@ -79,7 +79,7 @@ bool writeZones(const word& name, const fileName& meshDir, Time& runTime)
IOobject io
(
name,
runTime.timeName(),
runTime.name(),
meshDir,
runTime,
IOobject::MUST_READ,
@ -189,7 +189,7 @@ bool writeOptionalMeshObject
IOobject io
(
name,
runTime.timeName(),
runTime.name(),
meshDir,
runTime,
IOobject::MUST_READ,
@ -312,7 +312,7 @@ int main(int argc, char *argv[])
}
// Get list of objects from the database
IOobjectList objects(runTime, runTime.timeName(), regionPrefix);
IOobjectList objects(runTime, runTime.name(), regionPrefix);
forAllConstIter(IOobjectList, objects, iter)
{
@ -384,7 +384,7 @@ int main(int argc, char *argv[])
else
{
Info<< " Create polyMesh for time = "
<< runTime.timeName() << endl;
<< runTime.name() << endl;
meshPtr.reset
(
@ -393,7 +393,7 @@ int main(int argc, char *argv[])
IOobject
(
regionName,
runTime.timeName(),
runTime.name(),
runTime,
Foam::IOobject::MUST_READ
)
@ -428,7 +428,7 @@ int main(int argc, char *argv[])
// Do local scan for valid cloud objects
IOobjectList sprayObjs(runTime, runTime.timeName(), dir);
IOobjectList sprayObjs(runTime, runTime.name(), dir);
// Combine with all other cloud objects
stringList sprayFields(sprayObjs.sortedToc());

4
applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,7 +51,7 @@ inline bool writeMeshObject
typeIOobject<CheckType> io
(
name,
runTime.timeName(),
runTime.name(),
meshDir,
runTime,
IOobject::MUST_READ,

6
applications/utilities/miscellaneous/patchSummary/patchSummary.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -79,7 +79,7 @@ int main(int argc, char *argv[])
}
const IOobjectList fieldObjs(mesh, runTime.timeName());
const IOobjectList fieldObjs(mesh, runTime.name());
const wordList objNames = fieldObjs.names();
PtrList<volScalarField> vsf(objNames.size());
@ -101,7 +101,7 @@ int main(int argc, char *argv[])
IOobject obj
(
objNames[objI],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ
);

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

@ -151,7 +151,7 @@ void decomposeUniform
{
fileHandler().ln
(
parentPath/runTime.timeName()/uniformDir,
parentPath/runTime.name()/uniformDir,
uniformDir
);
}
@ -169,7 +169,7 @@ void writeDecomposition(const domainDecomposition& meshes)
IOobject
(
"cellProc",
meshes.completeMesh().time().timeName(),
meshes.completeMesh().time().name(),
meshes.completeMesh(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -453,7 +453,7 @@ int main(int argc, char *argv[])
(
writeCellProc
&& meshes.completeMesh().facesInstance()
== runTimes.completeTime().timeName()
== runTimes.completeTime().name()
)
{
writeDecomposition(meshes);
@ -497,7 +497,7 @@ int main(int argc, char *argv[])
IOobject
(
"",
procRunTime.timeName(),
procRunTime.name(),
procRunTime
),
word::null
@ -523,7 +523,7 @@ int main(int argc, char *argv[])
IOobjectList objects
(
meshes.completeMesh(),
runTimes.completeTime().timeName()
runTimes.completeTime().name()
);
// Construct the vol fields
@ -643,7 +643,7 @@ int main(int argc, char *argv[])
IOobjectList sprayObjs
(
meshes.completeMesh(),
runTimes.completeTime().timeName(),
runTimes.completeTime().name(),
cloud::prefix/cloudDirs[i],
IOobject::MUST_READ,
IOobject::NO_WRITE,
@ -736,7 +736,7 @@ int main(int argc, char *argv[])
IOobjectList lagrangianObjects
(
meshes.completeMesh(),
runTimes.completeTime().timeName(),
runTimes.completeTime().name(),
cloud::prefix/cloudDirs[cloudI],
IOobject::MUST_READ,
IOobject::NO_WRITE,

4
applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,7 +45,7 @@ Foam::dimFieldDecomposer::decomposeField
IOobject
(
field.name(),
procMesh_.time().timeName(),
procMesh_.time().name(),
procMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,

4
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
View File

@ -113,7 +113,7 @@ Foam::fvFieldDecomposer::decomposeField
IOobject
(
field.name(),
procMesh_.time().timeName(),
procMesh_.time().name(),
procMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
@ -258,7 +258,7 @@ Foam::fvFieldDecomposer::decomposeField
IOobject
(
field.name(),
procMesh_.time().timeName(),
procMesh_.time().name(),
procMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,

4
applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
View File

@ -135,7 +135,7 @@ Foam::lagrangianFieldDecomposer::decomposeField
IOobject
(
field.name(),
procMesh_.time().timeName(),
procMesh_.time().name(),
cloud::prefix/cloudName,
procMesh_,
IOobject::NO_READ,
@ -167,7 +167,7 @@ Foam::lagrangianFieldDecomposer::decomposeFieldField
IOobject
(
field.name(),
procMesh_.time().timeName(),
procMesh_.time().name(),
cloud::prefix/cloudName,
procMesh_,
IOobject::NO_READ,

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

@ -80,7 +80,7 @@ Foam::pointFieldDecomposer::decomposeField
IOobject
(
field.name(),
procMesh_().time().timeName(),
procMesh_().time().name(),
procMesh_(),
IOobject::NO_READ,
IOobject::NO_WRITE,

12
applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
View File

@ -110,7 +110,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeInternalField
IOobject
(
fieldIoObject.name(),
procMeshes_[proci].time().timeName(),
procMeshes_[proci].time().name(),
procMeshes_[proci],
IOobject::MUST_READ,
IOobject::NO_WRITE,
@ -126,7 +126,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeInternalField
IOobject
(
fieldIoObject.name(),
completeMesh_.time().timeName(),
completeMesh_.time().name(),
completeMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
@ -274,7 +274,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
IOobject
(
fieldIoObject.name(),
procMeshes_[proci].time().timeName(),
procMeshes_[proci].time().name(),
procMeshes_[proci],
IOobject::MUST_READ,
IOobject::NO_WRITE,
@ -290,7 +290,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
IOobject
(
fieldIoObject.name(),
completeMesh_.time().timeName(),
completeMesh_.time().name(),
completeMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
@ -437,7 +437,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
IOobject
(
fieldIoObject.name(),
procMeshes_[proci].time().timeName(),
procMeshes_[proci].time().name(),
procMeshes_[proci],
IOobject::MUST_READ,
IOobject::NO_WRITE,
@ -453,7 +453,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
IOobject
(
fieldIoObject.name(),
completeMesh_.time().timeName(),
completeMesh_.time().name(),
completeMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,

4
applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructorReconstructFields.C
View File

@ -47,7 +47,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
IOobject
(
fieldIoObject.name(),
procMeshes_[proci]().time().timeName(),
procMeshes_[proci]().time().name(),
procMeshes_[proci](),
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -125,7 +125,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
IOobject
(
fieldIoObject.name(),
completeMesh_().time().timeName(),
completeMesh_().time().name(),
completeMesh_(),
IOobject::NO_READ,
IOobject::NO_WRITE

8
applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangianFields.C
View File

@ -46,7 +46,7 @@ Foam::tmp<Foam::IOField<Type>> Foam::reconstructLagrangianField
IOobject
(
fieldName,
mesh.time().timeName(),
mesh.time().name(),
cloud::prefix/cloudName,
mesh,
IOobject::NO_READ,
@ -63,7 +63,7 @@ Foam::tmp<Foam::IOField<Type>> Foam::reconstructLagrangianField
typeIOobject<IOField<Type>> localIOobject
(
fieldName,
meshes[i].time().timeName(),
meshes[i].time().name(),
cloud::prefix/cloudName,
meshes[i],
IOobject::MUST_READ,
@ -106,7 +106,7 @@ Foam::reconstructLagrangianFieldField
IOobject
(
fieldName,
mesh.time().timeName(),
mesh.time().name(),
cloud::prefix/cloudName,
mesh,
IOobject::NO_READ,
@ -123,7 +123,7 @@ Foam::reconstructLagrangianFieldField
IOobject localIOobject
(
fieldName,
meshes[i].time().timeName(),
meshes[i].time().name(),
cloud::prefix/cloudName,
meshes[i],
IOobject::MUST_READ,

8
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
View File

@ -71,7 +71,7 @@ void writeDecomposition(const domainDecomposition& meshes)
IOobject
(
"cellProc",
meshes.completeMesh().time().timeName(),
meshes.completeMesh().time().name(),
meshes.completeMesh(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -312,7 +312,7 @@ int main(int argc, char *argv[])
(
writeCellProc
&& meshes.completeMesh().facesInstance()
== runTimes.completeTime().timeName()
== runTimes.completeTime().name()
)
{
writeDecomposition(meshes);
@ -323,7 +323,7 @@ int main(int argc, char *argv[])
IOobjectList objects
(
meshes.procMeshes()[0],
runTimes.procTimes()[0].timeName()
runTimes.procTimes()[0].name()
);
if (!noFields)
@ -527,7 +527,7 @@ int main(int argc, char *argv[])
IOobjectList sprayObjs
(
meshes.procMeshes()[proci],
runTimes.procTimes()[proci].timeName(),
runTimes.procTimes()[proci].name(),
cloud::prefix/cloudDirs[i]
);

12
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -170,7 +170,7 @@ void writeDecomposition
IOobject
(
name,
mesh.time().timeName(),
mesh.time().name(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
@ -276,7 +276,7 @@ void readFields
IOobject
(
name,
mesh.thisDb().time().timeName(),
mesh.thisDb().time().name(),
mesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -461,7 +461,7 @@ int main(int argc, char *argv[])
// Get original objects (before incrementing time!)
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
// We don't want to map the decomposition (mapping already tested when
// mapping the cell centre field)
IOobjectList::iterator iter = objects.find("decomposition");
@ -661,7 +661,7 @@ int main(int argc, char *argv[])
{
mesh.setInstance(masterInstDir);
}
Info<< "Writing redistributed mesh to " << runTime.timeName() << nl << endl;
Info<< "Writing redistributed mesh to " << runTime.name() << nl << endl;
mesh.write();
@ -676,7 +676,7 @@ int main(int argc, char *argv[])
Info<< nl
<< "You can pick up the redecomposed mesh from the polyMesh directory"
<< " in " << runTime.timeName() << "." << nl
<< " in " << runTime.name() << "." << nl
<< "If you redecomposed the mesh to less processors you can delete"
<< nl
<< "the processor directories with 0 sized meshes in them." << nl
@ -694,7 +694,7 @@ int main(int argc, char *argv[])
}
else
{
fileName timeDir = procDir/runTime.timeName()/meshSubDir;
fileName timeDir = procDir/runTime.name()/meshSubDir;
fileName constDir = procDir/runTime.constant()/meshSubDir;
Info<< " rm -r " << constDir.c_str() << nl

6
applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,7 +71,7 @@ int main(int argc, char *argv[])
runTime.rootPath()/
runTime.caseName()/
"fluentInterface"/
runTime.caseName() + runTime.timeName() + ".dat"
runTime.caseName() + runTime.name() + ".dat"
);
fluentDataFile
@ -103,7 +103,7 @@ int main(int argc, char *argv[])
// Search for list of objects for this time
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
// Converting volScalarField

12
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
View File

@ -271,7 +271,7 @@ int main(int argc, char *argv[])
// Set Time to the last time before looking for the lagrangian objects
runTime.setTime(Times.last(), Times.size()-1);
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
#include "checkMeshMoving.H"
@ -316,7 +316,7 @@ int main(int argc, char *argv[])
IOobjectList cloudObjs
(
mesh,
runTime.timeName(),
runTime.name(),
cloud::prefix/cloudDirs[cloudI]
);
@ -361,7 +361,7 @@ int main(int argc, char *argv[])
IOobjectList cloudObjs
(
mesh,
runTime.timeName(),
runTime.name(),
cloud::prefix/cloudIter.key()
);
@ -391,7 +391,7 @@ int main(int argc, char *argv[])
word timeName = itoa(timeIndex);
word timeFile = prepend + timeName;
Info<< "Translating time = " << runTime.timeName() << nl;
Info<< "Translating time = " << runTime.name() << nl;
polyMesh::readUpdateState meshState = mesh.readUpdate();
if (timeIndex != 0 && meshSubsetter.hasSubMesh())
@ -463,7 +463,7 @@ int main(int argc, char *argv[])
IOobject fieldObject
(
fieldName,
mesh.time().timeName(),
mesh.time().name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -579,7 +579,7 @@ int main(int argc, char *argv[])
IOobject fieldObject
(
fieldName,
mesh.time().timeName(),
mesh.time().name(),
cloud::prefix/cloudName,
mesh,
IOobject::MUST_READ

8
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
View File

@ -247,7 +247,7 @@ int main(int argc, char *argv[])
OFstream timeStamp(dataDir/subDir/"time");
timeStamp
<< "# timestep time" << nl
<< subDir.c_str() << " " << runTime.timeName() << nl;
<< subDir.c_str() << " " << runTime.name() << nl;
}
#include "moveMesh.H"
@ -283,7 +283,7 @@ int main(int argc, char *argv[])
IOobject fieldObject
(
fieldName,
mesh.time().timeName(),
mesh.time().name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -375,7 +375,7 @@ int main(int argc, char *argv[])
IOobjectList cloudObjs
(
mesh,
runTime.timeName(),
runTime.name(),
cloud::prefix/cloudName
);
@ -409,7 +409,7 @@ int main(int argc, char *argv[])
if (!fieldObject)
{
Info<< "missing "
<< runTime.timeName()/cloud::prefix/cloudName
<< runTime.name()/cloud::prefix/cloudName
/ fieldName
<< endl;
continue;

8
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H
View File

@ -9,14 +9,14 @@
}
else if
(
runTime.timeName() != runTime.constant()
&& runTime.timeName() != "0"
runTime.name() != runTime.constant()
&& runTime.name() != "0"
)
{
typeIOobject<IOdictionary> io
(
"time",
runTime.timeName(),
runTime.name(),
"uniform",
runTime,
IOobject::READ_IF_PRESENT,
@ -40,4 +40,4 @@
}
timeIndices.insert(timeIndex, timeDirs[timeI].value());
Info<< "\nTime [" << timeIndex << "] = " << runTime.timeName() << nl;
Info<< "\nTime [" << timeIndex << "] = " << runTime.name() << nl;

2
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
View File

@ -2,7 +2,7 @@
typeIOobject<pointIOField> io
(
"points",
runTime.timeName(),
runTime.name(),
polyMesh::meshSubDir,
mesh
);

6
applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -74,9 +74,9 @@ int main(int argc, char *argv[])
// Set Time
runTime.setTime(TimeList[n], n);
word CurTime = runTime.timeName();
word CurTime = runTime.name();
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
#include "moveMesh.H"

6
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
View File

@ -14,7 +14,7 @@ for (label i=0; i < nTypes; i++)
IOobject fieldObject
(
fieldName,
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
@ -65,7 +65,7 @@ for (label i=0; i < nTypes; i++)
IOobject lagrangianHeader
(
"positions",
runTime.timeName(),
runTime.name(),
cloud::prefix,
mesh,
IOobject::NO_READ
@ -75,7 +75,7 @@ for (label i=0; i < nTypes; i++)
{
Cloud<passiveParticle> particles(mesh, cloud::defaultName);
IOobjectList objects(mesh, runTime.timeName(), cloud::prefix);
IOobjectList objects(mesh, runTime.name(), cloud::prefix);
wordList lagrangianScalarNames = objects.names("scalarField");
wordList lagrangianVectorNames = objects.names("vectorField");

4
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
View File

@ -28,7 +28,7 @@ forAll(lagrangianScalarNames, i)
IOobject
(
name,
runTime.timeName(),
runTime.name(),
cloud::prefix,
mesh,
IOobject::MUST_READ,
@ -57,7 +57,7 @@ forAll(lagrangianVectorNames, i)
IOobject
(
name,
runTime.timeName(),
runTime.name(),
cloud::prefix,
mesh,
IOobject::MUST_READ,

2
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
View File

@ -26,7 +26,7 @@ forAll(lagrangianScalarNames, i)
IOobject
(
name,
runTime.timeName(),
runTime.name(),
cloud::prefix,
mesh,
IOobject::MUST_READ,

2
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
View File

@ -1,3 +1,3 @@
gmvFile
<< "probtime " << runTime.timeName() << nl
<< "probtime " << runTime.name() << nl
<< "endgmv" << nl;

4
applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
View File

@ -1,7 +1,7 @@
typeIOobject<pointIOField> ioPoints
(
"points",
runTime.timeName(),
runTime.name(),
mesh.name(),
mesh
);
@ -15,7 +15,7 @@ if (ioPoints.headerOk())
IOobject
(
"points",
runTime.timeName(),
runTime.name(),
mesh.name(),
mesh,
IOobject::MUST_READ,

14
applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -314,7 +314,7 @@ int main(int argc, char *argv[])
{
runTime.setTime(timeDirs[timeI], timeI);
Info<< "Time: " << runTime.timeName() << endl;
Info<< "Time: " << runTime.name() << endl;
const word timeDesc = name(timeI); // name(runTime.timeIndex());
@ -335,7 +335,7 @@ int main(int argc, char *argv[])
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Search for list of objects for this time
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
HashSet<word> selectedFields;
if (args.optionFound("fields"))
@ -1222,7 +1222,7 @@ int main(int argc, char *argv[])
IOobjectList sprayObjs
(
mesh,
runTime.timeName(),
runTime.name(),
cloud::prefix/cloudDirs[cloudI]
);
@ -1354,7 +1354,7 @@ int main(int argc, char *argv[])
IOobject
(
labelNames[i],
mesh.time().timeName(),
mesh.time().name(),
cloud::prefix/cloudDirs[cloudI],
mesh,
IOobject::MUST_READ,
@ -1378,7 +1378,7 @@ int main(int argc, char *argv[])
IOobject
(
scalarNames[i],
mesh.time().timeName(),
mesh.time().name(),
cloud::prefix/cloudDirs[cloudI],
mesh,
IOobject::MUST_READ,
@ -1396,7 +1396,7 @@ int main(int argc, char *argv[])
IOobject
(
vectorNames[i],
mesh.time().timeName(),
mesh.time().name(),
cloud::prefix/cloudDirs[cloudI],
mesh,
IOobject::MUST_READ,

8
applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -160,14 +160,14 @@ int main(int argc, char *argv[])
// Read the tetDualMesh
Info<< "Create tetDualMesh for time = "
<< runTime.timeName() << nl << endl;
<< runTime.name() << nl << endl;
fvMesh tetDualMesh
(
IOobject
(
"tetDualMesh",
runTime.timeName(),
runTime.name(),
runTime,
IOobject::MUST_READ
),
@ -244,7 +244,7 @@ int main(int argc, char *argv[])
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
// Read vol fields, interpolate onto tet points
PtrList<pointScalarField> psFlds;

12
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -456,7 +456,7 @@ int main(int argc, char *argv[])
IOobjectList sprayObjs
(
mesh,
runTime.timeName(),
runTime.name(),
cloud::prefix/cloudDirs[i]
);
@ -466,7 +466,7 @@ int main(int argc, char *argv[])
{
if (allCloudDirs.insert(cloudDirs[i]))
{
Info<< "At time: " << runTime.timeName()
Info<< "At time: " << runTime.name()
<< " detected cloud directory : " << cloudDirs[i]
<< endl;
}
@ -479,10 +479,10 @@ int main(int argc, char *argv[])
{
runTime.setTime(timeDirs[timeI], timeI);
Info<< "Time: " << runTime.timeName() << endl;
Info<< "Time: " << runTime.name() << endl;
word timeDesc =
useTimeName ? runTime.timeName() : Foam::name(runTime.timeIndex());
useTimeName ? runTime.name() : Foam::name(runTime.timeIndex());
// Check for new polyMesh/ and update mesh, fvMeshSubset and cell
// decomposition.
@ -549,7 +549,7 @@ int main(int argc, char *argv[])
// Search for list of objects for this time
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
HashSet<word> selectedFields;
bool specifiedFields = args.optionReadIfPresent
@ -1148,7 +1148,7 @@ int main(int argc, char *argv[])
IOobjectList sprayObjs
(
mesh,
runTime.timeName(),
runTime.name(),
cloud::prefix/cloudName
);

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,7 +40,7 @@ void Foam::lagrangianWriter::writeIOField(const wordList& objects)
IOobject header
(
object,
vMesh_.mesh().time().timeName(),
vMesh_.mesh().time().name(),
cloud::prefix/cloudName_,
vMesh_.mesh(),
IOobject::MUST_READ,

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C
View File

@ -90,9 +90,9 @@ bool Foam::functionObjects::writeVTK::write()
{
Info<< type() << " " << name() << " output:" << nl;
Info<< "Time: " << time_.timeName() << endl;
Info<< "Time: " << time_.name() << endl;
word timeDesc = time_.timeName();
word timeDesc = time_.name();
// VTK/ directory in the case
fileName fvPath(time_.path()/"VTK");

6
applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -131,7 +131,7 @@ int main(int argc, char *argv[])
IOobject
(
nameMap.lookup(starFieldNames[i]),
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE,
@ -150,7 +150,7 @@ int main(int argc, char *argv[])
IOobject
(
nameMap.lookup(starFieldNames[i]),
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE,

8
applications/utilities/postProcessing/foamPostProcess/foamPostProcess.C
View File

@ -128,7 +128,7 @@ void executeFunctionObjects
LIFOStack<regIOobject*> storedObjects;
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
IOobjectList objects(mesh, runTime.name());
HashSet<word> requiredFields(requiredFields0);
forAll(functions, i)
@ -232,13 +232,13 @@ int main(int argc, char *argv[])
{
Info
<< "Create mesh " << regionName << " for time = "
<< runTime.timeName() << nl << endl;
<< runTime.name() << nl << endl;
}
else
{
Info
<< "Create mesh for time = "
<< runTime.timeName() << nl << endl;
<< runTime.name() << nl << endl;
}
fvMesh mesh
@ -246,7 +246,7 @@ int main(int argc, char *argv[])
IOobject
(
regionName,
runTime.timeName(),
runTime.name(),
runTime,
IOobject::MUST_READ
)

4
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C
View File

@ -466,7 +466,7 @@ void Foam::vtkPVFoam::updateFoamMesh()
{
InfoInFunction << endl
<< " Creating OpenFOAM mesh for region " << meshRegion_
<< " at time=" << dbPtr_().timeName() << endl;
<< " at time=" << dbPtr_().name() << endl;
}
meshPtr_ = new fvMesh
@ -474,7 +474,7 @@ void Foam::vtkPVFoam::updateFoamMesh()
IOobject
(
meshRegion_,
dbPtr_().timeName(),
dbPtr_().name(),
dbPtr_(),
IOobject::MUST_READ
),

6
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamFields.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -104,7 +104,7 @@ void Foam::vtkPVFoam::convertFields(vtkMultiBlockDataSet* output)
(
selectedFields,
mesh,
dbPtr_().timeName()
dbPtr_().name()
)
);
@ -249,7 +249,7 @@ void Foam::vtkPVFoam::convertLagrangianFields(vtkMultiBlockDataSet* output)
(
selectedFields,
mesh,
dbPtr_().timeName(),
dbPtr_().name(),
cloud::prefix/cloudName
)
);

2
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMeshLagrangian.C
View File

@ -59,7 +59,7 @@ vtkPolyData* Foam::vtkPVFoam::lagrangianVTKMesh
IOobjectList sprayObjs
(
mesh,
mesh.time().timeName(),
mesh.time().name(),
cloud::prefix/cloudName
);

4
applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -329,7 +329,7 @@ void Foam::vtkPVblockMesh::updateFoamMesh()
if (debug)
{
InfoInFunction
<< "Creating blockMesh at time=" << dbPtr_().timeName() << endl;
<< "Creating blockMesh at time=" << dbPtr_().name() << endl;
}
// Set path for the blockMeshDict

2
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H
View File

@ -32,7 +32,7 @@ int USERD_get_maxsize_info
runTimePtr->setTime(timeDirs[timeI], timeI);
Info<< "Checking time = " << runTimePtr->timeName() << endl;
Info<< "Checking time = " << runTimePtr->name() << endl;
const cellShapeList& cells = meshPtr->cellShapes();

2
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_value_at_specific.H
View File

@ -28,7 +28,7 @@ int USERD_get_var_value_at_specific
IOobject fieldObject
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE

8
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
View File

@ -73,7 +73,7 @@ int USERD_set_filenames
IOobject
(
fvMesh::defaultRegion,
runTime.timeName(),
runTime.name(),
runTime
),
false
@ -89,7 +89,7 @@ int USERD_set_filenames
// set the number of fields and store their names
// a valid field must exist for all time-steps
runTime.setTime(timeDirs.last(), timeDirs.size()-1);
IOobjectList objects(*meshPtr, runTime.timeName());
IOobjectList objects(*meshPtr, runTime.name());
fieldNames = objects.names();
@ -164,7 +164,7 @@ int USERD_set_filenames
IOobject sprayHeader
(
"positions",
runTime.timeName(),
runTime.name(),
cloud::prefix,
runTime,
IOobject::NO_READ,
@ -180,7 +180,7 @@ int USERD_set_filenames
sprayPtr = new Cloud<passiveParticle>(*meshPtr, cloud::defaultName);
IOobjectList objects(*meshPtr, runTime.timeName(), cloud::prefix);
IOobjectList objects(*meshPtr, runTime.name(), cloud::prefix);
lagrangianScalarNames =
objects.names(sprayScalarFieldName);

4
applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldScalar.H
View File

@ -6,7 +6,7 @@ if (nVar >= Num_variables - nSprayVariables)
typeIOobject<volScalarField> fieldObjectPtr
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ
);
@ -19,7 +19,7 @@ if (!fieldObjectPtr.headerOk())
IOobject fieldObject
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE

4
applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H
View File

@ -7,7 +7,7 @@ if (nVar >= Num_variables - nSprayVariables)
typeIOobject<volTensorField> fieldObjectPtr
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ
);
@ -20,7 +20,7 @@ if (!fieldObjectPtr.headerOk())
IOobject fieldObject
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE

4
applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldVector.H
View File

@ -7,7 +7,7 @@ if (nVar >= Num_variables - nSprayVariables)
typeIOobject<volVectorField> fieldObjectPtr
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ
);
@ -20,7 +20,7 @@ if (!fieldObjectPtr.headerOk())
IOobject fieldObject
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE

2
applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H
View File

@ -11,7 +11,7 @@ if (nVar >= 0)
IOobject
(
name,
runTime.timeName(),
runTime.name(),
cloud::prefix,
mesh,
IOobject::MUST_READ,

2
applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
View File

@ -12,7 +12,7 @@ if (nVar >= 0)
IOobject
(
name,
runTime.timeName(),
runTime.name(),
cloud::prefix,
mesh,
IOobject::MUST_READ,

4
applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldScalar.H
View File

@ -8,7 +8,7 @@ if (nVar >= Num_variables - nSprayVariables)
typeIOobject<volScalarField> fieldObjectPtr
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::NO_READ
);
@ -21,7 +21,7 @@ if (!fieldObjectPtr.headerOk())
IOobject fieldObject
(
fieldNames[var2field[nVar]],
runTime.timeName(),
runTime.name(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE

Some files were not shown because too many files have changed in this diff Show More