cleanup

Author: pbrubeck

firedrake/adaptive_variational_solver.py

@@ -455,25 +455,25 @@ def set_adaptive_cell_markers(self, eta_cell):
 
     def set_uniform_cell_markers(self):
         """Uniform marking for comparison tests"""
-        mesh = self.amh[-1]
+        mesh = self.amh[-1].unique()
         markers_space = FunctionSpace(mesh, "DG", 0)
         markers = Function(markers_space)
         markers.assign(1)
         return markers
 
     def refine_problem(self, markers):
         """Rediscretise the problem on the finest mesh"""
-        domain_markers = {m.function_space().mesh(): m for m in markers.subfunctions}
-        hierarchy = {}
-        for mesh in domain_markers:
-            amh, _ = get_level(mesh)
-            new_mesh = mesh.refine_marked_elements(domain_markers[mesh])
-            amh.add_mesh(new_mesh)
-            hierarchy[mesh] = amh
-
-        if self.amh not in hierarchy.values():
-            mesh = self.amh[-1]
-            self.amh.add_mesh(type(mesh)([hierarchy[m][-1] for m in mesh]))
+        for marker in markers.subfunctions:
+            mesh = marker.function_space().mesh()
+            new_mesh = mesh.refine_marked_elements(marker)
+            mh, _ = get_level(mesh)
+            mh.add_mesh(new_mesh)
+
+        mesh = self.problem.u.function_space().mesh()
+        if len(mesh) > 1:
+            new_mesh = type(mesh)([get_level(m)[0][-1] for m in mesh])
+            mh, _ = get_level(mesh)
+            mh.add_mesh(new_mesh)
 
         coef_map = {}
         self.problem = refine(self.problem, refine, coefficient_mapping=coef_map)