style

Merge branch 'master' into eigenSolverInterface
Merge branch 'master' of https://github.com/mfem/mfem
2026-02-10 12:48:56 -08:00 · 2026-02-10 10:47:01 -08:00 · 2026-02-10 10:46:20 -08:00 · 2026-02-10 10:45:28 -08:00 · 2026-02-03 22:40:04 -08:00 · 2026-02-02 23:34:11 -08:00
186 changed files with 2557 additions and 13693 deletions
@@ -25,7 +25,7 @@ runs:
  steps:
    - uses: ./.github/actions/sanitize/config

-    - uses: actions/cache@v5
+    - uses: actions/cache@v4
      if: ${{env.DEBUG == 'true'}}
      id: debug
      with:
@@ -36,7 +36,7 @@ runs:
  steps:
    - uses: ./.github/actions/sanitize/config

-    - uses: actions/cache@v5
+    - uses: actions/cache@v4
      if: ${{env.DEBUG == 'true' && inputs.cache-skip != 'true'}}
      id: debug
      with:
@@ -23,7 +23,7 @@ inputs:
 runs:
  using: 'composite'
  steps:
-    - uses: actions/cache/restore@v5  # Cache for LLVM libcxx
+    - uses: actions/cache/restore@v4  # Cache for LLVM libcxx
      with:
        path: ${{env.LLVM_DIR}}
        fail-on-cache-miss: true
@@ -32,14 +32,14 @@ runs:
    - uses: ./.github/actions/sanitize/mpi
      if: ${{inputs.par == 'true'}}

-    - uses: actions/cache/restore@v5  # Cache for Hypre
+    - uses: actions/cache/restore@v4  # Cache for Hypre
      if: ${{inputs.par == 'true'}}
      with:
        path: ${{env.HYPRE_DIR}}
        fail-on-cache-miss: true
        key: ${{runner.os}}-ompi-build-${{env.HYPRE_DIR}}-int32-fp64-v2.5

-    - uses: actions/cache/restore@v5  # Cache for Metis
+    - uses: actions/cache/restore@v4  # Cache for Metis
      if: ${{inputs.par == 'true'}}
      with:
        path: ${{env.METIS_DIR}}
@@ -51,13 +51,13 @@ runs:
      run: ln -s -f ${{env.HYPRE_DIR}} hypre && ln -s -f ${{env.METIS_DIR}} metis-4.0
      shell: bash

-    - uses: actions/cache/restore@v5  # Cache for LSAN suppression file
+    - uses: actions/cache/restore@v4  # Cache for LSAN suppression file
      with:
        path: ${{env.LSAN_DIR}}
        fail-on-cache-miss: true
        key: build-lsan-suppression-file

-    - uses: actions/checkout@v6  # Checkout the repository
+    - uses: actions/checkout@v4  # Checkout the repository
      with:
        path: mfem
        # ref: ${{env.BRANCH}}
@@ -43,7 +43,7 @@ jobs:
          remove-docker-images: 'true'

      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      # It's easier to reference named variables than indexes of the matrix
      - name: Set Environment
@@ -153,7 +153,7 @@ jobs:
      # /home/runner/work/mfem/mfem/mfem
      # Note: Done now to access "install-hypre" and "install-metis" actions.
      - name: checkout mfem
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          path: ${{ env.MFEM_TOP_DIR }}
          # Fetch the complete history for codecov to access commits ID
@@ -225,7 +225,7 @@ jobs:
      - name: cache hypre
        id: hypre-cache
        if: matrix.mpi == 'par'
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.HYPRE_TOP_DIR }}
          key: ${{ runner.os }}-ompi-build-${{ env.HYPRE_TOP_DIR }}-${{ matrix.hypre-target }}-${{ matrix.precision }}-v2.5
@@ -255,7 +255,7 @@ jobs:
      - name: cache metis
        id: metis-cache
        if: matrix.mpi == 'par' && matrix.os != 'windows-latest'
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.METIS_TOP_DIR }}
          key: ${{ runner.os }}-build-${{ env.METIS_TOP_DIR }}-v2.5
@@ -270,7 +270,7 @@ jobs:
      - name: cache vcpkg (Windows)
        id: vcpkg-cache
        if: matrix.os == 'windows-latest'
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: vcpkg_cache
          key: ${{ runner.os }}-${{ matrix.mpi }}-vcpkg-v1
@@ -295,8 +295,7 @@ jobs:
          export HOMEBREW_NO_INSTALL_CLEANUP=1
          brew update
          brew install enzyme
-          ENZYME_LLVM=$(brew info enzyme | sed -n 's/^Required.*:.*\(llvm[^ ]*\).*/\1/p')
-          echo "ENZYME_LLVM=$ENZYME_LLVM"
+          ENZYME_LLVM=$(brew info enzyme | sed -n 's/^Required:.*\(llvm[^ ]*\).*/\1/p')
          LLVM_PREFIX=$(brew --prefix $ENZYME_LLVM)
          echo "LLVM_PREFIX=$LLVM_PREFIX" >> $GITHUB_ENV
          echo "OMPI_CC=$LLVM_PREFIX/bin/clang" >> $GITHUB_ENV
@@ -40,11 +40,11 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@v2
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@v4
+        uses: github/codeql-action/autobuild@v2

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@v2
@@ -39,7 +39,7 @@ jobs:

    steps:
      - name: checkout MFEM
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          path: mfem

@@ -50,7 +50,7 @@ jobs:

      - name: Cache Hypre Install
        id: hypre-cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.HYPRE_TOP_DIR }}
          key: ${{ runner.os }}-ompi-build-${{ env.HYPRE_TOP_DIR }}-v2.5
@@ -65,7 +65,7 @@ jobs:

      - name: Cache Metis Install
        id: metis-cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{ env.METIS_TOP_DIR }}
          key: ${{ runner.os }}-build-${{ env.METIS_TOP_DIR }}-v2.5
@@ -38,7 +38,7 @@ jobs:
       github.event.pull_request.head.repo.full_name != github.repository)
    steps:
      - name: checkout mfem
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: copyright check
        id: copyright
@@ -93,7 +93,7 @@ jobs:
       github.event.pull_request.head.repo.full_name != github.repository)
    steps:
      - name: checkout mfem
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: get astyle
        run: |
@@ -110,7 +110,7 @@ jobs:
       github.event.pull_request.head.repo.full_name != github.repository)
    steps:
      - name: checkout mfem
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: get doxygen and graphviz
        run: |
@@ -135,7 +135,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout mfem
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

@@ -17,11 +17,11 @@ jobs:
    runs-on: ubuntu-latest
    name: 2.19.0
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/config
      - name: Cache
        id: cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{env.HYPRE_DIR}}
          key: ${{runner.os}}-ompi-build-${{env.HYPRE_DIR}}-int32-fp64-v2.5
@@ -27,13 +27,13 @@ jobs:
            llvm_use_sanitizer: "Undefined"
    name: ${{matrix.sanitizer}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/config
        with:
          NO_FLAGS: true
      - name: Cache
        id: cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{env.LLVM_DIR}}
          key: build-libcxx-${{env.LLVM_VER}}-${{matrix.sanitizer}}
@@ -17,11 +17,11 @@ jobs:
    runs-on: ubuntu-latest
    name: lsan.supp
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/config
      - name: Cache
        id: cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{env.LSAN_DIR}}
          key: build-lsan-suppression-file
@@ -17,11 +17,11 @@ jobs:
    runs-on: ubuntu-latest
    name: 4.0.3
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/config
      - name: Cache
        id: cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ${{env.METIS_DIR}}
          key: ${{runner.os}}-build-${{env.METIS_DIR}}-v2.5
@@ -28,7 +28,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/mfem
        with:
          par: ${{inputs.par}}
@@ -40,7 +40,7 @@ jobs:
    env:
      ex: ${{inputs.par && 'ex1p' || 'ex1'}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/restore
        id: restore
        with:
@@ -58,7 +58,7 @@ jobs:
    env:
      exclude: ${{inputs.par && '-E "_ser"' || ''}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/restore
        id: restore
        with:
@@ -82,7 +82,7 @@ jobs:
    env:
      exclude: ${{inputs.par && '-E "_ser"' || ''}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/restore
        id: restore
        with:
@@ -107,7 +107,7 @@ jobs:
      run: ${{inputs.par && '-R "_cpu_np"' || ''}}
      exclude: ${{inputs.par && '"unit_tests|debug"' || '"^unit_tests$|debug"'}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/restore
        id: restore
        with:
@@ -131,7 +131,7 @@ jobs:
    env:
      unit_tests: ${{inputs.par && 'punit_tests' || 'unit_tests'}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/restore
        id: restore
        with:
@@ -165,7 +165,7 @@ jobs:
      unit_tests: ${{inputs.par && 'punit_tests' || 'unit_tests'}}
      np: ${{inputs.par && '_np=2' || ''}}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/sanitize/restore
        id: restore
        with:
@@ -443,16 +443,12 @@ miniapps/diag-smoothers/mg-abs-l1-jacobi
 miniapps/contact/contact
 miniapps/contact/ParaView

-miniapps/plasma/pic/electrostatic-*
-!miniapps/plasma/pic/electrostatic-*.cpp
-miniapps/plasma/pic/*.csv
-
 # Unit test binary and outputs
 tests/unit/output_meshes
 tests/unit/unit_tests
 tests/unit/punit_tests
-tests/unit/cunit_tests
-tests/unit/pcunit_tests
+tests/unit/gpu_unit_tests
+tests/unit/pgpu_unit_tests
 tests/unit/sedov_tests_*
 tests/unit/psedov_tests_*
 tests/unit/tmop_pa_tests_*
@@ -8,22 +8,6 @@
                               https://mfem.org


-Version 4.10 (development)
-==========================
-
-Discretization improvements
---------------------------
- Replaced legacy simplex quadrature rules with symmetric positive-weight
-  rules for triangles (orders 0-25) and tetrahedra (orders 0-20). These
-  rules guarantee all-positive weights and interior quadrature points,
-  improving numerical stability. Higher orders fall back to Grundmann-Moller.
-  Triangle rules: Witherden & Vincent, Comput. Math. Appl. 69(10):1232-1241,
-  2015.
-  Tet rules (d=1-13): Witherden & Vincent (ibid).
-  Tet rules (d=14-20): Chuluunbaatar et al., Comput. Math. Appl. 124:89-97,
-  2022.
-
-
 Version 4.9.1 (development)
 ===========================

@@ -33,9 +17,6 @@ Discretization improvements
  Vector and VectorFE, also NURBS versions. Optionally different types of
  projections can be selected, default behaviour has not changed.

- Added methods to estimate function extremum using piecewise linear bounds +
-  recursive subdivision.
-
 Meshing improvements
 --------------------
 - Improved support for 1D NURBS meshes with variable order, including using
@@ -592,13 +592,6 @@ if (MFEM_USE_ENZYME)
    set(ENZYME_INCLUDE_DIRS ${ENZYME_DIR}/include)
 endif()

-if (MFEM_USE_PROTEUS)
-    enable_language(C)
-    find_package(proteus REQUIRED PATHS "${PROTEUS_DIR}")
-    message(STATUS "${PROTEUS_DIR}/include")
-    include_directories("${PROTEUS_DIR}/include")
-endif()
-
 # MFEM_TIMER_TYPE
 if (NOT DEFINED MFEM_TIMER_TYPE)
  if (APPLE)
@@ -659,8 +652,6 @@ foreach(TPL IN LISTS MFEM_TPLS)
  endif()
 endforeach(TPL)

-# reverse to remove the first instance of entries in TPL_LIBRARIES
-# so later duplicates are kept (for dependency ordering)
 list(REVERSE TPL_LIBRARIES)
 list(REMOVE_DUPLICATES TPL_LIBRARIES)
 list(REVERSE TPL_LIBRARIES)
@@ -735,16 +726,6 @@ mfem_add_library(mfem ${SOURCES} ${HEADERS} ${MASTER_HEADERS})
 target_compile_features(mfem PUBLIC cxx_std_${CMAKE_CXX_STANDARD})
 # message(STATUS "TPL_LIBRARIES = ${TPL_LIBRARIES}")
 target_link_libraries(mfem PUBLIC ${TPL_LIBRARIES} ${TPL_TARGETS})
-
-if (MFEM_USE_PROTEUS)
-    add_library(ClangProteusFlags INTERFACE IMPORTED)
-    set_target_properties(ClangProteusFlags PROPERTIES
-        INTERFACE_COMPILE_OPTIONS "-fpass-plugin=$<TARGET_FILE:ProteusPass>"
-    )
-    target_link_libraries(mfem PUBLIC ClangProteusFlags)
-    target_link_libraries(mfem PUBLIC proteus)
-endif()
-
 if (TPL_TARGETS)
  add_dependencies(mfem ${TPL_TARGETS})
 endif()
@@ -1034,7 +1015,5 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data
 # Create 'config.mk' from 'config.mk.in' for the build and install locations and
 # define install rules for 'config.mk' and 'test.mk'
 #-------------------------------------------------------------------------------
-if (MFEM_USE_CUDA OR MFEM_USE_HIP)
-  option(MFEM_EXPORT_GPU_CONFIG "Export config.mk for GPU-enabled downstream packages" ON)
-endif()
+
 mfem_export_mk_files()
@@ -109,10 +109,6 @@ if (MFEM_USE_RAJA)
   find_dependency(RAJA)
 endif()

-if (MFEM_USE_UMPIRE)
-   find_dependency(umpire)
-endif()
-
 if (NOT TARGET mfem)
  include(${CMAKE_CURRENT_LIST_DIR}/MFEMTargets.cmake)
 endif (NOT TARGET mfem)
@@ -14,12 +14,12 @@
 #   - UMPIRE_LIBRARIES
 #   - UMPIRE_INCLUDE_DIRS

-if (NOT umpire_ROOT AND UMPIRE_DIR)
-  set(umpire_ROOT ${UMPIRE_DIR})
+if (NOT umpire_DIR AND UMPIRE_DIR)
+  set(umpire_DIR ${UMPIRE_DIR}/lib/cmake/umpire)
 endif()
 message(STATUS "Looking for UMPIRE ...")
 message(STATUS "   in UMPIRE_DIR = ${UMPIRE_DIR}")
-message(STATUS "      umpire_ROOT = ${umpire_ROOT}")
+message(STATUS "      umpire_DIR = ${umpire_DIR}")
 find_package(umpire CONFIG)
 set(UMPIRE_FOUND ${umpire_FOUND})
 set(UMPIRE_LIBRARIES "umpire")
@@ -701,6 +701,7 @@ endfunction(mfem_find_library)
 # Extract compile and link options needed by the given target.
 #
 function(mfem_get_target_options Target CompileOptsVar LinkOptsVar)
+
  if (NOT TARGET ${Target})
    return()
  endif()
@@ -798,12 +799,7 @@ function(mfem_get_target_options Target CompileOptsVar LinkOptsVar)
          # message(STATUS "Lib = ${Lib}")
          # Filter-out generator expressions
          if (NOT ("${Lib}" MATCHES "^\\$"))
-            if(NOT ("${Lib}" STREQUAL "dl"))
-              list(APPEND LinkOpts "${Lib}")
-            else()
-              # for some reason libdl doesn't include the "-l"
-              list(APPEND LinkOpts "-ldl")
-            endif()
+            list(APPEND LinkOpts "${Lib}")
          endif()
        else()
          mfem_get_target_options(${Lib} COpts LOpts)
@@ -892,18 +888,9 @@ function(mfem_export_mk_files)
      set(${var} NO)
    endif()
  endforeach()
-  if (MFEM_USE_CUDA AND MFEM_EXPORT_GPU_CONFIG)
-    set(MFEM_CXX ${CMAKE_CUDA_COMPILER})
-    if(MFEM_CUDA_COMPILER_IS_NVCC)
-      set(MFEM_HOST_CXX ${CMAKE_CUDA_HOST_COMPILER})
-    else()
-      set(MFEM_HOST_CXX ${CMAKE_CXX_COMPILER})
-    endif()
-  else()
-    # mfem doesn't use enable_language(HIP)
-    set(MFEM_CXX ${CMAKE_CXX_COMPILER})
-    set(MFEM_HOST_CXX ${CMAKE_CXX_COMPILER})
-  endif()
+  # TODO: Add support for MFEM_USE_CUDA=YES
+  set(MFEM_CXX ${CMAKE_CXX_COMPILER})
+  set(MFEM_HOST_CXX ${MFEM_CXX})
  set(MFEM_CPPFLAGS "")
  get_target_property(cxx_std mfem CXX_STANDARD)
  # For now, we ignore the setting of the CXX_EXTENSIONS property. If this
@@ -913,50 +900,6 @@ function(mfem_export_mk_files)
  string(STRIP
         "${cxx_std_flag} ${CMAKE_CXX_FLAGS_${BUILD_TYPE}} ${CMAKE_CXX_FLAGS}"
         MFEM_CXXFLAGS)
-  if(MFEM_EXPORT_GPU_CONFIG)
-    if (MFEM_USE_CUDA)
-      set(MFEM_CXXFLAGS "${MFEM_CXXFLAGS} ${CMAKE_CUDA_FLAGS}")
-      if (MFEM_CUDA_COMPILER_IS_NVCC)
-        set(MFEM_CXXFLAGS "-x=cu ${MFEM_CXXFLAGS} -ccbin ${CMAKE_CXX_COMPILER} --forward-unknown-to-host-compiler")
-        # The following intentionally hides CUDA deprecation warnings
-        foreach(ENTRY IN LISTS CUDAToolkit_INCLUDE_DIRS)
-          set(MFEM_CXXFLAGS "${MFEM_CXXFLAGS} -isystem ${ENTRY}")
-        endforeach()
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18.0)
-          # architecture flags not part of CMAKE_CUDA_FLAGS
-          if ("all" STREQUAL "${CMAKE_CUDA_ARCHITECTURES}"
-              OR "native" STREQUAL "${CMAKE_CUDA_ARCHITECTURES}"
-              OR "all-major" STREQUAL "${CMAKE_CUDA_ARCHITECTURES}")
-            set(MFEM_CXXFLAGS "${MFEM_CXXFLAGS} -arch=${CMAKE_CUDA_ARCHITECTURES}")
-          else()
-            foreach (ENTRY IN LISTS CMAKE_CUDA_ARCHITECTURES)
-              set(MFEM_CXXFLAGS
-                "${MFEM_CXXFLAGS} -gencode arch=compute_${ENTRY},code=sm_${ENTRY}")
-            endforeach()
-          endif()
-        endif()
-      else()
-        set(MFEM_CXXFLAGS "${MFEM_CXXFLAGS} -xcuda --cuda-path=${CUDAToolkit_LIBRARY_ROOT}")
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18.0)
-          # architecture flags not part of CMAKE_CUDA_FLAGS
-          if ("all" STREQUAL "${CMAKE_CUDA_ARCHITECTURES}"
-              OR "native" STREQUAL "${CMAKE_CUDA_ARCHITECTURES}"
-              OR "all-major" STREQUAL "${CMAKE_CUDA_ARCHITECTURES}")
-            # TODO: not supported
-          else()
-            foreach(ENTRY IN LISTS CMAKE_CUDA_ARCHITECTURES)
-              set(MFEM_CXXFLAGS "-cuda-gpu-arch=sm_${ENTRY} ${MFEM_CXXFLAGS}")
-            endforeach()
-          endif()
-        endif()
-      endif()
-    elseif (MFEM_USE_HIP)
-      set(MFEM_CXXFLAGS "${MFEM_CXXFLAGS} -xhip")
-      foreach(ENTRY IN LISTS CMAKE_HIP_ARCHITECTURES)
-        set(MFEM_CXXFLAGS "--offload-arch=${ENTRY} ${MFEM_CXXFLAGS}")
-      endforeach()
-    endif()
-  endif()
  set(MFEM_TPLFLAGS "")
  foreach(dir ${TPL_INCLUDE_DIRS})
    set(MFEM_TPLFLAGS "${MFEM_TPLFLAGS} -I${dir}")
@@ -987,9 +930,6 @@ function(mfem_export_mk_files)
    set(MFEM_SHARED NO)
    set(MFEM_STATIC YES)
  endif()
-  if (MFEM_USE_CUDA)
-    set(MFEM_EXT_LIBS "${MFEM_EXT_LIBS} -lcudart")
-  endif()
  set(MFEM_BUILD_TAG "${CMAKE_SYSTEM}")
  set(MFEM_PREFIX "${CMAKE_INSTALL_PREFIX}")
  # For the next 4 variables, these are the values for the build-tree version of
@@ -998,15 +938,8 @@ function(mfem_export_mk_files)
  set(MFEM_LIB_DIR "${PROJECT_BINARY_DIR}")
  set(MFEM_TEST_MK "${PROJECT_SOURCE_DIR}/config/test.mk")
  set(MFEM_CONFIG_EXTRA "MFEM_BUILD_DIR ?= ${PROJECT_BINARY_DIR}")
-  if (MFEM_USE_CUDA AND MFEM_EXPORT_GPU_CONFIG)
-    if (MFEM_CUDA_COMPILER_IS_NVCC)
-      set(MFEM_XLINKER "-Xlinker=")
-    else()
-      set(MFEM_XLINKER "${CMAKE_CUDA_LINKER_WRAPPER_FLAG}")
-    endif()
-  else()
-    set(MFEM_XLINKER "${CMAKE_CXX_LINKER_WRAPPER_FLAG}")
-  endif()
+  # TODO: CUDA/HIP support:
+  set(MFEM_XLINKER "${CMAKE_CXX_LINKER_WRAPPER_FLAG}")
  set(MFEM_MPIEXEC ${MPIEXEC})
  if (NOT MFEM_MPIEXEC)
    set(MFEM_MPIEXEC "mpirun")
@@ -1054,21 +987,16 @@ function(mfem_export_mk_files)
    # handle interfaces (e.g., SCOREC::apf)
    if ("${lib}" MATCHES "SCOREC::.*" OR "${lib}" MATCHES "Ginkgo::.*" OR "${lib}" MATCHES "ParMoonolith::.*")
    elseif (TARGET "${lib}")
-      mfem_get_target_options(${lib} CompileOpts2 LinkOpts2)
-      # remove generator expressions
-      string(GENEX_STRIP "${CompileOpts2}" CompileOpts)
-      string(GENEX_STRIP "${LinkOpts2}" LinkOpts)
+      mfem_get_target_options(${lib} CompileOpts LinkOpts)
      # Removing duplicates may lead to issues:
      # list(REMOVE_DUPLICATES CompileOpts)
      # list(REMOVE_DUPLICATES LinkOpts)
-      # message(WARNING "${lib}[LinkOpts]: ${LinkOpts}")      
-      # message(WARNING "${lib}[CompileOpts]: ${CompileOpts}")
-      foreach(LOpt IN LISTS LinkOpts)
-        set(MFEM_EXT_LIBS "${MFEM_EXT_LIBS} ${LOpt}")
-      endforeach()
-      foreach(COpt IN LISTS CompileOpts)
-        set(MFEM_TPLFLAGS "${MFEM_TPLFLAGS} ${COpt}")
-      endforeach()
+      string(REPLACE ";" " " COpts "${CompileOpts}")
+      string(REPLACE ";" " " LOpts "${LinkOpts}")
+      # message(STATUS "${lib}[COpts]: '${COpts}'")
+      # message(STATUS "${lib}[LOpts]: '${LOpts}'")
+      set(MFEM_TPLFLAGS "${MFEM_TPLFLAGS} ${COpts}")
+      set(MFEM_EXT_LIBS "${MFEM_EXT_LIBS} ${LOpts}")
      # message(FATAL_ERROR "***** interface lib found ... exiting *****")
      # handle static and shared libs
    elseif ("${suffix}" STREQUAL "${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -1076,7 +1004,7 @@ function(mfem_export_mk_files)
      get_filename_component(fullLibName ${lib} NAME_WE)
      string(REGEX REPLACE "^lib" "" libname ${fullLibName})
      set(MFEM_EXT_LIBS
-        "${MFEM_EXT_LIBS} ${shared_link_flag}${dir} -L${dir} -l${libname}")
+          "${MFEM_EXT_LIBS} ${shared_link_flag}${dir} -L${dir} -l${libname}")
    else()
      set(MFEM_EXT_LIBS "${MFEM_EXT_LIBS} ${lib}")
    endif()
@@ -1085,7 +1013,7 @@ function(mfem_export_mk_files)
  # Create the build-tree version of 'config.mk'
  configure_file(
    "${PROJECT_SOURCE_DIR}/config/config.mk.in"
-    "${PROJECT_BINARY_DIR}/config/config.mk" @ONLY)
+    "${PROJECT_BINARY_DIR}/config/config.mk")
  # Copy 'test.mk' from the source-tree to the build-tree
  configure_file(
    "${PROJECT_SOURCE_DIR}/config/test.mk"
@@ -1103,7 +1031,7 @@ function(mfem_export_mk_files)
  # Create the install-tree version of 'config.mk'
  configure_file(
    "${PROJECT_SOURCE_DIR}/config/config.mk.in"
-    "${PROJECT_BINARY_DIR}/config/config-install.mk" @ONLY)
+    "${PROJECT_BINARY_DIR}/config/config-install.mk")

  # Install rules for 'config.mk' and 'test.mk'
  install(FILES ${PROJECT_SOURCE_DIR}/config/test.mk
@@ -157,22 +157,4 @@ constexpr real_t operator""_r(unsigned long long v)
 #endif
 #endif // MFEM_USE_MPI not defined

-#ifdef NVTX_DBG_HPP
-#include NVTX_DBG_HPP
-#else
-#define db1(...)
-#define dbg(...)
-#define dbl(...)
-#define dba(...)
-#define dbc(...)
-#define NVTX_MARK_FUNCTION
-#define NVTX_MARK_BEGIN(...)
-#define NVTX_INI(...)
-#define NVTX_END(...)
-#define NVTX_MARK_INI(...)
-#define NVTX_MARK_END(...)
-#define NVTX_MARK(...)
-#define NVTX(...)
-#endif
-
 #endif // MFEM_CONFIG_HPP
@@ -47,7 +47,6 @@ list(APPEND ALL_EXE_SRCS
  ex39.cpp
  ex40.cpp
  ex41.cpp
-  jitplayground.cpp
  )

 if (MFEM_USE_MPI)
@@ -5,9 +5,9 @@
 // Sample runs:
 //    mpirun -np 4 ex12p -m ../data/beam-tri.mesh
 //    mpirun -np 4 ex12p -m ../data/beam-quad.mesh
-//    mpirun -np 4 ex12p -m ../data/beam-tet.mesh -s 464 -n 10 -o 2 -elast
+//    mpirun -np 4 ex12p -m ../data/beam-tet.mesh -s 462 -n 10 -o 2 -elast
 //    mpirun -np 4 ex12p -m ../data/beam-hex.mesh -s 3878
-//    mpirun -np 4 ex12p -m ../data/beam-wedge.mesh -s 82
+//    mpirun -np 4 ex12p -m ../data/beam-wedge.mesh -s 81
 //    mpirun -np 4 ex12p -m ../data/beam-tri.mesh -s 3877 -o 2 -sys
 //    mpirun -np 4 ex12p -m ../data/beam-quad.mesh -s 4544 -n 6 -o 3 -elast
 //    mpirun -np 4 ex12p -m ../data/beam-quad-nurbs.mesh
@@ -302,21 +302,15 @@ int main(int argc, char *argv[])
      char vishost[] = "localhost";
      int  visport   = 19916;
      socketstream sol_sock_r(vishost, visport);
+      socketstream sol_sock_i(vishost, visport);
      sol_sock_r << "parallel " << num_procs << " " << myid << "\n";
+      sol_sock_i << "parallel " << num_procs << " " << myid << "\n";
      sol_sock_r.precision(8);
+      sol_sock_i.precision(8);
      sol_sock_r << "solution\n" << *pmesh << u_exact->real()
                 << "window_title 'Exact: Real Part'" << flush;
-      // Make sure all ranks have sent their real solution before initiating
-      // another set of GLVis connections (one from each rank):
-      MPI_Barrier(pmesh->GetComm());
-      socketstream sol_sock_i(vishost, visport);
-      sol_sock_i << "parallel " << num_procs << " " << myid << "\n";
-      sol_sock_i.precision(8);
      sol_sock_i << "solution\n" << *pmesh << u_exact->imag()
                 << "window_title 'Exact: Imaginary Part'" << flush;
-      // Make sure all ranks have sent their imaginary solution before initiating
-      // another set of GLVis connections (one from each rank):
-      MPI_Barrier(pmesh->GetComm());
   }

   // 11. Set up the parallel sesquilinear form a(.,.) on the finite element
@@ -540,21 +534,15 @@ int main(int argc, char *argv[])
      char vishost[] = "localhost";
      int  visport   = 19916;
      socketstream sol_sock_r(vishost, visport);
+      socketstream sol_sock_i(vishost, visport);
      sol_sock_r << "parallel " << num_procs << " " << myid << "\n";
+      sol_sock_i << "parallel " << num_procs << " " << myid << "\n";
      sol_sock_r.precision(8);
+      sol_sock_i.precision(8);
      sol_sock_r << "solution\n" << *pmesh << u.real()
                 << "window_title 'Solution: Real Part'" << flush;
-      // Make sure all ranks have sent their real solution before initiating
-      // another set of GLVis connections (one from each rank):
-      MPI_Barrier(pmesh->GetComm());
-      socketstream sol_sock_i(vishost, visport);
-      sol_sock_i << "parallel " << num_procs << " " << myid << "\n";
-      sol_sock_i.precision(8);
      sol_sock_i << "solution\n" << *pmesh << u.imag()
                 << "window_title 'Solution: Imaginary Part'" << flush;
-      // Make sure all ranks have sent their imaginary solution before initiating
-      // another set of GLVis connections (one from each rank):
-      MPI_Barrier(pmesh->GetComm());
   }
   if (visualization && exact_sol)
   {
@@ -563,21 +551,15 @@ int main(int argc, char *argv[])
      char vishost[] = "localhost";
      int  visport   = 19916;
      socketstream sol_sock_r(vishost, visport);
+      socketstream sol_sock_i(vishost, visport);
      sol_sock_r << "parallel " << num_procs << " " << myid << "\n";
+      sol_sock_i << "parallel " << num_procs << " " << myid << "\n";
      sol_sock_r.precision(8);
+      sol_sock_i.precision(8);
      sol_sock_r << "solution\n" << *pmesh << u_exact->real()
                 << "window_title 'Error: Real Part'" << flush;
-      // Make sure all ranks have sent their real solution before initiating
-      // another set of GLVis connections (one from each rank):
-      MPI_Barrier(pmesh->GetComm());
-      socketstream sol_sock_i(vishost, visport);
-      sol_sock_i << "parallel " << num_procs << " " << myid << "\n";
-      sol_sock_i.precision(8);
      sol_sock_i << "solution\n" << *pmesh << u_exact->imag()
                 << "window_title 'Error: Imaginary Part'" << flush;
-      // Make sure all ranks have sent their imaginary solution before initiating
-      // another set of GLVis connections (one from each rank):
-      MPI_Barrier(pmesh->GetComm());
   }
   if (visualization)
   {
@@ -5,8 +5,8 @@
 // Sample runs:
 //     ex37 -alpha 10
 //     ex37 -alpha 10 -pv
-//     ex37 -lambda 0.1 -mu 0.1 -growth 1
-//     ex37 -o 2 -alpha 10.0 -mi 50 -vf 0.4 -ntol 1e-5 -growth 1.5
+//     ex37 -lambda 0.1 -mu 0.1
+//     ex37 -o 2 -alpha 5.0 -mi 50 -vf 0.4 -ntol 1e-5
 //     ex37 -r 6 -o 1 -alpha 25.0 -epsilon 0.02 -mi 50 -ntol 1e-5
 //
 // Description: This example code demonstrates the use of MFEM to solve a
@@ -55,6 +55,53 @@
 using namespace std;
 using namespace mfem;

+/**
+ * @brief Bregman projection of ρ = sigmoid(ψ) onto the subspace
+ *        ∫_Ω ρ dx = θ vol(Ω) as follows:
+ *
+ *        1. Compute the root of the R → R function
+ *            f(c) = ∫_Ω sigmoid(ψ + c) dx - θ vol(Ω)
+ *        2. Set ψ ← ψ + c.
+ *
+ * @param psi a GridFunction to be updated
+ * @param target_volume θ vol(Ω)
+ * @param tol Newton iteration tolerance
+ * @param max_its Newton maximum iteration number
+ * @return real_t Final volume, ∫_Ω sigmoid(ψ)
+ */
+real_t proj(GridFunction &psi, real_t target_volume, real_t tol=1e-12,
+            int max_its=10)
+{
+   MappedGridFunctionCoefficient sigmoid_psi(&psi, sigmoid);
+   MappedGridFunctionCoefficient der_sigmoid_psi(&psi, der_sigmoid);
+
+   LinearForm int_sigmoid_psi(psi.FESpace());
+   int_sigmoid_psi.AddDomainIntegrator(new DomainLFIntegrator(sigmoid_psi));
+   LinearForm int_der_sigmoid_psi(psi.FESpace());
+   int_der_sigmoid_psi.AddDomainIntegrator(new DomainLFIntegrator(
+                                              der_sigmoid_psi));
+   bool done = false;
+   for (int k=0; k<max_its; k++) // Newton iteration
+   {
+      int_sigmoid_psi.Assemble(); // Recompute f(c) with updated ψ
+      const real_t f = int_sigmoid_psi.Sum() - target_volume;
+
+      int_der_sigmoid_psi.Assemble(); // Recompute df(c) with updated ψ
+      const real_t df = int_der_sigmoid_psi.Sum();
+
+      const real_t dc = -f/df;
+      psi += dc;
+      if (abs(dc) < tol) { done = true; break; }
+   }
+   if (!done)
+   {
+      mfem_warning("Projection reached maximum iteration without converging. "
+                   "Result may not be accurate.");
+   }
+   int_sigmoid_psi.Assemble();
+   return int_sigmoid_psi.Sum();
+}
+
 /*
 * ---------------------------------------------------------------
 *                      ALGORITHM PREAMBLE
@@ -133,11 +180,10 @@ int main(int argc, char *argv[])
   int ref_levels = 5;
   int order = 2;
   real_t alpha = 1.0;
-   real_t growth = 2;
   real_t epsilon = 0.01;
   real_t vol_fraction = 0.5;
   int max_it = 1e3;
-   real_t itol = 1e-2;
+   real_t itol = 1e-1;
   real_t ntol = 1e-4;
   real_t rho_min = 1e-6;
   real_t lambda = 1.0;
@@ -152,8 +198,6 @@ int main(int argc, char *argv[])
                  "Order (degree) of the finite elements.");
   args.AddOption(&alpha, "-alpha", "--alpha-step-length",
                  "Step length for gradient descent.");
-   args.AddOption(&growth, "-growth", "--alpha-growth-rate",
-                  "Growth rate of step length for gradient descent.");
   args.AddOption(&epsilon, "-epsilon", "--epsilon-thickness",
                  "Length scale for ρ.");
   args.AddOption(&max_it, "-mi", "--max-it",
@@ -288,7 +332,6 @@ int main(int argc, char *argv[])
   }
   FilterSolver->SetEssentialBoundary(ess_bdr_filter);
   FilterSolver->SetupFEM();
-   FilterSolver->AssembleDiffusionBilinear();

   BilinearForm mass(&control_fes);
   mass.AddDomainIntegrator(new InverseIntegrator(new MassIntegrator(one)));
@@ -342,7 +385,7 @@ int main(int argc, char *argv[])
   // 11. Iterate:
   for (int k = 1; k <= max_it; k++)
   {
-      if (k > 1) { alpha = std::pow((real_t) k,growth); }
+      if (k > 1) { alpha *= ((real_t) k) / ((real_t) k-1); }

      mfem::out << "\nStep = " << k << std::endl;

@@ -379,9 +422,7 @@ int main(int argc, char *argv[])

      // Step 5 - Update design variable ψ ← proj(ψ - αG)
      psi.Add(-alpha, grad);
-      GridFunction alpha_grad(grad);
-      alpha_grad *= alpha;
-      const real_t material_volume = proj(psi, alpha_grad, target_volume);
+      const real_t material_volume = proj(psi, target_volume);

      // Compute ||ρ - ρ_old|| in control fes.
      real_t norm_increment = zerogf.ComputeL1Error(succ_diff_rho);
@@ -137,7 +137,7 @@ public:
        exponent(exponent_), rho_min(rho_min_)
   {
      MFEM_ASSERT(rho_min_ >= 0.0, "rho_min must be >= 0");
-      MFEM_ASSERT(rho_min_ < 1.0,  "rho_min must be < 1");
+      MFEM_ASSERT(rho_min_ < 1.0,  "rho_min must be > 1");
      MFEM_ASSERT(u, "displacement field is not set");
      MFEM_ASSERT(rho_filter, "density field is not set");
   }
@@ -231,12 +231,9 @@ private:
   FiniteElementCollection * fec = nullptr;
   FiniteElementSpace * fes = nullptr;
   Array<int> ess_bdr;
-   Array<int> ess_tdof_list;
   Array<int> neumann_bdr;
   GridFunction * u = nullptr;
   LinearForm * b = nullptr;
-   BilinearForm * a = nullptr;
-   OperatorPtr A;
   bool parallel;
 #ifdef MFEM_USE_MPI
   ParMesh * pmesh = nullptr;
@@ -270,8 +267,6 @@ public:
   void ResetFEM();
   void SetupFEM();

-   void UpdateEssentialTDofs();
-   void AssembleDiffusionBilinear(bool update_ess_tdofs=true);
   void Solve();
   GridFunction * GetFEMSolution();
   LinearForm * GetLinearForm() {return b;}
@@ -376,130 +371,6 @@ public:

 };

-/**
- * @brief Bregman projection of ρ = sigmoid(ψ) onto the subspace
- *        ∫_Ω ρ dx = θ vol(Ω) as follows:
- *
- *        1. Compute the root of the R → R function
- *            f(c) = ∫_Ω sigmoid(ψ + c) dx - θ vol(Ω)
- *           using the Illinois method
- *        2. Set ψ ← ψ + c.
- *
- * @param psi a GridFunction to be updated
- * @param alpha_grad alpha multiplied by gradient
- * @param target_volume θ vol(Ω)
- * @param tol Illinois iteration tolerance
- * @param max_its Illinois maximum iteration number
- * @return real_t Final volume (∫_Ω sigmoid(ψ) dx)
- */
-real_t proj(GridFunction &psi, GridFunction &alpha_grad, real_t target_volume,
-            real_t tol = 1e-12, int max_its = 100)
-{
-#ifdef MFEM_USE_MPI
-   FiniteElementSpace *fes = psi.FESpace();
-   ParFiniteElementSpace *pfes = dynamic_cast<ParFiniteElementSpace*>(fes);
-#endif
-   ConstantCoefficient zero_cf(0.0);
-   real_t a = -alpha_grad.ComputeMaxError(zero_cf);
-   real_t b = -a;
-   real_t y = 0.0;
-
-   MappedGridFunctionCoefficient sigmoid_psi(
-   &psi, [&y](const real_t x) { return sigmoid(x + y); });
-   std::unique_ptr<LinearForm> int_sigmoid_psi;
-#ifdef MFEM_USE_MPI
-   ParGridFunction *par_psi = dynamic_cast<ParGridFunction *>(&psi);
-   if (par_psi)
-   {
-      int_sigmoid_psi.reset(new ParLinearForm(par_psi->ParFESpace()));
-   }
-   else
-   {
-      int_sigmoid_psi.reset(new LinearForm(psi.FESpace()));
-   }
-#else
-   int_sigmoid_psi.reset(new LinearForm(psi.FESpace()));
-#endif
-   int_sigmoid_psi->AddDomainIntegrator(new DomainLFIntegrator(sigmoid_psi));
-
-   y = a;
-   int_sigmoid_psi->Assemble();
-   real_t f_a = int_sigmoid_psi->Sum();  // f_a := f(a) + θ vol(Ω)
-
-   y = b;
-   int_sigmoid_psi->Assemble();
-   real_t f_b = int_sigmoid_psi->Sum();  // f_b := f(b) + θ vol(Ω)
-#ifdef MFEM_USE_MPI
-   if (pfes)
-   {
-      MPI_Allreduce(MPI_IN_PLACE, &f_a, 1, MPITypeMap<real_t>::mpi_type,
-                    MPI_SUM, MPI_COMM_WORLD);
-      MPI_Allreduce(MPI_IN_PLACE, &f_b, 1, MPITypeMap<real_t>::mpi_type,
-                    MPI_SUM, MPI_COMM_WORLD);
-   }
-#endif
-   f_a -= target_volume; // f_a := f(a)
-   f_b -= target_volume; // f_b := f(b)
-   real_t c = 0.0;
-   real_t f_c = 0.0;
-   int side = 0;
-
-   bool done = false;
-   for (int k=0; k < max_its; k++)
-   {
-      c = (f_a * b - f_b * a) / (f_a - f_b);
-
-      if (abs(b - a) < tol * abs(b + a)) { done = true; break; }
-
-      y = c;
-      int_sigmoid_psi->Assemble();
-      f_c = int_sigmoid_psi->Sum(); // f_c := f(c) + θ vol(Ω)
-#ifdef MFEM_USE_MPI
-      if (pfes)
-      {
-         MPI_Allreduce(MPI_IN_PLACE, &f_c, 1, MPITypeMap<real_t>::mpi_type,
-                       MPI_SUM, MPI_COMM_WORLD);
-      }
-#endif
-      f_c -= target_volume; // f_c := f(c)
-
-      if (f_c * f_b > 0)
-      {
-         b = c;
-         f_b = f_c;
-         if (side == -1) { f_a /= 2.0; }
-         side = -1;
-      }
-      else if (f_c * f_a > 0)
-      {
-         a = c;
-         f_a = f_c;
-         if (side == 1) { f_b /= 2.0; }
-         side = 1;
-      }
-      else
-      {
-         done = true; break;
-      }
-   }
-   if (!done)
-   {
-      mfem_warning("Projection reached maximum iteration without converging. "
-                   "Result may not be accurate.");
-   }
-   y = 0.0;
-   psi += c;
-   int_sigmoid_psi->Assemble();
-   real_t material_volume = int_sigmoid_psi->Sum();
-#ifdef MFEM_USE_MPI
-   if (pfes)
-   {
-      MPI_Allreduce(MPI_IN_PLACE, &material_volume, 1,
-                    MPITypeMap<real_t>::mpi_type, MPI_SUM, MPI_COMM_WORLD);
-   }
-#endif
-   return material_volume;
-}

 // Poisson solver

@@ -551,8 +422,12 @@ void DiffusionSolver::SetupFEM()
   }
 }

-void DiffusionSolver::UpdateEssentialTDofs()
+void DiffusionSolver::Solve()
 {
+   OperatorPtr A;
+   Vector B, X;
+   Array<int> ess_tdof_list;
+
 #ifdef MFEM_USE_MPI
   if (parallel)
   {
@@ -565,39 +440,7 @@ void DiffusionSolver::UpdateEssentialTDofs()
 #else
   fes->GetEssentialTrueDofs(ess_bdr,ess_tdof_list);
 #endif
-}
-
-void DiffusionSolver::AssembleDiffusionBilinear(bool update_ess_tdofs)
-{
-   if (update_ess_tdofs)
-   {
-      UpdateEssentialTDofs();
-   }
-#ifdef MFEM_USE_MPI
-   if (parallel)
-   {
-      a = new ParBilinearForm(pfes);
-   }
-   else
-   {
-      a = new BilinearForm(fes);
-   }
-#else
-   a = new BilinearForm(fes);
-#endif
-   a->AddDomainIntegrator(new DiffusionIntegrator(*diffcf));
-   if (masscf)
-   {
-      a->AddDomainIntegrator(new MassIntegrator(*masscf));
-   }
-   a->Assemble();
-   a->FormSystemMatrix(ess_tdof_list, A);
-}
-
-void DiffusionSolver::Solve()
-{
-   Vector B, X;
-
+   *u=0.0;
   if (b)
   {
      delete b;
@@ -632,33 +475,31 @@ void DiffusionSolver::Solve()

   b->Assemble();

-   *u=0.0;
-   if (essbdr_cf)
-   {
-      u->ProjectBdrCoefficient(*essbdr_cf,ess_bdr);
-   }
+   BilinearForm * a = nullptr;

 #ifdef MFEM_USE_MPI
   if (parallel)
   {
-      X.SetSize(pfes->TrueVSize());
-      B.SetSize(pfes->TrueVSize());
-      dynamic_cast<ParGridFunction*>(u)->ParallelAssemble(X);
-      dynamic_cast<ParLinearForm*>(b)->ParallelAssemble(B);
-      dynamic_cast<ParBilinearForm*>(a)->ParallelEliminateTDofsInRHS(
-         ess_tdof_list, X, B);
+      a = new ParBilinearForm(pfes);
   }
   else
   {
-      X.NewDataAndSize(u->GetData(), u->Size());
-      B.NewDataAndSize(b->GetData(), b->Size());
-      a->EliminateVDofsInRHS(ess_tdof_list, X, B);
+      a = new BilinearForm(fes);
   }
 #else
-   X.NewDataAndSize(u->GetData(), u->Size());
-   B.NewDataAndSize(b->GetData(), b->Size());
-   a->EliminateVDofsInRHS(ess_tdof_list, X, B);
+   a = new BilinearForm(fes);
 #endif
+   a->AddDomainIntegrator(new DiffusionIntegrator(*diffcf));
+   if (masscf)
+   {
+      a->AddDomainIntegrator(new MassIntegrator(*masscf));
+   }
+   a->Assemble();
+   if (essbdr_cf)
+   {
+      u->ProjectBdrCoefficient(*essbdr_cf,ess_bdr);
+   }
+   a->FormLinearSystem(ess_tdof_list, *u, *b, A, X, B);

   CGSolver * cg = nullptr;
   Solver * M = nullptr;
@@ -687,6 +528,7 @@ void DiffusionSolver::Solve()
   delete M;
   delete cg;
   a->RecoverFEMSolution(X, *b, *u);
+   delete a;
 }

 GridFunction * DiffusionSolver::GetFEMSolution()
@@ -718,8 +560,6 @@ DiffusionSolver::~DiffusionSolver()
 #endif
   delete fec; fec = nullptr;
   delete b;
-   A.Clear();
-   delete a;
 }


@@ -4,8 +4,8 @@
 //
 // Sample runs:
 //    mpirun -np 4 ex37p -alpha 10 -pv
-//    mpirun -np 4 ex37p -lambda 0.1 -mu 0.1 -growth 1
-//    mpirun -np 4 ex37p -o 2 -alpha 10.0 -mi 50 -vf 0.4 -ntol 1e-5 -growth 1.5
+//    mpirun -np 4 ex37p -lambda 0.1 -mu 0.1
+//    mpirun -np 4 ex37p -o 2 -alpha 5.0 -mi 50 -vf 0.4 -ntol 1e-5
 //    mpirun -np 4 ex37p -r 6 -o 2 -alpha 10.0 -epsilon 0.02 -mi 50 -ntol 1e-5
 //
 // Description: This example code demonstrates the use of MFEM to solve a
@@ -54,6 +54,61 @@
 using namespace std;
 using namespace mfem;

+/**
+ * @brief Bregman projection of ρ = sigmoid(ψ) onto the subspace
+ *        ∫_Ω ρ dx = θ vol(Ω) as follows:
+ *
+ *        1. Compute the root of the R → R function
+ *            f(c) = ∫_Ω sigmoid(ψ + c) dx - θ vol(Ω)
+ *        2. Set ψ ← ψ + c.
+ *
+ * @param psi a GridFunction to be updated
+ * @param target_volume θ vol(Ω)
+ * @param tol Newton iteration tolerance
+ * @param max_its Newton maximum iteration number
+ * @return real_t Final volume, ∫_Ω sigmoid(ψ)
+ */
+real_t proj(ParGridFunction &psi, real_t target_volume, real_t tol=1e-12,
+            int max_its=10)
+{
+   MappedGridFunctionCoefficient sigmoid_psi(&psi, sigmoid);
+   MappedGridFunctionCoefficient der_sigmoid_psi(&psi, der_sigmoid);
+
+   ParLinearForm int_sigmoid_psi(psi.ParFESpace());
+   int_sigmoid_psi.AddDomainIntegrator(new DomainLFIntegrator(sigmoid_psi));
+   ParLinearForm int_der_sigmoid_psi(psi.ParFESpace());
+   int_der_sigmoid_psi.AddDomainIntegrator(new DomainLFIntegrator(
+                                              der_sigmoid_psi));
+   bool done = false;
+   for (int k=0; k<max_its; k++) // Newton iteration
+   {
+      int_sigmoid_psi.Assemble(); // Recompute f(c) with updated ψ
+      real_t f = int_sigmoid_psi.Sum();
+      MPI_Allreduce(MPI_IN_PLACE, &f, 1, MPITypeMap<real_t>::mpi_type,
+                    MPI_SUM, MPI_COMM_WORLD);
+      f -= target_volume;
+
+      int_der_sigmoid_psi.Assemble(); // Recompute df(c) with updated ψ
+      real_t df = int_der_sigmoid_psi.Sum();
+      MPI_Allreduce(MPI_IN_PLACE, &df, 1, MPITypeMap<real_t>::mpi_type,
+                    MPI_SUM, MPI_COMM_WORLD);
+
+      const real_t dc = -f/df;
+      psi += dc;
+      if (abs(dc) < tol) { done = true; break; }
+   }
+   if (!done)
+   {
+      mfem_warning("Projection reached maximum iteration without converging. "
+                   "Result may not be accurate.");
+   }
+   int_sigmoid_psi.Assemble();
+   real_t material_volume = int_sigmoid_psi.Sum();
+   MPI_Allreduce(MPI_IN_PLACE, &material_volume, 1,
+                 MPITypeMap<real_t>::mpi_type, MPI_SUM, MPI_COMM_WORLD);
+   return material_volume;
+}
+
 /*
 * ---------------------------------------------------------------
 *                      ALGORITHM PREAMBLE
@@ -138,11 +193,10 @@ int main(int argc, char *argv[])
   int ref_levels = 5;
   int order = 2;
   real_t alpha = 1.0;
-   real_t growth = 2;
   real_t epsilon = 0.01;
   real_t vol_fraction = 0.5;
   int max_it = 1e3;
-   real_t itol = 1e-2;
+   real_t itol = 1e-1;
   real_t ntol = 1e-4;
   real_t rho_min = 1e-6;
   real_t lambda = 1.0;
@@ -157,8 +211,6 @@ int main(int argc, char *argv[])
                  "Order (degree) of the finite elements.");
   args.AddOption(&alpha, "-alpha", "--alpha-step-length",
                  "Step length for gradient descent.");
-   args.AddOption(&growth, "-growth", "--alpha-growth-rate",
-                  "Growth rate of step length for gradient descent.");
   args.AddOption(&epsilon, "-epsilon", "--epsilon-thickness",
                  "Length scale for ρ.");
   args.AddOption(&max_it, "-mi", "--max-it",
@@ -307,7 +359,6 @@ int main(int argc, char *argv[])
   }
   FilterSolver->SetEssentialBoundary(ess_bdr_filter);
   FilterSolver->SetupFEM();
-   FilterSolver->AssembleDiffusionBilinear();

   ParBilinearForm mass(&control_fes);
   mass.AddDomainIntegrator(new InverseIntegrator(new MassIntegrator(one)));
@@ -361,7 +412,7 @@ int main(int argc, char *argv[])
   // 11. Iterate:
   for (int k = 1; k <= max_it; k++)
   {
-      if (k > 1) { alpha = std::pow((real_t) k,growth); }
+      if (k > 1) { alpha *= ((real_t) k) / ((real_t) k-1); }

      if (myid == 0)
      {
@@ -401,9 +452,7 @@ int main(int argc, char *argv[])

      // Step 5 - Update design variable ψ ← proj(ψ - αG)
      psi.Add(-alpha, grad);
-      ParGridFunction alpha_grad(grad);
-      alpha_grad *= alpha;
-      const real_t material_volume = proj(psi, alpha_grad, target_volume);
+      const real_t material_volume = proj(psi, target_volume);

      // Compute ||ρ - ρ_old|| in control fes.
      real_t norm_increment = zerogf.ComputeL1Error(succ_diff_rho);
@@ -1,536 +0,0 @@
-#include <mfem.hpp>
-
-#include "../fem/dfem/util.hpp"
-
-#include <proteus/CppJitModule.h>
-
-#include "jitplayground.hpp"
-
-#include <algorithm>
-#include <array>
-#include <cctype>
-#include <cmath>
-#include <fstream>
-#include <initializer_list>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <vector>
-
-namespace util
-{
-constexpr std::string_view Dirname(std::string_view path)
-{
-   const size_t last_sep = path.find_last_of("/\\");
-   if (last_sep == std::string_view::npos) { return {}; }
-   return path.substr(0, last_sep);
-}
-
-constexpr std::string_view thisFileDir = Dirname(__FILE__);
-}
-
-template <typename T>
-static std::string TypeNameString()
-{
-   return std::string(mfem::future::get_type_name<T>());
-}
-
-template <typename Tuple, size_t... Is>
-static auto ParamTypeStringsImpl(std::index_sequence<Is...>)
-{
-   return std::array<std::string, sizeof...(Is)>
-   {
-      TypeNameString<std::remove_reference_t<decltype(mfem::future::get<Is>(std::declval<Tuple&>()))>>()...
-   };
-}
-
-template <typename Tuple>
-static auto ParamTypeStrings()
-{
-   return ParamTypeStringsImpl<Tuple>(
-             std::make_index_sequence<mfem::future::tuple_size<Tuple>::value> {});
-}
-
-static std::string_view Trim(std::string_view s)
-{
-   size_t begin = 0;
-   while (begin < s.size() && std::isspace(static_cast<unsigned char>(s[begin])))
-   {
-      ++begin;
-   }
-   size_t end = s.size();
-   while (end > begin &&
-          std::isspace(static_cast<unsigned char>(s[end - 1])))
-   {
-      --end;
-   }
-   return s.substr(begin, end - begin);
-}
-
-static bool IsValidIdentifier(std::string_view s)
-{
-   if (s.empty()) { return false; }
-   const unsigned char c0 = static_cast<unsigned char>(s[0]);
-   if (!(std::isalpha(c0) || c0 == '_')) { return false; }
-   for (size_t i = 1; i < s.size(); ++i)
-   {
-      const unsigned char c = static_cast<unsigned char>(s[i]);
-      if (!(std::isalnum(c) || c == '_')) { return false; }
-   }
-   return true;
-}
-
-static bool ParseJitDirective(std::string_view line,
-                              std::string &type,
-                              std::string &var,
-                              std::string &kind)
-{
-   const size_t jit_pos = line.find("$JIT");
-   if (jit_pos == std::string_view::npos) { return false; }
-
-   const size_t open = line.find('[', jit_pos);
-   const size_t close = line.find(']', jit_pos);
-   MFEM_VERIFY(open != std::string_view::npos &&
-               close != std::string_view::npos &&
-               close > open,
-               "malformed $JIT directive (expected brackets): " << line);
-
-   const std::string_view payload = line.substr(open + 1, close - open - 1);
-   const size_t comma1 = payload.find(',');
-   const size_t comma2 = (comma1 == std::string_view::npos)
-                         ? std::string_view::npos
-                         : payload.find(',', comma1 + 1);
-   MFEM_VERIFY(comma1 != std::string_view::npos &&
-               comma2 != std::string_view::npos,
-               "malformed $JIT directive (expected 3 comma-separated fields): "
-               << line);
-
-   const std::string_view f0 = Trim(payload.substr(0, comma1));
-   const std::string_view f1 = Trim(payload.substr(comma1 + 1,
-                                                   comma2 - comma1 - 1));
-   const std::string_view f2 = Trim(payload.substr(comma2 + 1));
-   MFEM_VERIFY(!f0.empty() && !f1.empty() && !f2.empty(),
-               "malformed $JIT directive (empty field): " << line);
-
-   type.assign(f0);
-   var.assign(f1);
-   kind.assign(f2);
-   return true;
-}
-
-static std::string ReadFileOrEmpty(const std::string &fn)
-{
-   std::ifstream file(fn);
-   if (!file.is_open())
-   {
-      std::cerr << "could not open file " << fn << "\n";
-      return {};
-   }
-   std::stringstream buffer;
-   buffer << file.rdbuf();
-   return buffer.str();
-}
-
-static std::vector<std::string> ExtractJitVarNames(const std::string
-                                                   &kernel_code)
-{
-   std::stringstream ss(kernel_code);
-   std::string line;
-   std::vector<std::string> var_names;
-   std::unordered_set<std::string> seen_vars;
-
-   while (std::getline(ss, line))
-   {
-      std::string type, var, kind;
-      if (ParseJitDirective(line, type, var, kind))
-      {
-         MFEM_VERIFY(IsValidIdentifier(var),
-                     "$JIT variable must be a valid identifier: " << var);
-         MFEM_VERIFY(seen_vars.insert(var).second,
-                     "duplicate $JIT variable name: " << var);
-         var_names.push_back(var);
-      }
-   }
-   return var_names;
-}
-
-static std::string RewriteKernelForJit(std::string kernel_code,
-                                       const std::vector<std::string> &jit_values)
-{
-   std::stringstream ss(kernel_code);
-   std::string line;
-
-   std::string out;
-   out.reserve(kernel_code.size() + 128);
-
-   bool have_pending = false;
-   size_t pending_index = 0;
-   std::string pending_type;
-   std::string pending_var;
-   std::unordered_set<std::string> seen_vars;
-
-   while (std::getline(ss, line))
-   {
-      line.push_back('\n');
-
-      if (have_pending)
-      {
-         MFEM_VERIFY(pending_index < jit_values.size(),
-                     "not enough JIT values provided");
-         const size_t indent_end = line.find_first_not_of(" \t");
-         const std::string indent =
-            (indent_end == std::string::npos) ? std::string() :
-            line.substr(0, indent_end);
-         out += indent + "const " + pending_type + " " + pending_var + " = " +
-                jit_values[pending_index] + ";\n";
-         have_pending = false;
-         ++pending_index;
-         continue;
-      }
-
-      std::string type, var, kind;
-      if (ParseJitDirective(line, type, var, kind))
-      {
-         MFEM_VERIFY(IsValidIdentifier(var),
-                     "$JIT variable must be a valid identifier: " << var);
-         MFEM_VERIFY(kind == "generic",
-                     "unsupported $JIT kind: " << kind);
-         MFEM_VERIFY(seen_vars.insert(var).second,
-                     "duplicate $JIT variable name: " << var);
-
-         pending_type = std::move(type);
-         pending_var = std::move(var);
-         have_pending = true;
-         continue; // drop directive line
-      }
-
-      out += line;
-   }
-
-   MFEM_VERIFY(!have_pending,
-               "$JIT directive must annotate a following line");
-   MFEM_VERIFY(jit_values.size() == pending_index,
-               "JIT value count must match number of $JIT directives");
-   return out;
-}
-
-static std::string GeneratedOutputPath(std::string_view original_path)
-{
-   const size_t last_sep = original_path.find_last_of("/\\");
-   const size_t dot = original_path.find_last_of('.');
-   const bool dot_in_filename =
-      (dot != std::string_view::npos) &&
-      (last_sep == std::string_view::npos || dot > last_sep);
-
-   const std::string_view base =
-      dot_in_filename ? original_path.substr(0, dot) : original_path;
-   return std::string(base) + "_generated.hpp";
-}
-
-static void WriteFileOrWarn(const std::string &path,
-                            const std::string &contents)
-{
-   std::ofstream out(path);
-   if (!out.is_open())
-   {
-      std::cerr << "could not write generated file " << path << "\n";
-      return;
-   }
-   out << contents;
-}
-
-class JitQFunction
-{
-public:
-   template <typename ImplT, size_t N>
-   JitQFunction(ImplT, const std::string &fn,
-                const std::array<bool, N> &activity_map)
-   {
-      using qf_signature = typename
-                           mfem::future::get_function_signature<
-                           decltype(&ImplT::operator())>::type;
-      using qf_param_ts = typename qf_signature::parameter_ts;
-      constexpr size_t nparams = mfem::future::tuple_size<qf_param_ts>::value;
-      static_assert(N == nparams, "activity_map size must match qfunc arity");
-
-      this->fn = fn;
-      this->nparams = nparams;
-      this->activity_map.reserve(N);
-      for (size_t i = 0; i < N; ++i)
-      {
-         this->activity_map.push_back(activity_map[i]);
-      }
-      {
-         const auto param_types_arr = ParamTypeStrings<qf_param_ts>();
-         this->param_types.assign(param_types_arr.begin(), param_types_arr.end());
-      }
-      this->return_type = TypeNameString<typename qf_signature::return_t>();
-      this->return_is_void = std::is_same_v<typename qf_signature::return_t, void>;
-      this->impl_type_name = TypeNameString<ImplT>();
-      this->jit_var_names = ExtractJitVarNames(ReadFileOrEmpty(fn));
-   }
-
-   template <typename ReturnT, typename... Args>
-   ReturnT run(std::string_view name,
-               std::initializer_list<std::pair<std::string_view, std::string_view>> jit_values,
-               Args&&... args)
-   {
-      auto ordered_values = MatchJitValues(jit_values);
-      auto &mod = GetOrCreateModule(ordered_values);
-      auto &instance = mod.instantiate(std::string(name), std::string());
-      return instance.template run<ReturnT>(std::forward<Args>(args)...);
-   }
-
-   template <typename ReturnT, typename... Args>
-   ReturnT run_primal(
-      std::initializer_list<std::pair<std::string_view, std::string_view>> jit_values,
-      Args&&... args)
-   {
-      return run<ReturnT>(qfunc_name, jit_values,
-                          std::forward<Args>(args)...);
-   }
-
-   template <typename ReturnT, typename... Args>
-   ReturnT run_derivative(
-      std::initializer_list<std::pair<std::string_view, std::string_view>> jit_values,
-      Args&&... args)
-   {
-      return run<ReturnT>(qfunc_name + "_fwddiff", jit_values,
-                          std::forward<Args>(args)...);
-   }
-
-private:
-   std::vector<std::string_view> MatchJitValues(
-      std::initializer_list<std::pair<std::string_view, std::string_view>>
-      named_values) const
-   {
-      std::unordered_map<std::string_view, std::string_view> value_map;
-      for (const auto &[name, value] : named_values)
-      {
-         value_map[name] = value;
-      }
-
-      std::vector<std::string_view> ordered_values;
-      ordered_values.reserve(jit_var_names.size());
-      for (const auto &var_name : jit_var_names)
-      {
-         auto it = value_map.find(var_name);
-         MFEM_VERIFY(it != value_map.end(),
-                     "missing JIT value for variable: " << var_name);
-         ordered_values.push_back(it->second);
-      }
-
-      MFEM_VERIFY(ordered_values.size() == named_values.size(),
-                  "provided " << named_values.size() << " JIT values but expected "
-                  << jit_var_names.size());
-      return ordered_values;
-   }
-
-
-   std::string BuildModuleCode(const std::vector<std::string> &jit_values) const
-   {
-      std::string module_code =
-         RewriteKernelForJit(ReadFileOrEmpty(fn), jit_values);
-      module_code += "\n\n";
-      module_code += "// --- generated ---\n";
-      module_code +=
-         "template <typename return_type, typename... Args>\n"
-         "return_type __enzyme_fwddiff(Args...);\n"
-         "\n"
-         "extern int enzyme_const;\n"
-         "extern int enzyme_dup;\n"
-         "\n";
-
-      // Generate a primal wrapper with the requested symbol name, so the kernel
-      // header can just define the qfunc as a functor.
-      //
-      // Note: Proteus instantiates entrypoints via `qfunc_wrapper<>(...)` even
-      // when there are no user template args, so keep the wrapper itself a
-      // template (with a default parameter) while still doing literal `$JIT`
-      // replacements in the kernel code.
-      module_code += "template <typename = void>\n";
-      module_code += return_type + " " +
-                     std::string(qfunc_name) + "(";
-      bool first = true;
-      for (size_t i = 0; i < nparams; ++i)
-      {
-         if (!first) { module_code += ", "; }
-         first = false;
-         module_code += param_types[i] + " Arg" + std::to_string(i);
-      }
-      module_code += ")\n";
-      module_code += "{\n";
-      module_code += "   " + impl_type_name + " qf;\n";
-      if (return_is_void)
-      {
-         module_code += "   ";
-      }
-      else
-      {
-         module_code += "   return ";
-      }
-      module_code += "qf(";
-      for (size_t i = 0; i < nparams; ++i)
-      {
-         if (i) { module_code += ", "; }
-         module_code += "Arg" + std::to_string(i);
-      }
-      module_code += ");\n";
-      module_code += "}\n\n";
-
-      module_code += "template <typename = void>\n";
-      module_code += return_type + " " +
-                     std::string(qfunc_name) + "_fwddiff(";
-
-      first = true;
-      for (size_t i = 0; i < nparams; ++i)
-      {
-         if (!first) { module_code += ", "; }
-         first = false;
-         module_code += param_types[i] + " Arg" + std::to_string(i);
-         if (activity_map[i])
-         {
-            module_code += ", " + param_types[i] + " dArg" + std::to_string(i);
-         }
-      }
-      module_code += ")\n";
-      module_code += "{\n";
-      if (return_is_void)
-      {
-         module_code += "   __enzyme_fwddiff<void>(\n";
-      }
-      else
-      {
-         module_code += "   return __enzyme_fwddiff<" +
-                        return_type + ">(\n";
-      }
-      module_code += "      (void*)" + std::string(qfunc_name) + "<>";
-      module_code += ",\n";
-      for (size_t i = 0; i < nparams; ++i)
-      {
-         if (activity_map[i])
-         {
-            module_code += "      enzyme_dup, Arg" + std::to_string(i) +
-                           ", dArg" + std::to_string(i);
-         }
-         else
-         {
-            module_code += "      enzyme_const, Arg" + std::to_string(i);
-         }
-         module_code += (i + 1 == nparams) ? ");\n" : ",\n";
-      }
-      module_code += "}\n";
-
-      WriteFileOrWarn(GeneratedOutputPath(fn), module_code);
-      return module_code;
-   }
-
-   proteus::CppJitModule &GetOrCreateModule(
-      const std::vector<std::string_view> &jit_values)
-   {
-      std::string key;
-      for (const auto &val : jit_values)
-      {
-         if (!key.empty()) { key += ","; }
-         key += val;
-      }
-
-      auto it = modules.find(key);
-      if (it != modules.end())
-      {
-         return *it->second;
-      }
-
-      std::vector<std::string> values(jit_values.begin(), jit_values.end());
-      std::string code = BuildModuleCode(values);
-      auto mod = std::make_unique<proteus::CppJitModule>("host", code,
-                                                         DefaultExtraArgs());
-      auto [inserted, ok] = modules.emplace(key, std::move(mod));
-      MFEM_VERIFY(ok, "failed to cache JIT module");
-      return *inserted->second;
-   }
-
-   static std::vector<std::string> DefaultExtraArgs()
-   {
-      return {"-fplugin=/Users/andrej1/local/enzyme/lib/ClangEnzyme-20.dylib"};
-   }
-
-   std::string qfunc_name = "qfunc_wrapper";
-   std::string fn;
-   size_t nparams = 0;
-   std::vector<bool> activity_map;
-   std::vector<std::string> param_types;
-   std::string return_type;
-   bool return_is_void = false;
-   std::string impl_type_name;
-   std::vector<std::string> jit_var_names;
-   std::unordered_map<std::string, std::unique_ptr<proteus::CppJitModule>> modules;
-};
-
-int main()
-{
-   const size_t N = 4;
-   const size_t M = 5;
-   const double A = 123.4;
-
-   std::vector<double> X(N);
-   std::vector<double> Y(N);
-   for (size_t i = 0; i < N; ++i)
-   {
-      X[i] = static_cast<double>(i + 1);
-      Y[i] = static_cast<double>(N - i);
-   }
-
-   // // >>> user interface calls
-   // const std::string kernel_path = std::string(util::thisFileDir) +
-   //                                 "/jitplayground.hpp";
-   // JitQFunction qf(daxpy_op{}, kernel_path, std::array{false, true, false});
-   // // <<< user interface calls
-
-   // // this will happen internally in dFEM
-
-   daxpy_op op;
-   printf("\n\nfunction call\n");
-   op(&A, X.data(), Y.data(), &N);
-
-   // reset X for the derivative test
-   for (size_t i = 0; i < N; ++i)
-   {
-      X[i] = static_cast<double>(i + 1);
-      Y[i] = static_cast<double>(N - i);
-   }
-
-   std::vector<double> dX(N, 1.0);
-   printf("\n\nforward diff call\n");
-   daxpy_op_fwddiff(&A, X.data(), dX.data(), Y.data(), &N);
-
-   std::vector<double> dX_manual(N, A);
-
-   printf("\n\nderivative checks\n");
-   std::cout << "dX: ";
-   for (size_t i = 0; i < N; ++i)
-   {
-      std::cout << dX[i] << (i + 1 == N ? '\n' : ' ');
-   }
-
-   std::cout << "dX_manual: ";
-   for (size_t i = 0; i < N; ++i)
-   {
-      std::cout << dX_manual[i] << (i + 1 == N ? '\n' : ' ');
-   }
-
-   double max_abs_err = 0.0;
-   for (size_t i = 0; i < N; ++i)
-   {
-      max_abs_err = std::max(max_abs_err, std::abs(dX[i] - dX_manual[i]));
-   }
-   std::cout << "max |dX - dX_manual| = " << max_abs_err << "\n";
-
-   return 0;
-}
@@ -1,58 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <vector>
-#include <type_traits>
-
-#include "proteus/JitInterface.h"
-
-struct daxpy_op
-{
-   void operator()(
-      const double *a,
-      double *x,
-      const double *y,
-      const size_t *N) const
-   {
-      const size_t n = *N;
-      auto lam = [=, n = proteus::jit_variable(n)]
-                 () __attribute__((annotate("jit")))
-      {
-         printf("N = %zu\n", n);
-         for (size_t i = 0; i < n; ++i)
-         {
-            printf("x[%zu] = %f, y[%zu] = %f\n", i, x[i], i, y[i]);
-            x[i] = *a * x[i] + y[i];
-            printf("updated x[%zu] = %f\n", i, x[i]);
-         }
-      };
-
-      proteus::register_lambda(lam);
-
-      lam();
-   }
-};
-
-template <typename return_type, typename... Args>
-return_type __enzyme_fwddiff(Args...);
-
-extern int enzyme_const;
-extern int enzyme_dup;
-
-void daxpy_op_wrapper(const double * Arg0, double * Arg1,
-                      const double * Arg2, const size_t *Arg3)
-{
-   daxpy_op qf;
-   qf(Arg0, Arg1, Arg2, Arg3);
-}
-
-void daxpy_op_fwddiff(const double * Arg0, double * Arg1,
-                      double * dArg1, const double * Arg2, const size_t *Arg3)
-{
-   __enzyme_fwddiff<void>(
-      (void*)daxpy_op_wrapper,
-      enzyme_const, Arg0,
-      enzyme_dup, Arg1, dArg1,
-      enzyme_const, Arg2,
-      enzyme_const, Arg3);
-}
@@ -157,8 +157,6 @@ ex37-test-seq: ex37
 	@$(call mfem-test,$<,, Serial example,-mi 3)
 ex37p-test-par: ex37p
 	@$(call mfem-test,$<, $(RUN_MPI), Parallel example,-mi 3)
-ex39-test-seq: ex39
-	@$(call mfem-test,$<,, Serial example,-m ../data/compass.mesh)
 ex41-test-seq: ex41
 	@$(call mfem-test,$<,, Serial example,-tf 1.0)
 ex41p-test-par: ex41p
@@ -121,11 +121,6 @@ set(SRCS
  qinterp/eval_hdiv.cpp
  qinterp/grad_by_nodes.cpp
  qinterp/grad_by_vdim.cpp
-  qinterp/grad_transpose.cpp
-  qinterp/grad_transpose_by_nodes.cpp
-  qinterp/grad_transpose_by_vdim.cpp
-  qinterp/eval_transpose.cpp
-  qinterp/eval_transpose_by_vdim.cpp
  qspace.cpp
  quadinterpolator.cpp
  quadinterpolator_face.cpp
@@ -138,7 +133,7 @@ set(SRCS
  tmop/assemble/diag2.cpp
  tmop/assemble/grad2_limit.cpp
  tmop/assemble/grad2.cpp
-  tmop/assemble/diag3_limit.cpp
+  tmop/assemble/diag3_limit.cpp  
  tmop/assemble/diag3.cpp
  tmop/assemble/grad3_limit.cpp
  tmop/assemble/grad3.cpp
@@ -283,10 +278,8 @@ set(HDRS
  qfunction.hpp
  qinterp/det.hpp
  qinterp/eval.hpp
-  qinterp/eval_transpose.hpp
  qinterp/eval_hdiv.hpp
  qinterp/grad.hpp
-  qinterp/grad_transpose.hpp
  qspace.hpp
  quadinterpolator.hpp
  quadinterpolator_face.hpp
@@ -320,36 +313,36 @@ set(HDRS
  )

 if (MFEM_USE_SIDRE)
-    list(APPEND SRCS sidredatacollection.cpp)
-    list(APPEND HDRS sidredatacollection.hpp)
+  list(APPEND SRCS sidredatacollection.cpp)
+  list(APPEND HDRS sidredatacollection.hpp)
 endif()

 if (MFEM_USE_CONDUIT)
-    list(APPEND SRCS conduitdatacollection.cpp)
-    list(APPEND HDRS conduitdatacollection.hpp)
+  list(APPEND SRCS conduitdatacollection.cpp)
+  list(APPEND HDRS conduitdatacollection.hpp)
 endif()

 if (MFEM_USE_ADIOS2)
-    list(APPEND SRCS adios2datacollection.cpp)
-    list(APPEND HDRS adios2datacollection.hpp)
+  list(APPEND SRCS adios2datacollection.cpp)
+  list(APPEND HDRS adios2datacollection.hpp)
 endif()

 if (MFEM_USE_FMS)
-    list(APPEND SRCS fmsdatacollection.cpp fmsconvert.cpp)
-    list(APPEND HDRS fmsdatacollection.hpp fmsconvert.hpp)
+  list(APPEND SRCS fmsdatacollection.cpp fmsconvert.cpp)
+  list(APPEND HDRS fmsdatacollection.hpp fmsconvert.hpp)
 endif()

 if (MFEM_USE_MPI)
-    list(APPEND SRCS
+  list(APPEND SRCS
    pbilinearform.cpp
    pfespace.cpp
    pgridfunc.cpp
    plinearform.cpp
    pnonlinearform.cpp
    prestriction.cpp)
-    # If this list (HDRS -> HEADERS) is used for install, we probably want the
-    # headers added all the time.
-    list(APPEND HDRS
+  # If this list (HDRS -> HEADERS) is used for install, we probably want the
+  # headers added all the time.
+  list(APPEND HDRS
    pbilinearform.hpp
    pfespace.hpp
    pgridfunc.hpp
@@ -729,8 +729,7 @@ void BilinearForm::Assemble(int skip_zeros)
         tr = mesh -> GetBdrFaceTransformations (i);
         if (tr != NULL)
         {
-            mfem::DofTransformation doftrans;
-            fes -> GetElementVDofs (tr -> Elem1No, vdofs, doftrans);
+            fes -> GetElementVDofs (tr -> Elem1No, vdofs);
            fe1 = fes -> GetFE (tr -> Elem1No);
            // The fe2 object is really a dummy and not used on the boundaries,
            // but we can't dereference a NULL pointer, and we don't want to
@@ -744,7 +743,6 @@ void BilinearForm::Assemble(int skip_zeros)

               boundary_face_integs[k] -> AssembleFaceMatrix (*fe1, *fe2, *tr,
                                                              elemmat);
-               doftrans.TransformDual(elemmat);
               mat -> AddSubMatrix (vdofs, vdofs, elemmat, skip_zeros);
            }
         }
@@ -1725,7 +1723,6 @@ void MixedBilinearForm::Assemble(int skip_zeros)
         }
      }

-      DofTransformation dom_dof_trans, ran_dof_trans;
      for (int i = 0; i < trial_fes -> GetNBE(); i++)
      {
         const int bdr_attr = mesh->GetBdrAttribute(i);
@@ -1734,8 +1731,8 @@ void MixedBilinearForm::Assemble(int skip_zeros)
         ftr = mesh -> GetBdrFaceTransformations (i);
         if (ftr != NULL)
         {
-            trial_fes->GetElementVDofs(ftr->Elem1No, trial_vdofs, dom_dof_trans);
-            test_fes->GetElementVDofs(ftr->Elem1No, test_vdofs, ran_dof_trans);
+            trial_fes->GetElementVDofs(ftr->Elem1No, trial_vdofs);
+            test_fes->GetElementVDofs(ftr->Elem1No, test_vdofs);
            trial_fe1 = trial_fes->GetFE(ftr->Elem1No);
            test_fe1 = test_fes->GetFE(ftr->Elem1No);
            // The test_fe2 object is really a dummy and not used on the
@@ -1751,7 +1748,6 @@ void MixedBilinearForm::Assemble(int skip_zeros)
               boundary_face_integs[k]->AssembleFaceMatrix(*trial_fe1, *test_fe1, *trial_fe2,
                                                           *test_fe2,
                                                           *ftr, elemmat);
-               TransformDual(ran_dof_trans, dom_dof_trans, elemmat);
               mat->AddSubMatrix(test_vdofs, trial_vdofs, elemmat, skip_zeros);
            }
         }
@@ -2178,22 +2178,18 @@ class DiffusionIntegrator: public BilinearFormIntegrator
 {
 public:

-   using DiffusionApplyKernelType = void(*)(const int, const bool,
-                                            const Array<real_t>&,
-                                            const Array<real_t>&, const Array<real_t>&,
-                                            const Array<real_t>&,
-                                            const Vector&, const Vector&,
-                                            Vector&, const int, const int);
+   using ApplyKernelType = void(*)(const int, const bool, const Array<real_t>&,
+                                   const Array<real_t>&, const Array<real_t>&,
+                                   const Array<real_t>&,
+                                   const Vector&, const Vector&,
+                                   Vector&, const int, const int);

-   using DiffusionDiagonalKernelType = void(*)(const int, const bool,
-                                               const Array<real_t>&,
-                                               const Array<real_t>&, const Vector&, Vector&,
-                                               const int, const int);
+   using DiagonalKernelType = void(*)(const int, const bool, const Array<real_t>&,
+                                      const Array<real_t>&, const Vector&, Vector&,
+                                      const int, const int);

-   MFEM_REGISTER_KERNELS(DiffusionApplyPAKernel, DiffusionApplyKernelType,
-                         (int, int, int));
-   MFEM_REGISTER_KERNELS(DiffusionDiagonalPAKernel, DiffusionDiagonalKernelType,
-                         (int, int, int));
+   MFEM_REGISTER_KERNELS(ApplyPAKernels, ApplyKernelType, (int, int, int));
+   MFEM_REGISTER_KERNELS(DiagonalPAKernels, DiagonalKernelType, (int, int, int));
   struct Kernels { Kernels(); };

 protected:
@@ -2213,7 +2209,6 @@ private:
   const FiniteElementSpace *fespace;
   const DofToQuad *maps;         ///< Not owned
   const GeometricFactors *geom;  ///< Not owned
-public:
   int dim, ne, dofs1D, quad1D;
   Vector pa_data;
   bool symmetric = true; ///< False if using a nonsymmetric matrix coefficient
@@ -2355,8 +2350,8 @@ public:
   template <int DIM, int D1D, int Q1D>
   static void AddSpecialization()
   {
-      DiffusionApplyPAKernel::Specialization<DIM,D1D,Q1D>::Add();
-      DiffusionDiagonalPAKernel::Specialization<DIM,D1D,Q1D>::Add();
+      ApplyPAKernels::Specialization<DIM,D1D,Q1D>::Add();
+      DiagonalPAKernels::Specialization<DIM,D1D,Q1D>::Add();
   }
 protected:
   const IntegrationRule* GetDefaultIntegrationRule(
@@ -2715,7 +2710,7 @@ public:


 /** Integrator for $(-Q u, \nabla v)$ for Nedelec ($u$) and $H^1$ ($v$) elements.
-    This is equivalent to a weak divergence of the $H(curl)$ basis functions. */
+    This is equivalent to a weak divergence of the $H(curl$ basis functions. */
 class VectorFEWeakDivergenceIntegrator: public BilinearFormIntegrator
 {
 protected:
@@ -39,8 +39,8 @@ void PLBound::Setup(const int nb_i, const int ncp_i,
   b_type = b_type_i;
   cp_type = cp_type_i;
   tol = tol_i;
-   lbound.SetSize(ncp, nb);
-   ubound.SetSize(ncp, nb);
+   lbound.SetSize(nb, ncp);
+   ubound.SetSize(nb, ncp);
   nodes.SetSize(nb);
   weights.SetSize(nb);
   control_points.SetSize(ncp);
@@ -125,25 +125,21 @@ void PLBound::Setup(const int nb_i, const int ncp_i,
      {
         if (j == 0)
         {
-            lbound(j,i) = bv(i);
-            ubound(j,i) = bv(i);
+            lbound(i, j) = bv(i);
+            ubound(i, j) = bv(i);
         }
         else if (j == ncp-1)
         {
-            lbound(j,i) = bv(i);
-            ubound(j,i) = bv(i);
+            lbound(i, j) = bv(i);
+            ubound(i, j) = bv(i);
         }
         else
         {
            vals(0)  = bv(i);
            vals(1) =  bmv(i) +  dm*bdmv(i);
            vals(2) =  bpv(i) +  dp*bdpv(i);
-            lbound(j,i) = vals.Min()-tol; // tolerance for good measure
-            ubound(j,i) = vals.Max()+tol; // tolerance for good measure
-            if (b_type == 2)
-            {
-               lbound(j,i) = std::max(lbound(j,i),0_r);
-            }
+            lbound(i, j) = vals.Min()-tol; // tolerance for good measure
+            ubound(i, j) = vals.Max()+tol; // tolerance for good measure
         }
      }
   }
@@ -277,7 +273,8 @@ void PLBound::Get1DBounds(const Vector &coeff, Vector &intmin,
   intmax.SetSize(ncp);
   intmin = 0.0;
   intmax = 0.0;
-   Vector coeffm;
+   Vector coeffm(nb);
+   coeffm = 0.0;

   real_t a0 = 0.0;
   real_t a1 = 0.0;
@@ -305,8 +302,6 @@ void PLBound::Get1DBounds(const Vector &coeff, Vector &intmin,
   // compute L2 projection for linear bases: a0 + a1*x
   if (proj)
   {
-      coeffm.SetSize(nb);
-      coeffm = 0.0;
      for (int i = 0; i < nb; i++)
      {
         x = 2.0*nodes_int(i)-1;
@@ -347,8 +342,8 @@ void PLBound::Get1DBounds(const Vector &coeff, Vector &intmin,
      real_t c = coeffm(i);
      for (int j = 0; j < ncp; j++)
      {
-         intmin(j) += min(lbound(j,i)*c, ubound(j,i)*c);
-         intmax(j) += max(lbound(j,i)*c, ubound(j,i)*c);
+         intmin(j) += min(lbound(i,j)*c, ubound(i,j)*c);
+         intmax(j) += max(lbound(i,j)*c, ubound(i,j)*c);
      }
   }
 }
@@ -479,10 +474,10 @@ void PLBound::Get2DBounds(const Vector &coeff, Vector &intmin,
         real_t w1 = intmaxT(id2++);
         for (int k = 0; k < ncp; k++) // kth row
         {
-            vals(0) = w0*lbound(k,j);
-            vals(1) = w0*ubound(k,j);
-            vals(2) = w1*lbound(k,j);
-            vals(3) = w1*ubound(k,j);
+            vals(0) = w0*lbound(j,k);
+            vals(1) = w0*ubound(j,k);
+            vals(2) = w1*lbound(j,k);
+            vals(3) = w1*ubound(j,k);
            intmin(k*ncp+i) += vals.Min();
            intmax(k*ncp+i) += vals.Max();
         }
@@ -558,17 +553,17 @@ void PLBound::Get3DBounds(const Vector &coeff, Vector &intmin,
            for (int i = 0; i < nb; i++)
            {
               x = 2.0*nodes(i)-1; // x-coordinate
-               minNodalVals(i) -= a0V(j) + a1V(j)*x;
-               maxNodalVals(i) -= a0V(j) + a1V(j)*x;
+               minBounds(i) -= a0V(j) + a1V(j)*x;
+               maxBounds(i) -= a0V(j) + a1V(j)*x;
            }
            // Compute Bernstein coefficients
            LUFactors lu(basisMatLU.GetData(), lu_ip.GetData());
-            lu.Solve(nb, 1, minNodalVals.GetData());
-            lu.Solve(nb, 1, maxNodalVals.GetData());
+            lu.Solve(nb, 1, minBounds.GetData());
+            lu.Solve(nb, 1, maxBounds.GetData());
            for (int i = 0; i < nb; i++)
            {
-               intminT(i*ncp2+j) = minNodalVals(i);
-               intmaxT(i*ncp2+j) = maxNodalVals(i);
+               intminT(i*ncp2+j) = minBounds(i);
+               intmaxT(i*ncp2+j) = maxBounds(i);
            }
         }
      }
@@ -622,10 +617,10 @@ void PLBound::Get3DBounds(const Vector &coeff, Vector &intmin,
         real_t w1 = intmaxT(id2++);
         for (int k = 0; k < ncp; k++) // kth slice
         {
-            vals(0) = w0*lbound(k,j);
-            vals(1) = w0*ubound(k,j);
-            vals(2) = w1*lbound(k,j);
-            vals(3) = w1*ubound(k,j);
+            vals(0) = w0*lbound(j,k);
+            vals(1) = w0*ubound(j,k);
+            vals(2) = w1*lbound(j,k);
+            vals(3) = w1*ubound(j,k);
            intmin(k*ncp2+i) += vals.Min();
            intmax(k*ncp2+i) += vals.Max();
         }
@@ -658,8 +653,7 @@ void PLBound::SetupBernsteinBasisMat(DenseMatrix &basisMat,
                                     Vector &nodesBern) const
 {
   const int nbern = nodesBern.Size();
-   L2_SegmentElement el(nbern-1, 2);
-   // we use L2 to leverage lexicographic order
+   L2_SegmentElement el(nbern-1, 2); // we use L2 to leverage lexicographic order
   Array<int> ordering = el.GetLexicographicOrdering();
   basisMat.SetSize(nbern, nbern);
   Vector shape(nbern);
@@ -672,39 +666,6 @@ void PLBound::SetupBernsteinBasisMat(DenseMatrix &basisMat,
   }
 }

-DenseMatrix PLBound::GetBoundingMatrix(int dim, bool is_lower) const
-{
-   if (dim > 1)
-   {
-      const int ncpd = static_cast<int>(std::pow(ncp, dim));
-      const int nbd = static_cast<int>(std::pow(nb, dim));
-      DenseMatrix boundND(ncpd, nbd);
-      Vector phimin, phimax, col;
-      Vector coeffs(nbd);
-      coeffs = 0.0;
-      for (int j = 0; j < nbd; j++)
-      {
-         coeffs(j) = 1.0;
-         boundND.GetColumnReference(j, col);
-         GetNDBounds(dim, coeffs, phimin, phimax);
-         col = is_lower ? phimin : phimax;
-         coeffs(j) = 0.0;
-      }
-      return boundND;
-   }
-   return is_lower ? lbound : ubound;
-}
-
-DenseMatrix PLBound::GetLowerBoundMatrix(int dim) const
-{
-   return GetBoundingMatrix(dim, true);
-}
-
-DenseMatrix PLBound::GetUpperBoundMatrix(int dim) const
-{
-   return GetBoundingMatrix(dim, false);
-}
-
 constexpr int PLBound::min_ncp_gl_x[2][11];
 constexpr int PLBound::min_ncp_gll_x[2][11];
 constexpr int PLBound::min_ncp_pos_x[2][11];
@@ -755,4 +716,4 @@ void PLBound::Print(std::ostream &outp) const
   ubound.Print(outp);
 }

-}
+}
@@ -19,18 +19,14 @@ namespace mfem
 {

 /** @name Piecewise linear bounds of bases
-    \brief Piecewise linear bounds of bases can be used to compute bounds on
-    the grid function in each element. The bounds for the bases are constructed
-    based on the following parameters:
+    \brief Piecewise linear bounds of bases can be used to compute bounds on the grid function in each element. The bounds for the bases are constructed based on the following parameters:

    (i) @b nb: number of bases/nodes in 1D (i.e. polynomial order+1),

-    (ii) @b b_type: bases type, 0 - Lagrange interpolants on Gauss-Legendre
-    nodes, 1 - Lagrange interpolants on Gauss-Lobatto-Legendre nodes, and
+    (ii) @b b_type: bases type, 0 - Lagrange interpolants on Gauss-Legendre nodes, 1 - Lagrange interpolants on Gauss-Lobatto-Legendre nodes, and
    2 - Positive/Bernstein bases on uniformly distributed nodes,

-    (iii) @b ncp: number of control points used to construct the piecewise
-    linear bounds
+    (iii) @b ncp: number of control points used to construct the piecewise linear bounds

    (iv) @b cp_type: control point distribution. 0 - GL + end-points,
                    1 - Chebyshev.
@@ -39,9 +35,7 @@ namespace mfem

    If the user does not specify @b ncp and @b cp_type, the minimum value of
    @b ncp is used that would bound the bases for the @b cp_type. We default
-    to @b cp_type = 0 as it requires fewer number of points to bound the bases.
-    Typically, @b ncp = 2 @b nb is sufficient to get fairly compact bounds, and
-    increasing @b ncp results in tighter bounds.
+    to @b cp_type = 0 as it requires fewer number of points to bound the bases. Typically, @b ncp = 2 @b nb is sufficient to get fairly compact bounds, and increasing @b ncp results in tighter bounds.

    Finally, only tensor-product elements are currently supported.

@@ -60,7 +54,7 @@ private:
   bool proj = true; // Use linear projection to compute bounds.
   real_t tol = 0.0; // offset bounds to avoid round-off errors
   Vector nodes, weights, control_points;
-   DenseMatrix lbound, ubound; // ncp x nb matrices with bounds of all bases
+   DenseMatrix lbound, ubound; // nb x ncp matrices with bounds of all bases
   // Some auxillary storage for computing the bounds with Bernstein
   DenseMatrix basisMatNodes; // Bernstein bases at equispaced nodes
   DenseMatrix basisMatInt;   // Bernstein bases at GLL nodes
@@ -86,9 +80,6 @@ private:
      {3,5,8,9,11,12,13,13,14,15,16}
   };

-   /// Helper function to extract lower or upper bounding matrix
-   DenseMatrix GetBoundingMatrix(int dim, bool is_lower) const;
-
 public:
   // Constructor
   PLBound(const int nb_i, const int ncp_i, const int b_type_i,
@@ -101,82 +92,40 @@ public:
   PLBound(const FiniteElementSpace *fes,
           const int ncp_i = -1, const int cp_type_i = 0);

-   /// Get minimum number of control points needed to bound the given bases
+   // Get minimum number of control points needed to bound the given bases
   int GetMinimumPointsForGivenBases(int nb_i, int b_type_i,
                                     int cp_type_i) const;

-   /// Print information about the bounds
+   // Print information about the bounds
   void Print(std::ostream &outp = mfem::out) const;

-   /** @brief Enable (default) or disable linear projection before bounding.
-    *
-    *  @details This projection increases the computational cost but results in
-    *  tighter bounds.
-    */
+   // Enable (default) or disable linear projection before bounding.
+   // This projection increases the computational cost but results in tighter
+   // bounds.
   void SetProjectionFlagForBounding(bool proj_) { proj = proj_; }

-   /** @brief Compute piecewise linear bounds for the lexicographically-ordered
-    *  nodal coefficients in @a coeff in 1D/2D/3D.
-    *
-    *  @param[in] rdim    The spatial dimension of the element (1, 2, or 3).
-    *  @param[in] coeff   The vector of lexicographically-ordered coefficients.
-    *                     Should be of size nb^rdim, where nb is the number of
-    *                     bases/nodes in 1D. These coefficients must correspond
-    *                     to the bases type and number of bases, used in the
-    *                     constructor of PLBound.
-    *
-    *  @param[out] intmin The vector of minimum bound for all control points.
-    *  @param[out] intmax The vector of maximum bound for all control points.
-    *                     Both intmin and intmax are of size ncp^rdim, where
-    *                     ncp is the number of control points in 1D, and are
-    *                     ordered lexicographically.
-    */
+   /// Compute piecewise linear bounds for the lexicographically-ordered
+   /// coefficients in @a coeff in 1D/2D/3D.
   void GetNDBounds(const int rdim, const Vector &coeff,
                    Vector &intmin, Vector &intmax) const;

   /// Get number of control points used to compute the bounds.
   int GetNControlPoints() const { return ncp; }
-
-   /// Get 1D control point locations (lexicographic order) in [0,1].
-   const Vector &GetControlPoints() const { return control_points; }
-
-   /** @brief Get lower and upper bounding matrix (ncp^dim x nb^dim)
-    *
-    *  @details The matrices can be used to compute the bounds at control points
-    *           by a simple matrix-vector product with the
-    *           lexicographically-ordered nodal coefficients.
-    *           The resulting output is also lexicographically-ordered.
-    *
-    *  @note These matrices do not account for the linear projection step that
-    *        is optionally done in GetNDBounds before bounding the function.
-    */
-   ///@{
-   DenseMatrix GetLowerBoundMatrix(int dim = 1) const;
-   DenseMatrix GetUpperBoundMatrix(int dim = 1) const;
-   ///@}
-
 private:
-   /** @brief Compute piecewise linear bounds for the lexicographically-ordered
-    *  nodal coefficients in @a coeff in 1D.
-    *  See GetNDBounds for details of the input and output parameters.
-    */
+   /// Compute piecewise linear bounds for the lexicographically-ordered
+   /// coefficients in @a coeff in 1D.
   void Get1DBounds(const Vector &coeff, Vector &intmin, Vector &intmax) const;

-   /** @brief Compute piecewise linear bounds for the lexicographically-ordered
-    *  nodal coefficients in @a coeff in 2D.
-    *  See GetNDBounds for details of the input and output parameters.
-    */
+   /// Compute piecewise linear bounds for the lexicographically-ordered
+   /// coefficients in @a coeff in 2D.
   void Get2DBounds(const Vector &coeff, Vector &intmin, Vector &intmax) const;

-   /** @brief Compute piecewise linear bounds for the lexicographically-ordered
-    *  nodal coefficients in @a coeff in 3D.
-    *  See GetNDBounds for details of the input and output parameters.
-    */
+   /// Compute piecewise linear bounds for the lexicographically-ordered
+   /// coefficients in @a coeff in 3D.
   void Get3DBounds(const Vector &coeff, Vector &intmin, Vector &intmax) const;

-   /** @brief Setup matrix used to compute values at given 1D locations in [0,1]
-    *  for Bernstein bases.
-    */
+   /// Setup matrix used to compute values at given 1D locations in [0,1]
+   /// for Bernstein bases.
   void SetupBernsteinBasisMat(DenseMatrix &basisMat, Vector &nodesBern) const;

   void Setup(const int nb_i, const int ncp_i, const int b_type_i,
@@ -52,9 +52,6 @@ public:
   /// Get the time for time dependent coefficients
   real_t GetTime() { return time; }

-   /// Returns dimension of the vector.
-   int GetVDim() { return 1; }
-
   /** @brief Evaluate the coefficient in the element described by @a T at the
       point @a ip. */
   /** @note When this method is called, the caller must make sure that the
@@ -82,25 +82,6 @@ public:
   /// underlying #fes
   int VectorDim() const;

-   /// Copy assignment. Only the data of the base class Vector is copied.
-   /** It is assumed that this object and @a rhs use FiniteElementSpace%s that
-       have the same size.
-
-       @note Defining this method overwrites the implicitly defined copy
-       assignment operator. */
-   ComplexGridFunction &operator=(const ComplexGridFunction &rhs)
-   { return operator=((const Vector &)rhs); }
-
-   /// Copy the data from @a v.
-   /** The size of @a v must be equal to double of the size of the associated
-       FiniteElementSpace #fes. */
-   ComplexGridFunction &operator=(const Vector &v)
-   {
-      MFEM_ASSERT(fes && v.Size() == 2*fes->GetVSize(), "");
-      Vector::operator=(v);
-      return *this;
-   }
-
   /// Assign constant values to the ComplexGridFunction data.
   ComplexGridFunction &operator=(const std::complex<real_t> & value)
   { *gfr = value.real(); *gfi = value.imag(); return *this; }
@@ -492,8 +492,6 @@ void VisItDataCollection::SaveRootFile()
                           to_padded_string(cycle, pad_digits_cycle) +
                           ".mfem_root";
   std::ofstream root_file(root_name);
-   MFEM_VERIFY(root_file.is_open(),
-               "Failed to open ofstream " << root_name);
   root_file << GetVisItRootString();
   if (!root_file)
   {
@@ -979,10 +977,7 @@ void ParaViewDataCollection::Save()
   // Save the local part of the mesh and grid functions fields to the local
   // VTU file. Also save coefficient fields.
   {
-      std::string os_str = vtu_prefix + GenerateVTUFileName("proc", myid);
-      std::ofstream os(os_str);
-      MFEM_VERIFY(os.is_open(),
-                  "Failed to open ofstream " << os_str);
+      std::ofstream os(vtu_prefix + GenerateVTUFileName("proc", myid));
      os.precision(precision);
      SaveDataVTU(os, levels_of_detail);
   }
@@ -994,10 +989,7 @@ void ParaViewDataCollection::Save()
                  "QuadratureFunction output is not supported for "
                  "ParaViewDataCollection on domain boundary!");
      const std::string &field_name = qfield.first;
-      std::string os_str = vtu_prefix + GenerateVTUFileName(field_name, myid);
-      std::ofstream os(os_str);
-      MFEM_VERIFY(os.is_open(),
-                  "Failed to open ofstream " << os_str);
+      std::ofstream os(vtu_prefix + GenerateVTUFileName(field_name, myid));
      qfield.second->SaveVTU(os, pv_data_format, GetCompressionLevel(), field_name);
   }

@@ -1008,10 +1000,7 @@ void ParaViewDataCollection::Save()
   {
      // Create the main PVTU file
      {
-         std::string os_str = vtu_prefix + GeneratePVTUFileName("data");
-         std::ofstream pvtu_out(os_str);
-         MFEM_VERIFY(pvtu_out.is_open(),
-                     "Failed to open ofstream " << os_str);
+         std::ofstream pvtu_out(vtu_prefix + GeneratePVTUFileName("data"));
         WritePVTUHeader(pvtu_out);

         // Grid function fields and coefficient fields
@@ -1066,10 +1055,8 @@ void ParaViewDataCollection::Save()
         const std::string &q_field_name = q_field.first;
         std::string q_fname = GeneratePVTUPath() + "/"
                               + GeneratePVTUFileName(q_field_name);
-         std::string os_str = col_path + "/" + q_fname;
-         std::ofstream pvtu_out(os_str);
-         MFEM_VERIFY(pvtu_out.is_open(),
-                     "Failed to open ofstream " << os_str);
+
+         std::ofstream pvtu_out(col_path + "/" + q_fname);
         WritePVTUHeader(pvtu_out);
         int vec_dim = q_field.second->GetVDim();
         pvtu_out << "<PPointData>\n";
@@ -1,587 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-#pragma once
-
-#include <cassert>
-#include <cstddef>
-
-// #include "fem/kernels.hpp"
-#include "fem/kernels3d.hpp"
-namespace ker = mfem::kernels::internal;
-namespace low = mfem::kernels::internal::low;
-#include "fem/kernel_dispatch.hpp"
-
-// #include "linalg/kernels.hpp"
-
-#include "util.hpp"
-
-#undef NVTX_COLOR
-#define NVTX_COLOR ::nvtx::kOrchid
-
-namespace mfem::future
-{
-
-/** @brief Zero-copy view of a contiguous block as a `tensor<T, n1>` */
-template<typename T, int n1>
-MFEM_HOST_DEVICE
-const tensor<T, n1>& as_tensor(const T* ptr)
-{
-   // std::launder makes this defined behavior under strict aliasing rules
-   return *std::launder(reinterpret_cast<const tensor<T, n1>*>(ptr));
-}
-
-// convenience overload if you prefer a mutable view
-template<typename T, int n1>
-MFEM_HOST_DEVICE
-tensor<T, n1>& as_tensor(T* ptr)
-{
-   return *std::launder(reinterpret_cast<tensor<T, n1>*>(ptr));
-}
-
-/** @brief Zero-copy view of a contiguous block as a `tensor<T, n1, n2>` */
-template<typename T, int n1, int n2>
-MFEM_HOST_DEVICE
-const tensor<T, n1, n2>& as_tensor(const T* ptr)
-{
-   // std::launder makes this defined behavior under strict aliasing rules
-   return *std::launder(reinterpret_cast<const tensor<T, n1, n2>*>(ptr));
-}
-
-// convenience overload if you prefer a mutable view
-template<typename T, int n1, int n2>
-MFEM_HOST_DEVICE
-tensor<T, n1, n2>& as_tensor(T* ptr)
-{
-   return *std::launder(reinterpret_cast<tensor<T, n1, n2>*>(ptr));
-}
-
-/** @brief Zero-copy view of a contiguous block as a `tensor<T, n1, n2, n3>` */
-template<typename T, int n1, int n2, int n3>
-MFEM_HOST_DEVICE
-const tensor<T, n1, n2, n3>& as_tensor(const T* ptr)
-{
-   // std::launder makes this defined behavior under strict aliasing rules
-   return *std::launder(reinterpret_cast<const tensor<T, n1, n2, n3>*>(ptr));
-}
-
-// convenience overload if you prefer a mutable view
-template<typename T, int n1, int n2, int n3>
-MFEM_HOST_DEVICE
-tensor<T, n1, n2, n3>& as_tensor(T* ptr)
-{
-   return *std::launder(reinterpret_cast<tensor<T, n1, n2, n3>*>(ptr));
-}
-
-/** @brief Zero-copy view of a contiguous block as a `tensor<T, n1, n2, n3, n4>` */
-template<typename T, int n1, int n2, int n3, int n4>
-MFEM_HOST_DEVICE
-const tensor<T, n1, n2, n3, n4>& as_tensor(const T* ptr)
-{
-   // std::launder makes this defined behavior under strict aliasing rules
-   return *std::launder(reinterpret_cast<const tensor<T, n1, n2, n3, n4>*>(ptr));
-}
-
-// convenience overload if you prefer a mutable view
-template<typename T, int n1, int n2, int n3, int n4>
-MFEM_HOST_DEVICE
-tensor<T, n1, n2, n3, n4>& as_tensor(T* ptr)
-{
-   return *std::launder(reinterpret_cast<tensor<T, n1, n2, n3, n4>*>(ptr));
-}
-
-
-template <std::size_t N>
-MFEM_HOST_DEVICE inline
-std::array<real_t*, N>
-load_field_e_ptr(const std::array<DeviceTensor<2>, N> &fields_e,
-                 const int e)
-{
-   std::array<real_t*, N> f;
-   for_constexpr<N>([&](auto i) { f[i] = &fields_e[i](0, e); });
-   return f;
-}
-
-namespace qf
-{
-
-template <int T_Q1D,
-          size_t num_args,
-          typename reg_t,
-          typename qfunc_t,
-          typename args_ts>
-MFEM_HOST_DEVICE inline
-void apply_kernel(reg_t &res /*output*/,
-                  reg_t &reg,
-                  const real_t *rd,
-                  const int qx, const int qy, const int qz,
-                  const qfunc_t &qfunc, args_ts &args)
-{
-   if constexpr (num_args == 2) // PAApply
-   {
-      // ∇u
-      tensor<real_t, 3> &arg_0 = get<0>(args);
-      arg_0[0] = reg[qz][qy][qx][0];
-      arg_0[1] = reg[qz][qy][qx][1];
-      arg_0[2] = reg[qz][qy][qx][2];
-
-      // D (PA data)
-      tensor<real_t, 3, 3> &arg_1 = get<1>(args);
-
-      if constexpr (T_Q1D > 0)
-      {
-         const auto *D = (const real_t (*)[T_Q1D][T_Q1D][3][3]) rd;
-         for (int k = 0; k < 3; k++)
-         {
-            for (int j = 0; j < 3; j++)
-            {
-               arg_1[k][j] = D[qx][qy][qz][k][j];
-            }
-         }
-      }
-      else
-      {
-         static_assert(false);
-         // const auto D = Reshape(r2, 3, 3, Q1D, Q1D, Q1D);
-         // for (int j = 0; j < 3; j++)
-         // {
-         //    for (int k = 0; k < 3; k++)
-         //    {
-         //       arg_1[k][j] = D(j, k, qz, qy, qx);
-         //    }
-         // }
-      }
-   }
-   else
-   {
-      // MFApply comes here
-      assert(false);
-      // MFEM_ABORT("Only two arguments (∇u and D) are supported in apply_kernel for now");
-   }
-
-   const auto r = get<0>(apply(qfunc, args));
-
-   if constexpr (decltype(r)::ndim == 1)
-   {
-      // process_qf_result_from_reg(r0, qx, qy, qz, r);
-      as_tensor<real_t, 3>(&res[qz][qy][qx][0]) = r;
-   }
-   else
-   {
-      static_assert(false);
-   }
-}
-
-} // namespace qf
-
-#define MFEM_D2Q_MAX_SIZE 4
-static MFEM_CONSTANT real_t Bi[MFEM_D2Q_MAX_SIZE][8*8], Bo[8*8];
-static MFEM_CONSTANT real_t Gi[MFEM_D2Q_MAX_SIZE][8*8], Go[8*8];
-
-template<size_t num_fields,
-         size_t num_inputs,
-         size_t num_outputs,
-         typename restriction_cb_t,
-         typename qfunc_t,
-         typename input_t,
-         typename output_fop_t>
-class NewActionCallback
-{
-   restriction_cb_t &restriction_cb;
-   qfunc_t &qfunc;
-   input_t &inputs;
-   const std::array<size_t, num_inputs> &input_to_field;
-   const std::array<DofToQuadMap, num_inputs> &input_dtq_maps;
-   const std::array<DofToQuadMap, num_outputs> &output_dtq_maps;
-   const int num_entities;
-   const int test_vdim;
-   const int num_test_dof;
-   const int dimension;
-   const ThreadBlocks &thread_blocks;
-   SharedMemoryInfo<num_fields, num_inputs, num_outputs> &shmem_info;
-   const Array<int> &attributes;
-   const output_fop_t &output_fop;
-   const Array<int> *elem_attributes;
-   // refs
-   std::vector<Vector> &fields_e;
-   Vector &residual_e;
-   std::function<void(Vector &, Vector &)> &output_restriction_transpose;
-   // args
-   std::vector<Vector> &solutions_l;
-   const std::vector<Vector> &parameters_l;
-   Vector &residual_l;
-
-public:
-   NewActionCallback() = delete;
-
-   NewActionCallback(const bool use_kernels_specialization,
-                     restriction_cb_t &restriction_cb,
-                     qfunc_t &qfunc,
-                     input_t &inputs,
-                     const std::array<size_t, num_inputs> &input_to_field,
-                     const std::array<DofToQuadMap, num_inputs> &input_dtq_maps,
-                     const std::array<DofToQuadMap, num_outputs> &output_dtq_maps,
-                     const int num_entities,
-                     const int test_vdim,
-                     const int num_test_dof,
-                     const int dimension,
-                     const ThreadBlocks &thread_blocks,
-                     SharedMemoryInfo<num_fields, num_inputs, num_outputs> &shmem_info,
-                     const Array<int> &attributes,
-                     const output_fop_t &output_fop,
-                     const Array<int> *elem_attributes,
-                     // refs
-                     std::vector<Vector> &fields_e,
-                     Vector &residual_e,
-                     std::function<void(Vector &, Vector &)> &output_restriction_transpose,
-                     // args
-                     std::vector<Vector> &solutions_l,
-                     const std::vector<Vector> &parameters_l,
-                     Vector &residual_l):
-      restriction_cb(restriction_cb),
-      qfunc(qfunc),
-      inputs(inputs),
-      input_to_field(input_to_field),
-      input_dtq_maps(input_dtq_maps),
-      output_dtq_maps(output_dtq_maps),
-      num_entities(num_entities),
-      test_vdim(test_vdim),
-      num_test_dof(num_test_dof),
-      dimension(dimension),
-      thread_blocks(thread_blocks),
-      shmem_info(shmem_info),
-      attributes(attributes),
-      output_fop(output_fop),
-      elem_attributes(elem_attributes),
-      fields_e(fields_e),
-      residual_e(residual_e),
-      output_restriction_transpose(output_restriction_transpose),
-      solutions_l(solutions_l),
-      parameters_l(parameters_l),
-      residual_l(residual_l)
-   {
-      if (!use_kernels_specialization) { return; }
-      NewActionCallbackKernels::template Specialization<3>::Add(); // 1
-      NewActionCallbackKernels::template Specialization<4>::Add(); // 2
-      NewActionCallbackKernels::template Specialization<5>::Add(); // 3
-      NewActionCallbackKernels::template Specialization<6>::Add(); // 4
-      NewActionCallbackKernels::template Specialization<7>::Add(); // 5
-      NewActionCallbackKernels::template Specialization<8>::Add(); // 6
-   }
-
-   template<int T_Q1D = 0>
-   static void action_callback_new(const int d1d,
-                                   restriction_cb_t &restriction_cb,
-                                   qfunc_t &qfunc,
-                                   [[maybe_unused]] input_t &inputs,
-                                   [[maybe_unused]] const std::array<size_t, num_inputs> &input_to_field,
-                                   const std::array<DofToQuadMap, num_inputs> &input_dtq_maps,
-                                   const std::array<DofToQuadMap, num_outputs> &output_dtq_maps,
-                                   [[maybe_unused]] const int dimension,
-                                   const int num_entities,
-                                   [[maybe_unused]] const int test_vdim,
-                                   [[maybe_unused]] const int num_test_dof,
-                                   const ThreadBlocks &thread_blocks,
-                                   [[maybe_unused]] SharedMemoryInfo<num_fields, num_inputs, num_outputs>
-                                   &shmem_info,
-                                   [[maybe_unused]] const Array<int> &attributes,
-                                   [[maybe_unused]] const output_fop_t &output_fop,
-                                   [[maybe_unused]] const Array<int> *elem_attributes,
-                                   // refs
-                                   std::vector<Vector> &fields_e,
-                                   Vector &residual_e,
-                                   std::function<void(Vector &, Vector &)> &output_restriction_transpose,
-                                   // args
-                                   std::vector<Vector> &solutions_l,
-                                   const std::vector<Vector> &parameters_l,
-                                   Vector &residual_l,
-                                   // fallback arguments
-                                   const int q1d)
-   {
-      NVTX_MARK_FUNCTION;
-      assert(dimension == 3);
-      static_assert(MFEM_D2Q_MAX_SIZE >= num_inputs, "MFEM_D2Q_MAX_SIZE error");
-
-      constexpr int DIM = 3;
-
-      [[maybe_unused]] static bool ini = (for_constexpr<num_inputs>([&](auto i)
-      {
-         const auto dtq = input_dtq_maps[i];
-         {
-            const auto [q, _, p] = dtq.B.GetShape();
-            const auto B = (const real_t*)input_dtq_maps[i].B;
-            dbg("Loading Bi[{}]: q={} p={}", i.value, q, p);
-            if (B) { Gpu(MemcpyToSymbol)(Bi[i], B, (p*q)*sizeof(real_t)); }
-         }
-         {
-            const auto [q, _, p] = dtq.G.GetShape();
-            const auto G = (const real_t*)input_dtq_maps[i].G;
-            if (G) { Gpu(MemcpyToSymbol)(Gi[i], G, (p*q)*sizeof(real_t)); }
-         }
-         if constexpr (i == 0) // output B
-         {
-            const auto dtq_o = output_dtq_maps[0];
-            const auto [q, _, p] = dtq_o.B.GetShape();
-            const auto B = (const real_t*)dtq_o.B;
-            if (B) { Gpu(MemcpyToSymbol)(Bo, B, (p*q)*sizeof(real_t)); }
-         }
-         if constexpr (i == 0) // output G
-         {
-            const auto dtq_o = output_dtq_maps[0];
-            const auto [q, _, p] = dtq_o.G.GetShape();
-            const auto G = (const real_t*)dtq_o.G;
-            if (G) { Gpu(MemcpyToSymbol)(Go, G, (p*q)*sizeof(real_t)); }
-            dbg("Loaded B and G to constant memory");
-         }
-      }), true);
-
-      // types
-      using qf_signature =
-         typename create_function_signature<decltype(&qfunc_t::operator())>::type;
-      using qf_param_ts = typename qf_signature::parameter_ts;
-
-      restriction_cb(solutions_l, parameters_l, fields_e);
-
-      NVTX_INI("res=0");
-      residual_e = 0.0;
-      NVTX_END("res=0");
-
-      // auto wrapped_fields_e =
-      // wrap_fields(fields_e, shmem_info.field_sizes, num_entities);
-
-      const bool has_attr = attributes.Size() > 0;
-      const auto d_attr = attributes.Read();
-      const auto d_elem_attr = elem_attributes->Read();
-
-      // const int vdim = input.vdim;
-      // const auto fields_e_ptr = load_field_e_ptr(wrapped_fields_e, e);
-      // const real_t *field_e_r = fields_e_ptr[input_to_field[i]];
-      // const auto fields_e_ptr = load_field_e_ptr(wrapped_fields_e, e);
-      const int NE = num_entities;
-      constexpr int VDIM = 1;
-
-      const auto XE = Reshape(fields_e[0].Read(), d1d, d1d, d1d, VDIM, NE);
-      const real_t *dx_ptr = fields_e[1].Read();
-
-      auto YE = Reshape(residual_e.ReadWrite(), d1d, d1d, d1d, VDIM, NE);
-
-      const auto B = (const real_t*)input_dtq_maps[0/*i*/].B;
-      const auto G = (const real_t*)input_dtq_maps[0/*i*/].G;
-
-      NVTX_INI("forall");
-      dfem::forall<T_Q1D*T_Q1D*T_Q1D>([=] MFEM_HOST_DEVICE (int e, void *)
-      {
-         if (has_attr && !d_attr[d_elem_attr[e] - 1]) { return; }
-
-         constexpr int MQ1 = T_Q1D > 0 ? T_Q1D : 8;
-
-         MFEM_SHARED real_t sm0[MQ1][MQ1][MQ1][3];
-         MFEM_SHARED real_t sm1[MQ1][MQ1][MQ1][3];
-         // real_t (&sm0_ptr)[MQ1][MQ1][MQ1][3] = sm0;
-         // real_t (&sm1_ptr)[MQ1][MQ1][MQ1][3] = sm1;
-
-         low::regs3d_t<DIM, MQ1> reg;
-         const real_t *rd = dx_ptr;
-
-         // const auto fields_e_ptr = load_field_e_ptr(wrapped_fields_e, e);
-
-         MFEM_SHARED real_t sB[MQ1][MQ1], sG[MQ1][MQ1];
-         // real_t (&sB_ptr)[MD1][MQ1] = sB;
-         // real_t (&sG_ptr)[MD1][MQ1] = sG;
-
-         // Interpolate
-         // for_constexpr<num_inputs>(
-         //    [ D1D, Q1D, MQ1, e,
-         //           &input_dtq_maps,
-         //           &sm0_ptr, &sm1_ptr,
-         //           &sB = sB_ptr, &sG = sG_ptr,
-         //           &inputs,
-         //           //  &fields_e_ptr,
-         //           &reg, &rd,
-         //           &input_to_field ] (auto i)
-         {
-            // const auto input = get<0/*i*/>(inputs);
-            // using field_operator_t = std::decay_t<decltype(input)>;
-
-            // if constexpr (is_gradient_fop<field_operator_t>::value) // Grad
-            {
-               // const int vdim = input.vdim;
-               // const real_t *field_e_r = fields_e_ptr[input_to_field[i]];
-               // const auto XE = Reshape(field_e_r, D1D, D1D, D1D, vdim);
-               // const auto sB = reinterpret_cast<const real_t (*)[MQ1]>(Bi[i]);
-               // const auto sG = reinterpret_cast<const real_t (*)[MQ1]>(Gi[i]);
-               low::LoadMatrix(d1d, q1d, B, sB);
-               low::LoadMatrix(d1d, q1d, G, sG);
-               // for (int c = 0; c < vdim; c++)
-               // constexpr int c = 0;
-               {
-                  low::LoadDofs3d(e, d1d, XE, sm0);
-                  low::Grad3d(d1d, q1d, sB, sG, sm0, sm1, reg);
-               }
-            }
-            // else if constexpr (is_identity_fop<field_operator_t>::value)   // Identity
-            {
-               // db1("Identity");
-               // rd = fields_e_ptr[input_to_field[i]];
-               // rd = dx_ptr;
-            }
-            // else if constexpr (is_weight_fop<field_operator_t>::value)   // Weight
-            // {
-            //    dbg("Weight");
-            //    rw = fields_e_ptr[input_to_field[i]]; // 🔥
-            // }
-            // else
-            {
-               // MFApply comes here
-               // assert(false);
-               // MFEM_ABORT("Only Grad and Identity field operators are supported");
-            }
-         }//); // for_constexpr<num_inputs>
-
-         MFEM_FOREACH_THREAD_DIRECT(qz,z,q1d)
-         {
-            MFEM_FOREACH_THREAD_DIRECT(qy,y,q1d)
-            {
-               MFEM_FOREACH_THREAD_DIRECT(qx,x,q1d)
-               {
-#if 0
-                  auto qf_args = decay_tuple<qf_param_ts> {};
-                  qf::apply_kernel<T_Q1D, num_inputs>
-                  (reg, reg, rd, qx, qy, qz, qfunc, qf_args);
-#elif 0
-                  real_t v[3], u[3] = { reg[qz][qy][qx][0],
-                                        reg[qz][qy][qx][1],
-                                        reg[qz][qy][qx][2]
-                                      };
-                  const auto *D = (real_t (*)[T_Q1D][T_Q1D][3][3]) rd;
-                  kernels::Mult(3, 3, &D[qx][qy][qz][0][0], u, v);
-                  reg[qz][qy][qx][0] = v[0];
-                  reg[qz][qy][qx][1] = v[1];
-                  reg[qz][qy][qx][2] = v[2];
-#elif 0
-                  const auto *D = (real_t (*)[T_Q1D][T_Q1D][3][3]) rd;
-                  const auto args = decay_tuple<qf_param_ts>
-                  {
-                     {{ reg[qz][qy][qx][0], reg[qz][qy][qx][1], reg[qz][qy][qx][2] }},
-                     {{
-                           {{ D[qx][qy][qz][0][0], D[qx][qy][qz][0][1], D[qx][qy][qz][0][2] }},
-                           {{ D[qx][qy][qz][1][0], D[qx][qy][qz][1][1], D[qx][qy][qz][1][2] }},
-                           {{ D[qx][qy][qz][2][0], D[qx][qy][qz][2][1], D[qx][qy][qz][2][2] }}
-                        }
-                     }
-                  };
-                  const auto r = get<0>(apply(qfunc, args));
-                  reg[qz][qy][qx][0] = r[0];
-                  reg[qz][qy][qx][1] = r[1];
-                  reg[qz][qy][qx][2] = r[2];
-#elif 0
-                  auto u = as_tensor<real_t, 3>(&reg[qz][qy][qx][0]);
-                  const auto *d = (real_t (*)[T_Q1D][T_Q1D][3][3]) rd;
-                  auto D = as_tensor<real_t, 3, 3>(&d[qx][qy][qz][0][0]);
-                  auto r = D * u;
-                  reg[qz][qy][qx][0] = r[0];
-                  reg[qz][qy][qx][1] = r[1];
-                  reg[qz][qy][qx][2] = r[2];
-#else
-                  auto args = decay_tuple<qf_param_ts> {};
-                  get<0>(args) = as_tensor<real_t, 3>(&reg[qz][qy][qx][0]);
-                  if constexpr (T_Q1D > 0)
-                  {
-                     get<1>(args) = as_tensor<real_t, 3, 3>(rd + 9*(qx*T_Q1D*T_Q1D + qy*T_Q1D + qz));
-                  }
-                  else
-                  {
-                     get<1>(args) = as_tensor<real_t, 3, 3>(rd + 9*(qx*q1d*q1d + qy*q1d + qz));
-                  }
-                  auto r = get<0>(apply(qfunc, args));
-                  if constexpr (decltype(r)::ndim == 1)
-                  {
-                     as_tensor<real_t, 3>(&reg[qz][qy][qx][0]) = r;
-                  }
-                  else { static_assert(false); }
-#endif
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-         // Integrate
-         // if constexpr (is_gradient_fop<std::decay_t<output_fop_t>>::value) // Gradient
-         {
-            // const auto sB = reinterpret_cast<const real_t (*)[MQ1]>(Bo);
-            // const auto sG = reinterpret_cast<const real_t (*)[MQ1]>(Go);
-            low::GradTranspose3d(d1d, q1d, sB, sG, reg, sm1, sm0);
-            low::WriteDofs3d(d1d, 0, e, reg, YE);
-         }
-      },
-      num_entities, thread_blocks, 0, nullptr);
-      NVTX_END("forall");
-
-      NVTX_INI("out^T");
-      output_restriction_transpose(residual_e, residual_l);
-      NVTX_END("out^T");
-   }
-
-   using NewActionKernelType = decltype(&NewActionCallback::action_callback_new<>);
-   MFEM_REGISTER_KERNELS(NewActionCallbackKernels, NewActionKernelType, (int));
-
-   void Apply(const int d1d, const int q1d)
-   {
-      db1();
-      NewActionCallbackKernels::Run(q1d,
-                                    // args
-                                    d1d,
-                                    restriction_cb,
-                                    qfunc,
-                                    inputs,
-                                    input_to_field,
-                                    input_dtq_maps,
-                                    output_dtq_maps,
-                                    dimension,
-                                    num_entities,
-                                    test_vdim,
-                                    num_test_dof,
-                                    thread_blocks,
-                                    shmem_info,
-                                    attributes,
-                                    output_fop,
-                                    elem_attributes,
-                                    fields_e,
-                                    residual_e,
-                                    output_restriction_transpose,
-                                    solutions_l,
-                                    parameters_l,
-                                    residual_l,
-                                    // fallback arguments
-                                    q1d);
-   }
-};
-
-template<size_t num_fields, size_t num_inputs, size_t num_outputs,
-         typename restriction_cb_t, typename qfunc_t, typename input_t, typename output_fop_t>
-template<int T_Q1D>
-typename NewActionCallback<num_fields, num_inputs, num_outputs, restriction_cb_t, qfunc_t, input_t, output_fop_t>::NewActionKernelType
-NewActionCallback<num_fields, num_inputs, num_outputs, restriction_cb_t, qfunc_t, input_t, output_fop_t>::NewActionCallbackKernels::Kernel()
-{
-   return action_callback_new<T_Q1D>;
-}
-
-template<size_t num_fields, size_t num_inputs, size_t num_outputs,
-         typename restriction_cb_t, typename qfunc_t, typename input_t, typename output_fop_t>
-typename NewActionCallback<num_fields, num_inputs, num_outputs, restriction_cb_t, qfunc_t, input_t, output_fop_t>::NewActionKernelType
-NewActionCallback<num_fields, num_inputs, num_outputs, restriction_cb_t, qfunc_t, input_t, output_fop_t>::NewActionCallbackKernels::Fallback
-(int q1d)
-{
-   dbg("\x1b[33mFallback q1d:{}", q1d);
-   // MFEM_ABORT("No kernel for q1d=" << q1d);
-   // return nullptr;
-   return action_callback_new<>;
-}
-
-} // namespace mfem::future
@@ -1,111 +0,0 @@
-#pragma once
-
-#include "../util.hpp"
-#include "../../integrator_ctx.hpp"
-
-#include <utility>
-
-namespace mfem::future
-{
-
-namespace GlobalQFImpl
-{
-
-template<
-   typename qfunc_t,
-   typename inputs_t,
-   typename outputs_t,
-   size_t ninputs = tuple_size<inputs_t>::value,
-   size_t noutputs = tuple_size<outputs_t>::value>
-struct Action
-{
-   Action(
-      IntegratorContext ctx,
-      qfunc_t qfunc,
-      inputs_t inputs,
-      outputs_t outputs) :
-      ctx(ctx),
-      qfunc(std::move(qfunc)),
-      inputs(inputs),
-      outputs(outputs)
-   {
-      create_fop_to_fd(inputs, ctx.infds, input_to_infd);
-      create_fop_to_fd(outputs, ctx.outfds, output_to_outfd);
-
-      check_consistency(inputs, input_to_infd, ctx.infds);
-      check_consistency(outputs, output_to_outfd, ctx.outfds);
-
-      create_fieldbases(inputs, input_to_infd, ctx.infds, ctx.ir, input_bases);
-      create_fieldbases(outputs, output_to_outfd, ctx.outfds, ctx.ir, output_bases);
-
-      create_qlayouts(inputs, ctx.in_qlayouts, input_qlayouts);
-      create_qlayouts(outputs, ctx.out_qlayouts, output_qlayouts);
-
-      const int nqp = ctx.ir.GetNPoints();
-      gnqp = nqp * ctx.nentities;
-
-      xq_offsets.SetSize(ninputs + 1);
-      xq_offsets[0] = 0;
-      constexpr_for<0, ninputs>([&](auto i)
-      {
-         const auto input = get<i>(inputs);
-         xq_offsets[i + 1] = nqp * input.size_on_qp * ctx.nentities;
-      });
-      xq_offsets.PartialSum();
-      xq.Update(xq_offsets);
-
-      yq_offsets.SetSize(noutputs + 1);
-      yq_offsets[0] = 0;
-      constexpr_for<0, noutputs>([&](auto i)
-      {
-         const auto output = get<i>(outputs);
-         yq_offsets[i + 1] = nqp * output.size_on_qp * ctx.nentities;
-      });
-      yq_offsets.PartialSum();
-      yq.Update(yq_offsets);
-   }
-
-   void operator()(
-      const std::vector<Vector *> &xe,
-      std::vector<Vector *> &ye) const
-   {
-      if (ctx.attr.Size() == 0) { return; }
-
-      // E -> Q
-      interpolate(input_to_infd, input_bases, xe, xq);
-
-      // Q -> Q
-      static_assert(
-         detail::supports_tensor_array_qfunc<qfunc_t, inputs_t, outputs_t>::value,
-         "qfunc signature not supported by default backend Action");
-
-      detail::call_qfunc(
-         qfunc, xq, yq, gnqp, input_qlayouts, output_qlayouts,
-         std::make_index_sequence<ninputs> {},
-         std::make_index_sequence<noutputs> {});
-
-      // Q -> E
-      integrate(output_to_outfd, output_bases, yq, ye);
-   }
-
-   IntegratorContext ctx;
-   qfunc_t qfunc;
-   inputs_t inputs;
-   outputs_t outputs;
-
-   std::array<size_t, ninputs> input_to_infd;
-   std::array<size_t, noutputs> output_to_outfd;
-
-   std::array<FieldBasis, ninputs> input_bases;
-   std::array<FieldBasis, noutputs> output_bases;
-
-   std::array<std::vector<int>, ninputs>  input_qlayouts;
-   std::array<std::vector<int>, noutputs> output_qlayouts;
-
-   int gnqp = 0;
-   Array<int> xq_offsets, yq_offsets;
-   mutable BlockVector xq, yq;
-};
-
-}
-}
@@ -1,131 +0,0 @@
-#pragma once
-
-#include "../fem/quadinterpolator.hpp"
-#include "../../integrator_ctx.hpp"
-#include "../util.hpp"
-#include <utility>
-
-namespace mfem::future
-{
-
-namespace GlobalQFImpl
-{
-
-template<
-   int derivative_id,
-   typename qfunc_t,
-   typename inputs_t,
-   typename outputs_t,
-   size_t ninputs = tuple_size<inputs_t>::value,
-   size_t noutputs = tuple_size<outputs_t>::value>
-struct DerivativeActionEnzyme
-{
-   DerivativeActionEnzyme(
-      IntegratorContext ctx,
-      qfunc_t &qfunc,
-      inputs_t inputs,
-      outputs_t outputs) :
-      ctx(ctx),
-      qfunc(qfunc),
-      inputs(inputs),
-      outputs(outputs)
-   {
-      create_fop_to_fd(inputs, ctx.infds, input_to_infd);
-      create_fop_to_fd(outputs, ctx.outfds, output_to_outfd);
-
-      check_consistency(inputs, input_to_infd, ctx.infds);
-      check_consistency(outputs, output_to_outfd, ctx.outfds);
-
-      create_fieldbases(inputs, input_to_infd, ctx.infds, ctx.ir, input_bases);
-      create_fieldbases(outputs, output_to_outfd, ctx.outfds, ctx.ir, output_bases);
-
-      create_qlayouts(inputs, ctx.in_qlayouts, input_qlayouts);
-      create_qlayouts(outputs, ctx.out_qlayouts, output_qlayouts);
-
-      const int nqp = ctx.ir.GetNPoints();
-      gnqp = nqp * ctx.nentities;
-
-      xq_offsets.SetSize(ninputs + 1);
-      xq_offsets[0] = 0;
-      constexpr_for<0, ninputs>([&](auto i)
-      {
-         const auto input = get<i>(inputs);
-         xq_offsets[i + 1] = nqp * input.size_on_qp * ctx.nentities;
-      });
-      xq_offsets.PartialSum();
-      xq.Update(xq_offsets);
-
-      yq_offsets.SetSize(noutputs + 1);
-      yq_offsets[0] = 0;
-      constexpr_for<0, noutputs>([&](auto i)
-      {
-         const auto output = get<i>(outputs);
-         yq_offsets[i + 1] = nqp * output.size_on_qp * ctx.nentities;
-      });
-      yq_offsets.PartialSum();
-      yq.Update(yq_offsets);
-
-      // For each dependent input in the dependency map we create a shadow
-      // memory variable at the quadrature point level.
-      const auto activity_map = detail::make_activity_map<derivative_id>(inputs);
-      shadow_xq_offsets.SetSize(ninputs + 1);
-      shadow_xq_offsets = 0;
-      constexpr_for<0, ninputs>([&](auto i)
-      {
-         if (activity_map[i])
-         {
-            shadow_xq_offsets[i + 1] =
-               xq_offsets[i + 1] - xq_offsets[i];;
-         }
-      });
-      shadow_xq_offsets.PartialSum();
-      shadow_xq.Update(shadow_xq_offsets);
-   }
-
-   void operator()(
-      const std::vector<Vector *> &xe,
-      const Vector *de,
-      std::vector<Vector *> &ye) const
-   {
-      if (ctx.attr.Size() == 0) { return; }
-      // E -> Q
-      interpolate(input_to_infd, input_bases, xe, xq);
-
-      const auto activity_map = detail::make_activity_map<derivative_id>(inputs);
-      interpolate(input_to_infd, input_bases, xe, shadow_xq, activity_map);
-
-      // Q -> Q
-      static_assert(
-         detail::supports_tensor_array_qfunc<qfunc_t, inputs_t, outputs_t>::value,
-         "qfunc signature not supported by default backend Action");
-
-      detail::enzyme_fwddiff<derivative_id, qfunc_t, inputs_t, outputs_t>(
-         qfunc, xq, shadow_xq, yq, gnqp, input_qlayouts, output_qlayouts,
-         std::make_index_sequence<ninputs> {},
-         std::make_index_sequence<noutputs> {});
-
-      // Q -> E
-      integrate(output_to_outfd, output_bases, yq, ye);
-   }
-
-   IntegratorContext ctx;
-   qfunc_t &qfunc;
-   inputs_t inputs;
-   outputs_t outputs;
-
-   std::array<size_t, ninputs> input_to_infd;
-   std::array<size_t, noutputs> output_to_outfd;
-
-   std::array<FieldBasis, ninputs> input_bases;
-   std::array<FieldBasis, noutputs> output_bases;
-
-   std::array<std::vector<int>, ninputs>  input_qlayouts;
-   std::array<std::vector<int>, noutputs> output_qlayouts;
-
-   int gnqp = 0;
-   Array<int> xq_offsets, shadow_xq_offsets, yq_offsets;
-   mutable BlockVector xq, shadow_xq, yq;
-};
-
-}
-}
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "action.hpp"
-#include "derivative_action_enzyme.hpp"
-
-namespace mfem::future
-{
-
-struct GlobalQFBackend
-{
-   template<
-      typename qfunc_t,
-      typename inputs_t,
-      typename outputs_t>
-   auto static MakeAction(
-      const IntegratorContext &ctx,
-      qfunc_t qfunc,
-      inputs_t inputs,
-      outputs_t outputs)
-   {
-      return GlobalQFImpl::Action(ctx, qfunc, inputs, outputs);
-   }
-
-   template<
-      int derivative_id,
-      typename qfunc_t,
-      typename inputs_t,
-      typename outputs_t>
-   auto static MakeDerivativeAction(
-      const IntegratorContext &ctx,
-      qfunc_t qfunc,
-      inputs_t inputs,
-      outputs_t outputs)
-   {
-      return GlobalQFImpl::DerivativeActionEnzyme<
-             derivative_id, qfunc_t, inputs_t, outputs_t>(
-                ctx, qfunc, inputs, outputs);
-   }
-
-};
-
-}
@@ -1,166 +0,0 @@
-#pragma once
-
-#include "../util.hpp"
-#include "../../integrator_ctx.hpp"
-
-#include <utility>
-
-namespace mfem::future
-{
-
-namespace LocalQFImpl
-{
-
-template<
-   typename qfunc_t,
-   typename inputs_t,
-   typename outputs_t,
-   size_t ninputs = tuple_size<inputs_t>::value,
-   size_t noutputs = tuple_size<outputs_t>::value>
-struct Action
-{
-   Action(
-      IntegratorContext ctx,
-      qfunc_t qfunc,
-      inputs_t inputs,
-      outputs_t outputs) :
-      ctx(ctx),
-      qfunc(std::move(qfunc)),
-      inputs(inputs),
-      outputs(outputs)
-   {
-      create_fop_to_fd(inputs, ctx.infds, input_to_infd);
-      create_fop_to_fd(outputs, ctx.outfds, output_to_outfd);
-
-      check_consistency(inputs, input_to_infd, ctx.infds);
-      check_consistency(outputs, output_to_outfd, ctx.outfds);
-
-      const int nqp = ctx.ir.GetNPoints();
-
-      // Initialize DofToQuad maps for inputs
-      for_constexpr<ninputs>([&](auto i)
-      {
-         const auto &fd = ctx.infds[input_to_infd[i]];
-         std::visit([&](auto* space_ptr)
-         {
-            using T = std::decay_t<decltype(*space_ptr)>;
-            if constexpr (std::is_same_v<T, FiniteElementSpace> ||
-                          std::is_same_v<T, ParFiniteElementSpace>)
-            {
-               const auto *fe = space_ptr->GetTypicalFE();
-               input_dtq_maps[i] = &fe->GetDofToQuad(ctx.ir, DofToQuad::TENSOR);
-            }
-         }, fd.data);
-      });
-
-      // Initialize DofToQuad maps for outputs
-      for_constexpr<noutputs>([&](auto i)
-      {
-         const auto &fd = ctx.outfds[output_to_outfd[i]];
-         std::visit([&](auto* space_ptr)
-         {
-            using T = std::decay_t<decltype(*space_ptr)>;
-            if constexpr (std::is_same_v<T, FiniteElementSpace> ||
-                          std::is_same_v<T, ParFiniteElementSpace>)
-            {
-               const auto *fe = space_ptr->GetTypicalFE();
-               output_dtq_maps[i] = &fe->GetDofToQuad(ctx.ir, DofToQuad::TENSOR);
-            }
-         }, fd.data);
-      });
-   }
-
-   void operator()(
-      const std::vector<Vector *> &xe,
-      std::vector<Vector *> &ye) const
-   {
-      if (ctx.attr.Size() == 0) { return; }
-
-      // input_dtq_maps
-
-      // const auto B = (const real_t*)input_dtq_maps[0/*i*/].B;
-      // const auto G = (const real_t*)input_dtq_maps[0/*i*/].G;
-
-      //    dfem::forall<T_Q1D*T_Q1D*T_Q1D>([=] MFEM_HOST_DEVICE (int e, void *)
-      //    {
-      //       if (has_attr && !d_attr[d_elem_attr[e] - 1]) { return; }
-
-      //       constexpr int MQ1 = T_Q1D > 0 ? T_Q1D : 8;
-
-      //       MFEM_SHARED real_t sm0[MQ1][MQ1][MQ1][3];
-      //       MFEM_SHARED real_t sm1[MQ1][MQ1][MQ1][3];
-
-      //       low::regs3d_t<DIM, MQ1> reg;
-      //       const real_t *rd = dx_ptr;
-
-      //       MFEM_SHARED real_t sB[MQ1][MQ1], sG[MQ1][MQ1];
-      //       {
-      //          low::LoadMatrix(d1d, q1d, B, sB);
-      //          low::LoadMatrix(d1d, q1d, G, sG);
-      //          {
-      //             low::LoadDofs3d(e, d1d, XE, sm0);
-      //             low::Grad3d(d1d, q1d, sB, sG, sm0, sm1, reg);
-      //          }
-      //       }
-      //       // else if constexpr (is_identity_fop<field_operator_t>::value)   // Identity
-      //       {
-      //          // db1("Identity");
-      //          // rd = fields_e_ptr[input_to_field[i]];
-      //          // rd = dx_ptr;
-      //       }
-      //    }
-
-      //    MFEM_FOREACH_THREAD_DIRECT(qz,z,q1d)
-      //    {
-      //       MFEM_FOREACH_THREAD_DIRECT(qy,y,q1d)
-      //       {
-      //          MFEM_FOREACH_THREAD_DIRECT(qx,x,q1d)
-      //          {
-
-      //             auto args = decay_tuple<qf_param_ts> {};
-      //             get<0>(args) = as_tensor<real_t, 3>(&reg[qz][qy][qx][0]);
-      //             if constexpr (T_Q1D > 0)
-      //             {
-      //                get<1>(args) = as_tensor<real_t, 3, 3>(rd + 9*(qx*T_Q1D*T_Q1D + qy*T_Q1D + qz));
-      //             }
-      //             else
-      //             {
-      //                get<1>(args) = as_tensor<real_t, 3, 3>(rd + 9*(qx*q1d*q1d + qy*q1d + qz));
-      //             }
-      //             auto r = get<0>(apply(qfunc, args));
-      //             if constexpr (decltype(r)::ndim == 1)
-      //             {
-      //                as_tensor<real_t, 3>(&reg[qz][qy][qx][0]) = r;
-      //             }
-      //             else { static_assert(false); }
-      //          }
-      //       }
-      //    }
-      //    MFEM_SYNC_THREAD;
-      //    // Integrate
-      //    // if constexpr (is_gradient_fop<std::decay_t<output_fop_t>>::value) // Gradient
-      //    {
-      //       // const auto sB = reinterpret_cast<const real_t (*)[MQ1]>(Bo);
-      //       // const auto sG = reinterpret_cast<const real_t (*)[MQ1]>(Go);
-      //       low::GradTranspose3d(d1d, q1d, sB, sG, reg, sm1, sm0);
-      //       low::WriteDofs3d(d1d, 0, e, reg, YE);
-      //    }
-      // },
-      // num_entities, thread_blocks, 0, nullptr);
-   }
-
-
-   IntegratorContext ctx;
-   qfunc_t qfunc;
-   inputs_t inputs;
-   outputs_t outputs;
-
-   std::array<size_t, ninputs> input_to_infd;
-   std::array<size_t, noutputs> output_to_outfd;
-
-   std::array<const DofToQuad*, ninputs> input_dtq_maps;
-   std::array<const DofToQuad*, noutputs> output_dtq_maps;
-};
-
-}
-}
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "../../integrator_ctx.hpp"
-#include "action.hpp"
-
-namespace mfem::future
-{
-
-struct LocalQFBackend
-{
-   template<
-      typename qfunc_t,
-      typename inputs_t,
-      typename outputs_t>
-   auto static MakeAction(
-      const IntegratorContext &ctx,
-      qfunc_t qfunc,
-      inputs_t inputs,
-      outputs_t outputs)
-   {
-      return LocalQFImpl::Action(ctx, qfunc, inputs, outputs);
-   }
-
-   template<
-      int derivative_id,
-      typename qfunc_t,
-      typename inputs_t,
-      typename outputs_t>
-   auto static MakeDerivativeAction(
-      const IntegratorContext &ctx,
-      qfunc_t qfunc,
-      inputs_t inputs,
-      outputs_t outputs)
-   {
-      MFEM_ABORT("LocalQFBackend does not support derivative actions.");
-   }
-};
-
-}
@@ -1,659 +0,0 @@
-#pragma once
-
-#include "../fem/quadinterpolator.hpp"
-#include "../util.hpp"
-#include "general/enzyme.hpp"
-
-namespace mfem::future
-{
-
-template <size_t N, size_t... Is>
-constexpr std::array<bool, N> all_true_impl(std::index_sequence<Is...>)
-{
-   return {{((void)Is, true)...}};
-}
-
-template <size_t N>
-constexpr std::array<bool, N> all_true()
-{
-   return all_true_impl<N>(std::make_index_sequence<N> {});
-}
-
-struct FieldBasis
-{
-   // E-vector -> Q-vector
-   std::function<void(const Vector &, Vector &)> forward;
-
-   // Q-vector -> E-vector
-   std::function<void(const Vector &, Vector &)> transpose;
-};
-
-inline FieldBasis FromQI(const QuadratureInterpolator *qi,
-                         QuadratureInterpolator::EvalFlags mode)
-{
-   return
-   {
-      [qi, mode](const Vector &xe, Vector &xq)
-      {
-         qi->SetOutputLayout(QVectorLayout::byVDIM);
-         if (mode == QuadratureInterpolator::VALUES)
-         {
-            qi->Values(xe, xq);
-         }
-         else
-         {
-            qi->Derivatives(xe, xq);
-         }
-      },
-      [qi, mode](const Vector &yq, Vector &ye)
-      {
-         Vector empty;
-         qi->SetOutputLayout(QVectorLayout::byVDIM);
-         if (mode == QuadratureInterpolator::VALUES)
-         {
-            qi->AddMultTranspose(QuadratureInterpolator::VALUES, yq, empty, ye);
-         }
-         else
-         {
-            qi->AddMultTranspose(QuadratureInterpolator::DERIVATIVES, empty, yq, ye);
-         }
-      }
-   };
-}
-
-// QuadratureFunction identity copy
-inline FieldBasis FromQF()
-{
-   return
-   {
-      [](const Vector &xe, Vector &xq) { xq = xe; },
-      [](const Vector &yq, Vector &ye) { ye = yq; }
-   };
-}
-
-// User-defined parameter space B
-inline FieldBasis FromPS(const Operator *B, const Operator *Bt)
-{
-   return
-   {
-      [B](const Vector &xe, Vector &xq) { B->Mult(xe, xq); },
-      [Bt](const Vector &yq, Vector &ye) { Bt->Mult(yq, ye); }
-   };
-}
-
-inline FieldBasis FieldBasisFromWeight(const IntegrationRule &ir)
-{
-   return
-   {
-      [&ir](const Vector &, Vector &xq)
-      {
-         const int nqp = ir.GetNPoints();
-         MFEM_ASSERT(xq.Size() % nqp == 0, "weight block has unexpected size");
-
-         const int ne = xq.Size() / nqp;
-         const real_t *wref = ir.GetWeights().Read();
-
-         for (int e = 0; e < ne; e++)
-         {
-            std::memcpy(xq.GetData() + e*nqp, wref, nqp*sizeof(real_t));
-         }
-      },
-      [](const Vector &, Vector &) {}
-   };
-}
-
-inline const FieldBasis GetFieldBasis(const FieldDescriptor &f,
-                                      const IntegrationRule &ir,
-                                      QuadratureInterpolator::EvalFlags mode)
-{
-   return std::visit([&ir, &mode](auto && arg) -> FieldBasis
-   {
-      using T = std::decay_t<decltype(arg)>;
-
-      if constexpr (std::is_same_v<T, const FiniteElementSpace *>)
-      {
-         return FromQI(arg->GetQuadratureInterpolator(ir), mode);
-      }
-      else if constexpr (std::is_same_v<T, const ParFiniteElementSpace *>)
-      {
-         return FromQI(arg->GetQuadratureInterpolator(ir), mode);
-      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return FromQF();
-      }
-      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
-      {
-         return FromPS(arg->GetB(), arg->GetBt());
-      }
-      else if constexpr (std::is_same_v<T, const IntegrationRule *>)
-      {
-         return FieldBasis{};
-      }
-      else
-      {
-         static_assert(dfem::always_false<T>, "internal error");
-      }
-   }, f.data);
-}
-
-template <typename fops_t, size_t nfops>
-void create_fieldbases(
-   fops_t &fops,
-   const std::array<size_t, nfops> &fop_to_fd,
-   const std::vector<FieldDescriptor> &fds,
-   const IntegrationRule &ir,
-   std::array<FieldBasis, nfops> &bases)
-{
-   constexpr_for<0, nfops>([&](auto i)
-   {
-      const auto fop = get<i>(fops);
-      using fop_t = std::decay_t<decltype(fop)>;
-
-      const auto fd = fds[fop_to_fd[i]];
-
-      constexpr QuadratureInterpolator::EvalFlags dummy_mode =
-         QuadratureInterpolator::VALUES;
-      if constexpr (is_identity_fop<fop_t>::value)
-      {
-         bases[i] = GetFieldBasis(fd, ir, dummy_mode);
-      }
-      else if constexpr (is_weight_fop<fop_t>::value)
-      {
-         bases[i] = FieldBasisFromWeight(ir);
-      }
-      else if constexpr (is_value_fop<fop_t>::value)
-      {
-         bases[i] = GetFieldBasis(fd, ir, QuadratureInterpolator::VALUES);
-      }
-      else if constexpr (is_gradient_fop<fop_t>::value)
-      {
-         bases[i] = GetFieldBasis(fd, ir, QuadratureInterpolator::DERIVATIVES);
-      }
-   });
-}
-
-template <typename fops_t, size_t nfops>
-void check_consistency(
-   fops_t &fops,
-   const std::array<size_t, nfops> &fop_to_fd,
-   const std::vector<FieldDescriptor> &fields)
-{
-   constexpr_for<0, nfops>([&](auto i)
-   {
-      const auto input = get<i>(fops);
-      using input_t = std::decay_t<decltype(input)>;
-
-      const auto fd = fields[fop_to_fd[i]];
-
-      if constexpr (is_identity_fop<input_t>::value)
-      {
-         MFEM_ASSERT(std::holds_alternative<const QuadratureFunction *>(fd.data),
-                     "Identity FieldOperator requested on non "
-                     "QuadratureFunction");
-      }
-      else if constexpr (is_weight_fop<input_t>::value)
-      {
-      }
-      else if constexpr (is_value_fop<input_t>::value)
-      {
-         MFEM_ASSERT(std::holds_alternative<const FiniteElementSpace *>(fd.data) ||
-                     std::holds_alternative<const ParFiniteElementSpace *>(fd.data) ||
-                     std::holds_alternative<const ParameterSpace *>(fd.data),
-                     "Value FieldOperator requested on non "
-                     "QuadratureFunction");
-      }
-      else if constexpr (is_gradient_fop<input_t>::value)
-      {
-         MFEM_ASSERT(std::holds_alternative<const FiniteElementSpace *>(fd.data) ||
-                     std::holds_alternative<const ParFiniteElementSpace *>(fd.data),
-                     "Value FieldOperator requested on non "
-                     "QuadratureFunction");
-      }
-   });
-}
-
-template <size_t ninputs>
-void interpolate(
-   const std::array<size_t, ninputs> &input_to_infd,
-   const std::array<FieldBasis, ninputs> &input_bases,
-   const std::vector<Vector *> &xe,
-   BlockVector &xq,
-   const std::array<bool, ninputs> &conditional = all_true<ninputs>())
-{
-   constexpr_for<0, ninputs>([&](auto i)
-   {
-      if (!conditional.empty() && !conditional[i]) { return; }
-
-      input_bases[i].forward(*xe[input_to_infd[i]], xq.GetBlock(i));
-   });
-}
-
-template <size_t noutputs>
-void integrate(
-   const std::array<size_t, noutputs> &output_to_outfd,
-   const std::array<FieldBasis, noutputs> &output_bases,
-   const BlockVector &yq,
-   std::vector<Vector *> &ye)
-{
-   for (auto v : ye) { *v = 0.0; }
-
-   constexpr_for<0, noutputs>([&](auto i)
-   {
-      output_bases[i].transpose(yq.GetBlock(i), *ye[output_to_outfd[i]]);
-   });
-}
-
-
-namespace detail
-{
-
-template <typename T>
-struct is_tensor_array : std::false_type {};
-
-template <typename scalar_t, int... Dims>
-struct is_tensor_array<tensor_array<scalar_t, Dims...>> : std::true_type {};
-
-template <typename T>
-struct is_tensor_array_mut : std::false_type {};
-
-template <typename scalar_t, int... Dims>
-struct is_tensor_array_mut<tensor_array<scalar_t, Dims...>> :
-                                                            std::bool_constant<!std::is_const_v<scalar_t>> {};
-
-
-template <typename ndarray_t>
-inline void set_layout_default(ndarray_t &a)
-{
-   if constexpr (ndarray_t::tensor_rank() == 0) { return; }
-
-   constexpr std::size_t nd = ndarray_t::rank();
-   constexpr std::size_t td = ndarray_t::tensor_rank();
-   std::array<std::size_t, nd + td> perm{};
-
-   for (std::size_t i = 0; i < td; i++) { perm[i] = nd + i; }
-   for (std::size_t i = 0; i < nd; i++) { perm[td + i] = i; }
-
-   a.set_layout(perm);
-}
-
-template <typename ndarray_t>
-inline void set_layout(ndarray_t& a, const std::vector<int>& layout)
-{
-   if constexpr (ndarray_t::tensor_rank() == 0) { return; }
-
-   constexpr std::size_t nd = ndarray_t::rank();
-   constexpr std::size_t td = ndarray_t::tensor_rank();
-   constexpr std::size_t N  = nd + td;
-
-   // missing means default
-   if (layout.empty()) { set_layout_default(a); return; }
-
-   MFEM_VERIFY(layout.size() == N,
-               "layout size mismatch: expected " << N << " got " << layout.size());
-
-   // TODO: make a version of set_layout that takes `std::vector<int>`
-   std::array<std::size_t, N> perm{};
-   for (std::size_t i = 0; i < N; i++)
-   {
-      MFEM_VERIFY(layout[i] >= 0, "layout index must be >=0");
-      perm[i] = static_cast<std::size_t>(layout[i]);
-   }
-
-   a.set_layout(perm);
-}
-
-/// Primary template: intentionally undefined — gives a clear error for unsupported types.
-template <typename T>
-struct tensor_array_traits;
-
-/// Matches tensor<scalar_t, sizes...>
-template <typename scalar_t, int... sizes>
-struct tensor_array_traits<tensor<scalar_t, sizes...>>
-{
-   using scalar_type = scalar_t;
-   template <std::size_t ndims>
-   using array_type = tensor_ndarray<scalar_t, ndims, sizes...>;
-};
-
-/// Matches tensor_ndarray<scalar_t, ndims, tensor_sizes...>
-template <typename scalar_t, int ndims, int... tensor_sizes>
-struct tensor_array_traits<tensor_ndarray<scalar_t, ndims, tensor_sizes...>>
-{
-   using scalar_type = scalar_t;
-   template <std::size_t N>
-   using array_type = tensor_ndarray<scalar_t, N, tensor_sizes...>;
-};
-
-/// Entry point: explicit tensor type T as template argument.
-template <typename T, typename ptr_scalar_t, typename... dyn_sizes_t>
-decltype(auto) make_tensor_array(ptr_scalar_t *ptr,
-                                 const std::vector<int>* layout,
-                                 dyn_sizes_t... dynamic_sizes)
-{
-   using traits = tensor_array_traits<T>;
-   using array_t = typename traits::template array_type<sizeof...(dynamic_sizes)>;
-   auto a = array_t(ptr, {std::size_t(dynamic_sizes)...});
-   if (layout) { set_layout(a, *layout); }
-   else        { set_layout_default(a); }
-   return a;
-}
-
-template <typename qfunc_t, typename inputs_t, typename outputs_t>
-struct supports_tensor_array_qfunc
-{
-   using qf_signature = typename get_function_signature<qfunc_t>::type;
-   using qf_param_ts = typename qf_signature::parameter_ts;
-
-   static constexpr int ninputs = tuple_size<inputs_t>::value;
-   static constexpr int noutputs = tuple_size<outputs_t>::value;
-   static constexpr int nparams = tuple_size<qf_param_ts>::value;
-
-   template <std::size_t... Is>
-   static constexpr bool InputsOk(std::index_sequence<Is...>)
-   {
-      return (is_tensor_array<std::remove_cv_t<std::remove_reference_t<
-              typename tuple_element<Is, qf_param_ts>::type>>>::value && ...);
-   }
-
-   template <std::size_t... Is>
-   static constexpr bool OutputsOk(std::index_sequence<Is...>)
-   {
-      return (is_tensor_array_mut<std::remove_cv_t<std::remove_reference_t<
-              typename tuple_element<ninputs + Is, qf_param_ts>::type>>>::value && ...);
-   }
-
-   static constexpr bool value =
-      (nparams == ninputs + noutputs) &&
-      InputsOk(std::make_index_sequence<ninputs> {}) &&
-      OutputsOk(std::make_index_sequence<noutputs> {});
-};
-
-template <typename qfunc_t, std::size_t... Is, std::size_t... Os>
-inline void call_qfunc(
-   const qfunc_t &qfunc,
-   const BlockVector &xq,
-   BlockVector &yq,
-   int gnqp,
-   const std::array<std::vector<int>, sizeof...(Is)>& in_layouts,
-   const std::array<std::vector<int>, sizeof...(Os)>& out_layouts,
-   std::index_sequence<Is...>,
-   std::index_sequence<Os...>)
-{
-   constexpr std::size_t ninputs = sizeof...(Is);
-
-   using qf_signature = typename get_function_signature<qfunc_t>::type;
-   using qf_param_ts = typename qf_signature::parameter_ts;
-
-   auto inputs = std::make_tuple(
-                    make_tensor_array<std::remove_cv_t<std::remove_reference_t<
-                    typename tuple_element<Is, qf_param_ts>::type>>>(
-                       xq.GetBlock(Is).Read(), &in_layouts[Is], gnqp)...);
-
-   auto outputs = std::make_tuple(
-                     make_tensor_array<std::remove_cv_t<std::remove_reference_t<
-                     typename tuple_element<ninputs + Os, qf_param_ts>::type>>>(
-                        yq.GetBlock(Os).ReadWrite(), &out_layouts[Os], gnqp)...);
-
-   std::apply([&](auto&&... args)
-   {
-      qfunc(args...);
-   }, std::tuple_cat(inputs, outputs));
-}
-
-template <typename func_t, typename... arg_ts>
-MFEM_HOST_DEVICE inline
-auto qfunction_wrapper(const func_t &f, arg_ts...args)
-{
-   return f(args...);
-}
-
-template <std::size_t derivative_id, std::size_t I, typename Tuple, std::size_t... Is>
-constexpr std::array<bool, sizeof...(Is)>
-make_activity_array(std::index_sequence<Is...>)
-{
-   return { (std::decay_t<typename tuple_element<Is, Tuple>::type>::GetFieldId() == derivative_id)... };
-}
-
-template <std::size_t derivative_id, typename inputs_t, std::size_t... Is>
-constexpr auto make_activity_map_impl(std::index_sequence<Is...>)
-{
-   constexpr std::size_t N = sizeof...(Is);
-
-   if constexpr (N == 0)
-      return std::array<bool, 0> {};
-
-   return make_activity_array<derivative_id, 0, inputs_t>
-          (std::make_index_sequence<N> {});
-}
-
-template <std::size_t derivative_id, typename inputs_t>
-constexpr auto make_activity_map(inputs_t)
-{
-   return make_activity_map_impl<derivative_id, inputs_t>(
-             std::make_index_sequence<tuple_size<inputs_t>::value> {});
-}
-
-namespace enzyme_detail
-{
-
-template <auto wrapper_fn, typename qf_return_t, typename... AccArgs>
-__attribute__((always_inline)) inline void
-do_enzyme_call(AccArgs... acc)
-{
-   __enzyme_fwddiff<qf_return_t>(wrapper_fn, acc...);
-}
-
-template <auto wrapper_fn, typename qf_return_t,
-          size_t CurO, size_t NO,
-          typename primals_t, typename derivs_t,
-          typename... AccArgs>
-__attribute__((always_inline)) inline void
-process_outputs(primals_t &primals, derivs_t &derivs, AccArgs... acc)
-{
-   if constexpr (CurO == NO)
-   {
-      do_enzyme_call<wrapper_fn, qf_return_t>(acc...);
-   }
-   else
-   {
-      process_outputs<wrapper_fn, qf_return_t, CurO + 1, NO>(
-         primals, derivs,
-         acc...,
-         enzyme_dupnoneed,
-         &std::get<CurO>(primals),
-         &std::get<CurO>(derivs));
-   }
-}
-
-template <auto wrapper_fn, typename qf_return_t,
-          size_t CurI, size_t NI, bool... ActivityMap,
-          typename inputs_t, typename shadows_t,
-          typename primals_t, typename derivs_t,
-          typename... AccArgs>
-__attribute__((always_inline)) inline void
-process_inputs(inputs_t &inputs, shadows_t &shadows,
-               primals_t &primals, derivs_t &derivs,
-               AccArgs... acc)
-{
-   if constexpr (CurI == NI)
-   {
-      constexpr size_t NO = std::tuple_size_v<primals_t>;
-      process_outputs<wrapper_fn, qf_return_t, 0, NO>(
-         primals, derivs, acc...);
-   }
-   else
-   {
-      constexpr bool active =
-         std::array<bool, sizeof...(ActivityMap)> {ActivityMap...} [CurI];
-
-      if constexpr (active)
-      {
-         std::cout << "Input[" << CurI << "]: ACTIVE (enzyme_dup)\n"
-                   << "  primal ptr type:  "
-                   << get_type_name<decltype(&std::get<CurI>(inputs))>() << "\n"
-                   << "  shadow ptr type:  "
-                   << get_type_name<decltype(&std::get<CurI>(shadows))>() << "\n";
-      }
-      else
-      {
-         std::cout << "Input[" << CurI << "]: INACTIVE (enzyme_const)\n"
-                   << "  primal ptr type:  "
-                   << get_type_name<decltype(&std::get<CurI>(inputs))>() << "\n";
-      }
-
-      if constexpr (active)
-      {
-         process_inputs<wrapper_fn, qf_return_t, CurI + 1, NI, ActivityMap...>(
-            inputs, shadows, primals, derivs,
-            acc...,
-            enzyme_dup,
-            &std::get<CurI>(inputs),
-            &std::get<CurI>(shadows));
-      }
-      else
-      {
-         process_inputs<wrapper_fn, qf_return_t, CurI + 1, NI, ActivityMap...>(
-            inputs, shadows, primals, derivs,
-            acc...,
-            enzyme_const,
-            &std::get<CurI>(inputs));
-      }
-   }
-}
-
-} // namespace enzyme_detail
-
-template <size_t derivative_id, typename qfunc_t, typename inputs_t, typename outputs_t,
-          std::size_t... Is, std::size_t... Os>
-inline void enzyme_fwddiff(
-   qfunc_t &qfunc,
-   const BlockVector &xq,
-   const BlockVector &shadow_xq,
-   BlockVector &yq,
-   const int &gnqp,
-   const std::array<std::vector<int>, sizeof...(Is)>& in_layouts,
-   const std::array<std::vector<int>, sizeof...(Os)>& out_layouts,
-   std::index_sequence<Is...>,
-   std::index_sequence<Os...>)
-{
-#ifdef MFEM_USE_ENZYME
-   constexpr std::size_t ninputs  = sizeof...(Is);
-   constexpr std::size_t noutputs = sizeof...(Os);
-
-   using qf_signature = typename get_function_signature<qfunc_t>::type;
-   using qf_param_ts  = typename qf_signature::parameter_ts;
-   using qf_return_t  = typename qf_signature::return_t;
-
-   constexpr auto activity_map = make_activity_map<derivative_id>(inputs_t{});
-   static_assert(activity_map.size() == ninputs, "activity map size mismatch");
-
-   std::cout << "activity_map: ";
-   for (const auto &v : activity_map)
-   {
-      std::cout << v << " ";
-   }
-   std::cout << "\n";
-
-   auto inputs = std::make_tuple(
-                    make_tensor_array<std::remove_cv_t<std::remove_reference_t<
-                    typename tuple_element<Is, qf_param_ts>::type>>>(
-                       xq.GetBlock(Is).Read(), &in_layouts[Is], gnqp)...);
-
-   auto shadows = std::make_tuple(
-                     make_tensor_array<std::remove_cv_t<std::remove_reference_t<
-                     typename tuple_element<Is, qf_param_ts>::type>>>(
-                        shadow_xq.GetBlock(Is).Read(), &in_layouts[Is], gnqp)...);
-
-   std::array<Vector, noutputs> primal_storage;
-   ((primal_storage[Os].SetSize(yq.GetBlock(Os).Size())), ...);
-
-   auto primals_out = std::make_tuple(
-                         make_tensor_array<std::remove_cv_t<std::remove_reference_t<
-                         typename tuple_element<ninputs + Os, qf_param_ts>::type>>>(
-                            primal_storage[Os].ReadWrite(), &out_layouts[Os], gnqp)...);
-
-   auto derivs_out = std::make_tuple(
-                        make_tensor_array<std::remove_cv_t<std::remove_reference_t<
-                        typename tuple_element<ninputs + Os, qf_param_ts>::type>>>(
-                           yq.GetBlock(Os).ReadWrite(), &out_layouts[Os], gnqp)...);
-
-   using wrapper_fn_t = qf_return_t (*)(
-                           const qfunc_t &,
-                           std::remove_reference_t<decltype(std::get<Is>(inputs))>...,
-                           std::remove_reference_t<decltype(std::get<Os>(primals_out))>...);
-
-   constexpr wrapper_fn_t wrapper_fn =
-      qfunction_wrapper<qfunc_t,
-      std::remove_reference_t<decltype(std::get<Is>(inputs))>...,
-      std::remove_reference_t<decltype(std::get<Os>(primals_out))>...>;
-
-   // wrapper_fn travels as a non-type template parameter throughout without
-   // being stored.
-   enzyme_detail::process_inputs<
-   wrapper_fn,
-   qf_return_t,
-   0,
-   ninputs,
-   activity_map[Is]...
-   >(inputs, shadows,
-     primals_out, derivs_out,
-     enzyme_const, &qfunc // seed: qfunc is always inactive
-    );
-
-#else
-   MFEM_ABORT("enzyme_fwddiff requires MFEM_USE_ENZYME");
-#endif
-}
-
-} // namespace detail
-
-// Create quadrature function fop to fields map
-template <typename fops_t, size_t N = tuple_size<fops_t>::value, size_t M>
-void create_fop_to_fd(const fops_t &fops,
-                      const std::vector<FieldDescriptor> &fields,
-                      std::array<size_t, M> &fop_to_fd)
-{
-   static_assert(N == M, "sizes must match");
-   constexpr_for<0, N>([&](auto i)
-   {
-      const auto fop = get<i>(fops);
-      fop_to_fd[i] = std::numeric_limits<size_t>::max();
-      for (size_t j = 0; j < fields.size(); j++)
-      {
-         // TODO: output.GetFieldId() should probably store/return size_t
-         if (static_cast<int>(fields[j].id) == fop.GetFieldId())
-         {
-            fop_to_fd[i] = j;
-         }
-      }
-      // Handle Weight type. There is no FieldDescriptor for the weight.
-      // TODO: Create weight descriptor for the weight for internal use?
-      // TODO: this is a hack...
-      if (is_weight_fop<std::remove_cv_t<decltype(fop)>>::value)
-      {
-         fop_to_fd[i] = 0;
-      }
-      else if (fop_to_fd[i] == std::numeric_limits<size_t>::max())
-      {
-         MFEM_ABORT("not found");
-      }
-   });
-}
-
-template <typename fops_t, size_t nfops>
-void create_qlayouts(const fops_t &fops,
-                     const std::unordered_map<std::type_index, std::vector<int>> &a,
-                     std::array<std::vector<int>, nfops> &b)
-{
-   constexpr_for<0, nfops>([&](auto i)
-   {
-      using fop_t =
-         std::remove_cv_t<std::remove_reference_t<decltype(get<i>(fops))>>;
-      auto it = a.find(std::type_index(typeid(fop_t)));
-      if (it != a.end()) { b[i] = it->second; }
-      else               { b[i].clear(); }
-   });
-}
-
-}
@@ -11,119 +11,44 @@

 #include "doperator.hpp"

-#include <algorithm>
-
 #ifdef MFEM_USE_MPI

 using namespace mfem;
 using namespace mfem::future;

+void DifferentiableOperator::SetParameters(std::vector<Vector *> p) const
+{
+   MFEM_ASSERT(parameters.size() == p.size(),
+               "number of parameters doesn't match descriptors");
+   for (size_t i = 0; i < parameters.size(); i++)
+   {
+      p[i]->Read();
+      parameters_l[i] = *p[i];
+   }
+}
+
 DifferentiableOperator::DifferentiableOperator(
-   const std::vector<FieldDescriptor> &infds,
-   const std::vector<FieldDescriptor> &outfds,
+   const std::vector<FieldDescriptor> &solutions,
+   const std::vector<FieldDescriptor> &parameters,
   const ParMesh &mesh) :
-   Operator(),
   mesh(mesh),
-   infds(infds),
-   outfds(outfds)
+   solutions(solutions),
+   parameters(parameters)
 {
-   unionfds.clear();
-   unionfds.insert(unionfds.end(), infds.begin(), infds.end());
-   unionfds.insert(unionfds.end(), outfds.begin(), outfds.end());
-   std::sort(unionfds.begin(), unionfds.end());
-   auto last = std::unique(unionfds.begin(), unionfds.end());
-   unionfds.erase(last, unionfds.end());
+   fields.resize(solutions.size() + parameters.size());
+   fields_e.resize(fields.size());
+   solutions_l.resize(solutions.size());
+   parameters_l.resize(parameters.size());

-   infields_l.resize(infds.size());
-   for (size_t i = 0; i < infds.size(); i++)
+   for (size_t i = 0; i < solutions.size(); i++)
   {
-      infields_l[i] = new Vector(GetVSize(infds[i]));
+      fields[i] = solutions[i];
   }

-   infields_e.resize(infds.size());
-}
-
-void DifferentiableOperator::SetMultLevel(MultLevel level)
-{
-   mult_level = level;
-}
-
-void DifferentiableOperator::Mult(const Vector &x, Vector &y) const
-{
-   MFEM_ASSERT(!action_callbacks.empty(),
-               "no integrators have been set");
-
-   MFEM_ASSERT(dynamic_cast<const BlockVector*>(&x),
-               "x needs to be a BlockVector");
-
-   MFEM_ASSERT(dynamic_cast<const BlockVector*>(&y),
-               "y needs to be a BlockVector");
-
-   const auto &bx = static_cast<const BlockVector &>(x);
-   auto &by = static_cast<BlockVector &>(y);
-
-   Mult(bx, by);
-}
-
-void DifferentiableOperator::DisableTensorProductStructure(bool disable)
-{
-   use_tensor_product_structure = !disable;
-}
-
-std::shared_ptr<DerivativeOperator> DifferentiableOperator::GetDerivative(
-   size_t derivative_id, const Vector &x)
-{
-   MFEM_ASSERT(derivative_action_callbacks.find(derivative_id) !=
-               derivative_action_callbacks.end(),
-               "no derivative action has been found for ID " << derivative_id);
-
-   const size_t dfidx = FindIdx(derivative_id, infds);
-
-   // Get transpose callbacks if available, otherwise pass empty vector
-   std::vector<derivative_action_t> transpose_callbacks;
-   auto it = daction_transpose_callbacks.find(derivative_id);
-   if (it != daction_transpose_callbacks.end())
+   for (size_t i = 0; i < parameters.size(); i++)
   {
-      transpose_callbacks = it->second;
+      fields[i + solutions.size()] = parameters[i];
   }
-
-   return std::make_shared<DerivativeOperator>(
-             height,
-             GetTrueVSize(infds[dfidx]),
-             derivative_action_callbacks[derivative_id],
-             transpose_callbacks,
-             infds[dfidx],
-             x,
-             infds,
-             outfds);
-}
-
-std::shared_ptr<DerivativeOperator> DifferentiableOperator::GetDerivative(
-   size_t derivative_id, const MultiVector &x)
-{
-   MFEM_ASSERT(derivative_action_callbacks.find(derivative_id) !=
-               derivative_action_callbacks.end(),
-               "no derivative action has been found for ID " << derivative_id);
-
-   const size_t dfidx = FindIdx(derivative_id, infds);
-
-   // Get transpose callbacks if available, otherwise pass empty vector
-   std::vector<derivative_action_t> transpose_callbacks;
-   auto it = daction_transpose_callbacks.find(derivative_id);
-   if (it != daction_transpose_callbacks.end())
-   {
-      transpose_callbacks = it->second;
-   }
-
-   return std::make_shared<DerivativeOperator>(
-             height,
-             GetTrueVSize(infds[dfidx]),
-             derivative_action_callbacks[derivative_id],
-             transpose_callbacks,
-             infds[dfidx],
-             x,
-             infds,
-             outfds);
 }

 #endif // MFEM_USE_MPI
@@ -1,63 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-#pragma once
-
-#include "../fespace.hpp"
-#include "parameterspace.hpp"
-
-namespace mfem::future
-{
-
-/// @brief FieldDescriptor struct
-///
-/// This struct is used to store information about a field.
-struct FieldDescriptor
-{
-   using data_variant_t =
-      std::variant<const FiniteElementSpace *,
-      const ParFiniteElementSpace *,
-      const QuadratureFunction *,
-      const ParameterSpace *>;
-
-   /// Field ID
-   std::size_t id;
-
-   /// Field variant
-   data_variant_t data;
-
-   /// Default constructor
-   FieldDescriptor() :
-      id(SIZE_MAX), data(data_variant_t{}) {}
-
-   /// Constructor
-   template <typename T>
-   FieldDescriptor(std::size_t field_id, const T* v) :
-      id(field_id), data(v) {}
-
-   bool operator==(const FieldDescriptor& other) const
-   {
-      return id == other.id;
-   }
-
-   bool operator<(const FieldDescriptor& other) const
-   {
-      return id < other.id;
-   }
-
-   friend void swap(FieldDescriptor& a, FieldDescriptor& b)
-   {
-      using std::swap;
-      swap(a.id, b.id);
-      swap(a.data, b.data);
-   }
-};
-
-}
@@ -90,8 +90,8 @@ void map_quadrature_data_to_fields_impl(
   }
   else
   {
-      MFEM_ABORT_KERNEL("quadrature data mapping to field is not implemented"
-                        " for this field descriptor");
+      MFEM_ABORT("quadrature data mapping to field is not implemented for"
+                 " this field descriptor");
   }
 }

@@ -169,9 +169,8 @@ void map_quadrature_data_to_fields_tensor_impl_1d(
   }
   else
   {
-      MFEM_ABORT_KERNEL("quadrature data mapping to field is not implemented"
-                        "for this field descriptor with sum factorization on"
-                        " tensor product elements");
+      MFEM_ABORT("quadrature data mapping to field is not implemented for"
+                 " this field descriptor with sum factorization on tensor product elements");
   }
 }

@@ -307,9 +306,8 @@ void map_quadrature_data_to_fields_tensor_impl_2d(
   }
   else
   {
-      MFEM_ABORT_KERNEL("quadrature data mapping to field is not implemented"
-                        " for this field descriptor with sum factorization on"
-                        " tensor product elements");
+      MFEM_ABORT("quadrature data mapping to field is not implemented for"
+                 " this field descriptor with sum factorization on tensor product elements");
   }
 }

@@ -494,9 +492,8 @@ void map_quadrature_data_to_fields_tensor_impl_3d(
   }
   else
   {
-      MFEM_ABORT_KERNEL("quadrature data mapping to field is not implemented"
-                        " for this field descriptor with sum factorization on"
-                        " tensor product elements");
+      MFEM_ABORT("quadrature data mapping to field is not implemented for"
+                 " this field descriptor with sum factorization on tensor product elements");
   }
 }

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "util.hpp"
-
-namespace mfem::future
-{
-
-struct IntegratorContext
-{
-   const ParMesh &mesh;
-   const Array<int> *elem_attr;
-   Array<int> attr;
-   int nentities;
-   const std::vector<FieldDescriptor> &infds;
-   const std::vector<FieldDescriptor> &outfds;
-   const std::vector<FieldDescriptor> &unionfds;
-   const IntegrationRule &ir;
-   std::unordered_map<std::type_index, std::vector<int>> &in_qlayouts;
-   std::unordered_map<std::type_index, std::vector<int>> &out_qlayouts;
-};
-
-}
@@ -9,23 +9,8 @@
 // terms of the BSD-3 license. We welcome feedback and contributions, see file
 // CONTRIBUTING.md for details.
 #pragma once
-// #define NVTX_COLOR nvtx::kPeru

 #include "util.hpp"
-#include "fem/kernels.hpp"
-
-///////////////////////////////////////////////////////////////////////////////
-template <class T>
-inline std::enable_if_t<!std::numeric_limits<T>::is_integer, bool>
-AlmostEq(T x, T y, T tolerance = 15.0 * std::numeric_limits<T>::epsilon())
-{
-   const T neg = std::abs(x - y);
-   constexpr T min = std::numeric_limits<T>::min();
-   constexpr T eps = std::numeric_limits<T>::epsilon();
-   const T min_abs = std::min(std::abs(x), std::abs(y));
-   if (std::abs(min_abs) == 0.0) { return neg < eps; }
-   return (neg / (1.0 + std::max(min, min_abs))) < tolerance;
-}

 namespace mfem::future
 {
@@ -45,7 +30,6 @@ void map_field_to_quadrature_data_tensor_product_3d(

   if constexpr (is_value_fop<std::decay_t<field_operator_t>>::value)
   {
-      dbg("Value");
      auto [q1d, unused, d1d] = B.GetShape();
      const int vdim = input.vdim;
      const auto field = Reshape(&field_e[0], d1d, d1d, d1d, vdim);
@@ -110,11 +94,10 @@ void map_field_to_quadrature_data_tensor_product_3d(
   else if constexpr (
      is_gradient_fop<std::decay_t<field_operator_t>>::value)
   {
-      // dbg("Gradient");
-      const auto [q1d, B_dim, d1d] = B.GetShape();
+      const auto [q1d, unused, d1d] = B.GetShape();
      const int vdim = input.vdim;
      const int dim = input.dim;
-      const auto field = Reshape(&std::as_const(field_e[0]), d1d, d1d, d1d, vdim);
+      const auto field = Reshape(&field_e[0], d1d, d1d, d1d, vdim);
      auto fqp = Reshape(&field_qp[0], vdim, dim, q1d, q1d, q1d);

      auto s0 = Reshape(&scratch_mem[0](0), d1d, d1d, q1d);
@@ -123,30 +106,7 @@ void map_field_to_quadrature_data_tensor_product_3d(
      auto s3 = Reshape(&scratch_mem[3](0), d1d, q1d, q1d);
      auto s4 = Reshape(&scratch_mem[4](0), d1d, q1d, q1d);

-      // constexpr int MQ1 = T_Q1D > 0 ? T_Q1D : 8;
-      // static constexpr int DIM = 3;
-      // MFEM_VERIFY(q1d <= MQ1, "q1d > MQ1");
-      // MFEM_SHARED real_t smem[MQ1][MQ1];
-
-      // kernels::internal::d_regs3d_t<DIM, MQ1> r0, r1;
-      // real_t sB[MQ1][MQ1], sG[MQ1][MQ1];
-
-      /*
-      {
-         assert(B_dim == 1 && "1D B required!");
-         kernels::internal::LoadMatrix(d1d, q1d, B, sB);
-         kernels::internal::LoadMatrix(d1d, q1d, G, sG);
-         for (int qx = 0; qx < q1d; qx++)
-         {
-            for (int dx = 0; dx < d1d; dx++)
-            {
-               assert(AlmostEq(B(qx, 0, dx), sB[dx][qx]));
-               assert(AlmostEq(G(qx, 0, dx), sG[dx][qx]));
-            }
-         }
-      }*/
-
-      for (int c = 0; c < vdim; c++)
+      for (int vd = 0; vd < vdim; vd++)
      {
         MFEM_FOREACH_THREAD(dz, z, d1d)
         {
@@ -157,7 +117,7 @@ void map_field_to_quadrature_data_tensor_product_3d(
                  real_t uv[2] = {0.0, 0.0};
                  for (int dx = 0; dx < d1d; dx++)
                  {
-                     const real_t f = field(dx, dy, dz, c);
+                     const real_t f = field(dx, dy, dz, vd);
                     uv[0] += f * B(qx, 0, dx);
                     uv[1] += f * G(qx, 0, dx);
                  }
@@ -203,59 +163,19 @@ void map_field_to_quadrature_data_tensor_product_3d(
                     uvw[1] += s3(dz, qy, qx) * B(qz, 0, dz);
                     uvw[2] += s4(dz, qy, qx) * G(qz, 0, dz);
                  }
-                  fqp(c, 0, qx, qy, qz) = uvw[0];
-                  fqp(c, 1, qx, qy, qz) = uvw[1];
-                  fqp(c, 2, qx, qy, qz) = uvw[2];
+                  fqp(vd, 0, qx, qy, qz) = uvw[0];
+                  fqp(vd, 1, qx, qy, qz) = uvw[1];
+                  fqp(vd, 2, qx, qy, qz) = uvw[2];
               }
            }
         }
         MFEM_SYNC_THREAD;
      }
-
-      /*
-      {
-         for (int c = 0; c < vdim; c++)
-         {
-            kernels::internal::LoadDofs3d(d1d, c, field, r0);
-            for (int d = 0; d < DIM; d++)
-            {
-               for (int dz = 0; dz < d1d; dz++)
-               {
-                  for (int dy = 0; dy < d1d; dy++)
-                  {
-                     for (int dx = 0; dx < d1d; dx++)
-                     {
-                        const real_t f = field(dx, dy, dz, c);
-                        assert(AlmostEq(f, r0[d][dz][dy][dx]));
-                     }
-                  }
-               }
-            }
-
-            kernels::internal::Grad3d(d1d, q1d, smem, sB, sG, r0, r1, c);
-            for (int qz = 0; qz < q1d; qz++)
-            {
-               for (int qy = 0; qy < q1d; qy++)
-               {
-                  for (int qx = 0; qx < q1d; qx++)
-                  {
-                     if (!AlmostEq(fqp(c, d, qx, qy, qz), r1[d][qz][qy][qx]))
-                     {
-                        dbg("\x1b[31m[{}:d] {} {}", c, fqp(c, d, qx, qy, qz), r1[d][qz][qy][qx]);
-                        dbg("❌❌❌"), std::exit(EXIT_FAILURE);
-                     }
-                  }
-               }
-            }
-         }
-         // dbg("✅✅✅✅✅✅✅✅✅✅✅✅✅✅✅");//, std::exit(EXIT_SUCCESS);
-      }*/
   }
   // TODO: Create separate function for clarity
   else if constexpr (
      std::is_same_v<std::decay_t<field_operator_t>, Weight>)
   {
-      // dbg("None");
      const int num_qp = integration_weights.GetShape()[0];
      // TODO: eeek
      const int q1d = (int)floor(std::pow(num_qp, 1.0/input.dim) + 0.5);
@@ -598,9 +518,6 @@ void map_fields_to_quadrature_data(
   const int &dimension,
   const bool &use_sum_factorization = false)
 {
-   // dbg();
-   assert(use_sum_factorization && "❌ use_sum_factorization required");
-
   // When the input_to_field map returns -1, this means the requested input
   // is the integration weight. Weights don't have a user defined field
   // attached to them and we create a dummy field which is not accessed
@@ -661,7 +578,6 @@ void map_field_to_quadrature_data_conditional(
   const int &dimension,
   const bool &use_sum_factorization = false)
 {
-   assert(false && "❌ condition not implemented");
   if (condition)
   {
      if (use_sum_factorization)
@@ -703,7 +619,6 @@ void map_fields_to_quadrature_data_conditional(
   const std::array<bool, num_inputs> &conditions,
   const bool &use_sum_factorization = false)
 {
-   assert(false && "❌ condition not implemented");
   for_constexpr<num_inputs>([&](auto i)
   {
      map_field_to_quadrature_data_conditional(
@@ -712,7 +627,7 @@ void map_fields_to_quadrature_data_conditional(
   });
 }

-template <int T_Q1D, size_t num_inputs, typename field_operator_ts>
+template <size_t num_inputs, typename field_operator_ts>
 MFEM_HOST_DEVICE
 void map_direction_to_quadrature_data_conditional(
   std::array<DeviceTensor<2>, num_inputs> &directions_qp,
@@ -745,7 +660,7 @@ void map_direction_to_quadrature_data_conditional(
            }
            else if (dimension == 3)
            {
-               map_field_to_quadrature_data_tensor_product_3d<T_Q1D>(
+               map_field_to_quadrature_data_tensor_product_3d(
                  directions_qp[i], dtqmaps[i], direction_e, get<i>(fops),
                  integration_weights, scratch_mem);
            }
@@ -43,7 +43,7 @@ public:
   /// Get spatial dimension
   ///
   /// returns always 1.
-   constexpr int Dimension() const
+   int Dimension() const
   {
      return 1;
   }
@@ -74,14 +74,11 @@ public:
      return elem_restr.get();
   }

-   virtual const Operator* GetB() const = 0;
-
-   virtual const Operator* GetBt() const = 0;
-
 protected:
   int vdim;
   DofToQuad dtq;
-   mutable std::unique_ptr<Operator> prolongation, elem_restr, B, Bt;
+   mutable std::unique_ptr<Operator> prolongation;
+   mutable std::unique_ptr<Operator> elem_restr;
 };

 /// @brief Uniform parameter space
@@ -125,18 +122,6 @@ public:
      return lsize;
   }

-   const Operator* GetB() const override
-   {
-      MFEM_ABORT("UniformParameterSpace does not support GetB");
-      return nullptr;
-   }
-
-   const Operator* GetBt() const override
-   {
-      MFEM_ABORT("UniformParameterSpace does not support GetBt");
-      return nullptr;
-   }
-
 private:
   /// T-vector size
   int tsize;
@@ -243,8 +243,6 @@ void process_qf_arg(
   }
 }

-// const tensor<real_t, DIM>       ∇u
-// const tensor<real_t, DIM, DIM>  D (PA_DATA)
 template <typename arg_type>
 MFEM_HOST_DEVICE inline
 void process_qf_arg(const DeviceTensor<2> &u, arg_type &arg, int qp)
@@ -1,76 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-#pragma once
-
-#include "tuple.hpp"
-#include "../linalg/tensor.hpp"
-
-using namespace mfem::future;
-using mfem::future::tensor;
-
-// Helper to add dimension to tensor type
-template<typename T, int qp>
-struct AddQPDimension;
-
-// Specialization for tensor<real_t, dim>
-template<typename real_t, int dim, int qp>
-struct AddQPDimension<tensor<real_t, dim>, qp>
-{
-   using type = tensor<real_t, dim, qp>;
-};
-
-// Specialization for tensor<real_t, dim, dim>
-template<typename real_t, int dim, int qp>
-struct AddQPDimension<tensor<real_t, dim, dim>, qp>
-{
-   using type = tensor<real_t, dim, dim, qp>;
-};
-
-// Specialization for real_t (transforms to tensor<real_t, qp>)
-template<typename real_t, int qp>
-struct AddQPDimension
-{
-   using type = tensor<real_t, qp>;
-};
-
-// Helper to transform tuple
-template<typename Tuple, int qp>
-struct TransformTupleQP {};
-
-// Specialization for mfem::future::tuple
-template<int qp, typename... Types>
-struct TransformTupleQP<mfem::future::tuple<Types...>, qp>
-{
-   using type = mfem::future::tuple<typename AddQPDimension<Types, qp>::type...>;
-};
-
-template<int qp, typename... Types>
-struct TransformTupleQP<std::tuple<Types...>, qp>
-{
-   using type = std::tuple<typename AddQPDimension<Types, qp>::type...>;
-};
-
-// Function to transform tuple type with qp dimension
-template<int qp, typename qf_param_ts>
-struct add_qp_dimension
-{
-   using type = typename TransformTupleQP<qf_param_ts, qp>::type;
-};
-
-// Helper alias template for cleaner usage
-template<int qp, typename qf_param_ts>
-using add_qp_dimension_t = typename add_qp_dimension<qp, qf_param_ts>::type;
-
-// ...AddDomainIntegrator...
-// {
-//    constexpr int Q1D = 4;
-//    using qf_param_augmentd_ts = add_qp_dimension_t<Q1D, decay_tuple<qf_param_ts>>;
-// }
@@ -21,7 +21,6 @@
 #include <type_traits>
 #include <numeric>
 #include <iomanip>
-#include <typeindex>

 #include "../../general/communication.hpp"
 #include "../../general/forall.hpp"
@@ -29,19 +28,13 @@
 #include "../fe/fe_base.hpp"
 #include "../fespace.hpp"
 #include "../pfespace.hpp"
-#include "../qfunction.hpp"
 #include "../../mesh/mesh.hpp"
 #include "../../linalg/dtensor.hpp"
-#include "../quadinterpolator.hpp"

-#include "fielddescriptor.hpp"
 #include "fieldoperator.hpp"
 #include "parameterspace.hpp"
 #include "tuple.hpp"

-#undef NVTX_COLOR
-#define NVTX_COLOR ::nvtx::kLightBlue
-
 namespace mfem::future
 {

@@ -82,7 +75,7 @@ constexpr void for_constexpr(lambda&& f,
 }

 template <typename lambda>
-constexpr void for_constexpr(lambda&&, std::integer_sequence<std::size_t>) {}
+constexpr void for_constexpr(lambda&& f, std::integer_sequence<std::size_t>) {}

 template <int... n, typename lambda>
 constexpr void for_constexpr(lambda&& f)
@@ -91,7 +84,7 @@ constexpr void for_constexpr(lambda&& f)
 }

 template <typename lambda, typename arg_t>
-constexpr void for_constexpr_with_arg(lambda&&, arg_t&&,
+constexpr void for_constexpr_with_arg(lambda&& f, arg_t&& arg,
                                      std::integer_sequence<std::size_t>)
 {
   // Base case - do nothing for empty sequence
@@ -115,16 +108,6 @@ constexpr void for_constexpr_with_arg(lambda&& f, arg_t&& arg)
                          indices{});
 }

-template <auto start, auto end, auto inc = 1, typename F>
-constexpr void constexpr_for(F&& f)
-{
-   if constexpr (start < end)
-   {
-      f(std::integral_constant<decltype(start), start>());
-      constexpr_for<start + inc, end, inc>(f);
-   }
-}
-
 template <std::size_t I, typename Tuple, std::size_t... Is>
 std::array<bool, sizeof...(Is)>
 make_dependency_array(const Tuple& inputs, std::index_sequence<Is...>)
@@ -461,21 +444,6 @@ struct create_function_signature<output_t (*)(input_ts...)>
   using type = FunctionSignature<output_t(input_ts...)>;
 };

-template <typename...>
-using void_t = void;
-
-template <typename T, typename = void>
-struct get_function_signature
-{
-   using type = typename create_function_signature<T>::type;
-};
-
-template <typename T>
-struct get_function_signature<T, void_t<decltype(&T::operator())>>
-{
-   using type = typename create_function_signature<decltype(&T::operator())>::type;
-};
-
 template <typename T>
 constexpr int GetFieldId()
 {
@@ -570,12 +538,38 @@ auto get_marked_entries(
 /// @param t the tuple to filter fields from.
 /// @returns a tuple containing only the fields with field IDs not equal to -1.
 template <typename... Ts>
-constexpr auto filter_fields(const std::tuple<Ts...>&)
+constexpr auto filter_fields(const std::tuple<Ts...>& t)
 {
   return std::tuple_cat(
             std::conditional_t<Ts::GetFieldId() != -1, std::tuple<Ts>, std::tuple<>> {}...);
 }

+/// @brief FieldDescriptor struct
+///
+/// This struct is used to store information about a field.
+struct FieldDescriptor
+{
+   using data_variant_t =
+      std::variant<const FiniteElementSpace *,
+      const ParFiniteElementSpace *,
+      const ParameterSpace *>;
+
+   /// Field ID
+   std::size_t id;
+
+   /// Field variant
+   data_variant_t data;
+
+   /// Default constructor
+   FieldDescriptor() :
+      id(SIZE_MAX), data(data_variant_t{}) {}
+
+   /// Constructor
+   template <typename T>
+   FieldDescriptor(std::size_t field_id, const T* v) :
+      id(field_id), data(v) {}
+};
+
 namespace dfem
 {
 template <class... T> constexpr bool always_false = false;
@@ -605,7 +599,7 @@ struct ThreadBlocks

 #if defined(MFEM_USE_CUDA_OR_HIP)
 template <typename func_t>
-__global__ void forall_kernel_extern_shmem(func_t f, int n)
+__global__ void forall_kernel_shmem(func_t f, int n)
 {
   int i = blockIdx.x;
   extern __shared__ real_t shmem[];
@@ -614,48 +608,23 @@ __global__ void forall_kernel_extern_shmem(func_t f, int n)
      f(i, shmem);
   }
 }
-template <typename func_t>
-__global__ void forall_kernel_static_smem(func_t f, int n)
-{
-   int i = blockIdx.x;
-   if (i >= n) { return; }
-   f(i, nullptr);
-}
-template <int MAX_THREADS_PER_BLOCK, typename func_t>
-__global__
-MFEM_LAUNCH_BOUNDS(MAX_THREADS_PER_BLOCK)
-static void forall_kernel_static_smem_launch_bounds(func_t f, int n)
-{
-   for (int k = blockIdx.x; k < n; k += gridDim.x) { f(k, nullptr); }
-}
 #endif

-template </*typename kernel_tag,*/ typename func_t>
+template <typename func_t>
 void forall(func_t f,
            const int &N,
-            [[maybe_unused]] const ThreadBlocks &blocks,
-            [[maybe_unused]] int num_shmem = 0,
+            const ThreadBlocks &blocks,
+            int num_shmem = 0,
            real_t *shmem = nullptr)
 {
-   db1();
   if (Device::Allows(Backend::CUDA_MASK) ||
       Device::Allows(Backend::HIP_MASK))
   {
 #if defined(MFEM_USE_CUDA_OR_HIP)
      // int gridsize = (N + Z - 1) / Z;
      int num_bytes = num_shmem * sizeof(decltype(shmem));
-      db1("num_bytes:{}", num_bytes);
-      db1("block: {}x{}x{}", blocks.x, blocks.y, blocks.z);
      dim3 block_size(blocks.x, blocks.y, blocks.z);
-      // ForallKernel<kernel_tag>::run<<<N, block_size, num_bytes>>>(f, N);
-      if (num_bytes > 0)
-      {
-         forall_kernel_extern_shmem<<<N, block_size, num_bytes>>>(f, N);
-      }
-      else
-      {
-         forall_kernel_static_smem<<<N, block_size>>>(f, N);
-      }
+      forall_kernel_shmem<<<N, block_size, num_bytes>>>(f, N);
 #if defined(MFEM_USE_CUDA)
      MFEM_GPU_CHECK(cudaGetLastError());
 #elif defined(MFEM_USE_HIP)
@@ -666,7 +635,6 @@ void forall(func_t f,
   }
   else if (Device::Allows(Backend::CPU_MASK))
   {
-      db1("CPU_MASK");
      MFEM_ASSERT(!((bool)num_shmem != (bool)shmem),
                  "Backend::CPU needs a pre-allocated shared memory block");
      for (int i = 0; i < N; i++)
@@ -680,69 +648,6 @@ void forall(func_t f,
   }
 }

-namespace dfem
-{
-
-template <int MAX_THREADS_PER_BLOCK = 0, typename func_t>
-void forall(func_t f,
-            const int &N,
-            [[maybe_unused]] const ThreadBlocks &blocks,
-            [[maybe_unused]] int num_shmem = 0,
-            real_t *shmem = nullptr)
-{
-   db1();
-   if (Device::Allows(Backend::CUDA_MASK) ||
-       Device::Allows(Backend::HIP_MASK))
-   {
-#if defined(MFEM_USE_CUDA_OR_HIP)
-      int num_bytes = num_shmem * sizeof(decltype(shmem));
-      db1("num_bytes:{}", num_bytes);
-      db1("block: {}x{}x{}", blocks.x, blocks.y, blocks.z);
-      db1("MAX_THREADS_PER_BLOCK:{}", MAX_THREADS_PER_BLOCK);
-      dim3 block_size(blocks.x, blocks.y, blocks.z);
-      if constexpr (MAX_THREADS_PER_BLOCK > 0)
-      {
-         assert(num_bytes == 0);
-         forall_kernel_static_smem_launch_bounds
-         <MAX_THREADS_PER_BLOCK><<<N, block_size>>> (f, N);
-      }
-      else
-      {
-         static_assert(MAX_THREADS_PER_BLOCK == 0);
-         if (num_bytes == 0)
-         {
-            forall_kernel_static_smem<<<N, block_size>>>(f, N);
-         }
-         else
-         {
-            forall_kernel_extern_shmem<<<N, block_size, num_bytes>>>(f, N);
-         }
-      }
-#if defined(MFEM_USE_CUDA)
-      MFEM_GPU_CHECK(cudaGetLastError());
-#elif defined(MFEM_USE_HIP)
-      MFEM_GPU_CHECK(hipGetLastError());
-#endif
-      // MFEM_DEVICE_SYNC; // ⚠️
-#endif
-   }
-   else if (Device::Allows(Backend::CPU_MASK))
-   {
-      db1("CPU_MASK");
-      MFEM_ASSERT(!((bool)num_shmem != (bool)shmem),
-                  "Backend::CPU needs a pre-allocated shared memory block");
-      for (int i = 0; i < N; i++)
-      {
-         f(i, shmem);
-      }
-   }
-   else
-   {
-      MFEM_ABORT("no compute backend available");
-   }
-}
-}
-
 /// @todo To be removed.
 class FDJacobian : public Operator
 {
@@ -867,10 +772,6 @@ int GetVSize(const FieldDescriptor &f)
      {
         return arg->GetVSize();
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return arg->Size();
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         return arg->GetVSize();
@@ -909,10 +810,6 @@ void GetElementVDofs(const FieldDescriptor &f, int el, Array<int> &vdofs)
      {
         arg->GetElementVDofs(el, vdofs);
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         MFEM_ABORT("internal error");
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         MFEM_ABORT("internal error");
@@ -947,10 +844,6 @@ int GetTrueVSize(const FieldDescriptor &f)
      {
         return arg->GetTrueVSize();
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return arg->Size();
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         return arg->GetTrueVSize();
@@ -981,10 +874,6 @@ int GetVDim(const FieldDescriptor &f)
      {
         return arg->GetVDim();
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return arg->GetVDim();
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         return arg->GetVDim();
@@ -1020,10 +909,6 @@ int GetDimension(const FieldDescriptor &f)
            return arg->GetMesh()->Dimension() - 1;
         }
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return arg->GetSpace()->GetMesh()->Dimension();
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         return arg->Dimension();
@@ -1036,36 +921,6 @@ int GetDimension(const FieldDescriptor &f)
   }, f.data);
 }

-inline
-std::variant<const QuadratureInterpolator *, const Operator *>get_qinterp(
-   const FieldDescriptor &f,
-   const IntegrationRule &ir)
-{
-   return std::visit([&ir](auto && arg) -> const QuadratureInterpolator*
-   {
-      using T = std::decay_t<decltype(arg)>;
-      if constexpr (std::is_same_v<T, const FiniteElementSpace *> ||
-                    std::is_same_v<T, const ParFiniteElementSpace *>)
-      {
-         return arg->GetQuadratureInterpolator(ir);
-      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         // QuadratureFunction doesn't need a QuadratureInterpolator
-         return nullptr;
-      }
-      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
-      {
-         return nullptr;
-      }
-      else
-      {
-         static_assert(dfem::always_false<T>, "internal error");
-      }
-
-      return nullptr; // Unreachable, but avoids compiler warning
-   }, f.data);
-}

 /// @brief Get the prolongation operator for a field descriptor.
 ///
@@ -1074,7 +929,6 @@ std::variant<const QuadratureInterpolator *, const Operator *>get_qinterp(
 inline
 const Operator *get_prolongation(const FieldDescriptor &f)
 {
-   NVTX("get P");
   return std::visit([](auto&& arg) -> const Operator*
   {
      using T = std::decay_t<decltype(arg)>;
@@ -1083,10 +937,6 @@ const Operator *get_prolongation(const FieldDescriptor &f)
      {
         return arg->GetProlongationMatrix();
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return nullptr;
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         return arg->GetProlongationMatrix();
@@ -1109,7 +959,6 @@ inline
 const Operator *get_element_restriction(const FieldDescriptor &f,
                                        ElementDofOrdering o)
 {
-   NVTX("get ER");
   return std::visit([&o](auto&& arg) -> const Operator*
   {
      using T = std::decay_t<decltype(arg)>;
@@ -1118,10 +967,6 @@ const Operator *get_element_restriction(const FieldDescriptor &f,
      {
         return arg->GetElementRestriction(o);
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return nullptr;
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         return arg->GetElementRestriction(o);
@@ -1149,7 +994,6 @@ const Operator *get_face_restriction(const FieldDescriptor &f,
                                     FaceType ft,
                                     L2FaceValues m)
 {
-   NVTX("get FR");
   return std::visit([&o, &ft, &m](auto&& arg) -> const Operator*
   {
      using T = std::decay_t<decltype(arg)>;
@@ -1158,11 +1002,6 @@ const Operator *get_face_restriction(const FieldDescriptor &f,
      {
         return arg->GetFaceRestriction(o, ft, m);
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         // QuadratureFunction does not support face restrictions
-         MFEM_ABORT("internal error");
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         // ParameterSpace does not support face restrictions
@@ -1188,7 +1027,6 @@ inline
 const Operator *get_restriction(const FieldDescriptor &f,
                                const ElementDofOrdering &o)
 {
-   NVTX("get R");
   if constexpr (std::is_same_v<entity_t, Entity::Element>)
   {
      return get_element_restriction(f, o);
@@ -1214,14 +1052,12 @@ inline std::tuple<std::function<void(const Vector&, Vector&)>, int>
 get_restriction_transpose(
   const FieldDescriptor &f,
   const ElementDofOrdering &o,
-   [[maybe_unused]] const fop_t &fop)
+   const fop_t &fop)
 {
-   NVTX("get R^T");
   if constexpr (is_sum_fop<fop_t>::value)
   {
      auto RT = [=](const Vector &v_e, Vector &v_l)
      {
-         NVTX("R^T sum");
         v_l += v_e;
      };
      return std::make_tuple(RT, 1);
@@ -1231,7 +1067,6 @@ get_restriction_transpose(
      const Operator *R = get_restriction<entity_t>(f, o);
      std::function<void(const Vector&, Vector&)> RT = [=](const Vector &x, Vector &y)
      {
-         NVTX("R^T+");
         R->AddMultTranspose(x, y);
      };
      return std::make_tuple(RT, R->Height());
@@ -1251,26 +1086,11 @@ get_restriction_transpose(
 inline
 void prolongation(const FieldDescriptor field, const Vector &x, Vector &field_l)
 {
-   NVTX("P");
   const auto P = get_prolongation(field);
-
-   NVTX_INI("SetSize");
   field_l.SetSize(P->Height());
-   NVTX_END("SetSize");
-
-   NVTX_INI("P->Mult");
   P->Mult(x, field_l);
 }

-inline
-void prolongation_transpose(
-   const FieldDescriptor &field, const Vector &field_l, Vector &x)
-{
-   const auto P = get_prolongation(field);
-   x.SetSize(P->Width());
-   P->MultTranspose(field_l, x);
-}
-
 /// @brief Apply the prolongation operator to a vector of fields.
 ///
 /// x is a long vector containing the data for all fields on tdofs and
@@ -1287,7 +1107,6 @@ void prolongation(const std::array<FieldDescriptor, N> fields,
                  const Vector &x,
                  std::array<Vector, M> &fields_l)
 {
-   NVTX("P");
   int data_offset = 0;
   for (int i = 0; i < N; i++)
   {
@@ -1295,14 +1114,9 @@ void prolongation(const std::array<FieldDescriptor, N> fields,
      const int width = P->Width();
      // const Vector x_i(x.GetData() + data_offset, width);
      const Vector x_i(const_cast<Vector&>(x), data_offset, width);
-
-      NVTX_INI("SetSize");
      fields_l[i].SetSize(P->Height());
-      NVTX_END("SetSize");

-      NVTX_INI("P->Mult");
      P->Mult(x_i, fields_l[i]);
-      NVTX_END("P->Mult");
      data_offset += width;
   }
 }
@@ -1316,259 +1130,20 @@ void prolongation(const std::array<FieldDescriptor, N> fields,
 /// @param fields the array of field descriptors.
 /// @param x the input vector in tdofs.
 /// @param fields_l the array of output vectors in vdofs.
-// inline
-// void prolongation(const std::vector<FieldDescriptor> fields,
-//                   const Vector &x,
-//                   std::vector<Vector> &fields_l)
-// {
-//    int data_offset = 0;
-//    for (std::size_t i = 0; i < fields.size(); i++)
-//    {
-//       const auto P = get_prolongation(fields[i]);
-//       const int width = P->Width();
-//       const Vector x_i(const_cast<Vector&>(x), data_offset, width);
-//       fields_l[i].SetSize(P->Height());
-//       P->Mult(x_i, fields_l[i]);
-//       data_offset += width;
-//    }
-// }
-
 inline
-void prolongation(
-   const std::vector<FieldDescriptor> fields,
-   const BlockVector &x,
-   std::vector<Vector *> &x_l)
+void prolongation(const std::vector<FieldDescriptor> fields,
+                  const Vector &x,
+                  std::vector<Vector> &fields_l)
 {
-   MFEM_ASSERT(x.NumBlocks() == static_cast<int>(x_l.size()),
-               "error " << x.NumBlocks() << " vs " << x_l.size());
-   for (int i = 0; i < x.NumBlocks(); i++)
+   int data_offset = 0;
+   for (std::size_t i = 0; i < fields.size(); i++)
   {
      const auto P = get_prolongation(fields[i]);
-
-      // If nullptr, assume Identity.
-      if (P == nullptr)
-      {
-         *x_l[i] = x.GetBlock(i);
-      }
-      else
-      {
-         const auto P = get_prolongation(fields[i]);
-         MFEM_ASSERT(P->Width() == x.GetBlock(i).Size(),
-                     "prolongation not applicable to given input data size " <<
-                     P->Width() << " vs " << x.GetBlock(i).Size());
-         MFEM_ASSERT(P->Height() == x_l[i]->Size(),
-                     "prolongation not applicable to given output data size " <<
-                     P->Height() << " vs " << x_l[i]->Size());
-         P->Mult(x.GetBlock(i), *x_l[i]);
-      }
-   }
-}
-
-inline
-void prolongation(
-   const std::vector<FieldDescriptor> fields,
-   const MultiVector &x,
-   std::vector<Vector *> &x_l)
-{
-   MFEM_ASSERT(x.NumBlocks() == static_cast<int>(x_l.size()),
-               "error " << x.NumBlocks() << " vs " << x_l.size());
-   for (int i = 0; i < x.NumBlocks(); i++)
-   {
-      const auto P = get_prolongation(fields[i]);
-
-      // If nullptr, assume Identity.
-      if (P == nullptr)
-      {
-         *x_l[i] = x[i];
-      }
-      else
-      {
-         const auto P = get_prolongation(fields[i]);
-         MFEM_ASSERT(P->Width() == x[i].Size(),
-                     "prolongation not applicable to given input data size " <<
-                     P->Width() << " vs " << x[i].Size());
-         MFEM_ASSERT(P->Height() == x_l[i]->Size(),
-                     "prolongation not applicable to given output data size " <<
-                     P->Height() << " vs " << x_l[i]->Size());
-         P->Mult(x[i], *x_l[i]);
-      }
-   }
-}
-
-inline
-void prolongation_transpose(
-   const std::vector<FieldDescriptor> fields,
-   const std::vector<Vector *> &x_l,
-   BlockVector &x)
-{
-   MFEM_ASSERT(static_cast<int>(x_l.size()) == x.NumBlocks(),
-               "error " << x_l.size() << " vs " << x.NumBlocks());
-   for (size_t i = 0; i < x_l.size(); i++)
-   {
-      const auto P = get_prolongation(fields[i]);
-
-      // If nullptr, assume Identity.
-      if (P == nullptr)
-      {
-         x.GetBlock(i) = *x_l[i];
-      }
-      else
-      {
-         MFEM_ASSERT(P->Height() == x_l[i]->Size(),
-                     "prolongation not applicable to given input data size " <<
-                     P->Height() << " vs " << x_l[i]->Size());
-         MFEM_ASSERT(P->Width() == x.GetBlock(i).Size(),
-                     "prolongation not applicable to given output data size " <<
-                     P->Width() << " vs " << x.GetBlock(i).Size());
-         P->MultTranspose(*x_l[i], x.GetBlock(i));
-      }
-   }
-}
-
-inline
-void prolongation_transpose(
-   const std::vector<FieldDescriptor> fields,
-   const std::vector<Vector *> &x_l,
-   MultiVector &x)
-{
-   MFEM_ASSERT(static_cast<int>(x_l.size()) == x.NumBlocks(),
-               "error " << x_l.size() << " vs " << x.NumBlocks());
-   for (size_t i = 0; i < x_l.size(); i++)
-   {
-      const auto P = get_prolongation(fields[i]);
-
-      // If nullptr, assume Identity.
-      if (P == nullptr)
-      {
-         x[i] = *x_l[i];
-      }
-      else
-      {
-         MFEM_ASSERT(P->Height() == x_l[i]->Size(),
-                     "prolongation not applicable to given input data size " <<
-                     P->Height() << " vs " << x_l[i]->Size());
-         MFEM_ASSERT(P->Width() == x[i].Size(),
-                     "prolongation not applicable to given output data size " <<
-                     P->Width() << " vs " << x[i].Size());
-         P->MultTranspose(*x_l[i], x[i]);
-      }
-   }
-}
-
-template <typename entity_t>
-void restriction(
-   const std::vector<FieldDescriptor> fields,
-   const std::vector<Vector *> &x_l,
-   std::vector<Vector *> &x_e)
-{
-   MFEM_ASSERT(x_l.size() == x_e.size(),
-               "internal error " << x_l.size() << " vs " << x_e.size());
-   for (size_t i = 0; i < fields.size(); i++)
-   {
-      int s = 0;
-      const auto R = get_restriction<entity_t>(
-                        fields[i], ElementDofOrdering::LEXICOGRAPHIC);
-
-      // If nullptr, assume Identity.
-      if (R == nullptr)
-      {
-         s = x_l[i]->Size();
-      }
-      else
-      {
-         s = R->Height();
-      }
-
-      // TODO
-      if (x_e[i] == nullptr)
-      {
-         x_e[i] = new Vector(s);
-      }
-      x_e[i]->SetSize(s);
-
-      if (R == nullptr)
-      {
-         x_e[i] = x_l[i];
-      }
-      else
-      {
-         MFEM_ASSERT(R->Width() == x_l[i]->Size(),
-                     "restriction not applicable to given input data size " <<
-                     R->Width() << " vs " << x_l[i]->Size());
-         R->Mult(*x_l[i], *x_e[i]);
-      }
-   }
-}
-
-template <typename entity_t>
-void prepare_residual(
-   const std::vector<FieldDescriptor> &fields,
-   std::vector<Vector *> &r_e)
-{
-   for (size_t i = 0; i < fields.size(); i++)
-   {
-      int s = 0;
-      if (std::holds_alternative<const QuadratureFunction *>(fields[i].data))
-      {
-         const auto fd = std::get<const QuadratureFunction *>(fields[i].data);
-         s = fd->Size();
-      }
-      else
-      {
-         const auto R = get_restriction<entity_t>(
-                           fields[i], ElementDofOrdering::LEXICOGRAPHIC);
-         s = R->Height();
-      }
-
-      // TODO
-      if (r_e[i] == nullptr)
-      {
-         r_e[i] = new Vector(s);
-      }
-      else
-      {
-         r_e[i]->SetSize(s);
-      }
-   }
-}
-
-template <typename entity_t>
-void restriction_transpose(
-   const std::vector<FieldDescriptor> &fields,
-   const std::vector<Vector *> &x_e,
-   std::vector<Vector *> &x_l)
-{
-   for (size_t i = 0; i < fields.size(); i++)
-   {
-      int s = 0;
-      const auto R = get_restriction<entity_t>(
-                        fields[i], ElementDofOrdering::LEXICOGRAPHIC);
-      // TODO: if nullptr, assume Identity
-      if (R == nullptr)
-      {
-         s = x_e[i]->Size();
-      }
-      else
-      {
-         s = R->Width();
-      }
-
-      // TODO
-      if (x_l[i] == nullptr)
-      {
-         x_l[i] = new Vector(s);
-      }
-      x_l[i]->SetSize(s);
-
-      // TODO: if nullptr, assume Identity
-      if (R == nullptr)
-      {
-         x_l[i] = x_e[i];
-      }
-      else
-      {
-         R->MultTranspose(*x_e[i], *x_l[i]);
-      }
+      const int width = P->Width();
+      const Vector x_i(const_cast<Vector&>(x), data_offset, width);
+      fields_l[i].SetSize(P->Height());
+      P->Mult(x_i, fields_l[i]);
+      data_offset += width;
   }
 }

@@ -1577,7 +1152,6 @@ void get_lvectors(const std::vector<FieldDescriptor> fields,
                  const Vector &x,
                  std::vector<Vector> &fields_l)
 {
-   NVTX("get_lvectors");
   int data_offset = 0;
   for (std::size_t i = 0; i < fields.size(); i++)
   {
@@ -1604,15 +1178,13 @@ template <typename fop_t>
 inline
 std::function<void(const Vector&, Vector&)> get_prolongation_transpose(
   const FieldDescriptor &f,
-   [[maybe_unused]] const fop_t &fop,
+   const fop_t &fop,
   MPI_Comm mpi_comm)
 {
-   NVTX("get P^T");
   if constexpr (is_sum_fop<fop_t>::value)
   {
      auto PT = [=](const Vector &r_local, Vector &y)
      {
-         NVTX("P^T sum");
         MFEM_ASSERT(y.Size() == 1, "output size doesn't match kernel description");
         real_t local_sum = r_local.Sum();
         MPI_Allreduce(&local_sum, y.GetData(), 1, MPI_DOUBLE, MPI_SUM, mpi_comm);
@@ -1623,7 +1195,6 @@ std::function<void(const Vector&, Vector&)> get_prolongation_transpose(
   {
      auto PT = [=](const Vector &r_local, Vector &y)
      {
-         NVTX("P^T Identity");
         y = r_local;
      };
      return PT;
@@ -1631,7 +1202,6 @@ std::function<void(const Vector&, Vector&)> get_prolongation_transpose(
   const Operator *P = get_prolongation(f);
   auto PT = [=](const Vector &r_local, Vector &y)
   {
-      NVTX("P^T");
      P->MultTranspose(r_local, y);
   };
   return PT;
@@ -1650,19 +1220,12 @@ void restriction(const FieldDescriptor u,
                 Vector &field_e,
                 ElementDofOrdering ordering)
 {
-   NVTX("R");
   const auto R = get_restriction<entity_t>(u, ordering);
   MFEM_ASSERT(R->Width() == u_l.Size(),
               "restriction not applicable to given data size");
   const int height = R->Height();
-
-   NVTX_INI("SetSize");
   field_e.SetSize(height);
-   NVTX_END("SetSize");
-
-   NVTX_INI("R->Mult");
   R->Mult(u_l, field_e);
-   NVTX_END("R->Mult");
 }

 /// @brief Apply the restriction operator to a vector of fields.
@@ -1680,29 +1243,14 @@ void restriction(const std::vector<FieldDescriptor> u,
                 ElementDofOrdering ordering,
                 const int offset = 0)
 {
-   NVTX("R");
   for (std::size_t i = 0; i < u.size(); i++)
   {
      const auto R = get_restriction<entity_t>(u[i], ordering);
      MFEM_ASSERT(R->Width() == u_l[i].Size(),
                  "restriction not applicable to given data size");
      const int height = R->Height();
-
-      // NVTX_INI("SetSize");
      fields_e[i + offset].SetSize(height);
-      // NVTX_END("SetSize");
-
-      // NVTX_INI("R->Mult");
-      if (dynamic_cast<const IdentityOperator*>(R))
-      {
-         NVTX("Identity");
-         fields_e[i + offset].NewMemoryAndSize(u_l[i].GetMemory(), u_l[i].Size(), false);
-      }
-      else
-      {
-         R->Mult(u_l[i], fields_e[i + offset]);
-      }
-      // NVTX_END("R->Mult");
+      R->Mult(u_l[i], fields_e[i + offset]);
   }
 }

@@ -1714,21 +1262,14 @@ void element_restriction(const std::array<FieldDescriptor, N> u,
                         ElementDofOrdering ordering,
                         const int offset = 0)
 {
-   NVTX("ER");
   for (int i = 0; i < N; i++)
   {
      const auto R = get_element_restriction(u[i], ordering);
      MFEM_ASSERT(R->Width() == u_l[i].Size(),
                  "element restriction not applicable to given data size");
      const int height = R->Height();
-
-      NVTX_INI("SetSize");
      fields_e[i + offset].SetSize(height);
-      NVTX_END("SetSize");
-
-      NVTX_INI("R->Mult");
      R->Mult(u_l[i], fields_e[i + offset]);
-      NVTX_END("R->Mult");
   }
 }

@@ -1785,10 +1326,6 @@ const DofToQuad *GetDofToQuad(const FieldDescriptor &f,
            return &arg->GetTypicalTraceElement()->GetDofToQuad(ir, mode);
         }
      }
-      else if constexpr (std::is_same_v<T, const QuadratureFunction *>)
-      {
-         return nullptr;
-      }
      else if constexpr (std::is_same_v<T, const ParameterSpace *>)
      {
         return &arg->GetDofToQuad();
@@ -1920,7 +1457,7 @@ create_descriptors_to_fields_map(

   auto f = [&](auto &fop, auto &map)
   {
-      if constexpr (is_weight_fop<std::decay_t<decltype(fop)>>::value)
+      if constexpr (std::is_same_v<std::decay_t<decltype(fop)>, Weight>)
      {
         // TODO-bug: stealing dimension from the first field
         fop.dim = GetDimension<entity_t>(fields[0]);
@@ -2050,7 +1587,7 @@ get_shmem_info(
   const std::array<DofToQuadMap, num_outputs> &output_dtq_maps,
   const std::vector<FieldDescriptor> &fields,
   const int &num_entities,
-   [[maybe_unused]] const input_t &inputs,
+   const input_t &inputs,
   const int &num_qp,
   const std::vector<int> &input_size_on_qp,
   const int &residual_size_on_qp,
@@ -2805,25 +2342,5 @@ std::array<DofToQuadMap, num_fields> create_dtq_maps(
             std::make_index_sequence<num_fields> {});
 }

-struct QLayoutEntry
-{
-   std::type_index type;
-   std::vector<int> layout;
-
-   template <class Fop>
-   QLayoutEntry(Fop, std::initializer_list<int> idx) :
-      type(typeid(Fop)), layout(idx) {}
-};
-
-static void ExtractQLayouts(
-   const std::initializer_list<QLayoutEntry> entries,
-   std::unordered_map<std::type_index, std::vector<int>>& out)
-{
-   for (const auto& e : entries)
-   {
-      out[e.type] = e.layout;
-   }
-}
-
 } // namespace mfem::future
 #endif
@@ -320,8 +320,8 @@ public:
    error estimation procedure where the flux averaging is replaced by a global
    L2 projection (requiring a mass matrix solve).

-    The required BilinearFormIntegrator must implement the method
-    ComputeElementFlux().
+    The required BilinearFormIntegrator must implement the methods
+    ComputeElementFlux() and ComputeFluxEnergy().

    Implemented for the parallel case only.
 */
@@ -357,8 +357,8 @@ protected:

 public:
   /** @brief Construct a new L2ZienkiewiczZhuEstimator object.
-       @param integ    This BilinearFormIntegrator must implement the method
-                       ComputeElementFlux().
+       @param integ    This BilinearFormIntegrator must implement the methods
+                       ComputeElementFlux() and ComputeFluxEnergy().
       @param sol      The solution field whose error is to be estimated.
       @param flux_fes The L2ZienkiewiczZhuEstimator assumes ownership of this
                       FiniteElementSpace and will call its Update() method when
@@ -382,8 +382,8 @@ public:
   { }

   /** @brief Construct a new L2ZienkiewiczZhuEstimator object.
-       @param integ    This BilinearFormIntegrator must implement the method
-                       ComputeElementFlux().
+       @param integ    This BilinearFormIntegrator must implement the methods
+                       ComputeElementFlux() and ComputeFluxEnergy().
       @param sol      The solution field whose error is to be estimated.
       @param flux_fes The L2ZienkiewiczZhuEstimator does NOT assume ownership
                       of this FiniteElementSpace; will call its Update() method
@@ -663,59 +663,58 @@ const
   #pragma omp critical (DofToQuad)
 #endif
   {
-      // Do not run if the new Dof2Quad is already present, e.g. added in a
-      // previous call or added by another omp thread.
+      // If the new Dof2Quad is already present, e.g. added in a previous call
+      // or added by another omp thread, return.
      if (DofToQuad::SearchArray(dof2quad_array, ir,
-                                 DofToQuad::LEXICOGRAPHIC_FULL) == nullptr)
+                                 DofToQuad::LEXICOGRAPHIC_FULL))
+      { return; }
+
+      // Undo the native ordering which is what FiniteElement::GetDofToQuad
+      // returns.
+      auto *d2q_new = new DofToQuad(d2q);
+      d2q_new->mode = DofToQuad::LEXICOGRAPHIC_FULL;
+      const int nqpt = ir.GetNPoints();
+
+      const int b_dim = (range_type == VECTOR) ? dim : 1;
+
+      for (int i = 0; i < nqpt; i++)
      {
-         // Undo the native ordering which is what FiniteElement::GetDofToQuad
-         // returns.
-         auto *d2q_new = new DofToQuad(d2q);
-         d2q_new->mode = DofToQuad::LEXICOGRAPHIC_FULL;
-         const int nqpt = ir.GetNPoints();
-
-         const int b_dim = (range_type == VECTOR) ? dim : 1;
-
-         for (int i = 0; i < nqpt; i++)
+         for (int d = 0; d < b_dim; d++)
         {
-            for (int d = 0; d < b_dim; d++)
+            for (int j = 0; j < dof; j++)
            {
-               for (int j = 0; j < dof; j++)
-               {
-                  const double val = d2q.B[i + nqpt*(d+b_dim*lex_ordering[j])];
-                  d2q_new->B[i+nqpt*(d+b_dim*j)] = val;
-                  d2q_new->Bt[j+dof*(i+nqpt*d)] = val;
-               }
+               const double val = d2q.B[i + nqpt*(d+b_dim*lex_ordering[j])];
+               d2q_new->B[i+nqpt*(d+b_dim*j)] = val;
+               d2q_new->Bt[j+dof*(i+nqpt*d)] = val;
            }
         }
-
-         const int g_dim = [this]()
-         {
-            switch (deriv_type)
-            {
-               case GRAD: return dim;
-               case DIV: return 1;
-               case CURL: return cdim;
-               default: return 0;
-            }
-         }();
-
-         for (int i = 0; i < nqpt; i++)
-         {
-            for (int d = 0; d < g_dim; d++)
-            {
-               for (int j = 0; j < dof; j++)
-               {
-                  const double val = d2q.G[i + nqpt*(d+g_dim*lex_ordering[j])];
-                  d2q_new->G[i+nqpt*(d+g_dim*j)] = val;
-                  d2q_new->Gt[j+dof*(i+nqpt*d)] = val;
-               }
-            }
-         }
-
-         dof2quad_array.Append(d2q_new);
      }

+      const int g_dim = [this]()
+      {
+         switch (deriv_type)
+         {
+            case GRAD: return dim;
+            case DIV: return 1;
+            case CURL: return cdim;
+            default: return 0;
+         }
+      }();
+
+      for (int i = 0; i < nqpt; i++)
+      {
+         for (int d = 0; d < g_dim; d++)
+         {
+            for (int j = 0; j < dof; j++)
+            {
+               const double val = d2q.G[i + nqpt*(d+g_dim*lex_ordering[j])];
+               d2q_new->G[i+nqpt*(d+g_dim*j)] = val;
+               d2q_new->Gt[j+dof*(i+nqpt*d)] = val;
+            }
+         }
+      }
+
+      dof2quad_array.Append(d2q_new);
   }
 }

@@ -1044,50 +1043,9 @@ void VectorFiniteElement::SetDerivMembers()
   switch (map_type)
   {
      case H_DIV:
-         switch (dim)
-         {
-            case 3: // div: 3D H_DIV -> 3D INTEGRAL
-               deriv_type = DIV;
-               deriv_range_type = SCALAR;
-               deriv_map_type = INTEGRAL;
-               break;
-            case 2: // div: 2D H_DIV -> 2D INTEGRAL
-               deriv_type = DIV;
-               deriv_range_type = SCALAR;
-               deriv_map_type = INTEGRAL;
-               break;
-            default:
-               MFEM_ABORT("Invalid dimension, Dim = " << dim);
-         }
-         break;
-      case H_DIV_R2D:
-         switch (dim)
-         {
-            case 2: // div: 2D H_DIV_R2D -> 2D INTEGRAL
-               deriv_type = DIV;
-               deriv_range_type = SCALAR;
-               deriv_map_type = INTEGRAL;
-               break;
-            case 1: // div: 1D H_DIV_R2D -> 1D INTEGRAL
-               deriv_type = DIV;
-               deriv_range_type = SCALAR;
-               deriv_map_type = INTEGRAL;
-               break;
-            default:
-               MFEM_ABORT("Invalid dimension, Dim = " << dim);
-         }
-         break;
-      case H_DIV_R1D:
-         switch (dim)
-         {
-            case 1: // div: 1D H_DIV_R1D -> 1D INTEGRAL
-               deriv_type = DIV;
-               deriv_range_type = SCALAR;
-               deriv_map_type = INTEGRAL;
-               break;
-            default:
-               MFEM_ABORT("Invalid dimension, Dim = " << dim);
-         }
+         deriv_type = DIV;
+         deriv_range_type = SCALAR;
+         deriv_map_type = INTEGRAL;
         break;
      case H_CURL:
         switch (dim)
@@ -1105,49 +1063,13 @@ void VectorFiniteElement::SetDerivMembers()
               break;
            case 1:
               deriv_type = NONE;
-               deriv_range_type = UNKNOWN_RANGE_TYPE;
-               deriv_map_type = UNKNOWN_MAP_TYPE;
+               deriv_range_type = SCALAR;
+               deriv_map_type = INTEGRAL;
               break;
            default:
               MFEM_ABORT("Invalid dimension, Dim = " << dim);
         }
         break;
-      case H_CURL_R2D:
-         switch (dim)
-         {
-            case 2:
-               // curl: 2D H_CURL_R2D -> H_DIV_R2D
-               deriv_type = CURL;
-               deriv_range_type = VECTOR;
-               deriv_map_type = H_DIV_R2D;
-               break;
-            case 1:
-               // curl: 1D H_CURL_R2D -> H_DIV_R2D
-               deriv_type = CURL;
-               deriv_range_type = VECTOR;
-               deriv_map_type = H_DIV_R2D;
-               break;
-            default:
-               MFEM_ABORT("Invalid dimension, Dim = " << dim);
-         }
-         break;
-      case H_CURL_R1D:
-         switch (dim)
-         {
-            case 1:
-               // curl: 1D H_CURL_R1D -> H_DIV_R1D
-               deriv_type = CURL;
-               deriv_range_type = VECTOR;
-               deriv_map_type = H_DIV_R1D;
-               break;
-            case 0:
-               deriv_type = NONE;
-               deriv_range_type = UNKNOWN_RANGE_TYPE;
-               deriv_map_type = UNKNOWN_MAP_TYPE;
-            default:
-               MFEM_ABORT("Invalid dimension, Dim = " << dim);
-         }
-         break;
      default:
         MFEM_ABORT("Invalid MapType = " << map_type);
   }
@@ -295,20 +295,10 @@ public:
                          $ u(x) = (1/w) \hat u(\hat x) $ */
      H_DIV,     /**< For vector fields; preserves surface integrals of the
                          normal component $ u(x) = (J/w) \hat u(\hat x) $ */
-      H_CURL,    /**< For vector fields; preserves line integrals of the
+      H_CURL     /**< For vector fields; preserves line integrals of the
                          tangential component
                          $ u(x) = J^{-t} \hat u(\hat x) $ (square J),
                          $ u(x) = J(J^t J)^{-1} \hat u(\hat x) $ (general J) */
-      H_DIV_R2D, /**< For 3-component vector fields in 2D; equivalent to a
-                          direct sum of an H_DIV basis and an INTEGRAL basis */
-      H_CURL_R2D,/**< For 3-component vector fields in 2D; equivalent to a
-                          direct sum of an H_CURL basis and a VALUE basis */
-      H_DIV_R1D, /**< For 3-component vector fields in 1D; equivalent to a
-                          direct sum of a VALUE basis and a pair of INTEGRAL
-                          bases */
-      H_CURL_R1D /**< For 3-component vector fields in 1D; equivalent to a
-                          direct sum of an INTEGRAL basis and a pair of VALUE
-                          bases */
   };

   /** @brief Enumeration for DerivType: defines which derivative method
@@ -340,28 +330,12 @@ public:
   int GetDim() const { return dim; }

   /** @brief Returns the vector dimension for vector-valued finite elements,
-       which is also the dimension of the interpolation operation and the
-       width of the DenseMatrix argument in
-       CalcVShape(const IntegrationPoint &ip, DenseMatrix &shape). */
+       which is also the dimension of the interpolation operation. */
   int GetRangeDim() const { return vdim; }

-   /** @brief Returns the vector dimension, in physical space, for
-       vector-valued finite elements, which is also the width of the
-       DenseMatrix argument in
-       CalcPhysVShape(ElementTransformation &Trans, DenseMatrix &shape). */
-   virtual int GetPhysRangeDim(int /* space_dim */) const { return vdim; }
-
-   /** Returns the dimension of the curl for vector-valued finite elements,
-       which is also the width of the DenseMatrix argument in
-       CalcCurlShape(const IntegrationPoint &ip, DenseMatrix &curl_shape). */
+   /// Returns the dimension of the curl for vector-valued finite elements.
   int GetCurlDim() const { return cdim; }

-   /** Returns the dimension, in physical space, of the curl for vector-valued
-       finite elements, which is also the width of the DenseMatrix argument in
-       CalcPhysCurlShape(ElementTransformation &Trans, DenseMatrix &curl_shape).
-   */
-   virtual int GetPhysCurlDim(int /* space_dim */) const { return cdim; }
-
   /// Returns the Geometry::Type of the reference element.
   Geometry::Type GetGeomType() const { return geom_type; }

@@ -1016,8 +990,6 @@ protected:
 public:
   VectorFiniteElement(int D, Geometry::Type G, int Do, int O, int M,
                       int F = FunctionSpace::Pk);
-
-   int GetPhysRangeDim(int space_dim) const override { return space_dim; }
 };

 /// @brief Class for computing 1D special polynomials and their associated basis
@@ -589,7 +589,7 @@ void H1_TriangleElement::CalcHessian(const IntegrationPoint &ip,
   Vector   shape_x(p + 1),   shape_y(p + 1),   shape_l(p + 1);
   Vector  dshape_x(p + 1),  dshape_y(p + 1),  dshape_l(p + 1);
   Vector ddshape_x(p + 1), ddshape_y(p + 1), ddshape_l(p + 1);
-   DenseMatrix ddu(dof, (dim*(dim+1))/2);
+   DenseMatrix ddu(dof, dim);
 #endif

   poly1d.CalcBasis(p, ip.x, shape_x, dshape_x, ddshape_x);
@@ -2531,7 +2531,7 @@ void ND_FuentesPyramidElement::calcCurlBasis(const int p,

 ND_R1D_PointElement::ND_R1D_PointElement(int p)
   : VectorFiniteElement(1, Geometry::POINT, 2, p,
-                         H_CURL_R1D, FunctionSpace::Pk)
+                         H_CURL, FunctionSpace::Pk)
 {
   // VectorFiniteElement::SetDerivMembers doesn't support 0D H_CURL elements
   // so we mimic a 1D element and then correct the dimension here.
@@ -2562,7 +2562,7 @@ ND_R1D_SegmentElement::ND_R1D_SegmentElement(const int p,
                                             const int cb_type,
                                             const int ob_type)
   : VectorFiniteElement(1, Geometry::SEGMENT, 3 * p + 2, p,
-                         H_CURL_R1D, FunctionSpace::Pk),
+                         H_CURL, FunctionSpace::Pk),
     dof2tk(dof),
     cbasis1d(poly1d.GetBasis(p, VerifyClosed(cb_type))),
     obasis1d(poly1d.GetBasis(p - 1, VerifyOpen(ob_type)))
@@ -2839,7 +2839,7 @@ ND_R2D_SegmentElement::ND_R2D_SegmentElement(const int p,
                                             const int cb_type,
                                             const int ob_type)
   : VectorFiniteElement(1, Geometry::SEGMENT, 2 * p + 1, p,
-                         H_CURL_R2D, FunctionSpace::Pk),
+                         H_CURL, FunctionSpace::Pk),
     dof2tk(dof),
     cbasis1d(poly1d.GetBasis(p, VerifyClosed(cb_type))),
     obasis1d(poly1d.GetBasis(p - 1, VerifyOpen(ob_type)))
@@ -3023,7 +3023,7 @@ void ND_R2D_SegmentElement::Project(VectorCoefficient &vc,
 ND_R2D_FiniteElement::ND_R2D_FiniteElement(int p, Geometry::Type G, int Do,
                                           const real_t *tk_fe)
   : VectorFiniteElement(2, G, Do, p,
-                         H_CURL_R2D, FunctionSpace::Pk),
+                         H_CURL, FunctionSpace::Pk),
     tk(tk_fe),
     dof_map(dof),
     dof2tk(dof)
@@ -663,9 +663,6 @@ public:
                         const int cb_type = BasisType::GaussLobatto,
                         const int ob_type = BasisType::GaussLegendre);

-   int GetPhysRangeDim(int space_dim) const override { return 2; }
-   int GetPhysCurlDim(int space_dim) const override { return 1; }
-
   void CalcVShape(const IntegrationPoint &ip,
                   DenseMatrix &shape) const override;

@@ -708,9 +705,6 @@ private:
                           DenseMatrix &I) const;

 public:
-   int GetPhysRangeDim(int space_dim) const override { return 3; }
-   int GetPhysCurlDim(int space_dim) const override { return 3; }
-
   using FiniteElement::CalcVShape;
   using FiniteElement::CalcPhysCurlShape;

@@ -2006,7 +2006,7 @@ RT_R1D_SegmentElement::RT_R1D_SegmentElement(const int p,
                                             const int cb_type,
                                             const int ob_type)
   : VectorFiniteElement(1, Geometry::SEGMENT, 3 * p + 4, p + 1,
-                         H_DIV_R1D, FunctionSpace::Pk),
+                         H_DIV, FunctionSpace::Pk),
     dof2nk(dof),
     cbasis1d(poly1d.GetBasis(p + 1, VerifyClosed(cb_type))),
     obasis1d(poly1d.GetBasis(p, VerifyOpen(ob_type)))
@@ -2281,7 +2281,7 @@ const real_t RT_R2D_SegmentElement::nk[2] = { 0.,1.};
 RT_R2D_SegmentElement::RT_R2D_SegmentElement(const int p,
                                             const int ob_type)
   : VectorFiniteElement(1, Geometry::SEGMENT, p + 1, p + 1,
-                         H_DIV_R2D, FunctionSpace::Pk),
+                         H_DIV, FunctionSpace::Pk),
     dof2nk(dof),
     obasis1d(poly1d.GetBasis(p, VerifyOpen(ob_type)))
 {
@@ -2392,7 +2392,7 @@ void RT_R2D_SegmentElement::LocalInterpolation(const VectorFiniteElement &cfe,
 RT_R2D_FiniteElement::RT_R2D_FiniteElement(int p, Geometry::Type G, int Do,
                                           const real_t *nk_fe)
   : VectorFiniteElement(2, G, Do, p + 1,
-                         H_DIV_R2D, FunctionSpace::Pk),
+                         H_DIV, FunctionSpace::Pk),
     nk(nk_fe),
     dof_map(dof),
     dof2nk(dof)
@@ -510,9 +510,6 @@ public:
   RT_R2D_SegmentElement(const int p,
                         const int ob_type = BasisType::GaussLegendre);

-   int GetPhysRangeDim(int space_dim) const override { return 2; }
-   int GetPhysCurlDim(int space_dim) const override { return 0; }
-
   void CalcVShape(const IntegrationPoint &ip,
                   DenseMatrix &shape) const override;

@@ -550,9 +547,6 @@ private:
                           DenseMatrix &I) const;

 public:
-   int GetPhysRangeDim(int space_dim) const override { return 3; }
-   int GetPhysCurlDim(int space_dim) const override { return 0; }
-
   using FiniteElement::CalcVShape;

   void CalcVShape(ElementTransformation &Trans,
@@ -52,7 +52,7 @@
 #include "bounds.hpp"
 #include "particleset.hpp"

-// #include "dfem/doperator.hpp"
+#include "dfem/doperator.hpp"

 #ifdef MFEM_USE_MPI
 #include "pfespace.hpp"
@@ -282,7 +282,14 @@ int FiniteElementSpace::DofToVDof(int dof, int vd, int ndofs_) const
 void FiniteElementSpace::AdjustVDofs(Array<int> &vdofs)
 {
   int n = vdofs.Size(), *vdof = vdofs;
-   for (int i = 0; i < n; i++) { vdof[i] = UnsignIndex(vdof[i]); }
+   for (int i = 0; i < n; i++)
+   {
+      int j;
+      if ((j = vdof[i]) < 0)
+      {
+         vdof[i] = -1-j;
+      }
+   }
 }

 void FiniteElementSpace::GetElementVDofs(int i, Array<int> &vdofs,
@@ -476,14 +483,13 @@ void FiniteElementSpace::ReorderElementToDofTable()
   for (int k = 0, dof_counter = 0; k < nnz; k++)
   {
      const int sdof = J[k]; // signed dof
-      const int dof = UnsignIndex(sdof);
+      const int dof = (sdof < 0) ? -1-sdof : sdof;
      int new_dof = dof_marker[dof];
      if (new_dof < 0)
      {
         dof_marker[dof] = new_dof = dof_counter++;
      }
-      // Preserve the sign of sdof
-      J[k] = (sdof < 0) ? FlipIndexSign(new_dof) : new_dof;
+      J[k] = (sdof < 0) ? -1-new_dof : new_dof; // preserve the sign of sdof
   }
 }

@@ -541,7 +547,7 @@ void MarkDofs(const Array<int> &dofs, Array<int> &mark_array)
 {
   for (auto d : dofs)
   {
-      mark_array[UnsignIndex(d)] = -1;
+      mark_array[d >= 0 ? d : -1 - d] = -1;
   }
 }

@@ -925,7 +931,7 @@ void FiniteElementSpace::AddDependencies(
            if (std::abs(coef) > 1e-12)
            {
               const int mdof = master_dofs[j];
-               if (mdof != sdof && mdof != FlipIndexSign(sdof))
+               if (mdof != sdof && mdof != (-1-sdof))
               {
                  deps.Add(sdof, mdof, coef);
               }
@@ -1018,7 +1024,7 @@ int FiniteElementSpace::GetDegenerateFaceDofs(int index, Array<int> &dofs,
   // FiniteElementSpace::AddDependencies.

   Array<int> edof;
-   int order = GetEdgeDofs(FlipIndexSign(index), edof, variant);
+   int order = GetEdgeDofs(-1 - index, edof, variant);

   int nv = fec->DofForGeometry(Geometry::POINT);
   int ne = fec->DofForGeometry(Geometry::SEGMENT);
@@ -1704,8 +1710,8 @@ SparseMatrix *FiniteElementSpace::RefinementMatrix_main(

         for (int i = 0; i < fine_ldof; i++)
         {
-            const int r = DofToVDof(dofs[i], vd);
-            const int m = UnsignIndex(r);
+            int r = DofToVDof(dofs[i], vd);
+            int m = (r >= 0) ? r : (-1 - r);

            if (!mark[m])
            {
@@ -1766,7 +1772,7 @@ SparseMatrix *FiniteElementSpace::VariableOrderRefinementMatrix(
         for (int i = 0; i < fine_ldof; i++)
         {
            const int r = DofToVDof(dofs[i], vd);
-            const int m = UnsignIndex(r);
+            int m = (r >= 0) ? r : (-1 - r);

            if (!mark[m])
            {
@@ -2476,8 +2482,8 @@ SparseMatrix* FiniteElementSpace::DerefinementMatrix(int old_ndofs,
         {
            if (!std::isfinite(lR(i, 0))) { continue; }

-            const int r = DofToVDof(dofs[i], vd);
-            const int m = UnsignIndex(r);
+            int r = DofToVDof(dofs[i], vd);
+            int m = (r >= 0) ? r : (-1 - r);

            if (is_dg || !mark[m])
            {
@@ -3195,7 +3201,7 @@ void FiniteElementSpace::CalcEdgeFaceVarOrders(
            else
            {
               // degenerate face (i.e., edge-face constraint)
-               slave_orders |= edge_orders[FlipIndexSign(slave.index)];
+               slave_orders |= edge_orders[-1 - slave.index];
            }
         }

@@ -3934,16 +3940,6 @@ const FiniteElement *FiniteElementSpace::GetBE(int i) const
   return BE;
 }

-const FiniteElement *FiniteElementSpace::GetTypicalBE() const
-{
-   if (mesh->GetNBE() > 0) { return GetBE(0); }
-
-   Geometry::Type geom = mesh->GetTypicalFaceGeometry();
-   const FiniteElement *be = fec->FiniteElementForGeometry(geom);
-   MFEM_VERIFY(be != nullptr, "Could not determine a typical BE!");
-   return be;
-}
-
 const FiniteElement *FiniteElementSpace::GetFaceElement(int i) const
 {
   MFEM_VERIFY(!IsVariableOrder(), "not implemented");
@@ -3974,11 +3970,6 @@ const FiniteElement *FiniteElementSpace::GetFaceElement(int i) const
   return fe;
 }

-const FiniteElement *FiniteElementSpace::GetTypicalFaceElement() const
-{
-   return fec->FiniteElementForGeometry(mesh->GetTypicalFaceGeometry());
-}
-
 const FiniteElement *FiniteElementSpace::GetEdgeElement(int i,
                                                        int variant) const
 {
@@ -839,7 +839,7 @@ public:
       Note: For vector-valued elements, the results pads up the range dimension
       to the spatial dimension. E.g., consider a stack of 5 vector-valued
       elements each representing 2D vectors, living in a 3 dimensional space.
-       Then this function would give 15, not 10.
+       Then this fucntion would give 15, not 10.
       */
   int GetVectorDim() const;

@@ -1150,7 +1150,7 @@ public:

   /// Helper to return the DOF associated with a sign encoded DOF
   static inline int DecodeDof(int dof)
-   { return UnsignIndex(dof); }
+   { return (dof >= 0) ? dof : (-1 - dof); }

   /// Helper to determine the DOF and sign of a sign encoded DOF
   static inline int DecodeDof(int dof, real_t& sign)
@@ -1323,24 +1323,12 @@ public:
        associated with i'th boundary face in the mesh object. */
   const FiniteElement *GetBE(int i) const;

-   /// @brief Return a "typical" boundary element.
-   ///
-   /// This can be used in situations where the local mesh partition may be
-   /// empty.
-   const FiniteElement *GetTypicalBE() const;
-
   /** @brief Returns pointer to the FiniteElement in the FiniteElementCollection
        associated with i'th face in the mesh object.  Faces in this case refer
        to the MESHDIM-1 primitive so in 2D they are segments and in 1D they are
        points.*/
   const FiniteElement *GetFaceElement(int i) const;

-   /// @brief Return a "typical" face element.
-   ///
-   /// This can be used in situations where the local mesh partition may be
-   /// empty.
-   const FiniteElement *GetTypicalFaceElement() const;
-
   /** @brief Returns pointer to the FiniteElement in the FiniteElementCollection
        associated with i'th edge in the mesh object. */
   const FiniteElement *GetEdgeElement(int i, int variant = 0) const;
@@ -30,7 +30,6 @@
 #include <cmath>
 #include <iostream>
 #include <algorithm>
-#include <queue>

 namespace mfem
 {
@@ -345,6 +344,27 @@ void GridFunction::ComputeFlux(BilinearFormIntegrator &blfi,
   }
 }

+int GridFunction::VectorDim() const
+{
+   const FiniteElement *fe = fes->GetTypicalFE();
+   if (!fe || fe->GetRangeType() == FiniteElement::SCALAR)
+   {
+      return fes->GetVDim();
+   }
+   return fes->GetVDim()*std::max(fes->GetMesh()->SpaceDimension(),
+                                  fe->GetRangeDim());
+}
+
+int GridFunction::CurlDim() const
+{
+   const FiniteElement *fe = fes->GetTypicalFE();
+   if (!fe || fe->GetRangeType() == FiniteElement::SCALAR)
+   {
+      return 2 * fes->GetMesh()->SpaceDimension() - 3;
+   }
+   return fes->GetVDim()*fe->GetCurlDim();
+}
+
 void GridFunction::GetTrueDofs(Vector &tv) const
 {
   const SparseMatrix *R = fes->GetRestrictionMatrix();
@@ -2029,18 +2049,6 @@ void GridFunction::AccumulateAndCountBdrValues(
   Coefficient *coeff[], VectorCoefficient *vcoeff, const Array<int> &attr,
   Array<int> &values_counter)
 {
-   if (vcoeff)
-   {
-      MFEM_VERIFY(fes->GetVDim() == vcoeff->GetVDim(),
-                  "vcoeff vdim != fes VDim");
-      MFEM_VERIFY(fes->GetTypicalBE()->GetMapType() == FiniteElement::VALUE &&
-                  fes->GetTypicalBE()->GetRangeType() ==
-                  FiniteElement::SCALAR,
-                  "Can only call ProjectBdrCoefficient on scalar value-type "
-                  "boundary elements. "
-                  "Did you intended to call ProjectBdrCoefficientNormal or "
-                  "ProjectBdrCoefficientTangent for vector finite elements?");
-   }
   Array<int> vdofs;
   Vector vc;

@@ -2193,9 +2201,6 @@ void GridFunction::AccumulateAndCountBdrTangentValues(
   VectorCoefficient &vcoeff, const Array<int> &bdr_attr,
   Array<int> &values_counter)
 {
-   MFEM_VERIFY(fes->GetTypicalBE()->GetPhysRangeDim(
-                  fes->GetMesh()->SpaceDimension()) == vcoeff.GetVDim(),
-               "vcoeff vdim != PhysRangeDim");
   const FiniteElement *fe;
   ElementTransformation *T;
   Array<int> dofs;
@@ -2349,9 +2354,6 @@ void GridFunction::ProjectDeltaCoefficient(DeltaCoefficient &delta_coeff,

 void GridFunction::ProjectCoefficient(Coefficient &coeff, ProjectType type)
 {
-   MFEM_VERIFY(
-      VectorDim() == 1,
-      "Cannot project scalar Coefficient onto vector GridFunction");
   DeltaCoefficient *delta_c = dynamic_cast<DeltaCoefficient *>(&coeff);
   DofTransformation doftrans;
   Array<int> vdofs;
@@ -2627,7 +2629,6 @@ void GridFunction::ProjectCoefficient(
 void GridFunction::ProjectCoefficient(VectorCoefficient &vcoeff,
                                      ProjectType type)
 {
-   MFEM_VERIFY(VectorDim() == vcoeff.GetVDim(), "vcoeff vdim != VectorDim()");
   Array<int> vdofs;
   Vector vals;
   DofTransformation doftrans;
@@ -2943,7 +2944,6 @@ void GridFunction::ProjectCoefficientElementL2(VectorCoefficient &vcoeff)
 void GridFunction::ProjectCoefficient(
   VectorCoefficient &vcoeff, Array<int> &dofs)
 {
-   MFEM_VERIFY(VectorDim() == vcoeff.GetVDim(), "vcoeff vdim != VectorDim()");
   int el = -1;
   ElementTransformation *T = NULL;
   const FiniteElement *fe = NULL;
@@ -2973,7 +2973,6 @@ void GridFunction::ProjectCoefficient(

 void GridFunction::ProjectCoefficient(VectorCoefficient &vcoeff, int attribute)
 {
-   MFEM_VERIFY(VectorDim() == vcoeff.GetVDim(), "vcoeff vdim != VectorDim()");
   int i;
   Array<int> vdofs;
   Vector vals;
@@ -3030,14 +3029,9 @@ void GridFunction::ProjectCoefficient(Coefficient *coeff[])
   }
 }

-void GridFunction::ProjectDiscCoefficient(
-   std::variant<Coefficient*, VectorCoefficient*> coeff, Array<int> &dof_attr)
+void GridFunction::ProjectDiscCoefficient(VectorCoefficient &coeff,
+                                          Array<int> &dof_attr)
 {
-   std::visit([&](auto* c)
-   {
-      MFEM_VERIFY(VectorDim() == c->GetVDim(), "coeff vdim != VectorDim()");
-   }, coeff);
-
   Array<int> vdofs;
   Vector vals;

@@ -3051,10 +3045,7 @@ void GridFunction::ProjectDiscCoefficient(
   {
      fes->GetElementVDofs(i, vdofs);
      vals.SetSize(vdofs.Size());
-      std::visit([&](auto* c)
-      {
-         fes->GetFE(i)->Project(*c, *fes->GetElementTransformation(i), vals);
-      }, coeff);
+      fes->GetFE(i)->Project(coeff, *fes->GetElementTransformation(i), vals);

      // the values in shared dofs are determined from the element with maximal
      // attribute
@@ -3070,15 +3061,17 @@ void GridFunction::ProjectDiscCoefficient(
   }
 }

+void GridFunction::ProjectDiscCoefficient(VectorCoefficient &coeff)
+{
+   Array<int> dof_attr;
+   ProjectDiscCoefficient(coeff, dof_attr);
+}
+
 void GridFunction::ProjectDiscCoefficient(Coefficient &coeff, AvgType type)
 {
   // Harmonic  (x1 ... xn) = [ (1/x1 + ... + 1/xn) / n ]^-1.
   // Arithmetic(x1 ... xn) = (x1 + ... + xn) / n.

-   MFEM_VERIFY(
-      VectorDim() == 1,
-      "Cannot project a scalar coefficient onto a vector GridFunction");
-
   Array<int> zones_per_vdof;
   AccumulateAndCountZones(coeff, type, zones_per_vdof);

@@ -3088,7 +3081,6 @@ void GridFunction::ProjectDiscCoefficient(Coefficient &coeff, AvgType type)
 void GridFunction::ProjectDiscCoefficient(VectorCoefficient &coeff,
                                          AvgType type)
 {
-   MFEM_VERIFY(VectorDim() == coeff.GetVDim(), "coeff vdim != VectorDim()");
   Array<int> zones_per_vdof;
   AccumulateAndCountZones(coeff, type, zones_per_vdof);

@@ -3144,33 +3136,52 @@ void GridFunction::ProjectBdrCoefficient(Coefficient *coeff[],
 }

 void GridFunction::ProjectBdrCoefficientNormal(
-   Coefficient *coeff, VectorCoefficient *vcoeff, const Array<int> &bdr_attr)
+   VectorCoefficient &vcoeff, const Array<int> &bdr_attr)
 {
-   MFEM_VERIFY(fes->GetVDim() == 1, "fespace VDim != 1");
-   MFEM_VERIFY(fes->GetTypicalBE()->GetRangeType() == FiniteElement::SCALAR &&
-               fes->GetTypicalBE()->GetMapType() == FiniteElement::INTEGRAL,
-               "Not an RT FE space!");
-   if (vcoeff)
-   {
-      MFEM_VERIFY(vcoeff->GetVDim() == fes->GetMesh()->SpaceDimension(),
-                  "vcoeff vdim (" << vcoeff->GetVDim()
-                  << ") != SpaceDimension ("
-                  << fes->GetMesh()->SpaceDimension() << ")");
-   }
+#if 0
+   // implementation for the case when the face dofs are integrals of the
+   // normal component.
+   const FiniteElement *fe;
+   ElementTransformation *T;
+   Array<int> dofs;
+   int dim = vcoeff.GetVDim();
+   Vector vc(dim), nor(dim), lvec, shape;

+   for (int i = 0; i < fes->GetNBE(); i++)
+   {
+      if (bdr_attr[fes->GetBdrAttribute(i)-1] == 0)
+      {
+         continue;
+      }
+      fe = fes->GetBE(i);
+      T = fes->GetBdrElementTransformation(i);
+      int intorder = 2*fe->GetOrder(); // !!!
+      const IntegrationRule &ir = IntRules.Get(fe->GetGeomType(), intorder);
+      int nd = fe->GetDof();
+      lvec.SetSize(nd);
+      shape.SetSize(nd);
+      lvec = 0.0;
+      for (int j = 0; j < ir.GetNPoints(); j++)
+      {
+         const IntegrationPoint &ip = ir.IntPoint(j);
+         T->SetIntPoint(&ip);
+         vcoeff.Eval(vc, *T, ip);
+         CalcOrtho(T->Jacobian(), nor);
+         fe->CalcShape(ip, shape);
+         lvec.Add(ip.weight * (vc * nor), shape);
+      }
+      fes->GetBdrElementDofs(i, dofs);
+      SetSubVector(dofs, lvec);
+   }
+#else
   // implementation for the case when the face dofs are scaled point
   // values of the normal component.
   const FiniteElement *fe;
   ElementTransformation *T;
   Array<int> dofs;
-   Vector vc, nor, lvec;
+   int dim = vcoeff.GetVDim();
+   Vector vc(dim), nor(dim), lvec;
   DofTransformation doftrans;
-   if (vcoeff)
-   {
-      const int dim = vcoeff->GetVDim();
-      vc.SetSize(dim);
-      nor.SetSize(dim);
-   }

   for (int i = 0; i < fes->GetNBE(); i++)
   {
@@ -3186,22 +3197,15 @@ void GridFunction::ProjectBdrCoefficientNormal(
      {
         const IntegrationPoint &ip = ir.IntPoint(j);
         T->SetIntPoint(&ip);
-         if (coeff)
-         {
-            const real_t c = coeff->Eval(*T, ip);
-            lvec(j) = c * T->Weight();
-         }
-         else if (vcoeff)
-         {
-            vcoeff->Eval(vc, *T, ip);
-            CalcOrtho(T->Jacobian(), nor);
-            lvec(j) = (vc * nor);
-         }
+         vcoeff.Eval(vc, *T, ip);
+         CalcOrtho(T->Jacobian(), nor);
+         lvec(j) = (vc * nor);
      }
      fes->GetBdrElementDofs(i, dofs, doftrans);
      doftrans.TransformPrimal(lvec);
      SetSubVector(dofs, lvec);
   }
+#endif
 }

 void GridFunction::ProjectBdrCoefficientTangent(
@@ -5002,14 +5006,6 @@ real_t ExtrudeCoefficient::Eval(ElementTransformation &T,
   return sol_in.Eval(*T_in, ip);
 }

-void VectorExtrudeCoefficient::Eval(Vector &v, ElementTransformation &T,
-                                    const IntegrationPoint &ip)
-{
-   ElementTransformation *T_in =
-      mesh_in->GetElementTransformation(T.ElementNo / n);
-   T_in->SetIntPoint(&ip);
-   sol_in.Eval(v, *T_in, ip);
-}

 GridFunction *Extrude1DGridFunction(Mesh *mesh, Mesh *mesh2d,
                                    GridFunction *sol, const int ny)
@@ -5060,17 +5056,10 @@ GridFunction *Extrude1DGridFunction(Mesh *mesh, Mesh *mesh2d,
      return NULL;
   }
   FiniteElementSpace *solfes2d;
-   const int vdim = sol->FESpace()->GetVDim();
-   solfes2d = new FiniteElementSpace(mesh2d, solfec2d, vdim);
+   // assuming sol is scalar
+   solfes2d = new FiniteElementSpace(mesh2d, solfec2d);
   sol2d = new GridFunction(solfes2d);
   sol2d->MakeOwner(solfec2d);
-   if (vdim > 1)
-   {
-      VectorGridFunctionCoefficient vcsol(sol);
-      VectorExtrudeCoefficient vc2d(mesh, vcsol, ny);
-      sol2d->ProjectCoefficient(vc2d);
-   }
-   else
   {
      GridFunctionCoefficient csol(sol);
      ExtrudeCoefficient c2d(mesh, csol, ny);
@@ -5128,103 +5117,6 @@ void GridFunction::GetElementBoundsAtControlPoints(const int elem,
   }
 }

-void GridFunction::GetElementBoundsAtControlPoints(const int elem,
-                                                   const PLBound &plb,
-                                                   const Vector &ref_range,
-                                                   const int vdim,
-                                                   Vector &lower, Vector &upper,
-                                                   Vector &control_pos) const
-{
-   const FiniteElement *fe = fes->GetFE(elem);
-   const IntegrationRule ir_in = fe->GetNodes();
-   IntegrationRule ir_new(ir_in.GetNPoints());
-   const int dim = fes->GetMesh()->Dimension();
-   const L2_FECollection *l2fec = dynamic_cast<const L2_FECollection *>
-                                  (fes->FEColl());
-
-   const TensorBasisElement *tbe =
-      dynamic_cast<const TensorBasisElement *>(fe);
-   MFEM_VERIFY(tbe != NULL, "TensorBasis FiniteElement expected.");
-
-   const Array<int> &dof_map = tbe->GetDofMap();
-   bool lexico = (dof_map.Size() == 0);
-   bool bern = (tbe->GetBasisType() == BasisType::Positive);
-   bool h1   = (l2fec == nullptr);
-
-   Vector loc_data; // gridfunction values
-   // Construct an integration rule to evaluate the gridfunction in
-   // subinterval.
-   for (int i = 0; i < ir_in.GetNPoints(); i++)
-   {
-      IntegrationPoint &ip_new = ir_new.IntPoint(i);
-      const IntegrationPoint &ip_old =
-         ir_in.IntPoint((lexico || bern) ? i : dof_map[i]);
-      Vector ip_coord(dim);
-      ip_old.Get(ip_coord.GetData(), dim);
-      for (int d = 0; d < dim; d++)
-      {
-         ip_coord(d) = ref_range(d) +
-                       (ref_range(dim+d) - ref_range(d)) * ip_coord(d);
-      }
-      ip_new.Set(ip_coord.GetData(), dim);
-   }
-   GetValues(elem, ir_new, loc_data, vdim);
-   // At this point, the loc_data contains function values ordered
-   // lexicographically, unless we are using Bernstein bases.
-   // For Bernstein, we need to project and get coefficients first.
-
-   // For bernstein, we get coefficients corresponding to these function values
-   if (bern)
-   {
-      int bt = 4; // BasisType::ClosedUniform
-      int o = fe->GetOrder();
-      DenseMatrix projmat;
-      NodalTensorFiniteElement *ntfe = nullptr;
-      if (dim == 1)
-      {
-         if (h1) { ntfe = new H1_SegmentElement(o, bt); }
-         else    { ntfe = new L2_SegmentElement(o, bt); }
-      }
-      else if (dim == 2)
-      {
-         if (h1) { ntfe = new H1_QuadrilateralElement(o, bt); }
-         else    { ntfe = new L2_QuadrilateralElement(o, bt); }
-      }
-      else if (dim == 3)
-      {
-         if (h1) { ntfe = new H1_HexahedronElement(o, bt); }
-         else    { ntfe = new L2_HexahedronElement(o, bt); }
-      }
-      // projection matrix from H1 to Positive
-      ElementTransformation *eltran = fes->GetElementTransformation(elem);
-      fe->Project(*ntfe, *eltran, projmat);
-      Vector loc_data_temp(loc_data.Size());
-      projmat.Mult(loc_data, loc_data_temp);
-      for (int i = 0; i < dof_map.Size(); i++)
-      {
-         loc_data(i) = loc_data_temp(dof_map[i]);
-      }
-      if (dof_map.Size() == 0) { loc_data = loc_data_temp; }
-      delete ntfe;
-   }
-
-   // Get bounds at control points
-   plb.GetNDBounds(dim, loc_data, lower, upper);
-
-   // Save control point positions
-   int ncp = plb.GetNControlPoints();
-   control_pos.SetSize(dim * ncp);
-   const Vector control_pos_1D = plb.GetControlPoints();
-   for (int i = 0; i < ncp; i++)
-   {
-      for (int d = 0; d < dim; d++)
-      {
-         control_pos(i + d*ncp) =
-            ref_range(d) + (ref_range(dim+d)-ref_range(d))*control_pos_1D(i);
-      }
-   }
-}
-
 void GridFunction::GetElementBounds(const int elem, const PLBound &plb,
                                    Vector &lower, Vector &upper,
                                    const int vdim) const
@@ -5305,467 +5197,6 @@ PLBound GridFunction::GetBounds(Vector &lower, Vector &upper,
   return plb;
 }

-struct IntervalNode
-{
-   real_t val_min;
-   real_t val_max;
-   Array<IntervalNode *> child;
-   IntervalNode(real_t vmin, real_t vmax)
-      : val_min(vmin), val_max(vmax)
-   {
-      child.SetSize(0);
-   }
-   void AddChild(IntervalNode *ch) { child.Append(ch); }
-   real_t GetChildMinLower()
-   {
-      if (child.Size() == 0)
-      {
-         return val_min;
-      }
-      real_t valmin = numeric_limits<real_t>::max();
-      for (int i = 0; i < child.Size(); i++)
-      {
-         real_t candidate = child[i]->GetChildMinLower();
-         valmin = std::min(valmin, candidate);
-      }
-      return valmin;
-   }
-   real_t GetChildMinUpper()
-   {
-      if (child.Size() == 0)
-      {
-         return val_max;
-      }
-      real_t valmax = numeric_limits<real_t>::max();
-      for (int i = 0; i < child.Size(); i++)
-      {
-         real_t candidate = child[i]->GetChildMinUpper();
-         valmax = std::min(valmax, candidate);
-      }
-      return valmax;
-   }
-   real_t GetChildMaxLower()
-   {
-      if (child.Size() == 0)
-      {
-         return val_min;
-      }
-      real_t valmin = numeric_limits<real_t>::lowest();
-      for (int i = 0; i < child.Size(); i++)
-      {
-         real_t candidate = child[i]->GetChildMaxLower();
-         valmin = std::max(valmin, candidate);
-      }
-      return valmin;
-   }
-   real_t GetChildMaxUpper()
-   {
-      if (child.Size() == 0)
-      {
-         return val_max;
-      }
-      real_t valmax = numeric_limits<real_t>::lowest();
-      for (int i = 0; i < child.Size(); i++)
-      {
-         real_t candidate = child[i]->GetChildMaxUpper();
-         valmax = std::max(valmax, candidate);
-      }
-      return valmax;
-   }
-   void DeleteChildren()
-   {
-      for (int i = 0; i < child.Size(); i++)
-      {
-         child[i]->DeleteChildren();
-         delete child[i];
-      }
-      child.SetSize(0);
-   }
-};
-
-struct SearchInterval
-{
-   Vector ref_range;
-   int depth;
-   IntervalNode *node;
-   SearchInterval(const Vector &ref_range_in, int d, IntervalNode *n)
-      : ref_range(ref_range_in), depth(d), node(n)
-   { }
-};
-
-struct IntervalCompareMin
-{
-   bool operator()(const SearchInterval *a, const SearchInterval *b) const
-   {
-      return a->node->val_min > b->node->val_min;
-   }
-};
-
-struct IntervalCompareMax
-{
-   bool operator()(const SearchInterval *a, const SearchInterval *b) const
-   {
-      return a->node->val_max < b->node->val_max;
-   }
-};
-
-std::pair<real_t, real_t> GridFunction::EstimateFunctionMinimum(
-   const int elem, const PLBound &plb, const int vdim,
-   const int max_depth, const real_t tol) const
-{
-   real_t min_threshold = std::numeric_limits<real_t>::max();
-   return EstimateFunctionMinimum(elem, plb, vdim, max_depth, tol,
-                                  min_threshold);
 }

-std::pair<real_t, real_t> GridFunction::EstimateFunctionMinimum(
-   const int elem, const PLBound &plb, const int vdim,
-   const int max_depth, const real_t tol, real_t &min_threshold) const
-{
-   const int dim = this->FESpace()->GetMesh()->Dimension();
-   const int ncp = plb.GetNControlPoints();
-   Vector pos_range(2*dim); pos_range = 0.0;
-   for (int d = 0; d < dim; d++) { pos_range(d+dim) = 1.0; }
-   Vector lower, upper, cp_ref_loc;

-   GetElementBoundsAtControlPoints(elem, plb, lower, upper, vdim);
-   real_t val_min = lower.Min();
-   real_t val_max = upper.Min();
-
-   min_threshold = std::min(min_threshold, val_max);
-
-   // Pruning: if the element's lower bound is greater than the current global
-   // upper bound, this element cannot contain the global minimum.
-   if (val_min >= min_threshold)
-   {
-      return std::make_pair(val_min, val_max);
-   }
-
-   if (val_min == val_max || max_depth == 0)
-   {
-      min_threshold = std::min(min_threshold, val_min);
-      return std::make_pair(val_min, val_max);
-   }
-   real_t abs_tol = tol*(val_max-val_min);
-
-   IntervalNode *initial_node = new IntervalNode(val_min, val_max);
-   SearchInterval *initial_interval = new SearchInterval(pos_range, 0,
-                                                         initial_node);
-
-   std::priority_queue<SearchInterval*,
-       std::vector<SearchInterval*>, IntervalCompareMin> pq;
-   pq.push(initial_interval);
-
-   real_t min_upper_bound = upper.Min();
-   real_t min_lower_bound = lower.Min();
-
-   while (!pq.empty())
-   {
-      SearchInterval *current = pq.top();
-      pq.pop();
-      int curr_depth = current->depth;
-
-      // Reached max depth or this interval cannot contain the global minimum
-      if (current->node->val_min >= min_threshold || curr_depth >= max_depth)
-      {
-         delete current;
-         continue;
-      }
-
-      min_lower_bound = initial_node->GetChildMinLower();
-      if (min_upper_bound - min_lower_bound < abs_tol)
-      {
-         delete current;
-         break;
-      }
-
-      // Subdivide the interval and get bounds on it
-      GetElementBoundsAtControlPoints(elem, plb, current->ref_range,
-                                      vdim, lower, upper, cp_ref_loc);
-
-      // process the bounds and create sub-intervals
-      for (int k = 0; k < (dim == 3 ? ncp-1 : 1); k++)
-      {
-         for (int j = 0; j < (dim >= 2 ? ncp-1 : 1); j++)
-         {
-            for (int i = 0; i < ncp-1; i++)
-            {
-               real_t lv = 0.0, uv = 0.0;
-               if (dim == 1)
-               {
-                  lv = std::min(lower(i), lower(i+1));
-                  uv = std::min(upper(i), upper(i+1));
-               }
-               else if (dim == 2)
-               {
-                  lv = std::min({lower(i + j*ncp), lower((i+1) + j*ncp),
-                                 lower(i + (j+1)*ncp),
-                                 lower((i+1) + (j+1)*ncp)});
-                  uv = std::min({upper(i + j*ncp), upper((i+1) + j*ncp),
-                                 upper(i + (j+1)*ncp),
-                                 upper((i+1) + (j+1)*ncp)});
-               }
-               else if (dim == 3)
-               {
-                  lv = std::min({lower(i + j*ncp + k*ncp*ncp),
-                                 lower((i+1) + j*ncp + k*ncp*ncp),
-                                 lower(i + (j+1)*ncp + k*ncp*ncp),
-                                 lower((i+1) + (j+1)*ncp + k*ncp*ncp),
-                                 lower(i + j*ncp + (k+1)*ncp*ncp),
-                                 lower((i+1) + j*ncp + (k+1)*ncp*ncp),
-                                 lower(i + (j+1)*ncp + (k+1)*ncp*ncp),
-                                 lower((i+1) + (j+1)*ncp + (k+1)*ncp*ncp)});
-                  uv = std::min({upper(i + j*ncp + k*ncp*ncp),
-                                 upper((i+1) + j*ncp + k*ncp*ncp),
-                                 upper(i + (j+1)*ncp + k*ncp*ncp),
-                                 upper((i+1) + (j+1)*ncp + k*ncp*ncp),
-                                 upper(i + j*ncp + (k+1)*ncp*ncp),
-                                 upper((i+1) + j*ncp + (k+1)*ncp*ncp),
-                                 upper(i + (j+1)*ncp + (k+1)*ncp*ncp),
-                                 upper((i+1) + (j+1)*ncp + (k+1)*ncp*ncp)});
-               }
-               IntervalNode *child_node = new IntervalNode(lv, uv);
-               current->node->AddChild(child_node);
-
-               if (lv < min_threshold)
-               {
-                  min_upper_bound = std::min(min_upper_bound, uv);
-                  min_threshold = std::min(min_threshold, uv);
-                  if (curr_depth < max_depth)
-                  {
-                     pos_range(0) = cp_ref_loc(i);
-                     pos_range(0+dim) = cp_ref_loc(i+1);
-                     if (dim >= 2)
-                     {
-                        pos_range(1) = cp_ref_loc(ncp + j);
-                        pos_range(1+dim) = cp_ref_loc(ncp + j+1);
-                     }
-                     if (dim == 3)
-                     {
-                        pos_range(2) = cp_ref_loc(2*ncp + k);
-                        pos_range(2+dim) = cp_ref_loc(2*ncp + k+1);
-                     }
-                     SearchInterval *child_interval =
-                        new  SearchInterval(pos_range, curr_depth + 1,
-                                            child_node);
-                     pq.push(child_interval);
-                  }
-               }
-            }
-         }
-      }
-      delete current;
-   }
-
-   // clean up remaining intervals in queue
-   while (!pq.empty())
-   {
-      delete pq.top();
-      pq.pop();
-   }
-
-   min_lower_bound = initial_node->GetChildMinLower();
-   initial_node->DeleteChildren();
-   delete initial_node;
-
-   min_threshold = std::min(min_threshold, min_lower_bound);
-   return std::make_pair(min_lower_bound, min_upper_bound);
-}
-
-std::pair<real_t, real_t> GridFunction::EstimateFunctionMaximum(
-   const int elem, const PLBound &plb, const int vdim,
-   const int max_depth, const real_t tol) const
-{
-   real_t max_threshold = std::numeric_limits<real_t>::lowest();
-   return EstimateFunctionMaximum(elem, plb, vdim, max_depth, tol,
-                                  max_threshold);
-}
-
-std::pair<real_t, real_t> GridFunction::EstimateFunctionMaximum(
-   const int elem, const PLBound &plb, const int vdim,
-   const int max_depth, const real_t tol, real_t &max_threshold) const
-{
-   const int dim = this->FESpace()->GetMesh()->Dimension();
-   const int ncp = plb.GetNControlPoints();
-   Vector pos_range(2*dim); pos_range = 0.0;
-   for (int d = 0; d < dim; d++) { pos_range(d+dim) = 1.0; }
-   Vector lower, upper, cp_ref_loc;
-
-   GetElementBoundsAtControlPoints(elem, plb, lower, upper, vdim);
-   real_t val_min = lower.Max();
-   real_t val_max = upper.Max();
-
-   max_threshold = std::max(max_threshold, val_min);
-
-   // Pruning: if the element's upper bound is less than the current global
-   // lower bound, this element cannot contain the global maximum.
-   if (val_max <= max_threshold)
-   {
-      return std::make_pair(val_min, val_max);
-   }
-
-   if (val_min == val_max || max_depth == 0)
-   {
-      max_threshold = std::max(max_threshold, val_max);
-      return std::make_pair(val_min, val_max);
-   }
-   real_t abs_tol = tol*(val_max-val_min);
-
-   IntervalNode *initial_node = new IntervalNode(val_min, val_max);
-   SearchInterval *initial_interval = new SearchInterval(pos_range, 0,
-                                                         initial_node);
-
-   std::priority_queue<SearchInterval*,
-       std::vector<SearchInterval*>, IntervalCompareMax> pq;
-   pq.push(initial_interval);
-
-   real_t max_lower_bound = val_min;
-   real_t max_upper_bound = val_max;
-
-   while (!pq.empty())
-   {
-      SearchInterval *current = pq.top();
-      pq.pop();
-      int curr_depth = current->depth;
-
-      // Reached max depth or this interval cannot contain the global maximum.
-      if (current->node->val_max <= max_threshold || curr_depth >= max_depth)
-      {
-         delete current;
-         continue;
-      }
-
-      max_upper_bound = initial_node->GetChildMaxUpper();
-      if (max_upper_bound - max_lower_bound < abs_tol)
-      {
-         delete current;
-         break;
-      }
-
-      // Subdivide the interval and get bounds on it
-      GetElementBoundsAtControlPoints(elem, plb, current->ref_range,
-                                      vdim, lower, upper, cp_ref_loc);
-
-      // process the bounds and create sub-intervals
-      for (int k = 0; k < (dim == 3 ? ncp-1 : 1); k++)
-      {
-         for (int j = 0; j < (dim >= 2 ? ncp-1 : 1); j++)
-         {
-            for (int i = 0; i < ncp-1; i++)
-            {
-               real_t lv = 0.0, uv = 0.0;
-               if (dim == 1)
-               {
-                  lv = std::max(lower(i), lower(i+1));
-                  uv = std::max(upper(i), upper(i+1));
-               }
-               else if (dim == 2)
-               {
-                  lv = std::max({lower(i + j*ncp), lower((i+1) + j*ncp),
-                                 lower(i + (j+1)*ncp),
-                                 lower((i+1) + (j+1)*ncp)});
-                  uv = std::max({upper(i + j*ncp), upper((i+1) + j*ncp),
-                                 upper(i + (j+1)*ncp),
-                                 upper((i+1) + (j+1)*ncp)});
-               }
-               else if (dim == 3)
-               {
-                  lv = std::max({lower(i + j*ncp + k*ncp*ncp),
-                                 lower((i+1) + j*ncp + k*ncp*ncp),
-                                 lower(i + (j+1)*ncp + k*ncp*ncp),
-                                 lower((i+1) + (j+1)*ncp + k*ncp*ncp),
-                                 lower(i + j*ncp + (k+1)*ncp*ncp),
-                                 lower((i+1) + j*ncp + (k+1)*ncp*ncp),
-                                 lower(i + (j+1)*ncp + (k+1)*ncp*ncp),
-                                 lower((i+1) + (j+1)*ncp + (k+1)*ncp*ncp)});
-                  uv = std::max({upper(i + j*ncp + k*ncp*ncp),
-                                 upper((i+1) + j*ncp + k*ncp*ncp),
-                                 upper(i + (j+1)*ncp + k*ncp*ncp),
-                                 upper((i+1) + (j+1)*ncp + k*ncp*ncp),
-                                 upper(i + j*ncp + (k+1)*ncp*ncp),
-                                 upper((i+1) + j*ncp + (k+1)*ncp*ncp),
-                                 upper(i + (j+1)*ncp + (k+1)*ncp*ncp),
-                                 upper((i+1) + (j+1)*ncp + (k+1)*ncp*ncp)});
-               }
-               IntervalNode *child_node = new IntervalNode(lv, uv);
-               current->node->AddChild(child_node);
-
-               if (uv > max_threshold)
-               {
-                  max_lower_bound = std::max(max_lower_bound, lv);
-                  max_threshold = std::max(max_threshold, lv);
-                  if (curr_depth < max_depth)
-                  {
-                     pos_range(0) = cp_ref_loc(i);
-                     pos_range(0+dim) = cp_ref_loc(i+1);
-                     if (dim >= 2)
-                     {
-                        pos_range(1) = cp_ref_loc(ncp + j);
-                        pos_range(1+dim) = cp_ref_loc(ncp + j+1);
-                     }
-                     if (dim == 3)
-                     {
-                        pos_range(2) = cp_ref_loc(2*ncp + k);
-                        pos_range(2+dim) = cp_ref_loc(2*ncp + k+1);
-                     }
-                     SearchInterval *child_interval =
-                        new SearchInterval(pos_range, curr_depth + 1,
-                                           child_node);
-                     pq.push(child_interval);
-                  }
-               }
-            }
-         }
-      }
-      delete current;
-   }
-   // clean up remaining intervals in queue
-   while (!pq.empty())
-   {
-      delete pq.top();
-      pq.pop();
-   }
-
-   max_upper_bound = initial_node->GetChildMaxUpper();
-   initial_node->DeleteChildren();
-   delete initial_node;
-   max_threshold = std::max(max_threshold, max_upper_bound);
-
-   return std::make_pair(max_lower_bound, max_upper_bound);
-}
-
-std::pair<real_t, real_t> GridFunction::EstimateFunctionMinimum(
-   const int vdim, const PLBound &plb, const int max_depth,
-   const real_t tol) const
-{
-   real_t global_min_lower = std::numeric_limits<real_t>::max();
-   real_t global_min_upper = std::numeric_limits<real_t>::max();
-
-   for (int i = 0; i < fes->GetNE(); i++)
-   {
-      std::pair<real_t, real_t> min_pair =
-         EstimateFunctionMinimum(i, plb, vdim, max_depth, tol,
-                                 global_min_lower);
-      global_min_upper = std::min(global_min_upper, min_pair.second);
-   }
-   return std::make_pair(global_min_lower, global_min_upper);
-}
-
-std::pair<real_t, real_t> GridFunction::EstimateFunctionMaximum(
-   const int vdim, const PLBound &plb, const int max_depth,
-   const real_t tol) const
-{
-   real_t global_max_lower = std::numeric_limits<real_t>::lowest();
-   real_t global_max_upper = std::numeric_limits<real_t>::lowest();
-
-   for (int i = 0; i < fes->GetNE(); i++)
-   {
-      std::pair<real_t, real_t> max_pair =
-         EstimateFunctionMaximum(i, plb, vdim, max_depth, tol,
-                                 global_max_upper);
-      global_max_lower = std::max(global_max_lower, max_pair.first);
-   }
-   return std::make_pair(global_max_lower, global_max_upper);
-}
-
-}
@@ -23,7 +23,6 @@
 #include <limits>
 #include <ostream>
 #include <string>
-#include <variant>

 namespace mfem
 {
@@ -80,18 +79,10 @@ protected:
                        bool wcoef,
                        int subdomain);

-   /** @brief Project a discontinuous (vector) coefficient as a grid function on
-       a continuous finite element space. Return in dof_attr the maximal
-       attribute of the elements containing each degree of freedom. */
-   virtual void ProjectDiscCoefficient(
-      std::variant<Coefficient*, VectorCoefficient*> coeff, Array<int> &dof_attr);
-
-   /** @brief Project a discontinuous (vector) coefficient as a grid function on
-       a continuous finite element space. The values in shared dofs are
-       determined from the element with maximal attribute. */
-   virtual void ProjectDiscCoefficient(
-      std::variant<Coefficient*, VectorCoefficient*> coeff)
-   { Array<int> dof_attr; ProjectDiscCoefficient(coeff, dof_attr); };
+   /** Project a discontinuous vector coefficient in a continuous space and
+       return in dof_attr the maximal attribute of the elements containing each
+       degree of freedom. */
+   void ProjectDiscCoefficient(VectorCoefficient &coeff, Array<int> &dof_attr);

   /** Helper function for ProjectCoefficientElementL2 */
   void ProjectCoefficientElementL2_(Coefficient &coeff, Vector &sol, Vector &Va);
@@ -159,13 +150,11 @@ public:

   FiniteElementCollection *OwnFEC() { return fec_owned; }

-   /** @brief Shortcut for calling FiniteElementSpace::GetVectorDim() on the
-       underlying #fes */
-   int VectorDim() const { return fes->GetVectorDim(); }
+   /// Shortcut for calling FiniteElementSpace::GetVectorDim() on the underlying #fes
+   int VectorDim() const;

-   /** @brief Shortcut for calling FiniteElementSpace::GetCurlDim() on the
-       underlying #fes */
-   int CurlDim() const { return fes->GetCurlDim(); }
+   /// Shortcut for calling FiniteElementSpace::GetCurlDim() on the underlying #fes
+   int CurlDim() const;

   /// Read only access to the (optional) internal true-dof Vector.
   const Vector &GetTrueVector() const
@@ -524,17 +513,10 @@ public:
       but using an array of scalar coefficients for each component. */
   void ProjectCoefficient(Coefficient *coeff[]);

-   /** @brief Project a discontinuous coefficient as a grid function on
-       a continuous finite element space. The values in shared dofs are
-       determined from the element with maximal attribute. */
-   virtual void ProjectDiscCoefficient(Coefficient &coeff)
-   { ProjectDiscCoefficient(&coeff); }
-
   /** @brief Project a discontinuous vector coefficient as a grid function on
       a continuous finite element space. The values in shared dofs are
       determined from the element with maximal attribute. */
-   virtual void ProjectDiscCoefficient(VectorCoefficient &coeff)
-   { ProjectDiscCoefficient(&coeff); }
+   virtual void ProjectDiscCoefficient(VectorCoefficient &coeff);

   enum AvgType {ARITHMETIC, HARMONIC};
   /** @brief Projects a discontinuous coefficient so that the values in shared
@@ -550,9 +532,6 @@ public:
   std::unique_ptr<GridFunction> ProlongateToMaxOrder() const;

 protected:
-   void ProjectBdrCoefficientNormal(Coefficient *coeff, VectorCoefficient *vcoeff,
-                                    const Array<int> &attr);
-
   /** @brief Accumulates (depending on @a type) the values of @a coeff at all
       shared vdofs and counts in how many zones each vdof appears. */
   void AccumulateAndCountZones(Coefficient &coeff, AvgType type,
@@ -585,70 +564,6 @@ protected:
   /// P-refinement version of Update().
   void UpdatePRef();

-   /** @brief Estimate the minimum value of the GridFunction in element @a elem
-    *  if it is below a certain @a min_threshold.
-    *
-    *  @details For a given element \p elem and grid function component \p vdim
-    *  an estimate of the function minimum is the minimum of the piecewise
-    *  linear lower bound obtained using the given PLBound object. The actual
-    *  minimum is between [minimum lower bound, minimum upper bound]. We
-    *  improve the estimate of the function minimum by recursively
-    *  subdividing the interval with the lowest lower bound, and computing
-    *  bounds on the sub-intervals.
-    *  This process continues until (i) the maximum recursion depth is reached
-    *  or (ii) the difference between the minimum upper bound and minimum lower
-    *  bound is less than a certain tolerance (\p tol * [initial maximum
-    *  upper bound - initial minimum lower bound]).
-    *  The function also terminates if the lowest minima estimate is found
-    *  to be above the given threshold \p min_threshold. This is useful when
-    *  we are interested in computing the global minimum of the function
-    *  over all elements. In this case we can reject elements where the lowest
-    *  bound is above the current global minimum. In case the function
-    *  minimum on the element is below the global minimum, we update
-    *  \p min_threshold.
-    *
-    *  We return a pair of values that bracket the actual minimum, i.e.
-    *  [min_lower_bound, min_upper_bound].
-    */
-   std::pair<real_t,real_t> EstimateFunctionMinimum(const int elem,
-                                                    const PLBound &plb,
-                                                    const int vdim,
-                                                    const int max_depth,
-                                                    const real_t tol,
-                                                    real_t &min_threshold)const;
-
-   /** @brief Estimate the maximum value of the GridFunction in element @a elem
-    *  if it is below a certain @a max_threshold.
-    *
-    *  @details For a given element \p elem and grid function component \p vdim
-    *  an estimate of the function maximum is the maximum of the piecewise
-    *  linear upper bound obtained using the given PLBound object. The actual
-    *  maximum is between [maximum lower bound, maximum upper bound]. We
-    *  improve the estimate of the function maximum by recursively
-    *  subdividing the interval with the highest upper bound, and computing
-    *  bounds on the sub-intervals.
-    *  This process continues until (i) the maximum recursion depth is reached
-    *  or (ii) the difference between the maximum upper bound and maximum lower
-    *  bound is less than a certain tolerance (\p tol * [initial maximum
-    *  upper bound - initial maximum lower bound]).
-    *  The function also terminates if the highest maxima estimate is found
-    *  to be below the given threshold \p max_threshold. This is useful when
-    *  we are interested in computing the global maximum of the function
-    *  over all elements. In this case we can reject elements where the upper
-    *  bound is below the current global maximum. In case the function
-    *  maximum on the element is above the global maximum, we update
-    *  \p max_threshold.
-    *
-    *  We return a pair of values that bracket the actual maximum, i.e.
-    *  [max_lower_bound, max_upper_bound].
-    */
-   std::pair<real_t,real_t> EstimateFunctionMaximum(const int elem,
-                                                    const PLBound &plb,
-                                                    const int vdim,
-                                                    const int max_depth,
-                                                    const real_t tol,
-                                                    real_t &max_threshold)const;
-
 public:
   /** @brief For each vdof, counts how many elements contain the vdof,
       as containment is determined by FiniteElementSpace::GetElementVDofs(). */
@@ -677,26 +592,15 @@ public:
   virtual void ProjectBdrCoefficient(Coefficient *coeff[],
                                      const Array<int> &attr);

-   /** @brief Project the normal component of the given VectorCoefficient on
-       the boundary. */
-   /** Only boundary attributes that are marked in @a bdr_attr are
-       projected. Assumes RT-type vector finite element GridFunction. */
+   /** Project the normal component of the given VectorCoefficient on
+       the boundary. Only boundary attributes that are marked in
+       'bdr_attr' are projected. Assumes RT-type VectorFE GridFunction. */
   void ProjectBdrCoefficientNormal(VectorCoefficient &vcoeff,
-                                    const Array<int> &bdr_attr)
-   { ProjectBdrCoefficientNormal(NULL, &vcoeff, bdr_attr); }
-
-   /** @brief Project the given Coefficient in the normal direction on the
-       boundary. */
-   /** Only boundary attributes that are marked in @a bdr_attr are projected.
-       Assumes RT-type vector finite element GridFunction. */
-   void ProjectBdrCoefficientNormal(Coefficient &coeff,
-                                    const Array<int> &bdr_attr)
-   { ProjectBdrCoefficientNormal(&coeff, NULL, bdr_attr); }
+                                    const Array<int> &bdr_attr);

   /** @brief Project the tangential components of the given VectorCoefficient
-       on the boundary. */
-   /** Only boundary attributes that are marked in @a bdr_attr
-       are projected. Assumes ND-type vector finite element GridFunction. */
+       on the boundary. Only boundary attributes that are marked in @a bdr_attr
+       are projected. Assumes ND-type VectorFE GridFunction. */
   virtual void ProjectBdrCoefficientTangent(VectorCoefficient &vcoeff,
                                             const Array<int> &bdr_attr);

@@ -1758,21 +1662,21 @@ public:
    */
   ///@{
   /// Computes the \ref PLBound for the gridfunction with number of control
-   /// points based on \p ref_factor, and returns the overall bounds for each
-   /// vdim (across all elements) in \p lower and \p upper. We also return the
+   /// points based on @a ref_factor, and returns the overall bounds for each
+   /// vdim (across all elements) in @b lower and @b upper. We also return the
   /// PLBound object used to compute the bounds.
-   /// We compute the bounds for each vdim if \p vdim < 1.
+   /// We compute the bounds for each vdim if @a vdim < 1.
   /// Note: For most cases, this method/interface will be sufficient.
   virtual PLBound GetBounds(Vector &lower, Vector &upper,
                             const int ref_factor=1, const int vdim=-1) const;

   /// Computes the \ref PLBound for the gridfunction with number of control
-   /// points based on \p ref_factor, and returns the bounds for each element
-   /// ordered byNodes:
+   /// points based on @a ref_factor, and returns the bounds for each element
+   /// ordered byVDim:
   /// lower_{0,0}, lower_{1,0}, ..., lower_{ne-1,0},
   /// lower_{0,1}, ..., lower_{ne-1,vdim-1}. We also return the
   /// PLBound object used to compute the bounds.
-   /// We compute the bounds for each vdim if \p vdim < 1.
+   /// We compute the bounds for each vdim if @a vdim < 1.
   PLBound GetElementBounds(Vector &lower, Vector &upper,
                            const int ref_factor=1, const int vdim=-1) const;

@@ -1783,18 +1687,6 @@ public:
                                        Vector &lower, Vector &upper,
                                        const int vdim = -1) const;

-   /** @brief Gets the bounds on given reference range inside an element.
-    *
-    *  @details @a ref_range is a vector of size 2*dim that specifies the
-    *  lower and upper limits in each dimension of the reference element.
-    *  For example, in 2D, ref_range = [rmin, smin, rmax, smax].
-    */
-   void GetElementBoundsAtControlPoints(const int elem, const PLBound &plb,
-                                        const Vector &ref_range,
-                                        const int vdim,
-                                        Vector &lower, Vector &upper,
-                                        Vector &control_pos) const;
-
   /// Compute bounds on the grid function for the given element.
   /// The bounds are stored in @b lower and @b upper.
   void GetElementBounds(const int elem, const PLBound &plb,
@@ -1802,45 +1694,11 @@ public:
                         const int vdim = -1) const;

   /// Compute bounds on the grid function for all the elements. The bounds
-   /// are returned in @b lower and @b upper, ordered byNodes:
+   /// are returned in @b lower and @b upper, ordered byVDim:
   /// lower_{0,0}, lower_{1,0}, ..., lower_{ne-1,0},
   /// lower_{0,1}, ..., lower_{ne-1,vdim-1}
   void GetElementBounds(const PLBound &plb, Vector &lower, Vector &upper,
                         const int vdim=-1) const;
-
-   /** @brief Estimate the minimum value of the GridFunction in element @a elem.
-    *
-    *  @details See the protected version of EstimateFunctionMinimum for
-    *  details.
-    */
-   std::pair<real_t, real_t> EstimateFunctionMinimum(const int elem,
-                                                     const PLBound &plb,
-                                                     const int vdim,
-                                                     const int max_depth,
-                                                     const real_t tol) const;
-
-   /** @brief Estimate the minimum value of the GridFunction in element @a elem.
-    *
-    *  @details See the protected version of EstimateFunctionMaximum for
-    *  details.
-    */
-   std::pair<real_t, real_t> EstimateFunctionMaximum(const int elem,
-                                                     const PLBound &plb,
-                                                     const int vdim,
-                                                     const int max_depth,
-                                                     const real_t tol) const;
-
-   /** @brief Estimate the GridFunction minimum across all elements. */
-   virtual std::pair<real_t,real_t> EstimateFunctionMinimum(const int vdim,
-                                                            const PLBound &plb,
-                                                            const int max_depth,
-                                                            const real_t tol) const;
-
-   /** @brief Estimate the GridFunction maximum across all elements. */
-   virtual std::pair<real_t,real_t> EstimateFunctionMaximum(const int vdim,
-                                                            const PLBound &plb,
-                                                            const int max_depth,
-                                                            const real_t tol) const;
   ///@}

   /// Destroys grid function.
@@ -1946,7 +1804,7 @@ real_t ComputeElementLpDistance(real_t p, int i,
                                GridFunction& gf1, GridFunction& gf2);


-/// Class used for extruding a scalar coefficient
+/// Class used for extruding scalar GridFunctions
 class ExtrudeCoefficient : public Coefficient
 {
 private:
@@ -1954,53 +1812,13 @@ private:
   Mesh *mesh_in;
   Coefficient &sol_in;
 public:
-   /// Constructs an instance of VectorExtrudeCoefficient
-   /**
-    * @param m      1D mesh
-    * @param s      1D vector coefficient
-    * @param n_     number of transverse elements of the extruded mesh
-    */
   ExtrudeCoefficient(Mesh *m, Coefficient &s, int n_)
-      : n(n_), mesh_in(m), sol_in(s)
-   { MFEM_VERIFY(n > 0, "Number of transverse elements must be positive!"); }
-
+      : n(n_), mesh_in(m), sol_in(s) { }
   real_t Eval(ElementTransformation &T, const IntegrationPoint &ip) override;
-
   virtual ~ExtrudeCoefficient() { }
 };

-/// Class used for extruding a vector coefficient
-class VectorExtrudeCoefficient : public VectorCoefficient
-{
-private:
-   int n;
-   Mesh *mesh_in;
-   VectorCoefficient &sol_in;
-public:
-   /// Constructs an instance of VectorExtrudeCoefficient
-   /**
-    * @param m      1D mesh
-    * @param s      1D vector coefficient
-    * @param n_     number of transverse elements of the extruded mesh
-    */
-   VectorExtrudeCoefficient(Mesh *m, VectorCoefficient &s, int n_)
-      : VectorCoefficient(s.GetVDim()), n(n_), mesh_in(m), sol_in(s)
-   { MFEM_VERIFY(n > 0, "Number of transverse elements must be positive!"); }
-
-   void Eval(Vector &v, ElementTransformation &T,
-             const IntegrationPoint &ip) override;
-   using VectorCoefficient::Eval;
-
-   virtual ~VectorExtrudeCoefficient() { }
-};
-
-/// Extrude a 1D GridFunction, after extruding the mesh with Extrude1D()
-/**
- * @param mesh      1D mesh
- * @param mesh2d    extruded mesh
- * @param sol       grid function
- * @param ny        number of transverse elements of the extruded mesh
- */
+/// Extrude a scalar 1D GridFunction, after extruding the mesh with Extrude1D.
 GridFunction *Extrude1DGridFunction(Mesh *mesh, Mesh *mesh2d,
                                    GridFunction *sol, const int ny);

@@ -490,7 +490,7 @@ void FindPointsGSLIB::FindPointsOnDevice(const Vector &point_pos,
   }
   DEV.find_device = true;

-   const unsigned int id = gsl_comm->id, np = gsl_comm->np;
+   const int id = gsl_comm->id, np = gsl_comm->np;

   gsl_mfem_ref.SetSize(points_cnt * dim);
   gsl_mfem_elem.SetSize(points_cnt);
@@ -652,7 +652,7 @@ void FindPointsGSLIB::FindPointsOnDevice(const Vector &point_pos,
         {
            const int pp = hash_offset[i];
            /* don't send back to where it just came from */
-            if (static_cast<unsigned>(pp) == p->proc)
+            if (pp == p->proc)
            {
               continue;
            }
@@ -1068,7 +1068,7 @@ void FindPointsGSLIB::InterpolateOnDevice(const Vector &field_in_evec,
         sarray_transfer(struct evalOutPt_t, &outpt, proc, 1, cr);

         opt = (evalOutPt_t *)outpt.ptr;
-         for (size_t index = 0; index < outpt.n; index++)
+         for (int index = 0; index < outpt.n; index++)
         {
            int idx = ordering == Ordering::byNODES ?
                      opt->index + i*points_cnt :
@@ -1413,7 +1413,7 @@ void FindPointsGSLIB::SetupSplitMeshesAndIntegrationRules(const int order)
 {
   MFEM_VERIFY(mesh, "Setup FindPointsGSLIB with mesh first.");
   const int dof1D = order+1;
-   dim = mesh->Dimension();
+   const int dim = mesh->Dimension();

   SetupSplitMeshes();
   if (dim == 2)
@@ -2254,8 +2254,7 @@ void FindPointsGSLIB::DistributeInterpolatedValues(const Vector &int_vals,
      sarray_transfer(struct out_pt, outpt, proc, 1, cr);

      // Store received data
-      MFEM_VERIFY(outpt->n == static_cast<size_t>(points_cnt),
-                  "Incompatible size. Number of points "
+      MFEM_VERIFY(outpt->n == points_cnt, "Incompatible size. Number of points "
                  "received does not match the number of points originally "
                  "found using FindPoints.");

@@ -202,19 +202,13 @@ protected:
                            const int dof1dsol, const int ordering);

 public:
-   /// Serial constructor
   FindPointsGSLIB();
-
-   /// Serial constructor + setup with given Mesh (see \ref Setup)
   FindPointsGSLIB(Mesh &mesh_in, const double bb_t = 0.1,
                   const double newt_tol = 1.0e-12,
                   const int npt_max = 256);

 #ifdef MFEM_USE_MPI
-   /// Constructor for ParMesh
   FindPointsGSLIB(MPI_Comm comm_);
-
-   /// Constructor + setup with given ParMesh (see \ref Setup)
   FindPointsGSLIB(ParMesh &mesh_in, const double bb_t = 0.1,
                   const double newt_tol = 1.0e-12,
                   const int npt_max = 256);
@@ -254,7 +254,7 @@ get_edge(const double *elx[2], const double *wtend, int ei,
      edge.dxdn[d] = workspace + (2 + d) * pN; //dxdn and dydn at DOFs along edge
   }

-   if (static_cast<unsigned>(side_init) != (1u << ei))
+   if (side_init != (1u << ei))
   {
 #define ELX(d, j, k) elx[d][j + k * pN] // assumes lexicographic ordering
      for (int d = 0; d < 2; ++d)
@@ -294,7 +294,7 @@ get_face(const double *elx[3], const double *wtend, int fi, double *workspace,
      face.dxdn[d] = workspace+(3+d)*p_Nfr;
   }

-   if (static_cast<unsigned>(side_init) != (1u << fi))
+   if (side_init != (1u << fi))
   {
      const int e_stride[3] = {1, pN, pN*pN};
 #define ELX(d, j, k, l) elx[d][j*e_stride[d1]+k*e_stride[d2]+l*e_stride[dn]]
@@ -342,7 +342,7 @@ get_edge(const double *elx[3], const double *wtend, int ei, double *workspace,

   if (jidx >= 3*pN) { return edge; }

-   if (static_cast<unsigned>(side_init) != (64u << ei))
+   if (side_init != (64u << ei))
   {
      const int e_stride[3] = {1, pN, pN*pN};
 #define ELX(d, j, k, l) elx[d][j*e_stride[de]+k*e_stride[dn1]+l*e_stride[dn2]]
@@ -1064,8 +1064,6 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-
-      // Grad X
      MFEM_FOREACH_THREAD_DIRECT(dz,z,D1D)
      {
         MFEM_FOREACH_THREAD_DIRECT(dy,y,D1D)
@@ -1086,8 +1084,6 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-
-      // Grad Y
      MFEM_FOREACH_THREAD_DIRECT(dz,z,D1D)
      {
         MFEM_FOREACH_THREAD_DIRECT(qy,y,Q1D)
@@ -1109,8 +1105,6 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-
-      // Grad Z + Q-function
      MFEM_FOREACH_THREAD_DIRECT(qz,z,Q1D)
      {
         MFEM_FOREACH_THREAD_DIRECT(qy,y,Q1D)
@@ -1223,23 +1217,20 @@ inline void SmemPADiffusionApply3D(const int NE,

 namespace
 {
-using DiffusionApplyKernelType =
-   DiffusionIntegrator::DiffusionApplyKernelType;
-
-using DiffusionDiagonalKernelType =
-   DiffusionIntegrator::DiffusionDiagonalKernelType;
+using ApplyKernelType = DiffusionIntegrator::ApplyKernelType;
+using DiagonalKernelType = DiffusionIntegrator::DiagonalKernelType;
 }

 template<int DIM, int T_D1D, int T_Q1D>
-DiffusionApplyKernelType DiffusionIntegrator::DiffusionApplyPAKernel::Kernel()
+ApplyKernelType DiffusionIntegrator::ApplyPAKernels::Kernel()
 {
   if constexpr (DIM == 2) { return internal::SmemPADiffusionApply2D<T_D1D,T_Q1D>; }
   else if constexpr (DIM == 3) { return internal::SmemPADiffusionApply3D<T_D1D, T_Q1D>; }
   MFEM_ABORT("");
 }

-inline DiffusionApplyKernelType
-DiffusionIntegrator::DiffusionApplyPAKernel::Fallback(int DIM, int, int)
+inline
+ApplyKernelType DiffusionIntegrator::ApplyPAKernels::Fallback(int DIM, int, int)
 {
   if (DIM == 2) { return internal::PADiffusionApply2D; }
   else if (DIM == 3) { return internal::PADiffusionApply3D; }
@@ -1247,16 +1238,15 @@ DiffusionIntegrator::DiffusionApplyPAKernel::Fallback(int DIM, int, int)
 }

 template<int DIM, int D1D, int Q1D>
-DiffusionDiagonalKernelType
-DiffusionIntegrator::DiffusionDiagonalPAKernel::Kernel()
+DiagonalKernelType DiffusionIntegrator::DiagonalPAKernels::Kernel()
 {
   if constexpr (DIM == 2) { return internal::SmemPADiffusionDiagonal2D<D1D,Q1D>; }
   else if constexpr (DIM == 3) { return internal::SmemPADiffusionDiagonal3D<D1D, Q1D>; }
   MFEM_ABORT("");
 }

-inline DiffusionDiagonalKernelType
-DiffusionIntegrator::DiffusionDiagonalPAKernel::Fallback(int DIM, int, int)
+inline DiagonalKernelType
+DiffusionIntegrator::DiagonalPAKernels::Fallback(int DIM, int, int)
 {
   if (DIM == 2) { return internal::PADiffusionDiagonal2D; }
   else if (DIM == 3) { return internal::PADiffusionDiagonal3D; }
@@ -31,8 +31,8 @@ void DiffusionIntegrator::AssembleDiagonalPA(Vector &diag)
      const Array<real_t> &B = maps->B;
      const Array<real_t> &G = maps->G;
      const Vector &Dv = pa_data;
-      DiffusionDiagonalPAKernel::Run(dim, dofs1D, quad1D, ne, symmetric, B, G, Dv,
-                                     diag, dofs1D, quad1D);
+      DiagonalPAKernels::Run(dim, dofs1D, quad1D, ne, symmetric, B, G, Dv,
+                             diag, dofs1D, quad1D);
   }
 }

@@ -68,8 +68,8 @@ void DiffusionIntegrator::AddMultPA(const Vector &x, Vector &y) const
      }
 #endif // MFEM_USE_OCCA

-      DiffusionApplyPAKernel::Run(dim, dofs1D, quad1D, ne, symmetric, B, G, Bt,
-                                  Gt, Dv, x, y, dofs1D, quad1D);
+      ApplyPAKernels::Run(dim, dofs1D, quad1D, ne, symmetric, B, G, Bt,
+                          Gt, Dv, x, y, dofs1D, quad1D);
   }
 }

@@ -174,9 +174,9 @@ void DiffusionIntegrator::AddAbsMultPA(const Vector &x, Vector &y) const
   abs_pa_data.Abs();
   auto abs_maps = maps->Abs();

-   DiffusionApplyPAKernel::Run(dim, dofs1D, quad1D, ne, symmetric,
-                               abs_maps.B, abs_maps.G, abs_maps.Bt, abs_maps.Gt,
-                               abs_pa_data, x, y, dofs1D, quad1D);
+   ApplyPAKernels::Run(dim, dofs1D, quad1D, ne, symmetric,
+                       abs_maps.B, abs_maps.G, abs_maps.Bt, abs_maps.Gt,
+                       abs_pa_data, x, y, dofs1D, quad1D);
 }

 void DiffusionIntegrator::AddAbsMultTransposePA(const Vector &x,
@@ -197,21 +197,15 @@ static void EAHdivAssemble3D(const int NE,
      // Assemble (one row per thread)
      MFEM_FOREACH_THREAD(idx_i, x, NDOF)
      {
-         // NOTE: due to an llvm backend bug, usage of the modulus operator
-         // has been removed from this foreach section.
         const int ic = idx_i / NDOF_C;
-         const int idx_ii = idx_i - ic * NDOF_C; // idx_i % NDOF_C
+         const int idx_ii = idx_i % NDOF_C;

         const int nx_i = (ic == 0) ? D1D : D1D-1;
         const int ny_i = (ic == 1) ? D1D : D1D-1;

-         const int qx_i = idx_ii / nx_i;
-         const int ix = idx_ii - qx_i * nx_i; // idx_ii % nx_i
-
-         const int qy_i = qx_i / ny_i;
-         const int iy = qx_i - qy_i * ny_i; // (idx_ii / nx_i) % ny_i
-
-         const int iz = qy_i; // (idx_ii / nx_i) / ny_i
+         const int ix = idx_ii % nx_i;
+         const int iy = (idx_ii / nx_i) % ny_i;
+         const int iz = (idx_ii / nx_i) / ny_i;

         const real_t (&Bi1)[MQ1][MD1] = (ic == 0) ? r_Bc : r_Bo;
         const real_t (&Bi2)[MQ1][MD1] = (ic == 1) ? r_Bc : r_Bo;
@@ -220,18 +214,14 @@ static void EAHdivAssemble3D(const int NE,
         for (int idx_j = 0; idx_j < NDOF; ++idx_j)
         {
            const int jc = idx_j / NDOF_C;
-            const int idx_jj = idx_j - jc * NDOF_C; // idx_j % NDOF_C
+            const int idx_jj = idx_j % NDOF_C;

            const int nx_j = (jc == 0) ? D1D : D1D-1;
            const int ny_j = (jc == 1) ? D1D : D1D-1;

-            const int qx_j = idx_jj / nx_j;
-            const int jx = idx_jj - qx_j * nx_j; // idx_jj % nx_j
-
-            const int qy_j = qx_j / ny_j;
-            const int jy = qx_j - qy_j * ny_j; // (idx_jj / nx_j) % ny_j
-
-            const int jz = qy_j; // (idx_jj / nx_j) / ny_j
+            const int jx = idx_jj % nx_j;
+            const int jy = (idx_jj / nx_j) % ny_j;
+            const int jz = (idx_jj / nx_j) / ny_j;

            const real_t (&Bj1)[MQ1][MD1] = (jc == 0) ? r_Bc : r_Bo;
            const real_t (&Bj2)[MQ1][MD1] = (jc == 1) ? r_Bc : r_Bo;
@@ -171,15 +171,15 @@ template<int DIM, int T_SDIM, int T_D1D, int T_Q1D>
 VectorDiffusionIntegrator::ApplyKernelType
 VectorDiffusionIntegrator::ApplyPAKernels::Kernel()
 {
-   if constexpr (DIM == 2)
+   if (DIM == 2)
   {
      return internal::SmemPAVectorDiffusionApply2D<T_SDIM, T_D1D, T_Q1D>;
   }
-   else if constexpr (DIM == 3)
+   else if (DIM == 3)
   {
      return internal::SmemPAVectorDiffusionApply3D<T_SDIM, T_D1D, T_Q1D>;
   }
-   MFEM_ABORT("Unsupported kernel");
+   else { MFEM_ABORT("Unsupported kernel"); }
 }

 inline VectorDiffusionIntegrator::ApplyKernelType
@@ -182,15 +182,15 @@ template<int DIM, int T_D1D, int T_Q1D>
 VectorMassIntegrator::VectorMassAddMultPAType
 VectorMassIntegrator::VectorMassAddMultPA::Kernel()
 {
-   if constexpr (DIM == 2)
+   if (DIM == 2)
   {
      return internal::SmemPAVectorMassApply2D<T_D1D,T_Q1D>;
   }
-   else if constexpr (DIM == 3)
+   else if (DIM == 3)
   {
      return internal::SmemPAVectorMassApply3D<T_D1D, T_Q1D>;
   }
-   MFEM_ABORT("Unsupported kernel");
+   else { MFEM_ABORT("Unsupported kernel"); }
 }

 inline VectorMassIntegrator::VectorMassAddMultPAType
@@ -301,14 +301,18 @@ template <int DIM, int T_D1D, int T_Q1D>
 DomainLFIntegrator::AssembleKernelType
 DomainLFIntegrator::AssembleKernels::Kernel()
 {
-   if constexpr (DIM == 1) { return DLFEvalAssemble1D<T_D1D, T_Q1D>; }
-   if constexpr (DIM == 2) { return DLFEvalAssemble2D<T_D1D, T_Q1D>; }
-   if constexpr (DIM == 3) { return DLFEvalAssemble3D<T_D1D, T_Q1D>; }
+   switch (DIM)
+   {
+      case 1:
+         return DLFEvalAssemble1D<T_D1D, T_Q1D>;
+      case 2:
+         return DLFEvalAssemble2D<T_D1D, T_Q1D>;
+      case 3:
+         return DLFEvalAssemble3D<T_D1D, T_Q1D>;
+   }
   MFEM_ABORT("");
 }
-
 /// \endcond DO_NOT_DOCUMENT

 } // namespace mfem
-
-#endif // MFEM_LININTEG_DOMAIN_KERNELS_HPP
+#endif
@@ -43,52 +43,56 @@ public:
      index = i;
   }

-   void Set3w(const real_t x1, const real_t x2, const real_t x3, const real_t w)
-   { x = x1; y = x2; z = x3; weight = w; }
-   void Set2w(const real_t x1, const real_t x2, const real_t w)
-   { x = x1; y = x2; weight = w; }
-   void Set1w(const real_t x1, const real_t w)
-   { x = x1; weight = w; }
-
-   void Set3w(const real_t *p) { Set3w(p[0], p[1], p[2], p[3]); }
-   void Set2w(const real_t *p) { Set2w(p[0], p[1], p[2]); }
-   void Set1w(const real_t *p) { Set1w(p[0], p[1]); }
-
-   void Set3(const real_t x1, const real_t x2, const real_t x3)
-   { x = x1; y = x2; z = x3; }
-   void Set2(const real_t x1, const real_t x2)
-   { x = x1; y = x2; }
-   void Set1(const real_t x1)
-   { x = x1; }
-
-   void Set3(const real_t *p) { Set3(p[0], p[1], p[2]); }
-   void Set2(const real_t *p) { Set2(p[0], p[1]); }
-   void Set1(const real_t *p) { Set1(p[0]); }
-
-   void Set(const real_t x1, const real_t x2, const real_t x3, const real_t w)
-   { Set3w(x1, x2, x3, w); }
-
   void Set(const real_t *p, const int dim)
   {
      MFEM_ASSERT(1 <= dim && dim <= 3, "invalid dim: " << dim);
-      switch (dim)
+      x = p[0];
+      if (dim > 1)
      {
-         case 3: Set3(p); break;
-         case 2: Set2(p); break;
-         case 1: Set1(p); break;
+         y = p[1];
+         if (dim > 2)
+         {
+            z = p[2];
+         }
      }
   }

   void Get(real_t *p, const int dim) const
   {
      MFEM_ASSERT(1 <= dim && dim <= 3, "invalid dim: " << dim);
-      switch (dim)
+      p[0] = x;
+      if (dim > 1)
      {
-         case 3: p[2] = z;
-         case 2: p[1] = y;
-         case 1: p[0] = x;
+         p[1] = y;
+         if (dim > 2)
+         {
+            p[2] = z;
+         }
      }
   }
+
+   void Set(const real_t x1, const real_t x2, const real_t x3, const real_t w)
+   { x = x1; y = x2; z = x3; weight = w; }
+
+   void Set3w(const real_t *p) { x = p[0]; y = p[1]; z = p[2]; weight = p[3]; }
+
+   void Set3(const real_t x1, const real_t x2, const real_t x3)
+   { x = x1; y = x2; z = x3; }
+
+   void Set3(const real_t *p) { x = p[0]; y = p[1]; z = p[2]; }
+
+   void Set2w(const real_t x1, const real_t x2, const real_t w)
+   { x = x1; y = x2; weight = w; }
+
+   void Set2w(const real_t *p) { x = p[0]; y = p[1]; weight = p[2]; }
+
+   void Set2(const real_t x1, const real_t x2) { x = x1; y = x2; }
+
+   void Set2(const real_t *p) { x = p[0]; y = p[1]; }
+
+   void Set1w(const real_t x1, const real_t w) { x = x1; weight = w; }
+
+   void Set1w(const real_t *p) { x = p[0]; weight = p[1]; }
 };

 /// Class for an integration rule - an Array of IntegrationPoint.
@@ -121,6 +125,18 @@ private:
   void AddTriPoints3b(const int off, const real_t b, const real_t weight)
   { AddTriPoints3(off, (1. - b)/2., b, weight); }

+   void AddTriPoints3R(const int off, const real_t a, const real_t b,
+                       const real_t c, const real_t weight)
+   {
+      IntPoint(off + 0).Set2w(a, b, weight);
+      IntPoint(off + 1).Set2w(c, a, weight);
+      IntPoint(off + 2).Set2w(b, c, weight);
+   }
+
+   void AddTriPoints3R(const int off, const real_t a, const real_t b,
+                       const real_t weight)
+   { AddTriPoints3R(off, a, b, 1. - a - b, weight); }
+
   void AddTriPoints6(const int off, const real_t a, const real_t b,
                      const real_t c, const real_t weight)
   {
@@ -167,6 +183,14 @@ private:
      AddTetPoints3(off + 1, a, 1. - 3.*a, weight);
   }

+   // given b, add the permutations of (a,a,a,b), where 3*a + b = 1
+   void AddTetPoints4b(const int off, const real_t b, const real_t weight)
+   {
+      const real_t a = (1. - b)/3.;
+      IntPoint(off).Set(a, a, a, weight);
+      AddTetPoints3(off + 1, a, b, weight);
+   }
+
   // add the permutations of (a,a,b,b), 2*(a + b) = 1
   void AddTetPoints6(const int off, const real_t a, const real_t weight)
   {
@@ -185,37 +209,14 @@ private:
      AddTetPoints6(off + 6, a, bc, cb, weight);
   }

-   // add all 24 permutations of (a,b,c,d) where a+b+c+d = 1, all distinct
-   void AddTetPoints24(const int off, const real_t a, const real_t b,
-                       const real_t c, const real_t weight)
+   // given (b,c), add the permutations of (a,a,b,c), 2*a + b + c = 1
+   void AddTetPoints12bc(const int off, const real_t b, const real_t c,
+                         const real_t weight)
   {
-      const real_t d = 1. - a - b - c;
-      // all 24 permutations of 4 distinct barycentric coordinates
-      // permuting which coordinate goes to x, y, z (4th is 1-x-y-z)
-      IntPoint(off +  0).Set(a, b, c, weight);
-      IntPoint(off +  1).Set(a, b, d, weight);
-      IntPoint(off +  2).Set(a, c, b, weight);
-      IntPoint(off +  3).Set(a, c, d, weight);
-      IntPoint(off +  4).Set(a, d, b, weight);
-      IntPoint(off +  5).Set(a, d, c, weight);
-      IntPoint(off +  6).Set(b, a, c, weight);
-      IntPoint(off +  7).Set(b, a, d, weight);
-      IntPoint(off +  8).Set(b, c, a, weight);
-      IntPoint(off +  9).Set(b, c, d, weight);
-      IntPoint(off + 10).Set(b, d, a, weight);
-      IntPoint(off + 11).Set(b, d, c, weight);
-      IntPoint(off + 12).Set(c, a, b, weight);
-      IntPoint(off + 13).Set(c, a, d, weight);
-      IntPoint(off + 14).Set(c, b, a, weight);
-      IntPoint(off + 15).Set(c, b, d, weight);
-      IntPoint(off + 16).Set(c, d, a, weight);
-      IntPoint(off + 17).Set(c, d, b, weight);
-      IntPoint(off + 18).Set(d, a, b, weight);
-      IntPoint(off + 19).Set(d, a, c, weight);
-      IntPoint(off + 20).Set(d, b, a, weight);
-      IntPoint(off + 21).Set(d, b, c, weight);
-      IntPoint(off + 22).Set(d, c, a, weight);
-      IntPoint(off + 23).Set(d, c, b, weight);
+      const real_t a = (1. - b - c)/2.;
+      AddTetPoints3(off,     a, b, weight);
+      AddTetPoints3(off + 3, a, c, weight);
+      AddTetPoints6(off + 6, a, b, c, weight);
   }

 public:
@@ -207,28 +207,6 @@ inline MFEM_HOST_DEVICE void WriteDofs2d(const int e, const int d1d,
   MFEM_SYNC_THREAD;
 }

-/// Load 3D input DIM vector at element offset into given register tensor
-template <int VDIM, int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void LoadDofs3d(const int d1d, const int c,
-                                        const DeviceTensor<4, const real_t> &X,
-                                        vd_regs3d_t<VDIM, DIM, MQ1> &Y)
-{
-   for (int d = 0; d < DIM; d++)
-   {
-      for (int dz = 0; dz < d1d; ++dz)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(dy, y, d1d)
-         {
-            MFEM_FOREACH_THREAD_DIRECT(dx, x, d1d)
-            {
-               Y[c][d][dz][dy][dx] = X(dx, dy, dz, c);
-            }
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
 /// Load 3D input VDIM*DIM vector into given register tensor, specific component
 template <int VDIM, int DIM, int MQ1>
 inline MFEM_HOST_DEVICE void LoadDofs3d(const int e, const int d1d, const int c,
@@ -354,28 +332,6 @@ inline MFEM_HOST_DEVICE void WriteDofs3d(const int e, const int d1d,
   MFEM_SYNC_THREAD;
 }

-/// Write 3D DIM vector into given device tensor for specific component
-template <int VDIM, int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void WriteDofs3d(const int d1d, const int c,
-                                         vd_regs3d_t<VDIM, DIM, MQ1> &X,
-                                         DeviceTensor<4, real_t> &Y)
-{
-   for (int dz = 0; dz < d1d; ++dz)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(dy, y, d1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(dx, x, d1d)
-         {
-            for (int d = 0; d < DIM; ++d)
-            {
-               Y(dx, dy, dz, c) += X(c, d, dz, dy, dx);
-            }
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
 /// 2D scalar contraction, X direction
 template <bool Transpose, int MQ1>
 inline MFEM_HOST_DEVICE void ContractX2d(const int d1d, const int q1d,
@@ -1,332 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-#pragma once
-
-#include "../config/config.hpp"
-#include "../general/forall.hpp"
-#include "../linalg/dtensor.hpp"
-
-#include "kernels.hpp" // IWYU pragma: keep
-
-namespace mfem::kernels::internal::low
-{
-
-#if ((defined(MFEM_USE_CUDA) && defined(__CUDA_ARCH__)) ||       \
-     (defined(MFEM_USE_HIP) && defined(__HIP_DEVICE_COMPILE__)))
-template <int DIM, int N>
-// struct regs3d_device_wrapper: mfem::future::tensor<real_t, DIM, 0, 0, 0> {};
-struct regs3d_device_wrapper: mfem::future::tensor<real_t, 0, 0, 0, DIM> {};
-template <int DIM, int N>
-using regs3d_t = regs3d_device_wrapper<DIM, N>;
-#else
-template <int DIM, int N>
-using regs3d_t = mfem::future::tensor<real_t, N, N, N, DIM>;
-// using regs3d_t = mfem::future::tensor<real_t, DIM, N, N, N>;
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-/// Load 2D matrix into shared memory
-template <int MQ1>
-inline MFEM_HOST_DEVICE void LoadMatrix(const int d1d, const int q1d,
-                                        const real_t *M, real_t (*N)[MQ1])
-{
-   if (MFEM_THREAD_ID(z) == 0)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(dy, y, d1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(qx, x, q1d)
-         {
-            N[dy][qx] = M[dy * q1d + qx];
-         }
-      }
-   }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-template <int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void LoadDofs3d(const int e, const int d1d,
-                                        const DeviceTensor<5, const real_t> &XE,
-                                        real_t (&sm0)[MQ1][MQ1][MQ1][DIM])
-{
-   MFEM_FOREACH_THREAD_DIRECT(dy,y,d1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(dx,x,d1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(dz,z,d1d)
-         {
-            sm0[dz][dy][dx][0] = XE(dx, dy, dz, 0, e);
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D Scalar Gradient, 1/3
-template<int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void GradX(const int d1d, const int q1d,
-                                   const real_t (*B)[MQ1],
-                                   const real_t (*G)[MQ1],
-                                   const real_t (&sm0)[MQ1][MQ1][MQ1][DIM],
-                                   real_t (&sm1)[MQ1][MQ1][MQ1][DIM])
-{
-   MFEM_FOREACH_THREAD_DIRECT(dz,z,d1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(dy,y,d1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(qx,x,q1d)
-         {
-            real_t u = 0.0, v = 0.0;
-            MFEM_UNROLL(MQ1)
-            for (int dx = 0; dx < d1d; ++dx)
-            {
-               const auto x = sm0[dz][dy][dx][0];
-               u = std::fma(B[dx][qx], x, u);
-               v = std::fma(G[dx][qx], x, v);
-            }
-            sm1[dz][dy][qx][0] = u;
-            sm1[dz][dy][qx][1] = v;
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D Scalar Gradient, 2/3
-template<int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void GradY(const int d1d, const int q1d,
-                                   const real_t (*B)[MQ1],
-                                   const real_t (*G)[MQ1],
-                                   const real_t (&sm1)[MQ1][MQ1][MQ1][DIM],
-                                   real_t (&sm0)[MQ1][MQ1][MQ1][DIM])
-{
-   MFEM_FOREACH_THREAD_DIRECT(dz,z,d1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(qy,y,q1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(qx,x,q1d)
-         {
-            real_t u = 0.0, v = 0.0, w = 0.0;
-            MFEM_UNROLL(MQ1)
-            for (int dy = 0; dy < d1d; ++dy)
-            {
-               u = std::fma(sm1[dz][dy][qx][1], B[dy][qy], u);
-               v = std::fma(sm1[dz][dy][qx][0], G[dy][qy], v);
-               w = std::fma(sm1[dz][dy][qx][0], B[dy][qy], w);
-            }
-            sm0[dz][qy][qx][0] = u;
-            sm0[dz][qy][qx][1] = v;
-            sm0[dz][qy][qx][2] = w;
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D Scalar Gradient, 3/3
-template<int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void GradZ(const int d1d, const int q1d,
-                                   const real_t (*B)[MQ1],
-                                   const real_t (*G)[MQ1],
-                                   const real_t (&sm0)[MQ1][MQ1][MQ1][DIM],
-                                   regs3d_t<DIM,MQ1> &reg)
-{
-   MFEM_FOREACH_THREAD_DIRECT(qz,z,q1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(qy,y,q1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(qx,x,q1d)
-         {
-            real_t u[3] = {0.0, 0.0, 0.0};
-            MFEM_UNROLL(MQ1)
-            for (int dz = 0; dz < d1d; ++dz)
-            {
-               u[0] = std::fma(B[dz][qz], sm0[dz][qy][qx][0], u[0]);
-               u[1] = std::fma(B[dz][qz], sm0[dz][qy][qx][1], u[1]);
-               u[2] = std::fma(G[dz][qz], sm0[dz][qy][qx][2], u[2]);
-            }
-            reg[qz][qy][qx][0] = u[0];
-            reg[qz][qy][qx][1] = u[1];
-            reg[qz][qy][qx][2] = u[2];
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D scalar gradient
-template <int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void Grad3d(const int d1d, const int q1d,
-                                    const real_t (*B)[MQ1],
-                                    const real_t (*G)[MQ1],
-                                    real_t (&sm0)[MQ1][MQ1][MQ1][DIM],
-                                    real_t (&sm1)[MQ1][MQ1][MQ1][DIM],
-                                    regs3d_t<DIM,MQ1> &reg)
-{
-   GradX(d1d, q1d, B, G, sm0, sm1); // Grad X
-   GradY(d1d, q1d, B, G, sm1, sm0); // Grad Y
-   GradZ(d1d, q1d, B, G, sm0, reg); // Grad Z
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D Scalar Gradient Transposed, 1/3
-template<int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void GradTranspose3dX(const int d1d, const int q1d,
-                                              const real_t (*B)[MQ1],
-                                              const real_t (*G)[MQ1],
-                                              regs3d_t<DIM,MQ1> &reg,
-                                              real_t (&sm1)[MQ1][MQ1][MQ1][DIM],
-                                              real_t (&sm0)[MQ1][MQ1][MQ1][DIM])
-
-{
-   MFEM_FOREACH_THREAD_DIRECT(qz,z,q1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(qy,y,q1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(qx,x,q1d)
-         {
-            sm1[qz][qy][qx][0] = reg[qz][qy][qx][0];
-            sm1[qz][qy][qx][1] = reg[qz][qy][qx][1];
-            sm1[qz][qy][qx][2] = reg[qz][qy][qx][2];
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-
-   MFEM_FOREACH_THREAD_DIRECT(qz,z,q1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(qy,y,q1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(dx,x,d1d)
-         {
-            real_t u = 0.0, v = 0.0, w = 0.0;
-            MFEM_UNROLL(MQ1)
-            for (int qx = 0; qx < q1d; ++qx)
-            {
-               u = std::fma(sm1[qz][qy][qx][0], G[dx][qx], u);
-               v = std::fma(sm1[qz][qy][qx][1], B[dx][qx], v);
-               w = std::fma(sm1[qz][qy][qx][2], B[dx][qx], w);
-            }
-            sm0[qz][qy][dx][0] = u;
-            sm0[qz][qy][dx][1] = v;
-            sm0[qz][qy][dx][2] = w;
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D Scalar Gradient Transposed, 2/3
-template<int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void GradTranspose3dY(const int d1d, const int q1d,
-                                              const real_t (*B)[MQ1],
-                                              const real_t (*G)[MQ1],
-                                              real_t (&sm0)[MQ1][MQ1][MQ1][DIM],
-                                              real_t (&sm1)[MQ1][MQ1][MQ1][DIM])
-{
-   MFEM_FOREACH_THREAD_DIRECT(qz,z,q1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(dy,y,d1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(dx,x,d1d)
-         {
-            real_t u = 0.0, v = 0.0, w = 0.0;
-            MFEM_UNROLL(MQ1)
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               u = std::fma(sm0[qz][qy][dx][0], B[dy][qy], u);
-               v = std::fma(sm0[qz][qy][dx][1], G[dy][qy], v);
-               w = std::fma(sm0[qz][qy][dx][2], B[dy][qy], w);
-            }
-            sm1[qz][dy][dx][0] = u;
-            sm1[qz][dy][dx][1] = v;
-            sm1[qz][dy][dx][2] = w;
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D Scalar Gradient Transposed, 3/3
-template<int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void GradTranspose3dZ(const int d1d, const int q1d,
-                                              const real_t (*B)[MQ1],
-                                              const real_t (*G)[MQ1],
-                                              real_t (&sm1)[MQ1][MQ1][MQ1][DIM],
-                                              regs3d_t<DIM,MQ1> &reg)
-{
-   MFEM_FOREACH_THREAD_DIRECT(dz,z,d1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(dy,y,d1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(dx,x,d1d)
-         {
-            real_t u = 0.0, v = 0.0, w = 0.0;
-            MFEM_UNROLL(MQ1)
-            for (int qz = 0; qz < q1d; ++qz)
-            {
-               u = std::fma(sm1[qz][dy][dx][0], B[dz][qz], u);
-               v = std::fma(sm1[qz][dy][dx][1], B[dz][qz], v);
-               w = std::fma(sm1[qz][dy][dx][2], G[dz][qz], w);
-            }
-            reg[dz][dy][dx][0] = u;
-            reg[dz][dy][dx][1] = v;
-            reg[dz][dy][dx][2] = w;
-         }
-      }
-   }
-   MFEM_SYNC_THREAD;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D scalar gradient transposed
-template <int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void GradTranspose3d(const int d1d, const int q1d,
-                                             const real_t (*B)[MQ1],
-                                             const real_t (*G)[MQ1],
-                                             regs3d_t<DIM,MQ1> &reg,
-                                             real_t (&sm1)[MQ1][MQ1][MQ1][DIM],
-                                             real_t (&sm0)[MQ1][MQ1][MQ1][DIM])
-{
-   GradTranspose3dX(d1d, q1d, B, G, reg, sm1, sm0); // Grad^T X
-   GradTranspose3dY(d1d, q1d, B, G, sm0, sm1); // Grad^T Y
-   GradTranspose3dZ(d1d, q1d, B, G, sm1, reg); // Grad^T Z
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// 3D Scalar Gradient Transposed, 3/3
-template<int DIM, int MQ1>
-inline MFEM_HOST_DEVICE void WriteDofs3d(const int d1d,
-                                         const int c, const int e,
-                                         regs3d_t<DIM,MQ1> &reg,
-                                         const DeviceTensor<5, real_t> &YE)
-{
-   MFEM_FOREACH_THREAD_DIRECT(dz,z,d1d)
-   {
-      MFEM_FOREACH_THREAD_DIRECT(dy,y,d1d)
-      {
-         MFEM_FOREACH_THREAD_DIRECT(dx,x,d1d)
-         {
-            const real_t u = reg[dz][dy][dx][0];
-            const real_t v = reg[dz][dy][dx][1];
-            const real_t w = reg[dz][dy][dx][2];
-            YE(dx, dy, dz, c, e) += (u + v + w);
-         }
-      }
-   }
-}
-
-} // namespace mfem::kernels::internal
@@ -297,8 +297,7 @@ void LinearForm::Assemble()
         tr = mesh->GetBdrFaceTransformations(i);
         if (tr != NULL)
         {
-            mfem::DofTransformation doftrans;
-            fes -> GetElementVDofs (tr -> Elem1No, vdofs, doftrans);
+            fes -> GetElementVDofs (tr -> Elem1No, vdofs);
            for (int k = 0; k < boundary_face_integs.Size(); k++)
            {
               if (boundary_face_integs_marker[k] &&
@@ -308,7 +307,6 @@ void LinearForm::Assemble()
               boundary_face_integs[k]->
               AssembleRHSElementVect(*fes->GetFE(tr->Elem1No),
                                      *tr, elemvect);
-               doftrans.TransformDual(elemvect);
               AddElementVector (vdofs, elemvect);
            }
         }
@@ -164,8 +164,8 @@ private:

 public:
   /// Constructs the domain integrator $ (Q, \nabla v) $
-   DomainLFGradIntegrator(VectorCoefficient &QF, const IntegrationRule *ir = NULL)
-      : DeltaLFIntegrator(QF, ir), Q(QF) { }
+   DomainLFGradIntegrator(VectorCoefficient &QF)
+      : DeltaLFIntegrator(QF), Q(QF) { }

   bool SupportsDevice() const override { return true; }

@@ -158,16 +158,15 @@ void LORBase::ConstructLocalDofPermutation(Array<int> &perm_) const
               int i;
               i = dofmap_lor[off_lor + i1 + i2*2];
               int s1 = i < 0 ? -1 : 1;
-               int idof_lor = vdof_lor[UnsignIndex(i)];
+               int idof_lor = vdof_lor[absdof(i)];
               i = dofmap_ho[off_ho + i1*n1 + i2*n2];
               int s2 = i < 0 ? -1 : 1;
-               int idof_ho = vdof_ho[UnsignIndex(i)];
+               int idof_ho = vdof_ho[absdof(i)];
               int s3 = idof_lor < 0 ? -1 : 1;
               int s4 = idof_ho < 0 ? -1 : 1;
               int s = s1*s2*s3*s4;
-               i = UnsignIndex(idof_ho);
-               perm_[UnsignIndex(idof_lor)] = s < 0 ? -1-UnsignIndex(i) :
-                                              UnsignIndex(i);
+               i = absdof(idof_ho);
+               perm_[absdof(idof_lor)] = s < 0 ? -1-absdof(i) : absdof(i);
            }
         }
      };
@@ -233,7 +232,7 @@ void LORBase::ConstructDofPermutation() const
         int j = l_perm[i];
         int s = j < 0 ? -1 : 1;
         int t_i = pfes_lor->GetLocalTDofNumber(i);
-         int t_j = pfes_ho->GetLocalTDofNumber(UnsignIndex(j));
+         int t_j = pfes_ho->GetLocalTDofNumber(absdof(j));
         // Either t_i and t_j both -1, or both non-negative
         if ((t_i < 0 && t_j >=0) || (t_j < 0 && t_i >= 0))
         {
@@ -57,6 +57,8 @@ private:
   /// values (after temporarily changing them for LOR assembly).
   void ResetIntegrationRules(GetIntegratorsFn get_integrators);

+   static inline int absdof(int i) { return i < 0 ? -1-i : i; }
+
 protected:
   enum FESpaceType { H1, ND, RT, L2, INVALID };

@@ -224,9 +224,6 @@ public:
   /** @see GetGradient(const Vector &) */
   Operator &GetGradient(const Vector &x, bool finalize) const;

-   /// Suppress a warning about hiding overloaded virtual function.
-   using Operator::GetGradient;
-
   /// Update the NonlinearForm to propagate updates of the associated FE space.
   /** After calling this method, the essential boundary conditions need to be
       set again. */
@@ -424,7 +424,7 @@ void ParFiniteElementSpace::GetGroupComm(
            {
               if (ind[l] < 0)
               {
-                  dofs[l] = m + FlipIndexSign(ind[l]);
+                  dofs[l] = m + (-1-ind[l]);
                  if (g_ldof_sign)
                  {
                     (*g_ldof_sign)[dofs[l]] = -1;
@@ -462,7 +462,7 @@ void ParFiniteElementSpace::GetGroupComm(
            {
               if (ind[l] < 0)
               {
-                  dofs[l] = m + FlipIndexSign(ind[l]);
+                  dofs[l] = m + (-1-ind[l]);
                  if (g_ldof_sign)
                  {
                     (*g_ldof_sign)[dofs[l]] = -1;
@@ -500,7 +500,7 @@ void ParFiniteElementSpace::GetGroupComm(
            {
               if (ind[l] < 0)
               {
-                  dofs[l] = m + FlipIndexSign(ind[l]);
+                  dofs[l] = m + (-1-ind[l]);
                  if (g_ldof_sign)
                  {
                     (*g_ldof_sign)[dofs[l]] = -1;
@@ -538,16 +538,16 @@ void ParFiniteElementSpace::ApplyLDofSigns(Array<int> &dofs) const
   {
      if (dofs[i] < 0)
      {
-         if (ldof_sign[FlipIndexSign(dofs[i])] < 0)
+         if (ldof_sign[-1-dofs[i]] < 0)
         {
-            dofs[i] = FlipIndexSign(dofs[i]);
+            dofs[i] = -1-dofs[i];
         }
      }
      else
      {
         if (ldof_sign[dofs[i]] < 0)
         {
-            dofs[i] = FlipIndexSign(dofs[i]);
+            dofs[i] = -1-dofs[i];
         }
      }
   }
@@ -699,8 +699,7 @@ void ParFiniteElementSpace::GetSharedEdgeDofs(
      for (int i = 0; i < dofs.Size(); i++)
      {
         const int di = dofs[i];
-         dofs[i] = di >= 0 ? rdofs[di] :
-                   FlipIndexSign(rdofs[FlipIndexSign(di)]);
+         dofs[i] = (di >= 0) ? rdofs[di] : -1-rdofs[-1-di];
      }
   }
 }
@@ -724,8 +723,7 @@ void ParFiniteElementSpace::GetSharedTriangleDofs(
      for (int i = 0; i < dofs.Size(); i++)
      {
         const int di = dofs[i];
-         dofs[i] = di >= 0 ? rdofs[di] :
-                   FlipIndexSign(rdofs[FlipIndexSign(di)]);
+         dofs[i] = (di >= 0) ? rdofs[di] : -1-rdofs[-1-di];
      }
   }
 }
@@ -749,8 +747,7 @@ void ParFiniteElementSpace::GetSharedQuadrilateralDofs(
      for (int i = 0; i < dofs.Size(); i++)
      {
         const int di = dofs[i];
-         dofs[i] = (di >= 0) ? rdofs[di] :
-                   FlipIndexSign(rdofs[FlipIndexSign(di)]);
+         dofs[i] = (di >= 0) ? rdofs[di] : -1-rdofs[-1-di];
      }
   }
 }
@@ -1490,7 +1487,7 @@ void ParFiniteElementSpace::ExchangeFaceNbrData()
         GetElementVDofs(my_elems[i], ldofs);
         for (int j = 0; j < ldofs.Size(); j++)
         {
-            int ldof = UnsignIndex(ldofs[j]);
+            int ldof = (ldofs[j] >= 0 ? ldofs[j] : -1-ldofs[j]);

            if (ldof_marker[ldof] != fn)
            {
@@ -1551,7 +1548,7 @@ void ParFiniteElementSpace::ExchangeFaceNbrData()
         GetElementVDofs(my_elems[i], ldofs);
         for (int j = 0; j < ldofs.Size(); j++)
         {
-            int ldof = UnsignIndex(ldofs[j]);
+            int ldof = (ldofs[j] >= 0 ? ldofs[j] : -1-ldofs[j]);

            if (ldof_marker[ldof] != fn)
            {
@@ -1576,15 +1573,14 @@ void ParFiniteElementSpace::ExchangeFaceNbrData()

      for (int i = 0; i < num_ldofs; i++)
      {
-         int ldof = UnsignIndex(ldofs_fn[i]);
+         int ldof = (ldofs_fn[i] >= 0 ? ldofs_fn[i] : -1-ldofs_fn[i]);
         ldof_marker[ldof] = i;
      }

      for ( ; j < j_end; j++)
      {
-         const int ldof = UnsignIndex(send_J[j]);
-         send_J[j] = (send_J[j] >= 0 ? ldof_marker[ldof] :
-                      FlipIndexSign(ldof_marker[ldof]));
+         int ldof = (send_J[j] >= 0 ? send_J[j] : -1-send_J[j]);
+         send_J[j] = (send_J[j] >= 0 ? ldof_marker[ldof] : -1-ldof_marker[ldof]);
      }
   }

@@ -1676,7 +1672,12 @@ void ParFiniteElementSpace::ExchangeFaceNbrData()
   {
      for (int j_end = face_nbr_ldof.GetI()[fn+1]; j < j_end; j++)
      {
-         const int ldof = UnsignIndex(face_nbr_ldof.GetJ()[j]);
+         int ldof = face_nbr_ldof.GetJ()[j];
+         if (ldof < 0)
+         {
+            ldof = -1-ldof;
+         }
+
         face_nbr_glob_dof_map[j] = dof_face_nbr_offsets[fn] + ldof;
      }
   }
@@ -1720,7 +1721,7 @@ void ParFiniteElementSpace::GetFaceNbrFaceVDofs(int i, Array<int> &vdofs) const
   MFEM_ASSERT(Nonconforming() && i >= pmesh->GetNumFaces(), "");
   int el1, el2, inf1, inf2;
   pmesh->GetFaceElements(i, &el1, &el2);
-   el2 = FlipIndexSign(el2);
+   el2 = -1 - el2;
   pmesh->GetFaceInfos(i, &inf1, &inf2);
   MFEM_ASSERT(0 <= el2 && el2 < face_nbr_element_dof.Size(), "");
   const int nd = face_nbr_element_dof.RowSize(el2);
@@ -1736,8 +1737,7 @@ void ParFiniteElementSpace::GetFaceNbrFaceVDofs(int i, Array<int> &vdofs) const
   for (int j = 0; j < vdofs.Size(); j++)
   {
      const int ldof = vdofs[j];
-      vdofs[j] = (ldof >= 0) ? vol_vdofs[ldof] :
-                 FlipIndexSign(vol_vdofs[FlipIndexSign(ldof)]);
+      vdofs[j] = (ldof >= 0) ? vol_vdofs[ldof] : -1-vol_vdofs[-1-ldof];
   }
 }

@@ -2061,8 +2061,8 @@ void ParFiniteElementSpace::GetGhostFaceDofs(const MeshId &face_id,

         for (int j = 0; j < ne; j++)
         {
-            dofs[offset++] = (ind[j] >= 0) ? (first + ind[j]) :
-                             FlipIndexSign(first + FlipIndexSign(ind[j]));
+            dofs[offset++] = (ind[j] >= 0) ? (first + ind[j])
+                             /*         */ : (-1 - (first + (-1 - ind[j])));
         }
      }
      else
@@ -2072,8 +2072,8 @@ void ParFiniteElementSpace::GetGhostFaceDofs(const MeshId &face_id,
         const int *ind = fec->DofOrderForOrientation(Geometry::SEGMENT, Eo[i]);
         for (int j = 0; j < ne; j++)
         {
-            dofs[offset++] = (ind[j] >= 0) ? (first + ind[j]) :
-                             FlipIndexSign(first + FlipIndexSign(ind[j]));
+            dofs[offset++] = (ind[j] >= 0) ? (first + ind[j])
+                             /*         */ : (-1 - (first + (-1 - ind[j])));
         }
      }
   }
@@ -2866,7 +2866,7 @@ void NeighborRowMessage::Encode(int rank)

            if (ind && (edof = ind[edof]) < 0)
            {
-               edof = FlipIndexSign(edof);
+               edof = -1 - edof;
               s = -1;
            }

@@ -3067,10 +3067,10 @@ void NeighborRowMessage::Decode(int rank)

         // If edof arrived with a negative index, flip it, and the scaling.
         real_t s = (edof < 0) ? -1.0 : 1.0;
-         edof = UnsignIndex(edof);
+         edof = (edof < 0) ? -1 - edof : edof;
         if (ind && (edof = ind[edof]) < 0)
         {
-            edof = FlipIndexSign(edof);
+            edof = -1 - edof;
            s *= -1.0;
         }

@@ -3121,10 +3121,10 @@ void NeighborRowMessage::Decode(int rank)

            // If edof arrived with a negative index, flip it, and the scaling.
            s = (edof < 0) ? -1.0 : 1.0;
-            edof = UnsignIndex(edof);
+            edof = (edof < 0) ? -1 - edof : edof;
            if (ind && (edof = ind[edof]) < 0)
            {
-               edof = FlipIndexSign(edof);
+               edof = -1 - edof;
               s *= -1.0;
            }

@@ -4405,9 +4405,12 @@ ParFiniteElementSpace::RebalanceMatrix(int old_ndofs,
         {
            for (int j = 0; j < dofs.Size(); j++)
            {
-               const int row = UnsignIndex(DofToVDof(dofs[j], vd));
-               const int col = UnsignIndex(DofToVDof(old_dofs[j], vd,
-                                                     old_ndofs));
+               int row = DofToVDof(dofs[j], vd);
+               if (row < 0) { row = -1 - row; }
+
+               int col = DofToVDof(old_dofs[j], vd, old_ndofs);
+               if (col < 0) { col = -1 - col; }
+
               i_diag[row] = col;
            }
         }
@@ -4432,7 +4435,9 @@ ParFiniteElementSpace::RebalanceMatrix(int old_ndofs,
      {
         for (int j = 0; j < dofs.Size(); j++)
         {
-            const int row = UnsignIndex(DofToVDof(dofs[j], vd));
+            int row = DofToVDof(dofs[j], vd);
+            if (row < 0) { row = -1 - row; }
+
            if (i_diag[row] == i_diag[row+1]) // diag row empty?
            {
               i_offd[row] = old_dofs[j + vd * dofs.Size()];
@@ -4541,9 +4546,9 @@ ParFiniteElementSpace::ParallelDerefinementMatrix(int old_ndofs,
   {
      const Embedding &emb = dtrans.embeddings[k];

-      const int fine_rank = old_ranks[k];
-      const int coarse_rank = (emb.parent < 0) ? FlipIndexSign(emb.parent)
-                              : old_pncmesh->ElementRank(emb.parent);
+      int fine_rank = old_ranks[k];
+      int coarse_rank = (emb.parent < 0) ? (-1 - emb.parent)
+                        : old_pncmesh->ElementRank(emb.parent);

      if (coarse_rank != MyRank && fine_rank == MyRank)
      {
@@ -4631,8 +4636,8 @@ ParFiniteElementSpace::ParallelDerefinementMatrix(int old_ndofs,
            {
               if (!std::isfinite(lR(i, 0))) { continue; }

-               const int r = DofToVDof(dofs[i], vd);
-               const int m = UnsignIndex(r);
+               int r = DofToVDof(dofs[i], vd);
+               int m = (r >= 0) ? r : (-1 - r);

               if (is_dg || !mark[m])
               {
@@ -4681,7 +4686,8 @@ ParFiniteElementSpace::ParallelDerefinementMatrix(int old_ndofs,
            {
               if (!std::isfinite(lR(i, 0))) { continue; }

-               const int m = UnsignIndex(DofToVDof(dofs[i], vd));
+               int r = DofToVDof(dofs[i], vd);
+               int m = (r >= 0) ? r : (-1 - r);

               if (is_dg || !mark[m])
               {
@@ -545,8 +545,6 @@ void ParGridFunction::GetElementDofValues(int el, Vector &dof_vals) const

 void ParGridFunction::ProjectCoefficient(Coefficient &coeff, ProjectType type)
 {
-   MFEM_VERIFY(VectorDim() == 1,
-               "Cannot project scalar coefficient onto vector ParGridFunction");
   DeltaCoefficient *delta_c = dynamic_cast<DeltaCoefficient *>(&coeff);

   if (delta_c == NULL)
@@ -717,8 +715,7 @@ void ParGridFunction::ProjectCoefficientElementL2(VectorCoefficient &vcoeff)
 }


-void ParGridFunction::ProjectDiscCoefficient(
-   std::variant<Coefficient*, VectorCoefficient*> coeff)
+void ParGridFunction::ProjectDiscCoefficient(VectorCoefficient &coeff)
 {
   // local maximal element attribute for each dof
   Array<int> ldof_attr;
@@ -764,9 +761,6 @@ void ParGridFunction::ProjectDiscCoefficient(

 void ParGridFunction::ProjectDiscCoefficient(Coefficient &coeff, AvgType type)
 {
-   MFEM_VERIFY(
-      VectorDim() == 1,
-      "Cannot project scalar coefficient onto a vector ParGridFunction");
   // Harmonic  (x1 ... xn) = [ (1/x1 + ... + 1/xn) / n ]^-1.
   // Arithmetic(x1 ... xn) = (x1 + ... + xn) / n.

@@ -792,8 +786,6 @@ void ParGridFunction::ProjectDiscCoefficient(VectorCoefficient &vcoeff,
   // Harmonic  (x1 ... xn) = [ (1/x1 + ... + 1/xn) / n ]^-1.
   // Arithmetic(x1 ... xn) = (x1 + ... + xn) / n.

-   MFEM_VERIFY(VectorDim() == vcoeff.GetVDim(), "vcoeff vdim != VectorDim()");
-
   // Number of zones that contain a given dof.
   Array<int> zones_per_vdof;
   AccumulateAndCountZones(vcoeff, type, zones_per_vdof);
@@ -866,12 +858,6 @@ void ParGridFunction::ProjectBdrCoefficient(
 #endif
 }

-void ParGridFunction::ProjectBdrCoefficient(VectorCoefficient &vcoeff,
-                                            const Array<int> &attr)
-{
-   ProjectBdrCoefficient(NULL, &vcoeff, attr);
-}
-
 void ParGridFunction::ProjectBdrCoefficientTangent(VectorCoefficient &vcoeff,
                                                   const Array<int> &bdr_attr)
 {
@@ -1582,39 +1568,6 @@ PLBound ParGridFunction::GetBounds(Vector &lower, Vector &upper,
   return plb;
 }

-std::pair<real_t, real_t> ParGridFunction::EstimateFunctionMinimum(
-   const int vdim, const PLBound &plb, const int max_depth,
-   const real_t tol) const
-{
-   std::pair<real_t, real_t> minmax =
-      GridFunction::EstimateFunctionMinimum(vdim, plb, max_depth, tol);
-
-   real_t glob_min_lower = minmax.first;
-   real_t glob_min_upper = minmax.second;
-   MPI_Allreduce(MPI_IN_PLACE, &glob_min_lower, 1,
-                 MFEM_MPI_REAL_T, MPI_MIN, pfes->GetComm());
-   MPI_Allreduce(MPI_IN_PLACE, &glob_min_upper, 1,
-                 MFEM_MPI_REAL_T, MPI_MIN, pfes->GetComm());
-
-   return std::make_pair(glob_min_lower, glob_min_upper);
-}
-
-std::pair<real_t, real_t> ParGridFunction::EstimateFunctionMaximum(
-   const int vdim, const PLBound &plb, const int max_depth,
-   const real_t tol) const
-{
-   std::pair<real_t, real_t> minmax =
-      GridFunction::EstimateFunctionMaximum(vdim, plb, max_depth, tol);
-
-   real_t glob_max_lower = minmax.first;
-   real_t glob_max_upper = minmax.second;
-   MPI_Allreduce(MPI_IN_PLACE, &glob_max_lower, 1,
-                 MFEM_MPI_REAL_T, MPI_MAX, pfes->GetComm());
-   MPI_Allreduce(MPI_IN_PLACE, &glob_max_upper, 1,
-                 MFEM_MPI_REAL_T, MPI_MAX, pfes->GetComm());
-   return std::make_pair(glob_max_lower, glob_max_upper);
-}
-
 } // namespace mfem

 #endif // MFEM_USE_MPI
@@ -63,12 +63,6 @@ protected:
   void ProjectBdrCoefficient(Coefficient *coeff[], VectorCoefficient *vcoeff,
                              const Array<int> &attr);

-   /** @brief Project a discontinuous (vector) coefficient as a grid function on
-       a continuous finite element space. The values in shared dofs are
-       determined from the element with maximal attribute. */
-   virtual void ProjectDiscCoefficient(
-      std::variant<Coefficient*, VectorCoefficient*> coeff) override;
-
 public:
   ParGridFunction() { pfes = NULL; }

@@ -274,6 +268,11 @@ public:
                           ProjectType type = ProjectType::DEFAULT) override;

   using GridFunction::ProjectDiscCoefficient;
+   /** @brief Project a discontinuous vector coefficient as a grid function on
+       a continuous finite element space. The values in shared dofs are
+       determined from the element with maximal attribute. */
+   void ProjectDiscCoefficient(VectorCoefficient &coeff) override;
+
   void ProjectDiscCoefficient(Coefficient &coeff, AvgType type) override;

   void ProjectDiscCoefficient(VectorCoefficient &vcoeff, AvgType type) override;
@@ -281,7 +280,8 @@ public:
   using GridFunction::ProjectBdrCoefficient;

   void ProjectBdrCoefficient(VectorCoefficient &vcoeff,
-                              const Array<int> &attr) override;
+                              const Array<int> &attr) override
+   { ProjectBdrCoefficient(NULL, &vcoeff, attr); }

   void ProjectBdrCoefficient(Coefficient *coeff[],
                              const Array<int> &attr) override
@@ -609,18 +609,6 @@ public:
   PLBound GetBounds(Vector &lower, Vector &upper,
                     const int ref_factor=1, const int vdim=-1) const override;

-   /** @brief Estimate the GridFunction minimum across all elements. */
-   std::pair<real_t, real_t> EstimateFunctionMinimum(const int vdim,
-                                                     const PLBound &plb,
-                                                     const int max_depth,
-                                                     const real_t tol) const override;
-
-   /** @brief Estimate the GridFunction maximum across all elements. */
-   std::pair<real_t, real_t> EstimateFunctionMaximum(const int vdim,
-                                                     const PLBound &plb,
-                                                     const int max_depth,
-                                                     const real_t tol) const override;
-
   /** Save the local portion of the ParGridFunction. This differs from the
       serial GridFunction::Save in that it takes into account the signs of
       the local dofs. */
@@ -321,17 +321,12 @@ void ParL2FaceRestriction::DoubleValuedConformingMult(
   const int vd = vdim;
   const bool t = byvdim;
   const int threshold = ndofs;
-   const int nsdofs = pfes.GetFaceNbrVSize() / vd;
+   const int nsdofs = pfes.GetFaceNbrVSize();
   auto d_indices1 = scatter_indices1.Read();
   auto d_indices2 = scatter_indices2.Read();
   auto d_x = Reshape(x.Read(), t?vd:ndofs, t?ndofs:vd);
-   const int ne_shared = nsdofs / elem_dofs;
-   const int nedof = elem_dofs;
-   // Note: the shape of face_nbr_data, as determined by
-   // ParFiniteElementSpace::ExchangeFaceNbrData, is (elem_dofs, vdim,
-   // ne_shared), independent of the ordering (byNODES or byVDIM) of the finite
-   // element space.
-   auto d_x_shared = Reshape(face_nbr_data.Read(), elem_dofs, vd, ne_shared);
+   auto d_x_shared = Reshape(face_nbr_data.Read(),
+                             t?vd:nsdofs, t?nsdofs:vd);
   auto d_y = Reshape(y.Write(), nface_dofs, vd, 2, nf);
   mfem::forall(nfdofs, [=] MFEM_HOST_DEVICE (int i)
   {
@@ -351,9 +346,8 @@ void ParL2FaceRestriction::DoubleValuedConformingMult(
         }
         else if (idx2>=threshold) // shared boundary
         {
-            const int e_shared = (idx2 - threshold) / nedof;
-            const int i_shared = (idx2 - threshold) % nedof;
-            d_y(dof, c, 1, face) = d_x_shared(i_shared,c,e_shared);
+            d_y(dof, c, 1, face) = d_x_shared(t?c:(idx2-threshold),
+                                              t?(idx2-threshold):c);
         }
         else // true boundary
         {
@@ -271,7 +271,10 @@ inline void QuadratureFunction::GetValues(
   const int s_offset = qspace->Offset(idx);
   const int sl_size = qspace->Offset(idx + 1) - s_offset;
   // Make the values matrix memory an alias of the quadrature function memory
-   values.MakeRef(GetMemory(), vdim*s_offset, vdim, sl_size);
+   Memory<real_t> &values_mem = values.GetMemory();
+   values_mem.Delete();
+   values_mem.MakeAlias(GetMemory(), vdim*s_offset, vdim*sl_size);
+   values.SetSize(vdim, sl_size);
 }

 inline void QuadratureFunction::GetValues(
@@ -334,16 +334,17 @@ template<int DIM, int SDIM, int D1D, int Q1D>
 QuadratureInterpolator::DetKernelType
 QuadratureInterpolator::DetKernels::Kernel()
 {
-   if constexpr (DIM == 1)
+   if (DIM == 1)
   {
-      if constexpr (SDIM == 1) { return internal::quadrature_interpolator::Det1D; }
-      else if constexpr (SDIM == 2) { return internal::quadrature_interpolator::Det1DSurface<D1D, Q1D, 2>; }
-      else if constexpr (SDIM == 3) { return internal::quadrature_interpolator::Det1DSurface<D1D, Q1D, 3>; }
+      if (SDIM == 1) { return internal::quadrature_interpolator::Det1D; }
+      else if (SDIM == 2) { return internal::quadrature_interpolator::Det1DSurface<D1D, Q1D, 2>; }
+      else if (SDIM == 3) { return internal::quadrature_interpolator::Det1DSurface<D1D, Q1D, 3>; }
+      else { MFEM_ABORT(""); }
   }
-   else if constexpr (DIM == 2 && SDIM == 2) { return internal::quadrature_interpolator::Det2D<D1D, Q1D>; }
-   else if constexpr (DIM == 2 && SDIM == 3) { return internal::quadrature_interpolator::Det2DSurface<D1D, Q1D>; }
-   else if constexpr (DIM == 3) { return internal::quadrature_interpolator::Det3D<D1D, Q1D>; }
-   MFEM_ABORT("");
+   else if (DIM == 2 && SDIM == 2) { return internal::quadrature_interpolator::Det2D<D1D, Q1D>; }
+   else if (DIM == 2 && SDIM == 3) { return internal::quadrature_interpolator::Det2DSurface<D1D, Q1D>; }
+   else if (DIM == 3) { return internal::quadrature_interpolator::Det3D<D1D, Q1D>; }
+   else { MFEM_ABORT(""); }
 }

 /// @endcond
@@ -203,10 +203,10 @@ template<int DIM, QVectorLayout Q_LAYOUT,
 QuadratureInterpolator::TensorEvalKernelType
 QuadratureInterpolator::TensorEvalKernels::Kernel()
 {
-   if constexpr (DIM == 1) { return internal::quadrature_interpolator::Values1D<Q_LAYOUT>; }
-   else if constexpr (DIM == 2) { return internal::quadrature_interpolator::Values2D<Q_LAYOUT, VDIM, D1D, Q1D, NBZ>; }
-   else if constexpr (DIM == 3) { return internal::quadrature_interpolator::Values3D<Q_LAYOUT, VDIM, D1D, Q1D>; }
-   MFEM_ABORT("");
+   if (DIM == 1) { return internal::quadrature_interpolator::Values1D<Q_LAYOUT>; }
+   else if (DIM == 2) { return internal::quadrature_interpolator::Values2D<Q_LAYOUT, VDIM, D1D, Q1D, NBZ>; }
+   else if (DIM == 3) { return internal::quadrature_interpolator::Values3D<Q_LAYOUT, VDIM, D1D, Q1D>; }
+   else { MFEM_ABORT(""); }
 }

 /// @endcond
@@ -453,15 +453,8 @@ QuadratureInterpolator::TensorEvalHDivKernels::Kernel()
 {
   using namespace internal::quadrature_interpolator;
   static_assert(DIM == 2 || DIM == 3, "only DIM=2 and DIM=3 are implemented!");
-   if constexpr (DIM == 2)
-   {
-      return EvalHDiv2D<Q_LAYOUT, FLAGS, D1D, Q1D>;
-   }
-   else if constexpr (DIM == 3)
-   {
-      return EvalHDiv3D<Q_LAYOUT, FLAGS, D1D, Q1D>;
-   }
-   MFEM_ABORT("only DIM=2 and DIM=3 are implemented!");
+   if (DIM == 2) { return EvalHDiv2D<Q_LAYOUT, FLAGS, D1D, Q1D>; }
+   return EvalHDiv3D<Q_LAYOUT, FLAGS, D1D, Q1D>;
 }

 /// @endcond
@@ -1,44 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-
-#include "../quadinterpolator.hpp"
-#include "eval_transpose.hpp"
-
-namespace mfem
-{
-
-/// @cond Suppress_Doxygen_warnings
-
-QuadratureInterpolator::TensorEvalTransposeKernelType
-QuadratureInterpolator::TensorEvalTransposeKernels::Fallback(
-   int DIM, QVectorLayout Q_LAYOUT, int, int, int)
-{
-   using namespace internal::quadrature_interpolator;
-
-   if (Q_LAYOUT == QVectorLayout::byNODES)
-   {
-      if (DIM == 1) { return ValuesTranspose1D<QVectorLayout::byNODES>; }
-      else if (DIM == 2) { return ValuesTranspose2D<QVectorLayout::byNODES>; }
-      else if (DIM == 3) { return ValuesTranspose3D<QVectorLayout::byNODES>; }
-   }
-   else
-   {
-      if (DIM == 1) { return ValuesTranspose1D<QVectorLayout::byVDIM>; }
-      else if (DIM == 2) { return ValuesTranspose2D<QVectorLayout::byVDIM>; }
-      else if (DIM == 3) { return ValuesTranspose3D<QVectorLayout::byVDIM>; }
-   }
-   MFEM_ABORT("Invalid dimension");
-   return nullptr;
-}
-
-/// @endcond
-
-} // namespace mfem
@@ -1,300 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-
-#pragma once
-
-#include "../quadinterpolator.hpp"
-#include "../../general/forall.hpp"
-#include "../../linalg/dtensor.hpp"
-#include "../../linalg/kernels.hpp"
-#include "../kernels.hpp"
-
-namespace mfem
-{
-namespace internal
-{
-namespace quadrature_interpolator
-{
-
-template<QVectorLayout Q_LAYOUT>
-static void ValuesTranspose1D(const int NE,
-                              const real_t *b_,
-                              const real_t *q_,
-                              real_t *e_,
-                              const int vdim,
-                              const int d1d,
-                              const int q1d)
-{
-   const auto b = Reshape(b_, q1d, d1d);
-   const auto qd = Q_LAYOUT == QVectorLayout::byNODES ?
-                   Reshape(q_, q1d, vdim, NE) :
-                   Reshape(q_, vdim, q1d, NE);
-   auto e = Reshape(e_, d1d, vdim, NE);
-
-   mfem::forall(NE, [=] MFEM_HOST_DEVICE (int el)
-   {
-      for (int c = 0; c < vdim; c++)
-      {
-         for (int d = 0; d < d1d; d++)
-         {
-            real_t u = 0.0;
-            for (int q = 0; q < q1d; q++)
-            {
-               const real_t qval = Q_LAYOUT == QVectorLayout::byVDIM ?
-                                   qd(c, q, el) : qd(q, c, el);
-               u += b(q, d) * qval;
-            }
-            e(d, c, el) += u;
-         }
-      }
-   });
-}
-
-template<QVectorLayout Q_LAYOUT,
-         int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0,
-         int T_NBZ = 1>
-static void ValuesTranspose2D(const int NE,
-                              const real_t *b_,
-                              const real_t *q_,
-                              real_t *e_,
-                              const int vdim = 0,
-                              const int d1d = 0,
-                              const int q1d = 0)
-{
-   static constexpr int NBZ = T_NBZ ? T_NBZ : 1;
-   const int D1D = T_D1D ? T_D1D : d1d;
-   const int Q1D = T_Q1D ? T_Q1D : q1d;
-   const int VDIM = T_VDIM ? T_VDIM : vdim;
-
-   const auto b = Reshape(b_, Q1D, D1D);
-   const auto q = Q_LAYOUT == QVectorLayout::byNODES ?
-                  Reshape(q_, Q1D, Q1D, VDIM, NE) :
-                  Reshape(q_, VDIM, Q1D, Q1D, NE);
-   auto e = Reshape(e_, D1D, D1D, VDIM, NE);
-
-   mfem::forall_2D_batch(NE, D1D, D1D, NBZ, [=] MFEM_HOST_DEVICE (int el)
-   {
-      const int D1D = T_D1D ? T_D1D : d1d;
-      const int Q1D = T_Q1D ? T_Q1D : q1d;
-      const int VDIM = T_VDIM ? T_VDIM : vdim;
-      constexpr int MQ1 = T_Q1D ? T_Q1D : DofQuadLimits::MAX_Q1D;
-      constexpr int MD1 = T_D1D ? T_D1D : DofQuadLimits::MAX_D1D;
-      constexpr int MDQ = (MQ1 > MD1) ? MQ1 : MD1;
-      const int tidz = MFEM_THREAD_ID(z);
-
-      MFEM_SHARED real_t sB[MQ1*MD1];
-      MFEM_SHARED real_t sm0[NBZ][MDQ*MDQ];
-      MFEM_SHARED real_t sm1[NBZ][MDQ*MDQ];
-
-      kernels::internal::LoadB<MD1,MQ1>(D1D,Q1D,b,sB);
-
-      ConstDeviceMatrix B(sB, D1D, Q1D);
-      DeviceMatrix QQ(sm0[tidz], MQ1, MQ1);
-      DeviceMatrix DQ(sm1[tidz], MD1, MQ1);
-      DeviceMatrix DD(sm0[tidz], MD1, MD1);
-
-      for (int c = 0; c < VDIM; c++)
-      {
-         // Load Q data
-         MFEM_FOREACH_THREAD(qy,y,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qx,x,Q1D)
-            {
-               QQ(qx,qy) = Q_LAYOUT == QVectorLayout::byVDIM ?
-                           q(c,qx,qy,el) : q(qx,qy,c,el);
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Transpose in y: QQ -> DQ (apply B^T in y-direction)
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(qx,x,Q1D)
-            {
-               real_t u = 0.0;
-               for (int qy = 0; qy < Q1D; ++qy)
-               {
-                  u += B(dy,qy) * QQ(qx,qy);
-               }
-               DQ(dy,qx) = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Transpose in x: DQ -> DD (apply B^T in x-direction)
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(dx,x,D1D)
-            {
-               real_t u = 0.0;
-               for (int qx = 0; qx < Q1D; ++qx)
-               {
-                  u += B(dx,qx) * DQ(dy,qx);
-               }
-               DD(dx,dy) = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Store result
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(dx,x,D1D)
-            {
-               e(dx,dy,c,el) += DD(dx,dy);
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   });
-}
-
-template<QVectorLayout Q_LAYOUT,
-         int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0>
-static void ValuesTranspose3D(const int NE,
-                              const real_t *b_,
-                              const real_t *q_,
-                              real_t *e_,
-                              const int vdim = 0,
-                              const int d1d = 0,
-                              const int q1d = 0)
-{
-   const int D1D = T_D1D ? T_D1D : d1d;
-   const int Q1D = T_Q1D ? T_Q1D : q1d;
-   const int VDIM = T_VDIM ? T_VDIM : vdim;
-
-   const auto b = Reshape(b_, Q1D, D1D);
-   const auto q = Q_LAYOUT == QVectorLayout::byNODES ?
-                  Reshape(q_, Q1D, Q1D, Q1D, VDIM, NE) :
-                  Reshape(q_, VDIM, Q1D, Q1D, Q1D, NE);
-   auto e = Reshape(e_, D1D, D1D, D1D, VDIM, NE);
-
-   mfem::forall_3D(NE, D1D, D1D, D1D, [=] MFEM_HOST_DEVICE (int el)
-   {
-      const int D1D = T_D1D ? T_D1D : d1d;
-      const int Q1D = T_Q1D ? T_Q1D : q1d;
-      const int VDIM = T_VDIM ? T_VDIM : vdim;
-      constexpr int MQ1 = T_Q1D ? T_Q1D : DofQuadLimits::MAX_INTERP_1D;
-      constexpr int MD1 = T_D1D ? T_D1D : DofQuadLimits::MAX_INTERP_1D;
-      constexpr int MDQ = (MQ1 > MD1) ? MQ1 : MD1;
-
-      MFEM_SHARED real_t sB[MQ1*MD1];
-      MFEM_SHARED real_t sm0[MDQ*MDQ*MDQ];
-      MFEM_SHARED real_t sm1[MDQ*MDQ*MDQ];
-
-      kernels::internal::LoadB<MD1,MQ1>(D1D,Q1D,b,sB);
-
-      ConstDeviceMatrix B(sB, D1D, Q1D);
-      DeviceCube QQQ(sm0, MQ1, MQ1, MQ1);
-      DeviceCube DQQ(sm1, MD1, MQ1, MQ1);
-      DeviceCube DDQ(sm0, MD1, MD1, MQ1);
-      DeviceCube DDD(sm1, MD1, MD1, MD1);
-
-      for (int c = 0; c < VDIM; c++)
-      {
-         // Load Q data
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  QQQ(qx,qy,qz) = Q_LAYOUT == QVectorLayout::byVDIM ?
-                                  q(c,qx,qy,qz,el) : q(qx,qy,qz,c,el);
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Transpose in z
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  real_t u = 0.0;
-                  for (int qz = 0; qz < Q1D; ++qz)
-                  {
-                     u += B(dz,qz) * QQQ(qx,qy,qz);
-                  }
-                  DQQ(dz,qx,qy) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Transpose in y
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  real_t u = 0.0;
-                  for (int qy = 0; qy < Q1D; ++qy)
-                  {
-                     u += B(dy,qy) * DQQ(dz,qx,qy);
-                  }
-                  DDQ(dz,dy,qx) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Transpose in x
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qx = 0; qx < Q1D; ++qx)
-                  {
-                     u += B(dx,qx) * DDQ(dz,dy,qx);
-                  }
-                  DDD(dx,dy,dz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  e(dx,dy,dz,c,el) += DDD(dx,dy,dz);
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   });
-}
-
-} // namespace quadrature_interpolator
-} // namespace internal
-
-template<int DIM, QVectorLayout Q_LAYOUT,
-         int VDIM, int D1D, int Q1D, int NBZ>
-QuadratureInterpolator::TensorEvalTransposeKernelType
-QuadratureInterpolator::TensorEvalTransposeKernels::Kernel()
-{
-   if (DIM == 1) { return internal::quadrature_interpolator::ValuesTranspose1D<Q_LAYOUT>; }
-   else if (DIM == 2) { return internal::quadrature_interpolator::ValuesTranspose2D<Q_LAYOUT, VDIM, D1D, Q1D, NBZ>; }
-   else if (DIM == 3) { return internal::quadrature_interpolator::ValuesTranspose3D<Q_LAYOUT, VDIM, D1D, Q1D>; }
-   else { MFEM_ABORT(""); }
-}
-
-} // namespace mfem
@@ -1,61 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-
-#include "../quadinterpolator.hpp"
-#include "eval_transpose.hpp"
-
-namespace mfem
-{
-namespace internal
-{
-namespace quadrature_interpolator
-{
-
-void InitEvalTransposeByVDimKernels()
-{
-   using k = QuadratureInterpolator::TensorEvalTransposeKernels;
-   constexpr auto L = QVectorLayout::byVDIM;
-
-   // 2D
-   k::Specialization<2,L,1,2,4>::Opt<8>::Add();
-   k::Specialization<2,L,1,3,6>::Opt<4>::Add();
-   k::Specialization<2,L,1,4,8>::Opt<2>::Add();
-
-   k::Specialization<2,L,2,2,4>::Opt<8>::Add();
-   k::Specialization<2,L,2,3,4>::Opt<8>::Add();
-   k::Specialization<2,L,2,3,6>::Opt<4>::Add();
-   k::Specialization<2,L,2,4,6>::Opt<2>::Add();
-   k::Specialization<2,L,2,4,8>::Opt<2>::Add();
-
-   // 3D
-   k::Specialization<3,L,1,2,4>::Opt<1>::Add();
-   k::Specialization<3,L,1,3,6>::Opt<1>::Add();
-   k::Specialization<3,L,1,4,8>::Opt<1>::Add();
-   k::Specialization<3,L,3,2,4>::Opt<1>::Add();
-   k::Specialization<3,L,3,3,6>::Opt<1>::Add();
-   k::Specialization<3,L,3,4,8>::Opt<1>::Add();
-
-   k::Specialization<3,L,3,2,2>::Opt<1>::Add();
-   k::Specialization<3,L,3,3,3>::Opt<1>::Add();
-   k::Specialization<3,L,3,4,4>::Opt<1>::Add();
-   k::Specialization<3,L,3,5,5>::Opt<1>::Add();
-   k::Specialization<3,L,3,6,6>::Opt<1>::Add();
-   k::Specialization<3,L,3,7,7>::Opt<1>::Add();
-   k::Specialization<3,L,3,8,8>::Opt<1>::Add();
-   k::Specialization<3,L,3,9,9>::Opt<1>::Add();
-
-   k::Specialization<3,L,3,4,6>::Opt<1>::Add();
-   k::Specialization<3,L,3,3,4>::Opt<1>::Add();
-}
-
-} // namespace quadrature_interpolator
-} // namespace internal
-} // namespace mfem
@@ -592,10 +592,10 @@ template<int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int VDIM, int D1D,
 QuadratureInterpolator::GradKernelType
 QuadratureInterpolator::GradKernels::Kernel()
 {
-   if constexpr (DIM == 1) { return internal::quadrature_interpolator::Derivatives1D<Q_LAYOUT, GRAD_PHYS>; }
-   else if constexpr (DIM == 2) { return internal::quadrature_interpolator::Derivatives2D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, Q1D, NBZ>; }
-   else if constexpr (DIM == 3) { return internal::quadrature_interpolator::Derivatives3D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, Q1D>; }
-   MFEM_ABORT("");
+   if (DIM == 1) { return internal::quadrature_interpolator::Derivatives1D<Q_LAYOUT, GRAD_PHYS>; }
+   else if (DIM == 2) { return internal::quadrature_interpolator::Derivatives2D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, Q1D, NBZ>; }
+   else if (DIM == 3) { return internal::quadrature_interpolator::Derivatives3D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, Q1D>; }
+   else { MFEM_ABORT(""); }
 }

 template<int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int VDIM, int D1D,
@@ -603,10 +603,10 @@ template<int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int VDIM, int D1D,
 QuadratureInterpolator::CollocatedGradKernelType
 QuadratureInterpolator::CollocatedGradKernels::Kernel()
 {
-   if constexpr (DIM == 1) { return internal::quadrature_interpolator::CollocatedDerivatives1D<Q_LAYOUT, GRAD_PHYS>; }
-   else if constexpr (DIM == 2) { return internal::quadrature_interpolator::CollocatedDerivatives2D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, NBZ>; }
-   else if constexpr (DIM == 3) { return internal::quadrature_interpolator::CollocatedDerivatives3D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D>; }
-   MFEM_ABORT("");
+   if (DIM == 1) { return internal::quadrature_interpolator::CollocatedDerivatives1D<Q_LAYOUT, GRAD_PHYS>; }
+   else if (DIM == 2) { return internal::quadrature_interpolator::CollocatedDerivatives2D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, NBZ>; }
+   else if (DIM == 3) { return internal::quadrature_interpolator::CollocatedDerivatives3D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D>; }
+   else { MFEM_ABORT(""); }
 }

 /// @endcond
@@ -1,62 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-
-#include "../quadinterpolator.hpp"
-#include "grad_transpose.hpp"
-
-namespace mfem
-{
-
-/// @cond Suppress_Doxygen_warnings
-
-QuadratureInterpolator::GradTransposeKernelType
-QuadratureInterpolator::GradTransposeKernels::Fallback(
-   int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int, int, int)
-{
-   using namespace internal::quadrature_interpolator;
-
-   if (Q_LAYOUT == QVectorLayout::byNODES)
-   {
-      if (GRAD_PHYS)
-      {
-         if (DIM == 1) { return DerivativesTranspose1D<QVectorLayout::byNODES, true>; }
-         else if (DIM == 2) { return DerivativesTranspose2D<QVectorLayout::byNODES, true>; }
-         else if (DIM == 3) { return DerivativesTranspose3D<QVectorLayout::byNODES, true>; }
-      }
-      else
-      {
-         if (DIM == 1) { return DerivativesTranspose1D<QVectorLayout::byNODES, false>; }
-         else if (DIM == 2) { return DerivativesTranspose2D<QVectorLayout::byNODES, false>; }
-         else if (DIM == 3) { return DerivativesTranspose3D<QVectorLayout::byNODES, false>; }
-      }
-   }
-   else
-   {
-      if (GRAD_PHYS)
-      {
-         if (DIM == 1) { return DerivativesTranspose1D<QVectorLayout::byVDIM, true>; }
-         else if (DIM == 2) { return DerivativesTranspose2D<QVectorLayout::byVDIM, true>; }
-         else if (DIM == 3) { return DerivativesTranspose3D<QVectorLayout::byVDIM, true>; }
-      }
-      else
-      {
-         if (DIM == 1) { return DerivativesTranspose1D<QVectorLayout::byVDIM, false>; }
-         else if (DIM == 2) { return DerivativesTranspose2D<QVectorLayout::byVDIM, false>; }
-         else if (DIM == 3) { return DerivativesTranspose3D<QVectorLayout::byVDIM, false>; }
-      }
-   }
-   MFEM_ABORT("Invalid dimension");
-   return nullptr;
-}
-
-/// @endcond
-
-} // namespace mfem
@@ -1,737 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-
-#pragma once
-
-#include "../quadinterpolator.hpp"
-#include "../../general/forall.hpp"
-#include "../../linalg/dtensor.hpp"
-#include "../../linalg/kernels.hpp"
-#include "../kernels.hpp"
-
-namespace mfem
-{
-namespace internal
-{
-namespace quadrature_interpolator
-{
-
-// Transpose gradient operation: integrate against shape function derivatives
-// This is the adjoint of the Derivatives operation
-
-template<QVectorLayout Q_LAYOUT, bool GRAD_PHYS>
-static void DerivativesTranspose1D(const int NE,
-                                   const real_t *b_,
-                                   const real_t *g_,
-                                   const real_t *j_,
-                                   const real_t *q_,
-                                   real_t *e_,
-                                   const int sdim,
-                                   const int vdim,
-                                   const int d1d,
-                                   const int q1d)
-{
-   MFEM_CONTRACT_VAR(b_);
-   const int SDIM = GRAD_PHYS ? sdim : 1;
-   const auto g = Reshape(g_, q1d, d1d);
-   const auto j = Reshape(j_, q1d, SDIM, NE);
-   const auto q = Q_LAYOUT == QVectorLayout::byNODES ?
-                  Reshape(q_, q1d, vdim, SDIM, NE):
-                  Reshape(q_, vdim, SDIM, q1d, NE);
-   auto e = Reshape(e_, d1d, vdim, NE);
-
-   mfem::forall(NE, [=] MFEM_HOST_DEVICE (int el)
-   {
-      for (int c = 0; c < vdim; c++)
-      {
-         for (int d = 0; d < d1d; d++)
-         {
-            real_t u = 0.0;
-            for (int qx = 0; qx < q1d; qx++)
-            {
-               // Load gradient from q-vector
-               real_t dq[3] = {0.0, 0.0, 0.0};
-               for (int s = 0; s < SDIM; ++s)
-               {
-                  if (Q_LAYOUT == QVectorLayout::byVDIM)  { dq[s] = q(c, s, qx, el); }
-                  if (Q_LAYOUT == QVectorLayout::byNODES) { dq[s] = q(qx, c, s, el); }
-               }
-
-               // Apply inverse Jacobian transpose (adjoint of physical gradient)
-               real_t du = dq[0];
-               if (GRAD_PHYS)
-               {
-                  if (SDIM == 1) { du = dq[0] / j(qx, 0, el); }
-                  else if (SDIM == 2)
-                  {
-                     const real_t Jloc[2] = {j(qx,0,el), j(qx,1,el)};
-                     real_t Jinv[3];
-                     kernels::CalcLeftInverse<2,1>(Jloc, Jinv);
-                     du = Jinv[0]*dq[0] + Jinv[1]*dq[1];
-                  }
-                  else // SDIM == 3
-                  {
-                     const real_t Jloc[3] = {j(qx,0,el), j(qx,1,el), j(qx,2,el)};
-                     real_t Jinv[3];
-                     kernels::CalcLeftInverse<3,1>(Jloc, Jinv);
-                     du = Jinv[0]*dq[0] + Jinv[1]*dq[1] + Jinv[2]*dq[2];
-                  }
-               }
-
-               // Accumulate contribution (transpose of G matrix)
-               u += g(qx, d) * du;
-            }
-            e(d, c, el) += u;
-         }
-      }
-   });
-}
-
-template<QVectorLayout Q_LAYOUT, bool GRAD_PHYS,
-         int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0,
-         int T_NBZ = 1>
-static void DerivativesTranspose2D(const int NE,
-                                   const real_t *b_,
-                                   const real_t *g_,
-                                   const real_t *j_,
-                                   const real_t *q_,
-                                   real_t *e_,
-                                   const int sdim = 2,
-                                   const int vdim = 0,
-                                   const int d1d = 0,
-                                   const int q1d = 0)
-{
-   const int D1D = T_D1D ? T_D1D : d1d;
-   const int Q1D = T_Q1D ? T_Q1D : q1d;
-   const int VDIM = T_VDIM ? T_VDIM : vdim;
-   const int SDIM = GRAD_PHYS ? sdim : 2;
-   static constexpr int NBZ = T_NBZ ? T_NBZ : 1;
-
-   const auto b = Reshape(b_, Q1D, D1D);
-   const auto g = Reshape(g_, Q1D, D1D);
-   const auto j = Reshape(j_, Q1D, Q1D, SDIM, 2, NE);
-   const auto q = Q_LAYOUT == QVectorLayout::byNODES ?
-                  Reshape(q_, Q1D, Q1D, VDIM, SDIM, NE):
-                  Reshape(q_, VDIM, SDIM, Q1D, Q1D, NE);
-   auto e = Reshape(e_, D1D, D1D, VDIM, NE);
-
-   mfem::forall_2D_batch(NE, D1D, D1D, NBZ, [=] MFEM_HOST_DEVICE (int el)
-   {
-      const int D1D = T_D1D ? T_D1D : d1d;
-      const int Q1D = T_Q1D ? T_Q1D : q1d;
-      const int VDIM = T_VDIM ? T_VDIM : vdim;
-      constexpr int MQ1 = T_Q1D ? T_Q1D : DofQuadLimits::MAX_Q1D;
-      constexpr int MD1 = T_D1D ? T_D1D : DofQuadLimits::MAX_D1D;
-      constexpr int MDQ = (MQ1 > MD1) ? MQ1 : MD1;
-      const int tidz = MFEM_THREAD_ID(z);
-
-      MFEM_SHARED real_t BG[2][MQ1*MD1];
-      kernels::internal::LoadBG<MD1,MQ1>(D1D,Q1D,b,g,BG);
-      DeviceMatrix B(BG[0], D1D, Q1D);
-      DeviceMatrix G(BG[1], D1D, Q1D);
-
-      MFEM_SHARED real_t sm0[NBZ][MDQ*MDQ];
-      MFEM_SHARED real_t sm1[NBZ][MDQ*MDQ];
-
-      DeviceMatrix QQ(sm0[tidz], MQ1, MQ1);
-      DeviceMatrix DQ0(sm1[tidz], MD1, MQ1);
-      DeviceMatrix DQ1(sm1[tidz], MD1, MQ1);  // Reuse sm1 after DQ0 is done
-      DeviceMatrix DD(sm0[tidz], MD1, MD1);   // Reuse sm0 after QQ is done
-
-      for (int c = 0; c < VDIM; c++)
-      {
-         // Load Q data and apply inverse Jacobian
-         MFEM_FOREACH_THREAD(qy,y,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qx,x,Q1D)
-            {
-               // Load gradient components
-               real_t dq[3] = {0.0, 0.0, 0.0};
-               for (int d = 0; d < SDIM; ++d)
-               {
-                  if (Q_LAYOUT == QVectorLayout::byVDIM) { dq[d] = q(c, d, qx, qy, el); }
-                  else { dq[d] = q(qx, qy, c, d, el); }
-               }
-
-               // Apply inverse Jacobian transpose (adjoint of physical gradient)
-               real_t du[2] = {dq[0], dq[1]};
-               if (GRAD_PHYS)
-               {
-                  if (SDIM == 2)
-                  {
-                     real_t Jloc[4], Jinv[4];
-                     Jloc[0] = j(qx,qy,0,0,el);
-                     Jloc[1] = j(qx,qy,1,0,el);
-                     Jloc[2] = j(qx,qy,0,1,el);
-                     Jloc[3] = j(qx,qy,1,1,el);
-                     kernels::CalcInverse<2>(Jloc, Jinv);
-                     const real_t U = Jinv[0]*dq[0] + Jinv[2]*dq[1];
-                     const real_t V = Jinv[1]*dq[0] + Jinv[3]*dq[1];
-                     du[0] = U;
-                     du[1] = V;
-                  }
-                  else // SDIM == 3
-                  {
-                     real_t Jloc[6], Jinv[6];
-                     Jloc[0] = j(qx,qy,0,0,el);
-                     Jloc[1] = j(qx,qy,1,0,el);
-                     Jloc[2] = j(qx,qy,2,0,el);
-                     Jloc[3] = j(qx,qy,0,1,el);
-                     Jloc[4] = j(qx,qy,1,1,el);
-                     Jloc[5] = j(qx,qy,2,1,el);
-                     kernels::CalcLeftInverse<3,2>(Jloc, Jinv);
-                     const real_t U = Jinv[0]*dq[0] + Jinv[2]*dq[1] + Jinv[4]*dq[2];
-                     const real_t V = Jinv[1]*dq[0] + Jinv[3]*dq[1] + Jinv[5]*dq[2];
-                     du[0] = U;
-                     du[1] = V;
-                  }
-               }
-               QQ(qx, qy) = du[0];  // Store du/dx component
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in y-direction: QQ -> DQ0
-         // (Transpose of d/dx which uses DQ1(dy,qx)*B(dy,qy))
-         // Must produce DQ0(dy,qx) to match forward's DQ1 indexing
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(qx,x,Q1D)
-            {
-               real_t u = 0.0;
-               for (int qy = 0; qy < Q1D; ++qy)
-               {
-                  u += B(dy,qy) * QQ(qx,qy);
-               }
-               DQ0(dy,qx) = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply G^T in x-direction: DQ0 -> DD
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(dx,x,D1D)
-            {
-               real_t u = 0.0;
-               for (int qx = 0; qx < Q1D; ++qx)
-               {
-                  u += G(dx,qx) * DQ0(dy,qx);
-               }
-               DD(dx,dy) = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Accumulate to output
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(dx,x,D1D)
-            {
-               e(dx,dy,c,el) += DD(dx,dy);
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Now process du/dy component
-         MFEM_FOREACH_THREAD(qy,y,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qx,x,Q1D)
-            {
-               // Load gradient components
-               real_t dq[3] = {0.0, 0.0, 0.0};
-               for (int d = 0; d < SDIM; ++d)
-               {
-                  if (Q_LAYOUT == QVectorLayout::byVDIM) { dq[d] = q(c, d, qx, qy, el); }
-                  else { dq[d] = q(qx, qy, c, d, el); }
-               }
-
-               // Apply inverse Jacobian transpose
-               real_t du[2] = {dq[0], dq[1]};
-               if (GRAD_PHYS)
-               {
-                  if (SDIM == 2)
-                  {
-                     real_t Jloc[4], Jinv[4];
-                     Jloc[0] = j(qx,qy,0,0,el);
-                     Jloc[1] = j(qx,qy,1,0,el);
-                     Jloc[2] = j(qx,qy,0,1,el);
-                     Jloc[3] = j(qx,qy,1,1,el);
-                     kernels::CalcInverse<2>(Jloc, Jinv);
-                     const real_t U = Jinv[0]*dq[0] + Jinv[2]*dq[1];
-                     const real_t V = Jinv[1]*dq[0] + Jinv[3]*dq[1];
-                     du[0] = U;
-                     du[1] = V;
-                  }
-                  else // SDIM == 3
-                  {
-                     real_t Jloc[6], Jinv[6];
-                     Jloc[0] = j(qx,qy,0,0,el);
-                     Jloc[1] = j(qx,qy,1,0,el);
-                     Jloc[2] = j(qx,qy,2,0,el);
-                     Jloc[3] = j(qx,qy,0,1,el);
-                     Jloc[4] = j(qx,qy,1,1,el);
-                     Jloc[5] = j(qx,qy,2,1,el);
-                     kernels::CalcLeftInverse<3,2>(Jloc, Jinv);
-                     const real_t U = Jinv[0]*dq[0] + Jinv[2]*dq[1] + Jinv[4]*dq[2];
-                     const real_t V = Jinv[1]*dq[0] + Jinv[3]*dq[1] + Jinv[5]*dq[2];
-                     du[0] = U;
-                     du[1] = V;
-                  }
-               }
-               QQ(qx, qy) = du[1];  // Store du/dy component
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply G^T in y-direction: QQ -> DQ1
-         // (Transpose of d/dy which uses DQ0(dy,qx)*G(dy,qy))
-         // Must produce DQ1(dy,qx) to match forward's DQ0 indexing
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(qx,x,Q1D)
-            {
-               real_t u = 0.0;
-               for (int qy = 0; qy < Q1D; ++qy)
-               {
-                  u += G(dy,qy) * QQ(qx,qy);
-               }
-               DQ1(dy,qx) = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in x-direction: DQ1 -> DD
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(dx,x,D1D)
-            {
-               real_t u = 0.0;
-               for (int qx = 0; qx < Q1D; ++qx)
-               {
-                  u += B(dx,qx) * DQ1(dy,qx);
-               }
-               DD(dx,dy) = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Accumulate to output
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(dx,x,D1D)
-            {
-               e(dx,dy,c,el) += DD(dx,dy);
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   });
-}
-
-template<QVectorLayout Q_LAYOUT, bool GRAD_PHYS,
-         int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0>
-static void DerivativesTranspose3D(const int NE,
-                                   const real_t *b_,
-                                   const real_t *g_,
-                                   const real_t *j_,
-                                   const real_t *q_,
-                                   real_t *e_,
-                                   const int sdim = 3,
-                                   const int vdim = 0,
-                                   const int d1d = 0,
-                                   const int q1d = 0)
-{
-   const int D1D = T_D1D ? T_D1D : d1d;
-   const int Q1D = T_Q1D ? T_Q1D : q1d;
-   const int VDIM = T_VDIM ? T_VDIM : vdim;
-
-   const auto b = Reshape(b_, Q1D, D1D);
-   const auto g = Reshape(g_, Q1D, D1D);
-   const auto j = Reshape(j_, Q1D, Q1D, Q1D, 3, 3, NE);
-   const auto q = Q_LAYOUT == QVectorLayout::byNODES ?
-                  Reshape(q_, Q1D, Q1D, Q1D, VDIM, 3, NE):
-                  Reshape(q_, VDIM, 3, Q1D, Q1D, Q1D, NE);
-   auto e = Reshape(e_, D1D, D1D, D1D, VDIM, NE);
-
-   mfem::forall_3D(NE, Q1D, Q1D, Q1D, [=] MFEM_HOST_DEVICE (int el)
-   {
-      const int D1D = T_D1D ? T_D1D : d1d;
-      const int Q1D = T_Q1D ? T_Q1D : q1d;
-      const int VDIM = T_VDIM ? T_VDIM : vdim;
-      constexpr int MQ1 = T_Q1D ? T_Q1D : DofQuadLimits::MAX_INTERP_1D;
-      constexpr int MD1 = T_D1D ? T_D1D : DofQuadLimits::MAX_INTERP_1D;
-
-      MFEM_SHARED real_t BG[2][MQ1*MD1];
-      kernels::internal::LoadBG<MD1,MQ1>(D1D,Q1D,b,g,BG);
-      DeviceMatrix B(BG[0], D1D, Q1D);
-      DeviceMatrix G(BG[1], D1D, Q1D);
-
-      MFEM_SHARED real_t sm0[3][MQ1*MQ1*MQ1];
-      MFEM_SHARED real_t sm1[3][MQ1*MQ1*MQ1];
-      DeviceCube QQQ(sm0[0], MQ1, MQ1, MQ1);
-      DeviceCube DQQ(sm1[0], MD1, MQ1, MQ1);
-      DeviceCube DDQ(sm0[0], MD1, MD1, MQ1);
-      DeviceCube DDD(sm1[0], MD1, MD1, MD1);
-
-      for (int c = 0; c < VDIM; c++)
-      {
-         // Process du/dx component
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  real_t dq[3];
-                  if (Q_LAYOUT == QVectorLayout::byVDIM)
-                  {
-                     dq[0] = q(c,0,qx,qy,qz,el);
-                     dq[1] = q(c,1,qx,qy,qz,el);
-                     dq[2] = q(c,2,qx,qy,qz,el);
-                  }
-                  else
-                  {
-                     dq[0] = q(qx,qy,qz,c,0,el);
-                     dq[1] = q(qx,qy,qz,c,1,el);
-                     dq[2] = q(qx,qy,qz,c,2,el);
-                  }
-
-                  real_t du[3] = {dq[0], dq[1], dq[2]};
-                  if (GRAD_PHYS)
-                  {
-                     real_t Jloc[9], Jinv[9];
-                     for (int col = 0; col < 3; col++)
-                     {
-                        for (int row = 0; row < 3; row++)
-                        {
-                           Jloc[row+3*col] = j(qx,qy,qz,row,col,el);
-                        }
-                     }
-                     kernels::CalcInverse<3>(Jloc, Jinv);
-                     const real_t U = Jinv[0]*dq[0] + Jinv[3]*dq[1] + Jinv[6]*dq[2];
-                     const real_t V = Jinv[1]*dq[0] + Jinv[4]*dq[1] + Jinv[7]*dq[2];
-                     const real_t W = Jinv[2]*dq[0] + Jinv[5]*dq[1] + Jinv[8]*dq[2];
-                     du[0] = U; du[1] = V; du[2] = W;
-                  }
-                  QQQ(qx,qy,qz) = du[0];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply G^T in x: QQQ -> DQQ (transpose of G⊗B⊗B)
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qx = 0; qx < Q1D; ++qx)
-                  {
-                     u += G(dx,qx) * QQQ(qx,qy,qz);
-                  }
-                  DQQ(dx,qy,qz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in y: DQQ -> DDQ
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qy = 0; qy < Q1D; ++qy)
-                  {
-                     u += B(dy,qy) * DQQ(dx,qy,qz);
-                  }
-                  DDQ(dx,dy,qz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in z: DDQ -> DDD
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qz = 0; qz < Q1D; ++qz)
-                  {
-                     u += B(dz,qz) * DDQ(dx,dy,qz);
-                  }
-                  DDD(dx,dy,dz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Accumulate result
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  e(dx,dy,dz,c,el) += DDD(dx,dy,dz);
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Process du/dy component
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  real_t dq[3];
-                  if (Q_LAYOUT == QVectorLayout::byVDIM)
-                  {
-                     dq[0] = q(c,0,qx,qy,qz,el);
-                     dq[1] = q(c,1,qx,qy,qz,el);
-                     dq[2] = q(c,2,qx,qy,qz,el);
-                  }
-                  else
-                  {
-                     dq[0] = q(qx,qy,qz,c,0,el);
-                     dq[1] = q(qx,qy,qz,c,1,el);
-                     dq[2] = q(qx,qy,qz,c,2,el);
-                  }
-
-                  real_t du[3] = {dq[0], dq[1], dq[2]};
-                  if (GRAD_PHYS)
-                  {
-                     real_t Jloc[9], Jinv[9];
-                     for (int col = 0; col < 3; col++)
-                     {
-                        for (int row = 0; row < 3; row++)
-                        {
-                           Jloc[row+3*col] = j(qx,qy,qz,row,col,el);
-                        }
-                     }
-                     kernels::CalcInverse<3>(Jloc, Jinv);
-                     const real_t U = Jinv[0]*dq[0] + Jinv[3]*dq[1] + Jinv[6]*dq[2];
-                     const real_t V = Jinv[1]*dq[0] + Jinv[4]*dq[1] + Jinv[7]*dq[2];
-                     const real_t W = Jinv[2]*dq[0] + Jinv[5]*dq[1] + Jinv[8]*dq[2];
-                     du[0] = U; du[1] = V; du[2] = W;
-                  }
-                  QQQ(qx,qy,qz) = du[1];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in x: QQQ -> DQQ (transpose of B⊗G⊗B)
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qx = 0; qx < Q1D; ++qx)
-                  {
-                     u += B(dx,qx) * QQQ(qx,qy,qz);
-                  }
-                  DQQ(dx,qy,qz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply G^T in y: DQQ -> DDQ
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qy = 0; qy < Q1D; ++qy)
-                  {
-                     u += G(dy,qy) * DQQ(dx,qy,qz);
-                  }
-                  DDQ(dx,dy,qz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in z: DDQ -> DDD
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qz = 0; qz < Q1D; ++qz)
-                  {
-                     u += B(dz,qz) * DDQ(dx,dy,qz);
-                  }
-                  DDD(dx,dy,dz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Accumulate result
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  e(dx,dy,dz,c,el) += DDD(dx,dy,dz);
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Process du/dz component
-         MFEM_FOREACH_THREAD(qz,z,Q1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  real_t dq[3];
-                  if (Q_LAYOUT == QVectorLayout::byVDIM)
-                  {
-                     dq[0] = q(c,0,qx,qy,qz,el);
-                     dq[1] = q(c,1,qx,qy,qz,el);
-                     dq[2] = q(c,2,qx,qy,qz,el);
-                  }
-                  else
-                  {
-                     dq[0] = q(qx,qy,qz,c,0,el);
-                     dq[1] = q(qx,qy,qz,c,1,el);
-                     dq[2] = q(qx,qy,qz,c,2,el);
-                  }
-
-                  real_t du[3] = {dq[0], dq[1], dq[2]};
-                  if (GRAD_PHYS)
-                  {
-                     real_t Jloc[9], Jinv[9];
-                     for (int col = 0; col < 3; col++)
-                     {
-                        for (int row = 0; row < 3; row++)
-                        {
-                           Jloc[row+3*col] = j(qx,qy,qz,row,col,el);
-                        }
-                     }
-                     kernels::CalcInverse<3>(Jloc, Jinv);
-                     const real_t U = Jinv[0]*dq[0] + Jinv[3]*dq[1] + Jinv[6]*dq[2];
-                     const real_t V = Jinv[1]*dq[0] + Jinv[4]*dq[1] + Jinv[7]*dq[2];
-                     const real_t W = Jinv[2]*dq[0] + Jinv[5]*dq[1] + Jinv[8]*dq[2];
-                     du[0] = U; du[1] = V; du[2] = W;
-                  }
-                  QQQ(qx,qy,qz) = du[2];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply G^T in z: QQQ -> DQQ (transpose of B⊗B⊗G)
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(qy,y,Q1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  real_t u = 0.0;
-                  for (int qz = 0; qz < Q1D; ++qz)
-                  {
-                     u += G(dz,qz) * QQQ(qx,qy,qz);
-                  }
-                  DQQ(qx,qy,dz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in y: DQQ -> DDQ
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(qx,x,Q1D)
-               {
-                  real_t u = 0.0;
-                  for (int qy = 0; qy < Q1D; ++qy)
-                  {
-                     u += B(dy,qy) * DQQ(qx,qy,dz);
-                  }
-                  DDQ(qx,dy,dz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Apply B^T in x: DDQ -> DDD
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  real_t u = 0.0;
-                  for (int qx = 0; qx < Q1D; ++qx)
-                  {
-                     u += B(dx,qx) * DDQ(qx,dy,dz);
-                  }
-                  DDD(dx,dy,dz) = u;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         // Accumulate result
-         MFEM_FOREACH_THREAD(dz,z,D1D)
-         {
-            MFEM_FOREACH_THREAD(dy,y,D1D)
-            {
-               MFEM_FOREACH_THREAD(dx,x,D1D)
-               {
-                  e(dx,dy,dz,c,el) += DDD(dx,dy,dz);
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   });
-}
-
-} // namespace quadrature_interpolator
-} // namespace internal
-
-template<int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int VDIM, int D1D,
-         int Q1D, int NBZ>
-QuadratureInterpolator::GradTransposeKernelType
-QuadratureInterpolator::GradTransposeKernels::Kernel()
-{
-   if (DIM == 1) { return internal::quadrature_interpolator::DerivativesTranspose1D<Q_LAYOUT, GRAD_PHYS>; }
-   else if (DIM == 2) { return internal::quadrature_interpolator::DerivativesTranspose2D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, Q1D, NBZ>; }
-   else if (DIM == 3) { return internal::quadrature_interpolator::DerivativesTranspose3D<Q_LAYOUT, GRAD_PHYS, VDIM, D1D, Q1D>; }
-   else { MFEM_ABORT(""); }
-}
-
-} // namespace mfem
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bslazarov	c01a9cb623	style	2026-02-10 12:48:56 -08:00
Mathias Rainer Schmidt	007183c70a	Merge branch 'master' into eigenSolverInterface	2026-02-10 10:47:01 -08:00
Mathias Rainer Schmidt	0e63fc90e3	Merge branch 'master' of https://github.com/mfem/mfem	2026-02-10 10:46:20 -08:00
Mathias Rainer Schmidt	06cb917637	- added comments to slepc interaface class	2026-02-10 10:45:28 -08:00
Mathias Rainer Schmidt	db97637c09	- minor changed to address PR	2026-02-03 22:40:04 -08:00
Mathias Rainer Schmidt	cbaf930388	- minor changes for PR	2026-02-02 23:34:11 -08:00
blaz	b53dd0fea1	Set he number of eigenmodes in the bas class	2026-01-26 10:45:18 -08:00
blaz	acf167ed86	resize the eigenvalue array	2026-01-25 23:01:32 -08:00
blaz	8a8ac07910	cleaner code and style	2026-01-25 22:38:31 -08:00
Mathias Rainer Schmidt	c2d5eed541	Merge branch 'master' of https://github.com/mfem/mfem	2026-01-13 15:19:05 -08:00
Mathias Rainer Schmidt	f8e71cf89c	- initial commit for eigen sovler interface	2026-01-13 15:18:35 -08:00