From ed7e703040536ba2ac593a7a7d7262ceda274af5 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 30 Nov 2022 15:53:51 +0000 Subject: [PATCH] Time::timeName(): no longer needed, calls replaced by name() 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. --- .../solvers/DNS/dnsFoam/createFields.H | 4 +- applications/solvers/DNS/dnsFoam/dnsFoam.C | 4 +- .../solvers/DNS/dnsFoam/globalProperties.H | 6 +-- .../basic/laplacianFoam/createFields.H | 2 +- .../solvers/basic/laplacianFoam/write.H | 6 +-- .../basic/potentialFoam/createFields.H | 8 +-- .../basic/scalarTransportFoam/createFields.H | 4 +- .../combustion/XiFoam/PDRFoam/PDRFoam.C | 2 +- .../XiFoam/PDRFoam/PDRFoamAutoRefine.C | 2 +- .../basicXiSubXiEq/basicXiSubXiEq.C | 2 +- .../XiModels/XiEqModels/XiEqModel/XiEqModel.C | 2 +- .../XiFoam/PDRFoam/XiModels/XiModel/XiModel.C | 2 +- .../combustion/XiFoam/PDRFoam/createFields.H | 10 ++-- .../solvers/combustion/XiFoam/createFields.H | 12 ++--- .../combustion/chemFoam/createBaseFields.H | 8 +-- .../combustion/chemFoam/createFields.H | 6 +-- .../rhoCentralFoam/createFields.H | 12 ++--- .../rhoPorousSimpleFoam/createFields.H | 4 +- .../mdEquilibrationFoam/mdEquilibrationFoam.C | 4 +- .../molecularDynamics/mdFoam/createFields.H | 2 +- .../electrostaticFoam/createFields.H | 6 +-- .../electrostaticFoam/electrostaticFoam.C | 4 +- .../magneticFoam/createFields.H | 6 +-- .../magneticFoam/magneticFoam.C | 14 ++--- .../electromagnetics/mhdFoam/createFields.H | 8 +-- .../electromagnetics/mhdFoam/createPhiB.H | 6 +-- .../financial/financialFoam/createFields.H | 8 +-- .../financial/financialFoam/financialFoam.C | 4 +- .../solvers/foamMultiRun/foamMultiRun.C | 2 +- .../heatTransfer/thermoFoam/createFields.H | 6 +-- .../createFields.H | 10 ++-- .../adjointShapeOptimisationFoam/createPhia.H | 4 +- .../boundaryFoam/createFields.H | 4 +- .../incompressible/boundaryFoam/makeGraphs.H | 4 +- .../incompressible/icoFoam/createFields.H | 4 +- .../porousSimpleFoam/createFields.H | 4 +- .../shallowWaterFoam/createFields.H | 8 +-- .../shallowWaterFoam/createPhi.H | 4 +- .../shallowWaterFoam/shallowWaterFoam.C | 4 +- .../denseParticleFoam/createFields.H | 12 ++--- .../lagrangian/denseParticleFoam/createUcf.H | 4 +- .../denseParticleFoam/createUcfIfPresent.H | 4 +- .../denseParticleFoam/denseParticleFoam.C | 4 +- .../lagrangian/particleFoam/createFields.H | 10 ++-- .../createNonInertialFrameFields.H | 8 +-- .../lagrangian/rhoParticleFoam/createFields.H | 4 +- .../modules/compressibleVoF/alphaPredictor.C | 4 +- .../modules/compressibleVoF/compressibleVoF.C | 18 +++---- .../VoFSolidificationMeltingSource.C | 2 +- .../incompressibleFluid/incompressibleFluid.C | 10 ++-- .../modules/isothermalFluid/isothermalFluid.C | 14 ++--- .../modules/multicomponentFluid/setRDeltaT.C | 2 +- .../functionObjects/phaseForces/phaseForces.C | 10 ++-- .../functionObjects/phaseMap/phaseMap.C | 2 +- .../populationBalanceMoments.C | 8 +-- .../multiphaseEuler/include/createRDeltaTf.H | 2 +- .../interfaceCompositionModels/Henry/Henry.C | 2 +- .../Raoult/Raoult.C | 4 +- .../nonRandomTwoLiquid/nonRandomTwoLiquid.C | 4 +- .../interfaceSaturationTemperatureModel.C | 2 +- .../dragModels/dragModel/dragModel.C | 2 +- .../dragModels/segregated/segregated.C | 2 +- .../phaseTransferModel/phaseTransferModel.C | 2 +- .../virtualMassModel/virtualMassModel.C | 2 +- .../kineticTheoryModel/kineticTheoryModel.C | 10 ++-- .../multiphaseEuler/cellPressureCorrector.C | 4 +- .../multiphaseEuler/facePressureCorrector.C | 4 +- .../multiphaseEuler/multiphaseEuler.C | 4 +- .../BlendedInterfacialModel.C | 4 +- ...terfaceCompositionPhaseChangePhaseSystem.C | 8 +-- .../MomentumTransferPhaseSystem.C | 8 +-- .../PhaseTransferPhaseSystem.C | 6 +-- .../ThermalPhaseChangePhaseSystem.C | 8 +-- .../SidedInterfacialModel.C | 2 +- .../phaseSystems/diameterModels/IATE/IATE.C | 2 +- .../IATE/IATEsources/dummy/dummy.C | 2 +- .../randomCoalescence/IATErandomCoalescence.C | 2 +- .../turbulentBreakUp/IATEturbulentBreakUp.C | 2 +- .../IATEsources/wallBoiling/IATEwallBoiling.C | 4 +- .../isothermalDiameter/isothermalDiameter.C | 2 +- .../linearTsubDiameter/linearTsubDiameter.C | 2 +- .../sizeGroup/shapeModels/fractal/fractal.C | 6 +-- .../KochFriedlander/KochFriedlander.C | 2 +- .../sinteringModels/noSintering/noSintering.C | 2 +- .../velocityGroup/sizeGroup/sizeGroup.C | 2 +- .../velocityGroup/velocityGroup.C | 2 +- .../MovingPhaseModel/MovingPhaseModel.C | 16 +++--- .../phaseModel/phaseModel/phaseModel.C | 4 +- .../phaseSystems/phaseSystem/phaseSystem.C | 2 +- .../phaseSystem/phaseSystemSolve.C | 6 +-- .../phaseSystem/phaseSystemTemplates.C | 4 +- .../binaryBreakupModels/Liao/LiaoBase.C | 6 +-- .../LuoSvendsen/LuoSvendsen.C | 2 +- .../BrownianCollisions/BrownianCollisions.C | 2 +- .../DahnekeInterpolation.C | 4 +- .../LiaoCoalescence/LiaoCoalescence.C | 10 ++-- .../PrinceBlanch/PrinceBlanch.C | 2 +- .../driftModels/phaseChange/phaseChange.C | 2 +- .../populationBalanceModel.C | 26 ++++----- .../multiphase/cavitatingFoam/correctPhi.H | 2 +- .../multiphase/cavitatingFoam/createFields.H | 8 +-- .../compressibleMultiphaseMixture.C | 16 +++--- .../phaseModel/phaseModel.C | 8 +-- .../createFields.H | 4 +- .../driftFluxFoam/alphaEqnSubCycle.H | 4 +- .../multiphase/driftFluxFoam/createFields.H | 10 ++-- ...incompressibleTwoPhaseInteractingMixture.C | 2 +- .../relativeVelocityModel.C | 2 +- .../multiphase/interFoam/createFields.H | 8 +-- .../multiphase/interFoam/initCorrectPhi.H | 2 +- .../solvers/multiphase/interFoam/interFoam.C | 2 +- .../interFoam/interMixingFoam/alphaEqn.H | 4 +- .../interMixingFoam/alphaEqnSubCycle.H | 2 +- .../interFoam/interMixingFoam/createFields.H | 10 ++-- .../incompressibleThreePhaseMixture.C | 8 +-- .../interMixingFoam/initCorrectPhi.H | 2 +- .../threePhaseInterfaceProperties.C | 4 +- .../multiphaseInterFoam/createFields.H | 8 +-- .../multiphaseInterFoam/initCorrectPhi.H | 2 +- .../multiphaseMixture/multiphaseMixture.C | 10 ++-- .../multiphaseMixture/phase/phase.C | 4 +- .../solidDisplacementFoam/calculateStress.H | 4 +- .../solidDisplacementFoam/createFields.H | 6 +-- .../calculateStress.H | 4 +- .../createFields.H | 8 +-- .../Test-GAMGAgglomeration.C | 10 ++-- applications/test/IOField/Test-IOField.C | 4 +- .../Test-PatchEdgeFaceWave.C | 6 +-- .../test/PointEdgeWave/Test-PointEdgeWave.C | 4 +- applications/test/cyclic/createFields.H | 4 +- .../fieldDependency/Test-fieldDependency.C | 6 +-- .../test/fieldMapping/Test-fieldMapping.C | 12 ++--- .../test/fvMeshStitcher/Test-fvMeshStitcher.C | 4 +- applications/test/hexRef8/Test-hexRef8.C | 16 +++--- .../test/mappedPatch/Test-mappedPatch.C | 2 +- applications/test/mesh/Test-mesh.C | 6 +-- .../passiveParticle/Test-passiveParticle.C | 6 +-- .../test/patchRegion/Test-patchRegion.C | 4 +- .../test/patchToPatch/Test-patchToPatch.C | 2 +- .../test/pointField/Test-PointField.C | 4 +- .../test/reconstruct/Test-reconstruct.C | 4 +- .../test/slicedField/Test-slicedField.C | 12 ++--- applications/test/volField/Test-volField.C | 8 +-- .../Test-volPointInterpolation.C | 2 +- applications/test/wallDist/Test-wallDist.C | 6 +-- .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 2 +- .../advanced/autoRefineMesh/autoRefineMesh.C | 10 ++-- .../advanced/collapseEdges/collapseEdges.C | 6 +-- .../combinePatchFaces/combinePatchFaces.C | 2 +- .../mesh/advanced/modifyMesh/modifyMesh.C | 6 +-- .../advanced/refineHexMesh/refineHexMesh.C | 4 +- .../refineWallLayer/refineWallLayer.C | 2 +- .../refinementLevel/refinementLevel.C | 10 ++-- .../mesh/advanced/removeFaces/removeFaces.C | 4 +- .../mesh/advanced/splitCells/splitCells.C | 2 +- .../Optional/ccm26ToFoam/ccm26ToFoam.C | 6 +-- .../foamMeshToFluent/foamMeshToFluent.C | 4 +- .../foamToStarMesh/foamToStarMesh.C | 2 +- .../conversion/foamToStarMesh/getTimeIndex.H | 12 ++--- .../conversion/foamToSurface/foamToSurface.C | 4 +- .../conversion/foamToSurface/getTimeIndex.H | 12 ++--- .../conversion/writeMeshObj/writeMeshObj.C | 24 ++++----- .../generation/extrude2DMesh/extrude2DMesh.C | 6 +-- .../mesh/generation/extrudeMesh/extrudeMesh.C | 4 +- .../extrudeToRegionMesh/extrudeToRegionMesh.C | 2 +- .../DelaunayMesh/DelaunayMesh.C | 12 ++--- .../DelaunayMesh/DelaunayMeshIO.C | 10 ++-- .../backgroundMeshDecomposition.C | 16 +++--- .../cellShapeControlMesh.C | 10 ++-- .../conformalVoronoiMesh.C | 16 +++--- .../conformalVoronoiMeshCalcDualMesh.C | 4 +- .../conformalVoronoiMeshIO.C | 8 +-- .../conformalVoronoiMeshTemplates.C | 2 +- .../initialPointsMethod/pointFile/pointFile.C | 4 +- .../foamyMesh/foamyHexMesh/foamyHexMesh.C | 8 +-- .../foamyHexMeshBackgroundMesh.C | 6 +-- .../generation/foamyMesh/foamyQuadMesh/CV2D.C | 6 +-- .../foamyMesh/foamyQuadMesh/foamyQuadMesh.C | 2 +- .../generation/snappyHexMesh/snappyHexMesh.C | 12 ++--- .../manipulation/checkMesh/checkGeometry.C | 2 +- .../manipulation/checkMesh/checkTopology.C | 4 +- .../createBaffles/createBaffles.C | 4 +- .../createNonConformalCouples.C | 6 +-- .../manipulation/createPatch/createPatch.C | 2 +- .../manipulation/deformedGeom/deformedGeom.C | 2 +- .../manipulation/mergeBaffles/mergeBaffles.C | 4 +- .../manipulation/mergeMeshes/mergeMeshes.C | 12 ++--- .../mesh/manipulation/mirrorMesh/mirrorMesh.C | 2 +- .../mesh/manipulation/moveMesh/moveMesh.C | 6 +-- .../manipulation/polyDualMesh/polyDualMesh.C | 4 +- .../mesh/manipulation/refineMesh/refineMesh.C | 6 +-- .../manipulation/renumberMesh/renumberMesh.C | 4 +- .../mesh/manipulation/rotateMesh/rotateMesh.C | 4 +- .../singleCellMesh/singleCellMesh.C | 6 +-- .../manipulation/splitBaffles/splitBaffles.C | 4 +- .../mesh/manipulation/splitMesh/splitMesh.C | 4 +- .../splitMeshRegions/splitMeshRegions.C | 16 +++--- .../mesh/manipulation/stitchMesh/stitchMesh.C | 4 +- .../mesh/manipulation/subsetMesh/subsetMesh.C | 18 +++---- .../mesh/manipulation/topoSet/topoSet.C | 4 +- .../transformPoints/transformPoints.C | 2 +- .../foamFormatConvert/foamFormatConvert.C | 12 ++--- .../foamFormatConvert/writeMeshObject.H | 4 +- .../miscellaneous/patchSummary/patchSummary.C | 6 +-- .../decomposePar/decomposePar.C | 14 ++--- .../dimFieldDecomposerDecomposeFields.C | 4 +- .../fvFieldDecomposerDecomposeFields.C | 4 +- ...lagrangianFieldDecomposerDecomposeFields.C | 4 +- .../pointFieldDecomposerDecomposeFields.C | 2 +- .../fvFieldReconstructorReconstructFields.C | 12 ++--- ...pointFieldReconstructorReconstructFields.C | 4 +- .../reconstructLagrangianFields.C | 8 +-- .../reconstructPar/reconstructPar.C | 8 +-- .../redistributePar/redistributePar.C | 12 ++--- .../foamDataToFluent/foamDataToFluent.C | 6 +-- .../foamToEnsight/foamToEnsight.C | 12 ++--- .../foamToEnsightParts/foamToEnsightParts.C | 8 +-- .../foamToEnsightParts/getTimeIndex.H | 8 +-- .../foamToEnsightParts/moveMesh.H | 2 +- .../dataConversion/foamToGMV/foamToGMV.C | 6 +-- .../dataConversion/foamToGMV/gmvOutput.H | 6 +-- .../foamToGMV/gmvOutputLagrangian.H | 4 +- .../dataConversion/foamToGMV/gmvOutputSpray.H | 2 +- .../dataConversion/foamToGMV/gmvOutputTail.H | 2 +- .../dataConversion/foamToGMV/moveMesh.H | 4 +- .../foamToTecplot360/foamToTecplot360.C | 14 ++--- .../foamToTetDualMesh/foamToTetDualMesh.C | 8 +-- .../dataConversion/foamToVTK/foamToVTK.C | 12 ++--- .../foamToVTK/lagrangianWriterTemplates.C | 4 +- .../foamToVTK/foamToVTK/writeVTK/writeVTK.C | 4 +- .../dataConversion/smapToFoam/smapToFoam.C | 6 +-- .../foamPostProcess/foamPostProcess.C | 8 +-- .../graphics/PVReaders/vtkPVFoam/vtkPVFoam.C | 4 +- .../PVReaders/vtkPVFoam/vtkPVFoamFields.C | 6 +-- .../vtkPVFoam/vtkPVFoamMeshLagrangian.C | 2 +- .../PVReaders/vtkPVblockMesh/vtkPVblockMesh.C | 4 +- .../USERD_get_maxsize_info.H | 2 +- .../USERD_get_var_value_at_specific.H | 2 +- .../ensightFoamReader/USERD_set_filenames.H | 8 +-- .../ensightFoamReader/getFieldScalar.H | 4 +- .../ensightFoamReader/getFieldTensor.H | 4 +- .../ensightFoamReader/getFieldVector.H | 4 +- .../ensightFoamReader/getLagrangianScalar.H | 2 +- .../ensightFoamReader/getLagrangianVector.H | 2 +- .../ensightFoamReader/getPatchFieldScalar.H | 4 +- .../ensightFoamReader/getPatchFieldTensor.H | 4 +- .../ensightFoamReader/getPatchFieldVector.H | 4 +- .../steadyParticleTracks.C | 4 +- .../miscellaneous/pdfPlot/createFields.H | 2 +- .../temporalInterpolate/temporalInterpolate.C | 4 +- .../applyBoundaryLayer/applyBoundaryLayer.C | 6 +-- .../applyBoundaryLayer/createFields.H | 6 +-- .../utilities/preProcessing/boxTurb/boxTurb.C | 6 +-- .../preProcessing/boxTurb/createFields.H | 2 +- .../changeDictionary/changeDictionary.C | 2 +- .../createExternalCoupledPatchGeometry.C | 2 +- ...ateExternalCoupledPatchGeometryTemplates.C | 4 +- .../dsmcInitialise/dsmcInitialise.C | 4 +- .../preProcessing/engineSwirl/createFields.H | 2 +- .../faceAgglomerate/faceAgglomerate.C | 4 +- .../mapFields/MapConsistentVolFields.H | 2 +- .../mapFields/MapLagrangianFields.H | 6 +-- .../preProcessing/mapFields/MapVolFields.H | 2 +- .../preProcessing/mapFields/mapFields.C | 16 +++--- .../preProcessing/mapFields/mapLagrangian.C | 2 +- .../preProcessing/mapFields/mapMeshes.C | 12 ++--- .../mapFields/meshToMesh0Templates.C | 2 +- .../preProcessing/mapFieldsPar/mapClouds.C | 6 +-- .../preProcessing/mapFieldsPar/mapFieldsPar.C | 8 +-- .../mapFieldsPar/mapGeometricFields.C | 6 +-- .../setAtmBoundaryLayer/setAtmBoundaryLayer.C | 6 +-- .../preProcessing/setFields/setFields.C | 4 +- .../preProcessing/setWaves/setWaves.C | 18 +++---- .../viewFactorsGen/viewFactorsGen.C | 6 +-- .../surfaceRedistributePar.C | 2 +- etc/codeTemplates/app/createFields.H | 2 +- .../RAS/LamBremhorstKE/LamBremhorstKE.C | 6 +-- .../RAS/LienCubicKE/LienCubicKE.C | 6 +-- .../RAS/LienLeschziner/LienLeschziner.C | 6 +-- .../RAS/ShihQuadraticKE/ShihQuadraticKE.C | 6 +-- .../incompressible/RAS/kkLOmega/kkLOmega.C | 10 ++-- .../incompressible/RAS/qZeta/qZeta.C | 10 ++-- .../Base/kOmegaSST/kOmegaSSTBase.C | 4 +- .../LES/LESdeltas/LESdelta/LESdelta.C | 4 +- .../anisotropicFilter/anisotropicFilter.C | 6 +-- .../LESfilters/laplaceFilter/laplaceFilter.C | 6 +-- .../SpalartAllmarasDES/SpalartAllmarasDES.C | 4 +- .../LES/dynamicKEqn/dynamicKEqn.C | 4 +- .../LES/dynamicLagrangian/dynamicLagrangian.C | 6 +-- .../momentumTransportModels/LES/kEqn/kEqn.C | 4 +- .../momentumTransportModels/RAS/LRR/LRR.C | 6 +-- .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 6 +-- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 4 +- .../momentumTransportModels/RAS/SSG/SSG.C | 6 +-- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 2 +- .../RAS/kEpsilon/kEpsilon.C | 4 +- .../RAS/kOmega/kOmega.C | 6 +-- .../RAS/kOmega2006/kOmega2006.C | 4 +- .../RAS/kOmegaSSTLM/kOmegaSSTLM.C | 8 +-- .../RAS/realizableKE/realizableKE.C | 4 +- .../momentumTransportModels/RAS/v2f/v2f.C | 8 +-- .../ReynoldsStress/ReynoldsStress.C | 4 +- .../epsilonWallFunctionFvPatchScalarField.C | 2 +- .../omegaWallFunctionFvPatchScalarField.C | 2 +- .../eddyViscosity/eddyViscosity.C | 4 +- .../laminar/Maxwell/Maxwell.C | 10 ++-- .../strainRateViscosityModel.C | 2 +- .../lambdaThixotropic/lambdaThixotropic.C | 4 +- .../nonlinearEddyViscosity.C | 4 +- .../continuousGasKEpsilon.C | 2 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 12 ++--- src/OpenFOAM/db/IOobject/IOobject.C | 6 +-- src/OpenFOAM/db/Time/Time.C | 26 ++++----- src/OpenFOAM/db/Time/Time.H | 11 ++-- src/OpenFOAM/db/Time/TimeIO.C | 6 +-- src/OpenFOAM/db/Time/timeSelector.C | 2 +- .../db/functionObjects/logFiles/logFiles.C | 4 +- .../db/functionObjects/writeFile/writeFile.C | 6 +-- .../DimensionedField/DimensionedField.C | 6 +-- .../DimensionedField/MapDimensionedFields.H | 4 +- .../GeometricField/GeometricField.C | 14 ++--- .../GeometricField/MapGeometricFields.H | 2 +- .../masterUncollatedFileOperation.C | 14 ++--- src/OpenFOAM/include/createMesh.H | 4 +- src/OpenFOAM/include/createMeshNoChangers.H | 4 +- src/OpenFOAM/include/createMeshNoClear.H | 4 +- src/OpenFOAM/include/createNamedMesh.H | 6 +-- src/OpenFOAM/include/createNamedPolyMesh.H | 6 +-- src/OpenFOAM/include/createPolyMesh.H | 4 +- src/OpenFOAM/meshes/polyMesh/polyMesh.C | 8 +-- src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C | 2 +- .../eddyDiffusivity/eddyDiffusivity.C | 2 +- .../unityLewisEddyDiffusivity.C | 2 +- .../kEpsilonLopesdaCosta.C | 26 ++++----- src/combustionModels/EDC/EDC.C | 2 +- src/combustionModels/FSD/FSD.C | 2 +- .../reactionRateFlameArea.C | 4 +- src/combustionModels/PaSR/PaSR.C | 2 +- .../mixtureFraction/mixtureFraction.C | 4 +- .../singleStepCombustion.C | 4 +- .../meshWriter/starcd/STARCDMeshWriter.C | 8 +-- .../fvMeshDistribute/fvMeshDistribute.C | 4 +- .../fvMeshDistributeTemplates.C | 2 +- src/dynamicMesh/fvMeshSubset/fvMeshSubset.C | 6 +-- .../fvMeshSubset/fvMeshSubsetInterpolate.C | 8 +-- src/dynamicMesh/meshCut/cellCuts/cellCuts.C | 12 ++--- .../multiDirRefinement/multiDirRefinement.C | 2 +- .../refinementIterator/refinementIterator.C | 10 ++-- .../motionSmoother/motionSmootherAlgo.C | 2 +- .../motionSmoother/motionSmootherData.C | 10 ++-- .../componentDisplacementMotionSolver.C | 2 +- .../componentVelocityMotionSolver.C | 2 +- .../displacement/displacementMotionSolver.C | 2 +- .../displacementLayeredMotionMotionSolver.C | 6 +-- .../points0/points0MotionSolver.C | 2 +- .../interpolatingSolidBodyMotionSolver.C | 2 +- .../velocity/velocityMotionSolver.C | 2 +- .../dynamicMeshPointInterpolator.C | 4 +- .../pointPatchDist/pointPatchDist.C | 4 +- .../polyTopoChange/hexRef8/hexRef8.C | 2 +- .../polyTopoChanger/polyTopoChanger.C | 2 +- .../compressible/compressibleCreatePhi.H | 4 +- .../cfdTools/compressible/createRhoUf.H | 4 +- .../compressible/createRhoUfIfPresent.H | 4 +- .../cfdTools/general/CorrectPhi/CorrectPhi.C | 4 +- .../cfdTools/general/buoyancy/buoyancy.C | 4 +- .../general/fvModels/fvModelTemplates.C | 2 +- .../general/fvModels/fvModelsTemplates.C | 4 +- .../cfdTools/general/include/createRDeltaT.H | 2 +- .../DarcyForchheimer/DarcyForchheimer.C | 4 +- .../porosityModel/porosityModel.C | 4 +- .../convergenceControl/convergenceControl.C | 4 +- .../solutionControl/solutionControl.C | 4 +- .../cfdTools/incompressible/createPhi.H | 4 +- .../cfdTools/incompressible/createPhiv.H | 4 +- .../cfdTools/incompressible/createUf.H | 4 +- .../incompressible/createUfIfPresent.H | 4 +- .../waveSurfacePressureFvPatchScalarField.C | 2 +- .../CrankNicolsonDdtScheme.C | 2 +- .../localEulerDdtScheme/localEulerDdtScheme.C | 12 ++--- .../solvers/MULES/CMULESTemplates.C | 2 +- .../fvMatrices/solvers/MULES/MULESTemplates.C | 2 +- .../extendedCellToCellStencilTemplates.C | 2 +- src/finiteVolume/fvMesh/fvMesh.C | 8 +-- .../fvMeshDistributors/cpuLoad/cpuLoad.C | 2 +- src/finiteVolume/fvMesh/fvMeshGeometry.C | 4 +- .../fvMeshStitcher/fvMeshStitcherTemplates.C | 2 +- .../singleCellFvMeshInterpolate.C | 4 +- .../advectionDiffusionPatchDistMethod.C | 4 +- .../fvMesh/wallDist/wallDist/wallDist.C | 6 +-- .../zeroDimensionalFvMesh.C | 2 +- .../fvMeshToFvMesh/fvMeshToFvMeshTemplates.C | 2 +- .../interpolationCellPointWallModified.C | 4 +- .../LimitedScheme/LimitedScheme.C | 2 +- .../multivariateScheme/multivariateScheme.C | 4 +- .../multivariateSelectionScheme.C | 4 +- .../schemes/cellCoBlended/cellCoBlended.H | 2 +- .../cellSources/fieldToCell/fieldToCell.C | 8 +-- .../patchFluxToFace/patchFluxToFace.C | 6 +-- .../field/XiReactionRate/XiReactionRate.C | 10 ++-- src/functionObjects/field/age/age.C | 2 +- src/functionObjects/field/comfort/comfort.C | 6 +-- .../field/fieldAverage/fieldAverage.C | 8 +-- .../surfaceFieldValue/surfaceFieldValueI.H | 4 +- .../volFieldValue/volFieldValueTemplates.C | 2 +- .../field/histogram/histogram.C | 4 +- .../field/layerAverage/layerAverage.C | 2 +- .../field/nearWallFields/nearWallFields.C | 8 +-- .../nearWallFields/nearWallFieldsTemplates.C | 4 +- .../field/readFields/readFieldsTemplates.C | 2 +- .../regionSizeDistribution.C | 10 ++-- .../field/streamlines/streamlines.C | 2 +- .../turbulenceFieldsTemplates.C | 2 +- .../field/writeCellCentres/writeCellCentres.C | 10 ++-- .../field/writeCellVolumes/writeCellVolumes.C | 6 +-- .../lagrangian/dsmcFields/dsmcFields.C | 12 ++--- .../lagrangian/particles/particles.C | 4 +- .../phaseScalarTransport.C | 6 +-- .../solvers/scalarTransport/scalarTransport.C | 6 +-- .../writeDictionary/writeDictionary.C | 4 +- .../meanVelocityForce/meanVelocityForce.C | 6 +-- .../moving/fvMeshStitchersMoving.C | 2 +- .../meshToMesh/MeshToMeshMapGeometricFields.H | 4 +- .../movingCone/fvMeshTopoChangersMovingCone.C | 2 +- .../raw/fvMeshTopoChangersRawTemplates.C | 4 +- .../refiner/fvMeshTopoChangersRefiner.C | 4 +- .../heatTransferModels/function2/function2.C | 2 +- .../heatTransferModels/variable/variable.C | 2 +- .../derived/rotorDiskSource/rotorDiskSource.C | 6 +-- .../rotorDiskSourceTemplates.C | 4 +- .../solidificationMeltingSource.C | 2 +- .../semiImplicitSource/semiImplicitSource.C | 4 +- ...lacementComponentLaplacianFvMotionSolver.C | 6 +-- ...velocityComponentLaplacianFvMotionSolver.C | 2 +- .../displacementSBRStressFvMotionSolver.C | 2 +- .../displacementLaplacianFvMotionSolver.C | 4 +- .../velocityLaplacianFvMotionSolver.C | 2 +- .../inverseDistanceDiffusivity.C | 2 +- .../inverseFaceDistanceDiffusivity.C | 2 +- .../inversePointDistanceDiffusivity.C | 4 +- .../inverseVolume/inverseVolumeDiffusivity.C | 2 +- .../motionDirectionalDiffusivity.C | 6 +-- .../uniform/uniformDiffusivity.C | 4 +- .../clouds/Templates/DSMCCloud/DSMCCloud.C | 54 +++++++++---------- src/lagrangian/basic/Cloud/CloudIO.C | 6 +-- src/lagrangian/basic/IOPosition/IOPosition.C | 2 +- .../basic/InteractionLists/InteractionLists.C | 2 +- src/lagrangian/basic/cloud/cloud.C | 2 +- .../molecule/mdTools/createMDFields.H | 22 ++++---- .../Templates/MomentumCloud/MomentumCloud.C | 12 ++--- .../Templates/ReactingCloud/ReactingCloud.C | 4 +- .../Templates/ThermoCloud/ThermoCloud.C | 20 +++---- .../parcel/fvModels/clouds/clouds.C | 2 +- .../MPPICParcel/MPPICParcelTrackingDataI.H | 16 +++--- .../CloudFunctionObject/CloudFunctionObject.C | 2 +- .../FacePostProcessing/FacePostProcessing.C | 2 +- .../CloudFunctionObjects/Flux/Flux.C | 2 +- .../ParticleCollector/ParticleCollector.C | 2 +- .../ParticleErosion/ParticleErosion.C | 2 +- .../PatchCollisionDensity.C | 12 ++--- .../VoidFraction/VoidFraction.C | 4 +- .../AveragingMethod/AveragingMethod.C | 10 ++-- .../DampingModels/Relaxation/Relaxation.C | 2 +- .../IsotropyModels/Stochastic/Stochastic.C | 6 +-- .../MPPIC/PackingModels/Explicit/Explicit.C | 2 +- .../MPPIC/PackingModels/Implicit/Implicit.C | 8 +-- .../LocalInteraction/LocalInteraction.C | 4 +- src/lagrangian/solidParticle/solidParticle.C | 2 +- .../medialAxisMeshMover.C | 16 +++--- .../meshRefinement/meshRefinement.C | 22 ++++---- .../meshRefinement/meshRefinement.H | 4 +- .../meshRefinement/meshRefinementBaffles.C | 20 +++---- .../meshRefinement/meshRefinementMerge.C | 26 ++++----- .../meshRefinementProblemCells.C | 10 ++-- .../meshRefinement/meshRefinementRefine.C | 22 ++++---- .../snappyHexMeshDriver/snappyLayerDriver.C | 40 +++++++------- .../snappyLayerDriverShrink.C | 14 ++--- .../snappyHexMeshDriver/snappyRefineDriver.C | 20 +++---- .../snappyHexMeshDriver/snappySnapDriver.C | 40 +++++++------- .../meshToMesh/meshToMeshParallelOps.C | 4 +- .../polyMeshZipUpCells/polyMeshZipUpCells.C | 4 +- .../triSurfaceMesh/triSurfaceMesh.C | 4 +- src/parallel/parallel/domainDecomposition.C | 20 +++---- .../parallel/domainDecompositionDecompose.C | 2 +- .../constant/constantViscosityModel.C | 4 +- src/radiationModels/radiationModels/P1/P1.C | 24 ++++----- .../blackBodyEmission/blackBodyEmission.C | 4 +- .../radiationModels/fvDOM/fvDOM.C | 26 ++++----- .../radiativeIntensityRay.C | 14 ++--- .../radiationModels/viewFactor/viewFactor.C | 4 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.C | 10 ++-- .../rigidBodyMeshMotionSolver.C | 6 +-- src/sampling/probes/probes.C | 2 +- .../sampledSet/sampledSets/sampledSets.C | 8 +-- .../sampledSurfaces/sampledSurfaces.C | 8 +-- .../sampledThresholdCellFaces.C | 4 +- .../sixDoFRigidBodyMotionSolver.C | 8 +-- src/surfMesh/MeshedSurface/MeshedSurface.C | 2 +- .../MeshedSurfaceProxy/MeshedSurfaceProxy.C | 8 +-- .../surfaceRegistry/surfaceRegistry.C | 4 +- .../momentumSurfaceFilm/momentumSurfaceFilm.C | 48 ++++++++--------- .../curvatureSeparation/curvatureSeparation.C | 4 +- .../thixotropic/thixotropicViscosity.C | 2 +- .../waxSolvent/waxSolventViscosity.C | 4 +- .../contactAngleForce/contactAngleForce.C | 4 +- .../constantRadiation/constantRadiation.C | 4 +- .../primaryRadiation/primaryRadiation.C | 2 +- .../standardRadiation/standardRadiation.C | 2 +- .../mappedConvectiveHeatTransfer.C | 4 +- .../solidification/solidification.C | 4 +- .../waxSolventEvaporation.C | 6 +-- .../surfaceFilm/surfaceFilm.C | 10 ++-- .../thermoSurfaceFilm/thermoSurfaceFilm.C | 12 ++--- .../barotropicCompressibilityModel.C | 4 +- .../basic/basicThermo/basicThermo.C | 6 +-- .../basic/fluidThermo/fluidThermo.C | 4 +- .../basic/heThermo/heThermo.C | 6 +-- .../basic/rhoThermo/rhoThermo.C | 2 +- .../chemistryModel/chemistryModel.C | 4 +- .../chemistryModel/tabulation/ISAT/ISAT.C | 2 +- .../RaviPetersen/RaviPetersen.C | 2 +- .../moleFractions/moleFractions.C | 2 +- .../basicCombustionMixture.C | 2 +- .../basicSpecieMixture/basicSpecieMixture.C | 8 +-- .../psiuMulticomponentThermo/heheuPsiThermo.C | 4 +- .../constSolidThermo/constSolidThermo.C | 2 +- .../solidThermo/solidThermo/heSolidThermo.C | 2 +- .../solidThermo/solidThermo/solidThermo.C | 4 +- src/twoPhaseModels/VoF/alphaEqnSubCycle.H | 2 +- src/twoPhaseModels/VoF/createAlphaFluxes.H | 2 +- .../compressibleTwoPhaseMixture.C | 14 ++--- .../incompressibleTwoPhaseMixture.C | 2 +- .../interfaceCompression/MPLIC/MPLIC.C | 6 +-- .../interfaceCompression/MPLIC/MPLICU.C | 2 +- .../interfaceCompression/PLIC/PLIC.C | 2 +- .../interfaceCompression/PLIC/PLICU.C | 2 +- .../interfaceProperties/interfaceProperties.C | 4 +- .../surfaceTensionModel/surfaceTensionModel.C | 4 +- .../twoPhaseMixture/twoPhaseMixture.C | 4 +- .../Test-fvMeshTools/Test-fvMeshTools.C | 18 +++---- .../system/continuity | 4 +- .../waterEvaporation/system/continuity | 4 +- .../waterEvaporation/system/continuity | 4 +- .../potentialFoam/cylinder/system/controlDict | 2 +- .../calcRadiusField/calcRadiusField.C | 12 ++--- .../validation/WatersKing/WatersKing.C | 2 +- 546 files changed, 1612 insertions(+), 1613 deletions(-) diff --git a/applications/solvers/DNS/dnsFoam/createFields.H b/applications/solvers/DNS/dnsFoam/createFields.H index 2d2b832d07..13c3ce9081 100644 --- a/applications/solvers/DNS/dnsFoam/createFields.H +++ b/applications/solvers/DNS/dnsFoam/createFields.H @@ -6,7 +6,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -20,7 +20,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index 49ccc1b1c8..dafe0277f9 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -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 @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) runTime.path() /functionObjects::writeFile::outputPrefix /"graphs" - /runTime.timeName(), + /runTime.name(), "Ek", runTime.graphFormat() ); diff --git a/applications/solvers/DNS/dnsFoam/globalProperties.H b/applications/solvers/DNS/dnsFoam/globalProperties.H index cb45a95862..0f19c68f50 100644 --- a/applications/solvers/DNS/dnsFoam/globalProperties.H +++ b/applications/solvers/DNS/dnsFoam/globalProperties.H @@ -1,10 +1,10 @@ { - Info<< "k(" << runTime.timeName() << ") = " + Info<< "k(" << runTime.name() << ") = " << 3.0/2.0*average(magSqr(U)).value() << endl; - Info<< "epsilon(" << runTime.timeName() << ") = " + Info<< "epsilon(" << runTime.name() << ") = " << (0.5*nu*average(magSqr(twoSymm(fvc::grad(U))))).value() << endl; - Info<< "U.f(" << runTime.timeName() << ") = " + Info<< "U.f(" << runTime.name() << ") = " << 181.0*average(U & force).value() << endl; } diff --git a/applications/solvers/basic/laplacianFoam/createFields.H b/applications/solvers/basic/laplacianFoam/createFields.H index 527fb6dd1c..58389e79c2 100644 --- a/applications/solvers/basic/laplacianFoam/createFields.H +++ b/applications/solvers/basic/laplacianFoam/createFields.H @@ -5,7 +5,7 @@ volScalarField T IOobject ( "T", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/basic/laplacianFoam/write.H b/applications/solvers/basic/laplacianFoam/write.H index 6b14ba4995..be8571317d 100644 --- a/applications/solvers/basic/laplacianFoam/write.H +++ b/applications/solvers/basic/laplacianFoam/write.H @@ -7,7 +7,7 @@ IOobject ( "gradTx", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -20,7 +20,7 @@ IOobject ( "gradTy", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -33,7 +33,7 @@ IOobject ( "gradTz", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H index 8e2edecb99..40617bb242 100644 --- a/applications/solvers/basic/potentialFoam/createFields.H +++ b/applications/solvers/basic/potentialFoam/createFields.H @@ -4,7 +4,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -19,7 +19,7 @@ surfaceScalarField phi IOobject ( "phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -61,7 +61,7 @@ volScalarField p IOobject ( pName, - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::NO_WRITE @@ -92,7 +92,7 @@ volScalarField Phi IOobject ( "Phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::NO_WRITE diff --git a/applications/solvers/basic/scalarTransportFoam/createFields.H b/applications/solvers/basic/scalarTransportFoam/createFields.H index 52597d5c3e..ade11de281 100644 --- a/applications/solvers/basic/scalarTransportFoam/createFields.H +++ b/applications/solvers/basic/scalarTransportFoam/createFields.H @@ -5,7 +5,7 @@ volScalarField T IOobject ( "T", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -21,7 +21,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C index 3efbccd20e..dbe7ea3bd9 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) #include "setDeltaT.H" runTime++; - Info<< "\n\nTime = " << runTime.timeName() << endl; + Info<< "\n\nTime = " << runTime.name() << endl; #include "rhoEqn.H" diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C index 0fb56bc73f..1928c15ac1 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) runTime++; - Info<< "\n\nTime = " << runTime.timeName() << endl; + Info<< "\n\nTime = " << runTime.name() << endl; { // Make the fluxes absolute diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C index 033d182f01..0702021fb3 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C @@ -112,7 +112,7 @@ Foam::tmp Foam::XiEqModels::basicSubGrid::XiEq() const IOobject ( "ns", - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index bfe08c94f7..46f1fbfd27 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -113,7 +113,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const IOobject ( "tns", - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C index 8729f7ca93..a5b4fde443 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/XiModels/XiModel/XiModel.C @@ -65,7 +65,7 @@ Foam::XiModel::XiModel IOobject ( "Xi", - b.time().timeName(), + b.time().name(), b.db(), IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H index 0e1ea8225a..870b55c465 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/PDRFoam/createFields.H @@ -14,7 +14,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -33,7 +33,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -76,7 +76,7 @@ volScalarField dpdt IOobject ( "dpdt", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -100,7 +100,7 @@ volScalarField Su IOobject ( "Su", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -218,7 +218,7 @@ volScalarField St IOobject ( "St", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 33f2f51e1c..002e662d19 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -14,7 +14,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -34,7 +34,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -77,7 +77,7 @@ volScalarField dpdt IOobject ( "dpdt", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -93,7 +93,7 @@ volScalarField Xi IOobject ( "Xi", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -115,7 +115,7 @@ volScalarField Su IOobject ( "Su", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -132,7 +132,7 @@ volScalarField St IOobject ( "St", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/combustion/chemFoam/createBaseFields.H b/applications/solvers/combustion/chemFoam/createBaseFields.H index 726ee9fcea..ab3fcc767d 100644 --- a/applications/solvers/combustion/chemFoam/createBaseFields.H +++ b/applications/solvers/combustion/chemFoam/createBaseFields.H @@ -1,14 +1,14 @@ // write base thermo fields - not registered since will be re-read by // thermo package -Info<< "Creating base fields for time " << runTime.timeName() << endl; +Info<< "Creating base fields for time " << runTime.name() << endl; { volScalarField Ydefault ( IOobject ( "Ydefault", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::NO_WRITE, @@ -25,7 +25,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl; IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::NO_WRITE, @@ -42,7 +42,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl; IOobject ( "T", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::NO_WRITE, diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H index 3b919a0e53..f2d5dcf40b 100644 --- a/applications/solvers/combustion/chemFoam/createFields.H +++ b/applications/solvers/combustion/chemFoam/createFields.H @@ -38,7 +38,7 @@ IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -51,7 +51,7 @@ IOobject ( "Rspecific", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -69,7 +69,7 @@ IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index fd45d6dd9a..b1a44f1e98 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -16,7 +16,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -29,7 +29,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -42,7 +42,7 @@ volVectorField rhoU IOobject ( "rhoU", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -55,7 +55,7 @@ volScalarField rhoE IOobject ( "rhoE", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -68,7 +68,7 @@ surfaceScalarField pos IOobject ( "pos", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -80,7 +80,7 @@ surfaceScalarField neg IOobject ( "neg", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H index 6916ac0ece..a6ad40bedc 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H @@ -14,7 +14,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -28,7 +28,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C index 6aca476875..fe20da930d 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C @@ -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 @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/createFields.H b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/createFields.H index ce72e51d2b..745d0a2933 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/createFields.H +++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/createFields.H @@ -4,7 +4,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/electromagnetics/electrostaticFoam/createFields.H b/applications/solvers/electromagnetics/electrostaticFoam/createFields.H index 04c86c4edb..ffd58d13aa 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/createFields.H +++ b/applications/solvers/electromagnetics/electrostaticFoam/createFields.H @@ -29,7 +29,7 @@ IOobject ( "phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -44,7 +44,7 @@ IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -59,7 +59,7 @@ IOobject ( "rhoFlux", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C index bd5fb1c878..9a4effafb4 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C +++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C @@ -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 @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) while (runTime.loop()) { - Info<< "Iteration = " << runTime.timeName() << nl << endl; + Info<< "Iteration = " << runTime.name() << nl << endl; solve ( diff --git a/applications/solvers/electromagnetics/magneticFoam/createFields.H b/applications/solvers/electromagnetics/magneticFoam/createFields.H index da9b03317d..2158acf390 100644 --- a/applications/solvers/electromagnetics/magneticFoam/createFields.H +++ b/applications/solvers/electromagnetics/magneticFoam/createFields.H @@ -4,7 +4,7 @@ IOobject ( "psi", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -33,7 +33,7 @@ IOobject ( "murf", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -45,7 +45,7 @@ IOobject ( "Mrf", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C index 26eaa8f98c..a5d8381974 100644 --- a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C +++ b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C @@ -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 @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) IOobject ( "H", - runTime.timeName(), + runTime.name(), mesh ), fvc::reconstruct(fvc::snGrad(psi)*mesh.magSf()) @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) { Info<< nl << "Creating field H for time " - << runTime.timeName() << endl; + << runTime.name() << endl; H.write(); } @@ -109,14 +109,14 @@ int main(int argc, char *argv[]) { Info<< nl << "Creating field HdotGradH for time " - << runTime.timeName() << endl; + << runTime.name() << endl; volVectorField HdotGradH ( IOobject ( "HdotGradH", - runTime.timeName(), + runTime.name(), mesh ), H & fvc::grad(H) @@ -130,14 +130,14 @@ int main(int argc, char *argv[]) { Info<< nl << "Creating field B for time " - << runTime.timeName() << endl; + << runTime.name() << endl; volVectorField B ( IOobject ( "B", - runTime.timeName(), + runTime.name(), mesh ), constant::electromagnetic::mu0 diff --git a/applications/solvers/electromagnetics/mhdFoam/createFields.H b/applications/solvers/electromagnetics/mhdFoam/createFields.H index d4d7e88906..98cf31431f 100644 --- a/applications/solvers/electromagnetics/mhdFoam/createFields.H +++ b/applications/solvers/electromagnetics/mhdFoam/createFields.H @@ -46,7 +46,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -61,7 +61,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -77,7 +77,7 @@ volScalarField pB IOobject ( "pB", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -92,7 +92,7 @@ volVectorField B IOobject ( "B", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H index 967c98f55b..ca84a7692a 100644 --- a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H +++ b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H @@ -1,7 +1,7 @@ typeIOobject phiBHeader ( "phiB", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ ); @@ -18,7 +18,7 @@ if (phiBHeader.headerOk()) IOobject ( "phiB", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -35,7 +35,7 @@ else IOobject ( "phiB", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/financial/financialFoam/createFields.H b/applications/solvers/financial/financialFoam/createFields.H index 5f1fd2061d..2738d83d31 100644 --- a/applications/solvers/financial/financialFoam/createFields.H +++ b/applications/solvers/financial/financialFoam/createFields.H @@ -43,7 +43,7 @@ volScalarField V IOobject ( "V", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -57,7 +57,7 @@ surfaceVectorField Pf IOobject ( "Pf", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -71,7 +71,7 @@ volVectorField P IOobject ( "P", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -90,7 +90,7 @@ volScalarField delta IOobject ( "delta", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C index 68b3f9fbbe..588f970d3f 100644 --- a/applications/solvers/financial/financialFoam/financialFoam.C +++ b/applications/solvers/financial/financialFoam/financialFoam.C @@ -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[]) runTime.globalPath() /functionObjects::writeFile::outputPrefix /args.executable() - /runTime.timeName(), + /runTime.name(), args.executable(), diff --git a/applications/solvers/foamMultiRun/foamMultiRun.C b/applications/solvers/foamMultiRun/foamMultiRun.C index 1105fdb0ec..7bb438b3c9 100644 --- a/applications/solvers/foamMultiRun/foamMultiRun.C +++ b/applications/solvers/foamMultiRun/foamMultiRun.C @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) IOobject ( regionSolvers[i].first(), - runTime.timeName(), + runTime.name(), runTime, IOobject::MUST_READ ) diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index 773ce7a3a6..312301be59 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H @@ -9,7 +9,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -25,7 +25,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -59,7 +59,7 @@ volScalarField dpdt IOobject ( "dpdt", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H index 912ba97537..b213f247d6 100644 --- a/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H @@ -4,7 +4,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -40,7 +40,7 @@ volScalarField pa IOobject ( "pa", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -54,7 +54,7 @@ volVectorField Ua IOobject ( "Ua", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -99,7 +99,7 @@ volScalarField alpha IOobject ( "alpha", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H index 21a5bf7976..e8f762dfe4 100644 --- a/applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H @@ -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 @@ -38,7 +38,7 @@ surfaceScalarField phia IOobject ( "phia", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H index c92e2f4563..e8c88adb9b 100644 --- a/applications/solvers/incompressible/boundaryFoam/createFields.H +++ b/applications/solvers/incompressible/boundaryFoam/createFields.H @@ -4,7 +4,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -19,7 +19,7 @@ surfaceScalarField phi IOobject ( "phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H index 17bbdaf89f..8d503540ba 100644 --- a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H +++ b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H @@ -3,7 +3,7 @@ volSymmTensorField R IOobject ( "R", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ setWriter::New(runTime.graphFormat())->write runTime.globalPath() /functionObjects::writeFile::outputPrefix /args.executable() - /runTime.timeName(), + /runTime.name(), args.executable(), diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H index fdc325c7ff..98ccf90df1 100644 --- a/applications/solvers/incompressible/icoFoam/createFields.H +++ b/applications/solvers/incompressible/icoFoam/createFields.H @@ -25,7 +25,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -40,7 +40,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H index f29e7bdaa9..1c662a9597 100644 --- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H +++ b/applications/solvers/incompressible/porousSimpleFoam/createFields.H @@ -4,7 +4,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/incompressible/shallowWaterFoam/createFields.H b/applications/solvers/incompressible/shallowWaterFoam/createFields.H index d15ac864c1..24efded3c2 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H +++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H @@ -6,7 +6,7 @@ volScalarField h IOobject ( "h", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -34,7 +34,7 @@ volVectorField hU IOobject ( "hU", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -48,7 +48,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -62,7 +62,7 @@ volScalarField hTotal IOobject ( "hTotal", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/incompressible/shallowWaterFoam/createPhi.H b/applications/solvers/incompressible/shallowWaterFoam/createPhi.H index 3433212edb..a03d116f4d 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/createPhi.H +++ b/applications/solvers/incompressible/shallowWaterFoam/createPhi.H @@ -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 @@ -38,7 +38,7 @@ surfaceScalarField phi IOobject ( "phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C index 549d5e92ea..8daa80ebb0 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C +++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) while (pimple.loop(runTime)) { - Info<< "\n Time = " << runTime.timeName() << nl << endl; + Info<< "\n Time = " << runTime.name() << nl << endl; #include "CourantNo.H" diff --git a/applications/solvers/lagrangian/denseParticleFoam/createFields.H b/applications/solvers/lagrangian/denseParticleFoam/createFields.H index c942a5697d..71bfb562fd 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/createFields.H +++ b/applications/solvers/lagrangian/denseParticleFoam/createFields.H @@ -20,7 +20,7 @@ volVectorField Uc IOobject ( IOobject::groupName("U", continuousPhaseName), - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -34,7 +34,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -51,7 +51,7 @@ surfaceScalarField phic IOobject ( IOobject::groupName("phi", continuousPhaseName), - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -82,7 +82,7 @@ volScalarField rhoc IOobject ( rhocValue.name(), - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -96,7 +96,7 @@ volScalarField muc IOobject ( IOobject::groupName("mu", continuousPhaseName), - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -112,7 +112,7 @@ volScalarField alphac IOobject ( IOobject::groupName("alpha", continuousPhaseName), - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/lagrangian/denseParticleFoam/createUcf.H b/applications/solvers/lagrangian/denseParticleFoam/createUcf.H index 10d84b25a9..1475407c16 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/createUcf.H +++ b/applications/solvers/lagrangian/denseParticleFoam/createUcf.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ surfaceVectorField Ucf IOobject ( "Ucf", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/lagrangian/denseParticleFoam/createUcfIfPresent.H b/applications/solvers/lagrangian/denseParticleFoam/createUcfIfPresent.H index 5c822ec16f..d527f1a9b0 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/createUcfIfPresent.H +++ b/applications/solvers/lagrangian/denseParticleFoam/createUcfIfPresent.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ if (mesh.dynamic()) IOobject ( "Ucf", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C index 7a821579e6..f4ad4887f3 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C +++ b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) IOobject ( "cloudSUu", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) IOobject ( "cloudSUp", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/lagrangian/particleFoam/createFields.H b/applications/solvers/lagrangian/particleFoam/createFields.H index 20a3ab7689..b884f4467a 100644 --- a/applications/solvers/lagrangian/particleFoam/createFields.H +++ b/applications/solvers/lagrangian/particleFoam/createFields.H @@ -6,7 +6,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -26,7 +26,7 @@ volScalarField rhoInf IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -45,7 +45,7 @@ volScalarField mu IOobject ( "mu", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -59,7 +59,7 @@ parcelClouds& clouds = parcelClouds::New(mesh, rhoInf, U, mu, g); typeIOobject Hheader ( "H", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -77,7 +77,7 @@ if (Hheader.headerOk()) typeIOobject HdotGradHheader ( "HdotGradH", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/lagrangian/particleFoam/createNonInertialFrameFields.H b/applications/solvers/lagrangian/particleFoam/createNonInertialFrameFields.H index 6ca6c7afe5..4e8a688615 100644 --- a/applications/solvers/lagrangian/particleFoam/createNonInertialFrameFields.H +++ b/applications/solvers/lagrangian/particleFoam/createNonInertialFrameFields.H @@ -3,7 +3,7 @@ typeIOobject linearAccelerationHeader ( "linearAcceleration", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -25,7 +25,7 @@ typeIOobject angularVelocityHeader ( "angularVelocity", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -47,7 +47,7 @@ typeIOobject angularAccelerationHeader ( "angularAcceleration", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -69,7 +69,7 @@ typeIOobject centreOfRotationHeader ( "centreOfRotation", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/lagrangian/rhoParticleFoam/createFields.H b/applications/solvers/lagrangian/rhoParticleFoam/createFields.H index 16a6ab54cf..dfe5c4a328 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/createFields.H +++ b/applications/solvers/lagrangian/rhoParticleFoam/createFields.H @@ -13,7 +13,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -27,7 +27,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/compressibleVoF/alphaPredictor.C b/applications/solvers/modules/compressibleVoF/alphaPredictor.C index e03deac98a..13b6562868 100644 --- a/applications/solvers/modules/compressibleVoF/alphaPredictor.C +++ b/applications/solvers/modules/compressibleVoF/alphaPredictor.C @@ -52,7 +52,7 @@ void Foam::solvers::compressibleVoF::alphaPredictor() IOobject ( "alphaPhi1", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -64,7 +64,7 @@ void Foam::solvers::compressibleVoF::alphaPredictor() IOobject ( "rhoPhiSum", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/modules/compressibleVoF/compressibleVoF.C b/applications/solvers/modules/compressibleVoF/compressibleVoF.C index 1158b13cbf..7e0679acd1 100644 --- a/applications/solvers/modules/compressibleVoF/compressibleVoF.C +++ b/applications/solvers/modules/compressibleVoF/compressibleVoF.C @@ -72,7 +72,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -85,7 +85,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( "phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -102,7 +102,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) typeIOobject ( IOobject::groupName("alphaPhi", alpha1.group()), - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -120,7 +120,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( "dgdt", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -148,7 +148,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( "rhoPhi", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -161,7 +161,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( IOobject::groupName("alphaPhi", alpha1.group()), - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -203,7 +203,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( "Uf", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -227,7 +227,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( fv::localEulerDdt::rDeltaTName, - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -246,7 +246,7 @@ Foam::solvers::compressibleVoF::compressibleVoF(fvMesh& mesh) IOobject ( "rAU", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C index e83ce33d1d..5d0bba9327 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C +++ b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C @@ -97,7 +97,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource IOobject ( alphaSolidName(), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C index 1ce49d600e..6296fd8fde 100644 --- a/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C +++ b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C @@ -64,7 +64,7 @@ Foam::solvers::incompressibleFluid::incompressibleFluid(fvMesh& mesh) IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -79,7 +79,7 @@ Foam::solvers::incompressibleFluid::incompressibleFluid(fvMesh& mesh) IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -92,7 +92,7 @@ Foam::solvers::incompressibleFluid::incompressibleFluid(fvMesh& mesh) IOobject ( "phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -127,7 +127,7 @@ Foam::solvers::incompressibleFluid::incompressibleFluid(fvMesh& mesh) IOobject ( "Uf", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -151,7 +151,7 @@ Foam::solvers::incompressibleFluid::incompressibleFluid(fvMesh& mesh) IOobject ( fv::localEulerDdt::rDeltaTName, - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/isothermalFluid/isothermalFluid.C b/applications/solvers/modules/isothermalFluid/isothermalFluid.C index bc430b5f5d..948b23ff49 100644 --- a/applications/solvers/modules/isothermalFluid/isothermalFluid.C +++ b/applications/solvers/modules/isothermalFluid/isothermalFluid.C @@ -100,7 +100,7 @@ Foam::solvers::isothermalFluid::isothermalFluid IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -113,7 +113,7 @@ Foam::solvers::isothermalFluid::isothermalFluid IOobject ( "dpdt", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -137,7 +137,7 @@ Foam::solvers::isothermalFluid::isothermalFluid IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -150,7 +150,7 @@ Foam::solvers::isothermalFluid::isothermalFluid IOobject ( "phi", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -202,7 +202,7 @@ Foam::solvers::isothermalFluid::isothermalFluid IOobject ( "netForce", - runTime.timeName(), + runTime.name(), mesh ), fvc::reconstruct @@ -222,7 +222,7 @@ Foam::solvers::isothermalFluid::isothermalFluid IOobject ( "rhoUf", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -246,7 +246,7 @@ Foam::solvers::isothermalFluid::isothermalFluid IOobject ( fv::localEulerDdt::rDeltaTName, - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multicomponentFluid/setRDeltaT.C b/applications/solvers/modules/multicomponentFluid/setRDeltaT.C index 62155be612..f588fb4a67 100644 --- a/applications/solvers/modules/multicomponentFluid/setRDeltaT.C +++ b/applications/solvers/modules/multicomponentFluid/setRDeltaT.C @@ -100,7 +100,7 @@ void Foam::solvers::multicomponentFluid::setRDeltaT() IOobject ( "rDeltaTY", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.C b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.C index 8d31721ea9..1f469c1da4 100644 --- a/applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.C +++ b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.C @@ -83,7 +83,7 @@ Foam::functionObjects::phaseForces::phaseForces IOobject ( IOobject::groupName("dragForce", phase_.name()), - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -106,7 +106,7 @@ Foam::functionObjects::phaseForces::phaseForces "virtualMassForce", phase_.name() ), - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -125,7 +125,7 @@ Foam::functionObjects::phaseForces::phaseForces IOobject ( IOobject::groupName("liftForce", phase_.name()), - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -152,7 +152,7 @@ Foam::functionObjects::phaseForces::phaseForces "wallLubricationForce", phase_.name() ), - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -179,7 +179,7 @@ Foam::functionObjects::phaseForces::phaseForces "turbulentDispersionForce", phase_.name() ), - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, diff --git a/applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.C b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.C index 5567d3c5da..b471787b94 100644 --- a/applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.C +++ b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.C @@ -76,7 +76,7 @@ bool Foam::functionObjects::phaseMap::write() IOobject ( IOobject::groupName(phases_[0].member(), "map"), - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C index e9125285da..236ba67a25 100644 --- a/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C +++ b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C @@ -801,7 +801,7 @@ Foam::functionObjects::populationBalanceMoments::read(const dictionary& dict) IOobject ( this->integerMomentFldName(), - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE @@ -826,7 +826,7 @@ Foam::functionObjects::populationBalanceMoments::read(const dictionary& dict) IOobject ( this->defaultFldName(), - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE @@ -846,7 +846,7 @@ Foam::functionObjects::populationBalanceMoments::read(const dictionary& dict) IOobject ( this->defaultFldName(), - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE @@ -866,7 +866,7 @@ Foam::functionObjects::populationBalanceMoments::read(const dictionary& dict) IOobject ( this->defaultFldName(), - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/include/createRDeltaTf.H b/applications/solvers/modules/multiphaseEuler/include/createRDeltaTf.H index 64c9f7354e..382eae6385 100644 --- a/applications/solvers/modules/multiphaseEuler/include/createRDeltaTf.H +++ b/applications/solvers/modules/multiphaseEuler/include/createRDeltaTf.H @@ -9,7 +9,7 @@ if (LTS && faceMomentum) IOobject ( fv::localEulerDdt::rDeltaTfName, - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C index 7b3ebb3c33..32b7c8f154 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C @@ -53,7 +53,7 @@ Foam::interfaceCompositionModels::Henry::Henry IOobject ( IOobject::groupName("YSolvent", this->interface().name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ), interface.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C index e5abf194cf..c755f6f832 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C @@ -52,7 +52,7 @@ Foam::interfaceCompositionModels::Raoult::Raoult IOobject ( IOobject::groupName("YNonVapour", this->interface().name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ), interface.mesh(), @@ -63,7 +63,7 @@ Foam::interfaceCompositionModels::Raoult::Raoult IOobject ( IOobject::groupName("YNonVapourPrime", this->interface().name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ), interface.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C index 1e48797872..3c40b8cdc7 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C @@ -57,7 +57,7 @@ Foam::interfaceCompositionModels::nonRandomTwoLiquid::nonRandomTwoLiquid IOobject ( IOobject::groupName("gamma1", this->interface().name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ), interface.mesh(), @@ -68,7 +68,7 @@ Foam::interfaceCompositionModels::nonRandomTwoLiquid::nonRandomTwoLiquid IOobject ( IOobject::groupName("gamma2", this->interface().name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ), interface.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C index 567a859a97..156b473d53 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C @@ -51,7 +51,7 @@ Foam::interfaceSaturationTemperatureModel::interfaceSaturationTemperatureModel IOobject ( IOobject::groupName(typeName, interface.name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ) ), diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C index 9198050aab..fe1cf5bd8c 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C @@ -52,7 +52,7 @@ Foam::dragModel::dragModel IOobject ( IOobject::groupName(typeName, interface.name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh(), IOobject::NO_READ, IOobject::NO_WRITE, diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C index 42f2964b51..70674b2710 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C @@ -86,7 +86,7 @@ Foam::tmp Foam::dragModels::segregated::K() const IOobject ( "L", - mesh.time().timeName(), + mesh.time().name(), mesh ), mesh, diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C index 47e254c24a..b332cc7b5b 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C @@ -56,7 +56,7 @@ Foam::phaseTransferModel::phaseTransferModel IOobject ( IOobject::groupName(typeName, interface.name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ) ) diff --git a/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C index 9240867c10..83570ddd05 100644 --- a/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C @@ -51,7 +51,7 @@ Foam::virtualMassModel::virtualMassModel IOobject ( IOobject::groupName(typeName, interface.name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh(), IOobject::NO_READ, IOobject::NO_WRITE, diff --git a/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 8dcafc84e6..f22de22bcb 100644 --- a/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -155,7 +155,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject ( IOobject::groupName("Theta", phase_.name()), - U.time().timeName(), + U.time().name(), U.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -168,7 +168,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject ( IOobject::groupName(typedName("lambda"), phase_.name()), - U.time().timeName(), + U.time().name(), U.mesh(), IOobject::NO_READ, IOobject::NO_WRITE @@ -182,7 +182,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject ( IOobject::groupName(typedName("gs0"), phase_.name()), - U.time().timeName(), + U.time().name(), U.mesh(), IOobject::NO_READ, IOobject::NO_WRITE @@ -196,7 +196,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject ( IOobject::groupName(typedName("kappa"), phase_.name()), - U.time().timeName(), + U.time().name(), U.mesh(), IOobject::NO_READ, IOobject::NO_WRITE @@ -210,7 +210,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject ( IOobject::groupName(typedName("nuFric"), phase_.name()), - U.time().timeName(), + U.time().name(), U.mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C index e7a5866d80..c14e1f5e89 100644 --- a/applications/solvers/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C @@ -222,7 +222,7 @@ void Foam::solvers::multiphaseEuler::cellPressureCorrector() IOobject ( "phiHbyA", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -245,7 +245,7 @@ void Foam::solvers::multiphaseEuler::cellPressureCorrector() IOobject ( "rAUf", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C index 3671416d51..c7059c851a 100644 --- a/applications/solvers/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C @@ -209,7 +209,7 @@ void Foam::solvers::multiphaseEuler::facePressureCorrector() IOobject ( "phiHbyA", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -232,7 +232,7 @@ void Foam::solvers::multiphaseEuler::facePressureCorrector() IOobject ( "rAUf", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C index 238385036e..aa832cf191 100644 --- a/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C @@ -115,7 +115,7 @@ Foam::solvers::multiphaseEuler::multiphaseEuler(fvMesh& mesh) IOobject ( fv::localEulerDdt::rDeltaTName, - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -135,7 +135,7 @@ Foam::solvers::multiphaseEuler::multiphaseEuler(fvMesh& mesh) IOobject ( fv::localEulerDdt::rDeltaTfName, - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C index 112bdcb3d5..57b52139db 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -685,7 +685,7 @@ void Foam::BlendedInterfacialModel::postProcessBlendingCoefficients IOobject ( fluid.phases()[phasei].volScalarField::name(), - mesh.time().timeName(), + mesh.time().name(), mesh ), mesh, @@ -1284,7 +1284,7 @@ Foam::BlendedInterfacialModel::BlendedInterfacialModel IOobject ( IOobject::groupName(typeName, interface.name()), - interface.fluid().mesh().time().timeName(), + interface.fluid().mesh().time().name(), interface.fluid().mesh() ) ), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C index 8ad8185871..c1483c339e 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C @@ -249,7 +249,7 @@ InterfaceCompositionPhaseChangePhaseSystem "interfaceCompositionPhaseChange:dmdtf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -275,7 +275,7 @@ InterfaceCompositionPhaseChangePhaseSystem "interfaceCompositionPhaseChange:Tf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE @@ -321,7 +321,7 @@ InterfaceCompositionPhaseChangePhaseSystem ), interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), @@ -345,7 +345,7 @@ InterfaceCompositionPhaseChangePhaseSystem ), interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C index aac4b6c85d..c6a9077cde 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C @@ -113,7 +113,7 @@ MomentumTransferPhaseSystem IOobject ( IOobject::groupName("Kd", interface.name()), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), @@ -129,7 +129,7 @@ MomentumTransferPhaseSystem IOobject ( IOobject::groupName("Kdf", interface.name()), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), @@ -155,7 +155,7 @@ MomentumTransferPhaseSystem IOobject ( IOobject::groupName("Vm", interface.name()), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), @@ -171,7 +171,7 @@ MomentumTransferPhaseSystem IOobject ( IOobject::groupName("Vmf", interface.name()), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C index 878cc03ad9..6a525f9955 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C @@ -175,7 +175,7 @@ Foam::PhaseTransferPhaseSystem::PhaseTransferPhaseSystem "phaseTransfer:dmdtf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), @@ -195,7 +195,7 @@ Foam::PhaseTransferPhaseSystem::PhaseTransferPhaseSystem "phaseTransfer:d2mdtdpf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), @@ -228,7 +228,7 @@ Foam::PhaseTransferPhaseSystem::PhaseTransferPhaseSystem ), interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh() ), this->mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C index cdebcae3e7..4e567d52e6 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C @@ -129,7 +129,7 @@ ThermalPhaseChangePhaseSystem "thermalPhaseChange:dmdtf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -151,7 +151,7 @@ ThermalPhaseChangePhaseSystem "thermalPhaseChange:d2mdtdpf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE @@ -173,7 +173,7 @@ ThermalPhaseChangePhaseSystem "thermalPhaseChange:Tf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -197,7 +197,7 @@ ThermalPhaseChangePhaseSystem "thermalPhaseChange:nucleation:dmdtf", interface.name() ), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C index 8600b2708d..11048b55ae 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C @@ -41,7 +41,7 @@ Foam::SidedInterfacialModel::SidedInterfacialModel IOobject ( IOobject::groupName(typeName, interface.name()), - interface.mesh().time().timeName(), + interface.mesh().time().name(), interface.mesh() ) ), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C index 800af31e0c..6691b61203 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C @@ -71,7 +71,7 @@ Foam::diameterModels::IATE::IATE IOobject ( IOobject::groupName("kappai", phase.name()), - phase.time().timeName(), + phase.time().name(), phase.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C index 6032db4546..4193ac608f 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C @@ -55,7 +55,7 @@ Foam::diameterModels::IATEsources::dummy::R IOobject ( typedName("R"), - iate_.phase().time().timeName(), + iate_.phase().time().name(), iate_.phase().mesh() ), iate_.phase().mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C index 691ec23e15..d3bb42fcc6 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C @@ -72,7 +72,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R IOobject ( typedName("R"), - iate_.phase().time().timeName(), + iate_.phase().time().name(), iate_.phase().mesh() ), iate_.phase().mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C index 3a4c01ac4b..059e8330bf 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C @@ -71,7 +71,7 @@ Foam::diameterModels::IATEsources::turbulentBreakUp::R IOobject ( typedName("R"), - iate_.phase().time().timeName(), + iate_.phase().time().name(), iate_.phase().mesh() ), iate_.phase().mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C index f5ba9c3f51..9472871eb5 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C @@ -69,7 +69,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R IOobject ( typedName("R"), - phase().time().timeName(), + phase().time().name(), phase().mesh() ), phase().mesh(), @@ -81,7 +81,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R IOobject ( typedName("Rdk"), - phase().time().timeName(), + phase().time().name(), phase().mesh() ), phase().mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C index c8c8d6bf62..c7fa06ab98 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C @@ -54,7 +54,7 @@ Foam::diameterModels::isothermal::isothermal IOobject ( IOobject::groupName("d", phase.name()), - phase.time().timeName(), + phase.time().name(), phase.mesh() ), phase.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C index 526939ff66..eb8215427d 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C @@ -69,7 +69,7 @@ Foam::diameterModels::linearTsub::linearTsub IOobject ( IOobject::groupName("d", phase.name()), - phase.time().timeName(), + phase.time().name(), phase.mesh() ), phase.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C index b10e1f363c..4fb8aeef5b 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C @@ -77,7 +77,7 @@ Foam::diameterModels::shapeModels::fractal::fractal IOobject ( "kappa" + group.name().substr(1), - group.mesh().time().timeName(), + group.mesh().time().name(), group.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -98,7 +98,7 @@ Foam::diameterModels::shapeModels::fractal::fractal IOobject ( "dColl" + group.name().substr(1), - group.mesh().time().timeName(), + group.mesh().time().name(), group.mesh() ), this->dColl() @@ -108,7 +108,7 @@ Foam::diameterModels::shapeModels::fractal::fractal IOobject ( IOobject::groupName("Su", kappa_.name()), - group.mesh().time().timeName(), + group.mesh().time().name(), group.mesh() ), group.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C index 35e45b2beb..185f33a3ef 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C @@ -116,7 +116,7 @@ Foam::diameterModels::shapeModels::sinteringModels::KochFriedlander::R() const IOobject ( typedName("R"), - fi.time().timeName(), + fi.time().name(), fi.mesh() ), fi.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C index 34dd008a68..a88f9b408a 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C @@ -75,7 +75,7 @@ Foam::diameterModels::shapeModels::sinteringModels::noSintering::R() const IOobject ( typedName("R"), - fi.time().timeName(), + fi.time().name(), fi.mesh() ), fi.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C index 0f5a8b3477..6f911513ea 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C @@ -52,7 +52,7 @@ Foam::diameterModels::sizeGroup::sizeGroup name, velocityGroup.phase().name() ), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C index 17ff236bde..5e50e3f3bc 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C @@ -152,7 +152,7 @@ Foam::diameterModels::velocityGroup::velocityGroup "f", phase.name() ), - phase.time().timeName(), + phase.time().name(), phase.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C index 1dd3c262d0..21bcf86e41 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C @@ -47,7 +47,7 @@ Foam::MovingPhaseModel::phi(const volVectorField& U) const typeIOobject phiHeader ( phiName, - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::NO_READ ); @@ -63,7 +63,7 @@ Foam::MovingPhaseModel::phi(const volVectorField& U) const IOobject ( phiName, - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -97,7 +97,7 @@ Foam::MovingPhaseModel::phi(const volVectorField& U) const IOobject ( phiName, - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE @@ -127,7 +127,7 @@ Foam::MovingPhaseModel::MovingPhaseModel IOobject ( IOobject::groupName("U", this->name()), - fluid.mesh().time().timeName(), + fluid.mesh().time().name(), fluid.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -140,7 +140,7 @@ Foam::MovingPhaseModel::MovingPhaseModel IOobject ( IOobject::groupName("alphaPhi", this->name()), - fluid.mesh().time().timeName(), + fluid.mesh().time().name(), fluid.mesh() ), fluid.mesh(), @@ -151,7 +151,7 @@ Foam::MovingPhaseModel::MovingPhaseModel IOobject ( IOobject::groupName("alphaRhoPhi", this->name()), - fluid.mesh().time().timeName(), + fluid.mesh().time().name(), fluid.mesh() ), fluid.mesh(), @@ -186,7 +186,7 @@ Foam::MovingPhaseModel::MovingPhaseModel IOobject ( IOobject::groupName("continuityError", this->name()), - fluid.mesh().time().timeName(), + fluid.mesh().time().name(), fluid.mesh() ), fluid.mesh(), @@ -203,7 +203,7 @@ Foam::MovingPhaseModel::MovingPhaseModel IOobject ( IOobject::groupName("Uf", this->name()), - fluid.mesh().time().timeName(), + fluid.mesh().time().name(), fluid.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C index fc6d61b673..ea1bda6ede 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C @@ -54,7 +54,7 @@ Foam::phaseModel::phaseModel IOobject ( IOobject::groupName("alpha", phaseName), - fluid.mesh().time().timeName(), + fluid.mesh().time().name(), fluid.mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE @@ -67,7 +67,7 @@ Foam::phaseModel::phaseModel IOobject ( IOobject::groupName("alpha", phaseName), - fluid.mesh().time().timeName(), + fluid.mesh().time().name(), fluid.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C index 81d1298f77..7202f1b0df 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C @@ -241,7 +241,7 @@ Foam::phaseSystem::phaseSystem IOobject ( "dpdt", - mesh.time().timeName(), + mesh.time().name(), mesh ), mesh, diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C index 2eea39f2a5..79841501c3 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C @@ -125,7 +125,7 @@ void Foam::phaseSystem::solve IOobject ( "alphaVoid", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -173,7 +173,7 @@ void Foam::phaseSystem::solve IOobject ( "Sp", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -525,7 +525,7 @@ void Foam::phaseSystem::solve IOobject ( "sumAlphaMoving", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C index 9abbd002a1..014384031c 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C @@ -178,7 +178,7 @@ void Foam::phaseSystem::fillFields IOobject ( IOobject::groupName(name, phase.name()), - this->mesh_.time().timeName(), + this->mesh_.time().name(), this->mesh_ ), this->mesh_, @@ -214,7 +214,7 @@ void Foam::phaseSystem::fillFields IOobject ( IOobject::groupName(name, phase.name()), - this->mesh_.time().timeName(), + this->mesh_.time().name(), this->mesh_ ), this->mesh_, diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C index 172bb38abd..0819347615 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C @@ -40,7 +40,7 @@ Foam::diameterModels::LiaoBase::LiaoBase IOobject ( "kolmogorovLengthScale", - populationBalance_.time().timeName(), + populationBalance_.time().name(), populationBalance_.mesh() ), populationBalance_.mesh(), @@ -56,7 +56,7 @@ Foam::diameterModels::LiaoBase::LiaoBase IOobject ( "shearStrainRate", - populationBalance_.time().timeName(), + populationBalance_.time().name(), populationBalance_.mesh() ), populationBalance_.mesh(), @@ -72,7 +72,7 @@ Foam::diameterModels::LiaoBase::LiaoBase IOobject ( "eddyStrainRate", - populationBalance_.time().timeName(), + populationBalance_.time().name(), populationBalance_.mesh() ), populationBalance_.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C index b06eb82529..35ae889241 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C @@ -70,7 +70,7 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::LuoSvendsen IOobject ( "kolmogorovLengthScale", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C index 39ff18018f..92ef58504e 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C @@ -69,7 +69,7 @@ BrownianCollisions IOobject ( "lambda", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C index d84a9aa4c0..3dd29486bc 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C @@ -64,7 +64,7 @@ DahnekeInterpolation IOobject ( "BrownianCollisionRate", - popBal_.mesh().time().timeName(), + popBal_.mesh().time().name(), popBal_.mesh() ), popBal_.mesh(), @@ -76,7 +76,7 @@ DahnekeInterpolation IOobject ( "ballisticCollisionRate", - popBal_.mesh().time().timeName(), + popBal_.mesh().time().name(), popBal_.mesh() ), popBal_.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C index 62941f8d4f..037feb873b 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C @@ -80,7 +80,7 @@ LiaoCoalescence IOobject ( "CPack", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), @@ -100,7 +100,7 @@ LiaoCoalescence IOobject ( "dCrit", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), @@ -116,7 +116,7 @@ LiaoCoalescence IOobject ( "uRelTurb", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), @@ -132,7 +132,7 @@ LiaoCoalescence IOobject ( "uRelBuoy", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), @@ -148,7 +148,7 @@ LiaoCoalescence IOobject ( "uRelShear", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C index 079392b7a3..7bb43b54f0 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C @@ -93,7 +93,7 @@ PrinceBlanch IOobject ( "shearStrainRate", - popBal_.time().timeName(), + popBal_.time().name(), popBal_.mesh() ), popBal_.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C index 97c2dce710..28286bd902 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C @@ -71,7 +71,7 @@ Foam::diameterModels::driftModels::phaseChange::phaseChange IOobject ( IOobject::groupName(typedName("W"), interfaces_[i].name()), - popBal_.mesh().time().timeName(), + popBal_.mesh().time().name(), popBal_.mesh() ), popBal_.mesh(), diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C index bd98bfc965..6f269f12de 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C @@ -77,7 +77,7 @@ void Foam::diameterModels::populationBalanceModel::registerVelocityGroups() "dilatationError", velGroup.phase().name() ), - fluid_.time().timeName(), + fluid_.time().name(), mesh_ ), mesh_, @@ -167,7 +167,7 @@ void Foam::diameterModels::populationBalanceModel::registerSizeGroups IOobject ( "Su", - fluid_.time().timeName(), + fluid_.time().name(), mesh_ ), mesh_, @@ -182,7 +182,7 @@ void Foam::diameterModels::populationBalanceModel::registerSizeGroups IOobject ( "Sp", - fluid_.time().timeName(), + fluid_.time().name(), mesh_ ), mesh_, @@ -236,7 +236,7 @@ void Foam::diameterModels::populationBalanceModel::initialiseDmdtfs() typedName("dmdtf"), interface.name() ), - mesh().time().timeName(), + mesh().time().name(), mesh() ), mesh(), @@ -815,7 +815,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( "Sui", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -879,7 +879,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( "coalescenceRate", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -905,7 +905,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( "breakupRate", - fluid_.time().timeName(), + fluid_.time().name(), mesh_ ), mesh_, @@ -923,7 +923,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( "binaryBreakupRate", - fluid_.time().timeName(), + fluid_.time().name(), mesh_ ), mesh_, @@ -959,7 +959,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( "driftRate", - fluid_.time().timeName(), + fluid_.time().name(), mesh_ ), mesh_, @@ -977,7 +977,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( "nucleationRate", - fluid_.time().timeName(), + fluid_.time().name(), mesh_ ), mesh_, @@ -1000,7 +1000,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( IOobject::groupName("alpha", this->name()), - fluid_.time().timeName(), + fluid_.time().name(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -1017,7 +1017,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( IOobject::groupName("d", this->name()), - fluid_.time().timeName(), + fluid_.time().name(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -1034,7 +1034,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject ( IOobject::groupName("U", this->name()), - fluid_.time().timeName(), + fluid_.time().name(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H index 5f6df74e8e..64e93a1b28 100644 --- a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H +++ b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H @@ -9,7 +9,7 @@ correctUphiBCs(U, phi, true); IOobject ( "pcorr", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H index 9c9a521fb3..96de27c728 100644 --- a/applications/solvers/multiphase/cavitatingFoam/createFields.H +++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H @@ -6,7 +6,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -19,7 +19,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -33,7 +33,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -51,7 +51,7 @@ surfaceScalarField rhoPhi IOobject ( "rhoPhi", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C index aac8b8baea..de7d4c5558 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C @@ -86,7 +86,7 @@ Foam::compressibleMultiphaseMixture::compressibleMultiphaseMixture IOobject ( "p", - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -99,7 +99,7 @@ Foam::compressibleMultiphaseMixture::compressibleMultiphaseMixture IOobject ( "T", - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -114,7 +114,7 @@ Foam::compressibleMultiphaseMixture::compressibleMultiphaseMixture IOobject ( "rho", - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE @@ -132,7 +132,7 @@ Foam::compressibleMultiphaseMixture::compressibleMultiphaseMixture IOobject ( "rhoPhi", - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE @@ -146,7 +146,7 @@ Foam::compressibleMultiphaseMixture::compressibleMultiphaseMixture IOobject ( "alphas", - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -542,7 +542,7 @@ void Foam::compressibleMultiphaseMixture::solveAlphas IOobject ( "sumAlpha", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -564,7 +564,7 @@ void Foam::compressibleMultiphaseMixture::solveAlphas IOobject ( "Sp", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, @@ -576,7 +576,7 @@ void Foam::compressibleMultiphaseMixture::solveAlphas IOobject ( "Su", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), // Divergence term is handled explicitly to be diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/phaseModel/phaseModel.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/phaseModel/phaseModel.C index 5f0a9de69c..85dfe61456 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/phaseModel/phaseModel.C @@ -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 @@ -39,7 +39,7 @@ Foam::phaseModel::phaseModel IOobject ( IOobject::groupName("alpha", phaseName), - p.mesh().time().timeName(), + p.mesh().time().name(), p.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -55,7 +55,7 @@ Foam::phaseModel::phaseModel IOobject ( IOobject::groupName("Alpha", phaseName), - p.mesh().time().timeName(), + p.mesh().time().name(), p.mesh() ), p.mesh(), @@ -66,7 +66,7 @@ Foam::phaseModel::phaseModel IOobject ( IOobject::groupName("dgdt", phaseName), - p.mesh().time().timeName(), + p.mesh().time().name(), p.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H index deeb14156a..8aa8d690d0 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H @@ -4,7 +4,7 @@ volScalarField p_rgh IOobject ( "p_rgh", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H index ce3fed5537..eb7966b5c1 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H @@ -6,7 +6,7 @@ IOobject ( "alphaPhi", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -23,7 +23,7 @@ IOobject ( "alphaPhiSum", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H index 2d9ac2ac3a..9a183eaf5b 100644 --- a/applications/solvers/multiphase/driftFluxFoam/createFields.H +++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H @@ -4,7 +4,7 @@ volScalarField p_rgh IOobject ( "p_rgh", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -45,7 +45,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -59,7 +59,7 @@ surfaceScalarField rhoPhi IOobject ( "rhoPhi", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -80,7 +80,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C index 8baea1cdb8..02ee0ed865 100644 --- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C +++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C @@ -71,7 +71,7 @@ incompressibleTwoPhaseInteractingMixture IOobject ( "mu", - U_.time().timeName(), + U_.time().name(), U_.db() ), U_.mesh(), diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C index f59fedb4c6..804a954c59 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C @@ -82,7 +82,7 @@ Foam::relativeVelocityModel::relativeVelocityModel IOobject ( "Udm", - mixture.U().time().timeName(), + mixture.U().time().name(), mixture.U().mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H index 115e9fda76..628b195451 100644 --- a/applications/solvers/multiphase/interFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/createFields.H @@ -6,7 +6,7 @@ volScalarField p_rgh IOobject ( "p_rgh", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -20,7 +20,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -41,7 +41,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT ), @@ -60,7 +60,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/interFoam/initCorrectPhi.H b/applications/solvers/multiphase/interFoam/initCorrectPhi.H index 5643188881..31190e3c72 100644 --- a/applications/solvers/multiphase/interFoam/initCorrectPhi.H +++ b/applications/solvers/multiphase/interFoam/initCorrectPhi.H @@ -11,7 +11,7 @@ if IOobject ( "rAU", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 0c90a6a4ce..34d59bd829 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -177,7 +177,7 @@ int main(int argc, char *argv[]) IOobject ( "rhoPhi", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H index f7744d972b..00b594083c 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H @@ -7,7 +7,7 @@ IOobject ( "phir", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -23,7 +23,7 @@ IOobject ( "lambda", - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE, diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H index 1f395d424e..e274d9bb1a 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H @@ -8,7 +8,7 @@ if (nAlphaSubCycles > 1) IOobject ( "rhoPhiSum", - runTime.timeName(), + runTime.name(), mesh ), mesh, diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H index bf92375dc8..9e265e83e8 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H @@ -6,7 +6,7 @@ volScalarField p_rgh IOobject ( "p_rgh", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -20,7 +20,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -48,7 +48,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT ), @@ -65,7 +65,7 @@ surfaceScalarField rhoPhi IOobject ( "rhoPhi", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -91,7 +91,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C index c7c0cf8ca0..a0f1e46d24 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C @@ -69,7 +69,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture IOobject ( IOobject::groupName("alpha", phase1Name_), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -82,7 +82,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture IOobject ( IOobject::groupName("alpha", phase2Name_), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -95,7 +95,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture IOobject ( IOobject::groupName("alpha", phase3Name_), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -108,7 +108,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture IOobject ( "nu", - mesh.time().timeName(), + mesh.time().name(), mesh ), mesh, diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H b/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H index e02ffe6bf6..8f86942ad7 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/initCorrectPhi.H @@ -7,7 +7,7 @@ if (correctPhi) IOobject ( "rAU", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C index a6fa9d63d5..31132473cb 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C @@ -172,7 +172,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties IOobject ( "nHatf", - alpha1_.time().timeName(), + alpha1_.time().name(), alpha1_.mesh() ), alpha1_.mesh(), @@ -184,7 +184,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties IOobject ( "interfaceProperties:K", - alpha1_.time().timeName(), + alpha1_.time().name(), alpha1_.mesh() ), alpha1_.mesh(), diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H index 95b4831cab..72080a2c10 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H @@ -4,7 +4,7 @@ volScalarField p_rgh IOobject ( "p_rgh", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ volVectorField U IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -36,7 +36,7 @@ volScalarField rho IOobject ( "rho", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT ), @@ -61,7 +61,7 @@ volScalarField p IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H b/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H index e02ffe6bf6..8f86942ad7 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/initCorrectPhi.H @@ -7,7 +7,7 @@ if (correctPhi) IOobject ( "rAU", - runTime.timeName(), + runTime.name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index aed2795e1c..d31a95c29d 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -82,7 +82,7 @@ Foam::multiphaseMixture::multiphaseMixture IOobject ( "rhoPhi", - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE @@ -96,7 +96,7 @@ Foam::multiphaseMixture::multiphaseMixture IOobject ( "alphas", - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -110,7 +110,7 @@ Foam::multiphaseMixture::multiphaseMixture IOobject ( "nu", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mu()/rho() @@ -314,7 +314,7 @@ void Foam::multiphaseMixture::solve() IOobject ( "rhoPhiSum", - runTime.timeName(), + runTime.name(), mesh_ ), mesh_, @@ -520,7 +520,7 @@ void Foam::multiphaseMixture::solveAlphas IOobject ( "sumAlpha", - mesh_.time().timeName(), + mesh_.time().name(), mesh_ ), mesh_, diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C index 060ef1358f..eb28355ce5 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C @@ -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 @@ -39,7 +39,7 @@ Foam::phase::phase IOobject ( IOobject::groupName("alpha", phaseName), - U.mesh().time().timeName(), + U.mesh().time().name(), U.mesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H index 3a480ba8dd..3fad2fd0b1 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/calculateStress.H @@ -5,7 +5,7 @@ if (runTime.writeTime()) IOobject ( "sigma", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -23,7 +23,7 @@ if (runTime.writeTime()) IOobject ( "sigmaEq", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H index e3fb8bb8d3..53ea75ee7b 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H @@ -6,7 +6,7 @@ volVectorField D IOobject ( "D", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -20,7 +20,7 @@ volSymmTensorField sigmaD IOobject ( "sigmaD", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -34,7 +34,7 @@ volVectorField divSigmaExp IOobject ( "divSigmaExp", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/calculateStress.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/calculateStress.H index 587f6120ff..e75309bfa8 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/calculateStress.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/calculateStress.H @@ -5,7 +5,7 @@ if (runTime.writeTime()) IOobject ( "sigma", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ if (runTime.writeTime()) IOobject ( "sigmaEq", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/createFields.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/createFields.H index 01217b7bdf..abfbca6ba5 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/createFields.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/createFields.H @@ -6,7 +6,7 @@ volVectorField D IOobject ( "D", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -20,7 +20,7 @@ volVectorField Dcorr IOobject ( "Dcorr", - runTime.timeName(), + runTime.name(), mesh ), D @@ -33,7 +33,7 @@ volSymmTensorField sigmaD IOobject ( "sigmaD", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE @@ -46,7 +46,7 @@ volTensorField sigmaExp IOobject ( "sigmaExp", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C index 954f42dc4c..03b3ec967c 100644 --- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C +++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C @@ -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[]) IOobject ( "agglomeration", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) scalarAgglomeration.write(); Info<< "Writing initial cell distribution to " - << runTime.timeName() << endl; + << runTime.name() << endl; } @@ -158,7 +158,7 @@ int main(int argc, char *argv[]) IOobject ( "agglomeration", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -181,7 +181,7 @@ int main(int argc, char *argv[]) if (writeObj) { - OFstream str(runTime.path()/runTime.timeName()/"aggomeration.obj"); + OFstream str(runTime.path()/runTime.name()/"aggomeration.obj"); label vertI = 0; // Write all mesh cc diff --git a/applications/test/IOField/Test-IOField.C b/applications/test/IOField/Test-IOField.C index b1220e1b36..5cc910079c 100644 --- a/applications/test/IOField/Test-IOField.C +++ b/applications/test/IOField/Test-IOField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) typeIOobject> io ( "bla", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C index d6fbd6fae7..9bd222c28d 100644 --- a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C +++ b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C @@ -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[]) IOobject ( "patchDist", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) IOobject ( "otherPatchDist", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/test/PointEdgeWave/Test-PointEdgeWave.C b/applications/test/PointEdgeWave/Test-PointEdgeWave.C index 8eb18a1f57..b872de8c63 100644 --- a/applications/test/PointEdgeWave/Test-PointEdgeWave.C +++ b/applications/test/PointEdgeWave/Test-PointEdgeWave.C @@ -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 @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) IOobject ( "wallDist", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/test/cyclic/createFields.H b/applications/test/cyclic/createFields.H index 0ec3c54a2f..35c99dc5f7 100644 --- a/applications/test/cyclic/createFields.H +++ b/applications/test/cyclic/createFields.H @@ -4,7 +4,7 @@ IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -18,7 +18,7 @@ IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE diff --git a/applications/test/fieldDependency/Test-fieldDependency.C b/applications/test/fieldDependency/Test-fieldDependency.C index 55f564777f..fb8f0cc170 100644 --- a/applications/test/fieldDependency/Test-fieldDependency.C +++ b/applications/test/fieldDependency/Test-fieldDependency.C @@ -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 @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) IOobject ( "T", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index fedbf67e17..67c3eb2ba2 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) IOobject ( "one", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) zeroGradientFvPatchScalarField::typeName ); Info<< "Writing one field " - << one.name() << " in " << runTime.timeName() << endl; + << one.name() << " in " << runTime.name() << endl; one.write(); @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) IOobject ( "ccX", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) ); Info<< "Writing x component of cell centres to " << ccX.name() - << " in " << runTime.timeName() << endl; + << " in " << runTime.name() << endl; ccX.write(); @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) IOobject ( "surfaceOne", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) calculatedFvsPatchScalarField::typeName ); Info<< "Writing surface one field " - << surfaceOne.name() << " in " << runTime.timeName() << endl; + << surfaceOne.name() << " in " << runTime.name() << endl; surfaceOne.write(); diff --git a/applications/test/fvMeshStitcher/Test-fvMeshStitcher.C b/applications/test/fvMeshStitcher/Test-fvMeshStitcher.C index 2518c4e7f7..c006d507c4 100644 --- a/applications/test/fvMeshStitcher/Test-fvMeshStitcher.C +++ b/applications/test/fvMeshStitcher/Test-fvMeshStitcher.C @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { const word oldInstance = mesh.pointsInstance(); - mesh.setInstance(runTime.timeName()); + mesh.setInstance(runTime.name()); // Set the precision of the points data to 10 IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision())); @@ -65,7 +65,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(); } diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C index 589cc77a72..a62fdd0aad 100644 --- a/applications/test/hexRef8/Test-hexRef8.C +++ b/applications/test/hexRef8/Test-hexRef8.C @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) IOobject ( "one", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) zeroGradientFvPatchScalarField::typeName ); Info<< "Writing one field " - << one.name() << " in " << runTime.timeName() << endl; + << one.name() << " in " << runTime.name() << endl; one.write(); @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) IOobject ( "ccX", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) ); Info<< "Writing x component of cell centres to " << ccX.name() - << " in " << runTime.timeName() << endl; + << " in " << runTime.name() << endl; ccX.write(); @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) IOobject ( "surfaceOne", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) calculatedFvsPatchScalarField::typeName ); Info<< "Writing surface one field " - << surfaceOne.name() << " in " << runTime.timeName() << endl; + << surfaceOne.name() << " in " << runTime.name() << endl; surfaceOne.write(); @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) IOobject ( "pointX", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) pointX.primitiveFieldRef() = mesh.points().component(0); pointX.correctBoundaryConditions(); Info<< "Writing x-component field " - << pointX.name() << " in " << runTime.timeName() << endl; + << pointX.name() << " in " << runTime.name() << endl; pointX.write(); diff --git a/applications/test/mappedPatch/Test-mappedPatch.C b/applications/test/mappedPatch/Test-mappedPatch.C index 29c0cc53cd..c65cfeb2fd 100644 --- a/applications/test/mappedPatch/Test-mappedPatch.C +++ b/applications/test/mappedPatch/Test-mappedPatch.C @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) IOobject ( "cc", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/test/mesh/Test-mesh.C b/applications/test/mesh/Test-mesh.C index f3d330a958..1c1d1b61ac 100644 --- a/applications/test/mesh/Test-mesh.C +++ b/applications/test/mesh/Test-mesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) IOobject ( fvMesh::defaultRegion, - runTime.timeName(), + runTime.name(), runTime, IOobject::MUST_READ ) @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) IOobject ( "newMesh", - runTime.timeName(), + runTime.name(), runTime, Foam::IOobject::NO_READ ), diff --git a/applications/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C index a6f1a930cd..ee8be9cf55 100644 --- a/applications/test/passiveParticle/Test-passiveParticle.C +++ b/applications/test/passiveParticle/Test-passiveParticle.C @@ -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 @@ -70,12 +70,12 @@ int main(int argc, char *argv[]) << nl << endl; runTime++; - Pout<< "Writing particles to time " << runTime.timeName() << endl; + Pout<< "Writing particles to time " << runTime.name() << endl; particles.write(); } { - Pout<< "Rereading particles from time " << runTime.timeName() + Pout<< "Rereading particles from time " << runTime.name() << endl; passiveParticleCloud particles(mesh, cloudName); Pout<< "Reread particles:" << particles.size() << endl; diff --git a/applications/test/patchRegion/Test-patchRegion.C b/applications/test/patchRegion/Test-patchRegion.C index 3250e38f2d..69e8f2be4d 100644 --- a/applications/test/patchRegion/Test-patchRegion.C +++ b/applications/test/patchRegion/Test-patchRegion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) ); - Info<< "Time now = " << runTime.timeName() << endl; + Info<< "Time now = " << runTime.name() << endl; // Detect points with multiple regions diff --git a/applications/test/patchToPatch/Test-patchToPatch.C b/applications/test/patchToPatch/Test-patchToPatch.C index 86fdea3d85..a88d7e4be7 100644 --- a/applications/test/patchToPatch/Test-patchToPatch.C +++ b/applications/test/patchToPatch/Test-patchToPatch.C @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) Foam::IOobject ( Foam::polyMesh::defaultRegion, - srcRunTimePtr->timeName(), + srcRunTimePtr->name(), srcRunTimePtr(), Foam::IOobject::MUST_READ ) diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C index 3c862b444c..1d00a5b3a7 100644 --- a/applications/test/pointField/Test-PointField.C +++ b/applications/test/pointField/Test-PointField.C @@ -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 @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/test/reconstruct/Test-reconstruct.C b/applications/test/reconstruct/Test-reconstruct.C index c76593fc3a..c70b99156e 100644 --- a/applications/test/reconstruct/Test-reconstruct.C +++ b/applications/test/reconstruct/Test-reconstruct.C @@ -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 @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) IOobject ( "Uphi", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/applications/test/slicedField/Test-slicedField.C b/applications/test/slicedField/Test-slicedField.C index 8ce1b15557..8abf217de3 100644 --- a/applications/test/slicedField/Test-slicedField.C +++ b/applications/test/slicedField/Test-slicedField.C @@ -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 @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) IOobject ( "C2", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) IOobject ( "Sf2", - runTime.timeName(), + runTime.name(), mesh ), mesh, @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) IOobject ( "slicedPhi", - runTime.timeName(), + runTime.name(), mesh ), phi, diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C index 81b0783c47..91c0f0dfc8 100644 --- a/applications/test/volField/Test-volField.C +++ b/applications/test/volField/Test-volField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) IOobject ( "p", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) IOobject ( "U", - runTime.timeName(), + runTime.name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) IOobject ( "st", - runTime.timeName(), + runTime.name(), mesh, IOobject::NO_READ, IOobject::NO_WRITE diff --git a/applications/test/volPointInterpolation/Test-volPointInterpolation.C b/applications/test/volPointInterpolation/Test-volPointInterpolation.C index 799c39ec2e..492cef2e05 100644 --- a/applications/test/volPointInterpolation/Test-volPointInterpolation.C +++ b/applications/test/volPointInterpolation/Test-volPointInterpolation.C @@ -38,7 +38,7 @@ bool interpolate(const fvMesh& mesh, const word& name) typeIOobject> io ( name, - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::MUST_READ ); diff --git a/applications/test/wallDist/Test-wallDist.C b/applications/test/wallDist/Test-wallDist.C index ce5277fb81..f93ed23317 100644 --- a/applications/test/wallDist/Test-wallDist.C +++ b/applications/test/wallDist/Test-wallDist.C @@ -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 @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) << runTime.cpuTimeIncrement() << " s\n" << endl << endl; - Info<< "Time now = " << runTime.timeName() << endl; + Info<< "Time now = " << runTime.name() << endl; // Wall-reflection vectors const volVectorField& n = wallDist::New(mesh).n(); @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) runTime++; - Info<< "Time now = " << runTime.timeName() << endl; + Info<< "Time now = " << runTime.name() << endl; // Move points diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index 57e6bbadd2..7d9b00370b 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -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) { diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index e3979bf9af..c77603e2c8 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -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) diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index c11048587f..01b7a85a0f 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -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(); diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C index 6c8890d1e6..19fd2f9239 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C +++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C @@ -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(); } diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index 72493a3f4a..e5d9fba4fe 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -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(); } diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C index 2df8c9479a..dbbfa1dafa 100644 --- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C +++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C @@ -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(); diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C index 0555606b96..50fc73a90a 100644 --- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C +++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C @@ -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(); diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C index 2a4deec137..6fc05e04ad 100644 --- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C +++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C @@ -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 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 diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C index 5890b6aebf..15bf5b6f60 100644 --- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C +++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C @@ -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; diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C index 03f2703872..dd43e5a712 100644 --- a/applications/utilities/mesh/advanced/splitCells/splitCells.C +++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C @@ -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(); diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C index 832a8d07bc..882642f9df 100644 --- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C +++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C @@ -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 diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C index aac27faa6b..bb10247fdb 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C @@ -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 ( diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C index e89b3e2931..c323c155e4 100644 --- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C +++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C @@ -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); diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H index f9f10d2edb..db80f71eb8 100644 --- a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H +++ b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H @@ -4,14 +4,14 @@ if ( - runTime.timeName() != runTime.constant() - && runTime.timeName() != "0" + runTime.name() != runTime.constant() + && runTime.name() != "0" ) { typeIOobject 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; diff --git a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C index 126b823ba9..2b9d13915d 100644 --- a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C +++ b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C @@ -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()); diff --git a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H index 5ba1650b6c..72c4aff8a1 100644 --- a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H +++ b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H @@ -4,14 +4,14 @@ if ( - runTime.timeName() != runTime.constant() - && runTime.timeName() != "0" + runTime.name() != runTime.constant() + && runTime.name() != "0" ) { typeIOobject 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; diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C index 4210b4c51f..31c18444dc 100644 --- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C +++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C @@ -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