#704 changed to has_bc_of_form

Author: Scottmar93

pybamm/__init__.py

@@ -229,7 +229,7 @@ def version(formatted=False):
 # Mesh and Discretisation classes
 #
 from .discretisations.discretisation import Discretisation
-from .discretisations.discretisation import has_bc_condition_of_form
+from .discretisations.discretisation import has_bc_of_form
 from .meshes.meshes import Mesh, SubMesh, MeshGenerator
 from .meshes.zero_dimensional_submesh import SubMesh0D
 from .meshes.one_dimensional_submeshes import (

pybamm/discretisations/discretisation.py

@@ -7,7 +7,7 @@
 from scipy.sparse import block_diag, csr_matrix
 
 
-def has_bc_condition_of_form(symbol, side, bcs, form):
+def has_bc_of_form(symbol, side, bcs, form):
 
     if symbol.id in bcs:
         if bcs[symbol.id][side][1] == form:

pybamm/spatial_methods/finite_volume.py

@@ -614,7 +614,7 @@ def boundary_value_or_flux(self, symbol, discretised_child, bcs=None):
         # https://github.com/Scottmar93/extrapolation-coefficents/tree/master
         if isinstance(symbol, pybamm.BoundaryValue):
 
-            if use_bcs and pybamm.has_bc_condition_of_form(
+            if use_bcs and pybamm.has_bc_of_form(
                 child, symbol.side, bcs, "Dirichlet"
             ):
                 # just use the value from the bc: f(x*)
@@ -627,7 +627,7 @@ def boundary_value_or_flux(self, symbol, discretised_child, bcs=None):
                     # to find value at x* use formula:
                     # f(x*) = f_1 - (dx0 / dx1) (f_2 - f_1)
 
-                    if use_bcs and pybamm.has_bc_condition_of_form(
+                    if use_bcs and pybamm.has_bc_of_form(
                         child, symbol.side, bcs, "Neumann"
                     ):
                         sub_matrix = csr_matrix(([1], ([0], [0])), shape=(1, prim_pts),)
@@ -643,7 +643,7 @@ def boundary_value_or_flux(self, symbol, discretised_child, bcs=None):
 
                 elif extrap_order == "quadratic":
 
-                    if use_bcs and pybamm.has_bc_condition_of_form(
+                    if use_bcs and pybamm.has_bc_of_form(
                         child, symbol.side, bcs, "Neumann"
                     ):
                         a = (dx0 + dx1) ** 2 / (dx1 * (2 * dx0 + dx1))
@@ -672,7 +672,7 @@ def boundary_value_or_flux(self, symbol, discretised_child, bcs=None):
 
                 if extrap_order == "linear":
 
-                    if use_bcs and pybamm.has_bc_condition_of_form(
+                    if use_bcs and pybamm.has_bc_of_form(
                         child, symbol.side, bcs, "Neumann"
                     ):
                         # use formula:
@@ -695,7 +695,7 @@ def boundary_value_or_flux(self, symbol, discretised_child, bcs=None):
                         additive = pybamm.Scalar(0)
                 elif extrap_order == "quadratic":
 
-                    if use_bcs and pybamm.has_bc_condition_of_form(
+                    if use_bcs and pybamm.has_bc_of_form(
                         child, symbol.side, bcs, "Neumann"
                     ):
                         a = (dxN + dxNm1) ** 2 / (dxNm1 * (2 * dxN + dxNm1))
@@ -730,7 +730,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(
+            if use_bcs and pybamm.has_bc_of_form(
                 child, symbol.side, bcs, "Neumann"
             ):
                 # just use the value from the bc: f'(x*)