Merge pull request #159 from ubermag/explicit_time_function

enforce float
ubermag · Aug 9, 2024 · 9f14f5e · 9f14f5e
2 parents 6aa977c + 43c9ed4
commit 9f14f5e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/oommfc/drivers/driver.py b/oommfc/drivers/driver.py
@@ -246,11 +246,11 @@ def _time_dependence(term, **kwargs):
                 "used with time driver."
             ) from None
         ts = np.arange(0, tmax + term.dt, term.dt)
-        try:  # vector output from term.func
-            tlist = [list(term.func(t)) for t in ts]
+        if isinstance(term.func(ts[0]), (list, tuple, np.ndarray)):
+            tlist = [[float(x) for x in term.func(t)] for t in ts]
             dtlist = (np.gradient(tlist)[0] / term.dt).tolist()
-        except TypeError:  # scalar output from term.func
-            tlist = [term.func(t) for t in ts]
+        else:  # scalar output from term.func
+            tlist = [float(term.func(t)) for t in ts]
             dtlist = list(np.gradient(tlist) / term.dt)
         term.tlist = tlist
         term.dtlist = dtlist