Remove unused cylindrical battery geometry support

src/pybamm/geometry/battery_geometry.py

@@ -20,7 +20,7 @@ def battery_geometry(
         Dictionary of model options. Necessary for "particle-size geometry",
         relevant for lithium-ion chemistries.
     form_factor : str, optional
-        The form factor of the cell. Can be "pouch" (default) or "cylindrical".
+        The form factor of the cell. Can be "pouch" (default).
 
     Returns
     -------
@@ -150,21 +150,9 @@ def battery_geometry(
                     },
                 },
             }
-    elif form_factor == "cylindrical":
-        if current_collector_dimension == 0:
-            geometry["current collector"] = {"r_macro": {"position": 1}}
-        elif current_collector_dimension == 1:
-            geometry["current collector"] = {
-                "r_macro": {"min": geo.r_inner, "max": 1},
-            }
-        else:
-            raise pybamm.GeometryError(
-                f"Invalid current collector dimension '{current_collector_dimension}' (should be 0 or 1 for "
-                "a 'cylindrical' battery geometry)"
-            )
     else:
         raise pybamm.GeometryError(
-            f"Invalid form factor '{form_factor}' (should be 'pouch' or 'cylindrical'"
+            f"Invalid form factor '{form_factor}' (should be 'pouch')"
         )
 
     return pybamm.Geometry(geometry)

tests/unit/test_geometry/test_battery_geometry.py

@@ -48,15 +48,6 @@ def test_geometry(self):
         geometry = pybamm.battery_geometry()
         assert "negative particle size" not in geometry
 
-        geometry = pybamm.battery_geometry(form_factor="cylindrical")
-        assert geometry["current collector"]["r_macro"]["position"] == 1
-
-        geometry = pybamm.battery_geometry(
-            form_factor="cylindrical", options={"dimensionality": 1}
-        )
-        assert geometry["current collector"]["r_macro"]["min"] == geo.r_inner
-        assert geometry["current collector"]["r_macro"]["max"] == 1
-
         options = {"particle phases": "2"}
         geometry = pybamm.battery_geometry(options=options)
         geo = pybamm.GeometricParameters(options=options)
@@ -88,11 +79,11 @@ def test_geometry(self):
         assert "positive secondary particle size" in geometry
 
     def test_geometry_error(self):
-        with pytest.raises(pybamm.GeometryError, match="Invalid current"):
+        with pytest.raises(pybamm.GeometryError, match="Invalid form factor"):
             pybamm.battery_geometry(
                 form_factor="cylindrical", options={"dimensionality": 2}
             )
-        with pytest.raises(pybamm.GeometryError, match="Invalid form"):
+        with pytest.raises(pybamm.GeometryError, match="Invalid form factor"):
             pybamm.battery_geometry(form_factor="triangle")