#2669 PSD with SPM

Author: rtimms

pybamm/models/full_battery_models/base_battery_model.py

@@ -847,12 +847,14 @@ def options(self, extra_options):
                 raise pybamm.OptionError(
                     "x-average side reactions cannot be 'false' for SPM models"
                 )
-        if isinstance(self, pybamm.lithium_ion.SPM) and not isinstance(
-            self, pybamm.lithium_ion.MPM
-        ):
-            if options["particle size"] == "distribution":
+        if isinstance(self, pybamm.lithium_ion.SPM):
+            if (
+                "distribution" in options["particle size"]
+                and options["surface form"] == "false"
+            ):
                 raise pybamm.OptionError(
-                    "'particle size' should be 'single' for SPM and SPMe models"
+                    "surface form must be 'algebraic' or 'differential' if "
+                    " 'particle size' contains a 'distribution'"
                 )
         if isinstance(self, pybamm.lead_acid.BaseModel):
             if options["thermal"] != "isothermal" and options["dimensionality"] != 0:

tests/unit/test_models/test_full_battery_models/test_lithium_ion/test_dfn.py

@@ -27,6 +27,13 @@ def test_well_posed_size_distribution_tuple(self):
         options = {"particle size": ("single", "distribution")}
         self.check_well_posedness(options)
 
+    def test_well_posed_current_sigmoid_ocp_with_psd(self):
+        options = {
+            "open circuit potential": "current sigmoid",
+            "particle size": "distribution",
+        }
+        self.check_well_posedness(options)
+
     def test_well_posed_external_circuit_explicit_power(self):
         options = {"operating mode": "explicit power"}
         self.check_well_posedness(options)

tests/unit/test_models/test_full_battery_models/test_lithium_ion/test_spm.py

@@ -40,9 +40,13 @@ def test_x_average_options(self):
             pybamm.lithium_ion.SPM(options)
 
     def test_distribution_options(self):
-        with self.assertRaisesRegex(pybamm.OptionError, "particle size"):
+        with self.assertRaisesRegex(pybamm.OptionError, "surface form"):
             pybamm.lithium_ion.SPM({"particle size": "distribution"})
 
+    def test_particle_size_distribution(self):
+        options = {"surface form": "algebraic", "particle size": "distribution"}
+        self.check_well_posedness(options)
+
     def test_new_model(self):
         model = pybamm.lithium_ion.SPM({"thermal": "x-full"})
         new_model = model.new_copy()