#704 fixed errors in scripts and notebooks

Author: Scottmar93

examples/notebooks/change-settings.ipynb

@@ -374,7 +374,7 @@
    "outputs": [],
    "source": [
     "spatial_methods = model.default_spatial_methods\n",
-    "spatial_methods[\"negative particle\"] = pybamm.FiniteVolume"
+    "spatial_methods[\"negative particle\"] = pybamm.FiniteVolume()"
    ]
   },
   {
@@ -508,7 +508,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

examples/notebooks/create-model.ipynb

@@ -600,7 +600,7 @@
     "var_pts = {x: 100}\n",
     "mesh = pybamm.Mesh(geometry, submesh_types, var_pts)\n",
     "                   \n",
-    "spatial_methods = {\"SEI layer\": pybamm.FiniteVolume}\n",
+    "spatial_methods = {\"SEI layer\": pybamm.FiniteVolume()}\n",
     "disc = pybamm.Discretisation(mesh, spatial_methods)\n",
     "disc.process_model(model)"
    ]
@@ -710,7 +710,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

examples/notebooks/spatial_methods/finite-volumes.ipynb

@@ -124,9 +124,9 @@
    "outputs": [],
    "source": [
     "spatial_methods = {\n",
-    "    \"macroscale\": pybamm.FiniteVolume,\n",
-    "    \"negative particle\": pybamm.FiniteVolume,\n",
-    "    \"positive particle\": pybamm.FiniteVolume,\n",
+    "    \"macroscale\": pybamm.FiniteVolume(),\n",
+    "    \"negative particle\": pybamm.FiniteVolume(),\n",
+    "    \"positive particle\": pybamm.FiniteVolume(),\n",
     "}\n",
     "disc = pybamm.Discretisation(mesh, spatial_methods)"
    ]
@@ -1282,7 +1282,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.7"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

examples/notebooks/unsteady_heat_equation.ipynb

@@ -214,7 +214,7 @@
     "submesh_types = {\"rod\": pybamm.Uniform1DSubMesh}\n",
     "var_pts = {x: 30}\n",
     "mesh = pybamm.Mesh(geometry, submesh_types, var_pts)\n",
-    "spatial_methods = {\"rod\": pybamm.FiniteVolume}\n",
+    "spatial_methods = {\"rod\": pybamm.FiniteVolume()}\n",
     "disc = pybamm.Discretisation(mesh, spatial_methods)"
    ]
   },
@@ -421,7 +421,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

examples/notebooks/using-model-options_thermal-example.ipynb

@@ -204,7 +204,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

examples/scripts/create-model.py

@@ -105,7 +105,7 @@ def Diffusivity(cc):
 var_pts = {x: 50}
 mesh = pybamm.Mesh(geometry, submesh_types, var_pts)
 
-spatial_methods = {"SEI layer": pybamm.FiniteVolume}
+spatial_methods = {"SEI layer": pybamm.FiniteVolume()}
 disc = pybamm.Discretisation(mesh, spatial_methods)
 disc.process_model(model)
 

examples/scripts/heat_equation.py

@@ -51,7 +51,7 @@
 submesh_types = {"rod": pybamm.Uniform1DSubMesh}
 var_pts = {x: 30}
 mesh = pybamm.Mesh(geometry, submesh_types, var_pts)
-spatial_methods = {"rod": pybamm.FiniteVolume}
+spatial_methods = {"rod": pybamm.FiniteVolume()}
 disc = pybamm.Discretisation(mesh, spatial_methods)
 disc.process_model(model)
 

tests/unit/test_spatial_methods/test_scikit_finite_element.py

@@ -484,8 +484,8 @@ def test_dirichlet_bcs(self):
         # create discretisation
         mesh = get_unit_2p1D_mesh_for_testing(ypts=8, zpts=32)
         spatial_methods = {
-            "macroscale": pybamm.FiniteVolume,
-            "current collector": pybamm.ScikitFiniteElement,
+            "macroscale": pybamm.FiniteVolume(),
+            "current collector": pybamm.ScikitFiniteElement(),
         }
         disc = pybamm.Discretisation(mesh, spatial_methods)
         disc.process_model(model)
@@ -502,8 +502,8 @@ def test_dirichlet_bcs(self):
     def test_disc_spatial_var(self):
         mesh = get_unit_2p1D_mesh_for_testing(ypts=4, zpts=5)
         spatial_methods = {
-            "macroscale": pybamm.FiniteVolume,
-            "current collector": pybamm.ScikitFiniteElement,
+            "macroscale": pybamm.FiniteVolume(),
+            "current collector": pybamm.ScikitFiniteElement(),
         }
         disc = pybamm.Discretisation(mesh, spatial_methods)