diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C index 72494af3052cd56fdaa02359d4d00673ed10d6c8..60eef5b7d081afe43e38b4316f1d3f4c917ae6d2 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C @@ -132,7 +132,7 @@ void Foam::function1Base::resetDb(const objectRegistry& db) noexcept } -void Foam::function1Base::convertTimeBase(const Time& t) +void Foam::function1Base::userTimeToTime(const Time& t) {} diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H index 85188de82c45f4d8ac9ab1c9e590aa93984146c1..42b0efdcb7a4fa17c457ce524280cc4f14bc92b7 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H @@ -167,7 +167,7 @@ public: // Manipulation //- Convert time - virtual void convertTimeBase(const Time& t); + virtual void userTimeToTime(const Time& t); }; diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C index d72f9a7cf7dc837cde4180f62abee85b675592a2..1a477262c3f95a04020eec9cbbf4726205fa6c23 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C +++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C @@ -129,7 +129,7 @@ Foam::Function1Types::Polynomial<Type>::Polynomial(const Polynomial& poly) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<class Type> -void Foam::Function1Types::Polynomial<Type>::convertTimeBase(const Time& t) +void Foam::Function1Types::Polynomial<Type>::userTimeToTime(const Time& t) { forAll(coeffs_, i) { diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H index 67d35b504efc7b1468e21709d7a13de00055f883..bf165ed22d228d09f70904622489e11237f0ceb6 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H +++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H @@ -141,7 +141,7 @@ public: // Member Functions //- Convert time - virtual void convertTimeBase(const Time& t); + virtual void userTimeToTime(const Time& t); //- Return Polynomial value virtual Type value(const scalar x) const; diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C index ea3fc38380290f5fdb7ab8eaaab77f3fa60fcc06..8dcd13f5e5cc5bcb038e931163827742ba691c64 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C +++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C @@ -75,7 +75,7 @@ Foam::Function1Types::Sine<Type>::Sine(const Sine<Type>& rhs) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<class Type> -void Foam::Function1Types::Sine<Type>::convertTimeBase(const Time& t) +void Foam::Function1Types::Sine<Type>::userTimeToTime(const Time& t) { t0_ = t.timeToUserTime(t0_); } diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H index be8fdecb8e6fda81f65873ed983f30ff6c31057c..ac06f7c18a1a0a057dc9e3be8401635e8f239991 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H +++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H @@ -200,7 +200,7 @@ public: // Member Functions //- Convert time - virtual void convertTimeBase(const Time& t); + virtual void userTimeToTime(const Time& t); //- Return value for time t virtual inline Type value(const scalar t) const diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C index 2bbfba78c2e03d497a55b4e11335e533fd435975..36ec5a6f8b892fb3b07a82521315f8377f4a5122 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C +++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C @@ -254,7 +254,7 @@ bool Foam::Function1Types::TableBase<Type>::checkMaxBounds template<class Type> -void Foam::Function1Types::TableBase<Type>::convertTimeBase(const Time& t) +void Foam::Function1Types::TableBase<Type>::userTimeToTime(const Time& t) { for (auto& item : table_) { diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H index 1b805a8c85811bcba3ef507819a9232bd4b170dc..51836dd5dbb60b14a10b5ac792edf96fb5e03cc9 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H @@ -128,7 +128,7 @@ public: bool checkMaxBounds(const scalar x, scalar& xDash) const; //- Convert time - virtual void convertTimeBase(const Time& t); + virtual void userTimeToTime(const Time& t); //- Return Table value virtual Type value(const scalar x) const; diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C index b66acd4f32648ce416eca53e66b6f65c9c23e37a..23f14ce8176ce58c1937736eb8bbf782e0245f39 100644 --- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C +++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C @@ -59,7 +59,7 @@ void Foam::Function1Types::ramp::writeEntries(Ostream& os) const } -void Foam::Function1Types::ramp::convertTimeBase(const Time& t) +void Foam::Function1Types::ramp::userTimeToTime(const Time& t) { start_ = t.timeToUserTime(start_); duration_ = t.timeToUserTime(duration_); diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H index 98ce6969528876bce4195523a80e93ec82b05e3f..09b8154bf56a2fc479f83ca540a3083a97640261 100644 --- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H +++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H @@ -135,7 +135,7 @@ public: // Member Functions //- Convert time - virtual void convertTimeBase(const Time& t); + virtual void userTimeToTime(const Time& t); //- Return value for time t virtual scalar value(const scalar t) const = 0; diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C index 60b95f2d8faf80ce5d7d71c08bad442487d97bc9..0cdf552cd29bce09a1194e21fdaa7b257ff05fd4 100644 --- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C +++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C @@ -43,7 +43,7 @@ Foam::TimeFunction1<Type>::TimeFunction1 entry_(Function1<Type>::New(entryName, dict, &runTime)) { // Time conversion now handled by Function1 directly - // entry_->convertTimeBase(runTime); + // entry_->userTimeToTime(runTime); } @@ -83,7 +83,7 @@ template<class Type> void Foam::TimeFunction1<Type>::reset(const dictionary& dict) { entry_ = Function1<Type>::New(name_, dict, &time_); - entry_->convertTimeBase(time_); + entry_->userTimeToTime(time_); } diff --git a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C index 7a80721fd8e5cbde400917434745cdc27edf6eb6..d62c7d105b30fdb60001acacb168d5d06e499e07 100644 --- a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C +++ b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C @@ -102,7 +102,7 @@ const Foam::Time& Foam::patchFunction1Base::time() const } -void Foam::patchFunction1Base::convertTimeBase(const Time& t) +void Foam::patchFunction1Base::userTimeToTime(const Time& t) {} diff --git a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H index d4065c0f2138d0872a036088c0b9a4f7e9c56d7c..826618336b2d150bdbac3f2f949f5bf5458450b1 100644 --- a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H +++ b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H @@ -171,7 +171,7 @@ public: // Manipulation //- Convert time - virtual void convertTimeBase(const Time& t); + virtual void userTimeToTime(const Time& t); };