Merge pull request #1976 from pybamm-team/issue-1970-ocv-data

#1970 fix bug

Author: valentinsulzer

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 ## Bug fixes
 
+-   Fixed a bug in the eSOH variable calculation when OCV is given as data ([#1975](https://github.com/pybamm-team/PyBaMM/pull/1975))
 -   Fixed a bug where isothermal models did not compute any heat source terms ([#1958](https://github.com/pybamm-team/PyBaMM/pull/1958))
 
 ## Breaking changes

pybamm/parameters/parameter_values.py

@@ -299,7 +299,6 @@ def update(self, values, check_conflict=False, check_already_exists=True, path="
                 if value.startswith("[function]"):
                     loaded_value = pybamm.load_function(os.path.join(path, value[10:]))
                     self._dict_items[name] = loaded_value
-                    values[name] = loaded_value
                 # Data is flagged with the string "[data]" or "[current data]"
                 elif value.startswith("[current data]") or value.startswith("[data]"):
                     if value.startswith("[current data]"):
@@ -317,8 +316,6 @@ def update(self, values, check_conflict=False, check_already_exists=True, path="
                     ).to_numpy()
                     # Save name and data
                     self._dict_items[name] = (function_name, ([data[:, 0]], data[:, 1]))
-                    values[name] = (function_name, ([data[:, 0]], data[:, 1]))
-
                 # parse 2D parameter data
                 elif value.startswith("[2D data]"):
                     filename = os.path.join(path, value[9:] + ".json")
@@ -330,14 +327,19 @@ def update(self, values, check_conflict=False, check_already_exists=True, path="
                     data[0] = [np.array(el) for el in data[0]]
                     data[1] = np.array(data[1])
                     self._dict_items[name] = (function_name, data)
-                    values[name] = (function_name, data)
 
                 elif value == "[input]":
                     self._dict_items[name] = pybamm.InputParameter(name)
                 # Anything else should be a converted to a float
                 else:
                     self._dict_items[name] = float(value)
-                    values[name] = float(value)
+            elif isinstance(value, tuple) and isinstance(value[1], np.ndarray):
+                # If data is provided as a 2-column array (1D data),
+                # convert to two arrays for compatibility with 2D data
+                # see #1805
+                func_name, data = value
+                data = ([data[:, 0]], data[:, 1])
+                self._dict_items[name] = (func_name, data)
             else:
                 self._dict_items[name] = value
         # reset processed symbols
@@ -645,9 +647,6 @@ def _process_symbol(self, symbol):
                     # to create an Interpolant
                     name, data = function_name
 
-                    if isinstance(data, np.ndarray):
-                        data = [data[:, 0]], data[:, 1]
-
                     if len(data[0]) == 1:
                         input_data = data[0][0], data[1]
 

pybamm/solvers/solution.py

@@ -551,8 +551,7 @@ def save(self, filename):
             pickle.dump(self, f, pickle.HIGHEST_PROTOCOL)
 
     def save_data(
-            self, filename=None, variables=None,
-            to_format="pickle", short_names=None
+        self, filename=None, variables=None, to_format="pickle", short_names=None
     ):
         """
         Save solution data only (raw arrays)
@@ -613,16 +612,12 @@ def save_data(
 
         if to_format == "pickle":
             if filename is None:
-                raise ValueError(
-                    "pickle format must be written to a file"
-                )
+                raise ValueError("pickle format must be written to a file")
             with open(filename, "wb") as f:
                 pickle.dump(data_short_names, f, pickle.HIGHEST_PROTOCOL)
         elif to_format == "matlab":
             if filename is None:
-                raise ValueError(
-                    "matlab format must be written to a file"
-                )
+                raise ValueError("matlab format must be written to a file")
             # Check all the variable names only contain a-z, A-Z or _ or numbers
             for name in data_short_names.keys():
                 # Check the string only contains the following ASCII:
@@ -888,7 +883,7 @@ def get_cycle_summary_variables(cycle_solution, esoh_sim):
                     esoh_sim.parameter_values["Positive electrode OCP [V]"], tuple
                 ):
                     y_100_min = np.min(
-                        esoh_sim.parameter_values["Positive electrode OCP [V]"][1][:, 0]
+                        esoh_sim.parameter_values["Positive electrode OCP [V]"][1][0][0]
                     )
                     x_100_max = (
                         n_Li * pybamm.constants.F.value / 3600 - y_100_min * C_p