fixing post rebase, draft of bfs element

Author: indiamai

fuse/cells.py

@@ -383,17 +383,13 @@ def get_topology(self):
 
         self.topology = {}
         self.topology_unrelabelled = {}
-        self.topology_unrelabelled = {}
         for i in range(len(structure)):
             dimension = structure[i]
             self.topology[i] = {}
             self.topology_unrelabelled[i] = {}
-            self.topology_unrelabelled[i] = {}
             for node in dimension:
                 self.topology[i][node - min_ids[i]] = tuple([relabelled_verts[vert] for vert in self.get_node(node).ordered_vertices()])
                 self.topology_unrelabelled[i][node - min_ids[i]] = tuple([vert - min_ids[0] for vert in self.get_node(node).ordered_vertices()])
-        return self.topology_unrelabelled
-                self.topology_unrelabelled[i][node - min_ids[i]] = tuple([vert - min_ids[0] for vert in self.get_node(node).ordered_vertices()])
         return self.topology_unrelabelled
 
     def get_starter_ids(self):

fuse/triples.py

@@ -125,18 +125,21 @@ def to_fiat(self):
                     nodes.extend(fiat_dofs)
                     entity_ids[dim][dofs[i].trace_entity.id - min_ids[dim]].extend([counter + i for i in range(len(fiat_dofs))])
                     counter += len(fiat_dofs)
+        print("nodes", nodes)
         entity_perms, pure_perm = self.make_dof_perms(ref_el, entity_ids, nodes, poly_set)
-        self.matrices = self.make_overall_dense_matrices(ref_el, entity_ids, nodes, poly_set)
+        # self.matrices = self.make_overall_dense_matrices(ref_el, entity_ids, nodes, poly_set)
         form_degree = 1 if self.spaces[0].set_shape else 0
         print("my", [n.pt_dict for n in nodes])
         print(entity_perms)
         print(entity_ids)
-        print(ref_el.vertices)
+        print(nodes)
         print()
         # TODO: Change this when Dense case in Firedrake
         if pure_perm:
+            self.matrices = self.make_overall_dense_matrices(ref_el, entity_ids, nodes, poly_set)
             dual = DualSet(nodes, ref_el, entity_ids, entity_perms)
         else:
+            self.matrices = None
             dual = DualSet(nodes, ref_el, entity_ids)
         return CiarletElement(poly_set, dual, degree, form_degree)
 
@@ -221,7 +224,7 @@ def make_overall_dense_matrices(self, ref_el, entity_ids, nodes, poly_set):
             if g.perm.is_Identity:
                 res_dict[dim][e_id][val] = np.eye(len(nodes))
             else:
-                new_nodes = [d(g).convert_to_fiat(ref_el, degree) for d in self.generate()]
+                new_nodes = sum([d(g).convert_to_fiat(ref_el, degree) for d in self.generate()],[])
                 transformed_V, transformed_basis = self.compute_dense_matrix(ref_el, entity_ids, new_nodes, poly_set)
                 res_dict[dim][e_id][val] = np.matmul(transformed_basis, original_V.T)
         return res_dict

test/bfs.py

@@ -0,0 +1,23 @@
+from firedrake import *
+from fuse import *
+import numpy as np
+from test_convert_to_fiat import create_dg1
+from test_tensor_prod import mass_solve
+
+def her_int():
+    deg = 3
+    cell = Point(1, [Point(0), Point(0)], vertex_num=2)
+    vert_dg = create_dg1(cell.vertices()[0])
+    xs = [immerse(cell, vert_dg, TrH1), immerse(cell, vert_dg, TrGrad)]
+
+    Pk = PolynomialSpace(deg)
+    her = ElementTriple(cell, (Pk, CellL2, C0), DOFGenerator(xs, S2, S1))
+    return her
+
+r = 3
+her1 = her_int()
+her2 = her_int()
+bfs = tensor_product(her1, her2).flatten()
+mesh = UnitSquareMesh(2 ** r, 2 ** r, quadrilateral=quadrilateral)
+U = FunctionSpace(mesh, bfs.to_ufl())
+mass_solve(U)