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

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