DG-ify Hdiv and Hcurl fields about firedrake HOT 9 CLOSED

diff --git a/python/firedrake/core_types.pyx b/python/firedrake/core_types.pyx
index c0ab0bf..5a2c305 100644
--- a/python/firedrake/core_types.pyx
+++ b/python/firedrake/core_types.pyx
@@ -252,7 +252,7 @@ cdef void vector_field_destructor(object capsule):
     cdef void *vf = py.PyCapsule_GetPointer(capsule, _vector_field_name)
     ft.vector_field_destructor_f(vf)

-cdef ft.element_t as_element(object fiat_element):
+cdef ft.element_t as_element(object fiat_element, bool dgify):
     """Convert a FIAT element into a Fluidity element_t struct.

     This is used to build Fluidity element_types from FIAT element
@@ -275,6 +275,22 @@ cdef ft.element_t as_element(object fiat_element):
     element.entity_dofs = <int *>malloc(3 * element.ndof * sizeof(int))

     entity_dofs = f_element.entity_dofs()
+    if dgify:
+        dimN = len(entity_dofs.keys()) - 1
+        dg_dofs = []
+        for k in entity_dofs.keys():
+            for v in entity_dofs[k].values():
+                dg_dofs.extend(v)
+        replacement = {}
+        for k in entity_dofs.keys():
+            replacement[k] = {}
+            for idx in entity_dofs[k]:
+                if k == dimN:
+                    replacement[k][idx] = dg_dofs
+                else:
+                    replacement[k][idx] = []
+        entity_dofs = replacement
+        
     cdef int d
     cdef int e
     cdef int dof
@@ -779,7 +795,7 @@ class FunctionSpaceBase(object):
         derived types.
     """

-    def __init__(self, mesh, element, name=None, dim=1, rank=0):
+    def __init__(self, mesh, element, name=None, dim=1, rank=0, dgify=False):
         """
         :param mesh: :class:`Mesh` to build this space on
         :param element: :class:`ufl.FiniteElementBase` to build this space from
@@ -826,7 +842,7 @@ class FunctionSpaceBase(object):
             self.extruded = False

         # Create the extruded function space
-        cdef ft.element_t element_f = as_element(self.fiat_element)
+        cdef ft.element_t element_f = as_element(self.fiat_element, dgify)

         cdef void *fluidity_mesh = py.PyCapsule_GetPointer(mesh._fluidity_mesh, _mesh_name)
         if fluidity_mesh == NULL: