tidy

Author: pbrubeck

firedrake/mg/netgen.py

@@ -241,25 +241,25 @@ def NetgenHierarchy(mesh, levs, flags, distribution_parameters=None):
     comm = mesh.comm
     # Parse netgen flags
     if not isinstance(flags, dict):
-        flags = {}
+        flags = mesh.netgen_flags
     order = flags.get("degree", 1)
-    logger.info(f"\tOrder of the hierarchy: {order}")
     if isinstance(order, int):
         order = [order]*(levs+1)
+    permutation_tol = flags.get("permutation_tol", 1e-8)
     refType = flags.get("refinement_type", "uniform")
-    logger.info(f"\tRefinement type: {refType}")
     optMoves = flags.get("optimisation_moves", False)
     snap = flags.get("snap_to", "geometry")
     snap_smoothing = flags.get("snap_smoothing", "hyperelastic")
-    logger.info(f"\tSnap to {snap} using {snap_smoothing} smoothing (if snapping to coarse)")
     cg = flags.get("cg", not mesh.coordinates.function_space().finat_element.is_dg())
     nested = flags.get("nested", snap in ["coarse"])
-    permutation_tol = flags.get("permutation_tol", 1e-8)
+    logger.info(f"\tOrder of the hierarchy: {order}")
+    logger.info(f"\tRefinement type: {refType}")
+    logger.info(f"\tSnap to {snap} using {snap_smoothing} smoothing (if snapping to coarse)")
     # Firedrake quantities
     meshes = []
     lgmaps = []
     # Curve the mesh
-    if mesh.coordinates.function_space().ufl_element().degree() != order[0]:
+    if order[0] != mesh.coordinates.function_space().ufl_element().degree():
         coordinates = mesh.curve_field(
             order=order[0],
             permutation_tol=permutation_tol,

firedrake/netgen.py

@@ -135,7 +135,7 @@ class FiredrakeMesh:
     def __init__(self, mesh, netgen_flags=None, user_comm=fd.COMM_WORLD):
         self.comm = user_comm
         # Parsing netgen flags
-        if netgen_flags is None:
+        if not isinstance(netgen_flags, dict):
             netgen_flags = {}
         split2tets = netgen_flags.get("split_to_tets", False)
         split = netgen_flags.get("split", False)

firedrake/pointquery_utils.py

@@ -128,10 +128,7 @@ def init_X(fiat_cell, parameters):
 
 
 @PETSc.Log.EventDecorator()
-def to_reference_coords_newton_step(ufl_coordinate_element, parameters,
-                                    x0_dtype="double",
-                                    dX_dtype=ScalarType,
-                                    kernel_name="to_reference_coords_newton_step"):
+def to_reference_coords_newton_step(ufl_coordinate_element, parameters, x0_dtype="double", dX_dtype=ScalarType):
     # Set up UFL form
     cell = ufl_coordinate_element.cell
     domain = ufl.Mesh(ufl_coordinate_element)
@@ -194,7 +191,7 @@ def predicate(index):
     impero_c = impero_utils.compile_gem(assignments, ())
     kernel, _ = tsfc.loopy.generate(
         impero_c, loopy_args, ScalarType,
-        kernel_name=kernel_name)
+        kernel_name="to_reference_coords_newton_step")
     return lp.generate_code_v2(kernel).device_code()