From 373d88a4c4268eaa3bc2ea1a5241cb14c631963c Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 15 Dec 2020 21:45:24 +0000
Subject: [PATCH] ENH: Function1 - added some missing time conversions

---
 src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C | 7 +++++++
 src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H | 3 +++
 src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C | 7 +++++++
 src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H | 3 +++
 4 files changed, 20 insertions(+)

diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 20954fa1de..bfcafed6db 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -67,6 +67,13 @@ Foam::Function1Types::Sine<Type>::Sine(const Sine<Type>& rhs)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::Function1Types::Sine<Type>::convertTimeBase(const Time& t)
+{
+    t0_ = t.timeToUserTime(t0_);
+}
+
+
 template<class Type>
 void Foam::Function1Types::Sine<Type>::writeEntries(Ostream& os) const
 {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index 92fdb03865..f580978278 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -194,6 +194,9 @@ public:
 
     // Member Functions
 
+        //- Convert time
+        virtual void convertTimeBase(const Time& t);
+
         //- Return value for time t
         virtual inline Type value(const scalar t) const
         {
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index 9570edb905..53fb63ccc0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -58,6 +58,13 @@ void Foam::Function1Types::ramp::writeEntries(Ostream& os) const
 }
 
 
+void Foam::Function1Types::ramp::convertTimeBase(const Time& t)
+{
+    start_ = t.timeToUserTime(start_);
+    duration_ = t.timeToUserTime(duration_);
+}
+
+
 void Foam::Function1Types::ramp::writeData(Ostream& os) const
 {
     Function1<scalar>::writeData(os);
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
index 339da7de4e..f5767756f0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
@@ -133,6 +133,9 @@ public:
 
     // Member Functions
 
+        //- Convert time
+        virtual void convertTimeBase(const Time& t);
+
         //- Return value for time t
         virtual scalar value(const scalar t) const = 0;