#492 fixed some unit tests

Author: Scottmar93

pybamm/models/full_battery_models/lead_acid/higher_order.py

@@ -75,7 +75,7 @@ def set_leading_order_model(self):
 
     def set_current_collector_submodel(self):
         self.submodels["current collector"] = pybamm.current_collector.Uniform(
-            self.param
+            self.param, self.options
         )
 
     def set_average_interfacial_submodel(self):

pybamm/models/full_battery_models/lead_acid/loqs.py

@@ -38,7 +38,7 @@ def __init__(self, options=None, name="LOQS model"):
     def set_current_collector_submodel(self):
 
         self.submodels["current collector"] = pybamm.current_collector.Uniform(
-            self.param
+            self.param, self.options
         )
 
     def set_porosity_submodel(self):

pybamm/models/full_battery_models/lead_acid/newman_tiedemann.py

@@ -35,7 +35,7 @@ def __init__(self, options=None, name="Newman-Tiedemann model"):
 
     def set_current_collector_submodel(self):
         self.submodels["current collector"] = pybamm.current_collector.Uniform(
-            self.param
+            self.param, self.options
         )
 
     def set_porosity_submodel(self):
@@ -57,8 +57,12 @@ def set_interfacial_submodel(self):
 
     def set_solid_submodel(self):
         if self.options["surface form"] is False:
-            submod_n = pybamm.electrode.ohm.Full(self.param, "Negative", self.reactions)
-            submod_p = pybamm.electrode.ohm.Full(self.param, "Positive", self.reactions)
+            submod_n = pybamm.electrode.ohm.Full(
+                self.param, "Negative", self.reactions, self.options
+            )
+            submod_p = pybamm.electrode.ohm.Full(
+                self.param, "Positive", self.reactions, self.options
+            )
         else:
             submod_n = pybamm.electrode.ohm.SurfaceForm(self.param, "Negative")
             submod_p = pybamm.electrode.ohm.SurfaceForm(self.param, "Positive")

pybamm/models/full_battery_models/lithium_ion/spm.py

@@ -30,7 +30,7 @@ def set_current_collector_submodel(self):
 
         if self.options["bc_options"]["dimensionality"] == 0:
             self.submodels["current collector"] = pybamm.current_collector.Uniform(
-                self.param
+                self.param, self.options
             )
         elif self.options["bc_options"]["dimensionality"] == 1:
             raise NotImplementedError(
@@ -39,7 +39,9 @@ def set_current_collector_submodel(self):
         elif self.options["bc_options"]["dimensionality"] == 2:
             self.submodels[
                 "current collector"
-            ] = pybamm.current_collector.SingleParticlePotentialPair(self.param)
+            ] = pybamm.current_collector.SingleParticlePotentialPair(
+                self.param, self.options
+            )
         else:
             raise pybamm.ModelError(
                 "Dimension of current collectors must be 0, 1, or 2, not {}".format(

pybamm/models/full_battery_models/lithium_ion/spme.py

@@ -41,7 +41,7 @@ def set_current_collector_submodel(self):
 
         if self.options["bc_options"]["dimensionality"] == 0:
             self.submodels["current collector"] = pybamm.current_collector.Uniform(
-                self.param
+                self.param, self.options
             )
         elif self.options["bc_options"]["dimensionality"] == 1:
             raise NotImplementedError(
@@ -50,7 +50,9 @@ def set_current_collector_submodel(self):
         elif self.options["bc_options"]["dimensionality"] == 2:
             self.submodels[
                 "current collector"
-            ] = pybamm.current_collector.SingleParticlePotentialPair(self.param)
+            ] = pybamm.current_collector.SingleParticlePotentialPair(
+                self.param, self.options
+            )
         else:
             raise pybamm.ModelError(
                 "Dimension of current collectors must be 0, 1, or 2, not {}".format(

pybamm/models/reaction_diffusion.py

@@ -39,7 +39,7 @@ def set_thermal_submodel(self):
     def set_current_collector_submodel(self):
 
         self.submodels["current collector"] = pybamm.current_collector.Uniform(
-            self.param
+            self.param, self.options
         )
 
     def set_porosity_submodel(self):

pybamm/models/submodels/current_collector/single_particle_current_collector.py

@@ -18,8 +18,8 @@ class SingleParticlePotentialPair(BaseModel):
     **Extends:** :class:`pybamm.current_collector.BaseModel`
     """
 
-    def __init__(self, param):
-        super().__init__(param)
+    def __init__(self, param, options):
+        super().__init__(param, options)
 
     def get_fundamental_variables(self):
 

pybamm/models/submodels/electrode/ohm/full_ohm.py

@@ -19,13 +19,9 @@ class Full(BaseModel):
     **Extends:** :class:`pybamm.electrode.ohm.BaseModel`
     """
 
-    def __init__(self, param, domain, reactions, options=None):
+    def __init__(self, param, domain, reactions, options):
         super().__init__(param, domain, reactions)
-
-        if options:
-            self.options = options
-        else:
-            self.options = {"probelem type": "galvanostatic"}
+        self.options = options
 
     def get_fundamental_variables(self):
 

tests/unit/test_models/test_submodels/test_current_collector/test_base_current_collector.py

@@ -9,7 +9,7 @@
 
 class TestBaseModel(unittest.TestCase):
     def test_public_functions(self):
-        submodel = pybamm.current_collector.BaseModel(None)
+        submodel = pybamm.current_collector.BaseModel(None, None)
         std_tests = tests.StandardSubModelTests(submodel)
         std_tests.test_all()
 

tests/unit/test_models/test_submodels/test_current_collector/test_homogeneous_current_collector.py

@@ -11,7 +11,8 @@ class TestUniformModel(unittest.TestCase):
     def test_public_functions(self):
         param = pybamm.standard_parameters_lead_acid
 
-        submodel = pybamm.current_collector.Uniform(param)
+        options = {"problem type": "galavanostatic"}
+        submodel = pybamm.current_collector.Uniform(param, options)
         std_tests = tests.StandardSubModelTests(submodel)
         std_tests.test_all()
 

tests/unit/test_parameters/test_voltage_functions.py

@@ -12,7 +12,7 @@ def test_base_voltage(self):
         function = pybamm.GetVoltage()
         self.assertEqual(function(10), 1)
 
-    def test_constant_current(self):
+    def test_constant_voltage(self):
         function = pybamm.GetConstantVoltage(voltage=4)
         assert isinstance(function(0), numbers.Number)
         assert isinstance(function(np.zeros(3)), numbers.Number)
@@ -30,37 +30,7 @@ def test_constant_current(self):
         processed_voltage = parameter_values.process_symbol(voltage)
         self.assertIsInstance(processed_voltage.simplify(), pybamm.Scalar)
 
-    def test_get_current_data(self):
-        # test units
-        function_list = [
-            pybamm.GetVoltageData("US06.csv", units="[V]"),
-            pybamm.GetVoltageData("car_current.csv", units="[]", voltage_scale=10),
-        ]
-        for function in function_list:
-            function.interpolate()
-
-        # test process parameters
-        dimensional_voltage = pybamm.electrical_parameters.dimensional_voltage_with_time
-        parameter_values = pybamm.ParameterValues(
-            {
-                "Typical voltage [V]": 2,
-                "Typical timescale [s]": 1,
-                "Voltage function": pybamm.GetCurrentData(
-                    "car_voltage.csv", units="[]"
-                ),
-            }
-        )
-        dimensional_voltage_eval = parameter_values.process_symbol(dimensional_voltage)
-
-        def voltage(t):
-            return dimensional_voltage_eval.evaluate(t=t)
-
-        function_list.append(voltage)
-
-        standard_tests = StandardVoltageFunctionTests(function_list, always_array=True)
-        standard_tests.test_all()
-
-    def test_user_current(self):
+    def test_user_voltage(self):
         # create user-defined sin function
 
         def my_fun(t, A, omega):