From f6ee1811e760a1f5e712f25400f11be2834b07c0 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 22 Nov 2021 16:50:21 +0000
Subject: [PATCH] STYLE: renamed convertTimeBase to more descriptive
userTimeToTime
---
.../primitives/functions/Function1/Function1/function1Base.C | 2 +-
.../primitives/functions/Function1/Function1/function1Base.H | 2 +-
.../functions/Function1/Polynomial/PolynomialEntry.C | 2 +-
.../functions/Function1/Polynomial/PolynomialEntry.H | 2 +-
src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C | 2 +-
src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H | 2 +-
src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C | 2 +-
src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H | 2 +-
src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C | 2 +-
src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H | 2 +-
.../primitives/functions/TimeFunction1/TimeFunction1.C | 4 ++--
.../PatchFunction1/PatchFunction1/patchFunction1Base.C | 2 +-
.../PatchFunction1/PatchFunction1/patchFunction1Base.H | 2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C
index 72494af3052..60eef5b7d08 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 85188de82c4..42b0efdcb7a 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 d72f9a7cf7d..1a477262c3f 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 67d35b504ef..bf165ed22d2 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 ea3fc383802..8dcd13f5e5c 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 be8fdecb8e6..ac06f7c18a1 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 2bbfba78c2e..36ec5a6f8b8 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 1b805a8c858..51836dd5dbb 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 b66acd4f326..23f14ce8176 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 98ce6969528..09b8154bf56 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 60b95f2d8fa..0cdf552cd29 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 7a80721fd8e..d62c7d105b3 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 d4065c0f213..826618336b2 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);
};
--
GitLab