diff --git a/applications/test/rawIOField/Test-rawIOField.C b/applications/test/rawIOField/Test-rawIOField.C index 43bd4979ce..dcb1e2c7a8 100644 --- a/applications/test/rawIOField/Test-rawIOField.C +++ b/applications/test/rawIOField/Test-rawIOField.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2022 OpenCFD Ltd. + Copyright (C) 2022-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -122,11 +122,10 @@ int main(int argc, char *argv[]) // Fallback (eg, no runTime) if (!timePtr.good()) { - timePtr.reset(Time::New(argList::envGlobalPath())); + timePtr.reset(Time::NewGlobalTime()); } - - const auto& tm = timePtr(); + const auto& tm = *timePtr; fileName resolvedName(inputName); resolvedName.toAbsolute(); diff --git a/applications/test/surface-sampling/mydebugSurfaceWriter.C b/applications/test/surface-sampling/mydebugSurfaceWriter.C index 3a740aa697..f8ec340c89 100644 --- a/applications/test/surface-sampling/mydebugSurfaceWriter.C +++ b/applications/test/surface-sampling/mydebugSurfaceWriter.C @@ -317,7 +317,11 @@ Foam::fileName Foam::surfaceWriters::mydebugWriter::write() if (enableWrite_) { + #if (OPENFOAM <= 2306) dummyTimePtr = Time::New(argList::envGlobalPath()); + #else + dummyTimePtr = Time::NewGlobalTime(); + #endif } else if (verbose_) { @@ -392,7 +396,11 @@ Foam::fileName Foam::surfaceWriters::mydebugWriter::writeTemplate if (enableWrite_) { + #if (OPENFOAM <= 2306) dummyTimePtr = Time::New(argList::envGlobalPath()); + #else + dummyTimePtr = Time::NewGlobalTime(); + #endif } else if (verbose_) { diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 5aa90ccedc..36552f80cf 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -395,6 +395,7 @@ $(Time)/TimePaths.C $(Time)/TimeState.C $(Time)/Time.C $(Time)/TimeIO.C +$(Time)/TimeNew.C $(Time)/subCycleTime.C $(Time)/subLoopTime.C $(Time)/timeSelector.C diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index b6827deac5..e4912421da 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -690,48 +690,6 @@ Foam::Time::Time } -// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::Time::New() -{ - return - autoPtr