Make function for handling time or reuse an existing one (#4209)

* Make function for handling time or reuse an existing one
Fixes #4113

* style: pre-commit fixes

* fixing raises RegEx Error Experiment Test

* fix pre-commit error

* Update pybamm/callbacks.py

Co-authored-by: Eric G. Kratz <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Agriya Khetarpal <[email protected]>
Co-authored-by: Valentin Sulzer <[email protected]>
Co-authored-by: Eric G. Kratz <[email protected]>

Author: 5 people

pybamm/callbacks.py

@@ -178,15 +178,14 @@ def on_step_end(self, logs):
         time_stop = logs["stopping conditions"]["time"]
         if time_stop is not None:
             time_now = logs["experiment time"]
-            if time_now < time_stop[0]:
+            if time_now < time_stop:
                 self.logger.notice(
-                    f"Time is now {time_now:.3f} s, "
-                    f"will stop at {time_stop[0]:.3f} s."
+                    f"Time is now {time_now:.3f} s, will stop at {time_stop:.3f} s."
                 )
             else:
                 self.logger.notice(
                     f"Stopping experiment since time ({time_now:.3f} s) "
-                    f"has reached stopping time ({time_stop[0]:.3f} s)."
+                    f"has reached stopping time ({time_stop:.3f} s)."
                 )
 
     def on_cycle_end(self, logs):

pybamm/experiment/experiment.py

@@ -169,15 +169,26 @@ def read_termination(termination):
             elif term.endswith("V"):
                 end_discharge_V = term.split("V")[0]
                 termination_dict["voltage"] = (float(end_discharge_V), "V")
-            elif term.endswith("s"):
-                end_time_s = term.split("s")[0]
-                termination_dict["time"] = (float(end_time_s), "s")
-            elif term.endswith("min"):
-                end_time_s = term.split("min")[0]
-                termination_dict["time"] = (float(end_time_s) * 60, "s")
-            elif term.endswith("h"):
-                end_time_s = term.split("h")[0]
-                termination_dict["time"] = (float(end_time_s) * 3600, "s")
+            elif any(
+                [
+                    term.endswith(key)
+                    for key in [
+                        "hour",
+                        "hours",
+                        "h",
+                        "hr",
+                        "minute",
+                        "minutes",
+                        "m",
+                        "min",
+                        "second",
+                        "seconds",
+                        "s",
+                        "sec",
+                    ]
+                ]
+            ):
+                termination_dict["time"] = _convert_time_to_seconds(term)
             else:
                 raise ValueError(
                     "Only capacity or voltage can be provided as a termination reason, "

pybamm/simulation.py

@@ -671,7 +671,7 @@ def solve(
 
                     # if dt + starttime is larger than time_stop, set dt to time_stop - starttime
                     if time_stop is not None:
-                        dt = min(dt, time_stop[0] - start_time)
+                        dt = min(dt, time_stop - start_time)
 
                     step_str = str(step)
                     model = self.steps_to_built_models[step.basic_repr()]
@@ -779,7 +779,7 @@ def solve(
 
                     if time_stop is not None:
                         max_time = cycle_solution.t[-1]
-                        if max_time >= time_stop[0]:
+                        if max_time >= time_stop:
                             break
 
                     # Increment index for next iteration