#704 changed init of spatial methods

Author: Scottmar93

pybamm/discretisations/discretisation.py

@@ -44,7 +44,7 @@ def __init__(self, mesh=None, spatial_methods=None):
                 spatial_methods["separator"] = method
                 spatial_methods["positive electrode"] = method
             self._spatial_methods = {
-                dom: method(mesh) for dom, method in spatial_methods.items()
+                dom: method.build(mesh) for dom, method in spatial_methods.items()
             }
         self.bcs = {}
         self.y_slices = {}

pybamm/models/full_battery_models/base_battery_model.py

@@ -121,17 +121,17 @@ def default_submesh_types(self):
     @property
     def default_spatial_methods(self):
         base_spatial_methods = {
-            "macroscale": pybamm.FiniteVolume,
-            "negative particle": pybamm.FiniteVolume,
-            "positive particle": pybamm.FiniteVolume,
+            "macroscale": pybamm.FiniteVolume(),
+            "negative particle": pybamm.FiniteVolume(),
+            "positive particle": pybamm.FiniteVolume(),
         }
         if self.options["dimensionality"] == 0:
             # 0D submesh - use base spatial method
-            base_spatial_methods["current collector"] = pybamm.ZeroDimensionalMethod
+            base_spatial_methods["current collector"] = pybamm.ZeroDimensionalMethod()
         elif self.options["dimensionality"] == 1:
-            base_spatial_methods["current collector"] = pybamm.FiniteVolume
+            base_spatial_methods["current collector"] = pybamm.FiniteVolume()
         elif self.options["dimensionality"] == 2:
-            base_spatial_methods["current collector"] = pybamm.ScikitFiniteElement
+            base_spatial_methods["current collector"] = pybamm.ScikitFiniteElement()
         return base_spatial_methods
 
     @property

pybamm/spatial_methods/finite_volume.py

@@ -32,11 +32,11 @@ class FiniteVolume(pybamm.SpatialMethod):
     **Extends:"": :class:`pybamm.SpatialMethod`
     """
 
-    def __init__(self, mesh):
-        super().__init__(mesh)
+    def __init__(self, options=None):
+        super().__init__(options)
 
-        # there is no way to set this at the moment
-        self.options = {"extrapolation": {"order": "quadratic", "use bcs": True}}
+    def build(self, mesh):
+        super().build(mesh)
 
         # add npts_for_broadcast to mesh domains for this particular discretisation
         for dom in mesh.keys():
@@ -731,7 +731,7 @@ def boundary_value_or_flux(self, symbol, discretised_child, bcs=None):
         elif isinstance(symbol, pybamm.BoundaryGradient):
 
             if use_bcs and pybamm.has_bc_condition_of_form(
-                    child, symbol.side, bcs, "Neumann"
+                child, symbol.side, bcs, "Neumann"
             ):
                 # just use the value from the bc: f'(x*)
                 sub_matrix = csr_matrix((1, prim_pts))

pybamm/spatial_methods/scikit_finite_element.py

@@ -26,8 +26,11 @@ class ScikitFiniteElement(pybamm.SpatialMethod):
     **Extends:"": :class:`pybamm.SpatialMethod`
     """
 
-    def __init__(self, mesh):
-        super().__init__(mesh)
+    def __init__(self, options=None):
+        super().__init__(options)
+
+    def build(self, mesh):
+        super().build(mesh)
         # add npts_for_broadcast to mesh domains for this particular discretisation
         for dom in mesh.keys():
             for i in range(len(mesh[dom])):

pybamm/spatial_methods/spatial_method.py

@@ -20,7 +20,14 @@ class SpatialMethod:
         Contains all the submeshes for discretisation
     """
 
-    def __init__(self, mesh):
+    def __init__(self, options=None):
+
+        self.options = {"extrapolation": {"order": "quadratic", "use bcs": True}}
+
+        if options:
+            self.options.update(options)
+
+    def build(self, mesh):
         # add npts_for_broadcast to mesh domains for this particular discretisation
         for dom in mesh.keys():
             for i in range(len(mesh[dom])):

pybamm/spatial_methods/zero_dimensional_method.py

@@ -17,7 +17,10 @@ class ZeroDimensionalMethod(pybamm.SpatialMethod):
     **Extends** : :class:`pybamm.SpatialMethod`
     """
 
-    def __init__(self, mesh=None):
+    def __init__(self, options=None):
+        super().__init__(options)
+
+    def build(self, mesh):
         self._mesh = mesh
 
     def mass_matrix(self, symbol, boundary_conditions):

tests/unit/test_spatial_methods/test_finite_volume/test_extrapolation.py

@@ -2,14 +2,16 @@
 # Test for the operator class
 #
 import pybamm
-from tests import (
-    get_mesh_for_testing,
-    get_p2d_mesh_for_testing,
-    get_1p1d_mesh_for_testing,
-)
+
+# from tests import (
+#     get_mesh_for_testing,
+#     get_p2d_mesh_for_testing,
+#     get_1p1d_mesh_for_testing,
+# )
 
 import numpy as np
-from scipy.sparse import kron, eye
+
+# from scipy.sparse import kron, eye
 import unittest