Reorder in header file

ffcx/codegeneration/dofmap.py

@@ -99,14 +99,14 @@ def generator(ir, options):
             entity_dof_offsets.append(len(flattened_entity_dofs))
     d["entity_dofs"] = f"entity_dofs_{ir.name}"
     d["entity_dofs_init"] = L.ArrayDecl(
-        "static const int",
+        "int",
         f"entity_dofs_{ir.name}",
         values=flattened_entity_dofs,
         sizes=len(flattened_entity_dofs),
     )
     d["entity_dof_offsets"] = f"entity_dof_offsets_{ir.name}"
     d["entity_dof_offsets_init"] = L.ArrayDecl(
-        "static const int",
+        "int",
         f"entity_dof_offsets_{ir.name}",
         values=entity_dof_offsets,
         sizes=len(entity_dof_offsets),
@@ -122,14 +122,14 @@ def generator(ir, options):
             entity_closure_dof_offsets.append(len(flattened_entity_closure_dofs))
     d["entity_closure_dofs"] = f"entity_closure_dofs_{ir.name}"
     d["entity_closure_dofs_init"] = L.ArrayDecl(
-        "static const int",
+        "int",
         f"entity_closure_dofs_{ir.name}",
         values=flattened_entity_closure_dofs,
         sizes=len(flattened_entity_closure_dofs),
     )
     d["entity_closure_dof_offsets"] = f"entity_closure_dof_offsets_{ir.name}"
     d["entity_closure_dof_offsets_init"] = L.ArrayDecl(
-        "static const int",
+        "int",
         f"entity_closure_dof_offsets_{ir.name}",
         values=entity_closure_dof_offsets,
         sizes=len(entity_closure_dof_offsets),

ffcx/codegeneration/dofmap_template.py

@@ -40,11 +40,11 @@
   .num_global_support_dofs = {num_global_support_dofs},
   .num_element_support_dofs = {num_element_support_dofs},
   .block_size = {block_size},
-  .num_entity_dofs = {num_entity_dofs},
   .entity_dofs = {entity_dofs},
   .entity_dof_offsets = {entity_dof_offsets},
   .entity_closure_dofs = {entity_closure_dofs},
   .entity_closure_dof_offsets = {entity_closure_dof_offsets},
+  .num_entity_dofs = {num_entity_dofs},
   .tabulate_entity_dofs = tabulate_entity_dofs_{factory_name},
   .num_entity_closure_dofs = {num_entity_closure_dofs},
   .tabulate_entity_closure_dofs = tabulate_entity_closure_dofs_{factory_name},

ffcx/codegeneration/ufcx.h

@@ -222,15 +222,21 @@ extern "C"
     /// Return the block size for a VectorElement or TensorElement
     int block_size;
 
-    /// Number of dofs associated with each cell entity of dimension d
-    int* num_entity_dofs;
-
-    /// @brief New interface
+    /// Flattened list of dofs associated with each entity
     int* entity_dofs;
+
+    /// Offset for dofs of each entity in entity_dofs
     int* entity_dof_offsets;
+
+    /// Flattened list of closure dofs associated with each entity
     int* entity_closure_dofs;
+
+    /// Offset for closure dofs of each entity in entity_closure_dofs
     int* entity_closure_dof_offsets;
 
+    /// Number of dofs associated with each cell entity of dimension d
+    int* num_entity_dofs;
+
     /// Tabulate the local-to-local mapping of dofs on entity (d, i)
     void (*tabulate_entity_dofs)(int* restrict dofs, int d, int i);