Merge branch 'issue-2358-add-temperature-to-experiment' of https://github.com/pybamm-team/PyBaMM into issue-2358-add-temperature-to-experiment

Scottmar93 · Scottmar93 · commit 5fcc60be85e5 · 2023-01-08T17:57:41.000+01:00
diff --git a/examples/scripts/run_ecm.py b/examples/scripts/run_ecm.py
@@ -1,4 +1,5 @@
 import pybamm
+
 pybamm.set_logging_level("INFO")
 
 model = pybamm.equivalent_circuit.Thevenin()
diff --git a/pybamm/experiments/experiment.py b/pybamm/experiments/experiment.py
@@ -418,18 +418,14 @@ def convert_electric(self, electric):
                 )
 
     def _detect_mistyped_temperatures(self, cond):
-
-        mistype = False
-
         if "oC" in cond:
-            mistype = True
-
-        if mistype:
             raise ValueError(f"Temperature not written correctly on step: '{cond}'")
 
     def _read_and_drop_temperature(self, cond):
 
         matches = re.findall(r"at\s-*\d+\.*\d*\s*oC", cond)
+        if len(matches) == 0 and "oC" in cond:
+            raise ValueError(f"Temperature not written " f"correctly on step: '{cond}'")
 
         if len(matches) == 0:
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import pybamm`
	`2`	`+`
`2`	`3`	`pybamm.set_logging_level("INFO")`
`3`	`4`
`4`	`5`	`model = pybamm.equivalent_circuit.Thevenin()`