Merge branch 'master' into pbrubeck/fix/restricted-cofunction

docs/source/firedrake_usa_25.rst

@@ -27,13 +27,13 @@ The conference will begin with a tutorial session on the morning of 28 February
 Conference venue
 ----------------
 
-The conference will take place in the Bill Daniel Student Center in Room 202 in the heart of the Baylor campus.
+The conference will take place in the Bill Daniel Student Center in Room 202 in the heart of the Baylor campus.  A `campus map <https://map.baylor.edu/>`__ is available online, and both Apple Maps and Google Maps accurately locate the Bill Daniel Student Center.  
 
 
 Accommodation
 -------------
 
-We will be reserving a room block in a hotel near campus.  More information to follow.
+We have reserved a block of hotel rooms at SpringHill Suites Waco, about a 15 minute walk from the Bill Daniel Student Center.  Follow `this link <https://www.marriott.com/event-reservations/reservation-link.mi?id=1734040121673&key=GRP&guestreslink2=true&app=resvlink/>`__ to hold your room.  The group rate is only available until 20 January 2025.
 
 
 Conference dinner
@@ -53,9 +53,9 @@ The registration fees are as follows:
    :widths: 25 50
    :header-rows: 0
 
-   * - Student
+   * - Student:
      - $50
-   * - Non-student
+   * - Non-student:
      - $200
 
 The `SIAM Texas-Louisiana Section <https://www.siam.org/get-involved/connect-with-a-community/sections/siam-texas-louisiana-section/>`__ is providing some support for students currently attending universities in Texas or Louisiana to attend.
@@ -66,7 +66,7 @@ Conference registration is coming soon.
 Abstract submission
 -------------------
 
-Abstract submission will open soon via Easy Chair.
+Abstracts can be submitted `via EasyChair <https://easychair.org/conferences/?conf=firedrakeusa25>`__.
 
 
 
@@ -79,17 +79,11 @@ The conference has been kindly supported by the SIAM TX-LA Section and EPSRC.
 Travel to Waco
 --------------
 
-* By air
+* By air:  Waco has a small airport.  There is daily service between Waco and Dallas/Fort Worth International Airport via American Airlines.  
 
-   Waco has a small airport.  There is daily service between Waco and Dallas/Fort Worth International Airport via American Airlines.  
+* By ground:  We are less than two hours by car from the Dallas and Austin airports, and just under three hours from Bush Intercontinental Airport in Houston.  Additionally, Waco is reachable by bus services such as Greyhound and FlixBus.
 
-* By ground
-
-  We are less than two hours by car from the Dallas and Austin airports, and just under three hours from Bush Intercontinental Airport in Houston.  Additionally, Waco is reachable by bus services such as Greyhound and FlixBus.
-
-* Parking on campus
-
-  Baylor has plenty of visitor parking for your personal or rental vehicle, but conslut `these instructions <https://dps.web.baylor.edu/parking-transportation/visitors>__` and make sure to `register your vehicle <https://dps.web.baylor.edu/parking-transportation/visitors/visitor-parking-permit>__`.
+* Parking on campus:  Baylor has plenty of visitor parking for your personal or rental vehicle, but consult `these instructions <https://dps.web.baylor.edu/parking-transportation/visitors>`__ and make sure to `register your vehicle <https://dps.web.baylor.edu/parking-transportation/visitors/visitor-parking-permit>`__.
 
 
 

firedrake/cython/dmcommon.pyx

@@ -3358,7 +3358,7 @@ def make_global_numbering(PETSc.Section lsec, PETSc.Section gsec):
     cdef:
         PetscInt c, cc, p, pStart, pEnd, dof, cdof, loff, goff
         np.ndarray val
-        PetscInt *dof_array = NULL
+        const PetscInt *dof_array = NULL
 
     val = np.empty(lsec.getStorageSize(), dtype=IntType)
     pStart, pEnd = lsec.getChart()

firedrake/interpolation.py

@@ -1092,8 +1092,7 @@ def _interpolator(V, tensor, expr, subset, arguments, access, bcs=None):
     # interpolation) we have to pass the finat element we construct
     # here. Ideally we would only pass the UFL element through.
     kernel = compile_expression(cell_set.comm, expr, to_element, V.ufl_element(),
-                                domain=source_mesh, parameters=parameters,
-                                log=PETSc.Log.isActive())
+                                domain=source_mesh, parameters=parameters)
     ast = kernel.ast
     oriented = kernel.oriented
     needs_cell_sizes = kernel.needs_cell_sizes
@@ -1221,10 +1220,9 @@ def _interpolator(V, tensor, expr, subset, arguments, access, bcs=None):
                                   f"firedrake-tsfc-expression-kernel-cache-uid{os.getuid()}")
 
 
-def _compile_expression_key(comm, expr, to_element, ufl_element, domain, parameters, log):
+def _compile_expression_key(comm, expr, to_element, ufl_element, domain, parameters):
     """Generate a cache key suitable for :func:`tsfc.compile_expression_dual_evaluation`."""
-    key = hash_expr(expr), hash(ufl_element), utils.tuplify(parameters), log
-    return key
+    return (hash_expr(expr), hash(ufl_element), utils.tuplify(parameters))
 
 
 @memory_and_disk_cache(

firedrake/parloops.py

@@ -171,7 +171,7 @@ def par_loop(kernel, measure, args, kernel_kwargs=None, **kwargs):
       domain = '{[i]: 0 <= i < A.dofs}'
       instructions = '''
       for i
-          A[i] = max(A[i], B[0])
+          A[i] = fmax(A[i], B[0])
       end
       '''
       par_loop((domain, instructions), dx, {'A' : (A, RW), 'B': (B, READ)})

firedrake/preconditioners/pmg.py

@@ -530,7 +530,7 @@ def coarsen_bc_value(self, bc, cV):
 
 def prolongation_transfer_kernel_action(Vf, expr):
     to_element = create_element(Vf.ufl_element())
-    kernel = compile_expression_dual_evaluation(expr, to_element, Vf.ufl_element(), log=PETSc.Log.isActive())
+    kernel = compile_expression_dual_evaluation(expr, to_element, Vf.ufl_element())
     coefficients = extract_numbered_coefficients(expr, kernel.coefficient_numbers)
     if kernel.needs_external_coords:
         coefficients = [Vf.mesh().coordinates] + coefficients

firedrake/slate/slac/compiler.py

@@ -237,4 +237,4 @@ def gem_to_loopy(gem_expr, var2terminal, scalar_type):
 
     # Part B: impero_c to loopy
     output_arg = OutputKernelArg(output_loopy_arg)
-    return generate_loopy(impero_c, args, scalar_type, "slate_loopy", [], log=PETSc.Log.isActive()), output_arg
+    return generate_loopy(impero_c, args, scalar_type, "slate_loopy", []), output_arg

firedrake/tsfc_interface.py

@@ -53,8 +53,8 @@
 )
 
 
-def tsfc_compile_form_hashkey(form, prefix, parameters, interface, diagonal, log):
-    # Drop prefix as it's only used for naming and log
+def tsfc_compile_form_hashkey(form, prefix, parameters, interface, diagonal):
+    # Drop prefix as it's only used for naming
     return default_parallel_hashkey(form.signature(), prefix, parameters, interface, diagonal)
 
 
@@ -94,7 +94,7 @@ def __init__(
         """
         tree = tsfc_compile_form(form, prefix=name, parameters=parameters,
                                  interface=interface,
-                                 diagonal=diagonal, log=PETSc.Log.isActive())
+                                 diagonal=diagonal)
         kernels = []
         for kernel in tree:
             # Individual kernels do not have to use all of the coefficients