Merge pull request #1352 from Saransh-cpp/issue-1339-renaming-Cellcap…

…acity-to-Nominalcellcapacity Renamed 'Cell capacity [A.h]' to 'Nominal cell capacity [A.h]'
pybamm-team · Feb 3, 2021 · 7ad7cad · 7ad7cad
2 parents 7fb6040 + df0ab56
commit 7ad7cad
Show file tree

Hide file tree

Showing 23 changed files with 57 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@
 -   `Interpolant` now takes `x` and `y` instead of a single `data` entry ([#1312](https://github.com/pybamm-team/PyBaMM/pull/1312))
 -   Boolean model options ('sei porosity change', 'convection') must now be given in string format ('true' or 'false' instead of True or False) ([#1280](https://github.com/pybamm-team/PyBaMM/pull/1280))
 -   Operations such as `1*x` and `0+x` now directly return `x`. This can be bypassed by explicitly creating the binary operators, e.g. `pybamm.Multiplication(1, x)` ([#1252](https://github.com/pybamm-team/PyBaMM/pull/1252))
+-   `'Cell capacity [A.h]'` has been renamed to `'Nominal cell capacity [A.h]'`. `'Cell capacity [A.h]'` will be deprecated in the next release. ([#1352](https://github.com/pybamm-team/PyBaMM/pull/1352))
 
 # [v0.3.0](https://github.com/pybamm-team/PyBaMM) - 2020-11-22
 

diff --git a/examples/notebooks/Validating_mechanical_models_Enertech_DFN.ipynb b/examples/notebooks/Validating_mechanical_models_Enertech_DFN.ipynb
@@ -78,7 +78,7 @@
    "source": [
     "chemistry = pybamm.parameter_sets.Ai2020\n",
     "param = pybamm.ParameterValues(chemistry=chemistry)\n",
-    "capacity = param[\"Cell capacity [A.h]\"]\n",
+    "capacity = param[\"Nominal cell capacity [A.h]\"]\n",
     "param.update({\n",
     "    \"Current function [A]\": capacity * pybamm.InputParameter(\"C-rate\")\n",
     "})\n",
@@ -334,4 +334,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/examples/notebooks/compare-ecker-data.ipynb b/examples/notebooks/compare-ecker-data.ipynb
@@ -138,7 +138,7 @@
    "outputs": [],
    "source": [
     "C_rates = [1, 5]  # C-rates to solve for\n",
-    "capacity = parameter_values[\"Cell capacity [A.h]\"]\n",
+    "capacity = parameter_values[\"Nominal cell capacity [A.h]\"]\n",
     "t_evals = [\n",
     "    np.linspace(0, 3800, 100), \n",
     "    np.linspace(0, 720, 100)\n",

diff --git a/examples/notebooks/models/pouch-cell-model.ipynb b/examples/notebooks/models/pouch-cell-model.ipynb
@@ -124,7 +124,7 @@
    "outputs": [],
    "source": [
     "param = dfn.default_parameter_values\n",
-    "I_1C = param[\"Cell capacity [A.h]\"]  # 1C current is cell capacity multipled by 1 hour\n",
+    "I_1C = param[\"Nominal cell capacity [A.h]\"]  # 1C current is cell capacity multipled by 1 hour\n",
     "param.update(\n",
     "    {\n",
     "        \"Current function [A]\": I_1C * 3,       \n",
@@ -854,4 +854,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}
diff --git a/examples/notebooks/models/thermal-models.ipynb b/examples/notebooks/models/thermal-models.ipynb
@@ -415,7 +415,7 @@
    ],
    "source": [
     "# update current to correspond to a C-rate of 3 (i.e. 3 times the nominal cell capacity)\n",
-    "parameter_values[\"Current function [A]\"] = 3 * parameter_values[\"Cell capacity [A.h]\"]\n",
+    "parameter_values[\"Current function [A]\"] = 3 * parameter_values[\"Nominal cell capacity [A.h]\"]\n",
     "\n",
     "# pick solver \n",
     "solver = pybamm.CasadiSolver(mode=\"fast\", atol=1e-3)\n",
@@ -504,4 +504,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/examples/notebooks/speed-up-solver.ipynb b/examples/notebooks/speed-up-solver.ipynb
@@ -88,7 +88,7 @@
     "# Set up model\n",
     "model = pybamm.lithium_ion.DFN()\n",
     "param = model.default_parameter_values\n",
-    "cap = param[\"Cell capacity [A.h]\"]\n",
+    "cap = param[\"Nominal cell capacity [A.h]\"]\n",
     "param[\"Current function [A]\"] = cap * pybamm.InputParameter(\"Crate\")\n",
     "sim = pybamm.Simulation(model, parameter_values=param)\n",
     "\n",
@@ -5666,4 +5666,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/pybamm/input/parameters/lead-acid/cells/BBOXX_Sulzer2019/parameters.csv b/pybamm/input/parameters/lead-acid/cells/BBOXX_Sulzer2019/parameters.csv
@@ -19,7 +19,7 @@ Cell cooling surface area [m2],1.54E-1,,
 Cell volume [m3],2.70E-4,,
 ,,,
 # Electrical,,,
-Cell capacity [A.h],17,Manufacturer,
+Nominal cell capacity [A.h],17,Manufacturer,
 Typical current [A],1,,
 Current function [A],1,default current function,
 ,,,

diff --git a/pybamm/input/parameters/lithium-ion/cells/A123_Lain2019/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/A123_Lain2019/parameters.csv
@@ -33,6 +33,6 @@ Negative current collector thermal conductivity [W.m-1.K-1],401,CRC Handbook,cop
 Positive current collector thermal conductivity [W.m-1.K-1],237,CRC Handbook,aluminium
 ,,,
 # Electrical,,,
-Cell capacity [A.h],1.1,Lain 2019,
+Nominal cell capacity [A.h],1.1,Lain 2019,
 Current function [A],4.4,,
 Typical current [A],4.4,Lain 2019,
diff --git a/pybamm/input/parameters/lithium-ion/cells/Enertech_Ai2020/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/Enertech_Ai2020/parameters.csv
@@ -31,6 +31,6 @@ Negative current collector thermal conductivity [W.m-1.K-1],401,CRC Handbook,cop
 Positive current collector thermal conductivity [W.m-1.K-1],237,CRC Handbook,aluminium
 ,,,
 # Electrical,,,
-Cell capacity [A.h], 2.28,Ai 2020,2.28/34
+Nominal cell capacity [A.h], 2.28,Ai 2020,2.28/34
 Typical current [A], 2.28,Ai 2020,
 Current function [A], 2.28,default current function,
diff --git a/pybamm/input/parameters/lithium-ion/cells/Kim2011/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/Kim2011/parameters.csv
@@ -35,6 +35,6 @@ Negative current collector thermal conductivity [W.m-1.K-1],267.467, 401 * 0.667
 Positive current collector thermal conductivity [W.m-1.K-1],158.079, 237 * 0.667,
 ,,,
 # Electrical,,,
-Cell capacity [A.h],0.43,trial and error,
+Nominal cell capacity [A.h],0.43,trial and error,
 Typical current [A],0.43,0.2857,1C current
 Current function [A],0.43,default current function,
diff --git a/pybamm/input/parameters/lithium-ion/cells/LGM50_Chen2020/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/LGM50_Chen2020/parameters.csv
@@ -29,6 +29,6 @@ Negative current collector thermal conductivity [W.m-1.K-1],401,CRC Handbook,cop
 Positive current collector thermal conductivity [W.m-1.K-1],237,CRC Handbook,aluminium
 ,,,
 # Electrical,,,
-Cell capacity [A.h],5,Chen 2020,
+Nominal cell capacity [A.h],5,Chen 2020,
 Typical current [A],5,Chen 2020,
 Current function [A],5,default current function,
diff --git a/pybamm/input/parameters/lithium-ion/cells/UMBL_Mohtat2020/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/UMBL_Mohtat2020/parameters.csv
@@ -29,6 +29,6 @@ Negative current collector thermal conductivity [W.m-1.K-1],401,,
 Positive current collector thermal conductivity [W.m-1.K-1],237,,
 ,,,
 # Electrical,,,
-Cell capacity [A.h],5,Peyman MPM,
+Nominal cell capacity [A.h],5,Peyman MPM,
 Typical current [A],5,,1C current
 Current function [A],5,default current function,
diff --git a/pybamm/input/parameters/lithium-ion/cells/kokam_Ecker2015/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/kokam_Ecker2015/parameters.csv
@@ -13,6 +13,6 @@ Cell cooling surface area [m2],1.72E-2,,pouch (single layer)
 Cell volume [m3],1.61E-6,,pouch (single layer)
 ,,,
 # Electrical,,,
-Cell capacity [A.h], 0.15625, 7.5/48 (parameter set for a single layer cell),
+Nominal cell capacity [A.h], 0.15625, 7.5/48 (parameter set for a single layer cell),
 Typical current [A], 0.15652,,
 Current function [A],0.15652,default current function,
diff --git a/pybamm/input/parameters/lithium-ion/cells/kokam_Marquis2019/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/kokam_Marquis2019/parameters.csv
@@ -35,6 +35,6 @@ Negative current collector thermal conductivity [W.m-1.K-1],401,,
 Positive current collector thermal conductivity [W.m-1.K-1],237,,
 ,,,
 # Electrical,,,
-Cell capacity [A.h],0.680616,,24 Ah/m2 * 0.137m * 0.207m
+Nominal cell capacity [A.h],0.680616,,24 Ah/m2 * 0.137m * 0.207m
 Typical current [A],0.680616,,1C current
 Current function [A],0.680616,default current function,
diff --git a/pybamm/input/parameters/lithium-ion/cells/sony_Ramadass2004/parameters.csv b/pybamm/input/parameters/lithium-ion/cells/sony_Ramadass2004/parameters.csv
@@ -33,6 +33,6 @@ Negative current collector thermal conductivity [W.m-1.K-1],401,,
 Positive current collector thermal conductivity [W.m-1.K-1],237,,
 ,,,
 # Electrical,,,
-Cell capacity [A.h],1,,16.54 Ah/m2 * 0.057m * 1.06m
+Nominal cell capacity [A.h],1,,16.54 Ah/m2 * 0.057m * 1.06m
 Typical current [A],1,,1C current
 Current function [A],1,default current function,
diff --git a/pybamm/parameters/electrical_parameters.py b/pybamm/parameters/electrical_parameters.py
@@ -27,7 +27,7 @@ def _set_dimensional_parameters(self):
         "Defines the dimensional parameters"
 
         self.I_typ = pybamm.Parameter("Typical current [A]")
-        self.Q = pybamm.Parameter("Cell capacity [A.h]")
+        self.Q = pybamm.Parameter("Nominal cell capacity [A.h]")
         self.C_rate = pybamm.AbsoluteValue(self.I_typ / self.Q)
         self.n_electrodes_parallel = pybamm.Parameter(
             "Number of electrodes connected in parallel to make a cell"

diff --git a/pybamm/parameters/parameter_values.py b/pybamm/parameters/parameter_values.py
@@ -338,9 +338,29 @@ def check_parameter_values(self, values):
         if "C-rate" in values:
             raise ValueError(
                 "The 'C-rate' parameter has been deprecated, "
-                "use 'Current function [A]' instead. The cell capacity can be accessed "
-                "as 'Cell capacity [A.h]', and used to calculate current from C-rate."
+                "use 'Current function [A]' instead. The Nominal "
+                "cell capacity can be accessed as 'Nominal cell "
+                "capacity [A.h]', and used to calculate current from C-rate."
             )
+        if "Cell capacity [A.h]" in values:
+            if "Nominal cell capacity [A.h]" in values:
+                raise ValueError(
+                    "both 'Cell capacity [A.h]' and 'Nominal cell capacity [A.h]' "
+                    "provided in values. The 'Cell capacity [A.h]' notation will be "
+                    "deprecated in the next release so 'Nominal cell capacity [A.h]' "
+                    "should be used instead."
+                )
+            else:
+                values["Nominal cell capacity [A.h]"] = values["Cell capacity [A.h]"]
+                warnings.warn(
+                    "the 'Cell capacity [A.h]' notation will be "
+                    "deprecated in the next release, as it has now been renamed "
+                    "to 'Nominal cell capacity [A.h]'. Simulation will continue "
+                    "passing the 'Cell capacity [A.h]' as 'Nominal cell "
+                    "capacity [A.h]' (it might overwrite any existing definition "
+                    "of the component)",
+                    DeprecationWarning,
+                )
         for param in values:
             if "surface area density" in param:
                 raise ValueError(
@@ -791,7 +811,7 @@ def print_parameters(self, parameters, output_file=None):
         # Calculate parameters for each C-rate
         for Crate in [1, 10]:
             # Update Crate
-            capacity = self.get("Cell capacity [A.h]")
+            capacity = self.get("Nominal cell capacity [A.h]")
             if capacity is not None:
                 self.update(
                     {"Current function [A]": Crate * capacity},

diff --git a/pybamm/simulation.py b/pybamm/simulation.py
@@ -106,7 +106,7 @@ def __init__(
                     self._parameter_values.update(
                         {
                             "Current function [A]": self.C_rate
-                            * self._parameter_values["Cell capacity [A.h]"]
+                            * self._parameter_values["Nominal cell capacity [A.h]"]
                         }
                     )
 
@@ -218,7 +218,7 @@ def set_up_experiment(self, model, experiment):
                     I = op[0]
                 else:
                     # Scale C-rate with capacity to obtain current
-                    capacity = self._parameter_values["Cell capacity [A.h]"]
+                    capacity = self._parameter_values["Nominal cell capacity [A.h]"]
                     I = op[0] * capacity
                 operating_inputs = {
                     "Current switch": 1,
@@ -264,7 +264,7 @@ def set_up_experiment(self, model, experiment):
                     I = events[0]
                 else:
                     # Scale C-rate with capacity to obtain current
-                    capacity = self._parameter_values["Cell capacity [A.h]"]
+                    capacity = self._parameter_values["Nominal cell capacity [A.h]"]
                     I = events[0] * capacity
                 operating_inputs.update(
                     {"Current cut-off [A]": I, "Voltage cut-off [V]": -1e10}

diff --git a/tests/integration/test_experiments.py b/tests/integration/test_experiments.py
@@ -24,7 +24,7 @@ def test_discharge_rest_charge(self):
         np.testing.assert_array_almost_equal(
             sim._solution["Time [h]"].entries, np.linspace(0, 3, 13)
         )
-        cap = model.default_parameter_values["Cell capacity [A.h]"]
+        cap = model.default_parameter_values["Nominal cell capacity [A.h]"]
         np.testing.assert_array_almost_equal(
             sim._solution["Current [A]"].entries,
             [cap / 2] * 5 + [0] * 4 + [-cap / 2] * 4,
@@ -62,7 +62,7 @@ def test_gitt(self):
         np.testing.assert_array_almost_equal(
             sim._solution["Time [h]"].entries, np.arange(0, 20.01, 0.1)
         )
-        cap = model.default_parameter_values["Cell capacity [A.h]"]
+        cap = model.default_parameter_values["Nominal cell capacity [A.h]"]
         np.testing.assert_array_almost_equal(
             sim._solution["Current [A]"].entries,
             [cap / 20] * 11 + [0] * 10 + ([cap / 20] * 10 + [0] * 10) * 9,

diff --git a/tests/integration/test_models/standard_model_tests.py b/tests/integration/test_models/standard_model_tests.py
@@ -72,7 +72,7 @@ def test_solving(self, solver=None, t_eval=None):
 
         Crate = abs(
             self.parameter_values["Current function [A]"]
-            * self.parameter_values["Cell capacity [A.h]"]
+            * self.parameter_values["Nominal cell capacity [A.h]"]
         )
         # don't allow zero C-rate
         if Crate == 0:

diff --git a/tests/unit/test_experiments/test_simulation_with_experiment.py b/tests/unit/test_experiments/test_simulation_with_experiment.py
@@ -22,7 +22,7 @@ def test_set_up(self):
         self.assertEqual(sim.experiment, experiment)
         self.assertEqual(
             sim._experiment_inputs[0]["Current input [A]"],
-            1 / 20 * model.default_parameter_values["Cell capacity [A.h]"],
+            1 / 20 * model.default_parameter_values["Nominal cell capacity [A.h]"],
         )
         self.assertEqual(sim._experiment_inputs[0]["Current switch"], 1)
         self.assertEqual(sim._experiment_inputs[0]["Voltage switch"], 0)

diff --git a/tests/unit/test_parameters/test_lead_acid_parameters.py b/tests/unit/test_parameters/test_lead_acid_parameters.py
@@ -19,7 +19,7 @@ def test_all_defined(self):
         output_file = "lead_acid_parameters.txt"
         parameter_values.print_parameters(parameters, output_file)
         # test print_parameters with dict and without C-rate
-        del parameter_values["Cell capacity [A.h]"]
+        del parameter_values["Nominal cell capacity [A.h]"]
         parameters = {"C_e": parameters.C_e, "sigma_n": parameters.sigma_n}
         parameter_values.print_parameters(parameters)
 

diff --git a/tests/unit/test_parameters/test_parameter_values.py b/tests/unit/test_parameters/test_parameter_values.py
@@ -93,6 +93,12 @@ def test_update(self):
             param.update({"b": 1})
 
     def test_check_parameter_values(self):
+        # Cell capacity [A.h] deprecated
+        with self.assertRaisesRegex(ValueError, "Cell capacity"):
+            pybamm.ParameterValues({"Cell capacity [A.h]": 1,
+                                    "Nominal cell capacity [A.h]": 1})
+        with self.assertWarnsRegex(DeprecationWarning, "Cell capacity"):
+            pybamm.ParameterValues({"Cell capacity [A.h]": 1})
         # Can't provide a current density of 0, as this will cause a ZeroDivision error
         with self.assertRaisesRegex(ValueError, "Typical current"):
             pybamm.ParameterValues({"Typical current [A]": 0})