#4274 fully remove Integrated conductivity model

Author: brosaplanella

docs/source/api/models/submodels/electrolyte_conductivity/index.rst

@@ -7,6 +7,5 @@ Electrolyte Conductivity
     base_electrolyte_conductivity
     leading_order_conductivity
     composite_conductivity
-    integrated_conductivity
     full_conductivity
     surface_form/index

docs/source/api/models/submodels/electrolyte_conductivity/integrated_conductivity.rst

@@ -63,8 +63,7 @@ class BatteryModelOptions(pybamm.FuzzyDict):
                 Sets the dimension of the current collector problem. Can be 0
                 (default), 1 or 2.
             * "electrolyte conductivity" : str
-                Can be "default" (default), "full", "leading order", "composite" or
-                "integrated".
+                Can be "default" (default), "full", "leading order", "composite".
             * "exchange-current density" : str
                 Sets the model for the exchange-current density. Can be "single"
                 (default) or "current sigmoid". A 2-tuple can be provided for different
@@ -235,7 +234,6 @@ def __init__(self, extra_options):
                 "full",
                 "leading order",
                 "composite",
-                "integrated",
             ],
             "exchange-current density": ["single", "current sigmoid"],
             "heat of mixing": ["false", "true"],
@@ -941,7 +939,6 @@ def options(self, extra_options):
             if options["electrolyte conductivity"] not in [
                 "default",
                 "composite",
-                "integrated",
             ]:
                 raise pybamm.OptionError(
                     "electrolyte conductivity '{}' not suitable for SPMe".format(

src/pybamm/models/full_battery_models/base_battery_model.py

@@ -61,12 +61,6 @@ def set_electrolyte_potential_submodel(self):
                         self.param, options=self.options
                     )
                 )
-            elif self.options["electrolyte conductivity"] == "integrated":
-                self.submodels["electrolyte conductivity"] = (
-                    pybamm.electrolyte_conductivity.Integrated(
-                        self.param, options=self.options
-                    )
-                )
         if self.options["surface form"] == "false":
             surf_model = surf_form.Explicit
         elif self.options["surface form"] == "differential":

src/pybamm/models/full_battery_models/lithium_ion/spme.py

@@ -1,9 +1,7 @@
 from .base_electrolyte_conductivity import BaseElectrolyteConductivity
 from .leading_order_conductivity import LeadingOrder
 from .composite_conductivity import Composite
-from .composite_conductivity_old import CompositeOld
 from .full_conductivity import Full
-from .integrated_conductivity import Integrated
 
 from . import surface_potential_form
 

src/pybamm/models/submodels/electrolyte_conductivity/__init__.py

@@ -10,7 +10,3 @@ class TestSPMe(BaseIntegrationTestLithiumIon):
     @pytest.fixture(autouse=True)
     def setup(self):
         self.model = pybamm.lithium_ion.SPMe
-
-    def test_integrated_conductivity(self):
-        options = {"electrolyte conductivity": "integrated"}
-        self.run_basic_processing_test(options)

tests/integration/test_models/test_full_battery_models/test_lithium_ion/test_spme.py

@@ -225,16 +225,6 @@ def test_subramanian_2005(self):
         self.assertIn("Subramanian2005", citations._papers_to_cite)
         self.assertIn("Subramanian2005", citations._citation_tags.keys())
 
-    def test_brosaplanella_2021(self):
-        # Test that calling relevant bits of code adds the right paper to citations
-        citations = pybamm.citations
-
-        citations._reset()
-        self.assertNotIn("BrosaPlanella2021", citations._papers_to_cite)
-        pybamm.electrolyte_conductivity.Integrated(None)
-        self.assertIn("BrosaPlanella2021", citations._papers_to_cite)
-        self.assertIn("BrosaPlanella2021", citations._citation_tags.keys())
-
     def test_brosaplanella_2022(self):
         # Test that calling relevant bits of code adds the right paper to citations
         citations = pybamm.citations

tests/unit/test_citations.py

@@ -11,11 +11,6 @@ class TestDFN(BaseUnitTestLithiumIon):
     def setUp(self):
         self.model = pybamm.lithium_ion.DFN
 
-    def test_electrolyte_options(self):
-        options = {"electrolyte conductivity": "integrated"}
-        with pytest.raises(pybamm.OptionError, match="electrolyte conductivity"):
-            pybamm.lithium_ion.DFN(options)
-
     def test_well_posed_size_distribution(self):
         options = {"particle size": "distribution"}
         self.check_well_posedness(options)

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

@@ -11,11 +11,6 @@ class TestNewmanTobias(BaseUnitTestLithiumIon):
     def setUp(self):
         self.model = pybamm.lithium_ion.NewmanTobias
 
-    def test_electrolyte_options(self):
-        options = {"electrolyte conductivity": "integrated"}
-        with pytest.raises(pybamm.OptionError, match="electrolyte conductivity"):
-            pybamm.lithium_ion.NewmanTobias(options)
-
     @pytest.mark.skip(reason="Test currently not implemented")
     def test_well_posed_particle_phases(self):
         pass  # skip this test

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

@@ -33,7 +33,3 @@ def test_electrolyte_options(self):
         options = {"electrolyte conductivity": "full"}
         with pytest.raises(pybamm.OptionError, match="electrolyte conductivity"):
             pybamm.lithium_ion.SPMe(options)
-
-    def test_integrated_conductivity(self):
-        options = {"electrolyte conductivity": "integrated"}
-        self.check_well_posedness(options)