#191 fix some bugs relating to assuming dicts are ordered

pybamm-team · May 8, 2019 · e8e060c · e8e060c
1 parent 0a14aaf
commit e8e060c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,10 +29,10 @@ matrix:
         #   env:
         #     - PYBAMM_UNIT=true
         #   if: type != cron
-        # - python: "3.5"
-        #   env:
-        #     - PYBAMM_UNIT=true
-        #   if: type != cron
+        - python: "3.5"
+          env:
+            - PYBAMM_UNIT=true
+          if: type != cron
         - python: "3.6"
           env:
             - PYBAMM_UNIT=true

diff --git a/pybamm/meshes/submeshes.py b/pybamm/meshes/submeshes.py
@@ -39,8 +39,13 @@ def __init__(self, lims, npts):
         # currently accept lims and npts as dicts. This may get changed at a future
         # date depending on the form of mesh we desire for 2D/3D
 
-        spatial_lims = list(lims.values())[0]
-        npts = list(npts.values())[0]
+        # check that only one variable passed in
+        if len(lims) != 1:
+            raise ValueError("lims should only contain a single variable")
+
+        var = list(lims.keys())[0]
+        spatial_lims = lims[var]
+        npts = npts[var.id]
 
         edges = np.linspace(spatial_lims["min"], spatial_lims["max"], npts + 1)
 

diff --git a/tests/unit/test_discretisations/test_discretisation.py b/tests/unit/test_discretisations/test_discretisation.py
@@ -396,22 +396,22 @@ def test_process_model_ode(self):
 
         disc.process_model(model)
         y0 = model.concatenated_initial_conditions
-        np.testing.assert_array_equal(
-            y0,
-            np.concatenate(
-                [
-                    2 * np.ones_like(combined_submesh[0].nodes),
-                    5 * np.ones_like(mesh["negative electrode"][0].nodes),
-                    8 * np.ones_like(mesh["negative electrode"][0].nodes),
-                ]
-            ),
-        )
+        y0_expect = np.array([])
+        for var, init in model.initial_conditions.items():
+            if var.id == c.id:
+                vect = init.evaluate() * np.ones_like(combined_submesh[0].nodes)
+            else:
+                vect = init.evaluate() * np.ones_like(mesh[var.domain[0]][0].nodes)
+
+            y0_expect = np.concatenate([y0_expect,vect])
+
+        np.testing.assert_array_equal(y0,y0_expect)
+
         # grad and div are identity operators here
         np.testing.assert_array_equal(y0, model.concatenated_rhs.evaluate(None, y0))
-        c0, T0, S0 = np.split(
-            y0,
-            np.cumsum([combined_submesh[0].npts, mesh["negative electrode"][0].npts]),
-        )
+
+        S0 = model.initial_conditions[S].evaluate() * np.ones_like(mesh[S.domain[0]][0].nodes)
+        T0 = model.initial_conditions[T].evaluate() * np.ones_like(mesh[T.domain[0]][0].nodes)
         np.testing.assert_array_equal(S0 * T0, model.variables["ST"].evaluate(None, y0))
 
         # mass matrix is identity

diff --git a/tests/unit/test_geometry/test_geometry.py b/tests/unit/test_geometry/test_geometry.py
@@ -87,14 +87,14 @@ def test_combine_geometries(self):
         geometry1Dmicro = pybamm.Geometry1DMicro()
         geometry = pybamm.Geometry(geometry1Dmacro, geometry1Dmicro)
         self.assertEqual(
-            list(geometry.keys()),
-            [
+            set(geometry.keys()),
+            set([
                 "negative electrode",
                 "separator",
                 "positive electrode",
                 "negative particle",
                 "positive particle",
-            ],
+            ]),
         )
 
         # update with custom geometry
@@ -117,14 +117,14 @@ def test_combine_geometries_3D(self):
         geometry1Dmicro = pybamm.Geometry1DMicro()
         geometry = pybamm.Geometry(geometry3Dmacro, geometry1Dmicro)
         self.assertEqual(
-            list(geometry.keys()),
-            [
+            set(geometry.keys()),
+            set([
                 "negative electrode",
                 "separator",
                 "positive electrode",
                 "negative particle",
                 "positive particle",
-            ],
+            ]),
         )
 
         with self.assertRaises(ValueError):
@@ -134,25 +134,25 @@ def test_combine_geometries_3D(self):
     def test_combine_geometries_strings(self):
         geometry = pybamm.Geometry("1D macro", "1D micro")
         self.assertEqual(
-            list(geometry.keys()),
-            [
+            set(geometry.keys()),
+            set([
                 "negative electrode",
                 "separator",
                 "positive electrode",
                 "negative particle",
                 "positive particle",
-            ],
+            ]),
         )
         geometry = pybamm.Geometry("3D macro", "1D micro")
         self.assertEqual(
-            list(geometry.keys()),
-            [
+            set(geometry.keys()),
+            set([
                 "negative electrode",
                 "separator",
                 "positive electrode",
                 "negative particle",
                 "positive particle",
-            ],
+            ]),
         )