attempting to fix ci

Author: valentinsulzer

docs/conf.py

@@ -92,6 +92,7 @@
     "https://doi.org/10.1137/20M1336898",  # DOI link to ignore
     "https://en.wikipedia.org/wiki/",  # Wikipedia link to ignore
     "https://books.google.co.uk/books",
+    "https://docs.scipy.org/doc/scipy",  # SciPy docs timeout intermittently
 ]
 
 

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

@@ -48,14 +48,14 @@ def __init__(self, options=None, name="SPM with Separate Cell Domain"):
         T = pybamm.Variable("Cell temperature [K]", domain="cell")
 
         if self.options.get("cell geometry") == "pouch":
-            x = pybamm.SpatialVariable("x", domain="cell")
-            y = pybamm.SpatialVariable("y", domain="cell")
-            z = pybamm.SpatialVariable("z", domain="cell")
-            integration_vars = [x, y, z]
+            self.x_cell = pybamm.SpatialVariable("x", domain="cell")
+            self.y_cell = pybamm.SpatialVariable("y", domain="cell")
+            self.z_cell = pybamm.SpatialVariable("z", domain="cell")
+            integration_vars = [self.x_cell, self.y_cell, self.z_cell]
         elif self.options.get("cell geometry") == "cylindrical":
-            r = pybamm.SpatialVariable("r_macro", domain="cell")
-            z = pybamm.SpatialVariable("z", domain="cell")
-            integration_vars = [r, z]
+            self.r_cell = pybamm.SpatialVariable("r_macro", domain="cell")
+            self.z_cell = pybamm.SpatialVariable("z", domain="cell")
+            integration_vars = [self.r_cell, self.z_cell]
         else:
             raise ValueError(
                 f"Geometry type '{self.options.get('cell geometry')}' is not supported. "
@@ -261,9 +261,8 @@ def __init__(self, options=None, name="SPM with Separate Cell Domain"):
     def set_thermal_bcs(self, T):
         geometry_type = self.options.get("cell geometry", "pouch")
         if geometry_type == "pouch":
-            y = pybamm.SpatialVariable("y", "cell")
-            z = pybamm.SpatialVariable("z", "cell")
-            T_amb = self.param.T_amb(y, z, pybamm.t)
+            # Reuse the spatial variables created in __init__
+            T_amb = self.param.T_amb(self.y_cell, self.z_cell, pybamm.t)
             face_params = {
                 "x_min": self.param.h_edge_x_min,
                 "x_max": self.param.h_edge_x_max,
@@ -273,9 +272,8 @@ def set_thermal_bcs(self, T):
                 "z_max": self.param.h_edge_z_max,
             }
         elif geometry_type == "cylindrical":
-            r = pybamm.SpatialVariable("r_macro", "cell")
-            z = pybamm.SpatialVariable("z", "cell")
-            T_amb = self.param.T_amb(r, z, pybamm.t)
+            # Reuse the spatial variables created in __init__
+            T_amb = self.param.T_amb(self.r_cell, self.z_cell, pybamm.t)
             face_params = {
                 "r_min": self.param.h_edge_radial_min,
                 "r_max": self.param.h_edge_radial_max,