Time step estimates for the CG case - global vs local.

style
Cleaned raw pointers.
2026-05-22 10:43:48 -07:00 · 2025-04-18 17:47:53 -07:00 · 2025-04-18 17:35:15 -07:00 · 2025-04-18 09:26:22 -07:00 · 2025-04-18 09:25:29 -07:00 · 2025-04-11 15:05:33 -07:00
298 changed files with 5214 additions and 25212 deletions
@@ -1,154 +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.
---
-name: Sanitizer Config
-description: Sets up environment variables for MFEM sanitizer workflow
-
-inputs:
-  DEBUG:
-    description: If true, use intermediate caches to speed up the workflow
-                 by reusing previous builds.
-    default: false
-
-  REPOSITORY:
-    description: Repository to checkout
-    default: mfem/mfem
-
-  BRANCH:
-    description: Branch to checkout
-    default: ubsan
-
-  CLANG_VER:
-    description: CLANG version to use
-    default: 18
-
-  # https://github.com/llvm/llvm-project/releases
-  LLVM_VER:
-    description: LLVM version to use
-    default: 19.1.7
-
-  # https://github.com/hypre-space/hypre/releases
-  HYPRE_VER:
-    description: HYPRE version to use
-    default: 2.19.0
-
-  METIS_VER:
-    description: METIS version to use
-    default: 4.0.3
-
-  CTEST:
-    description: CTest command to use
-    default: ctest -j --test-load $(nproc)
-                      --schedule-random
-                      --stop-on-failure --output-on-failure
-                      --test-dir
-
-  # https://clang.llvm.org/docs/AddressSanitizer.html
-  ASAN_OPTIONS:
-    default: detect_leaks=1,
-             strict_init_order=1,
-             strict_string_checks=1,
-             check_initialization_order=1,
-             detect_stack_use_after_return=1
-  ASAN_CXXFLAGS:
-    default: -fsanitize=address
-             -fsanitize-address-use-after-scope
-  ASAN_LDFLAGS:
-    default: -fsanitize=address
-
-  # https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
-  UBSAN_OPTIONS:
-    default: halt_on_error=1, print_stacktrace=1
-  UBSAN_CXXFLAGS:
-    default: -fsanitize=undefined
-  UBSAN_LDFLAGS:
-    default: -fsanitize=undefined
-
-  # https://clang.llvm.org/docs/MemorySanitizer.html
-  MSAN_OPTIONS:
-    default: "poison_in_dtor=1"
-  MSAN_CXXFLAGS:
-    default: -fsanitize=memory
-             -fsanitize-memory-track-origins
-             -fsanitize-memory-use-after-dtor
-  MSAN_LDFLAGS:
-    default: -fsanitize=memory
-
-  LSAN_DIR:
-    description: LSAN suppression directory
-    default: lsan
-
-  LSAN_FILE:
-    description: LSAN suppression file
-    default: lsan.supp
-
-  NO_FLAGS:
-    description: If true, do not set any CXXFLAGS or LDFLAGS.
-    default: false
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Env (Inputs)
-      run: |
-        echo DEBUG=${{inputs.DEBUG}} >> $GITHUB_ENV
-        echo REPOSITORY=${{inputs.REPOSITORY}} >> $GITHUB_ENV
-        echo BRANCH=${{inputs.BRANCH}} >> $GITHUB_ENV
-        echo CLANG_VER=${{inputs.CLANG_VER}} >> $GITHUB_ENV
-        echo LLVM_VER=${{inputs.LLVM_VER}} >> $GITHUB_ENV
-        echo HYPRE_VER=${{inputs.HYPRE_VER}} >> $GITHUB_ENV
-        echo METIS_VER=${{inputs.METIS_VER}} >> $GITHUB_ENV
-        echo CTEST=${{inputs.CTEST}} >> $GITHUB_ENV
-        echo ASAN_OPTIONS=${{inputs.ASAN_OPTIONS}} >> $GITHUB_ENV
-        echo UBSAN_OPTIONS=${{inputs.UBSAN_OPTIONS}} >> $GITHUB_ENV
-        echo MSAN_OPTIONS=${{inputs.MSAN_OPTIONS}} >> $GITHUB_ENV
-        echo LSAN_DIR=${{inputs.LSAN_DIR}} >> $GITHUB_ENV
-        echo LSAN_FILE=${{inputs.LSAN_FILE}} >> $GITHUB_ENV
-        echo ASAN_CXXFLAGS=${{inputs.ASAN_CXXFLAGS}} >> $GITHUB_ENV
-        echo ASAN_LDFLAGS=${{inputs.ASAN_LDFLAGS}} >> $GITHUB_ENV
-        echo UBSAN_CXXFLAGS=${{inputs.UBSAN_CXXFLAGS}} >> $GITHUB_ENV
-        echo UBSAN_LDFLAGS=${{inputs.UBSAN_LDFLAGS}} >> $GITHUB_ENV
-        echo MSAN_CXXFLAGS=${{inputs.MSAN_CXXFLAGS}} >> $GITHUB_ENV
-        echo MSAN_LDFLAGS=${{inputs.MSAN_LDFLAGS}} >> $GITHUB_ENV
-      shell: bash
-
-    - name: Env (dir)
-      run: |
-        echo LLVM_DIR=${{github.workspace}}/llvm >> $GITHUB_ENV
-        echo HYPRE_DIR=hypre-${{inputs.HYPRE_VER}} >> $GITHUB_ENV
-        echo METIS_DIR=metis-${{inputs.METIS_VER}} >> $GITHUB_ENV
-      shell: bash
-
-    - name: Env (bis)
-      run: |
-        echo CC=clang-${{inputs.CLANG_VER}} >> $GITHUB_ENV
-        echo CXX=clang++-${{inputs.CLANG_VER}} >> $GITHUB_ENV
-        echo LLVM_INC=${{env.LLVM_DIR}}/include/c++/v1 >> $GITHUB_ENV
-        echo LLVM_LIB=${{env.LLVM_DIR}}/lib >> $GITHUB_ENV
-        echo HYPRE_TGZ=v${{inputs.HYPRE_VER}}.tar.gz >> $GITHUB_ENV
-        echo METIS_TGZ=metis-${{inputs.METIS_VER}}.tar.gz >> $GITHUB_ENV
-        LSAN_SUPPRESSIONS="${{github.workspace}}/${{inputs.LSAN_DIR}}/${{inputs.LSAN_FILE}}"
-        echo "LSAN_OPTIONS=suppressions=$LSAN_SUPPRESSIONS" >> $GITHUB_ENV
-      shell: bash
-
-    - name: Env (ter)
-      if: ${{ inputs.NO_FLAGS != 'true' }}
-      run: |
-        echo LLVM_CXXFLAGS=-stdlib=libc++ -I${{env.LLVM_INC}} -Isystem${{env.LLVM_INC}} >> $GITHUB_ENV
-        echo LLVM_LDFLAGS=-L${{env.LLVM_LIB}} -lc++abi -Wl,-rpath,${{env.LLVM_LIB}} >> $GITHUB_ENV
-      shell: bash
-
-    - name: Env (quater)
-      if: ${{ inputs.NO_FLAGS != 'true' }}
-      run: |
-        echo CXXFLAGS=${{env.LLVM_CXXFLAGS}} >> $GITHUB_ENV
-        echo LDFLAGS=${{env.LLVM_LDFLAGS}} >> $GITHUB_ENV
-      shell: bash
@@ -1,91 +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.
---
-name: 'MFEM Compilation'
-description: 'MFEM Compilation'
-
-inputs:
-  par:
-    description: 'Whether to build for parallel (true/false)'
-    default: false
-  sanitizer:
-    description: 'Sanitizer to use (asan, msan, ubsan)'
-    default: asan
-
-runs:
-  using: 'composite'
-  steps:
-    - uses: ./.github/actions/sanitize/config
-
-    - uses: actions/cache@v4
-      if: ${{env.DEBUG == 'true'}}
-      id: debug
-      with:
-        path: mfem/build
-        key: build-${{inputs.par}}-${{inputs.sanitizer}}
-
-    - uses: ./.github/actions/sanitize/setup
-      if: ${{steps.debug.outputs.cache-hit != 'true'}}
-      with:
-        par: ${{inputs.par}}
-        sanitizer: ${{inputs.sanitizer}}
-
-    - name: Build with ASAN
-      if: inputs.sanitizer == 'asan'
-      run: echo CXXFLAGS=${{env.CXXFLAGS}} ${{env.ASAN_CXXFLAGS}} >> $GITHUB_ENV
-      shell: bash
-
-    - name: Build with MSAN
-      if: inputs.sanitizer == 'msan'
-      run: echo CXXFLAGS=${{env.CXXFLAGS}} ${{env.MSAN_CXXFLAGS}} >> $GITHUB_ENV
-      shell: bash
-
-    - name: Build with UBSAN
-      if: inputs.sanitizer == 'ubsan'
-      run: echo CXXFLAGS=${{env.CXXFLAGS}} ${{env.UBSAN_CXXFLAGS}} >> $GITHUB_ENV
-      shell: bash
-
-    - uses: mfem/github-actions/build-mfem@v2.5
-      if: ${{steps.debug.outputs.cache-hit != 'true'}}
-      env:
-        CXXFLAGS: ${{env.CXXFLAGS}}
-        LDFLAGS: ${{env.LDFLAGS}}
-      with:
-        mpi: ${{inputs.par == 'false' && 'seq' || 'par'}}
-        mfem-dir: mfem
-        os: ${{runner.os}}
-        library-only: true
-        build-system: cmake
-        hypre-dir: ${{env.HYPRE_DIR}}
-        metis-dir: ${{env.METIS_DIR}}
-        config-options: >-
-          -GNinja
-          -DMPICXX=${{env.CXX}}
-          -DCMAKE_CXX_STANDARD=17
-          -DMFEM_USE_MEMALLOC=OFF
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_VERBOSE_MAKEFILE=ON
-          -DCMAKE_CXX_COMPILER=${{env.CXX}}
-          -DCMAKE_CXX_FLAGS_RELEASE='-g -O1 -fno-omit-frame-pointer'
-
-    - name: Delete object files
-      if: ${{steps.debug.outputs.cache-hit != 'true'}}
-      working-directory: mfem/build
-      run: find . -type f -name '*.o' -delete
-      shell: bash
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: build-${{inputs.par}}-${{inputs.sanitizer}}
-        path: mfem/build
-        if-no-files-found: error
-        retention-days: 1
-        overwrite: false
@@ -1,33 +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.
---
-name: 'Install MPI'
-description: 'Installs MPI and set up its environment variables'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Install
-      run: sudo apt-get install openmpi-bin libopenmpi-dev
-      shell: bash
-
-    - name: Env
-      run: |
-        echo PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe >> $GITHUB_ENV
-        echo MPI_INC=$(mpicxx --showme:compile) >> $GITHUB_ENV
-        echo MPI_LIB=$(mpicxx --showme:link) >> $GITHUB_ENV
-      shell: bash
-
-    - name: Env (bis)
-      run: |
-        echo CXXFLAGS=${{env.CXXFLAGS}} ${{env.MPI_INC}} >> $GITHUB_ENV
-        echo LDFLAGS=${{env.LDFLAGS}} ${{env.MPI_LIB}} >> $GITHUB_ENV
-      shell: bash
@@ -1,71 +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.
---
-name: 'Restore state'
-description: 'Restore state to be able to run checks, tests'
-
-inputs:
-  par:
-    description: 'Whether to build for parallel (true/false)'
-    default: false
-  sanitizer:
-    description: 'Sanitizer to use (asan, msan, ubsan)'
-    default: asan
-  cache-path:
-    description: 'path to what needs to be restored'
-    default: none
-  cache-skip:
-    description: 'Skip cache restoration'
-    default: false
-
-outputs:
-  cache-hit:
-    description: 'Output from a specific step'
-    value: ${{steps.debug.outputs.cache-hit}}
-
-runs:
-  using: 'composite'
-  steps:
-    - uses: ./.github/actions/sanitize/config
-
-    - uses: actions/cache@v4
-      if: ${{env.DEBUG == 'true' && inputs.cache-skip != 'true'}}
-      id: debug
-      with:
-        path: ${{inputs.cache-path}}
-        key: ${{github.job}}-${{inputs.par}}-${{inputs.sanitizer}}
-
-    - uses: ./.github/actions/sanitize/setup
-      if: ${{steps.debug.outputs.cache-hit != 'true'}}
-      with:
-        par: ${{inputs.par}}
-        sanitizer: ${{inputs.sanitizer}}
-
-    - uses: actions/download-artifact@v4
-      with:
-        name: build-${{inputs.par}}-${{inputs.sanitizer}}
-        path: mfem/build
-
-    - name: Ninja Patch
-      working-directory: mfem/build
-      run: |
-        sed -i -e 's/CXX_STATIC_LIBRARY_LINKER__mfem_Release.*/CUSTOM_COMMAND/' build.ninja
-        sed -i -e '/build tests\/unit\/all:/ s/tests\/unit\/[^ ]*unit_tests[^ ]*//g' build.ninja
-        sed -i -e '/^add_test(\[=\[\(unit_tests\|punit_tests\)\]=\]/ s/)/ "--input-file .\/list-test-names-${{matrix.tag}}" "--min-duration 1")/' tests/unit/CTestTestfile.cmake
-      shell: bash
-
-    - name: Copy Data
-      if: ${{steps.debug.outputs.cache-hit != 'true'}}
-      working-directory: mfem/build
-      run: |
-        ninja cmake_object_order_depends_target_unit_tests
-        cp -pR ../tests/unit/data tests/unit
-      shell: bash
@@ -1,64 +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.
---
-name: 'Setup state'
-description: 'Sets up the state to be able to run build & run'
-
-inputs:
-  par:
-    description: 'Whether to build for parallel (true/false)'
-    default: false
-  sanitizer:
-    description: 'Sanitizer to use (asan, msan, ubsan)'
-    default: asan
-
-runs:
-  using: 'composite'
-  steps:
-    - uses: actions/cache/restore@v4  # Cache for LLVM libcxx
-      with:
-        path: ${{env.LLVM_DIR}}
-        fail-on-cache-miss: true
-        key: build-libcxx-${{env.LLVM_VER}}-${{inputs.sanitizer}}
-
-    - uses: ./.github/actions/sanitize/mpi
-      if: ${{inputs.par == 'true'}}
-
-    - 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@v4  # Cache for Metis
-      if: ${{inputs.par == 'true'}}
-      with:
-        path: ${{env.METIS_DIR}}
-        fail-on-cache-miss: true
-        key: ${{runner.os}}-build-${{env.METIS_DIR}}-v2.5
-
-    - name: Hypre/Metis links
-      if: ${{inputs.par == 'true'}}
-      run: ln -s -f ${{env.HYPRE_DIR}} hypre && ln -s -f ${{env.METIS_DIR}} metis-4.0
-      shell: bash
-
-    - 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@v4  # Checkout the repository
-      with:
-        path: mfem
-        # ref: ${{env.BRANCH}}
-        # repository: ${{env.REPOSITORY}}
@@ -7,17 +7,18 @@

                               https://mfem.org

+
 This directory contains the GitHub CI scripts for MFEM.

 Note that some of these scripts use the shared MFEM GitHub Actions from the external mfem/github-actions repository:

-  <https://github.com/mfem/github-actions>
+  https://github.com/mfem/github-actions

-For a particular action, e.g. `mfem/github-actions/build-mfem@v2.5`, the `v2.5` suffix denotes the branch in the above from which the action is taken.
+For a particular action, e.g. `mfem/github-actions/build-mfem@v2.1`, the `v2.1` suffix denotes the branch in the above from which the action is taken.

 The current CI workflows are:

-## `repo-check.yml`
+### `repo-check.yml`

 Runs a number of static repository-level sanity checks.

@@ -29,39 +30,19 @@ Runs a number of static repository-level sanity checks.

 - `branch-history` guards against accidental commits of large files using the `--history` option of the `config/githooks/pre-push` script.

-## `mfem-analysis.yml` (`build-analysis`)
+### `mfem-analysis.yml` (`build-analysis`)

 Checks if the code builds and satisfies minimal requirements.

 - `gitignore` builds hypre, METIS, and MFEM using `mfem/github-actions/build-hypre`, `mfem/github-actions/build-metis`, and `mfem/github-actions/build-mfem` and checks for correct `.gitignore` settings by running the `tests/scripts/gitignore` script.

-## `builds-and-tests.yml`
+### `builds-and-tests.yml`

 Runs a matrix of builds and tests runs with different compilers, OS, mfem/hypre settings, etc. Also processes and upload Codecov reports.

-Uses the following GitHub Actions from <https://github.com/mfem/github-actions>:
+Uses the following GitHub Actions from https://github.com/mfem/github-actions:

 - `mfem/github-actions/build-hypre`
 - `mfem/github-actions/build-metis`
 - `mfem/github-actions/build-mfem`
 - `mfem/github-actions/upload-coverage`
-
-## Sanitizer Workflow for MFEM Verification
-
-This workflow validates MFEM unit tests, examples, and miniapps using sanitizer tools.
-
- `sanitizers.yml` orchestrates:
-  - Building and caching dependencies: HYPRE, METIS, LSAN suppression file, and LLVM libcxx.
-  - Launching fine-grained jobs for serial (ASAN, MSAN, UBSAN) and parallel (ASAN, UBSAN) sanitizers.
- `sanitize-tests.yml` is a reusable workflow accepting `par` mode (`true` for parallel) and `sanitizer` (ASAN, MSAN, or UBSAN) as inputs. It executes the following jobs:
-  - **Build**: Compiles the MFEM library with specified parallel and sanitizer settings.
-  - **Check**: Runs verification checks.
-  - Parallel jobs to test the following: **Examples**, **Miniapps** and **Unit tests**
-
-The workflow leverages composite actions in `.github/actions/sanitize/`:
-
- `config`: Centralizes settings for the sanitizer workflow.
- `mfem`: Manages the MFEM library build process.
- `mpi`: Installs MPI and applies additional compilation flags.
- `restore`: Restores the testing environment state.
- `setup`: Builds or restores cached dependencies.
@@ -58,7 +58,6 @@ jobs:
        build-system: [make, cmake]
        hypre-target: [int32]
        precision: [fp64]
-        enzyme: [false]
        exclude:
          - os: ubuntu-latest
            build-system: cmake
@@ -81,17 +80,15 @@ jobs:
            codecov: YES
          - os: ubuntu-latest
            target: dbg
-            config-opts: "CPPFLAGS+=-Og"
+            config-opts: 'CPPFLAGS+=-Og'
          - os: macos-latest
            codecov: NO
          - os: windows-latest
            codecov: NO
-            # config-opts: '-G "Ninja Multi-Config"'
          - os: windows-latest
            target: opt
            mpi: par
-            config-opts: "-DBUILD_SHARED_LIBS=ON"
-            # config-opts: '-DBUILD_SHARED_LIBS=ON -G "Ninja Multi-Config"'
+            config-opts: '-DBUILD_SHARED_LIBS=ON'
          - os: ubuntu-latest
            target: opt
            codecov: NO
@@ -99,7 +96,7 @@ jobs:
            build-system: cmake
            hypre-target: int32
            precision: fp64
-            config-opts: "-DCMAKE_INSTALL_PREFIX=../cmake-install"
+            config-opts: '-DCMAKE_INSTALL_PREFIX=../cmake-install'
            # This option can be set to pass additional configuration options to
            # the MFEM configuration command.
            # config-opts: '-DCMAKE_VERBOSE_MAKEFILE=ON'
@@ -124,17 +121,7 @@ jobs:
            build-system: make
            hypre-target: int32
            precision: fp32
-          - os: macos-latest
-            target: opt
-            codecov: NO
-            mpi: par
-            build-system: make
-            hypre-target: int32
-            precision: fp64
-            enzyme: true
-            config-opts: MFEM_USE_ENZYME=YES ENZYME_DIR=$(brew --prefix enzyme)
-
-    name: ${{ matrix.os }}-${{ matrix.build-system }}-${{ matrix.target }}-${{ matrix.mpi }}-${{ matrix.hypre-target }}-${{ matrix.precision }}${{ matrix.enzyme && '-enzyme' || '' }}
+    name: ${{ matrix.os }}-${{ matrix.build-system }}-${{ matrix.target }}-${{ matrix.mpi }}-${{ matrix.hypre-target }}-${{ matrix.precision }}

    runs-on: ${{ matrix.os }}

@@ -144,8 +131,8 @@ jobs:
        if: matrix.os == 'ubuntu-latest'
        uses: easimon/maximize-build-space@v8
        with:
-          overprovision-lvm: "true"
-          remove-android: "true"
+          overprovision-lvm: 'true'
+          remove-android: 'true'

      # Checkout MFEM in "mfem" subdirectory. Final path:
      # /home/runner/work/mfem/mfem/mfem
@@ -157,17 +144,6 @@ jobs:
          # Fetch the complete history for codecov to access commits ID
          fetch-depth: 0

-      - name: Windows environment - PowerShell [debug]
-        if: matrix.os == 'windows-latest'
-        run: |
-          ls env: | fl
-
-      - name: Windows environment - Bash [debug]
-        if: matrix.os == 'windows-latest'
-        run: |
-          env
-        shell: bash
-
      - name: Xcode version setup (MacOS)
        if: matrix.os == 'macos-latest'
        run: |
@@ -282,18 +258,6 @@ jobs:
        run: |
          vcpkg install metis-mfem --triplet=x64-windows-static --overlay-ports=${{ env.MFEM_TOP_DIR }}/config/vcpkg/ports

-      # It's usually fine to build the above TPLs with a different compiler.
-      #
-      - name: install Enzyme (macOS w/ Enzyme)
-        if: matrix.enzyme && matrix.os == 'macos-latest'
-        run: |
-          export HOMEBREW_NO_INSTALL_CLEANUP=1
-          brew update
-          brew install llvm@19 enzyme
-          echo "LLVM_PREFIX=$(brew --prefix llvm@19)" >> $GITHUB_ENV
-          echo "OMPI_CC=$(brew --prefix llvm@19)/bin/clang" >> $GITHUB_ENV
-          echo "OMPI_CXX=$(brew --prefix llvm@19)/bin/clang++" >> $GITHUB_ENV
-
      # MFEM build and test
      - name: build
        uses: mfem/github-actions/build-mfem@v2.5
@@ -0,0 +1,69 @@
+# 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.
+
+name: "Sanitizer"
+
+permissions:
+  actions: write
+
+on:
+  push:
+    branches:
+      - master
+      - next
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  Serial:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: MFEM Checkout
+        uses: actions/checkout@v4
+        with:
+          path: mfem
+
+      - name: MFEM Build
+        uses: mfem/github-actions/build-mfem@v2.5
+        with:
+          os: ${{ runner.os }}
+          target: opt
+          mpi: seq
+          hypre-dir: unused-hypre-dir
+          metis-dir: unused-metis-dir
+          mfem-dir: mfem
+          build-system: make
+          library-only: false
+          config-options:
+            CXX="clang++-18"
+            CXXFLAGS="-g -O1 -std=c++11
+                      -fsanitize=address
+                      -fno-omit-frame-pointer
+                      -fsanitize-address-use-after-scope"
+
+      - name: MFEM Info
+        working-directory: mfem
+        run: make info
+
+      - name: MFEM Sanitize
+        working-directory: mfem
+        run:
+          ASAN_OPTIONS="detect_leaks=1,
+                        strict_init_order=1,
+                        strict_string_checks=1,
+                        check_initialization_order=1,
+                        detect_stack_use_after_return=1"
+          make test
@@ -1,39 +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.
---
-name: build-hypre
-on:
-  workflow_call:
-jobs:
-  build-hypre:
-    runs-on: ubuntu-latest
-    name: 2.19.0
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/config
-      - name: Cache
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: ${{env.HYPRE_DIR}}
-          key: ${{runner.os}}-ompi-build-${{env.HYPRE_DIR}}-int32-fp64-v2.5
-      - name: Setup
-        if: steps.cache.outputs.cache-hit != 'true'
-        uses: ./.github/actions/sanitize/mpi
-      - name: Build
-        if: steps.cache.outputs.cache-hit != 'true'
-        uses: mfem/github-actions/build-hypre@v2.5
-        with:
-          archive: ${{env.HYPRE_TGZ}}
-          dir: ${{env.HYPRE_DIR}}
-          target: int32
-          precision: fp64
-          build-system: make
@@ -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.
---
-name: build-libcxx
-on:
-  workflow_call:
-jobs:
-  build-llvm-libcxx:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        sanitizer: [asan, msan, ubsan]
-        include:
-          - sanitizer: asan
-            llvm_use_sanitizer: "Address"
-          - sanitizer: msan
-            llvm_use_sanitizer: "MemoryWithOrigins"
-          - sanitizer: ubsan
-            llvm_use_sanitizer: "Undefined"
-    name: ${{matrix.sanitizer}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/config
-        with:
-          NO_FLAGS: true
-      - name: Cache
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: ${{env.LLVM_DIR}}
-          key: build-libcxx-${{env.LLVM_VER}}-${{matrix.sanitizer}}
-      - name: Clone
-        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-        run: >
-          git clone --filter=blob:none --depth=1
-          --branch llvmorg-${{env.LLVM_VER}}
-          --no-checkout https://github.com/llvm/llvm-project.git llvm-project
-      - name: Checkout
-        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-        working-directory: llvm-project
-        run: |
-          git sparse-checkout set --cone
-          git checkout llvmorg-${{env.LLVM_VER}}
-          git sparse-checkout set cmake llvm/cmake runtimes libcxx libcxxabi
-      - name: Mkdir
-        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-        run: mkdir ${{env.LLVM_DIR}}
-      - name: CMake
-        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-        working-directory: ${{env.LLVM_DIR}}
-        run: >
-          VERBOSE=1
-          cmake -GNinja ../llvm-project/runtimes/
-          -DCMAKE_C_COMPILER=${{env.CC}}
-          -DCMAKE_CXX_COMPILER=${{env.CXX}}
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo
-          -DCMAKE_INSTALL_PREFIX=/usr
-          -DLLVM_USE_SANITIZER=${{matrix.llvm_use_sanitizer}}
-          -DLLVM_BUILD_32_BITS=OFF
-          -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-          -DLLVM_INCLUDE_TESTS=OFF
-          -DLIBCXX_INCLUDE_TESTS=OFF
-          -DLIBCXX_INCLUDE_BENCHMARKS=OFF
-          -DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi'
-      - name: Build
-        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-        working-directory: ${{env.LLVM_DIR}}
-        run: cmake --build . -- cxx cxxabi
@@ -1,38 +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.
---
-name: build-file-lsan
-on:
-  workflow_call:
-jobs:
-  build-file-lsan:
-    runs-on: ubuntu-latest
-    name: lsan.supp
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/config
-      - name: Cache
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: ${{env.LSAN_DIR}}
-          key: build-lsan-suppression-file
-      - name: Setup
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p ${{env.LSAN_DIR}}
-          cat << EOF > ${{env.LSAN_DIR}}/${{env.LSAN_FILE}}
-          leak:libevent_core-2.1.so
-          leak:ompi_mpi_finalize
-          leak:ompi_mpi_init
-          leak:PMPI_Init
-          leak:strdup
-          EOF
@@ -1,36 +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.
---
-name: build-metis
-on:
-  workflow_call:
-jobs:
-  build-metis:
-    runs-on: ubuntu-latest
-    name: 4.0.3
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/config
-      - name: Cache
-        id: cache
-        uses: actions/cache@v4
-        with:
-          path: ${{env.METIS_DIR}}
-          key: ${{runner.os}}-build-${{env.METIS_DIR}}-v2.5
-      - name: Setup
-        if: steps.cache.outputs.cache-hit != 'true'
-        uses: ./.github/actions/sanitize/mpi
-      - name: Build
-        if: steps.cache.outputs.cache-hit != 'true'
-        uses: mfem/github-actions/build-metis@v2.5
-        with:
-          archive: ${{env.METIS_TGZ}}
-          dir: ${{env.METIS_DIR}}
@@ -1,197 +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.
---
-name: Sanitize
-on:
-  workflow_call:
-    inputs:
-      par:
-        description: 'Whether to build for parallel (true/false)'
-        required: false
-        default: false
-        type: boolean
-      sanitizer:
-        description: 'Sanitizer to use (asan, msan, ubsan)'
-        required: true
-        default: asan
-        type: string
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/mfem
-        with:
-          par: ${{inputs.par}}
-          sanitizer: ${{inputs.sanitizer}}
-
-  check:
-    needs: [build]
-    runs-on: ubuntu-latest
-    env:
-      ex: ${{inputs.par && 'ex1p' || 'ex1'}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/restore
-        id: restore
-        with:
-          par: ${{inputs.par}}
-          sanitizer: ${{inputs.sanitizer}}
-          cache-path: mfem/build/examples/${{env.ex}}
-      - name: MFEM Check
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: ninja -v check
-
-  examples:
-    needs: [check]
-    runs-on: ubuntu-latest
-    env:
-      exclude: ${{inputs.par && '-E "_ser"' || ''}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/restore
-        id: restore
-        with:
-          par: ${{inputs.par}}
-          sanitizer: ${{inputs.sanitizer}}
-          cache-path: mfem/build/examples/ex1
-      - name: Build Examples
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: ninja -v examples
-      - name: Test Examples
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: |
-          ${{env.CTEST}} examples ${{env.exclude}} --show-only
-          ${{env.CTEST}} examples ${{env.exclude}}
-
-  miniapps:
-    needs: [check]
-    runs-on: ubuntu-latest
-    env:
-      exclude: ${{inputs.par && '-E "_ser"' || ''}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/restore
-        id: restore
-        with:
-          par: ${{inputs.par}}
-          sanitizer: ${{inputs.sanitizer}}
-          cache-path: mfem/build/miniapps/meshing/minimal-surface
-      - name: Build Miniapps
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: ninja -v miniapps
-      - name: Test Miniapps
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: |
-          ${{env.CTEST}} miniapps ${{env.exclude}} --show-only
-          ${{env.CTEST}} miniapps ${{env.exclude}}
-
-  tests-miniapps:
-    needs: [check]
-    runs-on: ubuntu-latest
-    env:
-      run: ${{inputs.par && '-R "_cpu_np"' || ''}}
-      exclude: ${{inputs.par && '"unit_tests|debug"' || '"^unit_tests$|debug"'}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/restore
-        id: restore
-        with:
-          par: ${{inputs.par}}
-          sanitizer: ${{inputs.sanitizer}}
-          cache-path: mfem/build/tests/unit/sedov_tests_cpu
-      - name: Build Tests Unit Miniapps
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: ninja -v tests/unit/all
-      - name: Run Tests Unit Miniapps
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: |
-          ${{env.CTEST}} tests/unit -E ${{env.exclude}} ${{env.run}} --show-only
-          ${{env.CTEST}} tests/unit -E ${{env.exclude}} ${{env.run}}
-
-  tests-unit-build:
-    needs: [check]
-    runs-on: ubuntu-latest
-    env:
-      unit_tests: ${{inputs.par && 'punit_tests' || 'unit_tests'}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/restore
-        id: restore
-        with:
-          par: ${{inputs.par}}
-          sanitizer: ${{inputs.sanitizer}}
-          cache-path: mfem/build/tests/unit/${{env.unit_tests}}
-      - name: Build Unit Tests
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: ninja -v ${{env.unit_tests}}
-      - name: Delete object files
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build/tests/unit
-        run: find . -type f -name '*.o' -delete
-      - uses: actions/upload-artifact@v4
-        with:
-          name: tests-${{inputs.par}}-${{inputs.sanitizer}}
-          path: mfem/build/tests/unit/${{env.unit_tests}}
-          if-no-files-found: error
-          retention-days: 1
-          overwrite: false
-
-  tests-unit-run:
-    needs: [tests-unit-build]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        tag: [0, 1, 2, 3]
-    name: tests-unit-run-${{matrix.tag}}
-    env:
-      unit_tests: ${{inputs.par && 'punit_tests' || 'unit_tests'}}
-      np: ${{inputs.par && '_np=2' || ''}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/sanitize/restore
-        id: restore
-        with:
-          par: ${{inputs.par}}
-          sanitizer: ${{inputs.sanitizer}}
-          cache-path: mfem/build/tests/unit/${{env.unit_tests}}
-      - uses: actions/download-artifact@v4
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        with:
-          name: tests-${{inputs.par}}-${{inputs.sanitizer}}
-          path: mfem/build/tests/unit
-      - name: Split Unit Tests
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build/tests/unit
-        run: |
-          chmod 755 ${{env.unit_tests}}
-          ./${{env.unit_tests}} --list-test-names-only | tail -n +2 > list-test-names
-          shuf list-test-names -o list-test-names
-          split --verbose -n l/4 -d -a 1 list-test-names list-test-names-
-      - name: Cat Unit Tests ${{matrix.tag}}
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build/tests/unit
-        run: cat list-test-names-${{matrix.tag}}
-      - name: Run Unit Tests ${{matrix.tag}}
-        if: ${{steps.restore.outputs.cache-hit != 'true'}}
-        working-directory: mfem/build
-        run: |
-          ${{env.CTEST}} tests/unit -R "${{env.unit_tests}}${{env.np}}" --show-only
-          ${{env.CTEST}} tests/unit -R "${{env.unit_tests}}${{env.np}}"
@@ -1,73 +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.
---
-name: Sanitizers
-
-permissions:
-  actions: write
-
-on:
-  push:
-    branches: ["master", "next"]
-  pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{github.workflow}}-${{github.ref}}
-  cancel-in-progress: true
-
-jobs:
-
-  # Build steps for dependencies
-  build-hypre:
-    uses: ./.github/workflows/sanitize-build-hypre.yml
-
-  build-metis:
-    uses: ./.github/workflows/sanitize-build-metis.yml
-
-  build-lsan:
-    uses: ./.github/workflows/sanitize-build-lsan.yml
-
-  build-libcxx:
-    uses: ./.github/workflows/sanitize-build-libcxx.yml
-
-  # Serial sanitizers: asan, msan, ubsan
-  seq-asan:
-    needs: [build-libcxx]
-    uses: ./.github/workflows/sanitize-tests.yml
-    with:
-      sanitizer: asan
-
-  seq-msan:
-    needs: [build-libcxx]
-    uses: ./.github/workflows/sanitize-tests.yml
-    with:
-      sanitizer: msan
-
-  seq-ubsan:
-    needs: [build-libcxx]
-    uses: ./.github/workflows/sanitize-tests.yml
-    with:
-      sanitizer: ubsan
-
-  # Parallel sanitizers: asan, ubsan
-  par-asan:
-    needs: [build-libcxx, build-hypre, build-metis]
-    uses: ./.github/workflows/sanitize-tests.yml
-    with:
-      par: true
-      sanitizer: asan
-  par-ubsan:
-    needs: [build-libcxx, build-hypre, build-metis]
-    uses: ./.github/workflows/sanitize-tests.yml
-    with:
-      par: true
-      sanitizer: ubsan
@@ -201,9 +201,6 @@ examples/superlu/sol.*
 miniapps/adjoint/cvsRoberts_ASAi_dns
 miniapps/adjoint/adjoint_advection_diffusion

-miniapps/dfem/dfem-minimal-surface
-miniapps/dfem/dfem-minimal-surface-output
-
 miniapps/electromagnetics/volta
 miniapps/electromagnetics/tesla
 miniapps/electromagnetics/maxwell
@@ -232,7 +229,6 @@ miniapps/meshing/fit-node-position
 miniapps/meshing/trimmer
 miniapps/meshing/reflector
 miniapps/meshing/ref321
-miniapps/meshing/mesh-bounding-boxes
 miniapps/meshing/mesh-optimizer
 miniapps/meshing/pmesh-optimizer
 miniapps/meshing/pmesh-fitting
@@ -263,8 +259,6 @@ miniapps/meshing/mesh.*
 miniapps/meshing/order.*
 miniapps/meshing/sol.*
 miniapps/meshing/refined.mesh
-miniapps/meshing/bounding-box*
-miniapps/meshing/jacobian-determinant*

 miniapps/mtop/parheat
 miniapps/mtop/ParHeat*
@@ -300,7 +294,6 @@ miniapps/nurbs/nurbs_solenoidal
 miniapps/nurbs/nurbs_printfunc
 miniapps/nurbs/nurbs_patch_ex1
 miniapps/nurbs/nurbs_curveint
-miniapps/nurbs/nurbs_surface
 miniapps/nurbs/refined.mesh
 miniapps/nurbs/mesh.*
 miniapps/nurbs/sol_?.gf
@@ -319,7 +312,6 @@ miniapps/nurbs/nurbs_naca_cmesh
 miniapps/nurbs/naca-cmesh.mesh
 miniapps/nurbs/glvis_naca-cmesh.mesh
 miniapps/nurbs/Naca_cmesh
-miniapps/nurbs/*-Surface.mesh

 miniapps/performance/ex1
 miniapps/performance/ex1p
@@ -341,7 +333,6 @@ miniapps/shifted/lsf_integral
 miniapps/tools/display-basis
 miniapps/tools/load-dc
 miniapps/tools/convert-dc
-miniapps/tools/gridfunction-bounds
 miniapps/tools/lor-transfer
 miniapps/tools/plor-transfer
 miniapps/tools/get-values
@@ -408,15 +399,12 @@ miniapps/spde/ParaView

 miniapps/tribol/contact-patch-test

-miniapps/diag-smoothers/abs-l1-jacobi
-miniapps/diag-smoothers/mg-abs-l1-jacobi
-
 # Unit test binary and outputs
 tests/unit/output_meshes
 tests/unit/unit_tests
 tests/unit/punit_tests
-tests/unit/gpu_unit_tests
-tests/unit/pgpu_unit_tests
+tests/unit/cunit_tests
+tests/unit/pcunit_tests
 tests/unit/sedov_tests_*
 tests/unit/psedov_tests_*
 tests/unit/tmop_pa_tests_*
@@ -11,70 +11,6 @@
 Version 4.8.1 (development)
 ===========================

-Starting with this version, MFEM requires a C++17 compiler.
-
-Discretization improvements
---------------------------
- Introduced dFEM: a new MFEM capability for Automatic Differentiation (AD) of
-  nonlinear finite element operators, based on Enzyme or dual numbers AD at
-  quadrature points. These features are part of the new mfem::future namespace
-  and some of the API can change in the future. See the new dFEM minimal surface
-  miniapp in the miniapps/dfem/ directory for illustration of dFEM's use.
-
- Using Enzyme for AD in MFEM is tested with clang v19 and requires clang/LLVM
-  built with plugin support. See INSTALL for more details.
-
- In the ParMoonolith integration, added support for variational resampling of
-  H1 vector fields.
-
-Meshing improvements
--------------------
-
- Added support for higher order meshes in Mesh::MakeSimplicial and
-  ParMesh::MakeSimplicial.
-
- Added a new miniapp for interpolating a surface grid of points in 3D using a
-  smooth NURBS surface, that can then be sampled at arbitrary resolution while
-  staying close to the original geometry. See miniapps/nurbs/nurbs_surface.
-
-GPU computing
-------------
- The function Vector::SetSubVector(const Array<int> &, const real_t) now
-  executes on device if either the vector or the array have the device flag
-  set. This is most often used for setting constant essential boundary
-  conditions. A new function Vector::SetSubVectorHost has been added in cases
-  where host execution is always needed (e.g. when the DOFs array is small).
- Introduced MFEM_FOREACH_THREAD_DIRECT, which directly maps loop tasks to GPU
-  threads, assigning one task per thread.
-
-New and updated examples and miniapps
-------------------------------------
- Added miniapps to demonstrate an implementation of the absolute-value
-  L(1)-Jacobi preconditioners in partially assembled operators. This includes
-  Multigrid wrapper to demonstrate the effectiveness of these Jacobi-type
-  operators as smoothers.
-  These miniapps can be found in `miniapps/diag-smoothers`.
-
-API changes
-----------
- mfem::internal::tensor and mfem::internal::dual have been moved to
-  mfem::future::tensor and mfem::future::dual.
- API addition: in class `Operator`, added virtual functions: `AbsMult`, and
-  `AbsMultTranspose`; in class `Vector`, added `Abs` and `Pow`.
-
-Miscellaneous
-------------
- Added the "gpu", "raja-gpu", and "ceed-gpu" backend aliases/shortcuts which
-  automatically select between CUDA or HIP.
- The CUDA-specific names used by some of the unit tests like 'cunit_tests' and
-  'pcunit_tests' were replaced by names using 'gpu' instead of 'c' (short for
-  CUDA) or 'cuda'. These tests automatically run the CUDA/HIP tests based on the
-  MFEM build configuration.
- Added the option to enable GPU-aware MPI in MFEM using the environment
-  variable 'MFEM_GPU_AWARE_MPI' set to any value. Setting this environment
-  variable is an alternative to calling 'Device::SetGPUAwareMPI(true)'.
- Added parallel Address Sanitizer, serial and parallel Undefined Behavior
-  Sanitizer and serial Memory Sanitizer GitHub actions tests on Ubuntu.

 Version 4.8, released on Apr 9, 2025
 ====================================
@@ -18,8 +18,8 @@ message(STATUS "CMake version: ${CMAKE_VERSION}")
 set(USER_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/config/user.cmake" CACHE PATH
  "Path to optional user configuration file.")

-# Require C++17 and disable compiler-specific extensions
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use.")
+# Require C++11 and disable compiler-specific extensions
+set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use.")
 set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL
  "Force the use of the chosen C++ standard.")
 set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Enable C++ standard extensions.")
@@ -133,6 +133,7 @@ if (MFEM_USE_CUDA)
   if (NOT CMAKE_CUDA_HOST_COMPILER)
      set(CMAKE_CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER})
   endif()
+   set(CUDA_FLAGS "--expt-extended-lambda")
   if (CMAKE_VERSION VERSION_LESS 3.18.0)
      set(CUDA_FLAGS "-arch=${CUDA_ARCH} ${CUDA_FLAGS}")
   elseif (NOT CMAKE_CUDA_ARCHITECTURES)
@@ -147,20 +148,6 @@ if (MFEM_USE_CUDA)
   endif()
   message(STATUS "Using CUDA architecture: ${CUDA_ARCH}")
   enable_language(CUDA)
-   if (CMAKE_VERSION VERSION_LESS 3.18.0)
-     # backup try to detect if this is clang or nvcc
-     if(CMAKE_CUDA_COMPILER MATCHES "nvcc$")
-       # nvcc
-       set(MFEM_CUDA_COMPILER_IS_NVCC ON)
-       set(CUDA_FLAGS "${CUDA_FLAGS} --expt-extended-lambda --expt-relaxed-constexpr")
-     endif()
-   else()
-     if (CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
-       # nvcc
-       set(MFEM_CUDA_COMPILER_IS_NVCC ON)
-       set(CUDA_FLAGS "${CUDA_FLAGS} --expt-extended-lambda --expt-relaxed-constexpr")
-     endif()
-   endif()
   set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD} CACHE STRING
      "CUDA standard to use.")
   set(CMAKE_CUDA_STANDARD_REQUIRED ON CACHE BOOL
@@ -269,11 +256,7 @@ if (MFEM_USE_OPENMP OR MFEM_USE_LEGACY_OPENMP)
  if (OPENMP_FOUND)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
    if (MFEM_USE_CUDA)
-      if(MFEM_CUDA_COMPILER_IS_NVCC)
-        set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler=${OpenMP_CXX_FLAGS}")
-      else()
-        set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} ${OpenMP_CXX_FLAGS}")
-      endif()
+      set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler=${OpenMP_CXX_FLAGS}")
    endif()
  endif()
 endif()
@@ -405,11 +388,6 @@ if (MFEM_USE_GSLIB)
  find_package(GSLIB REQUIRED)
 endif()

-# HDF5
-if (MFEM_USE_HDF5)
-  find_package(HDF5 REQUIRED)
-endif()
-
 # NetCDF
 if (MFEM_USE_NETCDF)
  find_package(NetCDF REQUIRED)
@@ -549,10 +527,9 @@ if (MFEM_USE_TRIBOL)
  endif()
 endif()

+# Enzyme
 if (MFEM_USE_ENZYME)
-    find_package(Enzyme REQUIRED HINTS ${ENZYME_DIR})
-    message(STATUS "Enzyme found in ${ENZYME_DIR}.")
-    set(ENZYME_INCLUDE_DIRS ${ENZYME_DIR}/include)
+   find_package(ENZYME REQUIRED)
 endif()

 # MFEM_TIMER_TYPE
@@ -592,7 +569,7 @@ find_package(Threads REQUIRED)
 #    integers, the METIS header (with 32-bit indices, as used by mfem) needs to
 #    be before SuiteSparse.
 set(MFEM_TPLS OPENMP HYPRE LAPACK BLAS SuperLUDist STRUMPACK METIS SuiteSparse
-    SUNDIALS PETSC SLEPC MUMPS AXOM FMS CONDUIT Ginkgo GNUTLS GSLIB HDF5
+    SUNDIALS PETSC SLEPC MUMPS AXOM FMS CONDUIT Ginkgo GNUTLS GSLIB
    NETCDF MPFR PUMI HIOP POSIXCLOCKS MFEMBacktrace ZLIB OCCA CEED RAJA UMPIRE
    ADIOS2 MKL_CPARDISO MKL_PARDISO AMGX MAGMA CUSPARSE CUBLAS CALIPER CODIPACK
    BENCHMARK PARELAG TRIBOL MPI_CXX HIP HIPBLAS HIPSPARSE MOONOLITH BLITZ
@@ -704,9 +681,6 @@ if (MFEM_USE_MPI)
    target_link_libraries(mfem PUBLIC ${MPI_CXX_LINK_FLAGS})
  endif()
 endif()
-if (MFEM_USE_ENZYME)
-  target_link_libraries(mfem PUBLIC ClangEnzymeFlags)
-endif()

 set_target_properties(mfem PROPERTIES VERSION "${mfem_VERSION}")
 set_target_properties(mfem PROPERTIES SOVERSION "${mfem_VERSION}")
@@ -120,7 +120,6 @@ The MFEM source code has the following structure:
  |   └── superlu
  ├── fem
  │   ├── ceed
-  │   ├── dfem
  │   ├── eltrans
  │   ├── fe
  │   ├── gslib
@@ -139,7 +138,6 @@ The MFEM source code has the following structure:
  │   ├── adjoint
  │   ├── autodiff
  │   ├── common
-  │   ├── dfem
  │   ├── dpg
  │   ├── electromagnetics
  │   ├── gslib
@@ -551,8 +549,6 @@ Before a PR can be merged, it should satisfy the following:
      - [ ] Add a short description of the example in the "Extensive Examples" section of `features.md`.
 - [ ] New miniapps:
   - [ ] All sample runs at the top of the miniapp source file work.
-   - [ ] Add to internal testing repo, if sample runs should be included in nightly tests [internally](#tests-at-llnl).
-   - [ ] Exclude long sample runs from automated testing, with `* ` (one space) before the command.
   - [ ] Update top-level `makefile` and `makefile` in corresponding miniapp directory.
   - [ ] Add the miniapp binary and any files generated by it to the top-level `.gitignore` file.
   - [ ] Update CMake build system:
@@ -747,7 +743,7 @@ and debug build is performed with a simple run of `ex1` to verify the executable
 - We mirror the `master` and `next` branches internally (to `gh-master` and
  `gh-next`) and run longer nightly tests via cron. On the weekends, a more
  extensive test is run which extracts and executes all the different sample
-  runs from each example and most miniapps.
+  runs from each example.

 - We also mirror PRs on the LLNL GitLab instance. PR mirroring can only be
  triggered by _LLNL developers_, but test status is publicly available. Only
@@ -263,7 +263,7 @@ See the configuration file config/defaults.mk for the default settings.
 Compilers:
   CXX      - C++ compiler, serial build
   MPICXX   - MPI C++ compiler, parallel build
-   CUDA_CXX - The CUDA compiler, 'nvcc' or 'clang++'
+   CUDA_CXX - The CUDA compiler, 'nvcc'

 Compiler options:
   OPTIM_FLAGS - Options for optimized build
@@ -423,10 +423,6 @@ MFEM_USE_GNUTLS = YES/NO
   When MFEM_USE_GNUTLS is enabled, the additional build options, GNUTLS_*, are
   also used, see below.

-MFEM_USE_HDF5 = YES/NO
-   The HDF5 library is used for input and output of HDF5 files, for example
-   Cubit mesh files or VTKHDF files for ParaView.
-
 MFEM_USE_NETCDF = YES/NO
   NetCDF is the library that is used by the SNL Cubit mesh generator to create
   Genesis mesh files. This option enables a reader for these files, which
@@ -608,12 +604,11 @@ MFEM_USE_TRIBOL = YES/NO

 MFEM_USE_ENZYME = YES/NO
   Enables automatic differentiation support through the LLVM plugin Enzyme.
-   This requires the compiler to be set to clang (>=14.0.0). We also advise the
-   use of the link time optimization (LTO) plugin, so functions defined over
-   multiple files (compilation units) can be differentiated automatically. This
-   requires to also use LLVM/LLD for linking. The recommended options are in
-   config/defaults.mk. For more detailed instructions, see the section "Specific
-   options for Enzyme" below.
+   This requires the compiler to be set to clang (>=14.0.0). We also advise to
+   use the link time optimization (LTO) plugin, to enable functions that you
+   define over multiple files (compilation units) and want to be differentiated
+   automatically, to work. This requires to also use LLVM/LLD for linking.
+   Recommended options are in config/defaults.mk.

 MFEM_BUILD_TAG = (any value)
   An optional tag to characterize the build. Exported to config/config.mk.
@@ -738,9 +733,6 @@ The specific libraries and their options are:
  Options: GNUTLS_OPT, GNUTLS_LIB.
  Versions: GnuTLS >= 2.12.0, older versions may work too.

- HDF5 (optional), used when MFEM_USE_HDF5 = YES, required for reading and
-  writing files in VTKHDF format.
-
 - NetCDF (optional), used when MFEM_USE_NETCDF = YES, required for reading Cubit
  mesh files. Also requires installation of HDF5 and ZLIB, as explained at the
  NetCDF web site. Note that we use the plain vanilla "C" version of NetCDF, you
@@ -836,7 +828,7 @@ The specific libraries and their options are:

 - CUDA (optional), used when MFEM_USE_CUDA = YES.
  URL: https://developer.nvidia.com/cuda-toolkit
-  Options: CUDA_CXX, CUDA_ARCH, CUDA_OPT, CUDA_LIB, CUDA_DIR (when CUDA_CXX=clang++).
+  Options: CUDA_CXX, CUDA_ARCH, CUDA_OPT, CUDA_LIB.
  Versions: CUDA >= 10.1.168.

 - HIP (optional), used when MFEM_USE_HIP = YES.
@@ -912,7 +904,7 @@ The specific libraries and their options are:
 - Enzyme, used when MFEM_USE_ENZYME = YES. Requires LLVM/Clang >= 14.0.0.
  URL: https://github.com/EnzymeAD/Enzyme
  Options: ENZYME_DIR, ENZYME_OPT, ENZYME_LIB.
-  Versions: Enzyme >= v0.0.176.
+  Versions: Enzyme >= v0.0.33.


 Building with CMake
@@ -1046,7 +1038,6 @@ MFEM_USE_STRUMPACK
 MFEM_USE_GINKGO
 MFEM_USE_AMGX
 MFEM_USE_GNUTLS
-MFEM_USE_HDF5
 MFEM_USE_NETCDF
 MFEM_USE_MPFR
 MFEM_USE_ZLIB
@@ -1191,73 +1182,3 @@ the older HIP C++ library build/linkage. To ensure proper build and linkage
 check that `CMAKE_CXX_COMPILER` and `CMAKE_HIP_COMPILER` are set to the same
 compiler. This is especially important when using an MPI compiler (for example
 crayCC) where some linker flags may get dropped if these two are not identical.
-
-Specific options for Enzyme
-===========================
-To work properly, MFEM and Enzyme need to use the same LLVM/Clang configuration.
-For example, on macOS this can be done by using Homebrew: first install Enzyme,
-which in turn installs LLVM as a dependency (as of May 2025, this is LLVM 19):
-
-   brew install enzyme
-
-In order to ensure the correct compiler choice for the MFEM makefile build, set
-
-   CXX = $(shell brew --prefix llvm@19)/bin/clang++
-
-in the user.mk file (adapted from config/defaults.mk, see the section "Building
-with GNU make" above). With MPI, it is convenient to set
-
-   MPICXX = OMPI_CXX=$(CXX) mpicxx
-
-for OpenMPI and
-
-   MPICXX = MPICH_CXX=$(CXX) mpicxx
-
-for MPICH.
-
-Additionally, the Enzyme directory needs to be set in user.mk as follows:
-
-   ENZYME_DIR = $(shell brew --prefix enzyme)
-
-Specifically, a full build on a Mac can be tested by adding the following
-user.mk file in the config/ directory
-
-   MFEM_USE_ENZYME = YES
-   ENZYME_DIR = $(shell brew --prefix enzyme)
-   LLVM_DIR = $(shell brew --prefix llvm@19)
-   CXX = $(LLVM_DIR)/bin/clang++
-   MFEM_USE_MPI = YES
-   MPICXX = OMPI_CXX=$(CXX) mpicxx
-
-and running
-
-   make config
-   make -j
-   cd miniapps/dfem
-   make
-   ./dfem-minimal-surface
-
-On Linux systems, for example Ubuntu 24.04, use the package manager to install
-the Enzyme dependencies
-
-   sudo apt install libclang-dev libzstd-dev llvm-dev clang
-
-and then clone and build Enzyme
-
-   cd $HOME
-   git clone https://github.com/EnzymeAD/Enzyme.git
-   cd Enzyme/enzyme && mkdir build && cd build
-   CC=clang CXX=clang++ cmake .. -DLLVM_DIR=/usr/lib/llvm-18/lib/cmake -DCMAKE_INSTALL_PREFIX=$HOME/Enzyme/enzyme/build
-   make -j
-   make install
-
-From here, one can proceed in the same way using the following user.mk settings
-
-   MFEM_USE_ENZYME = YES
-   ENZYME_DIR = $(HOME)/Enzyme/enzyme/build
-   CXX = clang++
-   MFEM_USE_MPI = YES
-   MPICXX = OMPI_CXX=$(CXX) mpicxx
-
-On other Linux systems the LLVM packages may have different names, for example
-on RHEL9, one needs to "sudo yum install llvm-devel libzstd clang-devel".
@@ -41,7 +41,6 @@ set(MFEM_USE_MAGMA @MFEM_USE_MAGMA@)
 set(MFEM_USE_HIOP @MFEM_USE_HIOP@)
 set(MFEM_USE_GNUTLS @MFEM_USE_GNUTLS@)
 set(MFEM_USE_GSLIB @MFEM_USE_GSLIB@)
-set(MFEM_USE_HDF5 @MFEM_USE_HDF5@)
 set(MFEM_USE_NETCDF @MFEM_USE_NETCDF@)
 set(MFEM_USE_PETSC @MFEM_USE_PETSC@)
 set(MFEM_USE_SLEPC @MFEM_USE_SLEPC@)
@@ -132,9 +132,6 @@
 // Enable Conduit support.
 #cmakedefine MFEM_USE_CONDUIT

-// Enable functionality based on the HDF5 library (reading VTKHDF files).
-#cmakedefine MFEM_USE_HDF5
-
 // Enable functionality based on the NetCDF library (reading CUBIT files).
 #cmakedefine MFEM_USE_NETCDF

@@ -0,0 +1,27 @@
+# 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.
+
+message(STATUS "Looking for ENZYME ...")
+message(STATUS "   in ENZYME_DIR = ${ENZYME_DIR}")
+
+# Make sure the directory and version combination works. Do nothing otherwise.
+if(EXISTS "${ENZYME_DIR}/ClangEnzyme-${ENZYME_VERSION}.so")
+  message(STATUS "Found ENZYME: ${ENZYME_DIR}/ClangEnzyme-${ENZYME_VERSION}.so")
+
+  # Set ENZYME_FOUND
+  set(ENZYME_FOUND TRUE CACHE BOOL "ENZYME was found." FORCE)
+
+  # Set CXX flags to accommodate the Enzyme Clang plugin
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -load -Xclang ${ENZYME_DIR}/ClangEnzyme-${ENZYME_VERSION}.so -mllvm -enzyme-loose-types=1")
+  set(MFEM_USE_ENZYME YES)
+else()
+
+endif()
@@ -86,9 +86,8 @@ if (HYPRE_FOUND AND HYPRE_USING_CUDA)
  mfem_culib_set_libraries(CUSPARSE cusparse)
  mfem_culib_set_libraries(CURAND curand)
  mfem_culib_set_libraries(CUBLAS cublas)
-  mfem_culib_set_libraries(CUSOLVER cusolver)
  list(APPEND HYPRE_LIBRARIES ${CUSPARSE_LIBRARIES} ${CURAND_LIBRARIES}
-       ${CUBLAS_LIBRARIES} ${CUSOLVER_LIBRARIES})
+       ${CUBLAS_LIBRARIES})
  set(HYPRE_LIBRARIES ${HYPRE_LIBRARIES} CACHE STRING
      "HYPRE libraries + dependencies." FORCE)
  message(STATUS "Updated HYPRE_LIBRARIES: ${HYPRE_LIBRARIES}")
@@ -125,9 +125,7 @@ macro(add_mfem_miniapp MFEM_EXE_NAME)
  if (MFEM_USE_CUDA)
    set_source_files_properties(${MAIN_LIST} ${EXTRA_SOURCES_LIST}
      PROPERTIES LANGUAGE CUDA)
-    if (MFEM_CUDA_COMPILER_IS_NVCC)
-      list(TRANSFORM EXTRA_OPTIONS_LIST PREPEND "-Xcompiler=")
-    endif()
+    list(TRANSFORM EXTRA_OPTIONS_LIST PREPEND "-Xcompiler=")
  endif()

  # Actually add the executable
@@ -879,8 +877,7 @@ function(mfem_export_mk_files)
      MFEM_USE_OCCA MFEM_USE_CEED MFEM_USE_CALIPER MFEM_USE_UMPIRE MFEM_USE_SIMD
      MFEM_USE_ADIOS2 MFEM_USE_MKL_CPARDISO MFEM_USE_MKL_PARDISO
      MFEM_USE_ADFORWARD MFEM_USE_CODIPACK MFEM_USE_BENCHMARK MFEM_USE_PARELAG
-      MFEM_USE_TRIBOL MFEM_USE_MOONOLITH MFEM_USE_ALGOIM MFEM_USE_ENZYME
-      MFEM_USE_HDF5)
+      MFEM_USE_TRIBOL MFEM_USE_MOONOLITH MFEM_USE_ALGOIM MFEM_USE_ENZYME)
  foreach(var ${CONFIG_MK_BOOL_VARS})
    if (${var})
      set(${var} YES)
@@ -93,17 +93,17 @@ macro (RESOLVE_LIBRARIES LIBS LINK_LINE)
        set (_directory_list ${_directory_list} ${libpath})
        set (token ${libname})
      endif (token MATCHES "^/")
-      set (_lib "NOTFOUND")
+      set (_lib "NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
      find_library (_lib ${token} HINTS ${_directory_list} ${_root})
      if (_lib)
-        string (REPLACE "//" "/" _lib ${_lib})
+	string (REPLACE "//" "/" _lib ${_lib})
        list (APPEND _libs_found ${_lib})
      else (_lib)
        message (STATUS "Unable to find library ${token}")
      endif (_lib)
-      unset(_lib CACHE)
    endif (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
  endforeach (token)
+  set (_lib "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE)
  # only the LAST occurrence of each library is required since there should be no circular dependencies
  if (_libs_found)
    list (REVERSE _libs_found)
@@ -132,9 +132,6 @@
 // Enable Conduit support.
 // #define MFEM_USE_CONDUIT

-// Enable functionality based on the HDF5 library
-// #define MFEM_USE_HDF5
-
 // Enable functionality based on the NetCDF library (reading CUBIT files).
 // #define MFEM_USE_NETCDF

@@ -40,7 +40,6 @@ MFEM_USE_GINKGO        = @MFEM_USE_GINKGO@
 MFEM_USE_AMGX          = @MFEM_USE_AMGX@
 MFEM_USE_MAGMA         = @MFEM_USE_MAGMA@
 MFEM_USE_GNUTLS        = @MFEM_USE_GNUTLS@
-MFEM_USE_HDF5          = @MFEM_USE_HDF5@
 MFEM_USE_NETCDF        = @MFEM_USE_NETCDF@
 MFEM_USE_PETSC         = @MFEM_USE_PETSC@
 MFEM_USE_SLEPC         = @MFEM_USE_SLEPC@
@@ -98,7 +97,7 @@ MFEM_MPIEXEC_NP = @MFEM_MPIEXEC_NP@
 MFEM_MPI_NP     = @MFEM_MPI_NP@

 # The NVCC compiler cannot link with -x=cu
-MFEM_LINK_FLAGS := $(filter-out -x=cu -xcuda -xhip, $(MFEM_FLAGS))
+MFEM_LINK_FLAGS := $(filter-out -x=cu -xhip, $(MFEM_FLAGS))

 # Optional extra configuration
@MFEM_CONFIG_EXTRA@
@@ -43,7 +43,6 @@ option(MFEM_USE_AMGX "Enable AmgX usage" OFF)
 option(MFEM_USE_MAGMA "Enable MAGMA usage" OFF)
 option(MFEM_USE_GNUTLS "Enable GNUTLS usage" OFF)
 option(MFEM_USE_GSLIB "Enable GSLIB usage" OFF)
-option(MFEM_USE_HDF5 "Enable HDF5 usage" OFF)
 option(MFEM_USE_NETCDF "Enable NETCDF usage" OFF)
 option(MFEM_USE_PETSC "Enable PETSc support." OFF)
 option(MFEM_USE_SLEPC "Enable SLEPc support." OFF)
@@ -268,8 +267,6 @@ set(TRIBOL_DIR "${MFEM_DIR}/../tribol" CACHE PATH "Path to Tribol")
 set(Tribol_REQUIRED_PACKAGES "Axom/core/mint/slam/slic" CACHE STRING
    "Additional packages required by Tribol")

-set(ENZYME_DIR "${MFEM_DIR}/../enzyme" CACHE PATH "Path to Enzyme")
-
 set(BLAS_INCLUDE_DIRS "" CACHE STRING "Path to BLAS headers.")
 set(BLAS_LIBRARIES "" CACHE STRING "The BLAS library.")
 set(LAPACK_INCLUDE_DIRS "" CACHE STRING "Path to LAPACK headers.")
@@ -24,7 +24,7 @@ EGREP_BIN = $(shell command -v egrep 2> /dev/null)
 CXX = g++
 MPICXX = mpicxx

-BASE_FLAGS  = -std=c++17
+BASE_FLAGS  = -std=c++11
 OPTIM_FLAGS = -O3 $(BASE_FLAGS)
 DEBUG_FLAGS = -g $(XCOMPILER)-Wall $(BASE_FLAGS)

@@ -43,23 +43,12 @@ SHARED = NO

 # CUDA configuration options
 #
-# If you set MFEM_USE_ENZYME=YES, must use CUDA_CXX=clang++
+# If you set MFEM_USE_ENZYME=YES, CUDA_CXX has to be configured to use cuda with
+# clang as its host compiler.
 CUDA_CXX = nvcc
 CUDA_ARCH = sm_60
-# Base CUDA install directory, only needed if building with clang+cuda:
-# The default setting is:
-# 1. If CUDA_HOME is defined and non-empty, use that.
-# 2. If nvcc is in the path, use the directory two levels up from that.
-# 3. Use /usr/local/cuda
-CUDA_DIR = $(or $(CUDA_HOME),$(patsubst %/,%,$(dir \
- $(patsubst %/,%,$(dir $(shell command -v nvcc))))),/usr/local/cuda)
-# flags for clang+cuda
-CLANG_CUDA_FLAGS = -xcuda --cuda-path=$(CUDA_DIR) --cuda-gpu-arch=$(CUDA_ARCH)
-# flags for nvcc
-NVCC_FLAGS = -x=cu --expt-extended-lambda --expt-relaxed-constexpr \
- -arch=$(CUDA_ARCH)
-# Prefixes for passing flags to the host compiler and linker when using
-# CUDA_CXX=nvcc
+CUDA_FLAGS = -x=cu --expt-extended-lambda -arch=$(CUDA_ARCH)
+# Prefixes for passing flags to the host compiler and linker when using CUDA_CXX
 CUDA_XCOMPILER = -Xcompiler=
 CUDA_XLINKER   = -Xlinker=

@@ -156,7 +145,6 @@ MFEM_USE_GINKGO        = NO
 MFEM_USE_AMGX          = NO
 MFEM_USE_MAGMA         = NO
 MFEM_USE_GNUTLS        = NO
-MFEM_USE_HDF5          = NO
 MFEM_USE_NETCDF        = NO
 MFEM_USE_PETSC         = NO
 MFEM_USE_SLEPC         = NO
@@ -238,7 +226,7 @@ HYPRE_OPT = -I$(HYPRE_DIR)/include
 HYPRE_LIB = -L$(HYPRE_DIR)/lib -lHYPRE
 ifeq (YES,$(MFEM_USE_CUDA))
   # This is only necessary when hypre is built with cuda:
-   HYPRE_LIB += -lcusolver -lcusparse -lcurand -lcublas
+   HYPRE_LIB += -lcusparse -lcurand -lcublas
 endif
 ifeq (YES,$(MFEM_USE_HIP))
   # This is only necessary when hypre is built with hip:
@@ -253,7 +241,7 @@ ifeq ($(MFEM_USE_SUPERLU)$(MFEM_USE_STRUMPACK)$(MFEM_USE_MUMPS),NONONO)
     METIS_OPT =
     METIS_LIB = -L$(METIS_DIR) -lmetis
   else
-     METIS_DIR = @MFEM_DIR@/../metis-5.1.0
+     METIS_DIR = @MFEM_DIR@/../metis-5.0
     METIS_OPT = -I$(METIS_DIR)/include
     METIS_LIB = -L$(METIS_DIR)/lib -lmetis
   endif
@@ -413,14 +401,9 @@ MAGMA_LIB = -L$(MAGMA_DIR)/lib -l:libmagma.a -lcublas -lcusparse $(LAPACK_LIB)
 GNUTLS_OPT =
 GNUTLS_LIB = -lgnutls

-# HDF5 library configuration
-HDF5_DIR   = $(HOME)/local
-HDF5_OPT = -I$(HDF5_DIR)/include
-HDF5_LIB = $(XLINKER)-rpath,$(HDF5_DIR)/lib -L$(HDF5_DIR)/lib -lhdf5_hl -lhdf5 \
-           $(ZLIB_LIB)
-
 # NetCDF library configuration
 NETCDF_DIR = $(HOME)/local
+HDF5_DIR   = $(HOME)/local
 NETCDF_OPT = -I$(NETCDF_DIR)/include -I$(HDF5_DIR)/include $(ZLIB_OPT)
 NETCDF_LIB = $(XLINKER)-rpath,$(NETCDF_DIR)/lib -L$(NETCDF_DIR)/lib\
 $(XLINKER)-rpath,$(HDF5_DIR)/lib -L$(HDF5_DIR)/lib\
@@ -522,9 +505,6 @@ GSLIB_LIB = -L$(GSLIB_DIR)/lib -lgs
 # CUDA library configuration
 CUDA_OPT =
 CUDA_LIB = -lcusparse -lcublas
-CLANG_CUDA_LIB = -L$(CUDA_DIR)/lib64 -L$(CUDA_DIR)/lib \
- $(XLINKER)-rpath,$(CUDA_DIR)/lib64,-rpath,$(CUDA_DIR)/lib \
- -lcudart -ldl -lrt -pthread

 # HIP library configuration
 HIP_OPT =
@@ -624,20 +604,29 @@ TRIBOL_LIB = -L$(TRIBOL_DIR)/lib -ltribol -lredecomp -L$(AXOM_DIR)/lib -laxom_mi
   -laxom_slam -laxom_slic -laxom_core

 # Enzyme configuration
-ENZYME_DIR = @MFEM_DIR@/../enzyme
-ENZYME_PLUGIN = $(abspath $(wildcard $(subst \
-   @MFEM_DIR@,$(MFEM_DIR),$(ENZYME_DIR))/lib/ClangEnzyme-*.$(SO_EXT)))
-ifeq ($(MAKECMDGOALS)-$(MFEM_USE_ENZYME),config-YES)
-   ifeq ($(ENZYME_PLUGIN),)
-      $(error Unable to find the Enzyme pluging! Please set ENZYME_DIR)
-   endif
-   ifneq ($(words $(ENZYME_PLUGIN)),1)
-      $(error Multiple versions of the Enzyme pluging found! \
-              Please set ENZYME_PLUGIN directly)
-   endif
+
+# If you want to enable automatic differentiation at compile time, use the
+# options below, adapted to your configuration. To be more flexible, we
+# recommend using the Enzyme plugin during link time optimization. One option is
+# to add your options to the global compiler/linker flags like
+#
+# BASE_FLAGS += -flto
+# CXX_XLINKER += -fuse-ld=lld -Wl,--lto-legacy-pass-manager\
+#                -Wl,-mllvm=-load=$(ENZYME_DIR)/LLDEnzyme-$(ENZYME_VERSION).so -Wl,
+#
+ENZYME_DIR ?= @MFEM_DIR@/../enzyme
+ENZYME_VERSION ?= 14
+ENZYME_OPT = -fno-experimental-new-pass-manager -Xclang -load -Xclang $(ENZYME_DIR)/ClangEnzyme-$(ENZYME_VERSION).so
+ENZYME_LIB = ""
+
+# Google Benchmark, SUNDIALS >= 6.4.0, STRUMPACK, RAJA, UMPIRE, and Tribol require C++14:
+ifneq ($(filter YES,$(MFEM_USE_BENCHMARK) $(MFEM_USE_SUNDIALS) $(MFEM_USE_STRUMPACK) $(MFEM_USE_RAJA) $(MFEM_USE_UMPIRE) $(MFEM_USE_TRIBOL)),)
+    BASE_FLAGS = -std=c++14
+endif
+# Ginkgo requires C++17:
+ifeq ($(MFEM_USE_GINKGO),YES)
+   BASE_FLAGS = -std=c++17
 endif
-ENZYME_OPT = -fplugin=$(ENZYME_PLUGIN)
-ENZYME_LIB =

 # If YES, enable some informational messages
 VERBOSE = NO
@@ -115,7 +115,7 @@ vertices

 nodes
 FiniteElementSpace
-FiniteElementCollection: H1_3D_P2
+FiniteElementCollection: Quadratic
 VDim: 3
 Ordering: 0

@@ -56,7 +56,7 @@ vertices

 nodes
 FiniteElementSpace
-FiniteElementCollection: H1_3D_P2
+FiniteElementCollection: Quadratic
 VDim: 3
 Ordering: 0

@@ -227,7 +227,7 @@ vertices

 nodes
 FiniteElementSpace
-FiniteElementCollection: H1_2D_P2
+FiniteElementCollection: Quadratic
 VDim: 2
 Ordering: 0

@@ -65,7 +65,7 @@ vertices

 nodes
 FiniteElementSpace
-FiniteElementCollection: H1_2D_P2
+FiniteElementCollection: Quadratic
 VDim: 2
 Ordering: 0

@@ -951,7 +951,6 @@ INPUT                  = @MFEM_SOURCE_DIR@/doc/CodeDocumentation.dox \
                         @MFEM_SOURCE_DIR@/fem/ceed/integrators/nlconvection \
                         @MFEM_SOURCE_DIR@/fem/ceed/interface \
                         @MFEM_SOURCE_DIR@/fem/ceed/solvers \
-                         @MFEM_SOURCE_DIR@/fem/dfem \
                         @MFEM_SOURCE_DIR@/fem/eltrans \
                         @MFEM_SOURCE_DIR@/fem/fe \
                         @MFEM_SOURCE_DIR@/fem/gslib \
@@ -973,7 +972,6 @@ INPUT                  = @MFEM_SOURCE_DIR@/doc/CodeDocumentation.dox \
                         @MFEM_SOURCE_DIR@/miniapps/adjoint \
                         @MFEM_SOURCE_DIR@/miniapps/autodiff \
                         @MFEM_SOURCE_DIR@/miniapps/common \
-                         @MFEM_SOURCE_DIR@/miniapps/dfem \
                         @MFEM_SOURCE_DIR@/miniapps/dpg \
                         @MFEM_SOURCE_DIR@/miniapps/dpg/util \
                         @MFEM_SOURCE_DIR@/miniapps/electromagnetics \
@@ -62,9 +62,14 @@ static real_t epsilon_ = 1.0;
 static real_t sigma_ = 20.0;
 static real_t omega_ = 10.0;

-complex<real_t> u0_exact(const Vector &x);
-void u1_exact(const Vector &, ComplexVector &);
-void u2_exact(const Vector &, ComplexVector &);
+real_t u0_real_exact(const Vector &);
+real_t u0_imag_exact(const Vector &);
+
+void u1_real_exact(const Vector &, Vector &);
+void u1_imag_exact(const Vector &, Vector &);
+
+void u2_real_exact(const Vector &, Vector &);
+void u2_imag_exact(const Vector &, Vector &);

 bool check_for_inline_mesh(const char * mesh_file);

@@ -210,48 +215,54 @@ int main(int argc, char *argv[])
   ComplexGridFunction * u_exact = NULL;
   if (exact_sol) { u_exact = new ComplexGridFunction(fespace); }

-   ComplexFunctionCoefficient u0(u0_exact);
-   ComplexVectorFunctionCoefficient u1(dim, u1_exact);
-   ComplexVectorFunctionCoefficient u2(dim, u2_exact);
+   FunctionCoefficient u0_r(u0_real_exact);
+   FunctionCoefficient u0_i(u0_imag_exact);
+   VectorFunctionCoefficient u1_r(dim, u1_real_exact);
+   VectorFunctionCoefficient u1_i(dim, u1_imag_exact);
+   VectorFunctionCoefficient u2_r(dim, u2_real_exact);
+   VectorFunctionCoefficient u2_i(dim, u2_imag_exact);

-   ComplexConstantCoefficient oneCoef(1.0);
+   ConstantCoefficient zeroCoef(0.0);
+   ConstantCoefficient oneCoef(1.0);

+   Vector zeroVec(dim); zeroVec = 0.0;
   Vector  oneVec(dim);  oneVec = 0.0; oneVec[(prob==2)?(dim-1):0] = 1.0;
-   ComplexVectorConstantCoefficient oneVecCoef(oneVec);
+   VectorConstantCoefficient zeroVecCoef(zeroVec);
+   VectorConstantCoefficient oneVecCoef(oneVec);

   switch (prob)
   {
      case 0:
         if (exact_sol)
         {
-            u.ProjectBdrCoefficient(u0, ess_bdr);
-            u_exact->ProjectCoefficient(u0);
+            u.ProjectBdrCoefficient(u0_r, u0_i, ess_bdr);
+            u_exact->ProjectCoefficient(u0_r, u0_i);
         }
         else
         {
-            u.ProjectBdrCoefficient(oneCoef, ess_bdr);
+            u.ProjectBdrCoefficient(oneCoef, zeroCoef, ess_bdr);
         }
         break;
      case 1:
         if (exact_sol)
         {
-            u.ProjectBdrCoefficientTangent(u1, ess_bdr);
-            u_exact->ProjectCoefficient(u1);
+            u.ProjectBdrCoefficientTangent(u1_r, u1_i, ess_bdr);
+            u_exact->ProjectCoefficient(u1_r, u1_i);
         }
         else
         {
-            u.ProjectBdrCoefficientTangent(oneVecCoef, ess_bdr);
+            u.ProjectBdrCoefficientTangent(oneVecCoef, zeroVecCoef, ess_bdr);
         }
         break;
      case 2:
         if (exact_sol)
         {
-            u.ProjectBdrCoefficientNormal(u2, ess_bdr);
-            u_exact->ProjectCoefficient(u2);
+            u.ProjectBdrCoefficientNormal(u2_r, u2_i, ess_bdr);
+            u_exact->ProjectCoefficient(u2_r, u2_i);
         }
         else
         {
-            u.ProjectBdrCoefficientNormal(oneVecCoef, ess_bdr);
+            u.ProjectBdrCoefficientNormal(oneVecCoef, zeroVecCoef, ess_bdr);
         }
         break;
      default: break; // This should be unreachable
@@ -289,24 +300,27 @@ int main(int argc, char *argv[])
   ConstantCoefficient lossCoef(omega_ * sigma_);
   ConstantCoefficient negMassCoef(omega_ * omega_ * epsilon_);

-   ComplexConstantCoefficient complexMassCoef(-omega_ * omega_ * epsilon_,
-                                              omega_ * sigma_);
-
   SesquilinearForm *a = new SesquilinearForm(fespace, conv);
   if (pa) { a->SetAssemblyLevel(AssemblyLevel::PARTIAL); }
   switch (prob)
   {
      case 0:
-         a->AddDomainIntegrator<DiffusionIntegrator>(stiffnessCoef);
-         a->AddDomainIntegrator<MassIntegrator>(complexMassCoef);
+         a->AddDomainIntegrator(new DiffusionIntegrator(stiffnessCoef),
+                                NULL);
+         a->AddDomainIntegrator(new MassIntegrator(massCoef),
+                                new MassIntegrator(lossCoef));
         break;
      case 1:
-         a->AddDomainIntegrator<CurlCurlIntegrator>(stiffnessCoef);
-         a->AddDomainIntegrator<VectorFEMassIntegrator>(complexMassCoef);
+         a->AddDomainIntegrator(new CurlCurlIntegrator(stiffnessCoef),
+                                NULL);
+         a->AddDomainIntegrator(new VectorFEMassIntegrator(massCoef),
+                                new VectorFEMassIntegrator(lossCoef));
         break;
      case 2:
-         a->AddDomainIntegrator<DivDivIntegrator>(stiffnessCoef);
-         a->AddDomainIntegrator<VectorFEMassIntegrator>(complexMassCoef);
+         a->AddDomainIntegrator(new DivDivIntegrator(stiffnessCoef),
+                                NULL);
+         a->AddDomainIntegrator(new VectorFEMassIntegrator(massCoef),
+                                new VectorFEMassIntegrator(lossCoef));
         break;
      default: break; // This should be unreachable
   }
@@ -422,24 +436,29 @@ int main(int argc, char *argv[])

   if (exact_sol)
   {
-      real_t err_u = -1.0;
+      real_t err_r = -1.0;
+      real_t err_i = -1.0;

      switch (prob)
      {
         case 0:
-            err_u = u.ComputeL2Error(u0);
+            err_r = u.real().ComputeL2Error(u0_r);
+            err_i = u.imag().ComputeL2Error(u0_i);
            break;
         case 1:
-            err_u = u.ComputeL2Error(u1);
+            err_r = u.real().ComputeL2Error(u1_r);
+            err_i = u.imag().ComputeL2Error(u1_i);
            break;
         case 2:
-            err_u = u.ComputeL2Error(u2);
+            err_r = u.real().ComputeL2Error(u2_r);
+            err_i = u.imag().ComputeL2Error(u2_i);
            break;
         default: break; // This should be unreachable
      }

      cout << endl;
-      cout << "|| u_h - u ||_{L^2} = " << err_u << endl;
+      cout << "|| Re (u_h - u) ||_{L^2} = " << err_r << endl;
+      cout << "|| Im (u_h - u) ||_{L^2} = " << err_i << endl;
      cout << endl;
   }

@@ -545,14 +564,36 @@ complex<real_t> u0_exact(const Vector &x)
   return std::exp(-i * kappa * x[dim - 1]);
 }

-void u1_exact(const Vector &x, ComplexVector &v)
+real_t u0_real_exact(const Vector &x)
 {
-   int dim = x.Size();
-   v.SetSize(dim); v = 0.0; v[0] = u0_exact(x);
+   return u0_exact(x).real();
 }

-void u2_exact(const Vector &x, ComplexVector &v)
+real_t u0_imag_exact(const Vector &x)
+{
+   return u0_exact(x).imag();
+}
+
+void u1_real_exact(const Vector &x, Vector &v)
 {
   int dim = x.Size();
-   v.SetSize(dim); v = 0.0; v[dim-1] = u0_exact(x);
+   v.SetSize(dim); v = 0.0; v[0] = u0_real_exact(x);
+}
+
+void u1_imag_exact(const Vector &x, Vector &v)
+{
+   int dim = x.Size();
+   v.SetSize(dim); v = 0.0; v[0] = u0_imag_exact(x);
+}
+
+void u2_real_exact(const Vector &x, Vector &v)
+{
+   int dim = x.Size();
+   v.SetSize(dim); v = 0.0; v[dim-1] = u0_real_exact(x);
+}
+
+void u2_imag_exact(const Vector &x, Vector &v)
+{
+   int dim = x.Size();
+   v.SetSize(dim); v = 0.0; v[dim-1] = u0_imag_exact(x);
 }
@@ -62,10 +62,6 @@ static real_t epsilon_ = 1.0;
 static real_t sigma_ = 20.0;
 static real_t omega_ = 10.0;

-complex<real_t> u0_exact(const Vector &x);
-void u1_exact(const Vector &, ComplexVector &);
-void u2_exact(const Vector &, ComplexVector &);
-
 real_t u0_real_exact(const Vector &);
 real_t u0_imag_exact(const Vector &);

@@ -248,22 +244,13 @@ int main(int argc, char *argv[])
   ParComplexGridFunction * u_exact = NULL;
   if (exact_sol) { u_exact = new ParComplexGridFunction(fespace); }

-   ComplexFunctionCoefficient u0(u0_exact);
-   ComplexVectorFunctionCoefficient u1(dim, u1_exact);
-   ComplexVectorFunctionCoefficient u2(dim, u2_exact);
-
-   ComplexConstantCoefficient oneCoef(1.0);
-
-   Vector  oneVec(dim);  oneVec = 0.0; oneVec[(prob==2)?(dim-1):0] = 1.0;
-   ComplexVectorConstantCoefficient oneVecCoef(oneVec);
-
   FunctionCoefficient u0_r(u0_real_exact);
   FunctionCoefficient u0_i(u0_imag_exact);
   VectorFunctionCoefficient u1_r(dim, u1_real_exact);
   VectorFunctionCoefficient u1_i(dim, u1_imag_exact);
   VectorFunctionCoefficient u2_r(dim, u2_real_exact);
   VectorFunctionCoefficient u2_i(dim, u2_imag_exact);
-   /*
+
   ConstantCoefficient zeroCoef(0.0);
   ConstantCoefficient oneCoef(1.0);

@@ -271,40 +258,40 @@ int main(int argc, char *argv[])
   Vector  oneVec(dim);  oneVec = 0.0; oneVec[(prob==2)?(dim-1):0] = 1.0;
   VectorConstantCoefficient zeroVecCoef(zeroVec);
   VectorConstantCoefficient oneVecCoef(oneVec);
-   */
+
   switch (prob)
   {
      case 0:
         if (exact_sol)
         {
-            u.ProjectBdrCoefficient(u0, ess_bdr);
-            u_exact->ProjectCoefficient(u0);
+            u.ProjectBdrCoefficient(u0_r, u0_i, ess_bdr);
+            u_exact->ProjectCoefficient(u0_r, u0_i);
         }
         else
         {
-            u.ProjectBdrCoefficient(oneCoef, ess_bdr);
+            u.ProjectBdrCoefficient(oneCoef, zeroCoef, ess_bdr);
         }
         break;
      case 1:
         if (exact_sol)
         {
-            u.ProjectBdrCoefficientTangent(u1, ess_bdr);
-            u_exact->ProjectCoefficient(u1);
+            u.ProjectBdrCoefficientTangent(u1_r, u1_i, ess_bdr);
+            u_exact->ProjectCoefficient(u1_r, u1_i);
         }
         else
         {
-            u.ProjectBdrCoefficientTangent(oneVecCoef, ess_bdr);
+            u.ProjectBdrCoefficientTangent(oneVecCoef, zeroVecCoef, ess_bdr);
         }
         break;
      case 2:
         if (exact_sol)
         {
-            u.ProjectBdrCoefficientNormal(u2, ess_bdr);
-            u_exact->ProjectCoefficient(u2);
+            u.ProjectBdrCoefficientNormal(u2_r, u2_i, ess_bdr);
+            u_exact->ProjectCoefficient(u2_r, u2_i);
         }
         else
         {
-            u.ProjectBdrCoefficientNormal(oneVecCoef, ess_bdr);
+            u.ProjectBdrCoefficientNormal(oneVecCoef, zeroVecCoef, ess_bdr);
         }
         break;
      default: break; // This should be unreachable
@@ -344,24 +331,27 @@ int main(int argc, char *argv[])
   ConstantCoefficient lossCoef(omega_ * sigma_);
   ConstantCoefficient negMassCoef(omega_ * omega_ * epsilon_);

-   ComplexConstantCoefficient complexMassCoef(-omega_ * omega_ * epsilon_,
-                                              omega_ * sigma_);
-
   ParSesquilinearForm *a = new ParSesquilinearForm(fespace, conv);
   if (pa) { a->SetAssemblyLevel(AssemblyLevel::PARTIAL); }
   switch (prob)
   {
      case 0:
-         a->AddDomainIntegrator<DiffusionIntegrator>(stiffnessCoef);
-         a->AddDomainIntegrator<MassIntegrator>(complexMassCoef);
+         a->AddDomainIntegrator(new DiffusionIntegrator(stiffnessCoef),
+                                NULL);
+         a->AddDomainIntegrator(new MassIntegrator(massCoef),
+                                new MassIntegrator(lossCoef));
         break;
      case 1:
-         a->AddDomainIntegrator<CurlCurlIntegrator>(stiffnessCoef);
-         a->AddDomainIntegrator<VectorFEMassIntegrator>(complexMassCoef);
+         a->AddDomainIntegrator(new CurlCurlIntegrator(stiffnessCoef),
+                                NULL);
+         a->AddDomainIntegrator(new VectorFEMassIntegrator(massCoef),
+                                new VectorFEMassIntegrator(lossCoef));
         break;
      case 2:
-         a->AddDomainIntegrator<DivDivIntegrator>(stiffnessCoef);
-         a->AddDomainIntegrator<VectorFEMassIntegrator>(complexMassCoef);
+         a->AddDomainIntegrator(new DivDivIntegrator(stiffnessCoef),
+                                NULL);
+         a->AddDomainIntegrator(new VectorFEMassIntegrator(massCoef),
+                                new VectorFEMassIntegrator(lossCoef));
         break;
      default: break; // This should be unreachable
   }
@@ -485,18 +475,22 @@ int main(int argc, char *argv[])

   if (exact_sol)
   {
-      real_t err_u = -1.0;
+      real_t err_r = -1.0;
+      real_t err_i = -1.0;

      switch (prob)
      {
         case 0:
-            err_u = u.ComputeL2Error(u0);
+            err_r = u.real().ComputeL2Error(u0_r);
+            err_i = u.imag().ComputeL2Error(u0_i);
            break;
         case 1:
-            err_u = u.ComputeL2Error(u1);
+            err_r = u.real().ComputeL2Error(u1_r);
+            err_i = u.imag().ComputeL2Error(u1_i);
            break;
         case 2:
-            err_u = u.ComputeL2Error(u2);
+            err_r = u.real().ComputeL2Error(u2_r);
+            err_i = u.imag().ComputeL2Error(u2_i);
            break;
         default: break; // This should be unreachable
      }
@@ -504,7 +498,8 @@ int main(int argc, char *argv[])
      if ( myid == 0 )
      {
         cout << endl;
-         cout << "|| u_h - u ||_{L^2} = " << err_u << endl;
+         cout << "|| Re (u_h - u) ||_{L^2} = " << err_r << endl;
+         cout << "|| Im (u_h - u) ||_{L^2} = " << err_i << endl;
         cout << endl;
      }
   }
@@ -632,12 +627,6 @@ real_t u0_imag_exact(const Vector &x)
   return u0_exact(x).imag();
 }

-void u1_exact(const Vector &x, ComplexVector &v)
-{
-   int dim = x.Size();
-   v.SetSize(dim); v = 0.0; v[0] = u0_exact(x);
-}
-
 void u1_real_exact(const Vector &x, Vector &v)
 {
   int dim = x.Size();
@@ -650,12 +639,6 @@ void u1_imag_exact(const Vector &x, Vector &v)
   v.SetSize(dim); v = 0.0; v[0] = u0_imag_exact(x);
 }

-void u2_exact(const Vector &x, ComplexVector &v)
-{
-   int dim = x.Size();
-   v.SetSize(dim); v = 0.0; v[dim-1] = u0_exact(x);
-}
-
 void u2_real_exact(const Vector &x, Vector &v)
 {
   int dim = x.Size();
@@ -2,14 +2,14 @@
 //
 // Compile with: make ex9
 //
-// Sample runs:
+// DG sample runs:
 //    ex9 -m ../data/periodic-segment.mesh -p 0 -r 2 -dt 0.005
 //    ex9 -m ../data/periodic-square.mesh -p 0 -r 2 -dt 0.01 -tf 10
 //    ex9 -m ../data/periodic-hexagon.mesh -p 0 -r 2 -dt 0.01 -tf 10
 //    ex9 -m ../data/periodic-square.mesh -p 1 -r 2 -dt 0.005 -tf 9
 //    ex9 -m ../data/periodic-hexagon.mesh -p 1 -r 2 -dt 0.005 -tf 9
 //    ex9 -m ../data/amr-quad.mesh -p 1 -r 2 -dt 0.002 -tf 9
-//    ex9 -m ../data/amr-quad.mesh -p 1 -r 2 -dt 0.02 -s 23 -tf 9
+//    ex9 -m ../data/amr-quad.mesh -p 1 -r 2 -dt 0.02 -s 13 -tf 9
 //    ex9 -m ../data/star-q3.mesh -p 1 -r 2 -dt 0.005 -tf 9
 //    ex9 -m ../data/star-mixed.mesh -p 1 -r 2 -dt 0.005 -tf 9
 //    ex9 -m ../data/disc-nurbs.mesh -p 1 -r 3 -dt 0.005 -tf 9
@@ -19,6 +19,23 @@
 //    ex9 -m ../data/periodic-square.msh -p 0 -r 2 -dt 0.005 -tf 2
 //    ex9 -m ../data/periodic-cube.msh -p 0 -r 1 -o 2 -tf 2
 //
+// CG sample runs:
+//    ex9 -m ../data/periodic-segment.mesh -p 0 -r 5 -dt 0.001 -sc 11 -vs 50 -o 1 -s 2
+//    ex9 -m ../data/periodic-segment.mesh -p 0 -r 5 -dt 0.001 -sc 12 -vs 50 -o 1 -s 2
+//    ex9 -m ../data/periodic-segment.mesh -p 0 -r 5 -dt 0.001 -sc 13 -vs 50 -o 1 -s 2
+//    ex9 -m ../data/periodic-square.mesh -p 0 -r 3 -dt 0.01 -tf 10 -sc 11 -o 2 -s 3 -vs 20
+//    ex9 -m ../data/periodic-hexagon.mesh -p 0 -r 3 -dt 0.01 -tf 10 -sc 12 -vs 20
+//    ex9 -m ../data/periodic-square.mesh -p 1 -r 4 -dt 0.002 -tf 9 -sc 11 -o 1 -s 2 -vs 20
+//    ex9 -m ../data/periodic-square.mesh -p 1 -r 2 -dt 0.002 -tf 9 -sc 11 -vs 20
+//    ex9 -m ../data/periodic-square.mesh -p 1 -r 4 -dt 0.002 -tf 9 -sc 13 -o 1 -s 2 -vs 20
+//    ex9 -m ../data/star-mixed.mesh -p 1 -r 4 -dt 0.004 -tf 9 -vs 20 -sc 11 -o 1 -s 2
+//    ex9 -m ../data/star-q3.mesh -p 1 -r 4 -dt 0.004 -tf 9 -vs 20 -sc 11 -o 1 -s 2
+//    ex9 -m ../data/disc-nurbs.mesh -p 1 -r 3 -dt 0.005 -tf 9 -sc 11
+//    ex9 -m ../data/disc-nurbs.mesh -p 1 -r 4 -dt 0.005 -tf 9 -sc 12 -o 2 -s 3
+//    ex9 -m ../data/periodic-square.mesh -p 3 -r 4 -dt 0.005 -tf 9 -vs 20 -sc 11 -o 2 -s 3
+//    ex9 -m ../data/periodic-cube.mesh -p 0 -r 2 -dt 0.02 -tf 8 -sc 11 -o 2 -s 3
+//    ex9 -m ../data/periodic-cube.msh -p 0 -r 2 -o 2 -s 3 -tf 2 -sc 11
+//
 // Device sample runs:
 //    ex9 -pa
 //    ex9 -ea
@@ -41,11 +58,16 @@
 //               solution. The saving of time-dependent data files for external
 //               visualization with VisIt (visit.llnl.gov) and ParaView
 //               (paraview.org) is also illustrated.
+//               Additionally, the example showcases the implementation of an
+//               element-based Clip & Scale limiter for continuous finite
+//               elements, which is designed to be bound-preserving.
+//               For more detail, see https://doi.org/10.1142/13466.

 #include "mfem.hpp"
 #include <fstream>
 #include <iostream>
 #include <algorithm>
+#include "ex9.hpp"

 using namespace std;
 using namespace mfem;
@@ -104,12 +126,12 @@ public:
      }
   }

-   void SetOperator(const Operator &op) override
+   void SetOperator(const Operator &op)
   {
      linear_solver.SetOperator(op);
   }

-   void Mult(const Vector &x, Vector &y) const override
+   virtual void Mult(const Vector &x, Vector &y) const
   {
      linear_solver.Mult(x, y);
   }
@@ -120,7 +142,7 @@ public:
    and advection matrices, and b describes the flow on the boundary. This can
    be written as a general ODE, du/dt = M^{-1} (K u + b), and this class is
    used to evaluate the right-hand side. */
-class FE_Evolution : public TimeDependentOperator
+class DG_FE_Evolution : public TimeDependentOperator
 {
 private:
   BilinearForm &M, &K;
@@ -132,15 +154,14 @@ private:
   mutable Vector z;

 public:
-   FE_Evolution(BilinearForm &M_, BilinearForm &K_, const Vector &b_);
+   DG_FE_Evolution(BilinearForm &M_, BilinearForm &K_, const Vector &b_);

-   void Mult(const Vector &x, Vector &y) const override;
-   void ImplicitSolve(const real_t dt, const Vector &x, Vector &k) override;
+   virtual void Mult(const Vector &x, Vector &y) const;
+   virtual void ImplicitSolve(const real_t dt, const Vector &x, Vector &k);

-   ~FE_Evolution() override;
+   virtual ~DG_FE_Evolution();
 };

-
 int main(int argc, char *argv[])
 {
   // 1. Parse command-line options.
@@ -153,6 +174,7 @@ int main(int argc, char *argv[])
   bool fa = false;
   const char *device_config = "cpu";
   int ode_solver_type = 4;
+   int scheme = 1;
   real_t t_final = 10.0;
   real_t dt = 0.01;
   bool visualization = true;
@@ -182,7 +204,17 @@ int main(int argc, char *argv[])
   args.AddOption(&device_config, "-d", "--device",
                  "Device configuration string, see Device::Configure().");
   args.AddOption(&ode_solver_type, "-s", "--ode-solver",
-                  ODESolver::Types.c_str());
+                  "ODE solver: 1 - Forward Euler,\n\t"
+                  "            2 - RK2 SSP, 3 - RK3 SSP, 4 - RK4, 6 - RK6,\n\t"
+                  "            11 - Backward Euler,\n\t"
+                  "            12 - SDIRK23 (L-stable), 13 - SDIRK33,\n\t"
+                  "            22 - Implicit Midpoint Method,\n\t"
+                  "            23 - SDIRK23 (A-stable), 24 - SDIRK34");
+   args.AddOption(&scheme, "-sc", "--scheme",
+                  "FE scheme: 1 - DG high-order, unstabilized,\n\t"
+                  "           11 - CG low-order,\n\t"
+                  "           12 - CG high-order, stabilized,\n\t"
+                  "           13 - CG high-order, stabilized, limited.");
   args.AddOption(&t_final, "-tf", "--t-final",
                  "Final time; start time is 0.");
   args.AddOption(&dt, "-dt", "--time-step",
@@ -209,6 +241,14 @@ int main(int argc, char *argv[])
   }
   args.PrintOptions(cout);

+   const bool DG = (scheme < 10);
+
+   // Limiter is only implemented to run on cpu.
+   if (!DG && strcmp(device_config, "cuda") == 0)
+   {
+      cout << "Cuda not supported for this CG implementation" << endl;
+      return 2;
+   }
   Device device(device_config);
   device.Print();

@@ -217,9 +257,49 @@ int main(int argc, char *argv[])
   Mesh mesh(mesh_file, 1, 1);
   int dim = mesh.Dimension();

+   // Nonconforming meshes are not feasible for continuous elements
+   if (!DG && !mesh.Conforming())
+   {
+      cout << "CG needs a conforming mesh." << endl;
+      return 3;
+   }
+
   // 3. Define the ODE solver used for time integration. Several explicit
   //    Runge-Kutta methods are available.
-   unique_ptr<ODESolver> ode_solver = ODESolver::Select(ode_solver_type);
+   //    The CG Limiter is only implemented for explicit time-stepping methods.
+   if (!DG && ode_solver_type > 10)
+   {
+      cout << "The CG methods are supported only with explicit RK schemes.\n";
+      return 4;
+   }
+   // Limiter and low order scheme are only provably bound preserving
+   // when employing SSP-RK time-stepping methods
+   else if ((scheme == 11 || scheme == 13) && ode_solver_type > 3)
+   {
+      MFEM_WARNING("Non-SSP-RK method! Bounds might be violated.");
+   }
+   unique_ptr<ODESolver> ode_solver = nullptr;
+   switch (ode_solver_type)
+   {
+      // Explicit methods
+      case 1: ode_solver.reset(new ForwardEulerSolver); break;
+      case 2: ode_solver.reset(new RK2Solver(1.0)); break;
+      case 3: ode_solver.reset(new RK3SSPSolver); break;
+      case 4: ode_solver.reset(new RK4Solver); break;
+      case 6: ode_solver.reset(new RK6Solver); break;
+      // Implicit (L-stable) methods
+      case 11: ode_solver.reset(new BackwardEulerSolver); break;
+      case 12: ode_solver.reset(new SDIRK23Solver(2)); break;
+      case 13: ode_solver.reset(new SDIRK33Solver); break;
+      // Implicit A-stable methods (not L-stable)
+      case 22: ode_solver.reset(new ImplicitMidpointSolver); break;
+      case 23: ode_solver.reset(new SDIRK23Solver); break;
+      case 24: ode_solver.reset(new SDIRK34Solver); break;
+
+      default:
+         cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
+         return 5;
+   }

   // 4. Refine the mesh to increase the resolution. In this example we do
   //    'ref_levels' of uniform refinement, where 'ref_levels' is a
@@ -235,12 +315,21 @@ int main(int argc, char *argv[])
   }
   mesh.GetBoundingBox(bb_min, bb_max, max(order, 1));

-   // 5. Define the discontinuous DG finite element space of the given
-   //    polynomial order on the refined mesh.
-   DG_FECollection fec(order, dim, BasisType::GaussLobatto);
-   FiniteElementSpace fes(&mesh, &fec);
+   // 5. Define the finite element space of the given polynomial order on the
+   //    refined mesh. Continuous H1 and discontinuous L2 spaces are supported.
+   DG_FECollection fec_DG(order, dim, BasisType::GaussLobatto);
+   H1_FECollection fec_CG(order, dim, BasisType::Positive);
+   unique_ptr<FiniteElementSpace> fes = nullptr;
+   switch (scheme)
+   {
+      case 1: fes.reset(new FiniteElementSpace(&mesh, &fec_DG)); break;
+      case 11:
+      case 12:
+      case 13: fes.reset(new FiniteElementSpace(&mesh, &fec_CG)); break;
+      default: cout << "Unknown scheme: " << scheme << endl; return 6;
+   }

-   cout << "Number of unknowns: " << fes.GetVSize() << endl;
+   cout << "Number of unknowns: " << fes->GetVSize() << endl;

   // 6. Set up and assemble the bilinear and linear forms corresponding to the
   //    DG discretization. The DGTraceIntegrator involves integrals over mesh
@@ -249,46 +338,71 @@ int main(int argc, char *argv[])
   FunctionCoefficient inflow(inflow_function);
   FunctionCoefficient u0(u0_function);

-   BilinearForm m(&fes);
-   BilinearForm k(&fes);
-   if (pa)
+   BilinearForm m(fes.get());
+   BilinearForm k(fes.get());
+   if (DG)
   {
-      m.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      k.SetAssemblyLevel(AssemblyLevel::PARTIAL);
+      if (pa)
+      {
+         m.SetAssemblyLevel(AssemblyLevel::PARTIAL);
+         k.SetAssemblyLevel(AssemblyLevel::PARTIAL);
+      }
+      else if (ea)
+      {
+         m.SetAssemblyLevel(AssemblyLevel::ELEMENT);
+         k.SetAssemblyLevel(AssemblyLevel::ELEMENT);
+      }
+      else if (fa)
+      {
+         m.SetAssemblyLevel(AssemblyLevel::FULL);
+         k.SetAssemblyLevel(AssemblyLevel::FULL);
+      }
   }
-   else if (ea)
+   else if (scheme == 13 && (pa || ea))
   {
-      m.SetAssemblyLevel(AssemblyLevel::ELEMENT);
-      k.SetAssemblyLevel(AssemblyLevel::ELEMENT);
-   }
-   else if (fa)
-   {
-      m.SetAssemblyLevel(AssemblyLevel::FULL);
-      k.SetAssemblyLevel(AssemblyLevel::FULL);
+      cout << "The CG Limiter needs full assembly of the mass matrix to obtain "
+           << "the local stencil via its sparsity pattern.\n";
+      return 7;
   }
+
   m.AddDomainIntegrator(new MassIntegrator);
-   constexpr real_t alpha = -1.0;
-   k.AddDomainIntegrator(new ConvectionIntegrator(velocity, alpha));
-   k.AddInteriorFaceIntegrator(
-      new NonconservativeDGTraceIntegrator(velocity, alpha));
-   k.AddBdrFaceIntegrator(
-      new NonconservativeDGTraceIntegrator(velocity, alpha));
-
-   LinearForm b(&fes);
-   b.AddBdrFaceIntegrator(
-      new BoundaryFlowIntegrator(inflow, velocity, alpha));
-
   m.Assemble();
-   int skip_zeros = 0;
-   k.Assemble(skip_zeros);
-   b.Assemble();
   m.Finalize();
-   k.Finalize(skip_zeros);
+
+   constexpr real_t alpha = -1.0;
+   int skip_zeros = 0;
+   Vector lumpedmassmatrix(m.Height());
+
+   // The convective bilinear form is not needed in the CG case.
+   if (DG)
+   {
+      k.AddDomainIntegrator(new ConvectionIntegrator(velocity, alpha));
+      k.AddInteriorFaceIntegrator(
+         new NonconservativeDGTraceIntegrator(velocity, alpha));
+      k.AddBdrFaceIntegrator(
+         new NonconservativeDGTraceIntegrator(velocity, alpha));
+
+      k.Assemble(skip_zeros);
+      k.Finalize(skip_zeros);
+   }
+   // lumped mass matrix not needed in the DG case
+   else
+   {
+      BilinearForm mL(fes.get());
+      mL.AddDomainIntegrator(new LumpedIntegrator(new MassIntegrator));
+      mL.Assemble();
+      mL.Finalize();
+      mL.SpMat().GetDiag(lumpedmassmatrix);
+   }
+
+   LinearForm b(fes.get());
+   b.AddBdrFaceIntegrator(new BoundaryFlowIntegrator(inflow, velocity, alpha));
+   b.Assemble();

   // 7. Define the initial conditions, save the corresponding grid function to
   //    a file and (optionally) save data in the VisIt format and initialize
   //    GLVis visualization.
-   GridFunction u(&fes);
+   GridFunction u(fes.get());
   u.ProjectCoefficient(u0);

   {
@@ -302,7 +416,7 @@ int main(int argc, char *argv[])

   // Create data collection for solution output: either VisItDataCollection for
   // ascii data files, or SidreDataCollection for binary data files.
-   DataCollection *dc = NULL;
+   unique_ptr<DataCollection> dc = nullptr;
   if (visit)
   {
      if (binary)
@@ -315,7 +429,7 @@ int main(int argc, char *argv[])
      }
      else
      {
-         dc = new VisItDataCollection("Example9", &mesh);
+         dc.reset(new VisItDataCollection("Example9", &mesh));
         dc->SetPrecision(precision);
      }
      dc->RegisterField("solution", &u);
@@ -324,10 +438,10 @@ int main(int argc, char *argv[])
      dc->Save();
   }

-   ParaViewDataCollection *pd = NULL;
+   unique_ptr<ParaViewDataCollection> pd = nullptr;
   if (paraview)
   {
-      pd = new ParaViewDataCollection("Example9", &mesh);
+      pd.reset(new ParaViewDataCollection("Example9", &mesh));
      pd->SetPrefixPath("ParaView");
      pd->RegisterField("solution", &u);
      pd->SetLevelsOfDetail(order);
@@ -365,11 +479,23 @@ int main(int argc, char *argv[])
   // 8. Define the time-dependent evolution operator describing the ODE
   //    right-hand side, and perform time-integration (looping over the time
   //    iterations, ti, with a time-step dt).
-   FE_Evolution adv(m, k, b);
+   //DG_FE_Evolution adv(m, k, b);
+   unique_ptr<TimeDependentOperator> adv = nullptr;
+   switch (scheme)
+   {
+      case 1: adv.reset(new DG_FE_Evolution(m, k, b)); break;
+      case 11: adv.reset(new LowOrderScheme(*fes, lumpedmassmatrix,
+                                               inflow, velocity, m)); break;
+      case 12: adv.reset(new HighOrderTargetScheme(*fes, lumpedmassmatrix,
+                                                      inflow, velocity, m)); break;
+      case 13: adv.reset(new ClipAndScale(*fes, lumpedmassmatrix,
+                                             inflow, velocity, m)); break;
+      default: cout << "Unknown scheme: " << scheme << '\n'; return 8;
+   }

   real_t t = 0.0;
-   adv.SetTime(t);
-   ode_solver->Init(adv);
+   adv->SetTime(t);
+   ode_solver->Init(*adv);

   bool done = false;
   for (int ti = 0; !done; )
@@ -413,16 +539,16 @@ int main(int argc, char *argv[])
      u.Save(osol);
   }

-   // 10. Free the used memory.
-   delete pd;
-   delete dc;
+   ConstantCoefficient zero(0.0);
+   std::cout << "Norm: " << u.ComputeL2Error(zero) << std::endl;

   return 0;
 }


-// Implementation of class FE_Evolution
-FE_Evolution::FE_Evolution(BilinearForm &M_, BilinearForm &K_, const Vector &b_)
+// Implementation of class DG_FE_Evolution
+DG_FE_Evolution::DG_FE_Evolution(BilinearForm &M_, BilinearForm &K_,
+                                 const Vector &b_)
   : TimeDependentOperator(M_.FESpace()->GetTrueVSize()),
     M(M_), K(K_), b(b_), z(height)
 {
@@ -447,7 +573,7 @@ FE_Evolution::FE_Evolution(BilinearForm &M_, BilinearForm &K_, const Vector &b_)
   M_solver.SetPrintLevel(0);
 }

-void FE_Evolution::Mult(const Vector &x, Vector &y) const
+void DG_FE_Evolution::Mult(const Vector &x, Vector &y) const
 {
   // y = M^{-1} (K x + b)
   K.Mult(x, z);
@@ -455,7 +581,7 @@ void FE_Evolution::Mult(const Vector &x, Vector &y) const
   M_solver.Mult(z, y);
 }

-void FE_Evolution::ImplicitSolve(const real_t dt, const Vector &x, Vector &k)
+void DG_FE_Evolution::ImplicitSolve(const real_t dt, const Vector &x, Vector &k)
 {
   MFEM_VERIFY(dg_solver != NULL,
               "Implicit time integration is not supported with partial assembly");
@@ -465,7 +591,7 @@ void FE_Evolution::ImplicitSolve(const real_t dt, const Vector &x, Vector &k)
   dg_solver->Mult(z, k);
 }

-FE_Evolution::~FE_Evolution()
+DG_FE_Evolution::~DG_FE_Evolution()
 {
   delete M_prec;
   delete dg_solver;
@@ -0,0 +1,554 @@
+//                  MFEM Example 9 - Serial/Parallel Shared Code
+
+#include "mfem.hpp"
+#include <limits>
+
+namespace mfem
+{
+
+// Function f = 1 for lumped boundary operator
+real_t one(const Vector &x) { return 1.0; }
+
+/** Abstract base class for evaluating the time-dependent operator in the ODE
+    formulation. The continuous Galerkin (CG) strong form of the advection
+    equation du/dt = -v.grad(u) is given by M du/dt = -K u + b, where M and K
+    are the mass and advection matrices, respectively, and b represents the
+    boundary flow contribution.
+
+    The ODE can be reformulated as:
+    du/dt = M_L^{-1}((-K + D) u + F^*(u) + b),
+    where M_L is the lumped mass matrix, D is a low-order stabilization term,
+    and F^*(u) represents the limited anti-diffusive fluxes.
+    Here, F^* is a limited version of F, which recover the high-order target
+    scheme. The limited anti-diffusive fluxes F^* are the sum of the limited
+    element contributions of the original flux F to enforce local bounds.
+
+    Additional to the limiter we implement the low-order scheme and
+    high-order target scheme by chosing:
+    - F^* = 0 for the bound-preserving low-order scheme.
+    - F^* = F for the high-order target scheme which is not bound-preserving.
+
+    This abstract class provides a framework for evaluating the right-hand side
+    of the ODE and is intended to be inherited by classes that implement
+    the three schemes:
+    - The ClipAndScale class, which employes the limiter to enforces local
+      bounds
+    - The HighOrderTargetScheme class, which employs the raw anti-diffusive
+      fluxes F
+    - The LowOrderScheme class, which employs F = 0 and has low accuracy, but
+      is bound-preserving */
+class CG_FE_Evolution : public TimeDependentOperator
+{
+protected:
+   const Vector &lumpedmassmatrix;
+   FiniteElementSpace &fes;
+#ifdef MFEM_USE_MPI
+   ParFiniteElementSpace *pfes;
+#endif
+   int *I, *J;
+   LinearForm b_lumped;
+   GridFunction u_inflow;
+
+   mutable DenseMatrix Ke, Me;
+   mutable Vector ue, re, udote, fe, fe_star, gammae;
+   mutable ConvectionIntegrator conv_int;
+   mutable MassIntegrator mass_int;
+   mutable Vector z;
+
+   virtual void ComputeLOTimeDerivatives(const Vector &u, Vector &udot) const;
+
+public:
+   CG_FE_Evolution(FiniteElementSpace &fes_,
+                   const Vector &lumpedmassmatrix_, FunctionCoefficient &inflow,
+                   VectorFunctionCoefficient &vel, BilinearForm &M)
+      : TimeDependentOperator(lumpedmassmatrix_.Size()),
+        lumpedmassmatrix(lumpedmassmatrix_), fes(fes_),
+        I(M.SpMat().GetI()), J(M.SpMat().GetJ()), b_lumped(&fes),
+        u_inflow(&fes), conv_int(vel), mass_int()
+   {
+      u_inflow.ProjectCoefficient(inflow);
+
+      // For bound preservation the boundary condition \hat{u} is enforced
+      // via a lumped approximation to < (u_h - u_inflow) * min(v * n, 0 ), w >,
+      // i.e., (u_i - (u_inflow)_i) * \int_F \varphi_i * min(v * n, 0).
+      // The integral can be implemented as follows:
+      FunctionCoefficient fc1(one);
+      b_lumped.AddBdrFaceIntegrator(new BoundaryFlowIntegrator(fc1, vel, 1.0));
+      b_lumped.Assemble();
+
+      z.SetSize(lumpedmassmatrix.Size());
+
+#ifdef MFEM_USE_MPI
+      pfes = dynamic_cast<ParFiniteElementSpace *>(&fes);
+      if (pfes)
+      {
+         // distribute the lumped mass matrix entries
+         Array<real_t> lumpedmassmatrix_array(lumpedmassmatrix.GetData(),
+                                              lumpedmassmatrix.Size());
+         pfes->GroupComm().Reduce<real_t>(lumpedmassmatrix_array,
+                                          GroupCommunicator::Sum);
+         pfes->GroupComm().Bcast(lumpedmassmatrix_array);
+      }
+#endif
+   }
+
+   virtual void Mult(const Vector &x, Vector &y) const = 0;
+
+   /// Estimate a CFL-like forward Euler time step for the low-order (LO)
+   /// scheme, based on Lemma 4.3 in:
+   ///   HIGH-ORDER MULTI-MATERIAL ALE HYDRODYNAMICS
+   ///   Anderson, Dobrev, Kolev, Rieben, Tomov (2018).
+   ///
+   /// The LO forward Euler update can be written in the form
+   ///   M_L u^{n+1} = (M_L + dt * K_LO) u^n + dt * rhs_const,
+   /// where M_L is the lumped mass matrix and K_LO has nonnegative
+   /// off-diagonals and nonpositive diagonal.
+   /// Lemma 4.3 gives the sufficient condition for entrywise nonnegativity:
+   ///   m_i + dt * (K_LO)_{ii} >= 0  for all i,
+   /// i.e., dt <= min_i m_i / (-(K_LO)_{ii}) over DOFs with (K_LO)_{ii} < 0.
+   ///
+   /// Two estimates are returned:
+   /// - dt_local: uses per-element (unassembled) matrices; ignores overlap.
+   /// - dt_global: uses the globally assembled diagonal (sums element overlap).
+   void ComputeLOTimeStepEstimates(real_t &dt_local, real_t &dt_global) const;
+
+   virtual ~CG_FE_Evolution() { }
+};
+
+// High-order target scheme class
+class HighOrderTargetScheme : public CG_FE_Evolution
+{
+private:
+   mutable Vector udot;
+
+public:
+   HighOrderTargetScheme(FiniteElementSpace &fes_,
+                         const Vector &lumpedmassmatrix_,
+                         FunctionCoefficient &inflow,
+                         VectorFunctionCoefficient &velocity, BilinearForm &M)
+      : CG_FE_Evolution(fes_, lumpedmassmatrix_, inflow, velocity, M)
+   {
+      udot.SetSize(lumpedmassmatrix.Size());
+   }
+
+   virtual void Mult(const Vector &x, Vector &y) const override;
+};
+
+// Low-order scheme class
+class LowOrderScheme : public CG_FE_Evolution
+{
+public:
+   LowOrderScheme(FiniteElementSpace &fes_,
+                  const Vector &lumpedmassmatrix_, FunctionCoefficient &inflow,
+                  VectorFunctionCoefficient &velocity, BilinearForm &M)
+      : CG_FE_Evolution(fes_, lumpedmassmatrix_, inflow, velocity, M) { }
+
+   virtual void Mult(const Vector &x, Vector &y) const override
+   {
+      ComputeLOTimeDerivatives(x, y);
+   }
+};
+
+// Clip and Scale limiter class
+class ClipAndScale : public CG_FE_Evolution
+{
+private:
+   mutable Array<real_t> umin, umax;
+   mutable Vector udot;
+
+   virtual void ComputeBounds(const Vector &u, Array<real_t> &u_min,
+                              Array<real_t> &u_max) const;
+
+public:
+   ClipAndScale(FiniteElementSpace &fes_,
+                const Vector &lumpedmassmatrix_, FunctionCoefficient &inflow,
+                VectorFunctionCoefficient &velocity, BilinearForm &M)
+      : CG_FE_Evolution(fes_, lumpedmassmatrix_, inflow, velocity, M)
+   {
+      umin.SetSize(lumpedmassmatrix.Size());
+      umax.SetSize(lumpedmassmatrix.Size());
+      udot.SetSize(lumpedmassmatrix.Size());
+   }
+
+
+   virtual void Mult(const Vector &x, Vector &y) const override;
+
+   virtual ~ClipAndScale() { }
+};
+
+void CG_FE_Evolution::ComputeLOTimeDerivatives(const Vector &u,
+                                               Vector &udot) const
+{
+   udot = 0.0;
+   const int nE = fes.GetNE();
+   Array<int> dofs;
+
+   for (int e = 0; e < nE; e++)
+   {
+      auto element = fes.GetFE(e);
+      auto eltrans = fes.GetElementTransformation(e);
+
+      // assemble element matrix of convection operator
+      conv_int.AssembleElementMatrix(*element, *eltrans, Ke);
+
+      fes.GetElementDofs(e, dofs);
+      ue.SetSize(dofs.Size());
+      u.GetSubVector(dofs, ue);
+      re.SetSize(dofs.Size());
+      re = 0.0;
+
+      for (int i = 0; i < dofs.Size(); i++)
+      {
+         for (int j = 0; j < i; j++)
+         {
+            // add low-order stabilization with discrete upwinding
+            real_t dije = std::max(std::max(Ke(i,j), Ke(j,i)), real_t(0.0));
+            real_t diffusion = dije * (ue(j) - ue(i));
+
+            re(i) += diffusion;
+            re(j) -= diffusion;
+         }
+      }
+      // Add -K_e u_e to obtain (-K_e + D_e) u_e and add element contribution
+      // to global vector
+      Ke.AddMult(ue, re, -1.0);
+      udot.AddElementVector(dofs, re);
+   }
+
+   // add boundary condition (u - u_inflow) * b.
+   // This is under the assumption that b_lumped has been updated
+   subtract(u, u_inflow, z);
+   z *= b_lumped;
+   udot += z;
+
+#ifdef MFEM_USE_MPI
+   if (pfes)
+   {
+      // Sum over the shared DOFs.
+      Array<real_t> udot_array(udot.GetData(), udot.Size());
+      pfes->GroupComm().Reduce<real_t>(udot_array, GroupCommunicator::Sum);
+      pfes->GroupComm().Bcast(udot_array);
+   }
+#endif
+
+   // apply inverse lumped mass matrix
+   udot /= lumpedmassmatrix;
+}
+
+void CG_FE_Evolution::ComputeLOTimeStepEstimates(real_t &dt_local,
+                                                 real_t &dt_global) const
+{
+   // Elementwise (unassembled) estimate.
+   dt_local = std::numeric_limits<real_t>::infinity();
+
+   // Globally assembled diagonal of K_LO (in the DOF numbering of 'fes').
+   Vector kdiag(lumpedmassmatrix.Size());
+   kdiag = 0.0;
+
+   const int nE = fes.GetNE();
+   Array<int> dofs;
+
+   for (int e = 0; e < nE; e++)
+   {
+      auto element = fes.GetFE(e);
+      auto eltrans = fes.GetElementTransformation(e);
+
+      // Assemble element matrices for the LO operator:
+      //   K_LO,e = (-K_e + D_e),
+      // where D_e is the discrete upwinding diffusion constructed from K_e.
+      conv_int.AssembleElementMatrix(*element, *eltrans, Ke);
+      mass_int.AssembleElementMatrix(*element, *eltrans, Me);
+
+      fes.GetElementDofs(e, dofs);
+      const int nd = dofs.Size();
+
+      Vector me(nd), kdiag_e(nd);
+      for (int i = 0; i < nd; i++)
+      {
+         // m_i^e = sum_j (M_e)_{ij}  (row-sum lumping)
+         real_t mi = 0.0;
+         for (int j = 0; j < nd; j++) { mi += Me(i, j); }
+         me(i) = mi;
+
+         // Start with the diagonal from -K_e.
+         kdiag_e(i) = -Ke(i, i);
+      }
+
+      // Add diagonal contributions from the diffusion D_e:
+      // D_e has off-diagonal entries d_ij >= 0 and diagonal entries
+      // (D_e)_{ii} = -sum_{j != i} d_ij.
+      for (int i = 0; i < nd; i++)
+      {
+         for (int j = 0; j < i; j++)
+         {
+            const real_t d_ij =
+               std::max(std::max(Ke(i, j), Ke(j, i)), real_t(0.0));
+            kdiag_e(i) -= d_ij;
+            kdiag_e(j) -= d_ij;
+         }
+      }
+
+      // Per-element time step estimate (ignores overlap).
+      for (int i = 0; i < nd; i++)
+      {
+         if (kdiag_e(i) < 0.0)
+         {
+            dt_local = std::min(dt_local, me(i) / (-kdiag_e(i)));
+         }
+      }
+
+      // Contribute to the globally assembled diagonal.
+      for (int i = 0; i < nd; i++) { kdiag(dofs[i]) += kdiag_e(i); }
+   }
+
+   // Add boundary flow contribution (diagonal) from the LO evolution operator.
+   // Note: In this example set-up this is typically zero.
+   kdiag += b_lumped;
+
+#ifdef MFEM_USE_MPI
+   if (pfes)
+   {
+      // Sum K_LO diagonal contributions over shared DOFs.
+      Array<real_t> kdiag_array(kdiag.GetData(), kdiag.Size());
+      pfes->GroupComm().Reduce<real_t>(kdiag_array, GroupCommunicator::Sum);
+      pfes->GroupComm().Bcast(kdiag_array);
+   }
+#endif
+
+   // Global (assembled) estimate.
+   dt_global = std::numeric_limits<real_t>::infinity();
+   for (int i = 0; i < kdiag.Size(); i++)
+   {
+      if (kdiag(i) < 0.0)
+      {
+         dt_global = std::min(dt_global, lumpedmassmatrix(i) / (-kdiag(i)));
+      }
+   }
+
+#ifdef MFEM_USE_MPI
+   if (pfes)
+   {
+      // Reduce to a global minimum over all MPI ranks.
+      real_t dt_local_glob = dt_local;
+      real_t dt_global_glob = dt_global;
+      MPI_Allreduce(&dt_local, &dt_local_glob, 1, MPITypeMap<real_t>::mpi_type,
+                    MPI_MIN, pfes->GetComm());
+      MPI_Allreduce(&dt_global, &dt_global_glob, 1,
+                    MPITypeMap<real_t>::mpi_type, MPI_MIN, pfes->GetComm());
+      dt_local = dt_local_glob;
+      dt_global = dt_global_glob;
+   }
+#endif
+}
+
+void HighOrderTargetScheme::Mult(const Vector &x, Vector &y) const
+{
+   y = 0.0;
+
+   // compute low-order time derivative for high-order stabilization
+   ComputeLOTimeDerivatives(x, udot);
+
+   Array<int> dofs;
+   for (int e = 0; e < fes.GetNE(); e++)
+   {
+      auto element = fes.GetFE(e);
+      auto eltrans = fes.GetElementTransformation(e);
+
+      // assemble element mass and convection matrices
+      conv_int.AssembleElementMatrix(*element, *eltrans, Ke);
+      mass_int.AssembleElementMatrix(*element, *eltrans, Me);
+
+      fes.GetElementDofs(e, dofs);
+      ue.SetSize(dofs.Size());
+      re.SetSize(dofs.Size());
+      udote.SetSize(dofs.Size());
+
+      x.GetSubVector(dofs, ue);
+      udot.GetSubVector(dofs, udote);
+
+      re = 0.0;
+      for (int i = 0; i < dofs.Size(); i++)
+      {
+         for (int j = 0; j < i; j++)
+         {
+            // add high-order stabilization without correction for low-order
+            // stabilization
+            real_t fije = Me(i,j) * (udote(i) - udote(j));
+            re(i) += fije;
+            re(j) -= fije;
+         }
+      }
+
+      // add convective term and add to global vector
+      Ke.AddMult(ue, re, -1.0);
+      y.AddElementVector(dofs, re);
+   }
+
+   // add boundary condition (u - u_inflow) * b (u - u_inflow) * b
+   subtract(x, u_inflow, z);
+   z *= b_lumped;
+   y += z;
+
+#ifdef MFEM_USE_MPI
+   if (pfes)
+   {
+      // Sum over the shared DOFs.
+      Array<real_t> y_array(y.GetData(), y.Size());
+      pfes->GroupComm().Reduce<real_t>(y_array, GroupCommunicator::Sum);
+      pfes->GroupComm().Bcast(y_array);
+   }
+#endif
+
+   // apply inverse lumped mass matrix
+   y /= lumpedmassmatrix;
+}
+
+void ClipAndScale::ComputeBounds(const Vector &u,
+                                 Array<real_t> &u_min,
+                                 Array<real_t> &u_max) const
+{
+   // iterate over local number of dofs on this processor
+   // and compute maximum and minimum over local stencil
+   for (int i = 0; i < fes.GetVSize(); i++)
+   {
+      umin[i] = u(i);
+      umax[i] = u(i);
+
+      for (int k = I[i]; k < I[i+1]; k++)
+      {
+         int j = J[k];
+         umin[i] = std::min(umin[i], u(j));
+         umax[i] = std::max(umax[i], u(j));
+      }
+   }
+
+#ifdef MFEM_USE_MPI
+   if (pfes)
+   {
+      // Reduce min and max over the shared DOFs.
+      pfes->GroupComm().Reduce<real_t>(umax, GroupCommunicator::Max);
+      pfes->GroupComm().Bcast(umax);
+      pfes->GroupComm().Reduce<real_t>(umin, GroupCommunicator::Min);
+      pfes->GroupComm().Bcast(umin);
+   }
+#endif
+}
+
+void ClipAndScale::Mult(const Vector &x, Vector &y) const
+{
+   y = 0.0;
+
+   // compute low-order time derivative for high-order
+   // stabilization and local bounds
+   ComputeLOTimeDerivatives(x, udot);
+   ComputeBounds(x, umin, umax);
+
+   Array<int> dofs;
+   for (int e = 0; e < fes.GetNE(); e++)
+   {
+      auto element = fes.GetFE(e);
+      auto eltrans = fes.GetElementTransformation(e);
+
+      // assemble element mass and convection matrices
+      conv_int.AssembleElementMatrix(*element, *eltrans, Ke);
+      mass_int.AssembleElementMatrix(*element, *eltrans, Me);
+
+      fes.GetElementDofs(e, dofs);
+      ue.SetSize(dofs.Size());
+      re.SetSize(dofs.Size());
+      udote.SetSize(dofs.Size());
+      fe.SetSize(dofs.Size());
+      fe_star.SetSize(dofs.Size());
+      gammae.SetSize(dofs.Size());
+
+      x.GetSubVector(dofs, ue);
+      udot.GetSubVector(dofs, udote);
+
+      re = 0.0;
+      fe = 0.0;
+      gammae = 0.0;
+      for (int i = 0; i < dofs.Size(); i++)
+      {
+         for (int j = 0; j < i; j++)
+         {
+            // add low-order diffusion
+            real_t dije = std::max(std::max(Ke(i,j), Ke(j,i)), real_t(0.0));
+            real_t diffusion = dije * (ue(j) - ue(i));
+
+            re(i) += diffusion;
+            re(j) -= diffusion;
+
+            // for bounding fluxes
+            gammae(i) += dije;
+            gammae(j) += dije;
+
+            // assemble raw antidifussive fluxes
+            // note that fije = - fjie
+            real_t fije = Me(i,j) * (udote(i) - udote(j)) - diffusion;
+            fe(i) += fije;
+            fe(j) -= fije;
+         }
+      }
+
+      // add convective term
+      Ke.AddMult(ue, re, -1.0);
+
+      gammae *= 2.0;
+
+      real_t P_plus = 0.0;
+      real_t P_minus = 0.0;
+
+      //Clip
+      for (int i = 0; i < dofs.Size(); i++)
+      {
+         // bounding fluxes to enforce u_i = u_i_min implies du/dt >= 0
+         // and u_i = u_i_max implies du/dt <= 0
+         real_t fie_max = gammae(i) * (umax[dofs[i]] - ue(i));
+         real_t fie_min = gammae(i) * (umin[dofs[i]] - ue(i));
+
+         fe_star(i) = std::min(std::max(fie_min, fe(i)), fie_max);
+
+         // track positive and negative contributions s
+         P_plus += std::max(fe_star(i), real_t(0.0));
+         P_minus += std::min(fe_star(i), real_t(0.0));
+      }
+      const real_t P = P_minus + P_plus;
+
+      //and Scale for the sum of fe_star to be 0, i.e., mass conservation
+      for (int i = 0; i < dofs.Size(); i++)
+      {
+         if (fe_star(i) > 0.0 && P > 0.0)
+         {
+            fe_star(i) *= - P_minus / P_plus;
+         }
+         else if (fe_star(i) < 0.0 && P < 0.0)
+         {
+            fe_star(i) *= - P_plus / P_minus;
+         }
+      }
+      // add limited antidiffusive fluxes to element contribution
+      // and add to global vector
+      re += fe_star;
+      y.AddElementVector(dofs, re);
+   }
+
+   // add boundary condition (u - u_inflow) * b
+   subtract(x, u_inflow, z);
+   z *= b_lumped;
+   y += z;
+
+#ifdef MFEM_USE_MPI
+   if (pfes)
+   {
+      // Sum over the shared DOFs.
+      Array<real_t> y_array(y.GetData(), y.Size());
+      pfes->GroupComm().Reduce<real_t>(y_array, GroupCommunicator::Sum);
+      pfes->GroupComm().Bcast(y_array);
+   }
+#endif
+
+   // apply inverse lumped mass matrix
+   y /= lumpedmassmatrix;
+}
+
+} // namespace mfem
@@ -2,14 +2,14 @@
 //
 // Compile with: make ex9p
 //
-// Sample runs:
+// DG sample runs:
 //    mpirun -np 4 ex9p -m ../data/periodic-segment.mesh -p 0 -dt 0.005
 //    mpirun -np 4 ex9p -m ../data/periodic-square.mesh -p 0 -dt 0.01
 //    mpirun -np 4 ex9p -m ../data/periodic-hexagon.mesh -p 0 -dt 0.01
 //    mpirun -np 4 ex9p -m ../data/periodic-square.mesh -p 1 -dt 0.005 -tf 9
 //    mpirun -np 4 ex9p -m ../data/periodic-hexagon.mesh -p 1 -dt 0.005 -tf 9
 //    mpirun -np 4 ex9p -m ../data/amr-quad.mesh -p 1 -rp 1 -dt 0.002 -tf 9
-//    mpirun -np 4 ex9p -m ../data/amr-quad.mesh -p 1 -rp 1 -dt 0.02 -s 23 -tf 9
+//    mpirun -np 4 ex9p -m ../data/amr-quad.mesh -p 1 -rp 1 -dt 0.02 -s 13 -tf 9
 //    mpirun -np 4 ex9p -m ../data/star-q3.mesh -p 1 -rp 1 -dt 0.004 -tf 9
 //    mpirun -np 4 ex9p -m ../data/star-mixed.mesh -p 1 -rp 1 -dt 0.004 -tf 9
 //    mpirun -np 4 ex9p -m ../data/disc-nurbs.mesh -p 1 -rp 1 -dt 0.005 -tf 9
@@ -20,7 +20,24 @@
 //    mpirun -np 4 ex9p -m ../data/periodic-cube.msh -p 0 -rs 1 -o 2 -tf 2
 //    mpirun -np 3 ex9p -m ../data/amr-hex.mesh -p 1 -rs 1 -rp 0 -dt 0.005 -tf 0.5
 //
-// Device sample runs:
+// CG sample runs:
+//    mpirun -np 4 ex9p -m ../data/periodic-segment.mesh -p 0 -rp 5 -dt 0.00025 -sc 11 -o 1 -s 2 -vs 200
+//    mpirun -np 4 ex9p -m ../data/periodic-segment.mesh -p 0 -rp 5 -dt 0.00025 -sc 12 -o 1 -s 2 -vs 200
+//    mpirun -np 4 ex9p -m ../data/periodic-segment.mesh -p 0 -rp 5 -dt 0.00025 -sc 13 -o 1 -s 2 -vs 200
+//    mpirun -np 4 ex9p -m ../data/periodic-square.mesh -p 0 -rp 1 -dt 0.0025 -tf 2 -vs 20 -sc 11 -s 3 -o 2
+//    mpirun -np 4 ex9p -m ../data/periodic-hexagon.mesh -p 0 -rp 1 -dt 0.0025 -tf 2 -vs 20 -sc 11
+//    mpirun -np 4 ex9p -m ../data/periodic-square.mesh -p 1 -rp 3 -dt 0.002 -tf 9 -sc 11 -o 1 -s 2 -vs 20
+//    mpirun -np 4 ex9p -m ../data/periodic-square.mesh -p 1 -rp 1 -dt 0.002 -tf 9 -sc 11 -vs 20
+//    mpirun -np 4 ex9p -m ../data/periodic-square.mesh -p 1 -rp 3 -dt 0.002 -tf 9 -sc 13 -o 1 -s 2 -vs 20
+//    mpirun -np 4 ex9p -m ../data/star-mixed.mesh -p 1 -rp 2 -dt 0.004 -tf 9 -vs 20 -sc 11 -o 1 -s 2
+//    mpirun -np 4 ex9p -m ../data/star-q3.mesh -p 1 -rp 2 -dt 0.004 -tf 9 -vs 20 -sc 11 -o 1 -s 2
+//    mpirun -np 4 ex9p -m ../data/disc-nurbs.mesh -p 1 -rp 1 -dt 0.005 -tf 9 -sc 11 -vs 20
+//    mpirun -np 4 ex9p -m ../data/disc-nurbs.mesh -p 2 -rp 2 -dt 0.005 -tf 9 -sc 12 -s 3 -o 2 -vs 20
+//    mpirun -np 4 ex9p -m ../data/periodic-square.mesh -p 3 -rp 4 -dt 0.0025 -tf 9 -vs 20 -sc 11 -s 2 -o 1
+//    mpirun -np 4 ex9p -m ../data/periodic-cube.mesh -p 0 -o 2 -s 3 -rp 1 -dt 0.01 -tf 8 -sc 11
+//    mpirun -np 4 ex9p -m ../data/periodic-cube.msh -p 0 -rp 1 -o 2 -s 3 -tf 2 -sc 11
+//
+// Device sample runs (DG only):
 //    mpirun -np 4 ex9p -pa
 //    mpirun -np 4 ex9p -ea
 //    mpirun -np 4 ex9p -fa
@@ -43,10 +60,15 @@
 //               with VisIt (visit.llnl.gov) and ParaView (paraview.org), as
 //               well as the optional saving with ADIOS2 (adios2.readthedocs.io)
 //               are also illustrated.
+//               Additionally, the example showcases the parallel implementation
+//               of an element-based Clip & Scale limiter for continuous finite
+//               elements, which is designed to be bound-preserving.
+//               For more detail, see https://doi.org/10.1142/13466.

 #include "mfem.hpp"
 #include <fstream>
 #include <iostream>
+#include "ex9.hpp"

 using namespace std;
 using namespace mfem;
@@ -64,6 +86,9 @@ real_t u0_function(const Vector &x);
 // Inflow boundary condition
 real_t inflow_function(const Vector &x);

+// Function f = 1 for lumped boundary operator
+real_t one(const Vector &x) {return 1.0;}
+
 // Mesh bounding box
 Vector bb_min, bb_max;

@@ -92,7 +117,7 @@ private:
 public:
   AIR_prec(int blocksize_) : AIR_solver(NULL), blocksize(blocksize_) { }

-   void SetOperator(const Operator &op) override
+   void SetOperator(const Operator &op)
   {
      width = op.Width();
      height = op.Height();
@@ -110,7 +135,7 @@ public:
      AIR_solver->SetMaxLevels(50);
   }

-   void Mult(const Vector &x, Vector &y) const override
+   virtual void Mult(const Vector &x, Vector &y) const
   {
      // Scale the rhs by block inverse and solve system
      HypreParVector z_s;
@@ -119,7 +144,7 @@ public:
      AIR_solver->Mult(z_s, y);
   }

-   ~AIR_prec() override
+   ~AIR_prec()
   {
      delete AIR_solver;
   }
@@ -137,7 +162,8 @@ private:
   Solver *prec;
   real_t dt;
 public:
-   DG_Solver(HypreParMatrix &M_, HypreParMatrix &K_, const FiniteElementSpace &fes,
+   DG_Solver(HypreParMatrix &M_, HypreParMatrix &K_,
+             const FiniteElementSpace &fes,
             PrecType prec_type)
      : M(M_),
        K(K_),
@@ -185,17 +211,17 @@ public:
      }
   }

-   void SetOperator(const Operator &op) override
+   void SetOperator(const Operator &op)
   {
      linear_solver.SetOperator(op);
   }

-   void Mult(const Vector &x, Vector &y) const override
+   virtual void Mult(const Vector &x, Vector &y) const
   {
      linear_solver.Mult(x, y);
   }

-   ~DG_Solver() override
+   ~DG_Solver()
   {
      delete prec;
      delete A;
@@ -208,7 +234,7 @@ public:
    and advection matrices, and b describes the flow on the boundary. This can
    be written as a general ODE, du/dt = M^{-1} (K u + b), and this class is
    used to evaluate the right-hand side. */
-class FE_Evolution : public TimeDependentOperator
+class DG_FE_Evolution : public TimeDependentOperator
 {
 private:
   OperatorHandle M, K;
@@ -220,16 +246,15 @@ private:
   mutable Vector z;

 public:
-   FE_Evolution(ParBilinearForm &M_, ParBilinearForm &K_, const Vector &b_,
-                PrecType prec_type);
+   DG_FE_Evolution(ParBilinearForm &M_, ParBilinearForm &K_, const Vector &b_,
+                   PrecType prec_type);

-   void Mult(const Vector &x, Vector &y) const override;
-   void ImplicitSolve(const real_t dt, const Vector &x, Vector &k) override;
+   virtual void Mult(const Vector &x, Vector &y) const;
+   virtual void ImplicitSolve(const real_t dt, const Vector &x, Vector &k);

-   ~FE_Evolution() override;
+   virtual ~DG_FE_Evolution();
 };

-
 int main(int argc, char *argv[])
 {
   // 1. Initialize MPI and HYPRE.
@@ -249,6 +274,7 @@ int main(int argc, char *argv[])
   bool fa = false;
   const char *device_config = "cpu";
   int ode_solver_type = 4;
+   int scheme = 1;
   real_t t_final = 10.0;
   real_t dt = 0.01;
   bool visualization = true;
@@ -285,7 +311,17 @@ int main(int argc, char *argv[])
   args.AddOption(&device_config, "-d", "--device",
                  "Device configuration string, see Device::Configure().");
   args.AddOption(&ode_solver_type, "-s", "--ode-solver",
-                  ODESolver::Types.c_str());
+                  "ODE solver: 1 - Forward Euler,\n\t"
+                  "            2 - RK2 SSP, 3 - RK3 SSP, 4 - RK4, 6 - RK6,\n\t"
+                  "            11 - Backward Euler,\n\t"
+                  "            12 - SDIRK23 (L-stable), 13 - SDIRK33,\n\t"
+                  "            22 - Implicit Midpoint Method,\n\t"
+                  "            23 - SDIRK23 (A-stable), 24 - SDIRK34");
+   args.AddOption(&scheme, "-sc", "--scheme",
+                  "FE scheme: 1 - DG high-order, unstabilized,\n\t"
+                  "           11 - CG low-order,\n\t"
+                  "           12 - CG high-order, stabilized,\n\t"
+                  "           13 - CG high-order, stabilized, limited.");
   args.AddOption(&t_final, "-tf", "--t-final",
                  "Final time; start time is 0.");
   args.AddOption(&dt, "-dt", "--time-step",
@@ -323,17 +359,82 @@ int main(int argc, char *argv[])
      args.PrintOptions(cout);
   }

+   const bool DG = (scheme < 10);
+
+   // Limiter is only implemented to run on cpu.
+   if (!DG && strcmp(device_config, "cuda") == 0)
+   {
+      if (Mpi::Root())
+      {
+         cout << "Cuda not supported for this CG implementation" << endl;
+      }
+      return 2;
+   }
+
   Device device(device_config);
-   if (Mpi::Root()) { device.Print(); }
+   if (Mpi::Root())
+   {
+      device.Print();
+   }

   // 3. Read the serial mesh from the given mesh file on all processors. We can
   //    handle geometrically periodic meshes in this code.
   Mesh *mesh = new Mesh(mesh_file, 1, 1);
   int dim = mesh->Dimension();

-   // 4. Define the ODE solver used for time integration. Several explicit
-   //    Runge-Kutta methods are available.
-   unique_ptr<ODESolver> ode_solver = ODESolver::Select(ode_solver_type);
+   // Nonconforming meshes are not feasible for continuous elements
+   if (!DG && !mesh->Conforming())
+   {
+      if (Mpi::Root())
+      {
+         cout << "CG needs a conforming mesh." << endl;
+      }
+      return 3;
+   }
+
+   // 4. Define the ODE solver used for time integration.
+   //    Several explicit Runge-Kutta methods are available.
+   //    The CG Limiter is only implemented for explicit
+   //    time-stepping methods.
+   if (!DG && ode_solver_type > 10)
+   {
+      cout << "The CG methods are supported only with explicit RK schemes.\n";
+      return 4;
+   }
+   // Limiter and low order scheme are only provably
+   // bound preserving when employing SSP-RK time-stepping methods
+   else if ((scheme == 11 || scheme == 13) && ode_solver_type > 3)
+   {
+      if (Mpi::Root())
+      {
+         MFEM_WARNING("Non-SSP-RK mehod! Bounds might be violated.");
+      }
+   }
+   unique_ptr<ODESolver> ode_solver = nullptr;
+   switch (ode_solver_type)
+   {
+      // Explicit methods
+      case 1: ode_solver.reset(new ForwardEulerSolver); break;
+      case 2: ode_solver.reset(new RK2Solver(1.0)); break;
+      case 3: ode_solver.reset(new RK3SSPSolver); break;
+      case 4: ode_solver.reset(new RK4Solver); break;
+      case 6: ode_solver.reset(new RK6Solver); break;
+      // Implicit (L-stable) methods
+      case 11: ode_solver.reset(new BackwardEulerSolver); break;
+      case 12: ode_solver.reset(new SDIRK23Solver(2)); break;
+      case 13: ode_solver.reset(new SDIRK33Solver); break;
+      // Implicit A-stable methods (not L-stable)
+      case 22: ode_solver.reset(new ImplicitMidpointSolver); break;
+      case 23: ode_solver.reset(new SDIRK23Solver); break;
+      case 24: ode_solver.reset(new SDIRK34Solver); break;
+      default:
+         if (Mpi::Root())
+         {
+            cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
+         }
+         delete mesh;
+         return 5;
+   }

   // 5. Refine the mesh in serial to increase the resolution. In this example
   //    we do 'ser_ref_levels' of uniform refinement, where 'ser_ref_levels' is
@@ -352,17 +453,31 @@ int main(int argc, char *argv[])
   // 6. Define the parallel mesh by a partitioning of the serial mesh. Refine
   //    this mesh further in parallel to increase the resolution. Once the
   //    parallel mesh is defined, the serial mesh can be deleted.
-   ParMesh *pmesh = new ParMesh(MPI_COMM_WORLD, *mesh);
+   ParMesh pmesh(MPI_COMM_WORLD, *mesh);
   delete mesh;
   for (int lev = 0; lev < par_ref_levels; lev++)
   {
-      pmesh->UniformRefinement();
+      pmesh.UniformRefinement();
   }

-   // 7. Define the parallel discontinuous DG finite element space on the
-   //    parallel refined mesh of the given polynomial order.
-   DG_FECollection fec(order, dim, BasisType::GaussLobatto);
-   ParFiniteElementSpace *fes = new ParFiniteElementSpace(pmesh, &fec);
+   // 7. Define the parallel discontinuous DG finite element or continuouts CG
+   // space on the parallel refined mesh of the given polynomial order.
+   DG_FECollection fec_DG(order, dim, BasisType::GaussLobatto);
+   H1_FECollection fec_CG(order, dim, BasisType::Positive);
+   unique_ptr<ParFiniteElementSpace> fes = nullptr;
+   switch (scheme)
+   {
+      case 1: fes.reset(new ParFiniteElementSpace(&pmesh, &fec_DG)); break;
+      case 11:
+      case 12:
+      case 13: fes.reset(new ParFiniteElementSpace(&pmesh, &fec_CG)); break;
+      default:
+         if (Mpi::Root())
+         {
+            cout << "Unknown scheme: " << scheme << '\n';
+         }
+         return 6;
+   }

   HYPRE_BigInt global_vSize = fes->GlobalTrueVSize();
   if (Mpi::Root())
@@ -377,52 +492,82 @@ int main(int argc, char *argv[])
   FunctionCoefficient inflow(inflow_function);
   FunctionCoefficient u0(u0_function);

-   ParBilinearForm *m = new ParBilinearForm(fes);
-   ParBilinearForm *k = new ParBilinearForm(fes);
-   if (pa)
+   ParBilinearForm m(fes.get());
+   ParBilinearForm k(fes.get());
+   if (DG)
   {
-      m->SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      k->SetAssemblyLevel(AssemblyLevel::PARTIAL);
+      if (pa)
+      {
+         m.SetAssemblyLevel(AssemblyLevel::PARTIAL);
+         k.SetAssemblyLevel(AssemblyLevel::PARTIAL);
+      }
+      else if (ea)
+      {
+         m.SetAssemblyLevel(AssemblyLevel::ELEMENT);
+         k.SetAssemblyLevel(AssemblyLevel::ELEMENT);
+      }
+      else if (fa)
+      {
+         m.SetAssemblyLevel(AssemblyLevel::FULL);
+         k.SetAssemblyLevel(AssemblyLevel::FULL);
+      }
   }
-   else if (ea)
+   else if (scheme == 13 && (pa || ea))
   {
-      m->SetAssemblyLevel(AssemblyLevel::ELEMENT);
-      k->SetAssemblyLevel(AssemblyLevel::ELEMENT);
-   }
-   else if (fa)
-   {
-      m->SetAssemblyLevel(AssemblyLevel::FULL);
-      k->SetAssemblyLevel(AssemblyLevel::FULL);
+      if (Mpi::Root())
+      {
+         cout << "The CG Limiter needs full assembly of the mass matrix to "
+              << "obtain the local stencil via its sparsity pattern.\n";
+      }
+      return 7;
   }

-   m->AddDomainIntegrator(new MassIntegrator);
+   m.AddDomainIntegrator(new MassIntegrator);
+   m.Assemble();
+   m.Finalize();
+
   constexpr real_t alpha = -1.0;
-   k->AddDomainIntegrator(new ConvectionIntegrator(velocity, alpha));
-   k->AddInteriorFaceIntegrator(
-      new NonconservativeDGTraceIntegrator(velocity, alpha));
-   k->AddBdrFaceIntegrator(
-      new NonconservativeDGTraceIntegrator(velocity, alpha));
-
-   ParLinearForm *b = new ParLinearForm(fes);
-   b->AddBdrFaceIntegrator(
-      new BoundaryFlowIntegrator(inflow, velocity, alpha));
-
   int skip_zeros = 0;
-   m->Assemble();
-   k->Assemble(skip_zeros);
-   b->Assemble();
-   m->Finalize();
-   k->Finalize(skip_zeros);
+   Vector lumpedmassmatrix(m.Height());

+   // The convective bilinear form is not needed in the CG case.
+   if (DG)
+   {
+      k.AddDomainIntegrator(new ConvectionIntegrator(velocity, alpha));
+      k.AddInteriorFaceIntegrator(
+         new NonconservativeDGTraceIntegrator(velocity, alpha));
+      k.AddBdrFaceIntegrator(
+         new NonconservativeDGTraceIntegrator(velocity, alpha));

-   HypreParVector *B = b->ParallelAssemble();
+      k.Assemble(skip_zeros);
+      k.Finalize(skip_zeros);
+   }
+   // lumped mass matrix not needed in the DG case
+   else
+   {
+      ParBilinearForm mL(fes.get());
+      mL.AddDomainIntegrator(new LumpedIntegrator(new MassIntegrator));
+      mL.Assemble();
+      mL.Finalize();
+      mL.SpMat().GetDiag(lumpedmassmatrix);
+   }
+
+   ParLinearForm b(fes.get());
+   b.AddBdrFaceIntegrator(new BoundaryFlowIntegrator(inflow, velocity, alpha));
+   b.Assemble();
+   unique_ptr<HypreParVector> B(b.ParallelAssemble());

   // 9. Define the initial conditions, save the corresponding grid function to
   //    a file and (optionally) save data in the VisIt format and initialize
   //    GLVis visualization.
-   ParGridFunction *u = new ParGridFunction(fes);
-   u->ProjectCoefficient(u0);
-   HypreParVector *U = u->GetTrueDofs();
+   ParGridFunction u(fes.get());
+   u.ProjectCoefficient(u0);
+
+   // DG uses a HypreParVector to communicate between processess.
+   // In the implementation of the element-based Clip & Scale limiter we do
+   // this by hand.
+   unique_ptr<HypreParVector> U = nullptr;
+   if (DG) { U.reset(u.GetTrueDofs()); }

   {
      ostringstream mesh_name, sol_name;
@@ -430,15 +575,15 @@ int main(int argc, char *argv[])
      sol_name << "ex9-init." << setfill('0') << setw(6) << myid;
      ofstream omesh(mesh_name.str().c_str());
      omesh.precision(precision);
-      pmesh->Print(omesh);
+      pmesh.Print(omesh);
      ofstream osol(sol_name.str().c_str());
      osol.precision(precision);
-      u->Save(osol);
+      u.Save(osol);
   }

   // Create data collection for solution output: either VisItDataCollection for
   // ascii data files, or SidreDataCollection for binary data files.
-   DataCollection *dc = NULL;
+   unique_ptr<DataCollection> dc = nullptr;
   if (visit)
   {
      if (binary)
@@ -451,23 +596,23 @@ int main(int argc, char *argv[])
      }
      else
      {
-         dc = new VisItDataCollection("Example9-Parallel", pmesh);
+         dc.reset(new VisItDataCollection("Example9-Parallel", &pmesh));
         dc->SetPrecision(precision);
         // To save the mesh using MFEM's parallel mesh format:
         // dc->SetFormat(DataCollection::PARALLEL_FORMAT);
      }
-      dc->RegisterField("solution", u);
+      dc->RegisterField("solution", &u);
      dc->SetCycle(0);
      dc->SetTime(0.0);
      dc->Save();
   }

-   ParaViewDataCollection *pd = NULL;
+   unique_ptr<ParaViewDataCollection> pd = nullptr;
   if (paraview)
   {
-      pd = new ParaViewDataCollection("Example9P", pmesh);
+      pd.reset(new ParaViewDataCollection("Example9P", &pmesh));
      pd->SetPrefixPath("ParaView");
-      pd->RegisterField("solution", u);
+      pd->RegisterField("solution", &u);
      pd->SetLevelsOfDetail(order);
      pd->SetDataFormat(VTKFormat::BINARY);
      pd->SetHighOrderOutput(true);
@@ -479,7 +624,7 @@ int main(int argc, char *argv[])
   // Optionally output a BP (binary pack) file using ADIOS2. This can be
   // visualized with the ParaView VTX reader.
 #ifdef MFEM_USE_ADIOS2
-   ADIOS2DataCollection *adios2_dc = NULL;
+   unique_ptr<ADIOS2DataCollection> adios2_dc = nullptr;
   if (adios2)
   {
      std::string postfix(mesh_file);
@@ -487,7 +632,7 @@ int main(int argc, char *argv[])
      postfix += "_o" + std::to_string(order);
      const std::string collection_name = "ex9-p-" + postfix + ".bp";

-      adios2_dc = new ADIOS2DataCollection(MPI_COMM_WORLD, collection_name, pmesh);
+      adios2_dc.reset(ADIOS2DataCollection(MPI_COMM_WORLD, collection_name, pmesh));
      // output data substreams are half the number of mpi processes
      adios2_dc->SetParameter("SubStreams", std::to_string(num_procs/2) );
      // adios2_dc->SetLevelsOfDetail(2);
@@ -521,7 +666,7 @@ int main(int argc, char *argv[])
      {
         sout << "parallel " << num_procs << " " << myid << "\n";
         sout.precision(precision);
-         sout << "solution\n" << *pmesh << *u;
+         sout << "solution\n" << pmesh << u;
         sout << "pause\n";
         sout << flush;
         if (Mpi::Root())
@@ -535,19 +680,50 @@ int main(int argc, char *argv[])
   // 10. Define the time-dependent evolution operator describing the ODE
   //     right-hand side, and perform time-integration (looping over the time
   //     iterations, ti, with a time-step dt).
-   FE_Evolution adv(*m, *k, *B, prec_type);
+   unique_ptr<TimeDependentOperator> adv = nullptr;
+   switch (scheme)
+   {
+      case 1: adv.reset(new DG_FE_Evolution(m, k, *B, prec_type)); break;
+      case 11: adv.reset(new LowOrderScheme(*fes, lumpedmassmatrix,
+                                               inflow, velocity, m)); break;
+      case 12: adv.reset(new HighOrderTargetScheme(*fes, lumpedmassmatrix,
+                                                      inflow, velocity, m)); break;
+      case 13: adv.reset(new ClipAndScale(*fes, lumpedmassmatrix,
+                                             inflow, velocity, m)); break;
+   }
+
+   if (!DG)
+   {
+      auto *cg_adv = dynamic_cast<CG_FE_Evolution *>(adv.get());
+      MFEM_VERIFY(cg_adv != NULL, "Expected a CG_FE_Evolution operator.");
+
+      real_t dt_lo_local = 0.0, dt_lo_global = 0.0;
+      cg_adv->ComputeLOTimeStepEstimates(dt_lo_local, dt_lo_global);
+      if (Mpi::Root())
+      {
+         cout << "CG low-order time step estimate (local matrices):  "
+              << dt_lo_local << '\n';
+         cout << "CG low-order time step estimate (global assembled): "
+              << dt_lo_global << '\n';
+         std::cout << dt_lo_global / dt_lo_local << std::endl;
+         cout << "Commandl line dt: " << dt << std::endl;
+      }
+      // dt = dt_lo_global;
+   }

   real_t t = 0.0;
-   adv.SetTime(t);
-   ode_solver->Init(adv);
+   adv->SetTime(t);
+   ode_solver->Init(*adv);

   bool done = false;
   for (int ti = 0; !done; )
   {
      real_t dt_real = min(dt, t_final - t);
-      ode_solver->Step(*U, t, dt_real);
-      ti++;

+      if (DG) { ode_solver->Step(*U, t, dt_real); }
+      else    { ode_solver->Step(u, t, dt_real); }
+
+      ti++;
      done = (t >= t_final - 1e-8*dt);

      if (done || ti % vis_steps == 0)
@@ -557,14 +733,15 @@ int main(int argc, char *argv[])
            cout << "time step: " << ti << ", time: " << t << endl;
         }

-         // 11. Extract the parallel grid function corresponding to the finite
-         //     element approximation U (the local solution on each processor).
-         *u = *U;
+         // 11. In case of DG extract the parallel grid function corresponding
+         //     to the finite element approximation U.
+         //     (the local solution on each processor).
+         if (DG) { u = *U; }

         if (visualization)
         {
            sout << "parallel " << num_procs << " " << myid << "\n";
-            sout << "solution\n" << *pmesh << *u << flush;
+            sout << "solution\n" << pmesh << u << flush;
         }

         if (visit)
@@ -596,39 +773,23 @@ int main(int argc, char *argv[])
   // 12. Save the final solution in parallel. This output can be viewed later
   //     using GLVis: "glvis -np <np> -m ex9-mesh -g ex9-final".
   {
-      *u = *U;
      ostringstream sol_name;
      sol_name << "ex9-final." << setfill('0') << setw(6) << myid;
      ofstream osol(sol_name.str().c_str());
      osol.precision(precision);
-      u->Save(osol);
+      u.Save(osol);
   }

-   // 13. Free the used memory.
-   delete U;
-   delete u;
-   delete B;
-   delete b;
-   delete k;
-   delete m;
-   delete fes;
-   delete pmesh;
-   delete pd;
-#ifdef MFEM_USE_ADIOS2
-   if (adios2)
-   {
-      delete adios2_dc;
-   }
-#endif
-   delete dc;
+   ConstantCoefficient zero(0.0);
+   std::cout << "Norm: " << u.ComputeL2Error(zero) << std::endl;

   return 0;
 }


-// Implementation of class FE_Evolution
-FE_Evolution::FE_Evolution(ParBilinearForm &M_, ParBilinearForm &K_,
-                           const Vector &b_, PrecType prec_type)
+// Implementation of class DG_FE_Evolution
+DG_FE_Evolution::DG_FE_Evolution(ParBilinearForm &M_, ParBilinearForm &K_,
+                                 const Vector &b_, PrecType prec_type)
   : TimeDependentOperator(M_.ParFESpace()->GetTrueVSize()), b(b_),
     M_solver(M_.ParFESpace()->GetComm()),
     z(height)
@@ -674,7 +835,7 @@ FE_Evolution::FE_Evolution(ParBilinearForm &M_, ParBilinearForm &K_,
 //    u_t = M^{-1}(Ku + b),
 // by solving associated linear system
 //    (M - dt*K) d = K*u + b
-void FE_Evolution::ImplicitSolve(const real_t dt, const Vector &x, Vector &k)
+void DG_FE_Evolution::ImplicitSolve(const real_t dt, const Vector &x, Vector &k)
 {
   K->Mult(x, z);
   z += b;
@@ -682,7 +843,7 @@ void FE_Evolution::ImplicitSolve(const real_t dt, const Vector &x, Vector &k)
   dg_solver->Mult(z, k);
 }

-void FE_Evolution::Mult(const Vector &x, Vector &y) const
+void DG_FE_Evolution::Mult(const Vector &x, Vector &y) const
 {
   // y = M^{-1} (K x + b)
   K->Mult(x, z);
@@ -690,13 +851,12 @@ void FE_Evolution::Mult(const Vector &x, Vector &y) const
   M_solver.Mult(z, y);
 }

-FE_Evolution::~FE_Evolution()
+DG_FE_Evolution::~DG_FE_Evolution()
 {
   delete M_prec;
   delete dg_solver;
 }

-
 // Velocity coefficient
 void velocity_function(const Vector &x, Vector &v)
 {
@@ -717,9 +877,17 @@ void velocity_function(const Vector &x, Vector &v)
         // Translations in 1D, 2D, and 3D
         switch (dim)
         {
-            case 1: v(0) = 1.0; break;
-            case 2: v(0) = sqrt(2./3.); v(1) = sqrt(1./3.); break;
-            case 3: v(0) = sqrt(3./6.); v(1) = sqrt(2./6.); v(2) = sqrt(1./6.);
+            case 1:
+               v(0) = 1.0;
+               break;
+            case 2:
+               v(0) = sqrt(2./3.);
+               v(1) = sqrt(1./3.);
+               break;
+            case 3:
+               v(0) = sqrt(3./6.);
+               v(1) = sqrt(2./6.);
+               v(2) = sqrt(1./6.);
               break;
         }
         break;
@@ -731,9 +899,18 @@ void velocity_function(const Vector &x, Vector &v)
         const real_t w = M_PI/2;
         switch (dim)
         {
-            case 1: v(0) = 1.0; break;
-            case 2: v(0) = w*X(1); v(1) = -w*X(0); break;
-            case 3: v(0) = w*X(1); v(1) = -w*X(0); v(2) = 0.0; break;
+            case 1:
+               v(0) = 1.0;
+               break;
+            case 2:
+               v(0) = w*X(1);
+               v(1) = -w*X(0);
+               break;
+            case 3:
+               v(0) = w*X(1);
+               v(1) = -w*X(0);
+               v(2) = 0.0;
+               break;
         }
         break;
      }
@@ -745,9 +922,18 @@ void velocity_function(const Vector &x, Vector &v)
         d = d*d;
         switch (dim)
         {
-            case 1: v(0) = 1.0; break;
-            case 2: v(0) = d*w*X(1); v(1) = -d*w*X(0); break;
-            case 3: v(0) = d*w*X(1); v(1) = -d*w*X(0); v(2) = 0.0; break;
+            case 1:
+               v(0) = 1.0;
+               break;
+            case 2:
+               v(0) = d*w*X(1);
+               v(1) = -d*w*X(0);
+               break;
+            case 3:
+               v(0) = d*w*X(1);
+               v(1) = -d*w*X(0);
+               v(2) = 0.0;
+               break;
         }
         break;
      }
@@ -815,7 +1001,8 @@ real_t inflow_function(const Vector &x)
      case 0:
      case 1:
      case 2:
-      case 3: return 0.0;
+      case 3:
+         return 0.0;
   }
   return 0.0;
 }
@@ -16,16 +16,10 @@
 //               multi-physics applications.
 //
 //               This particular example is only for serial runtimes.
-//               For non-conforming meshes please have a look at example
-//               "ex2p.cpp".

 #include "example_utils.hpp"
 #include "mfem.hpp"

-#ifndef MFEM_USE_MOONOLITH
-#error This example requires that MFEM is built with MFEM_USE_MOONOLITH=YES
-#endif
-
 using namespace mfem;
 using namespace std;

@@ -221,8 +215,8 @@ int main(int argc, char *argv[])
         mfem::out << "l2 error: src: " << src_err << ", dest: " << dest_err
                   << std::endl;

-         plot(*src_mesh, src_fun, "source", 0);
-         plot(*dest_mesh, dest_fun, "destination", 1);
+         plot(*src_mesh, src_fun, "source");
+         plot(*dest_mesh, dest_fun, "destination");
      }
   }
   else
@@ -8,23 +8,18 @@
 //   mpirun -np 4 ex1p -s ../../data/inline-hex.mesh -d ../../data/inline-tet.mesh
 //
 // Description:  This example code demonstrates the use of MFEM for transferring
-//               discrete fields from one conforming finite element mesh to another. The
+//               discrete fields from one finite element mesh to another. The
 //               meshes can be of arbitrary shape and completely unrelated with
 //               each other. This feature can be used for implementing immersed
 //               domain methods for fluid-structure interaction or general
 //               multi-physics applications.
 //
 //               This particular example is for parallel runtimes. Vector FE is
-//               an experimental feature in parallel. For non-conforming meshes
-//               please have a look at example "ex2p.cpp".
+//               an experimental feature in parallel.

 #include "example_utils.hpp"
 #include "mfem.hpp"

-#ifndef MFEM_USE_MOONOLITH
-#error This example requires that MFEM is built with MFEM_USE_MOONOLITH=YES
-#endif
-
 using namespace mfem;
 using namespace std;

@@ -55,8 +50,6 @@ int main(int argc, char *argv[])
   int dest_fe_order = 1;
   bool visualization = true;
   bool use_vector_fe = false;
-   bool use_h1 = true;
-   bool use_vector_space = false;
   bool verbose = false;
   bool assemble_mass_and_coupling_together = true;

@@ -79,28 +72,14 @@ int main(int argc, char *argv[])
   args.AddOption(&verbose, "-verb", "--verbose", "--no-verb", "--no-verbose",
                  "Enable/Disable verbose output");
   args.AddOption(&use_vector_fe, "-vfe", "--use_vector_fe", "-no-vfe",
-                  "--no-vector_fe",
-                  "Use RT|ND vector finite elements (Experimental)");
-   args.AddOption(&use_vector_space, "-vfs", "--use_vector_space", "-no-vfs",
-                  "--no-vector_space",
-                  "Use Lagrange vector finite elements (Experimental)");
-   args.AddOption(&use_h1, "-h1", "--use-h1", "-nh1", "--no-h1",
-                  "Use H1 collection");
+                  "--no-vector_fe", "Use vector finite elements (Experimental)");
   args.AddOption(&assemble_mass_and_coupling_together, "-act",
                  "--assemble_mass_and_coupling_together", "-no-act",
                  "--no-assemble_mass_and_coupling_together",
-                  "Assemble mass and coupling operators together (better for "
-                  "non-affine elements)");
+                  "Assemble mass and coupling operators together (better for non-affine elements)");
   args.Parse();
   check_options(args);

-   if (use_vector_fe && use_vector_space)
-   {
-      mfem::err <<
-                "WARNING: use_vector_fe and use_vector_space options"
-                "are both true, ignoring use_vector_fe\n";
-   }
-
   shared_ptr<Mesh> src_mesh, dest_mesh;

   ifstream imesh;
@@ -190,30 +169,17 @@ int main(int argc, char *argv[])
   }
   else
   {
-
-      if (use_h1)
-      {
-         src_fe_coll =
-            make_shared<H1_FECollection>(source_fe_order, src_mesh->Dimension());
-         dest_fe_coll =
-            make_shared<H1_FECollection>(dest_fe_order, dest_mesh->Dimension());
-      }
-      else
-      {
-         src_fe_coll =
-            make_shared<L2_FECollection>(source_fe_order, src_mesh->Dimension());
-         dest_fe_coll =
-            make_shared<L2_FECollection>(dest_fe_order, dest_mesh->Dimension());
-      }
+      src_fe_coll =
+         make_shared<L2_FECollection>(source_fe_order, src_mesh->Dimension());
+      dest_fe_coll =
+         make_shared<L2_FECollection>(dest_fe_order, dest_mesh->Dimension());
   }

-   auto src_fe = make_shared<ParFiniteElementSpace>(
-                    p_src_mesh.get(), src_fe_coll.get(),
-                    use_vector_space ? src_mesh->Dimension() : 1);
+   auto src_fe =
+      make_shared<ParFiniteElementSpace>(p_src_mesh.get(), src_fe_coll.get());

-   auto dest_fe = make_shared<ParFiniteElementSpace>(
-                     p_dest_mesh.get(), dest_fe_coll.get(),
-                     use_vector_space ? dest_mesh->Dimension() : 1);
+   auto dest_fe =
+      make_shared<ParFiniteElementSpace>(p_dest_mesh.get(), dest_fe_coll.get());

   ParGridFunction src_fun(src_fe.get());

@@ -223,7 +189,7 @@ int main(int argc, char *argv[])
   // To be used with vector fe
   VectorFunctionCoefficient vector_coeff(dim, &vector_fun);

-   if (use_vector_fe || use_vector_space)
+   if (use_vector_fe)
   {
      src_fun.ProjectCoefficient(vector_coeff);
      src_fun.Update();
@@ -243,11 +209,7 @@ int main(int argc, char *argv[])
      assemble_mass_and_coupling_together);
   assembler.SetVerbose(verbose);

-   if (use_vector_space)
-   {
-      assembler.AddMortarIntegrator(make_shared<LagrangeVectorL2MortarIntegrator>());
-   }
-   else if (use_vector_fe)
+   if (use_vector_fe)
   {
      assembler.AddMortarIntegrator(make_shared<VectorL2MortarIntegrator>());
   }
@@ -281,8 +243,8 @@ int main(int argc, char *argv[])
                      << std::endl;
         }

-         plot(*p_src_mesh, src_fun, "source", 0);
-         plot(*p_dest_mesh, dest_fun, "destination", 1);
+         plot(*p_src_mesh, src_fun, "source");
+         plot(*p_dest_mesh, dest_fun, "destination");
      }
   }
   else
@@ -20,10 +20,6 @@
 #include "example_utils.hpp"
 #include "mfem.hpp"

-#ifndef MFEM_USE_MOONOLITH
-#error This example requires that MFEM is built with MFEM_USE_MOONOLITH=YES
-#endif
-
 using namespace mfem;
 using namespace std;

@@ -190,8 +186,8 @@ int main(int argc, char *argv[])
                      << std::endl;
         }

-         plot(*p_src_mesh, src_fun, "source", 0);
-         plot(*p_dest_mesh, dest_fun, "destination", 1);
+         plot(*p_src_mesh, src_fun, "source");
+         plot(*p_dest_mesh, dest_fun, "destination");
      }
   }
   else
@@ -84,8 +84,7 @@ void vector_fun(const mfem::Vector &x, mfem::Vector &f)
   f = n;
 }

-inline void plot(mfem::Mesh &mesh, mfem::GridFunction &x, std::string title,
-                 const int plot_number = 0)
+inline void plot(mfem::Mesh &mesh, mfem::GridFunction &x, std::string title)
 {
   using namespace std;
   using namespace mfem;
@@ -104,18 +103,5 @@ inline void plot(mfem::Mesh &mesh, mfem::GridFunction &x, std::string title,
   sol_sock.precision(8);
   sol_sock << "solution\n" << mesh << x
            << "window_title '"<< title << "'\n" << flush;
-
-   sol_sock << "window_geometry ";
-   sol_sock << (plot_number * 600)  << " " << 0 << " " << 600 << " " << 600 <<
-            "\n";
-
-   if (mesh.Dimension() == 2)
-   {
-      sol_sock  << "keys jRmclA\n";
-   }
-   else
-   {
-      sol_sock  << "keys rmclAa\n";
-   }
   sol_sock << flush;
 }
@@ -59,13 +59,11 @@ set(SRCS
  integ/nonlininteg_vecconvection_pa.cpp
  integ/nonlininteg_vecconvection_mf.cpp
  coefficient.cpp
-  complex_coefficient.cpp
  complex_fem.cpp
  convergence.cpp
  datacollection.cpp
  dgmassinv.cpp
  doftrans.cpp
-  dfem/doperator.cpp
  eltrans.cpp
  batchitrans.cpp
  estimators.cpp
@@ -163,7 +161,6 @@ set(SRCS
  transfer.cpp
  hyperbolic.cpp
  integrator.cpp
-  bounds.cpp
  )

 set(HDRS
@@ -177,21 +174,12 @@ set(HDRS
  integ/bilininteg_hcurlhdiv_kernels.hpp
  integ/bilininteg_mass_kernels.hpp
  coefficient.hpp
-  complex_coefficient.hpp
  complex_fem.hpp
  convergence.hpp
  datacollection.hpp
  dgmassinv.hpp
  dgmassinv_kernels.hpp
  doftrans.hpp
-  dfem/doperator.hpp
-  dfem/fieldoperator.hpp
-  dfem/integrate.hpp
-  dfem/parameterspace.hpp
-  dfem/qfunction_apply.hpp
-  dfem/qfunction_transform.hpp
-  dfem/tuple.hpp
-  dfem/util.hpp
  eltrans.hpp
  estimators.hpp
  fe.hpp
@@ -249,7 +237,6 @@ set(HDRS
  nonlinearform_ext.hpp
  nonlininteg.hpp
  qfunction.hpp
-  qinterp/det.hpp
  qinterp/eval.hpp
  qinterp/eval_hdiv.hpp
  qinterp/grad.hpp
@@ -276,7 +263,6 @@ set(HDRS
  transfer.hpp
  hyperbolic.hpp
  integrator.hpp
-  bounds.hpp
  )

 if (MFEM_USE_SIDRE)
@@ -515,7 +515,6 @@ struct InvTNewtonSolver<Geometry::SEGMENT, SDim, SType, max_team_x>
            phys_tol += pptr[idx + d * npts] * pptr[idx + d * npts];
         }
         phys_tol = fmax(phys_rtol * phys_rtol, phys_tol * phys_rtol * phys_rtol);
-         hit_bdr[0] = prev_hit_bdr[0] = false;
      }
      // for each iteration
      while (true)
@@ -466,6 +466,7 @@ void BilinearForm::Assemble(int skip_zeros)
   }

   ElementTransformation *eltrans;
+   DofTransformation * doftrans;
   Mesh *mesh = fes -> GetMesh();
   DenseMatrix elmat, *elmat_p;

@@ -502,14 +503,13 @@ void BilinearForm::Assemble(int skip_zeros)
         }
      }

-      DofTransformation doftrans;
      // Element-wise integration
      for (int i = 0; i < fes -> GetNE(); i++)
      {
         // Set both doftrans (potentially needed to assemble the element
         // matrix) and vdofs, which is also needed when the element matrices
         // are pre-assembled.
-         fes->GetElementVDofs(i, vdofs, doftrans);
+         doftrans = fes->GetElementVDofs(i, vdofs);
         if (element_matrices)
         {
            elmat_p = &(*element_matrices)(i);
@@ -547,7 +547,10 @@ void BilinearForm::Assemble(int skip_zeros)
            {
               elmat_p = &elmat;
            }
-            doftrans.TransformDual(elmat);
+            if (doftrans)
+            {
+               doftrans->TransformDual(elmat);
+            }
            elmat_p = &elmat;
         }
         if (static_cond)
@@ -625,14 +628,13 @@ void BilinearForm::Assemble(int skip_zeros)
         }
      }

-      DofTransformation doftrans;
      for (int i = 0; i < fes -> GetNBE(); i++)
      {
         const int bdr_attr = mesh->GetBdrAttribute(i);
         if (bdr_attr_marker[bdr_attr-1] == 0) { continue; }

         const FiniteElement &be = *fes->GetBE(i);
-         fes -> GetBdrElementVDofs (i, vdofs, doftrans);
+         doftrans = fes -> GetBdrElementVDofs (i, vdofs);
         eltrans = fes -> GetBdrElementTransformation (i);
         int k = 0;
         for (; k < boundary_integs.Size(); k++)
@@ -652,7 +654,10 @@ void BilinearForm::Assemble(int skip_zeros)
            boundary_integs[k]->AssembleElementMatrix(be, *eltrans, elemmat);
            elmat += elemmat;
         }
-         doftrans.TransformDual(elmat);
+         if (doftrans)
+         {
+            doftrans->TransformDual(elmat);
+         }
         elmat_p = &elmat;
         if (!static_cond)
         {
@@ -1525,6 +1530,8 @@ void MixedBilinearForm::Assemble(int skip_zeros)
   }

   ElementTransformation *eltrans;
+   DofTransformation * dom_dof_trans;
+   DofTransformation * ran_dof_trans;
   DenseMatrix elmat;

   Mesh *mesh = test_fes -> GetMesh();
@@ -1547,12 +1554,11 @@ void MixedBilinearForm::Assemble(int skip_zeros)
         }
      }

-      DofTransformation dom_dof_trans, ran_dof_trans;
      for (int i = 0; i < test_fes -> GetNE(); i++)
      {
         const int elem_attr = mesh->GetAttribute(i);
-         trial_fes->GetElementVDofs (i, trial_vdofs, dom_dof_trans);
-         test_fes->GetElementVDofs (i, test_vdofs, ran_dof_trans);
+         dom_dof_trans = trial_fes -> GetElementVDofs (i, trial_vdofs);
+         ran_dof_trans = test_fes  -> GetElementVDofs (i, test_vdofs);
         eltrans = test_fes -> GetElementTransformation (i);

         elmat.SetSize(test_vdofs.Size(), trial_vdofs.Size());
@@ -1568,7 +1574,10 @@ void MixedBilinearForm::Assemble(int skip_zeros)
               elmat += elemmat;
            }
         }
-         TransformDual(ran_dof_trans, dom_dof_trans, elmat);
+         if (ran_dof_trans || dom_dof_trans)
+         {
+            TransformDual(ran_dof_trans, dom_dof_trans, elmat);
+         }
         mat -> AddSubMatrix (test_vdofs, trial_vdofs, elmat, skip_zeros);
      }
   }
@@ -1596,14 +1605,13 @@ void MixedBilinearForm::Assemble(int skip_zeros)
         }
      }

-      DofTransformation dom_dof_trans, ran_dof_trans;
      for (int i = 0; i < test_fes -> GetNBE(); i++)
      {
         const int bdr_attr = mesh->GetBdrAttribute(i);
         if (bdr_attr_marker[bdr_attr-1] == 0) { continue; }

-         trial_fes->GetBdrElementVDofs (i, trial_vdofs, dom_dof_trans);
-         test_fes->GetBdrElementVDofs (i, test_vdofs, ran_dof_trans);
+         dom_dof_trans = trial_fes -> GetBdrElementVDofs (i, trial_vdofs);
+         ran_dof_trans = test_fes  -> GetBdrElementVDofs (i, test_vdofs);
         eltrans = test_fes -> GetBdrElementTransformation (i);

         elmat.SetSize(test_vdofs.Size(), trial_vdofs.Size());
@@ -1618,7 +1626,10 @@ void MixedBilinearForm::Assemble(int skip_zeros)
                                                        *eltrans, elemmat);
            elmat += elemmat;
         }
-         TransformDual(ran_dof_trans, dom_dof_trans, elmat);
+         if (ran_dof_trans || dom_dof_trans)
+         {
+            TransformDual(ran_dof_trans, dom_dof_trans, elmat);
+         }
         mat -> AddSubMatrix (test_vdofs, trial_vdofs, elmat, skip_zeros);
      }
   }
@@ -2396,6 +2407,8 @@ void DiscreteLinearOperator::Assemble(int skip_zeros)
   }

   ElementTransformation *eltrans;
+   DofTransformation * dom_dof_trans;
+   DofTransformation * ran_dof_trans;
   DenseMatrix elmat;

   Mesh *mesh = test_fes->GetMesh();
@@ -2418,13 +2431,11 @@ void DiscreteLinearOperator::Assemble(int skip_zeros)
         }
      }

-      DofTransformation dom_dof_trans;
-      DofTransformation ran_dof_trans;
      for (int i = 0; i < test_fes->GetNE(); i++)
      {
         const int elem_attr = mesh->GetAttribute(i);
-         trial_fes->GetElementVDofs(i, trial_vdofs, dom_dof_trans);
-         test_fes->GetElementVDofs(i, test_vdofs, ran_dof_trans);
+         dom_dof_trans = trial_fes->GetElementVDofs(i, trial_vdofs);
+         ran_dof_trans = test_fes->GetElementVDofs(i, test_vdofs);
         eltrans = test_fes->GetElementTransformation(i);

         elmat.SetSize(test_vdofs.Size(), trial_vdofs.Size());
@@ -2440,7 +2451,10 @@ void DiscreteLinearOperator::Assemble(int skip_zeros)
               elmat += elemmat;
            }
         }
-         TransformPrimal(ran_dof_trans, dom_dof_trans, elemmat);
+         if (ran_dof_trans || dom_dof_trans)
+         {
+            TransformPrimal(ran_dof_trans, dom_dof_trans, elemmat);
+         }
         mat->SetSubMatrix(test_vdofs, trial_vdofs, elemmat, skip_zeros);
      }
   }
@@ -569,7 +569,7 @@ public:

   /// @brief Compute and store internally all element matrices.
   ///
-   /// If AssemblyLevel::ELEMENT is selected with SetAssemblyLevel(), this will
+   /// If AssemblyLevel::ELEMENT is selected with SetAssemblyLeve(), this will
   /// use efficient (device-accelerated) assembly of the element matrices.
   void ComputeElementMatrices();

@@ -578,7 +578,7 @@ public:

   /// @brief Return a DenseTensor containing the assembled element matrices.
   ///
-   /// If AssemblyLevel::ELEMENT is selected with SetAssemblyLevel(), this will
+   /// If AssemblyLevel::ELEMENT is selected with SetAssemblyLeve(), this will
   /// use efficient (device-accelerated) assembly of the element matrices.
   const DenseTensor &GetElementMatrices();

@@ -78,7 +78,7 @@ void MFBilinearFormExtension::AssembleDiagonal(Vector &y) const
         dynamic_cast<const ElementRestriction*>(elem_restrict);
      if (H1elem_restrict)
      {
-         H1elem_restrict->AbsMultTranspose(localY, y);
+         H1elem_restrict->MultTransposeUnsigned(localY, y);
      }
      else
      {
@@ -456,7 +456,7 @@ void PABilinearFormExtension::AssembleDiagonal(Vector &y) const
            dynamic_cast<const ElementRestriction*>(elem_restrict);
         if (H1elem_restrict)
         {
-            H1elem_restrict->AbsMultTranspose(localY, y);
+            H1elem_restrict->MultTransposeUnsigned(localY, y);
         }
         else
         {
@@ -491,7 +491,7 @@ void PABilinearFormExtension::AssembleDiagonal(Vector &y) const
         assemble_diagonal_with_markers(*bdr_integs[i], bdr_markers[i],
                                        bdr_attributes, bdr_face_Y);
      }
-      bdr_face_restrict_lex->AddAbsMultTranspose(bdr_face_Y, y);
+      bdr_face_restrict_lex->AddMultTransposeUnsigned(bdr_face_Y, y);
   }
 }

@@ -526,8 +526,7 @@ void PABilinearFormExtension::FormLinearSystem(const Array<int> &ess_tdof_list,
   A.Reset(oper); // A will own oper
 }

-void PABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
-                                           const bool useAbs) const
+void PABilinearFormExtension::Mult(const Vector &x, Vector &y) const
 {
   Array<BilinearFormIntegrator*> &integrators = *a->GetDBFI();

@@ -559,13 +558,11 @@ void PABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
      {
         if (integrators[i]->Patchwise())
         {
-            MFEM_ASSERT(!useAbs, "AbsMult not implemented with NURBS!")
            integrators[i]->AddMultNURBSPA(x, y);
         }
         else
         {
-            if (useAbs) { integrators[i]->AddAbsMultPA(x, y); }
-            else { integrators[i]->AddMultPA(x, y); }
+            integrators[i]->AddMultPA(x, y);
         }
      }
   }
@@ -574,30 +571,14 @@ void PABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
      if (iSz)
      {
         Array<Array<int>*> &elem_markers = *a->GetDBFI_Marker();
-         auto H1elem_restrict =
-            dynamic_cast<const ElementRestriction*>(elem_restrict);
-         if (H1elem_restrict && useAbs)
-         {
-            H1elem_restrict->AbsMult(x, localX);
-         }
-         else
-         {
-            elem_restrict->Mult(x, localX);
-         }
+         elem_restrict->Mult(x, localX);
         localY = 0.0;
         for (int i = 0; i < iSz; ++i)
         {
            AddMultWithMarkers(*integrators[i], localX, elem_markers[i],
-                               elem_attributes, false, localY, useAbs);
-         }
-         if (H1elem_restrict && useAbs)
-         {
-            H1elem_restrict->AbsMultTranspose(localY, y);
-         }
-         else
-         {
-            elem_restrict->MultTranspose(localY, y);
+                               elem_attributes, false, localY);
         }
+         elem_restrict->MultTranspose(localY, y);
      }
      else
      {
@@ -609,7 +590,6 @@ void PABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
   const int iFISz = intFaceIntegrators.Size();
   if (int_face_restrict_lex && iFISz>0)
   {
-      MFEM_ASSERT(!useAbs, "AbsMult not implemented for face integrators!")
      // When assembling interior face integrators for DG spaces, we need to
      // exchange the face-neighbor information. This happens inside member
      // functions of the 'int_face_restrict_lex'. To avoid repeated calls to
@@ -671,7 +651,6 @@ void PABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
   const bool has_bdr_integs = (n_bdr_face_integs > 0 || n_bdr_integs > 0);
   if (bdr_face_restrict_lex && has_bdr_integs)
   {
-      MFEM_ASSERT(!useAbs, "AbsMult not implemented for bdr integrators!")
      Array<Array<int>*> &bdr_markers = *a->GetBBFI_Marker();
      Array<Array<int>*> &bdr_face_markers = *a->GetBFBFI_Marker();
      bdr_face_restrict_lex->Mult(x, bdr_face_X);
@@ -849,39 +828,22 @@ void PABilinearFormExtension::AddMultWithMarkers(
   const Array<int> *markers,
   const Array<int> &attributes,
   const bool transpose,
-   Vector &y,
-   const bool useAbs) const
+   Vector &y) const
 {
   if (markers)
   {
      tmp_evec.SetSize(y.Size());
      tmp_evec = 0.0;
-      if (useAbs)
-      {
-         if (transpose) { integ.AddAbsMultTransposePA(x, tmp_evec); }
-         else { integ.AddAbsMultPA(x, tmp_evec); }
-      }
-      else
-      {
-         if (transpose) { integ.AddMultTransposePA(x, tmp_evec); }
-         else { integ.AddMultPA(x, tmp_evec); }
-      }
+      if (transpose) { integ.AddMultTransposePA(x, tmp_evec); }
+      else { integ.AddMultPA(x, tmp_evec); }
      const int ne = attributes.Size();
      const int nd = x.Size() / ne;
      AddWithMarkers_(ne, nd, tmp_evec, *markers, attributes, y);
   }
   else
   {
-      if (useAbs)
-      {
-         if (transpose) { integ.AddAbsMultTransposePA(x, y); }
-         else { integ.AddAbsMultPA(x, y); }
-      }
-      else
-      {
-         if (transpose) { integ.AddMultTransposePA(x, y); }
-         else { integ.AddMultPA(x, y); }
-      }
+      if (transpose) { integ.AddMultTransposePA(x, y); }
+      else { integ.AddMultPA(x, y); }
   }
 }

@@ -1048,13 +1010,8 @@ void EABilinearFormExtension::Assemble()
   }
 }

-void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
-                                           const bool useTranspose,
-                                           const bool useAbs) const
+void EABilinearFormExtension::Mult(const Vector &x, Vector &y) const
 {
-   auto elemRest = dynamic_cast<const ElementRestriction*>(elem_restrict);
-   MFEM_ASSERT(useAbs?(elemRest!=nullptr):true,
-               "elem_restrict is not ElementRestriction*!")
   // Apply the Element Restriction
   const bool useRestrict = !DeviceCanUseCeed() && elem_restrict;
   if (!useRestrict)
@@ -1062,11 +1019,6 @@ void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
      y.UseDevice(true); // typically this is a large vector, so store on device
      y = 0.0;
   }
-   else if (useAbs)
-   {
-      elemRest->AbsMult(x, localX);
-      localY = 0.0;
-   }
   else
   {
      elem_restrict->Mult(x, localX);
@@ -1074,55 +1026,25 @@ void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
   }
   // Apply the Element Matrices
   {
-      Vector abs_ea_data;
-      if (useAbs)
-      {
-         abs_ea_data = ea_data;
-         abs_ea_data.Abs();
-      }
      const int NDOFS = elemDofs;
      auto X = Reshape(useRestrict?localX.Read():x.Read(), NDOFS, ne);
      auto Y = Reshape(useRestrict?localY.ReadWrite():y.ReadWrite(), NDOFS, ne);
-      auto A = Reshape(useAbs?abs_ea_data.Read():ea_data.Read(), NDOFS, NDOFS, ne);
-      if (!useTranspose)
+      auto A = Reshape(ea_data.Read(), NDOFS, NDOFS, ne);
+      mfem::forall(ne*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
      {
-         mfem::forall(ne*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
+         const int e = glob_j/NDOFS;
+         const int j = glob_j%NDOFS;
+         real_t res = 0.0;
+         for (int i = 0; i < NDOFS; i++)
         {
-            const int e = glob_j/NDOFS;
-            const int j = glob_j%NDOFS;
-            real_t res = 0.0;
-            for (int i = 0; i < NDOFS; i++)
-            {
-               res += A(i, j, e)*X(i, e);
-            }
-            Y(j, e) += res;
-         });
-      }
-      else
-      {
-         mfem::forall(ne*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
-         {
-            const int e = glob_j/NDOFS;
-            const int j = glob_j%NDOFS;
-            real_t res = 0.0;
-            for (int i = 0; i < NDOFS; i++)
-            {
-               res += A(j, i, e)*X(i, e);
-            }
-            Y(j, e) += res;
-         });
-      }
+            res += A(i, j, e)*X(i, e);
+         }
+         Y(j, e) += res;
+      });
      // Apply the Element Restriction transposed
      if (useRestrict)
      {
-         if (useAbs)
-         {
-            elemRest->AbsMultTranspose(localY, y);
-         }
-         else
-         {
-            elem_restrict->MultTranspose(localY, y);
-         }
+         elem_restrict->MultTranspose(localY, y);
      }
   }

@@ -1131,7 +1053,6 @@ void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
   const int iFISz = intFaceIntegrators.Size();
   if (int_face_restrict_lex && iFISz>0)
   {
-      MFEM_VERIFY(!useAbs, "AbsMult not implemented with Face integrators!")
      // Apply the Interior Face Restriction
      int_face_restrict_lex->Mult(x, int_face_X);
      if (int_face_X.Size()>0)
@@ -1143,65 +1064,7 @@ void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
         auto Y = Reshape(int_face_Y.ReadWrite(), NDOFS, 2, nf_int);
         if (!factorize_face_terms)
         {
-            Vector abs_ea_data_int(ea_data_int.Size());
-            if (useAbs)
-            {
-               abs_ea_data_int = ea_data_int;
-               abs_ea_data_int.Abs();
-            }
-            auto A_int = Reshape(useAbs?abs_ea_data_int.Read():ea_data_int.Read(),
-                                 NDOFS, NDOFS, 2, nf_int);
-            if (!useTranspose)
-            {
-               mfem::forall(nf_int*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
-               {
-                  const int f = glob_j/NDOFS;
-                  const int j = glob_j%NDOFS;
-                  real_t res = 0.0;
-                  for (int i = 0; i < NDOFS; i++)
-                  {
-                     res += A_int(i, j, 0, f)*X(i, 0, f);
-                  }
-                  Y(j, 0, f) += res;
-                  res = 0.0;
-                  for (int i = 0; i < NDOFS; i++)
-                  {
-                     res += A_int(i, j, 1, f)*X(i, 1, f);
-                  }
-                  Y(j, 1, f) += res;
-               });
-            }
-            else
-            {
-               mfem::forall(nf_int*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
-               {
-                  const int f = glob_j/NDOFS;
-                  const int j = glob_j%NDOFS;
-                  real_t res = 0.0;
-                  for (int i = 0; i < NDOFS; i++)
-                  {
-                     res += A_int(j, i, 0, f)*X(i, 0, f);
-                  }
-                  Y(j, 0, f) += res;
-                  res = 0.0;
-                  for (int i = 0; i < NDOFS; i++)
-                  {
-                     res += A_int(j, i, 1, f)*X(i, 1, f);
-                  }
-                  Y(j, 1, f) += res;
-               });
-            }
-         }
-         Vector abs_ea_data_ext(ea_data_ext.Size());
-         if (useAbs)
-         {
-            abs_ea_data_ext = ea_data_ext;
-            abs_ea_data_ext.Abs();
-         }
-         auto A_ext = Reshape(useAbs?abs_ea_data_ext.Read():ea_data_ext.Read(),
-                              NDOFS, NDOFS, 2, nf_int);
-         if (!useTranspose)
-         {
+            auto A_int = Reshape(ea_data_int.Read(), NDOFS, NDOFS, 2, nf_int);
            mfem::forall(nf_int*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
            {
               const int f = glob_j/NDOFS;
@@ -1209,37 +1072,35 @@ void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
               real_t res = 0.0;
               for (int i = 0; i < NDOFS; i++)
               {
-                  res += A_ext(i, j, 0, f)*X(i, 0, f);
+                  res += A_int(i, j, 0, f)*X(i, 0, f);
               }
-               Y(j, 1, f) += res;
+               Y(j, 0, f) += res;
               res = 0.0;
               for (int i = 0; i < NDOFS; i++)
               {
-                  res += A_ext(i, j, 1, f)*X(i, 1, f);
+                  res += A_int(i, j, 1, f)*X(i, 1, f);
               }
-               Y(j, 0, f) += res;
+               Y(j, 1, f) += res;
            });
         }
-         else
+         auto A_ext = Reshape(ea_data_ext.Read(), NDOFS, NDOFS, 2, nf_int);
+         mfem::forall(nf_int*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
         {
-            mfem::forall(nf_int*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
+            const int f = glob_j/NDOFS;
+            const int j = glob_j%NDOFS;
+            real_t res = 0.0;
+            for (int i = 0; i < NDOFS; i++)
            {
-               const int f = glob_j/NDOFS;
-               const int j = glob_j%NDOFS;
-               real_t res = 0.0;
-               for (int i = 0; i < NDOFS; i++)
-               {
-                  res += A_ext(j, i, 1, f)*X(i, 0, f);
-               }
-               Y(j, 1, f) += res;
-               res = 0.0;
-               for (int i = 0; i < NDOFS; i++)
-               {
-                  res += A_ext(j, i, 0, f)*X(i, 1, f);
-               }
-               Y(j, 0, f) += res;
-            });
-         }
+               res += A_ext(i, j, 0, f)*X(i, 0, f);
+            }
+            Y(j, 1, f) += res;
+            res = 0.0;
+            for (int i = 0; i < NDOFS; i++)
+            {
+               res += A_ext(i, j, 1, f)*X(i, 1, f);
+            }
+            Y(j, 0, f) += res;
+         });
         // Apply the Interior Face Restriction transposed
         int_face_restrict_lex->AddMultTransposeInPlace(int_face_Y, y);
      }
@@ -1248,9 +1109,7 @@ void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
   // Treatment of boundary faces
   if (!factorize_face_terms && bdr_face_restrict_lex && ea_data_bdr.Size() > 0)
   {
-      MFEM_ASSERT(!useAbs, "AbsMult not implemented with Face integrators!")
      // Apply the Boundary Face Restriction
-      // TODO: AbsMult if needed
      bdr_face_restrict_lex->Mult(x, bdr_face_X);
      bdr_face_Y = 0.0;
      // Apply the boundary face matrices
@@ -1258,38 +1117,141 @@ void EABilinearFormExtension::MultInternal(const Vector &x, Vector &y,
      auto X = Reshape(bdr_face_X.Read(), NDOFS, nf_bdr);
      auto Y = Reshape(bdr_face_Y.ReadWrite(), NDOFS, nf_bdr);
      auto A = Reshape(ea_data_bdr.Read(), NDOFS, NDOFS, nf_bdr);
-      if (!useTranspose)
+      mfem::forall(nf_bdr*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
      {
-         // TODO: useAbs
-         mfem::forall(nf_bdr*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
+         const int f = glob_j/NDOFS;
+         const int j = glob_j%NDOFS;
+         real_t res = 0.0;
+         for (int i = 0; i < NDOFS; i++)
         {
-            const int f = glob_j/NDOFS;
-            const int j = glob_j%NDOFS;
-            real_t res = 0.0;
-            for (int i = 0; i < NDOFS; i++)
-            {
-               res += A(i, j, f)*X(i, f);
-            }
-            Y(j, f) += res;
-         });
-      }
-      else
-      {
-         // TODO: useAbs
-         mfem::forall(nf_bdr*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
-         {
-            const int f = glob_j/NDOFS;
-            const int j = glob_j%NDOFS;
-            real_t res = 0.0;
-            for (int i = 0; i < NDOFS; i++)
-            {
-               res += A(j, i, f)*X(i, f);
-            }
-            Y(j, f) += res;
-         });
-      }
+            res += A(i, j, f)*X(i, f);
+         }
+         Y(j, f) += res;
+      });
+      // Apply the Boundary Face Restriction transposed
+      bdr_face_restrict_lex->AddMultTransposeInPlace(bdr_face_Y, y);
+   }
+}
+
+void EABilinearFormExtension::MultTranspose(const Vector &x, Vector &y) const
+{
+   // Apply the Element Restriction
+   const bool useRestrict = !DeviceCanUseCeed() && elem_restrict;
+   if (!useRestrict)
+   {
+      y.UseDevice(true); // typically this is a large vector, so store on device
+      y = 0.0;
+   }
+   else
+   {
+      elem_restrict->Mult(x, localX);
+      localY = 0.0;
+   }
+   // Apply the Element Matrices transposed
+   {
+      const int NDOFS = elemDofs;
+      auto X = Reshape(useRestrict?localX.Read():x.Read(), NDOFS, ne);
+      auto Y = Reshape(useRestrict?localY.ReadWrite():y.ReadWrite(), NDOFS, ne);
+      auto A = Reshape(ea_data.Read(), NDOFS, NDOFS, ne);
+      mfem::forall(ne*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
+      {
+         const int e = glob_j/NDOFS;
+         const int j = glob_j%NDOFS;
+         real_t res = 0.0;
+         for (int i = 0; i < NDOFS; i++)
+         {
+            res += A(j, i, e)*X(i, e);
+         }
+         Y(j, e) += res;
+      });
+      // Apply the Element Restriction transposed
+      if (useRestrict)
+      {
+         elem_restrict->MultTranspose(localY, y);
+      }
+   }
+
+   // Treatment of interior faces
+   Array<BilinearFormIntegrator*> &intFaceIntegrators = *a->GetFBFI();
+   const int iFISz = intFaceIntegrators.Size();
+   if (int_face_restrict_lex && iFISz>0)
+   {
+      // Apply the Interior Face Restriction
+      int_face_restrict_lex->Mult(x, int_face_X);
+      if (int_face_X.Size()>0)
+      {
+         int_face_Y = 0.0;
+         // Apply the interior face matrices transposed
+         const int NDOFS = faceDofs;
+         auto X = Reshape(int_face_X.Read(), NDOFS, 2, nf_int);
+         auto Y = Reshape(int_face_Y.ReadWrite(), NDOFS, 2, nf_int);
+         if (!factorize_face_terms)
+         {
+            auto A_int = Reshape(ea_data_int.Read(), NDOFS, NDOFS, 2, nf_int);
+            mfem::forall(nf_int*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
+            {
+               const int f = glob_j/NDOFS;
+               const int j = glob_j%NDOFS;
+               real_t res = 0.0;
+               for (int i = 0; i < NDOFS; i++)
+               {
+                  res += A_int(j, i, 0, f)*X(i, 0, f);
+               }
+               Y(j, 0, f) += res;
+               res = 0.0;
+               for (int i = 0; i < NDOFS; i++)
+               {
+                  res += A_int(j, i, 1, f)*X(i, 1, f);
+               }
+               Y(j, 1, f) += res;
+            });
+         }
+         auto A_ext = Reshape(ea_data_ext.Read(), NDOFS, NDOFS, 2, nf_int);
+         mfem::forall(nf_int*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
+         {
+            const int f = glob_j/NDOFS;
+            const int j = glob_j%NDOFS;
+            real_t res = 0.0;
+            for (int i = 0; i < NDOFS; i++)
+            {
+               res += A_ext(j, i, 1, f)*X(i, 0, f);
+            }
+            Y(j, 1, f) += res;
+            res = 0.0;
+            for (int i = 0; i < NDOFS; i++)
+            {
+               res += A_ext(j, i, 0, f)*X(i, 1, f);
+            }
+            Y(j, 0, f) += res;
+         });
+         // Apply the Interior Face Restriction transposed
+         int_face_restrict_lex->AddMultTransposeInPlace(int_face_Y, y);
+      }
+   }
+
+   // Treatment of boundary faces
+   if (!factorize_face_terms && bdr_face_restrict_lex && ea_data_bdr.Size() > 0)
+   {
+      // Apply the Boundary Face Restriction
+      bdr_face_restrict_lex->Mult(x, bdr_face_X);
+      bdr_face_Y = 0.0;
+      // Apply the boundary face matrices transposed
+      const int NDOFS = faceDofs;
+      auto X = Reshape(bdr_face_X.Read(), NDOFS, nf_bdr);
+      auto Y = Reshape(bdr_face_Y.ReadWrite(), NDOFS, nf_bdr);
+      auto A = Reshape(ea_data_bdr.Read(), NDOFS, NDOFS, nf_bdr);
+      mfem::forall(nf_bdr*NDOFS, [=] MFEM_HOST_DEVICE (int glob_j)
+      {
+         const int f = glob_j/NDOFS;
+         const int j = glob_j%NDOFS;
+         real_t res = 0.0;
+         for (int i = 0; i < NDOFS; i++)
+         {
+            res += A(j, i, f)*X(i, f);
+         }
+         Y(j, f) += res;
+      });
      // Apply the Boundary Face Restriction transposed
-      // TODO: AbsMultTranspose if needed
      bdr_face_restrict_lex->AddMultTransposeInPlace(bdr_face_Y, y);
   }
 }
@@ -1949,7 +1911,7 @@ void PAMixedBilinearFormExtension::AssembleDiagonal_ADAt(const Vector &D,
         dynamic_cast<const ElementRestriction*>(elem_restrict_trial);
      if (H1elem_restrict_trial)
      {
-         H1elem_restrict_trial->AbsMult(D, localTrial);
+         H1elem_restrict_trial->MultUnsigned(D, localTrial);
      }
      else
      {
@@ -1975,7 +1937,7 @@ void PAMixedBilinearFormExtension::AssembleDiagonal_ADAt(const Vector &D,
         dynamic_cast<const ElementRestriction*>(elem_restrict_test);
      if (H1elem_restrict_test)
      {
-         H1elem_restrict_test->AbsMultTranspose(localTest, diag);
+         H1elem_restrict_test->MultTransposeUnsigned(localTest, diag);
      }
      else
      {
@@ -2031,7 +1993,7 @@ void PADiscreteLinearOperatorExtension::Assemble()
      dynamic_cast<const ElementRestriction*>(elem_restrict_test);
   if (elem_restrict)
   {
-      elem_restrict->AbsMultTranspose(ones, test_multiplicity);
+      elem_restrict->MultTransposeUnsigned(ones, test_multiplicity);
   }
   else
   {
@@ -91,17 +91,12 @@ public:
                         Vector &x, Vector &b,
                         OperatorHandle &A, Vector &X, Vector &B,
                         int copy_interior = 0) override;
-   void Mult(const Vector &x, Vector &y) const override
-   { MultInternal(x,y); }
-   void AbsMult(const Vector &x, Vector &y) const override
-   { MultInternal(x,y, true); }
+   void Mult(const Vector &x, Vector &y) const override;
   void MultTranspose(const Vector &x, Vector &y) const override;
   void Update() override;

 protected:
   void SetupRestrictionOperators(const L2FaceValues m);
-   void MultInternal(const Vector &x, Vector &y,
-                     const bool useAbs = false) const;

   /// @brief Accumulate the action (or transpose) of the integrator on @a x
   /// into @a y, taking into account the (possibly null) @a markers array.
@@ -115,14 +110,12 @@ protected:
   /// @param attributes Array of element or boundary element attributes.
   /// @param transpose Compute the action or transpose of the integrator .
   /// @param y Output E-vector
-   /// @param useAbs Apply absolute-value operator
   void AddMultWithMarkers(const BilinearFormIntegrator &integ,
                           const Vector &x,
                           const Array<int> *markers,
                           const Array<int> &attributes,
                           const bool transpose,
-                           Vector &y,
-                           const bool useAbs = false) const;
+                           Vector &y) const;

   /// @brief Performs the same function as AddMultWithMarkers, but takes as
   /// input and output face normal derivatives.
@@ -159,15 +152,8 @@ public:
   EABilinearFormExtension(BilinearForm *form);

   void Assemble() override;
-
-   void Mult(const Vector &x, Vector &y) const override
-   { MultInternal(x, y, false); }
-   void AbsMult(const Vector &x, Vector &y) const override
-   { MultInternal(x, y, false, true); }
-   void MultTranspose(const Vector &x, Vector &y) const override
-   { MultInternal(x, y, true); }
-   void AbsMultTranspose(const Vector &x, Vector &y) const override
-   { MultInternal(x, y, true, true); }
+   void Mult(const Vector &x, Vector &y) const override;
+   void MultTranspose(const Vector &x, Vector &y) const override;

   /// @brief Populates @a element_matrices with the element matrices.
   ///
@@ -179,10 +165,6 @@ public:
   void GetElementMatrices(DenseTensor &element_matrices,
                           ElementDofOrdering ordering,
                           bool add_bdr);
-
-   // This method needs to be public due to 'nvcc' restriction.
-   void MultInternal(const Vector &x, Vector &y, const bool useTranspose,
-                     const bool useAbs = false) const;
 };

 /// Data and methods for fully-assembled bilinear forms
@@ -121,12 +121,6 @@ void BilinearFormIntegrator::AddMultPA(const Vector &, Vector &) const
              "   is not implemented for this class.");
 }

-void BilinearFormIntegrator::AddAbsMultPA(const Vector &, Vector &) const
-{
-   MFEM_ABORT("BilinearFormIntegrator:AddAbsMultPA:(...)\n"
-              "   is not implemented for this class.");
-}
-
 void BilinearFormIntegrator::AddMultNURBSPA(const Vector &, Vector &) const
 {
   MFEM_ABORT("BilinearFormIntegrator::AddMultNURBSPA(...)\n"
@@ -139,13 +133,6 @@ void BilinearFormIntegrator::AddMultTransposePA(const Vector &, Vector &) const
              "   is not implemented for this class.");
 }

-void BilinearFormIntegrator::AddAbsMultTransposePA(const Vector &,
-                                                   Vector &) const
-{
-   MFEM_ABORT("BilinearFormIntegrator::AddAbsMultTransposePA(...)\n"
-              "   is not implemented for this class.");
-}
-
 void BilinearFormIntegrator::AssembleMF(const FiniteElementSpace &fes)
 {
   MFEM_ABORT("BilinearFormIntegrator::AssembleMF(...)\n"
@@ -431,14 +418,6 @@ void SumIntegrator::AddMultPA(const Vector& x, Vector& y) const
   }
 }

-void SumIntegrator::AddAbsMultPA(const Vector& x, Vector& y) const
-{
-   for (int i = 0; i < integrators.Size(); i++)
-   {
-      integrators[i]->AddAbsMultPA(x, y);
-   }
-}
-
 void SumIntegrator::AddMultTransposePA(const Vector &x, Vector &y) const
 {
   for (int i = 0; i < integrators.Size(); i++)
@@ -447,14 +426,6 @@ void SumIntegrator::AddMultTransposePA(const Vector &x, Vector &y) const
   }
 }

-void SumIntegrator::AddAbsMultTransposePA(const Vector &x, Vector &y) const
-{
-   for (int i = 0; i < integrators.Size(); i++)
-   {
-      integrators[i]->AddAbsMultTransposePA(x, y);
-   }
-}
-
 void SumIntegrator::AssembleMF(const FiniteElementSpace &fes)
 {
   for (int i = 0; i < integrators.Size(); i++)
@@ -78,8 +78,6 @@ public:
       called. */
   void AddMultPA(const Vector &x, Vector &y) const override;

-   virtual void AddAbsMultPA(const Vector &x, Vector &y) const;
-
   /// Method for partially assembled action on NURBS patches.
   virtual void AddMultNURBSPA(const Vector&x, Vector&y) const;

@@ -92,8 +90,6 @@ public:
       called. */
   virtual void AddMultTransposePA(const Vector &x, Vector &y) const;

-   virtual void AddAbsMultTransposePA(const Vector &x, Vector &y) const;
-
   /// Method defining element assembly.
   /** The result of the element assembly is added to the @a emat Vector if
       @a add is true. Otherwise, if @a add is false, we set @a emat. */
@@ -500,12 +496,8 @@ public:

   void AddMultTransposePA(const Vector &x, Vector &y) const override;

-   void AddAbsMultTransposePA(const Vector &x, Vector &y) const override;
-
   void AddMultPA(const Vector& x, Vector& y) const override;

-   void AddAbsMultPA(const Vector& x, Vector& y) const override;
-
   void AssembleMF(const FiniteElementSpace &fes) override;

   void AddMultMF(const Vector &x, Vector &y) const override;
@@ -2328,12 +2320,8 @@ public:

   void AddMultPA(const Vector&, Vector&) const override;

-   void AddAbsMultPA(const Vector&, Vector&) const override;
-
   void AddMultTransposePA(const Vector&, Vector&) const override;

-   void AddAbsMultTransposePA(const Vector&, Vector&) const override;
-
   void AddMultNURBSPA(const Vector&, Vector&) const override;

   void AddMultPatchPA(const int patch, const Vector &x, Vector &y) const;
@@ -2431,12 +2419,8 @@ public:

   void AddMultPA(const Vector&, Vector&) const override;

-   void AddAbsMultPA(const Vector&, Vector&) const override;
-
   void AddMultTransposePA(const Vector&, Vector&) const override;

-   void AddAbsMultTransposePA(const Vector&, Vector&) const override;
-
   static const IntegrationRule &GetRule(const FiniteElement &trial_fe,
                                         const FiniteElement &test_fe,
                                         const ElementTransformation &Trans);
@@ -2832,7 +2816,6 @@ public:
   using BilinearFormIntegrator::AssemblePA;
   void AssemblePA(const FiniteElementSpace &fes) override;
   void AddMultPA(const Vector &x, Vector &y) const override;
-   void AddAbsMultPA(const Vector &x, Vector &y) const override;
   void AssembleDiagonalPA(Vector& diag) override;

   const Coefficient *GetCoefficient() const { return Q; }
@@ -2950,7 +2933,6 @@ public:
   void AssemblePA(const FiniteElementSpace &trial_fes,
                   const FiniteElementSpace &test_fes) override;
   void AddMultPA(const Vector &x, Vector &y) const override;
-   void AddAbsMultPA(const Vector &x, Vector &y) const override;
   void AddMultTransposePA(const Vector &x, Vector &y) const override;
   void AssembleDiagonalPA(Vector& diag) override;
   void AssembleEA(const FiniteElementSpace &fes, Vector &emat,
@@ -1,715 +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.
-
-// Implementation of bounds
-
-#include "bounds.hpp"
-
-#include <limits>
-#include <cstring>
-#include <string>
-#include <cmath>
-#include <iostream>
-#include <algorithm>
-
-namespace mfem
-{
-
-using namespace std;
-
-void PLBound::Setup(const int nb_i, const int ncp_i,
-                    const int b_type_i, const int cp_type_i,
-                    const real_t tol_i)
-{
-   MFEM_VERIFY(b_type_i >= 0 && b_type_i <= 2, "Bases not supported. "
-               "Please read class description to see supported types.");
-   MFEM_VERIFY(cp_type_i == 0 || cp_type_i == 1,
-               "Control point type not supported. Please read class "
-               "description to see supported types.");
-   nb = nb_i;
-   ncp = ncp_i;
-   b_type = b_type_i;
-   cp_type = cp_type_i;
-   tol = tol_i;
-   lbound.SetSize(nb, ncp);
-   ubound.SetSize(nb, ncp);
-   nodes.SetSize(nb);
-   weights.SetSize(nb);
-   control_points.SetSize(ncp);
-
-   auto scalenodes = [](const Vector &in, const real_t a, const real_t b) -> Vector
-   {
-      Vector outVec(in.Size());
-      real_t maxv = in.Max();
-      real_t minv = in.Min();
-      for (int i = 0; i < in.Size(); i++)
-      {
-         outVec(i) = a + (b-a)*(in(i)-minv)/(maxv-minv);
-      }
-      return outVec;
-   };
-   MFEM_VERIFY(ncp >= 2,"At least 2 control points are required.");
-
-   if (cp_type == 0) // GL + End Point
-   {
-      control_points(0) = 0.0;
-      control_points(ncp-1) = 1.0;
-      if (ncp > 2)
-      {
-         const real_t *x = poly1d.GetPoints(ncp-3, 0);
-         MFEM_VERIFY(x, "Error in getting points.");
-         for (int i = 0; i < ncp-2; i++)
-         {
-            control_points(i+1) = x[i];
-         }
-      }
-   }
-   else if (cp_type == 1) // Chebyshev
-   {
-      auto GetChebyshevNodes = [](int n) -> Vector
-      {
-         Vector cheb(n);
-         for (int i = 0; i < n; ++i)
-         {
-            cheb(i) = -cos(M_PI * (static_cast<real_t>(i) / (n - 1)));
-         }
-         return cheb;
-      };
-      control_points = GetChebyshevNodes(ncp);
-   }
-   else
-   {
-      MFEM_ABORT("Unsupported interval points. Use [0,1].\n");
-   }
-   control_points = scalenodes(control_points, 0.0, 1.0); // rescale to [0,1]
-
-   Poly_1D::Basis &basis1d(poly1d.GetBasis(nb-1, b_type));
-
-   // Initialize bounds
-   lbound = 0.0;
-   ubound = 0.0;
-
-   Vector bmv(nb), bpv(nb), bv(nb); // basis values
-   Vector bdmv(nb), bdpv(nb), bdv(nb); // basis derivative values
-   Vector vals(3);
-
-   // See Section 3.1.1 of https://arxiv.org/pdf/2501.12349 for explanation of
-   // procedure below.
-   for (int j = 0; j < ncp; j++)
-   {
-      real_t x = control_points(j);
-      real_t xm = x;
-      if (j != 0)
-      {
-         xm = 0.5*(control_points(j-1)+control_points(j));
-      }
-      real_t xp = x;
-      if (j != ncp-1)
-      {
-         xp = 0.5*(control_points(j)+control_points(j+1));
-      }
-      basis1d.Eval(xm, bmv, bdmv);
-      basis1d.Eval(xp, bpv, bdpv);
-      basis1d.Eval(x, bv);
-      real_t dm = x-xm;
-      real_t dp = x-xp;
-      for (int i = 0; i < nb; i++)
-      {
-         if (j == 0)
-         {
-            lbound(i, j) = bv(i);
-            ubound(i, j) = bv(i);
-         }
-         else if (j == ncp-1)
-         {
-            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(i, j) = vals.Min()-tol; // tolerance for good measure
-            ubound(i, j) = vals.Max()+tol; // tolerance for good measure
-         }
-      }
-   }
-
-   IntegrationRule irule(nb);
-   if (b_type == 0)
-   {
-      QuadratureFunctions1D::GaussLegendre(nb, &irule);
-      for (int i = 0; i < nb; i++)
-      {
-         weights(i) = irule.IntPoint(i).weight;
-         nodes(i) = irule.IntPoint(i).x;
-      }
-   }
-   else if (b_type == 1)
-   {
-      QuadratureFunctions1D::GaussLobatto(nb, &irule);
-      for (int i = 0; i < nb; i++)
-      {
-         weights(i) = irule.IntPoint(i).weight;
-         nodes(i) = irule.IntPoint(i).x;
-      }
-   }
-   else if (b_type == 2)
-   {
-      QuadratureFunctions1D::ClosedUniform(nb, &irule);
-      for (int i = 0; i < nb; i++)
-      {
-         weights(i) = irule.IntPoint(i).weight;
-         nodes(i) = irule.IntPoint(i).x;
-      }
-   }
-
-   if (b_type == 2)
-   {
-      nodes_int.SetSize(nb);
-      weights_int.SetSize(nb);
-      IntegrationRule irule_int(nb);
-      {
-         QuadratureFunctions1D::GaussLobatto(nb, &irule_int);
-         for (int i = 0; i < nb; i++)
-         {
-            weights_int(i) = irule_int.IntPoint(i).weight;
-            nodes_int(i) = irule_int.IntPoint(i).x;
-         }
-      }
-
-      SetupBernsteinBasisMat(basisMatNodes, nodes);
-      // Setup memory for lu factors
-      basisMatLU = basisMatNodes;
-      lu_ip.SetSize(nb);
-      // Compute lu factors
-      LUFactors lu(basisMatLU.GetData(), lu_ip.GetData());
-      bool factor = lu.Factor(nb);
-      MFEM_VERIFY(factor,"Failure in LU factorization in PLBound.");
-
-      // Setup the Bernstein basis matrix for the GLL integration points. This
-      // is used to compute linear fit.
-      SetupBernsteinBasisMat(basisMatInt, nodes_int);
-   }
-   else
-   {
-      nodes_int.SetDataAndSize(nodes.GetData(), nb);
-      weights_int.SetDataAndSize(weights.GetData(), nb);
-   }
-}
-
-PLBound::PLBound(FiniteElementSpace *fes, int ncp_i, int cp_type_i)
-{
-   MFEM_VERIFY(!fes->IsVariableOrder(),
-               "Variable order meshes not yet supported.");
-   const char *name = fes->FEColl()->Name();
-   string cname = name;
-
-   cp_type = cp_type_i;
-   b_type = BasisType::Invalid;
-   nb = fes->GetMaxElementOrder()+1;
-   tol = 0.0;
-
-   int minncp = 2;
-   if (nb > 12)
-   {
-      minncp = 2*nb;
-   }
-   else if (!strncmp(name, "H1_", 3) && strncmp(name, "H1_Trace_", 9))
-   {
-      // H1 GLL
-      b_type = BasisType::GaussLobatto;
-      minncp = min_ncp_gll_x[cp_type][nb-2];
-   }
-   else if (!strncmp(name, "H1Pos_", 6) && strncmp(name, "H1Pos_Trace_", 12))
-   {
-      // H1 Positive
-      b_type = BasisType::Positive;
-      minncp = min_ncp_pos_x[cp_type][nb-2];
-   }
-   else if (!strncmp(name, "L2_", 3) && strncmp(name, "L2_T", 4))
-   {
-      // L2 Gauss-Legendre
-      b_type = BasisType::GaussLegendre;
-      minncp = min_ncp_gl_x[cp_type][nb-2];
-   }
-   else if (!strncmp(name, "L2_T1", 5))
-   {
-      // L2 GLL
-      b_type = BasisType::GaussLobatto;
-      minncp = min_ncp_gll_x[cp_type][nb-2];
-   }
-   else if (!strncmp(name, "L2_T2", 5))
-   {
-      // L2 Positive
-      b_type = BasisType::Positive;
-      minncp = min_ncp_pos_x[cp_type][nb-2];
-   }
-   else
-   {
-      MFEM_ABORT("Only H1 GLL/Positive & L2 GL/GLL/Positive bases supported.");
-   }
-
-   ncp = std::max(minncp, ncp_i);
-
-   Setup(nb, ncp, b_type, cp_type, tol);
-}
-
-void PLBound::Get1DBounds(Vector &coeff, Vector &intmin, Vector &intmax) const
-{
-   real_t x,w;
-   intmin.SetSize(ncp);
-   intmax.SetSize(ncp);
-   intmin = 0.0;
-   intmax = 0.0;
-   Vector coeffm(nb);
-   coeffm = 0.0;
-
-   real_t a0 = 0.0;
-   real_t a1 = 0.0;
-
-   Vector nodal_vals, nodal_integ_vals;
-   if (b_type == 2) // compute values at equispaced nodes and GLL nodes
-   {
-      nodal_vals.SetSize(nb);
-      nodal_integ_vals.SetSize(nb);
-      Vector shape(nb);
-      for (int i = 0; i < nb; i++)
-      {
-         basisMatNodes.GetRow(i, shape);
-         nodal_vals(i) = shape*coeff;
-         basisMatInt.GetRow(i, shape);
-         nodal_integ_vals(i) = shape*coeff;
-      }
-   }
-   else
-   {
-      nodal_vals.SetDataAndSize(coeff.GetData(), nb);
-      nodal_integ_vals.SetDataAndSize(coeff.GetData(), nb);
-   }
-
-   // compute L2 projection for linear bases: a0 + a1*x
-   if (proj)
-   {
-      for (int i = 0; i < nb; i++)
-      {
-         x = 2.0*nodes_int(i)-1;
-         w = 2.0*weights_int(i);
-         a0 += 0.5*nodal_integ_vals(i)*w;
-         a1 += 1.5*nodal_integ_vals(i)*w*x;
-      }
-
-      // offset the linear fit from nodal values
-      for (int i = 0; i < nb; i++)
-      {
-         x = 2.0*nodes(i)-1;
-         coeffm(i) = nodal_vals(i) - a0 - a1*x;
-      }
-
-      // compute coefficients for Bernstein
-      if (b_type == 2)
-      {
-         LUFactors lu(basisMatLU.GetData(), lu_ip.GetData());
-         lu.Solve(nb, 1, coeffm.GetData());
-      }
-
-      // initialize the bounds to be the linear fit
-      for (int j = 0; j < ncp; j++)
-      {
-         x = 2.0*control_points(j)-1;
-         intmin(j) = a0 + a1*x;
-         intmax(j) = intmin(j);
-      }
-   }
-   else
-   {
-      coeffm.SetDataAndSize(coeff.GetData(), nb);
-   }
-
-   for (int i = 0; i < nb; i++)
-   {
-      real_t c = coeffm(i);
-      for (int j = 0; j < ncp; j++)
-      {
-         intmin(j) += min(lbound(i,j)*c, ubound(i,j)*c);
-         intmax(j) += max(lbound(i,j)*c, ubound(i,j)*c);
-      }
-   }
-}
-
-void PLBound::Get2DBounds(Vector &coeff, Vector &intmin, Vector &intmax) const
-{
-   intmin.SetSize(ncp*ncp);
-   intmax.SetSize(ncp*ncp);
-   intmin = 0.0;
-   intmax = 0.0;
-   Vector intminT(ncp*nb);
-   Vector intmaxT(ncp*nb);
-   // Get bounds for each row of the solution
-   for (int i = 0; i < nb; i++)
-   {
-      Vector solcoeff(coeff.GetData()+i*nb, nb);
-      Vector intminrow(intminT.GetData()+i*ncp, ncp);
-      Vector intmaxrow(intmaxT.GetData()+i*ncp, ncp);
-      Get1DBounds(solcoeff, intminrow, intmaxrow);
-   }
-   Vector intminT2 = intminT;
-
-   // Compute a0 and a1 for each column of nodes
-   Vector a0V(ncp), a1V(ncp);
-   a0V = 0.0;
-   a1V = 0.0;
-   real_t x,w,t;
-   if (proj)
-   {
-      if (b_type == 2)
-      {
-         // Note: DenseMatrix uses column-major ordering so we will need to
-         // transpose the matrix.
-         DenseMatrix intminTM(intminT.GetData(), ncp, nb),
-                     intmaxTM(intmaxT.GetData(), ncp, nb),
-                     intmeanTM(ncp, nb);
-         DenseMatrix minvalsM(nb, ncp), maxvalsM(nb, ncp), meanintvalsM(nb, ncp);
-         MultABt(basisMatNodes, intminTM, minvalsM);
-         MultABt(basisMatNodes, intmaxTM, maxvalsM);
-         intmeanTM = intminTM;
-         intmeanTM += intmaxTM;
-         intmeanTM *= 0.5;
-         MultABt(basisMatInt, intmeanTM, meanintvalsM);
-
-         // Compute the linear fit along each column and then offset it from
-         // the bounds on the coefficient.
-         // Note: Since Bernstein bases are positive, we can use the lower
-         // bounds to compute the lower bounding polynomial and subtract the
-         // linear fit before finding the Bernstein coefficients corresponding
-         // to the perturbation. Same for upper bounds. If the bases were not
-         // always positive, it is not yet clear if the perturbation
-         // coefficients will be this straightforward to compute.
-         for (int j = 0; j < ncp; j++) // row of interval points
-         {
-            for (int i = 0; i < nb; i++)
-            {
-               x = 2.0*nodes_int(i)-1; // x-coordinate
-               w = 2.0*weights_int(i); // weight
-               t = meanintvalsM(i,j);
-               a0V(j) += 0.5*t*w;
-               a1V(j) += 1.5*t*w*x;
-            }
-            // Offset linear fit
-            for (int i = 0; i < nb; i++)
-            {
-               x = 2.0*nodes(i)-1; // x-coordinate
-               minvalsM(i,j) -= a0V(j) + a1V(j)*x;
-               maxvalsM(i,j) -= a0V(j) + a1V(j)*x;
-            }
-            // Compute Bernstein coefficients
-            LUFactors lu(basisMatLU.GetData(), lu_ip.GetData());
-            lu.Solve(nb, 1, minvalsM.GetColumn(j));
-            lu.Solve(nb, 1, maxvalsM.GetColumn(j));
-            for (int i = 0; i < nb; i++)
-            {
-               intminT(i*ncp+j) = minvalsM(i,j);
-               intmaxT(i*ncp+j) = maxvalsM(i,j);
-            }
-         }
-      }
-      else
-      {
-         for (int j = 0; j < nb; j++) // row of nodes
-         {
-            x = 2.0*nodes(j)-1; // x-coordinate
-            w = 2.0*weights(j); // weight
-            for (int i = 0; i < ncp; i++) // column of interval points
-            {
-               t = 0.5*(intminT(j*ncp+i)+intmaxT(j*ncp+i));
-               a0V(i) += 0.5*t*w;
-               a1V(i) += 1.5*t*w*x;
-            }
-         }
-         // offset the linear fit from nodal values
-         for (int j = 0; j < nb; j++) // row of nodes
-         {
-            x = 2.0*nodes(j)-1; // x-coordinate
-            for (int i = 0; i < ncp; i++) // column of interval points
-            {
-               t = a0V(i) + a1V(i)*x;
-               intminT(j*ncp+i) -= t;
-               intmaxT(j*ncp+i) -= t;
-            }
-         }
-      }
-
-      // Initialize bounds using a0 and a1 values
-      for (int j = 0; j < ncp; j++) // row j
-      {
-         x = 2.0*control_points(j)-1;
-         for (int i = 0; i < ncp; i++) // column i
-         {
-            intmin(j*ncp+i) = a0V(i) + a1V(i)*x;
-            intmax(j*ncp+i) = intmin(j*ncp+i);
-         }
-      }
-   }
-
-   // Compute bounds
-   int id1 = 0, id2 = 0;
-   Vector vals(4);
-   for (int j = 0; j < nb; j++)
-   {
-      for (int i = 0; i < ncp; i++) // ith column
-      {
-         real_t w0 = intminT(id1++);
-         real_t w1 = intmaxT(id2++);
-         for (int k = 0; k < ncp; k++) // kth row
-         {
-            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();
-         }
-      }
-   }
-}
-
-void PLBound::Get3DBounds(Vector &coeff, Vector &intmin, Vector &intmax) const
-{
-   int nb2 = nb*nb,
-       ncp2 = ncp*ncp,
-       ncp3 = ncp*ncp*ncp;
-
-   intmin.SetSize(ncp3);
-   intmax.SetSize(ncp3);
-   intmin = 0.0;
-   intmax = 0.0;
-   Vector intminT(ncp2*nb);
-   Vector intmaxT(ncp2*nb);
-
-   // Get bounds for each slice of the solution
-   for (int i = 0; i < nb; i++)
-   {
-      Vector solcoeff(coeff.GetData()+i*nb2, nb2);
-      Vector intminrow(intminT.GetData()+i*ncp2, ncp2);
-      Vector intmaxrow(intmaxT.GetData()+i*ncp2, ncp2);
-      Get2DBounds(solcoeff, intminrow, intmaxrow);
-   }
-   DenseMatrix intminTM(intminT.GetData(), ncp2, nb),
-               intmaxTM(intmaxT.GetData(), ncp2, nb);
-
-   // Compute a0 and a1 for each tower of nodes
-   Vector a0V(ncp2), a1V(ncp2);
-   a0V = 0.0;
-   a1V = 0.0;
-   real_t x,w,t;
-   if (proj)
-   {
-      if (b_type == 2) // Bernstein bases
-      {
-         // Compute the mean coefficients along each tower.
-         for (int j = 0; j < ncp2; j++) // slice of interval points
-         {
-            Vector meanBounds(nb), minBounds(nb), maxBounds(nb);
-            intminTM.GetRow(j, minBounds);
-            intmaxTM.GetRow(j, maxBounds);
-            for (int i = 0; i < nb; i++) // column of nodes
-            {
-               meanBounds(i) = 0.5*(minBounds(i)+maxBounds(i));
-            }
-            Vector meanNodalIntVals(nb);
-            Vector minNodalVals(nb);
-            Vector maxNodalVals(nb);
-            Vector row(nb);
-            for (int i = 0; i < nb; i++)
-            {
-               basisMatNodes.GetRow(i, row);
-               minNodalVals(i) = row*minBounds;
-               maxNodalVals(i) = row*maxBounds;
-               basisMatInt.GetRow(i, row);
-               meanNodalIntVals(i) = row*meanBounds;
-            }
-            // linear fit along each tower
-            for (int i = 0; i < nb; i++)
-            {
-               x = 2.0*nodes_int(i)-1; // x-coordinate
-               w = 2.0*weights_int(i); // weight
-               a0V(j) += 0.5*meanNodalIntVals(i)*w;
-               a1V(j) += 1.5*meanNodalIntVals(i)*w*x;
-            }
-            // offset the linear fit from bounding coefficients
-            for (int i = 0; i < nb; i++)
-            {
-               x = 2.0*nodes(i)-1; // x-coordinate
-               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, minBounds.GetData());
-            lu.Solve(nb, 1, maxBounds.GetData());
-            for (int i = 0; i < nb; i++)
-            {
-               intminT(i*ncp2+j) = minBounds(i);
-               intmaxT(i*ncp2+j) = maxBounds(i);
-            }
-         }
-      }
-      else
-      {
-         // nodal bases
-         for (int j = 0; j < nb; j++) // tower of nodes
-         {
-            x = 2.0*nodes(j)-1; // x-coordinate
-            w = 2.0*weights(j); // weight
-            for (int i = 0; i < ncp2; i++) // slice of interval points
-            {
-               t = 0.5*(intminT(j*ncp2+i)+intmaxT(j*ncp2+i));
-               a0V(i) += 0.5*t*w;
-               a1V(i) += 1.5*t*w*x;
-            }
-         }
-         // offset the linear fit from nodal values
-         for (int j = 0; j < nb; j++) // row of nodes
-         {
-            x = 2.0*nodes(j)-1; // x-coordinate
-            for (int i = 0; i < ncp2; i++) // column of interval points
-            {
-               t = a0V(i) + a1V(i)*x;
-               intminT(j*ncp2+i) -= t;
-               intmaxT(j*ncp2+i) -= t;
-            }
-         }
-      }
-
-      // Initialize bounds using a0 and a1 values
-      for (int j = 0; j < ncp; j++) // slice j
-      {
-         x = 2.0*control_points(j)-1;
-         for (int i = 0; i < ncp2; i++) // tower i
-         {
-            intmin(j*ncp2+i) = a0V(i) + a1V(i)*x;
-            intmax(j*ncp2+i) = a0V(i) + a1V(i)*x;
-         }
-      }
-   }
-
-   // Compute bounds
-   int id1 = 0, id2 = 0;
-   Vector vals(4);
-   for (int j = 0; j < nb; j++)
-   {
-      for (int i = 0; i < ncp2; i++) // ith tower
-      {
-         real_t w0 = intminT(id1++);
-         real_t w1 = intmaxT(id2++);
-         for (int k = 0; k < ncp; k++) // kth slice
-         {
-            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();
-         }
-      }
-   }
-}
-
-void PLBound::GetNDBounds(int rdim, Vector &coeff,
-                          Vector &intmin, Vector &intmax) const
-{
-   if (rdim == 1)
-   {
-      Get1DBounds(coeff, intmin, intmax);
-   }
-   else if (rdim == 2)
-   {
-      Get2DBounds(coeff, intmin, intmax);
-   }
-   else if (rdim == 3)
-   {
-      Get3DBounds(coeff, intmin, intmax);
-   }
-   else
-   {
-      MFEM_ABORT("Currently not supported.");
-   }
-}
-
-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
-   Array<int> ordering = el.GetLexicographicOrdering();
-   basisMat.SetSize(nbern, nbern);
-   Vector shape(nbern);
-   IntegrationPoint ip;
-   for (int i = 0; i < nbern; i++)
-   {
-      ip.x = nodesBern(i);
-      el.CalcShape(ip, shape);
-      basisMat.SetRow(i, shape);
-   }
-}
-
-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];
-
-int PLBound::GetMinimumPointsForGivenBases(int nb_i, int b_type_i,
-                                           int cp_type_i) const
-{
-   MFEM_VERIFY(b_type_i >= 0 && b_type_i <= 2, "Invalid node type. Specify 0 "
-               "for GL, 1 for GLL, and 2 for positive " "bases.");
-   MFEM_VERIFY(cp_type_i == 0 || cp_type_i == 1, "Invalid control point type. "
-               "Specify 0 for GL+end points, 1 for Chebyshev.");
-   if (nb_i > 12)
-   {
-      MFEM_ABORT("GetMinimumPointsForGivenBases can only be used for maximum "
-                 "order = 11, i.e. nb=12. 2*nb points should be sufficient to "
-                 "bound the bases up to nb = 30.");
-   }
-   else if (b_type_i == 0)
-   {
-      return min_ncp_gl_x[cp_type_i][nb_i-2];
-   }
-   else if (b_type_i == 1)
-   {
-      return min_ncp_gll_x[cp_type_i][nb_i-2];
-   }
-   else if (b_type_i == 2)
-   {
-      return min_ncp_pos_x[cp_type_i][nb_i-2];
-   }
-   return 0;
-}
-
-void PLBound::Print(std::ostream &outp) const
-{
-   outp << "PLBound nb: " << nb << std::endl;
-   outp << "PLBound ncp: " << ncp << std::endl;
-   outp << "PLBound b_type: " << b_type << std::endl;
-   outp << "PLBound cp_type: " << cp_type << std::endl;
-   outp << "Print nodes: " << std::endl;
-   nodes.Print(outp);
-   outp << "Print weights: " << std::endl;
-   weights.Print(outp);
-   outp << "Print control_points: " << std::endl;
-   control_points.Print(outp);
-   outp << "Print lower bounds: " << std::endl;
-   lbound.Print(outp);
-   outp << "Print upper bounds: " << std::endl;
-   ubound.Print(outp);
-}
-
-}
@@ -1,136 +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.
-
-#ifndef MFEM_BOUND
-#define MFEM_BOUND
-
-#include "../config/config.hpp"
-#include "fespace.hpp"
-
-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:
-
-    (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
-    2 - Positive/Bernstein bases on uniformly distributed nodes,
-
-    (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.
-
-    Note: @b nb and @b b_type are inferred directly from the grid-function.
-
-    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.
-
-    Finally, only tensor-product elements are currently supported.
-
-    For more technical details see:
-    Mittal et al., "General Field Evaluation in High-Order Meshes on GPUs" &
-    Dzanic et al., "A method for bounding high-order finite element
-    functions: Applications to mesh validity and bounds-preserving limiters".
-*/
-class PLBound
-{
-private:
-   int nb; // #mesh nodes in 1D
-   int ncp; // #control points in 1D
-   int b_type; // bases type: 0 - GL, 1 - GLL, 2 - Bernstein
-   int cp_type; // control points type: 0 - GL+Ends, 1 - Chebyshev
-   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; // 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
-   Vector nodes_int, weights_int; // Integration nodes and weights
-   DenseMatrix basisMatLU;    // Used to compute LU factors for Bernstein
-   mutable Array<int> lu_ip;
-
-   // stores min_ncp for nb = 2..12 for Lagrange interpolants on GL nodes
-   // with GL+end points and Chebyshev points as control points
-   static constexpr int min_ncp_gl_x[2][11]= {{3,5,6,8,9,10,11,11,12,13,14},
-      {3,5,8,9,11,12,14,15,17,18,20}
-   };
-
-   // stores min_ncp for nb = 2..12 for Lagrange interpolants on GLL nodes
-   // with GL+end points and Chebyshev points as control points
-   static constexpr int min_ncp_gll_x[2][11]= {{3,5,7,8,9,10,12,13,14,15,16},
-      {3,5,8,10,12,13,15,17,19,21,22}
-   };
-
-   // stores min_ncp for nb = 2..12 for Bernstein bases with GL+end points
-   // and Chebyshev points as control points
-   static constexpr int min_ncp_pos_x[2][11]= {{3,5,7,8,8,9,10,10,11,12,13},
-      {3,5,8,9,11,12,13,13,14,15,16}
-   };
-
-public:
-   // Constructor
-   PLBound(const int nb_i, const int ncp_i, const int b_type_i,
-           const int cp_type_i, const real_t tol_i)
-   {
-      Setup(nb_i, ncp_i, b_type_i, cp_type_i, tol_i);
-   }
-
-   // Constructor
-   PLBound(FiniteElementSpace *fes, int ncp_i = -1, int cp_type_i = 0);
-
-   // 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
-   void Print(std::ostream &outp = mfem::out) const;
-
-   // 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_; }
-
-   /// Compute piecewise linear bounds for the lexicographically-ordered
-   /// coefficients in @a coeff in 1D/2D/3D.
-   void GetNDBounds(int rdim, Vector &coeff,
-                    Vector &intmin, Vector &intmax) const;
-
-   /// Get number of control points used to compute the bounds.
-   int GetNControlPoints() const { return ncp; }
-private:
-   /// Compute piecewise linear bounds for the lexicographically-ordered
-   /// coefficients in @a coeff in 1D.
-   void Get1DBounds(Vector &coeff, Vector &intmin, Vector &intmax) const;
-
-   /// Compute piecewise linear bounds for the lexicographically-ordered
-   /// coefficients in @a coeff in 2D.
-   void Get2DBounds(Vector &coeff, Vector &intmin, Vector &intmax) const;
-
-   /// Compute piecewise linear bounds for the lexicographically-ordered
-   /// coefficients in @a coeff in 3D.
-   void Get3DBounds(Vector &coeff, Vector &intmin, Vector &intmax) const;
-
-   /// 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,
-              const int cp_type_i, const real_t tol_i);
-};
-
-} // namespace mfem
-
-#endif // MFEM_BOUND
@@ -240,9 +240,7 @@ public:
       Vector argument instead of Vector. */
   MFEM_DEPRECATED FunctionCoefficient(real_t (*f)(Vector &))
   {
-      // Cast first to (void*) to suppress a warning from newer version of
-      // Clang when using -Wextra.
-      Function = reinterpret_cast<real_t(*)(const Vector&)>((void*)f);
+      Function = reinterpret_cast<real_t(*)(const Vector&)>(f);
      TDFunction = NULL;
   }

@@ -252,10 +250,7 @@ public:
   MFEM_DEPRECATED FunctionCoefficient(real_t (*tdf)(Vector &, real_t))
   {
      Function = NULL;
-      // Cast first to (void*) to suppress a warning from newer version of
-      // Clang when using -Wextra.
-      TDFunction =
-         reinterpret_cast<real_t(*)(const Vector&,real_t)>((void*)tdf);
+      TDFunction = reinterpret_cast<real_t(*)(const Vector&,real_t)>(tdf);
   }

   /// Evaluate the coefficient at @a ip.
@@ -1,217 +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 "complex_fem.hpp"
-#include "../general/forall.hpp"
-
-using namespace std;
-
-namespace mfem
-{
-
-real_t
-RealPartCoefficient::Eval(ElementTransformation &T,
-                          const IntegrationPoint &ip)
-{
-   complex_t val = complex_coef_.Eval(T, ip);
-   return val.real();
-}
-
-real_t
-ImagPartCoefficient::Eval(ElementTransformation &T,
-                          const IntegrationPoint &ip)
-{
-   complex_t val = complex_coef_.Eval(T, ip);
-   return val.imag();
-}
-
-RealPartVectorCoefficient::RealPartVectorCoefficient(ComplexVectorCoefficient &
-                                                     complex_vcoef)
-   : VectorCoefficient(complex_vcoef.GetVDim()),
-     complex_vcoef_(complex_vcoef),
-     val_(vdim)
-{}
-
-void
-RealPartVectorCoefficient::Eval(Vector &V, ElementTransformation &T,
-                                const IntegrationPoint &ip)
-{
-   complex_vcoef_.Eval(val_, T, ip);
-   V = val_.real();
-}
-
-ImagPartVectorCoefficient::ImagPartVectorCoefficient(ComplexVectorCoefficient &
-                                                     complex_vcoef)
-   : VectorCoefficient(complex_vcoef.GetVDim()),
-     complex_vcoef_(complex_vcoef),
-     val_(vdim)
-{}
-
-void
-ImagPartVectorCoefficient::Eval(Vector &V, ElementTransformation &T,
-                                const IntegrationPoint &ip)
-{
-   complex_vcoef_.Eval(val_, T, ip);
-   V = val_.imag();
-}
-
-RealPartMatrixCoefficient::RealPartMatrixCoefficient(ComplexMatrixCoefficient &
-                                                     complex_mcoef)
-   : MatrixCoefficient(complex_mcoef.GetHeight(), complex_mcoef.GetWidth()),
-     complex_mcoef_(complex_mcoef),
-     val_(height, width)
-{}
-
-void
-RealPartMatrixCoefficient::Eval(DenseMatrix &M, ElementTransformation &T,
-                                const IntegrationPoint &ip)
-{
-   complex_mcoef_.Eval(val_, T, ip);
-   M = val_.real();
-}
-
-ImagPartMatrixCoefficient::ImagPartMatrixCoefficient(ComplexMatrixCoefficient &
-                                                     complex_mcoef)
-   : MatrixCoefficient(complex_mcoef.GetHeight(), complex_mcoef.GetWidth()),
-     complex_mcoef_(complex_mcoef),
-     val_(height, width)
-{}
-
-void
-ImagPartMatrixCoefficient::Eval(DenseMatrix &M, ElementTransformation &T,
-                                const IntegrationPoint &ip)
-{
-   complex_mcoef_.Eval(val_, T, ip);
-   M = val_.imag();
-}
-
-ComplexCoefficient::ComplexCoefficient()
-   : time(0.),
-     re_part_coef_(*this), im_part_coef_(*this),
-     real_coef_(re_part_coef_), imag_coef_(im_part_coef_)
-{ }
-
-ComplexCoefficient::ComplexCoefficient(Coefficient &c_r,
-                                       Coefficient &c_i)
-   : time(c_r.GetTime()),
-     re_part_coef_(*this), im_part_coef_(*this),
-     real_coef_(c_r), imag_coef_(c_i)
-{
-   c_i.SetTime(time);
-}
-
-complex_t
-ComplexCoefficient::Eval(ElementTransformation &T,
-                         const IntegrationPoint &ip)
-{
-   // Avoid circular dependency
-   MFEM_VERIFY(std::addressof(real_coef_) != std::addressof(re_part_coef_) &&
-               std::addressof(imag_coef_) != std::addressof(im_part_coef_),
-               "Classes dervied from ComplexCoefficient must either "
-               "implement an Eval method or supply Coefficients "
-               "for both the real and imaginary parts of the field.");
-
-   return complex_t(real_coef_.Eval(T, ip), imag_coef_.Eval(T, ip));
-}
-
-ComplexVectorCoefficient::ComplexVectorCoefficient(VectorCoefficient &v_r,
-                                                   VectorCoefficient &v_i)
-   : vdim(v_r.GetVDim()), time(v_r.GetTime()),
-     re_part_vcoef_(*this), im_part_vcoef_(*this),
-     real_vcoef_(v_r), imag_vcoef_(v_i)
-{
-   MFEM_ASSERT(v_r.GetVDim() == v_i.GetVDim(), "ComplexVectorCoefficient"
-               " - incompatible vector dimensions of real and imaginary parts.");
-
-   v_i.SetTime(time);
-}
-
-void ComplexVectorCoefficient::Eval(ComplexVector &V, ElementTransformation &T,
-                                    const IntegrationPoint &ip)
-{
-   // Avoid circular dependency
-   MFEM_VERIFY(std::addressof(real_vcoef_) != std::addressof(re_part_vcoef_) &&
-               std::addressof(imag_vcoef_) != std::addressof(im_part_vcoef_),
-               "Classes dervied from ComplexVectorCoefficient must either "
-               "implement an Eval method or supply VectorCoefficients "
-               "for both the real and imaginary parts of the field.");
-
-   V_r_.SetSize(vdim);
-   V_i_.SetSize(vdim);
-
-   real_vcoef_.Eval(V_r_, T, ip);
-   imag_vcoef_.Eval(V_i_, T, ip);
-
-   V.Set(V_r_, V_i_);
-}
-
-ComplexConstantCoefficient::ComplexConstantCoefficient(
-   const complex_t z)
-   : val(z), real_coef(z.real()), imag_coef(z.imag())
-{
-   real_coef_ = real_coef;
-   imag_coef_ = imag_coef;
-}
-
-ComplexConstantCoefficient::ComplexConstantCoefficient(
-   real_t z_r, real_t z_i)
-   : real_coef(z_r), imag_coef(z_i)
-{
-   val = complex_t(z_r, z_i);
-
-   real_coef_ = real_coef;
-   imag_coef_ = imag_coef;
-}
-
-complex_t ComplexFunctionCoefficient::Eval(ElementTransformation & T,
-                                           const IntegrationPoint & ip)
-{
-   real_t x[3];
-   Vector transip(x, 3);
-
-   T.Transform(ip, transip);
-
-   if (Function)
-   {
-      return Function(transip);
-   }
-   else
-   {
-      return TDFunction(transip, GetTime());
-   }
-}
-
-void ComplexVectorFunctionCoefficient::Eval(ComplexVector &V,
-                                            ElementTransformation &T,
-                                            const IntegrationPoint &ip)
-{
-   real_t x[3];
-   Vector transip(x, 3);
-
-   T.Transform(ip, transip);
-
-   V.SetSize(vdim);
-   if (Function)
-   {
-      Function(transip, V);
-   }
-   else
-   {
-      TDFunction(transip, GetTime(), V);
-   }
-   if (Q)
-   {
-      V *= Q->Eval(T, ip, GetTime());
-   }
-}
-
-} // end namespace mfem
-
@@ -1,523 +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.
-
-#ifndef MFEM_COMPLEX_COEFFICIENT
-#define MFEM_COMPLEX_COEFFICIENT
-
-#include "../config/config.hpp"
-#include "../linalg/linalg.hpp"
-#include "coefficient.hpp"
-#include "intrules.hpp"
-#include "eltrans.hpp"
-
-namespace mfem
-{
-
-class ComplexCoefficient;
-class ComplexVectorCoefficient;
-class ComplexMatrixCoefficient;
-
-/// Standard Coefficient which returns the real part of a ComplexCoefficient
-class RealPartCoefficient : public Coefficient
-{
-private:
-   ComplexCoefficient &complex_coef_;
-
-public:
-   RealPartCoefficient(ComplexCoefficient & complex_coef)
-      : complex_coef_(complex_coef) {}
-
-   real_t Eval(ElementTransformation &T,
-               const IntegrationPoint &ip);
-};
-
-/// Standard Coefficient which returns the imaginary part of a
-/// ComplexCoefficient
-class ImagPartCoefficient : public Coefficient
-{
-private:
-   ComplexCoefficient &complex_coef_;
-
-public:
-   ImagPartCoefficient(ComplexCoefficient & complex_coef)
-      : complex_coef_(complex_coef) {}
-
-   real_t Eval(ElementTransformation &T,
-               const IntegrationPoint &ip);
-};
-
-typedef ImagPartCoefficient ImaginaryPartCoefficient;
-
-class RealPartVectorCoefficient : public VectorCoefficient
-{
-private:
-   ComplexVectorCoefficient &complex_vcoef_;
-   mutable ComplexVector val_;
-
-public:
-   RealPartVectorCoefficient(ComplexVectorCoefficient & complex_vcoef);
-
-   void Eval(Vector &V, ElementTransformation &T,
-             const IntegrationPoint &ip);
-};
-
-class ImagPartVectorCoefficient : public VectorCoefficient
-{
-private:
-   ComplexVectorCoefficient &complex_vcoef_;
-   mutable ComplexVector val_;
-
-public:
-   ImagPartVectorCoefficient(ComplexVectorCoefficient & complex_vcoef);
-
-   void Eval(Vector &V, ElementTransformation &T,
-             const IntegrationPoint &ip);
-};
-
-typedef ImagPartVectorCoefficient ImaginaryPartVectorCoefficient;
-
-class RealPartMatrixCoefficient : public MatrixCoefficient
-{
-private:
-   ComplexMatrixCoefficient &complex_mcoef_;
-   mutable ComplexTypeDenseMatrix val_;
-
-public:
-   RealPartMatrixCoefficient(ComplexMatrixCoefficient & complex_mcoef);
-
-   void Eval(DenseMatrix &M, ElementTransformation &T,
-             const IntegrationPoint &ip);
-};
-
-class ImagPartMatrixCoefficient : public MatrixCoefficient
-{
-private:
-   ComplexMatrixCoefficient &complex_mcoef_;
-   mutable ComplexTypeDenseMatrix val_;
-
-public:
-   ImagPartMatrixCoefficient(ComplexMatrixCoefficient & complex_mcoef);
-
-   void Eval(DenseMatrix &V, ElementTransformation &T,
-             const IntegrationPoint &ip);
-};
-
-typedef ImagPartMatrixCoefficient ImaginaryPartMatrixCoefficient;
-
-/** @brief Base class ComplexCoefficients that optionally depend on space and
-    time. These are used by the SesquilinearForm, ComplexLinearForm, and
-    ComplexGridFunction classes to represent the physical coefficients in
-    the PDEs that are being discretized. This class can also be used in a more
-    general way to represent functions that don't necessarily belong to a FE
-    space, e.g., to project onto ComplexGridFunctions to use as initial
-    conditions, exact solutions, etc. See, e.g., ex22 for these uses. */
-class ComplexCoefficient
-{
-protected:
-   real_t time;
-
-private:
-   RealPartCoefficient re_part_coef_;
-   ImagPartCoefficient im_part_coef_;
-
-protected:
-   Coefficient &real_coef_;
-   Coefficient &imag_coef_;
-
-public:
-
-   ComplexCoefficient();
-   ComplexCoefficient(Coefficient &c_r, Coefficient &c_i);
-
-   /// Set the time for time dependent coefficients
-   virtual void SetTime(real_t t)
-   { time = t; real_coef_.SetTime(t); imag_coef_.SetTime(t); }
-
-   /// Get the time for time dependent coefficients
-   real_t GetTime() { return time; }
-
-   /** @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
-       IntegrationPoint associated with @a T is the same as @a ip. This can be
-       achieved by calling T.SetIntPoint(&ip). */
-   virtual complex_t Eval(ElementTransformation &T,
-                          const IntegrationPoint &ip);
-
-   /** @brief Evaluate the coefficient in the element described by @a T at the
-       point @a ip at time @a t. */
-   /** @note When this method is called, the caller must make sure that the
-       IntegrationPoint associated with @a T is the same as @a ip. This can be
-       achieved by calling T.SetIntPoint(&ip). */
-   complex_t Eval(ElementTransformation &T,
-                  const IntegrationPoint &ip, real_t t)
-   {
-      SetTime(t);
-      return Eval(T, ip);
-   }
-
-   /** @brief Access a standard Coefficient object reproducing the real part of
-       the complex-valued field */
-   /** @note By default this method returns an internal object which
-       computes the complex value using the above Eval method and
-       returns its real part. Custom implementations may choose to
-       override this method with a more efficient real-valued
-       coefficient. */
-   virtual Coefficient & real() { return real_coef_; }
-
-   /** @brief Access a standard Coefficient object reproducing the imaginary
-       part of the complex-valued field */
-   /** @note By default this method returns an internal object which
-       computes the complex value using the above Eval method and
-       returns its imaginary part. Custom implementations may choose to
-       override this method with a more efficient real-valued
-       coefficient. */
-   virtual Coefficient & imag() { return imag_coef_; }
-
-   virtual ~ComplexCoefficient() { }
-};
-
-/** @brief Base class ComplexVectorCoefficients that optionally depend
-    on space and time. These are used by the SesquilinearForm,
-    ComplexLinearForm, and ComplexGridFunction classes to represent
-    the physical vector-valued coefficients in the PDEs that are being
-    discretized. This class can also be used in a more general way to
-    represent functions that don't necessarily belong to a FE space,
-    e.g., to project onto ComplexGridFunctions to use as initial
-    conditions, exact solutions, etc. See, e.g., ex22 for these
-    uses. */
-class ComplexVectorCoefficient
-{
-protected:
-   int vdim;
-   real_t time;
-
-private:
-   RealPartVectorCoefficient re_part_vcoef_;
-   ImagPartVectorCoefficient im_part_vcoef_;
-
-protected:
-   VectorCoefficient &real_vcoef_;
-   VectorCoefficient &imag_vcoef_;
-
-   mutable Vector V_r_;
-   mutable Vector V_i_;
-
-public:
-   ComplexVectorCoefficient(int vd)
-      : vdim(vd), time(0.),
-        re_part_vcoef_(*this), im_part_vcoef_(*this),
-        real_vcoef_(re_part_vcoef_), imag_vcoef_(im_part_vcoef_)
-   { }
-
-   ComplexVectorCoefficient(VectorCoefficient &v_r, VectorCoefficient &v_i);
-
-
-   /// Set the time for time dependent coefficients
-   virtual void SetTime(real_t t)
-   { time = t; real_vcoef_.SetTime(t); imag_vcoef_.SetTime(t); }
-
-   /// Get the time for time dependent coefficients
-   real_t GetTime() { return time; }
-
-   /// Returns dimension of the vector.
-   int GetVDim() { return vdim; }
-
-   /** @brief Evaluate the vector coefficient in the element described by @a T
-       at the point @a ip, storing the result in @a V. */
-   /** @note When this method is called, the caller must make sure that the
-       IntegrationPoint associated with @a T is the same as @a ip. This can be
-       achieved by calling T.SetIntPoint(&ip). */
-   virtual void Eval(ComplexVector &V, ElementTransformation &T,
-                     const IntegrationPoint &ip);
-
-   /** @brief Evaluate the vector coefficient in the element described by @a T
-       at the point @a ip at time @a t, storing the result in @a V. */
-   /** @note When this method is called, the caller must make sure that the
-       IntegrationPoint associated with @a T is the same as @a ip. This can be
-       achieved by calling T.SetIntPoint(&ip). */
-   void Eval(ComplexVector &V, ElementTransformation &T,
-             const IntegrationPoint &ip, real_t t)
-   {
-      SetTime(t);
-      Eval(V, T, ip);
-   }
-
-   /** @brief Access a standard Coefficient object reproducing the real part of
-       the complex-valued field */
-   /** @note By default this method returns an internal object which
-       computes the complex value using the above Eval method and
-       returns its real part. Custom implementations may choose to
-       override this method with a more efficient real-valued
-       coefficient. */
-   virtual VectorCoefficient & real() { return real_vcoef_; }
-
-   /** @brief Access a standard Coefficient object reproducing the imaginary
-       part of the complex-valued field */
-   /** @note By default this method returns an internal object which
-       computes the complex value using the above Eval method and
-       returns its imaginary part. Custom implementations may choose to
-       override this method with a more efficient real-valued
-       coefficient. */
-   virtual VectorCoefficient & imag() { return imag_vcoef_; }
-
-   virtual ~ComplexVectorCoefficient() { }
-};
-
-/** @brief Base class ComplexMatrixCoefficients that optionally depend
-    on space and time. These are used by the SesquilinearForm,
-    ComplexLinearForm, and ComplexGridFunction classes to represent
-    the physical matrix-valued coefficients in the PDEs that are being
-    discretized. This class can also be used in a more general way to
-    represent functions that don't necessarily belong to a FE space.
-    See, e.g., ex22 for these uses. */
-class ComplexMatrixCoefficient
-{
-protected:
-   int height, width;
-   real_t time;
-
-private:
-   RealPartMatrixCoefficient re_part_mcoef_;
-   ImagPartMatrixCoefficient im_part_mcoef_;
-
-protected:
-   MatrixCoefficient &real_mcoef_;
-   MatrixCoefficient &imag_mcoef_;
-
-   mutable DenseMatrix M_r_;
-   mutable DenseMatrix M_i_;
-
-public:
-   /// Construct a dim x dim matrix coefficient.
-   explicit ComplexMatrixCoefficient(int dim)
-      : height(dim), width(dim), time(0.),
-        re_part_mcoef_(*this), im_part_mcoef_(*this),
-        real_mcoef_(re_part_mcoef_), imag_mcoef_(im_part_mcoef_)
-   { }
-
-   /// Construct a h x w matrix coefficient.
-   ComplexMatrixCoefficient(int h, int w) :
-      height(h), width(w), time(0.),
-      re_part_mcoef_(*this), im_part_mcoef_(*this),
-      real_mcoef_(re_part_mcoef_), imag_mcoef_(im_part_mcoef_)
-   { }
-
-   /// Set the time for time dependent coefficients
-   virtual void SetTime(real_t t) { time = t; }
-
-   /// Get the time for time dependent coefficients
-   real_t GetTime() { return time; }
-
-   /// Get the height of the matrix.
-   int GetHeight() const { return height; }
-
-   /// Get the width of the matrix.
-   int GetWidth() const { return width; }
-
-   /// For backward compatibility get the width of the matrix.
-   int GetVDim() const { return width; }
-
-   /** @brief Evaluate the matrix coefficient in the element described by @a T
-       at the point @a ip, storing the result in @a K. */
-   /** @note When this method is called, the caller must make sure that the
-       IntegrationPoint associated with @a T is the same as @a ip. This can be
-       achieved by calling T.SetIntPoint(&ip). */
-   virtual void Eval(ComplexTypeDenseMatrix &K, ElementTransformation &T,
-                     const IntegrationPoint &ip) = 0;
-
-   /** @brief Access a standard Coefficient object reproducing the real part of
-       the complex-valued field */
-   /** @note By default this method returns an internal object which
-       computes the complex value using the above Eval method and
-       returns its real part. Custom implementations may choose to
-       override this method with a more efficient real-valued
-       coefficient. */
-   virtual MatrixCoefficient & real() { return real_mcoef_; }
-
-   /** @brief Access a standard Coefficient object reproducing the imaginary
-       part of the complex-valued field */
-   /** @note By default this method returns an internal object which
-       computes the complex value using the above Eval method and
-       returns its imaginary part. Custom implementations may choose to
-       override this method with a more efficient real-valued
-       coefficient. */
-   virtual MatrixCoefficient & imag() { return imag_mcoef_; }
-
-   virtual ~ComplexMatrixCoefficient() { }
-};
-
-/// A complex-valued coefficient that is constant across space and time
-class ComplexConstantCoefficient : public ComplexCoefficient
-{
-private:
-   complex_t val;
-
-   ConstantCoefficient real_coef;
-   ConstantCoefficient imag_coef;
-
-public:
-   ComplexConstantCoefficient(const complex_t z);
-
-   ComplexConstantCoefficient(real_t z_r, real_t z_i = 0.);
-
-   complex_t Eval(ElementTransformation &T,
-                  const IntegrationPoint &ip) { return val; }
-};
-
-/// Complex-valued vector coefficient that is constant in space and time.
-class ComplexVectorConstantCoefficient : public ComplexVectorCoefficient
-{
-private:
-   ComplexVector vec;
-
-public:
-   /// Construct the coefficient with constant vector @a v.
-   ComplexVectorConstantCoefficient(const ComplexVector &v)
-      : ComplexVectorCoefficient(v.Size()), vec(v) { }
-
-   /// Construct the coefficient with constant vector @a v.
-   ComplexVectorConstantCoefficient(const Vector &v)
-      : ComplexVectorCoefficient(v.Size()), vec(v) { }
-
-   using ComplexVectorCoefficient::Eval;
-
-   ///  Evaluate the vector coefficient at @a ip.
-   void Eval(ComplexVector &V, ElementTransformation &T,
-             const IntegrationPoint &ip) override { V = vec; }
-
-   /// Return a reference to the constant vector in this class.
-   const ComplexVector& GetVec() const { return vec; }
-};
-
-/// Complex-valued vector coefficient that is constant in space and time.
-class ComplexMatrixConstantCoefficient : public ComplexMatrixCoefficient
-{
-private:
-   ComplexTypeDenseMatrix mat;
-
-public:
-   /// Construct the coefficient with constant vector @a v.
-   ComplexMatrixConstantCoefficient(const ComplexTypeDenseMatrix &m)
-      : ComplexMatrixCoefficient(m.Height(), m.Width()), mat(m) { }
-
-   /// Construct the coefficient with constant vector @a v.
-   ComplexMatrixConstantCoefficient(const DenseMatrix &m)
-      : ComplexMatrixCoefficient(m.Height(), m.Width()), mat(m) { }
-
-   using ComplexMatrixCoefficient::Eval;
-
-   ///  Evaluate the matrix coefficient at @a ip.
-   void Eval(ComplexTypeDenseMatrix &M, ElementTransformation &T,
-             const IntegrationPoint &ip) override { M = mat; }
-
-   /// Return a reference to the constant matrix in this class.
-   const ComplexTypeDenseMatrix& GetMat() const { return mat; }
-};
-
-/// A general complex-valued function coefficient
-class ComplexFunctionCoefficient : public ComplexCoefficient
-{
-protected:
-   std::function<complex_t(const Vector &)> Function;
-   std::function<complex_t(const Vector &, real_t)> TDFunction;
-
-public:
-   /// Define a time-independent coefficient from a std function
-   /** \param F time-independent std::function */
-   ComplexFunctionCoefficient(std::function<complex_t
-                              (const Vector &)> F)
-      : Function(std::move(F))
-   { }
-
-   /// Define a time-dependent coefficient from a std function
-   /** \param TDF time-dependent function */
-   ComplexFunctionCoefficient(std::function<complex_t
-                              (const Vector &, real_t)> TDF)
-      : TDFunction(std::move(TDF))
-   { }
-
-   /// (DEPRECATED) Define a time-independent coefficient from a C-function
-   /** @deprecated Use the method where the C-function, @a f, uses a const
-       Vector argument instead of Vector. */
-   MFEM_DEPRECATED ComplexFunctionCoefficient(complex_t
-                                              (*f)(Vector &))
-   {
-      // Cast first to (void*) to suppress a warning from newer version of
-      // Clang when using -Wextra.
-      Function = reinterpret_cast<complex_t(*)
-                 (const Vector&)>((void*)f);
-      TDFunction = NULL;
-   }
-
-   /// (DEPRECATED) Define a time-dependent coefficient from a C-function
-   /** @deprecated Use the method where the C-function, @a tdf, uses a const
-       Vector argument instead of Vector. */
-   MFEM_DEPRECATED ComplexFunctionCoefficient(complex_t
-                                              (*tdf)(Vector &, real_t))
-   {
-      Function = NULL;
-      // Cast first to (void*) to suppress a warning from newer version of
-      // Clang when using -Wextra.
-      TDFunction =
-         reinterpret_cast<complex_t(*)(const Vector&,
-                                       real_t)>((void*)tdf);
-   }
-
-   /// Evaluate the coefficient at @a ip.
-   complex_t Eval(ElementTransformation &T,
-                  const IntegrationPoint &ip) override;
-};
-
-/// A general vector function coefficient
-class ComplexVectorFunctionCoefficient : public ComplexVectorCoefficient
-{
-private:
-   std::function<void(const Vector &, ComplexVector &)> Function;
-   std::function<void(const Vector &, real_t, ComplexVector &)> TDFunction;
-   ComplexCoefficient *Q;
-
-public:
-   /// Define a time-independent complex-valued vector coefficient
-   /// from a std function
-   /** \param dim - the size of the vector
-       \param F - time-independent function
-       \param q - optional scalar Coefficient to scale the vector coefficient */
-   ComplexVectorFunctionCoefficient(int dim,
-                                    std::function<void(const Vector &,
-                                                       ComplexVector &)> F,
-                                    ComplexCoefficient *q = nullptr)
-      : ComplexVectorCoefficient(dim), Function(std::move(F)), Q(q)
-   { }
-
-   /// Define a time-dependent complex-valued vector coefficient from
-   /// a std function
-   /** \param dim - the size of the vector
-       \param TDF - time-dependent function
-       \param q - optional scalar ComplexCoefficient to scale the vector coefficient */
-   ComplexVectorFunctionCoefficient(int dim,
-                                    std::function<void(const Vector &, real_t,
-                                                       ComplexVector &)> TDF,
-                                    ComplexCoefficient *q = nullptr)
-      : ComplexVectorCoefficient(dim), TDFunction(std::move(TDF)), Q(q)
-   { }
-
-   using ComplexVectorCoefficient::Eval;
-   /// Evaluate the vector coefficient at @a ip.
-   void Eval(ComplexVector &V, ElementTransformation &T,
-             const IntegrationPoint &ip) override;
-
-   virtual ~ComplexVectorFunctionCoefficient() { }
-};
-
-} // end namespace mfem
-
-#endif
@@ -96,23 +96,6 @@ ComplexGridFunction::ProjectCoefficient(Coefficient &real_coeff,
   gfi->SyncAliasMemory(*this);
 }

-void
-ComplexGridFunction::ProjectCoefficient(Coefficient &real_coeff)
-{
-   gfr->SyncMemory(*this);
-   gfi->SyncMemory(*this);
-   gfr->ProjectCoefficient(real_coeff);
-   *gfi = 0.0;
-   gfr->SyncAliasMemory(*this);
-   gfi->SyncAliasMemory(*this);
-}
-
-void
-ComplexGridFunction::ProjectCoefficient(ComplexCoefficient &coeff)
-{
-   this->ProjectCoefficient(coeff.real(), coeff.imag());
-}
-
 void
 ComplexGridFunction::ProjectCoefficient(VectorCoefficient &real_vcoeff,
                                        VectorCoefficient &imag_vcoeff)
@@ -125,23 +108,6 @@ ComplexGridFunction::ProjectCoefficient(VectorCoefficient &real_vcoeff,
   gfi->SyncAliasMemory(*this);
 }

-void
-ComplexGridFunction::ProjectCoefficient(VectorCoefficient &real_vcoeff)
-{
-   gfr->SyncMemory(*this);
-   gfi->SyncMemory(*this);
-   gfr->ProjectCoefficient(real_vcoeff);
-   *gfi = 0.0;
-   gfr->SyncAliasMemory(*this);
-   gfi->SyncAliasMemory(*this);
-}
-
-void
-ComplexGridFunction::ProjectCoefficient(ComplexVectorCoefficient &vcoeff)
-{
-   this->ProjectCoefficient(vcoeff.real(), vcoeff.imag());
-}
-
 void
 ComplexGridFunction::ProjectBdrCoefficient(Coefficient &real_coeff,
                                           Coefficient &imag_coeff,
@@ -155,26 +121,6 @@ ComplexGridFunction::ProjectBdrCoefficient(Coefficient &real_coeff,
   gfi->SyncAliasMemory(*this);
 }

-void
-ComplexGridFunction::ProjectBdrCoefficient(Coefficient &real_coeff,
-                                           Array<int> &attr)
-{
-   ConstantCoefficient zero_coeff(0.0);
-   gfr->SyncMemory(*this);
-   gfi->SyncMemory(*this);
-   gfr->ProjectBdrCoefficient(real_coeff, attr);
-   gfi->ProjectBdrCoefficient(zero_coeff, attr);
-   gfr->SyncAliasMemory(*this);
-   gfi->SyncAliasMemory(*this);
-}
-
-void
-ComplexGridFunction::ProjectBdrCoefficient(ComplexCoefficient &coeff,
-                                           Array<int> &attr)
-{
-   this->ProjectBdrCoefficient(coeff.real(), coeff.imag(), attr);
-}
-
 void
 ComplexGridFunction::ProjectBdrCoefficientNormal(VectorCoefficient &real_vcoeff,
                                                 VectorCoefficient &imag_vcoeff,
@@ -188,28 +134,6 @@ ComplexGridFunction::ProjectBdrCoefficientNormal(VectorCoefficient &real_vcoeff,
   gfi->SyncAliasMemory(*this);
 }

-void
-ComplexGridFunction::ProjectBdrCoefficientNormal(VectorCoefficient &real_vcoeff,
-                                                 Array<int> &attr)
-{
-   Vector zero_vec(real_vcoeff.GetVDim()); zero_vec = 0.;
-   VectorConstantCoefficient zero_vcoeff(zero_vec);
-   gfr->SyncMemory(*this);
-   gfi->SyncMemory(*this);
-   gfr->ProjectBdrCoefficientNormal(real_vcoeff, attr);
-   gfi->ProjectBdrCoefficientNormal(zero_vcoeff, attr);
-   gfr->SyncAliasMemory(*this);
-   gfi->SyncAliasMemory(*this);
-}
-
-void
-ComplexGridFunction::ProjectBdrCoefficientNormal(
-   ComplexVectorCoefficient &vcoeff,
-   Array<int> &attr)
-{
-   this->ProjectBdrCoefficientNormal(vcoeff.real(), vcoeff.imag(), attr);
-}
-
 void
 ComplexGridFunction::ProjectBdrCoefficientTangent(VectorCoefficient
                                                  &real_vcoeff,
@@ -225,80 +149,6 @@ ComplexGridFunction::ProjectBdrCoefficientTangent(VectorCoefficient
   gfi->SyncAliasMemory(*this);
 }

-void
-ComplexGridFunction::ProjectBdrCoefficientTangent(VectorCoefficient
-                                                  &real_vcoeff,
-                                                  Array<int> &attr)
-{
-   Vector zero_vec(real_vcoeff.GetVDim()); zero_vec = 0.;
-   VectorConstantCoefficient zero_vcoeff(zero_vec);
-   gfr->SyncMemory(*this);
-   gfi->SyncMemory(*this);
-   gfr->ProjectBdrCoefficientTangent(real_vcoeff, attr);
-   gfi->ProjectBdrCoefficientTangent(zero_vcoeff, attr);
-   gfr->SyncAliasMemory(*this);
-   gfi->SyncAliasMemory(*this);
-}
-
-void
-ComplexGridFunction::ProjectBdrCoefficientTangent(
-   ComplexVectorCoefficient &vcoeff,
-   Array<int> &attr)
-{
-   this->ProjectBdrCoefficientTangent(vcoeff.real(), vcoeff.imag(), attr);
-}
-
-real_t
-ComplexGridFunction::ComputeL2Error(Coefficient &re_exsol,
-                                    Coefficient &im_exsol,
-                                    const IntegrationRule *irs[],
-                                    const Array<int> *elems) const
-{
-   real_t err_r = gfr->ComputeL2Error(re_exsol, irs, elems);
-   real_t err_i = gfi->ComputeL2Error(im_exsol, irs, elems);
-
-   return sqrt(err_r * err_r + err_i * err_i);
-}
-
-real_t
-ComplexGridFunction::ComputeL2Error(Coefficient &re_exsol,
-                                    const IntegrationRule *irs[],
-                                    const Array<int> *elems) const
-{
-   ConstantCoefficient zero_coef(0.0);
-
-   real_t err_r = gfr->ComputeL2Error(re_exsol, irs, elems);
-   real_t err_i = gfi->ComputeL2Error(zero_coef, irs, elems);
-
-   return sqrt(err_r * err_r + err_i * err_i);
-}
-
-real_t
-ComplexGridFunction::ComputeL2Error(VectorCoefficient &re_exsol,
-                                    VectorCoefficient &im_exsol,
-                                    const IntegrationRule *irs[],
-                                    const Array<int> *elems) const
-{
-   real_t err_r = gfr->ComputeL2Error(re_exsol, irs, elems);
-   real_t err_i = gfi->ComputeL2Error(im_exsol, irs, elems);
-
-   return sqrt(err_r * err_r + err_i * err_i);
-}
-
-real_t
-ComplexGridFunction::ComputeL2Error(VectorCoefficient &re_exsol,
-                                    const IntegrationRule *irs[],
-                                    const Array<int> *elems) const
-{
-   Vector zero_vec(re_exsol.GetVDim()); zero_vec = 0.0;
-   VectorConstantCoefficient zero_coef(zero_vec);
-
-   real_t err_r = gfr->ComputeL2Error(re_exsol, irs, elems);
-   real_t err_i = gfi->ComputeL2Error(zero_coef, irs, elems);
-
-   return sqrt(err_r * err_r + err_i * err_i);
-}
-

 ComplexLinearForm::ComplexLinearForm(FiniteElementSpace *fes,
                                     ComplexOperator::Convention convention)
@@ -881,17 +731,6 @@ ParComplexGridFunction::ProjectCoefficient(Coefficient &real_coeff,
   pgfi->SyncAliasMemory(*this);
 }

-void
-ParComplexGridFunction::ProjectCoefficient(Coefficient &real_coeff)
-{
-   pgfr->SyncMemory(*this);
-   pgfi->SyncMemory(*this);
-   pgfr->ProjectCoefficient(real_coeff);
-   *pgfi = 0.0;
-   pgfr->SyncAliasMemory(*this);
-   pgfi->SyncAliasMemory(*this);
-}
-
 void
 ParComplexGridFunction::ProjectCoefficient(VectorCoefficient &real_vcoeff,
                                           VectorCoefficient &imag_vcoeff)
@@ -904,17 +743,6 @@ ParComplexGridFunction::ProjectCoefficient(VectorCoefficient &real_vcoeff,
   pgfi->SyncAliasMemory(*this);
 }

-void
-ParComplexGridFunction::ProjectCoefficient(VectorCoefficient &real_vcoeff)
-{
-   pgfr->SyncMemory(*this);
-   pgfi->SyncMemory(*this);
-   pgfr->ProjectCoefficient(real_vcoeff);
-   *pgfi = 0.0;
-   pgfr->SyncAliasMemory(*this);
-   pgfi->SyncAliasMemory(*this);
-}
-
 void
 ParComplexGridFunction::ProjectBdrCoefficient(Coefficient &real_coeff,
                                              Coefficient &imag_coeff,
@@ -928,19 +756,6 @@ ParComplexGridFunction::ProjectBdrCoefficient(Coefficient &real_coeff,
   pgfi->SyncAliasMemory(*this);
 }

-void
-ParComplexGridFunction::ProjectBdrCoefficient(Coefficient &real_coeff,
-                                              Array<int> &attr)
-{
-   ConstantCoefficient zero_coeff(0.0);
-   pgfr->SyncMemory(*this);
-   pgfi->SyncMemory(*this);
-   pgfr->ProjectBdrCoefficient(real_coeff, attr);
-   pgfi->ProjectBdrCoefficient(zero_coeff, attr);
-   pgfr->SyncAliasMemory(*this);
-   pgfi->SyncAliasMemory(*this);
-}
-
 void
 ParComplexGridFunction::ProjectBdrCoefficientNormal(VectorCoefficient
                                                    &real_vcoeff,
@@ -956,21 +771,6 @@ ParComplexGridFunction::ProjectBdrCoefficientNormal(VectorCoefficient
   pgfi->SyncAliasMemory(*this);
 }

-void
-ParComplexGridFunction::ProjectBdrCoefficientNormal(VectorCoefficient
-                                                    &real_vcoeff,
-                                                    Array<int> &attr)
-{
-   Vector zero_vec(real_vcoeff.GetVDim()); zero_vec = 0.;
-   VectorConstantCoefficient zero_vcoeff(zero_vec);
-   pgfr->SyncMemory(*this);
-   pgfi->SyncMemory(*this);
-   pgfr->ProjectBdrCoefficientNormal(real_vcoeff, attr);
-   pgfi->ProjectBdrCoefficientNormal(zero_vcoeff, attr);
-   pgfr->SyncAliasMemory(*this);
-   pgfi->SyncAliasMemory(*this);
-}
-
 void
 ParComplexGridFunction::ProjectBdrCoefficientTangent(VectorCoefficient
                                                     &real_vcoeff,
@@ -986,21 +786,6 @@ ParComplexGridFunction::ProjectBdrCoefficientTangent(VectorCoefficient
   pgfi->SyncAliasMemory(*this);
 }

-void
-ParComplexGridFunction::ProjectBdrCoefficientTangent(VectorCoefficient
-                                                     &real_vcoeff,
-                                                     Array<int> &attr)
-{
-   Vector zero_vec(real_vcoeff.GetVDim()); zero_vec = 0.;
-   VectorConstantCoefficient zero_vcoeff(zero_vec);
-   pgfr->SyncMemory(*this);
-   pgfi->SyncMemory(*this);
-   pgfr->ProjectBdrCoefficientTangent(real_vcoeff, attr);
-   pgfi->ProjectBdrCoefficientTangent(zero_vcoeff, attr);
-   pgfr->SyncAliasMemory(*this);
-   pgfi->SyncAliasMemory(*this);
-}
-
 void
 ParComplexGridFunction::Distribute(const Vector *tv)
 {
@@ -1040,31 +825,6 @@ ParComplexGridFunction::ParallelProject(Vector &tv) const
   tvi.SyncAliasMemory(tv);
 }

-real_t
-ParComplexGridFunction::ComputeL2Error(Coefficient &exsolr,
-                                       const IntegrationRule *irs[],
-                                       Array<int> *elems) const
-{
-   ConstantCoefficient zeroCoef(0.0);
-
-   real_t err_r = pgfr->ComputeL2Error(exsolr, irs, elems);
-   real_t err_i = pgfi->ComputeL2Error(zeroCoef, irs, elems);
-   return sqrt(err_r * err_r + err_i * err_i);
-}
-
-real_t
-ParComplexGridFunction::ComputeL2Error(VectorCoefficient &exsolr,
-                                       const IntegrationRule *irs[],
-                                       Array<int> *elems) const
-{
-   Vector zeroVec(exsolr.GetVDim()); zeroVec = 0.0;
-   VectorConstantCoefficient zeroCoef(zeroVec);
-
-   real_t err_r = pgfr->ComputeL2Error(exsolr, irs, elems);
-   real_t err_i = pgfi->ComputeL2Error(zeroCoef, irs, elems);
-   return sqrt(err_r * err_r + err_i * err_i);
-}
-

 ParComplexLinearForm::ParComplexLinearForm(ParFiniteElementSpace *pfes,
                                           ComplexOperator::Convention
@@ -12,7 +12,6 @@
 #include "fem.hpp"
 #include "../mesh/nurbs.hpp"
 #include "../mesh/vtk.hpp"
-#include "../mesh/vtkhdf.hpp"
 #include "../general/binaryio.hpp"
 #include "../general/text.hpp"
 #include "picojson.h"
@@ -759,59 +758,35 @@ void VisItDataCollection::ParseVisItRootString(const std::string& json)
   }
 }

-ParaViewDataCollectionBase::ParaViewDataCollectionBase(
-   const std::string &name, Mesh *mesh) : DataCollection(name, mesh)
+ParaViewDataCollection::ParaViewDataCollection(const std::string&
+                                               collection_name,
+                                               Mesh *mesh_)
+   : DataCollection(collection_name, mesh_),
+     levels_of_detail(1),
+     pv_data_format(VTKFormat::BINARY),
+     high_order_output(false),
+     restart_mode(false)
 {
-   cycle = 0;
+   cycle = 0; // always include a valid cycle index in file names
+
+   compression_level = -1;  // default zlib compression level, equivalent to 6
 #ifdef MFEM_USE_ZLIB
-   // If we have zlib, enable compression. Otherwise, compression is disabled in
-   // the DataCollection base class constructor.
-   compression = true;
+   compression = true; // if we have zlib, enable compression
+#else
+   compression = false; // otherwise, disable compression
 #endif
 }

-void ParaViewDataCollectionBase::SetLevelsOfDetail(int levels_of_detail_)
+void ParaViewDataCollection::SetLevelsOfDetail(int levels_of_detail_)
 {
   levels_of_detail = levels_of_detail_;
 }

-void ParaViewDataCollectionBase::SetHighOrderOutput(bool high_order_output_)
+void ParaViewDataCollection::Load(int )
 {
-   high_order_output = high_order_output_;
+   MFEM_WARNING("ParaViewDataCollection::Load() is not implemented!");
 }

-void ParaViewDataCollectionBase::SetCompressionLevel(int compression_level_)
-{
-   MFEM_ASSERT(compression_level_ >= -1 && compression_level_ <= 9,
-               "Compression level must be between -1 and 9 (inclusive).");
-   if (compression_level_ != 0) { SetCompression(true);}
-   compression_level = compression_level_;
-}
-
-int ParaViewDataCollectionBase::GetCompressionLevel() const
-{
-   return compression ? compression_level : 0;
-}
-
-void ParaViewDataCollectionBase::SetDataFormat(VTKFormat fmt)
-{
-   pv_data_format = fmt;
-}
-
-bool ParaViewDataCollectionBase::IsBinaryFormat() const
-{
-   return pv_data_format != VTKFormat::ASCII;
-}
-
-void ParaViewDataCollectionBase::UseRestartMode(bool restart_mode_)
-{
-   restart_mode = restart_mode_;
-}
-
-ParaViewDataCollection::ParaViewDataCollection(
-   const std::string& collection_name, Mesh *mesh_)
-   : ParaViewDataCollectionBase(collection_name, mesh_) { }
-
 std::string ParaViewDataCollection::GenerateCollectionPath()
 {
   return prefix_path + DataCollection::GetCollectionName();
@@ -926,7 +901,7 @@ void ParaViewDataCollection::Save()
         // Initialize new pvd file.
         pvd_stream.open(pvdname,std::ios::out|std::ios::trunc);
         pvd_stream << "<?xml version=\"1.0\"?>\n";
-         pvd_stream << "<VTKFile type=\"Collection\" version=\"2.2\"";
+         pvd_stream << "<VTKFile type=\"Collection\" version=\"0.1\"";
         pvd_stream << " byte_order=\"" << VTKByteOrder() << "\">\n";
         pvd_stream << "<Collection>" << std::endl;
      }
@@ -1026,7 +1001,7 @@ void ParaViewDataCollection::WritePVTUHeader(std::ostream &os)
 {
   os << "<?xml version=\"1.0\"?>\n";
   os << "<VTKFile type=\"PUnstructuredGrid\"";
-   os << " version =\"2.2\" byte_order=\"" << VTKByteOrder() << "\">\n";
+   os << " version =\"0.1\" byte_order=\"" << VTKByteOrder() << "\">\n";
   os << "<PUnstructuredGrid GhostLevel=\"0\">\n";

   os << "<PPoints>\n";
@@ -1067,7 +1042,7 @@ void ParaViewDataCollection::SaveDataVTU(std::ostream &os, int ref)
   {
      os << " compressor=\"vtkZLibDataCompressor\"";
   }
-   os << " version=\"2.2\" byte_order=\"" << VTKByteOrder() << "\">\n";
+   os << " version=\"0.1\" byte_order=\"" << VTKByteOrder() << "\">\n";
   os << "<UnstructuredGrid>\n";
   mesh->PrintVTU(os,ref,pv_data_format,high_order_output,GetCompressionLevel());

@@ -1140,6 +1115,39 @@ void ParaViewDataCollection::SaveGFieldVTU(std::ostream &os, int ref_,
   os << "</DataArray>" << std::endl;
 }

+void ParaViewDataCollection::SetDataFormat(VTKFormat fmt)
+{
+   pv_data_format = fmt;
+}
+
+bool ParaViewDataCollection::IsBinaryFormat() const
+{
+   return pv_data_format != VTKFormat::ASCII;
+}
+
+void ParaViewDataCollection::SetHighOrderOutput(bool high_order_output_)
+{
+   high_order_output = high_order_output_;
+}
+
+void ParaViewDataCollection::SetCompressionLevel(int compression_level_)
+{
+   MFEM_ASSERT(compression_level_ >= -1 && compression_level_ <= 9,
+               "Compression level must be between -1 and 9 (inclusive).");
+   compression_level = compression_level_;
+   compression = compression_level_ != 0;
+}
+
+void ParaViewDataCollection::SetCompression(bool compression_)
+{
+   compression = compression_;
+}
+
+void ParaViewDataCollection::UseRestartMode(bool restart_mode_)
+{
+   restart_mode = restart_mode_;
+}
+
 const char *ParaViewDataCollection::GetDataFormatString() const
 {
   if (pv_data_format == VTKFormat::ASCII)
@@ -1164,85 +1172,9 @@ const char *ParaViewDataCollection::GetDataTypeString() const
   }
 }

-#ifdef MFEM_USE_HDF5
-
-ParaViewHDFDataCollection::ParaViewHDFDataCollection(
-   const std::string &collection_name, Mesh *mesh)
-   : ParaViewDataCollectionBase(collection_name, mesh)
+int ParaViewDataCollection::GetCompressionLevel() const
 {
-   compression = true;
+   return compression ? compression_level : 0;
 }

-void ParaViewHDFDataCollection::SetCompression(bool compression_)
-{
-   compression = compression_;
-}
-
-void ParaViewHDFDataCollection::EnsureVTKHDF()
-{
-   if (!vtkhdf)
-   {
-      if (!prefix_path.empty())
-      {
-         const int error_code = create_directory(prefix_path, mesh, myid);
-         MFEM_VERIFY(error_code == 0, "Error creating directory " << prefix_path);
-      }
-
-      std::string fname = prefix_path + name + ".vtkhdf";
-      bool use_mpi = false;
-#ifdef MFEM_USE_MPI
-      if (ParMesh *pmesh = dynamic_cast<ParMesh*>(mesh))
-      {
-         use_mpi = true;
-#ifdef MFEM_PARALLEL_HDF5
-         vtkhdf.reset(new VTKHDF(fname, pmesh->GetComm(), {restart_mode, time}));
-#else
-         MFEM_ABORT("Requires HDF5 library with parallel support enabled");
-#endif
-      }
-#endif
-      if (!use_mpi)
-      {
-         vtkhdf.reset(new VTKHDF(fname, {restart_mode, time}));
-      }
-   }
-}
-
-template <typename FP_T>
-void ParaViewHDFDataCollection::TSave()
-{
-   EnsureVTKHDF();
-
-   if (compression)
-   {
-      vtkhdf->EnableCompression(compression_level >= 0 ? compression_level : 6);
-   }
-   else
-   {
-      vtkhdf->DisableCompression();
-   }
-
-   vtkhdf->SaveMesh<FP_T>(*mesh, high_order_output, levels_of_detail);
-   for (const auto &field : field_map)
-   {
-      vtkhdf->SaveGridFunction<FP_T>(*field.second, field.first);
-   }
-   vtkhdf->UpdateSteps(time);
-   vtkhdf->Flush();
-}
-
-void ParaViewHDFDataCollection::Save()
-{
-   switch (pv_data_format)
-   {
-      case VTKFormat::BINARY32: TSave<float>(); break;
-      case VTKFormat::BINARY: TSave<double>(); break;
-      default: MFEM_ABORT("Unsupported VTK format.");
-   }
-}
-
-ParaViewHDFDataCollection::~ParaViewHDFDataCollection() = default;
-
-#endif
-
 }  // end namespace MFEM
@@ -502,27 +502,60 @@ public:
 };


-/// Abstract base class for ParaViewDataCollection and ParaViewHDFDataCollection
-class ParaViewDataCollectionBase : public DataCollection
+/// Helper class for ParaView visualization data
+class ParaViewDataCollection : public DataCollection
 {
-protected:
-   int levels_of_detail = 1;
-   int compression_level = -1;
-   bool high_order_output = false;
-   bool restart_mode = false;
-   VTKFormat pv_data_format = VTKFormat::BINARY;
-public:
-   ParaViewDataCollectionBase(const std::string &name, Mesh *mesh);
+private:
+   int levels_of_detail;
+   int compression_level;
+   std::fstream pvd_stream;
+   VTKFormat pv_data_format;
+   bool high_order_output;
+   bool restart_mode;

-   /// @brief Set the refinement level.
-   ///
-   /// In "low-order mode", every element is uniformly split based on the levels
-   /// of detail. In "high-order mode", this sets the polynomial degree for the
-   /// element transformations.
-   ///
-   /// The initial value is 1.
+protected:
+   void WritePVTUHeader(std::ostream &out);
+   void WritePVTUFooter(std::ostream &out, const std::string &vtu_prefix);
+   void SaveDataVTU(std::ostream &out, int ref);
+   void SaveGFieldVTU(std::ostream& out, int ref_, const FieldMapIterator& it);
+   const char *GetDataFormatString() const;
+   const char *GetDataTypeString() const;
+   /// @brief If compression is enabled, return the compression level, otherwise
+   /// return 0.
+   int GetCompressionLevel() const;
+
+   std::string GenerateCollectionPath();
+   std::string GenerateVTUFileName(const std::string &prefix, int rank);
+   std::string GenerateVTUPath();
+   std::string GeneratePVDFileName();
+   std::string GeneratePVTUFileName(const std::string &prefix);
+   std::string GeneratePVTUPath();
+
+
+public:
+   /// Constructor. The collection name is used when saving the data.
+   /** If @a mesh_ is NULL, then the mesh can be set later by calling SetMesh().
+       Before saving the data collection, some parameters in the collection can
+       be adjusted, e.g. SetPadDigits(), SetPrefixPath(), etc. */
+   ParaViewDataCollection(const std::string& collection_name,
+                          mfem::Mesh *mesh_ = NULL);
+
+   /// Set refinement levels - every element is uniformly split based on
+   /// levels_of_detail_. The initial value is 1.
   void SetLevelsOfDetail(int levels_of_detail_);

+   /// Save the collection - the directory name is constructed based on the
+   /// cycle value
+   void Save() override;
+
+   /// Set the data format for the ParaView output files. Possible options are
+   /// VTKFormat::ASCII, VTKFormat::BINARY, and VTKFormat::BINARY32.
+   /// The ASCII and BINARY options output double precision data, whereas the
+   /// BINARY32 option outputs single precision data.
+   ///
+   /// The initial format is VTKFormat::BINARY.
+   void SetDataFormat(VTKFormat fmt);
+
   /// @brief Set the zlib compression level.
   ///
   /// 0 indicates no compression, -1 indicates the default compression level.
@@ -537,109 +570,28 @@ public:
   /// Any nonzero compression level will enable compression.
   void SetCompressionLevel(int compression_level_);

-   /// @brief Sets whether or not to output the data as high-order elements
-   /// (false by default).
-   ///
-   /// Reading high-order data requires ParaView 5.5 or later.
-   void SetHighOrderOutput(bool high_order_output_);
-
-   /// If compression is enabled, return the compression level, else return 0.
-   int GetCompressionLevel() const;
-
-   /// @brief Set the data format for the ParaView output files.
-   ///
-   /// Possible options are VTKFormat::ASCII, VTKFormat::BINARY, and
-   /// VTKFormat::BINARY32. The ASCII and BINARY options output double precision
-   /// data, whereas the BINARY32 option outputs single precision data.
-   ///
-   /// The initial format is VTKFormat::BINARY.
-   ///
-   /// VTKFormat::ASCII is not supported by ParaViewHDFDataCollection.
-   void SetDataFormat(VTKFormat fmt);
+   /// Enable or disable zlib compression. If the input is true, use the default
+   /// zlib compression level (unless the compression level has previously been
+   /// set by calling SetCompressionLevel()).
+   void SetCompression(bool compression_) override;

   /// Returns true if the output format is BINARY or BINARY32, false if ASCII.
   bool IsBinaryFormat() const;

-   /// @brief Enable or disable restart mode.
-   ///
-   /// If restart is enabled, new writes will preserve timestep metadata for any
-   /// solutions prior to the currently defined time.
+   /// Sets whether or not to output the data as high-order elements (false
+   /// by default). Reading high-order data requires ParaView 5.5 or later.
+   void SetHighOrderOutput(bool high_order_output_);
+
+   /// Enable or disable restart mode. If restart is enabled, new writes will
+   /// preserve timestep metadata for any solutions prior to the currently
+   /// defined time.
   ///
   /// Initially, restart mode is disabled.
   void UseRestartMode(bool restart_mode_);
+
+   /// Load the collection - not implemented in the ParaView writer
+   void Load(int cycle_ = 0) override;
 };

-/// Writer for ParaView visualization (PVD and VTU format)
-class ParaViewDataCollection : public ParaViewDataCollectionBase
-{
-private:
-   std::fstream pvd_stream;
-
-protected:
-   void WritePVTUHeader(std::ostream &out);
-   void WritePVTUFooter(std::ostream &out, const std::string &vtu_prefix);
-   void SaveDataVTU(std::ostream &out, int ref);
-   void SaveGFieldVTU(std::ostream& out, int ref_, const FieldMapIterator& it);
-   const char *GetDataFormatString() const;
-   const char *GetDataTypeString() const;
-
-   std::string GenerateCollectionPath();
-   std::string GenerateVTUFileName(const std::string &prefix, int rank);
-   std::string GenerateVTUPath();
-   std::string GeneratePVDFileName();
-   std::string GeneratePVTUFileName(const std::string &prefix);
-   std::string GeneratePVTUPath();
-
-public:
-   /// Constructor. The collection name is used when saving the data.
-   /** If @a mesh_ is NULL, then the mesh can be set later by calling SetMesh().
-       Before saving the data collection, some parameters in the collection can
-       be adjusted, e.g. SetPadDigits(), SetPrefixPath(), etc. */
-   ParaViewDataCollection(const std::string& collection_name,
-                          Mesh *mesh_ = nullptr);
-
-   /// Save the collection - the directory name is constructed based on the
-   /// cycle value
-   void Save() override;
-};
-
-#ifdef MFEM_USE_HDF5
-
-/// Writer for ParaView visualization (%VTKHDF format)
-class ParaViewHDFDataCollection : public ParaViewDataCollectionBase
-{
-   /// The low-level VTKHDF object for I/O (pointer to implementation idiom).
-   std::unique_ptr<class VTKHDF> vtkhdf;
-
-   /// Create the VTKHDF object if it doesn't exist already.
-   void EnsureVTKHDF();
-
-   /// Save the collection (templated on floating point type).
-   template <typename FP_T> void TSave();
-
-public:
-   /// @brief Constructor. The collection name is used when saving the data.
-   ///
-   /// If @a mesh_ is NULL, then the mesh can be set later by calling SetMesh().
-   /// Before saving the data collection, some parameters in the collection can
-   /// be adjusted, e.g. SetPadDigits(), SetPrefixPath(), etc.
-   ParaViewHDFDataCollection(const std::string& collection_name,
-                             Mesh *mesh_ = nullptr);
-
-   /// @brief Enable or disable compression.
-   ///
-   /// The compression level can be set with SetCompressionLevel()). VTKHDF
-   /// compression does not require MFEM to be compiled with zlib support.
-   void SetCompression(bool compression_) override;
-
-   /// Save the collection.
-   void Save() override;
-
-   /// Destructor.
-   ~ParaViewHDFDataCollection();
-};
-
-#endif
-
 }
 #endif
@@ -1,54 +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 "doperator.hpp"
-
-#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> &solutions,
-   const std::vector<FieldDescriptor> &parameters,
-   const ParMesh &mesh) :
-   mesh(mesh),
-   solutions(solutions),
-   parameters(parameters)
-{
-   fields.resize(solutions.size() + parameters.size());
-   fields_e.resize(fields.size());
-   solutions_l.resize(solutions.size());
-   parameters_l.resize(parameters.size());
-
-   for (size_t i = 0; i < solutions.size(); i++)
-   {
-      fields[i] = solutions[i];
-   }
-
-   for (size_t i = 0; i < parameters.size(); i++)
-   {
-      fields[i + solutions.size()] = parameters[i];
-   }
-}
-
-#endif // MFEM_USE_MPI
@@ -1,797 +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 <type_traits>
-#include <utility>
-
-#include "../../config/config.hpp"
-
-#ifdef MFEM_USE_MPI
-#include "../fespace.hpp"
-
-#include "util.hpp"
-#include "interpolate.hpp"
-#include "integrate.hpp"
-#include "qfunction_apply.hpp"
-
-namespace mfem::future
-{
-
-/// @brief Type alias for a function that computes the action of an operator
-using action_t =
-   std::function<void(std::vector<Vector> &, const std::vector<Vector> &, Vector &)>;
-
-/// @brief Type alias for a function that computes the action of a derivative
-using derivative_action_t =
-   std::function<void(std::vector<Vector> &, const Vector &, Vector &)>;
-
-/// @brief Type alias for a function that assembles the sparse matrix of a
-/// derivative operator
-using assemble_derivative_hypreparmatrix_callback_t =
-   std::function<void(std::vector<Vector> &, HypreParMatrix &)>;
-
-/// @brief Type alias for a function that applies the appropriate restriction to
-/// the solution and parameters
-using restriction_callback_t =
-   std::function<void(std::vector<Vector> &,
-                      const std::vector<Vector> &,
-                      std::vector<Vector> &)>;
-
-/// Class representing the derivative (Jacobian) operator of a
-/// DifferentiableOperator.
-///
-/// This class implements a derivative operator that computes directional
-/// derivatives for a given set of solution and parameter fields. It supports
-/// both forward and transpose operations, as well as assembly into sparse
-/// matrices.
-///
-/// @note The derivative operator uses only forward mode differentiation in Mult
-/// and MultTranspose. It does not support reverse mode differentiation. The
-/// MultTranspose operation is achieved by using the transpose of the derivative
-/// actions on each quadrature point.
-///
-/// @see DifferentiableOperator
-class DerivativeOperator : public Operator
-{
-public:
-   /// Constructor for the DerivativeOperator class.
-   ///
-   /// This is usually not called directly from a user. A DifferentiableOperator
-   /// calls this constructor when using
-   /// DifferentiableOperator::GetDerivative().
-   DerivativeOperator(
-      const int &height,
-      const int &width,
-      const std::vector<derivative_action_t> &derivative_actions,
-      const FieldDescriptor &direction,
-      const int &daction_l_size,
-      const std::vector<derivative_action_t> &derivative_actions_transpose,
-      const FieldDescriptor &transpose_direction,
-      const int &daction_transpose_l_size,
-      const std::vector<Vector *> &solutions_l,
-      const std::vector<Vector *> &parameters_l,
-      const restriction_callback_t &restriction_callback,
-      const std::function<void(Vector &, Vector &)> &prolongation_transpose,
-      const std::vector<assemble_derivative_hypreparmatrix_callback_t>
-      &assemble_derivative_hypreparmatrix_callbacks) :
-      Operator(height, width),
-      derivative_actions(derivative_actions),
-      direction(direction),
-      daction_l(daction_l_size),
-      daction_l_size(daction_l_size),
-      derivative_actions_transpose(derivative_actions_transpose),
-      transpose_direction(transpose_direction),
-      prolongation_transpose(prolongation_transpose),
-      assemble_derivative_hypreparmatrix_callbacks(
-         assemble_derivative_hypreparmatrix_callbacks)
-   {
-      std::vector<Vector> s_l(solutions_l.size());
-      for (size_t i = 0; i < s_l.size(); i++)
-      {
-         s_l[i] = *solutions_l[i];
-      }
-
-      std::vector<Vector> p_l(parameters_l.size());
-      for (size_t i = 0; i < p_l.size(); i++)
-      {
-         p_l[i] = *parameters_l[i];
-      }
-
-      fields_e.resize(solutions_l.size() + parameters_l.size());
-      restriction_callback(s_l, p_l, fields_e);
-   }
-
-   /// @brief Compute the action of the derivative operator on a given vector.
-   ///
-   /// @param direction_t The direction vector in which to compute the
-   /// derivative. This has to be a T-dof vector.
-   /// @param result_t Result vector of the action of the derivative on
-   /// direction_t on T-dofs.
-   void Mult(const Vector &direction_t, Vector &result_t) const override
-   {
-      daction_l.SetSize(daction_l_size);
-      daction_l = 0.0;
-
-      prolongation(direction, direction_t, direction_l);
-      for (const auto &f : derivative_actions)
-      {
-         f(fields_e, direction_l, daction_l);
-      }
-      prolongation_transpose(daction_l, result_t);
-   };
-
-   /// @brief Compute the transpose of the derivative operator on a given
-   /// vector.
-   ///
-   /// This function computes the transpose of the derivative operator on a
-   /// given vector by transposing the quadrature point local forward derivative
-   /// action. It does not use reverse mode automatic differentiation.
-   ///
-   /// @param direction_t The direction vector in which to compute the
-   /// derivative. This has to be a T-dof vector.
-   /// @param result_t Result vector of the transpose action of the derivative on
-   /// direction_t on T-dofs.
-   void MultTranspose(const Vector &direction_t, Vector &result_t) const override
-   {
-      MFEM_ASSERT(!derivative_actions_transpose.empty(),
-                  "derivative can't be used to be multiplied in transpose mode");
-
-      daction_l.SetSize(width);
-      daction_l = 0.0;
-
-      prolongation(transpose_direction, direction_t, direction_l);
-      for (const auto &f : derivative_actions_transpose)
-      {
-         f(fields_e, direction_l, daction_l);
-      }
-      prolongation_transpose(daction_l, result_t);
-   };
-
-   /// @brief Assemble the derivative operator into a HypreParMatrix.
-   ///
-   /// @param A The HypreParMatrix to assemble the derivative operator into. Can
-   /// be an uninitialized object.
-   void Assemble(HypreParMatrix &A)
-   {
-      MFEM_ASSERT(!assemble_derivative_hypreparmatrix_callbacks.empty(),
-                  "derivative can't be assembled into a matrix");
-
-      for (const auto &f : assemble_derivative_hypreparmatrix_callbacks)
-      {
-         f(fields_e, A);
-      }
-   }
-
-private:
-   /// Derivative action callbacks. Depending on the requested derivatives in
-   /// DifferentiableOperator the callbacks represent certain combinations of
-   /// actions of derivatives of the forward operator.
-   std::vector<derivative_action_t> derivative_actions;
-
-   FieldDescriptor direction;
-
-   mutable Vector daction_l;
-
-   const int daction_l_size;
-
-   /// Transpose Derivative action callbacks. Depending on the requested
-   /// derivatives in DifferentiableOperator the callbacks represent certain
-   /// combinations of actions of derivatives of the forward operator.
-   std::vector<derivative_action_t> derivative_actions_transpose;
-
-   FieldDescriptor transpose_direction;
-
-   mutable std::vector<Vector> fields_e;
-
-   mutable Vector direction_l;
-
-   std::function<void(Vector &, Vector &)> prolongation_transpose;
-
-   /// Callbacks that assemble derivatives into a HypreParMatrix.
-   std::vector<assemble_derivative_hypreparmatrix_callback_t>
-   assemble_derivative_hypreparmatrix_callbacks;
-};
-
-/// Class representing a differentiable operator which acts on solution and
-/// parameter fields to compute residuals.
-///
-/// This class provides functionality to define differentiable operators by
-/// composing functions that compute values at quadrature points. It supports
-/// automatic differentiation to compute derivatives with respect to solutions
-/// (Jacobians) and parameter fields (general derivative operators).
-///
-/// The operator is constructed with solution fields that it will act on and
-/// parameter fields that define coefficients. Quadrature functions are added by
-/// e.g. using AddDomainIntegrator() which specify how the operator evaluates f
-/// those functionas and parameters at quadrature points.
-///
-/// Derivatives can be computed by obtaining a DerivativeOperator using
-/// GetDerivative().
-///
-/// @see DerivativeOperator
-class DifferentiableOperator : public Operator
-{
-public:
-   /// Constructor for the DifferentiableOperator class.
-   ///
-   /// @param solutions The solution fields that the operator will act on.
-   /// @param parameters The parameter fields that define coefficients.
-   /// @param mesh The mesh on which the operator is defined.
-   DifferentiableOperator(
-      const std::vector<FieldDescriptor> &solutions,
-      const std::vector<FieldDescriptor> &parameters,
-      const ParMesh &mesh);
-
-   /// @brief Compute the action of the operator on a given vector.
-   ///
-   /// @param solutions_t The solution vector in which to compute the action.
-   /// This has to be a T-dof vector.
-   /// @param result_t Result vector of the action of the operator on
-   /// solutions_t. The result is a T-dof vector.
-   void Mult(const Vector &solutions_t, Vector &result_t) const override
-   {
-      MFEM_ASSERT(!action_callbacks.empty(), "no integrators have been set");
-      prolongation(solutions, solutions_t, solutions_l);
-      residual_l = 0.0;
-      for (auto &action : action_callbacks)
-      {
-         action(solutions_l, parameters_l, residual_l);
-      }
-      prolongation_transpose(residual_l, result_t);
-   }
-
-   /// @brief Add a domain integrator to the operator.
-   ///
-   /// @param qfunc The quadrature function to be added.
-   /// @param inputs Tuple of FieldOperators for the inputs of the quadrature
-   /// function.
-   /// @param outputs Tuple of FieldOperators for the outputs of the quadrature
-   /// function.
-   /// @param integration_rule IntegrationRule to use with this integrator.
-   /// @param domain_attributes Domain attributes marker array indicating over
-   /// which attributes this integrator will integrate over.
-   /// @param derivative_ids Derivatives to be made available for this
-   /// integrator.
-   template <
-      typename qfunc_t,
-      typename input_t,
-      typename output_t,
-      typename derivative_ids_t = decltype(std::make_index_sequence<0> {})>
-   void AddDomainIntegrator(
-      qfunc_t &qfunc,
-      input_t inputs,
-      output_t outputs,
-      const IntegrationRule &integration_rule,
-      const Array<int> &domain_attributes,
-      derivative_ids_t derivative_ids = std::make_index_sequence<0> {});
-
-   /// @brief Set the parameters for the operator.
-   ///
-   /// This has to be called before using Mult() or MultTranspose().
-   ///
-   /// @param p The parameters to be set. This should be a vector of pointers to
-   /// the parameter vectors. The vectors have to be L-vectors (e.g.
-   /// GridFunctions).
-   void SetParameters(std::vector<Vector *> p) const;
-
-   /// @brief Disable the use of tensor product structure.
-   ///
-   /// This function disables the use of tensor product structure for the
-   /// operator. Usually, DifferentiableOperator creates callbacks based on
-   /// heuristics that achieve good performance for each element type. Some
-   /// functionality is not implemented for these performant algorithms but only
-   /// for generic assembly. Therefore the user can decide to use fallback
-   /// methods.
-   void DisableTensorProductStructure(bool disable = true)
-   {
-      use_tensor_product_structure = !disable;
-   }
-
-   /// @brief Get the derivative operator for a given derivative ID.
-   ///
-   /// This function returns a shared pointer to a DerivativeOperator that
-   /// computes the derivative of the operator with respect to the given
-   /// derivative ID. The derivative ID is used to identify the specific
-   /// derivative action to be performed.
-   ///
-   /// @param derivative_id The ID of the derivative to be computed.
-   /// @param sol_l The solution vectors to be used for the derivative
-   /// computation. This should be a vector of pointers to the solution
-   /// vectors. The vectors have to be L-vectors (e.g. GridFunctions).
-   /// @param par_l The parameter vectors to be used for the derivative
-   /// computation. This should be a vector of pointers to the parameter
-   /// vectors. The vectors have to be L-vectors (e.g. GridFunctions).
-   /// @return A shared pointer to the DerivativeOperator.
-   std::shared_ptr<DerivativeOperator> GetDerivative(
-      size_t derivative_id, std::vector<Vector *> sol_l, std::vector<Vector *> par_l)
-   {
-      MFEM_ASSERT(derivative_action_callbacks.find(derivative_id) !=
-                  derivative_action_callbacks.end(),
-                  "no derivative action has been found for ID " << derivative_id);
-
-      MFEM_ASSERT(sol_l.size() == solutions.size(),
-                  "wrong number of solutions");
-
-      MFEM_ASSERT(par_l.size() == parameters.size(),
-                  "wrong number of parameters");
-
-      const size_t derivative_idx = FindIdx(derivative_id, fields);
-
-      return std::make_shared<DerivativeOperator>(
-                height,
-                GetTrueVSize(fields[derivative_idx]),
-                derivative_action_callbacks[derivative_id],
-                fields[derivative_idx],
-                residual_l.Size(),
-                daction_transpose_callbacks[derivative_id],
-                fields[test_space_field_idx],
-                GetVSize(fields[test_space_field_idx]),
-                sol_l,
-                par_l,
-                restriction_callback,
-                prolongation_transpose,
-                assemble_derivative_hypreparmatrix_callbacks[derivative_id]);
-   }
-
-private:
-   const ParMesh &mesh;
-
-   std::vector<action_t> action_callbacks;
-   std::map<size_t,
-       std::vector<derivative_action_t>> derivative_action_callbacks;
-   std::map<size_t,
-       std::vector<derivative_action_t>> daction_transpose_callbacks;
-   std::map<size_t,
-       std::vector<assemble_derivative_hypreparmatrix_callback_t>>
-       assemble_derivative_hypreparmatrix_callbacks;
-
-
-   std::vector<FieldDescriptor> solutions;
-   std::vector<FieldDescriptor> parameters;
-   // solutions and parameters
-   std::vector<FieldDescriptor> fields;
-
-   mutable std::vector<Vector> solutions_l;
-   mutable std::vector<Vector> parameters_l;
-   mutable Vector residual_l;
-
-   mutable std::vector<Vector> fields_e;
-   mutable Vector residual_e;
-
-   std::function<void(Vector &, Vector &)> prolongation_transpose;
-   std::function<void(Vector &, Vector &)> output_restriction_transpose;
-   restriction_callback_t restriction_callback;
-
-   std::map<size_t, size_t> assembled_vector_sizes;
-
-   bool use_tensor_product_structure = true;
-
-   size_t test_space_field_idx = SIZE_MAX;
-};
-
-template <
-   typename qfunc_t,
-   typename input_t,
-   typename output_t,
-   typename derivative_ids_t>
-void DifferentiableOperator::AddDomainIntegrator(
-   qfunc_t &qfunc,
-   input_t inputs,
-   output_t outputs,
-   const IntegrationRule &integration_rule,
-   const Array<int> &domain_attributes,
-   derivative_ids_t derivative_ids)
-{
-   using entity_t = Entity::Element;
-
-   static constexpr size_t num_inputs =
-      tuple_size<decltype(inputs)>::value;
-
-   static constexpr size_t num_outputs =
-      tuple_size<decltype(outputs)>::value;
-
-   using qf_signature =
-      typename create_function_signature<decltype(&qfunc_t::operator())>::type;
-   using qf_param_ts = typename qf_signature::parameter_ts;
-   using qf_output_t = typename qf_signature::return_t;
-
-   // Consistency checks
-   if constexpr (num_outputs > 1)
-   {
-      static_assert(dfem::always_false<qfunc_t>,
-                    "more than one output per quadrature functions is not supported right now");
-   }
-
-   if constexpr (std::is_same_v<qf_output_t, void>)
-   {
-      static_assert(dfem::always_false<qfunc_t>,
-                    "quadrature function has no return value");
-   }
-
-   constexpr size_t num_qfinputs = tuple_size<qf_param_ts>::value;
-   static_assert(num_qfinputs == num_inputs,
-                 "quadrature function inputs and descriptor inputs have to match");
-
-   constexpr size_t num_qf_outputs = tuple_size<qf_output_t>::value;
-   static_assert(num_qf_outputs == num_outputs,
-                 "quadrature function outputs and descriptor outputs have to match");
-
-   constexpr auto inout_tuple =
-      merge_mfem_tuples_as_empty_std_tuple(inputs, outputs);
-   constexpr auto filtered_inout_tuple = filter_fields(inout_tuple);
-   static constexpr size_t num_fields =
-      count_unique_field_ids(filtered_inout_tuple);
-
-   MFEM_ASSERT(num_fields == solutions.size() + parameters.size(),
-               "Total number of fields doesn't match sum of solutions and parameters."
-               " This indicates that some fields are not used in the integrator,"
-               " which currently is not supported.");
-
-   auto dependency_map = make_dependency_map(inputs);
-
-   // pretty_print(dependency_map);
-
-   auto input_to_field =
-      create_descriptors_to_fields_map<entity_t>(fields, inputs);
-   auto output_to_field =
-      create_descriptors_to_fields_map<entity_t>(fields, outputs);
-
-   // TODO: factor out
-   std::vector<int> inputs_vdim(num_inputs);
-   for_constexpr<num_inputs>([&](auto i)
-   {
-      inputs_vdim[i] = get<i>(inputs).vdim;
-   });
-
-
-   Array<int> elem_attributes;
-   elem_attributes.SetSize(mesh.GetNE());
-   for (int i = 0; i < mesh.GetNE(); ++i)
-   {
-      elem_attributes[i] = mesh.GetAttribute(i);
-   }
-
-   const auto output_fop = get<0>(outputs);
-   test_space_field_idx = FindIdx(output_fop.GetFieldId(), fields);
-
-   bool use_sum_factorization = false;
-   auto entity_element_type =
-      Element::TypeFromGeometry(mesh.GetTypicalElementGeometry());
-   if ((entity_element_type == Element::QUADRILATERAL ||
-        entity_element_type == Element::HEXAHEDRON) &&
-       use_tensor_product_structure == true)
-   {
-      use_sum_factorization = true;
-   }
-
-   ElementDofOrdering element_dof_ordering = ElementDofOrdering::NATIVE;
-   DofToQuad::Mode doftoquad_mode = DofToQuad::Mode::FULL;
-   if (use_sum_factorization)
-   {
-      element_dof_ordering = ElementDofOrdering::LEXICOGRAPHIC;
-      doftoquad_mode = DofToQuad::Mode::TENSOR;
-   }
-
-   auto [output_rt,
-         output_e_sz] = get_restriction_transpose<entity_t>
-                        (fields[test_space_field_idx],
-                         element_dof_ordering, output_fop);
-   auto &output_e_size = output_e_sz;
-
-   output_restriction_transpose = output_rt;
-   residual_e.SetSize(output_e_size);
-
-   // The explicit captures are necessary to avoid dependency on
-   // the specific instance of this class (this pointer).
-   restriction_callback =
-      [=, solutions = this->solutions, parameters = this->parameters]
-      (std::vector<Vector> &sol,
-       const std::vector<Vector> &par,
-       std::vector<Vector> &f)
-   {
-      restriction<entity_t>(solutions, sol, f,
-                            element_dof_ordering);
-      restriction<entity_t>(parameters, par, f,
-                            element_dof_ordering,
-                            solutions.size());
-   };
-
-   prolongation_transpose = get_prolongation_transpose(
-                               fields[test_space_field_idx], output_fop, mesh.GetComm());
-
-   const int dimension = mesh.Dimension();
-   [[maybe_unused]] const int num_elements = GetNumEntities<Entity::Element>(mesh);
-   const int num_entities = GetNumEntities<entity_t>(mesh);
-   const int num_qp = integration_rule.GetNPoints();
-
-   if constexpr (is_sum_fop<decltype(output_fop)>::value)
-   {
-      residual_l.SetSize(1);
-      height = 1;
-   }
-   else
-   {
-      const int residual_lsize = GetVSize(fields[test_space_field_idx]);
-      residual_l.SetSize(residual_lsize);
-      height = GetTrueVSize(fields[test_space_field_idx]);
-   }
-
-   // TODO: Is this a hack?
-   width = GetTrueVSize(fields[0]);
-
-   std::vector<const DofToQuad*> dtq;
-   for (const auto &field : fields)
-   {
-      dtq.emplace_back(GetDofToQuad<entity_t>(
-                          field,
-                          integration_rule,
-                          doftoquad_mode));
-   }
-   const int q1d = (int)floor(std::pow(num_qp, 1.0/dimension) + 0.5);
-
-   const int residual_size_on_qp =
-      GetSizeOnQP<entity_t>(output_fop,
-                            fields[test_space_field_idx]);
-
-   auto input_dtq_maps = create_dtq_maps<entity_t>(inputs, dtq, input_to_field);
-   auto output_dtq_maps = create_dtq_maps<entity_t>(outputs, dtq, output_to_field);
-
-   const int test_vdim = output_fop.vdim;
-   const int test_op_dim = output_fop.size_on_qp / output_fop.vdim;
-   const int num_test_dof =
-      num_entities ? (output_e_size / output_fop.vdim / num_entities) : 0;
-
-   auto ir_weights = Reshape(integration_rule.GetWeights().Read(), num_qp);
-
-   auto input_size_on_qp =
-      get_input_size_on_qp(inputs, std::make_index_sequence<num_inputs> {});
-
-   auto action_shmem_info =
-      get_shmem_info<entity_t, num_fields, num_inputs, num_outputs>
-      (input_dtq_maps, output_dtq_maps, fields, num_entities, inputs, num_qp,
-       input_size_on_qp, residual_size_on_qp, element_dof_ordering);
-
-   Vector shmem_cache(action_shmem_info.total_size);
-
-   // print_shared_memory_info(action_shmem_info);
-
-   ThreadBlocks thread_blocks;
-   if (dimension == 3)
-   {
-      if (use_sum_factorization)
-      {
-         thread_blocks.x = q1d;
-         thread_blocks.y = q1d;
-         thread_blocks.z = q1d;
-      }
-   }
-   else if (dimension == 2)
-   {
-      if (use_sum_factorization)
-      {
-         thread_blocks.x = q1d;
-         thread_blocks.y = q1d;
-         thread_blocks.z = 1;
-      }
-   }
-
-   action_callbacks.push_back(
-      // Explicitly capture everything we need, so we can make explicit choice
-      // how to capture every variable, by copy or by ref.
-      [
-         // capture by copy:
-         dimension,             // int
-         num_entities,          // int
-         num_test_dof,          // int
-         num_qp,                // int
-         q1d,                   // int
-         residual_size_on_qp,   // int
-         test_vdim,             // int (= output_fop.vdim)
-         test_op_dim,           // int (derived from output_fop)
-         inputs,                // mfem::future::tuple
-         domain_attributes,     // Array<int>
-         ir_weights,            // DeviceTensor
-         use_sum_factorization, // bool
-         input_dtq_maps,        // std::array<DofToQuadMap, num_fields>
-         output_dtq_maps,       // std::array<DofToQuadMap, num_fields>
-         input_to_field,        // std::array<int, s>
-         output_fop,            // class derived from FieldOperator
-         qfunc,                 // qfunc_t
-         thread_blocks,         // ThreadBlocks
-         shmem_cache,           // Vector (local)
-         action_shmem_info,     // SharedMemoryInfo
-         // TODO: make this Array<int> a member of the DifferentiableOperator
-         //       and capture it by ref.
-         elem_attributes,       // Array<int>
-
-         // capture by ref:
-         &restriction_cb = this->restriction_callback,
-         &fields_e = this->fields_e,
-         &residual_e = this->residual_e,
-         &output_restriction_transpose = this->output_restriction_transpose
-      ]
-      (std::vector<Vector> &sol, const std::vector<Vector> &par, Vector &res)
-      mutable // mutable: needed to modify 'shmem_cache'
-   {
-      restriction_cb(sol, par, fields_e);
-
-      residual_e = 0.0;
-      auto ye = Reshape(residual_e.ReadWrite(), test_vdim, num_test_dof, num_entities);
-
-      auto wrapped_fields_e = wrap_fields(fields_e,
-                                          action_shmem_info.field_sizes,
-                                          num_entities);
-
-      const bool has_attr = domain_attributes.Size() > 0;
-      const auto d_domain_attr = domain_attributes.Read();
-      const auto d_elem_attr = elem_attributes.Read();
-
-      forall([=] MFEM_HOST_DEVICE (int e, void *shmem)
-      {
-         if (has_attr && !d_domain_attr[d_elem_attr[e] - 1]) { return; }
-
-         auto [input_dtq_shmem, output_dtq_shmem, fields_shmem, input_shmem,
-                                residual_shmem, scratch_shmem] =
-                  unpack_shmem(shmem, action_shmem_info, input_dtq_maps, output_dtq_maps,
-                               wrapped_fields_e, num_qp, e);
-
-         map_fields_to_quadrature_data(
-            input_shmem, fields_shmem, input_dtq_shmem, input_to_field, inputs, ir_weights,
-            scratch_shmem, dimension, use_sum_factorization);
-
-         call_qfunction<qf_param_ts>(
-            qfunc, input_shmem, residual_shmem,
-            residual_size_on_qp, num_qp, q1d, dimension, use_sum_factorization);
-
-         auto fhat = Reshape(&residual_shmem(0, 0), test_vdim, test_op_dim, num_qp);
-         auto y = Reshape(&ye(0, 0, e), num_test_dof, test_vdim);
-         map_quadrature_data_to_fields(
-            y, fhat, output_fop, output_dtq_shmem[0],
-            scratch_shmem, dimension, use_sum_factorization);
-      }, num_entities, thread_blocks, action_shmem_info.total_size, shmem_cache.ReadWrite());
-      output_restriction_transpose(residual_e, res);
-   });
-
-   // Without this compile-time check, some valid instantiations of this method
-   // will fail.
-   if constexpr (derivative_ids_t::size() != 0)
-   {
-      // Create the action of the derivatives
-      for_constexpr([&, &or_transpose =
-                        this->output_restriction_transpose](const std::size_t derivative_id)
-      {
-         const size_t d_field_idx = FindIdx(derivative_id, fields);
-         const auto direction = fields[d_field_idx];
-         const int da_size_on_qp =
-            GetSizeOnQP<entity_t>(output_fop, fields[test_space_field_idx]);
-
-         auto shmem_info =
-            get_shmem_info<entity_t, num_fields, num_inputs, num_outputs>(
-               input_dtq_maps, output_dtq_maps, fields, num_entities, inputs,
-               num_qp, input_size_on_qp, residual_size_on_qp,
-               element_dof_ordering, d_field_idx);
-
-         Vector shmem_cache(shmem_info.total_size);
-
-         // print_shared_memory_info(shmem_info);
-
-         Vector direction_e;
-         Vector derivative_action_e(output_e_size);
-         derivative_action_e = 0.0;
-
-         // Lookup the derivative_id key in the dependency map
-         auto it = dependency_map.find(derivative_id);
-         if (it == dependency_map.end())
-         {
-            MFEM_ABORT("Derivative ID not found in dependency map");
-         }
-         const auto input_is_dependent = it->second;
-
-         derivative_action_callbacks[derivative_id].push_back(
-            [
-               // capture by copy:
-               dimension,             // int
-               num_entities,          // int
-               num_test_dof,          // int
-               num_qp,                // int
-               q1d,                   // int
-               test_vdim,             // int (= output_fop.vdim)
-               test_op_dim,           // int (derived from output_fop)
-               inputs,                // mfem::future::tuple
-               domain_attributes,     // Array<int>
-               ir_weights,            // DeviceTensor
-               use_sum_factorization, // bool
-               input_dtq_maps,        // std::array<DofToQuadMap, num_fields>
-               output_dtq_maps,       // std::array<DofToQuadMap, num_fields>
-               input_to_field,        // std::array<int, s>
-               output_fop,            // class derived from FieldOperator
-               qfunc,                 // qfunc_t
-               thread_blocks,         // ThreadBlocks
-               shmem_cache,           // Vector (local)
-               shmem_info,            // SharedMemoryInfo
-               // TODO: make this Array<int> a member of the DifferentiableOperator
-               //       and capture it by ref.
-               elem_attributes,       // Array<int>
-
-               input_is_dependent,    // std::array<bool, num_inputs>
-               direction,             // FieldDescriptor
-               direction_e,           // Vector
-               derivative_action_e,   // Vector
-               element_dof_ordering,  // ElementDofOrdering
-               da_size_on_qp,         // int
-
-               // capture by ref:
-               &or_transpose
-            ](
-               std::vector<Vector> &f_e, const Vector &dir_l,
-               Vector &der_action_l) mutable
-         {
-            restriction<entity_t>(direction, dir_l, direction_e,
-                                  element_dof_ordering);
-            auto ye = Reshape(derivative_action_e.ReadWrite(), num_test_dof,
-                              test_vdim, num_entities);
-            auto wrapped_fields_e = wrap_fields(f_e, shmem_info.field_sizes,
-                                                num_entities);
-            auto wrapped_direction_e = Reshape(direction_e.ReadWrite(),
-                                               shmem_info.direction_size,
-                                               num_entities);
-
-            const auto d_elem_attr = elem_attributes.Read();
-            const bool has_attr = domain_attributes.Size() > 0;
-            const auto d_domain_attr = domain_attributes.Read();
-
-            derivative_action_e = 0.0;
-            forall([=] MFEM_HOST_DEVICE (int e, real_t *shmem)
-            {
-               if (has_attr && !d_domain_attr[d_elem_attr[e] - 1]) { return; }
-
-               auto [input_dtq_shmem, output_dtq_shmem, fields_shmem,
-                                      direction_shmem, input_shmem,
-                                      shadow_shmem_, residual_shmem,
-                                      scratch_shmem] =
-                        unpack_shmem(shmem, shmem_info, input_dtq_maps, output_dtq_maps,
-                                     wrapped_fields_e, wrapped_direction_e, num_qp, e);
-               auto &shadow_shmem = shadow_shmem_;
-
-               map_fields_to_quadrature_data(
-                  input_shmem, fields_shmem, input_dtq_shmem, input_to_field,
-                  inputs, ir_weights, scratch_shmem, dimension,
-                  use_sum_factorization);
-
-               // TODO: Probably redundant
-               set_zero(shadow_shmem);
-
-               map_direction_to_quadrature_data_conditional(
-                  shadow_shmem, direction_shmem, input_dtq_shmem, inputs,
-                  ir_weights, scratch_shmem, input_is_dependent, dimension,
-                  use_sum_factorization);
-
-               call_qfunction_derivative_action<qf_param_ts>(
-                  qfunc, input_shmem, shadow_shmem, residual_shmem,
-                  da_size_on_qp, num_qp, q1d, dimension, use_sum_factorization);
-
-               auto fhat = Reshape(&residual_shmem(0, 0), test_vdim,
-                                   test_op_dim, num_qp);
-               auto y = Reshape(&ye(0, 0, e), num_test_dof, test_vdim);
-               map_quadrature_data_to_fields(
-                  y, fhat, output_fop, output_dtq_shmem[0],
-                  scratch_shmem, dimension, use_sum_factorization);
-            }, num_entities, thread_blocks, shmem_info.total_size,
-            shmem_cache.ReadWrite());
-            or_transpose(derivative_action_e, der_action_l);
-         });
-      }, derivative_ids);
-   }
-}
-
-} // namespace mfem::future
-#endif
@@ -1,144 +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 <type_traits>
-
-namespace mfem::future
-{
-
-/// @brief Base class for FieldOperators.
-///
-/// This class serves as a base for different FieldOperator types which can be
-/// applied to fields that are used with inputs to a quadrature point function.
-/// See DifferentialOperator.
-template <int FIELD_ID = -1>
-class FieldOperator
-{
-public:
-   /// @brief Constructor for the FieldOperator.
-   ///
-   /// This constructor initializes the FieldOperator with it's size on
-   /// quadrature points. The size on quadrature points has to be determined by
-   /// the FieldOperator type, the dimension and the vector dimension (number
-   /// of components). See the following examples
-   ///
-   /// Scalar FiniteElementSpace with Value FieldOperator:
-   /// size = vdim x dim x 1 = 1 x dim x 1 = dim
-   ///
-   /// Vector FiniteElementSpace with Gradient FieldOperator:
-   /// size = vdim x dim x dim = vdim x dim x dim = vdim * dim^2
-   ///
-   /// ParameterSpace with Identity FieldOperator:
-   /// size = vdim = vdim
-   constexpr FieldOperator(int size_on_qp = 0) :
-      size_on_qp(size_on_qp) {};
-
-   /// @brief Get the field id this FieldOperator is attached to.
-   static constexpr int GetFieldId() { return FIELD_ID; }
-
-   /// @brief Get the size on quadrature point for this FieldOperator.
-   int size_on_qp = -1;
-
-   /// @brief Get the dimension of the FieldOperator.
-   int dim = -1;
-
-   /// @brief Get the vector dimension (number of components)
-   /// of the FieldOperator.
-   int vdim = -1;
-};
-
-/// @brief Identity FieldOperator.
-///
-/// This FieldOperator does nothing to the field. The field (usually a
-/// ParametricFunction) transfers the values to the quadrature point data and
-/// Identity can be viewed as an identity operation.
-template <int FIELD_ID = -1>
-class Identity : public FieldOperator<FIELD_ID>
-{
-public:
-   constexpr Identity() : FieldOperator<FIELD_ID>() {}
-};
-
-template< typename T >
-struct is_identity_fop : std::false_type {};
-
-template <int FIELD_ID>
-struct is_identity_fop<Identity<FIELD_ID>> : std::true_type {};
-
-/// @brief Weight FieldOperator.
-///
-/// This FieldOperator is used to signal that this field contains the quadrature
-/// point weights.
-class Weight : public FieldOperator<-1>
-{
-public:
-   constexpr Weight() : FieldOperator<-1>() {};
-};
-
-template< typename T >
-struct is_weight_fop : std::false_type {};
-
-template <>
-struct is_weight_fop<Weight> : std::true_type {};
-
-/// @brief Value FieldOperator.
-///
-/// This FieldOperator is used to signal that the field contains the
-/// interpolated values of the degrees of freedom at the quadrature points.
-template <int FIELD_ID = -1>
-class Value : public FieldOperator<FIELD_ID>
-{
-public:
-   constexpr Value() : FieldOperator<FIELD_ID>() {};
-};
-
-template< typename T >
-struct is_value_fop : std::false_type {};
-
-template <int FIELD_ID>
-struct is_value_fop<Value<FIELD_ID>> : std::true_type {};
-
-/// @brief Gradient FieldOperator.
-///
-/// This FieldOperator is used to signal that the field contains the
-/// interpolated gradients of the degrees of freedom at the quadrature points.
-template <int FIELD_ID = -1>
-class Gradient : public FieldOperator<FIELD_ID>
-{
-public:
-   constexpr Gradient() : FieldOperator<FIELD_ID>() {};
-};
-
-template< typename T >
-struct is_gradient_fop : std::false_type {};
-
-template <int FIELD_ID>
-struct is_gradient_fop<Gradient<FIELD_ID>> : std::true_type {};
-
-/// @brief Sum FieldOperator.
-///
-/// This FieldOperator is commonly used to signal that an output of a quadrature
-/// function should be summed.
-template <int FIELD_ID = -1>
-class Sum : public FieldOperator<FIELD_ID>
-{
-public:
-   constexpr Sum() : FieldOperator<FIELD_ID>() {};
-};
-
-template< typename T >
-struct is_sum_fop : std::false_type {};
-
-template <int FIELD_ID>
-struct is_sum_fop<Sum<FIELD_ID>> : std::true_type {};
-
-} // namespace mfem::future
@@ -1,450 +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 "util.hpp"
-
-namespace mfem::future
-{
-
-template <typename output_t>
-MFEM_HOST_DEVICE
-void map_quadrature_data_to_fields_impl(
-   DeviceTensor<2, real_t> &y,
-   const DeviceTensor<3, real_t> &f,
-   const output_t &output,
-   const DofToQuadMap &dtq)
-{
-   [[maybe_unused]] auto B = dtq.B;
-   [[maybe_unused]] auto G = dtq.G;
-
-   // assuming the quadrature point residual has to "play nice with
-   // the test function"
-   if constexpr (is_value_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [num_qp, cdim, num_dof] = B.GetShape();
-      const int vdim = output.vdim > 0 ? output.vdim : cdim ;
-      for (int dof = 0; dof < num_dof; dof++)
-      {
-         for (int vd = 0; vd < vdim; vd++)
-         {
-            real_t acc = 0.0;
-            for (int qp = 0; qp < num_qp; qp++)
-            {
-               acc += B(qp, 0, dof) * f(vd, 0, qp);
-            }
-            y(dof, vd) += acc;
-         }
-      }
-   }
-   else if constexpr (
-      is_gradient_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [num_qp, dim, num_dof] = G.GetShape();
-      const int vdim = output.vdim;
-      for (int dof = 0; dof < num_dof; dof++)
-      {
-         for (int vd = 0; vd < vdim; vd++)
-         {
-            real_t acc = 0.0;
-            for (int d = 0; d < dim; d++)
-            {
-               for (int qp = 0; qp < num_qp; qp++)
-               {
-                  acc += G(qp, d, dof) * f(vd, d, qp);
-               }
-            }
-            y(dof, vd) += acc;
-         }
-      }
-   }
-   else if constexpr (is_sum_fop<std::decay_t<output_t>>::value)
-   {
-      // This is the "integral over all quadrature points type" applying
-      // B = 1 s.t. B^T * C \in R^1.
-      const auto [num_qp, unused, unused1] = B.GetShape();
-      auto cc = Reshape(&f(0, 0, 0), num_qp);
-      for (int i = 0; i < num_qp; i++)
-      {
-         y(0, 0) += cc(i);
-      }
-   }
-   else if constexpr (is_identity_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [num_qp, unused, num_dof] = B.GetShape();
-      const auto vdim = output.vdim;
-      auto cc = Reshape(&f(0, 0, 0), num_qp * vdim);
-      auto yy = Reshape(&y(0, 0), num_qp * vdim);
-      for (int i = 0; i < num_qp * vdim; i++)
-      {
-         yy(i) = cc(i);
-      }
-   }
-   else
-   {
-      MFEM_ABORT("quadrature data mapping to field is not implemented for"
-                 " this field descriptor");
-   }
-}
-
-template <typename output_t>
-MFEM_HOST_DEVICE
-void map_quadrature_data_to_fields_tensor_impl_2d(
-   DeviceTensor<2, real_t> &y,
-   const DeviceTensor<3, real_t> &f,
-   const output_t &output,
-   const DofToQuadMap &dtq,
-   std::array<DeviceTensor<1>, 6> &scratch_mem)
-{
-   [[maybe_unused]] auto B = dtq.B;
-   [[maybe_unused]] auto G = dtq.G;
-
-   if constexpr (is_value_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = B.GetShape();
-      const int vdim = output.vdim;
-      const int test_dim = output.size_on_qp / vdim;
-
-      auto fqp = Reshape(&f(0, 0, 0), vdim, test_dim, q1d, q1d);
-      auto yd = Reshape(&y(0, 0), d1d, d1d, vdim);
-
-      auto s0 = Reshape(&scratch_mem[0](0), q1d, d1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(qy, y, q1d)
-         {
-            MFEM_FOREACH_THREAD(dx, x, d1d)
-            {
-               real_t acc = 0.0;
-               for (int qx = 0; qx < q1d; qx++)
-               {
-                  acc += fqp(vd, 0, qx, qy) * B(qx, 0, dx);
-               }
-               s0(qy, dx) = acc;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(dy, y, d1d)
-         {
-            MFEM_FOREACH_THREAD(dx, x, d1d)
-            {
-               real_t acc = 0.0;
-               for (int qy = 0; qy < q1d; qy++)
-               {
-                  acc += s0(qy, dx) * B(qy, 0, dy);
-               }
-               yd(dx, dy, vd) += acc;
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else if constexpr (is_gradient_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = G.GetShape();
-      const int vdim = output.vdim;
-      const int test_dim = output.size_on_qp / vdim;
-      auto fqp = Reshape(&f(0, 0, 0), vdim, test_dim, q1d, q1d);
-      auto yd = Reshape(&y(0, 0), d1d, d1d, vdim);
-
-      auto s0 = Reshape(&scratch_mem[0](0), q1d, d1d);
-      auto s1 = Reshape(&scratch_mem[1](0), q1d, d1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(qy, y, q1d)
-         {
-            MFEM_FOREACH_THREAD(dx, x, d1d)
-            {
-               real_t uv[2] = {0.0, 0.0};
-               for (int qx = 0; qx < q1d; qx++)
-               {
-                  uv[0] += fqp(vd, 0, qx, qy) * G(qx, 0, dx);
-                  uv[1] += fqp(vd, 1, qx, qy) * B(qx, 0, dx);
-               }
-               s0(qy, dx) = uv[0];
-               s1(qy, dx) = uv[1];
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(dy, y, d1d)
-         {
-            MFEM_FOREACH_THREAD(dx, x, d1d)
-            {
-               real_t uv[2] = {0.0, 0.0};
-               for (int qy = 0; qy < q1d; qy++)
-               {
-                  uv[0] += s0(qy, dx) * B(qy, 0, dy);
-                  uv[1] += s1(qy, dx) * G(qy, 0, dy);
-               }
-               yd(dx, dy, vd) += uv[0] + uv[1];
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else if constexpr (is_identity_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = B.GetShape();
-
-      // // TODO: Check if this is the right fix for all cases
-      // auto fqp = Reshape(&f(0, 0, 0), output.size_on_qp, q1d);
-      // auto yqp = Reshape(&y(0, 0), output.size_on_qp, q1d);
-      // for (int sq = 0; sq < output.size_on_qp; sq++)
-      // {
-      //    MFEM_FOREACH_THREAD(qx, x, q1d)
-      //    {
-      //       yqp(sq, qx) = fqp(sq, qx);
-      //    }
-      //    MFEM_SYNC_THREAD;
-      // }
-
-      auto fqp = Reshape(&f(0, 0, 0), output.size_on_qp, q1d, q1d);
-      auto yqp = Reshape(&y(0, 0), output.size_on_qp, q1d, q1d);
-
-      for (int sq = 0; sq < output.size_on_qp; sq++)
-      {
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               yqp(sq, qx, qy) = fqp(sq, qx, qy);
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else
-   {
-      MFEM_ABORT("quadrature data mapping to field is not implemented for"
-                 " this field descriptor with sum factorization on tensor product elements");
-   }
-}
-
-template <typename output_t>
-MFEM_HOST_DEVICE
-void map_quadrature_data_to_fields_tensor_impl_3d(
-   DeviceTensor<2, real_t> &y,
-   const DeviceTensor<3, real_t> &f,
-   const output_t &output,
-   const DofToQuadMap &dtq,
-   std::array<DeviceTensor<1>, 6> &scratch_mem)
-{
-   [[maybe_unused]] auto B = dtq.B;
-   [[maybe_unused]] auto G = dtq.G;
-
-   if constexpr (is_value_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = B.GetShape();
-      const int vdim = output.vdim;
-      const int test_dim = output.size_on_qp / vdim;
-
-      auto fqp = Reshape(&f(0, 0, 0), vdim, test_dim, q1d, q1d, q1d);
-      auto yd = Reshape(&y(0, 0), d1d, d1d, d1d, vdim);
-
-      auto s0 = Reshape(&scratch_mem[0](0), q1d, q1d, d1d);
-      auto s1 = Reshape(&scratch_mem[1](0), q1d, d1d, d1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(qy, y, q1d)
-         {
-            MFEM_FOREACH_THREAD(dx, x, d1d)
-            {
-               MFEM_FOREACH_THREAD(qz, z, q1d)
-               {
-                  real_t acc = 0.0;
-                  for (int qx = 0; qx < q1d; qx++)
-                  {
-                     acc += fqp(vd, 0, qx, qy, qz) * B(qx, 0, dx);
-                  }
-                  s0(qz, qy, dx) = acc;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(dy, y, d1d)
-         {
-            MFEM_FOREACH_THREAD(dx, x, d1d)
-            {
-               MFEM_FOREACH_THREAD(qz, z, q1d)
-               {
-                  real_t acc = 0.0;
-                  for (int qy = 0; qy < q1d; qy++)
-                  {
-                     acc += s0(qz, qy, dx) * B(qy, 0, dy);
-                  }
-                  s1(qz, dy, dx) = acc;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-
-         MFEM_FOREACH_THREAD(dy, y, d1d)
-         {
-            MFEM_FOREACH_THREAD(dx, x, d1d)
-            {
-               MFEM_FOREACH_THREAD(dz, z, d1d)
-               {
-                  real_t acc = 0.0;
-                  for (int qz = 0; qz < q1d; qz++)
-                  {
-                     acc += s1(qz, dy, dx) * B(qz, 0, dz);
-                  }
-                  yd(dx, dy, dz, vd) += acc;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else if constexpr (is_gradient_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = G.GetShape();
-      const int vdim = output.vdim;
-      const int test_dim = output.size_on_qp / vdim;
-      auto fqp = Reshape(&f(0, 0, 0), vdim, test_dim, q1d, q1d, q1d);
-      auto yd = Reshape(&y(0, 0), d1d, d1d, d1d, vdim);
-
-      auto s0 = Reshape(&scratch_mem[0](0), q1d, q1d, d1d);
-      auto s1 = Reshape(&scratch_mem[1](0), q1d, q1d, d1d);
-      auto s2 = Reshape(&scratch_mem[2](0), q1d, q1d, d1d);
-      auto s3 = Reshape(&scratch_mem[3](0), q1d, d1d, d1d);
-      auto s4 = Reshape(&scratch_mem[4](0), q1d, d1d, d1d);
-      auto s5 = Reshape(&scratch_mem[5](0), q1d, d1d, d1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(qz, z, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               MFEM_FOREACH_THREAD(dx, x, d1d)
-               {
-                  real_t uvw[3] = {0.0, 0.0, 0.0};
-                  for (int qx = 0; qx < q1d; qx++)
-                  {
-                     uvw[0] += fqp(vd, 0, qx, qy, qz) * G(qx, 0, dx);
-                     uvw[1] += fqp(vd, 1, qx, qy, qz) * B(qx, 0, dx);
-                     uvw[2] += fqp(vd, 2, qx, qy, qz) * B(qx, 0, dx);
-                  }
-                  s0(qz, qy, dx) = uvw[0];
-                  s1(qz, qy, dx) = uvw[1];
-                  s2(qz, qy, dx) = uvw[2];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(qz, z, q1d)
-         {
-            MFEM_FOREACH_THREAD(dy, y, d1d)
-            {
-               MFEM_FOREACH_THREAD(dx, x, d1d)
-               {
-                  real_t uvw[3] = {0.0, 0.0, 0.0};
-                  for (int qy = 0; qy < q1d; qy++)
-                  {
-                     uvw[0] += s0(qz, qy, dx) * B(qy, 0, dy);
-                     uvw[1] += s1(qz, qy, dx) * G(qy, 0, dy);
-                     uvw[2] += s2(qz, qy, dx) * B(qy, 0, dy);
-                  }
-                  s3(qz, dy, dx) = uvw[0];
-                  s4(qz, dy, dx) = uvw[1];
-                  s5(qz, dy, dx) = uvw[2];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(dz, z, d1d)
-         {
-            MFEM_FOREACH_THREAD(dy, y, d1d)
-            {
-               MFEM_FOREACH_THREAD(dx, x, d1d)
-               {
-                  real_t uvw[3] = {0.0, 0.0, 0.0};
-                  for (int qz = 0; qz < q1d; qz++)
-                  {
-                     uvw[0] += s3(qz, dy, dx) * B(qz, 0, dz);
-                     uvw[1] += s4(qz, dy, dx) * B(qz, 0, dz);
-                     uvw[2] += s5(qz, dy, dx) * G(qz, 0, dz);
-                  }
-                  yd(dx, dy, dz, vd) += uvw[0] + uvw[1] + uvw[2];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else if constexpr (is_identity_fop<std::decay_t<output_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = B.GetShape();
-      auto fqp = Reshape(&f(0, 0, 0), output.size_on_qp, q1d, q1d, q1d);
-      auto yqp = Reshape(&y(0, 0), output.size_on_qp, q1d, q1d, q1d);
-
-      for (int sq = 0; sq < output.size_on_qp; sq++)
-      {
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               MFEM_FOREACH_THREAD(qz, z, q1d)
-               {
-                  yqp(sq, qx, qy, qz) = fqp(sq, qx, qy, qz);
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else
-   {
-      MFEM_ABORT("quadrature data mapping to field is not implemented for"
-                 " this field descriptor with sum factorization on tensor product elements");
-   }
-}
-
-template <typename output_t>
-MFEM_HOST_DEVICE
-void map_quadrature_data_to_fields(
-   DeviceTensor<2, real_t> &y,
-   const DeviceTensor<3, real_t> &f,
-   const output_t &output,
-   const DofToQuadMap &dtq,
-   std::array<DeviceTensor<1>, 6> &scratch_mem,
-   const int &dimension,
-   const bool &use_sum_factorization)
-{
-   if (use_sum_factorization)
-   {
-      if (dimension == 2)
-      {
-         map_quadrature_data_to_fields_tensor_impl_2d(y, f, output, dtq, scratch_mem);
-      }
-      else if (dimension == 3)
-      {
-         map_quadrature_data_to_fields_tensor_impl_3d(y, f, output, dtq, scratch_mem);
-      }
-      else { MFEM_ABORT_KERNEL("dimension not supported"); }
-   }
-   else
-   {
-      map_quadrature_data_to_fields_impl(y, f, output, dtq);
-   }
-}
-
-} // namespace mfem::future
@@ -1,573 +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 "util.hpp"
-
-namespace mfem::future
-{
-
-template <typename field_operator_t>
-MFEM_HOST_DEVICE inline
-void map_field_to_quadrature_data_tensor_product_3d(
-   DeviceTensor<2> &field_qp,
-   const DofToQuadMap &dtq,
-   const DeviceTensor<1> &field_e,
-   const field_operator_t &input,
-   const DeviceTensor<1, const real_t> &integration_weights,
-   const std::array<DeviceTensor<1>, 6> &scratch_mem)
-{
-   [[maybe_unused]] auto B = dtq.B;
-   [[maybe_unused]] auto G = dtq.G;
-
-   if constexpr (is_value_fop<std::decay_t<field_operator_t>>::value)
-   {
-      auto [q1d, unused, d1d] = B.GetShape();
-      const int vdim = input.vdim;
-      const auto field = Reshape(&field_e[0], d1d, d1d, d1d, vdim);
-      auto fqp = Reshape(&field_qp[0], vdim, q1d, q1d, q1d);
-      auto s0 = Reshape(&scratch_mem[0](0), d1d, d1d, q1d);
-      auto s1 = Reshape(&scratch_mem[1](0), d1d, q1d, q1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(dz, z, d1d)
-         {
-            MFEM_FOREACH_THREAD(dy, y, d1d)
-            {
-               MFEM_FOREACH_THREAD(qx, x, q1d)
-               {
-                  real_t acc = 0.0;
-                  for (int dx = 0; dx < d1d; dx++)
-                  {
-                     acc += B(qx, 0, dx) * field(dx, dy, dz, vd);
-                  }
-                  s0(dz, dy, qx) = acc;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(dz, z, d1d)
-         {
-            MFEM_FOREACH_THREAD(qx, x, q1d)
-            {
-               MFEM_FOREACH_THREAD(qy, y, q1d)
-               {
-                  real_t acc = 0.0;
-                  for (int dy = 0; dy < d1d; dy++)
-                  {
-                     acc += s0(dz, dy, qx) * B(qy, 0, dy);
-                  }
-                  s1(dz, qy, qx) = acc;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(qz, z, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               MFEM_FOREACH_THREAD(qx, x, q1d)
-               {
-                  real_t acc = 0.0;
-                  for (int dz = 0; dz < d1d; dz++)
-                  {
-                     acc += s1(dz, qy, qx) * B(qz, 0, dz);
-                  }
-                  fqp(vd, qx, qy, qz) = acc;
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else if constexpr (
-      is_gradient_fop<std::decay_t<field_operator_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = B.GetShape();
-      const int vdim = input.vdim;
-      const int dim = input.dim;
-      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);
-      auto s1 = Reshape(&scratch_mem[1](0), d1d, d1d, q1d);
-      auto s2 = Reshape(&scratch_mem[2](0), d1d, q1d, q1d);
-      auto s3 = Reshape(&scratch_mem[3](0), d1d, q1d, q1d);
-      auto s4 = Reshape(&scratch_mem[4](0), d1d, q1d, q1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(dz, z, d1d)
-         {
-            MFEM_FOREACH_THREAD(dy, y, d1d)
-            {
-               MFEM_FOREACH_THREAD(qx, x, q1d)
-               {
-                  real_t uv[2] = {0.0, 0.0};
-                  for (int dx = 0; dx < d1d; dx++)
-                  {
-                     const real_t f = field(dx, dy, dz, vd);
-                     uv[0] += f * B(qx, 0, dx);
-                     uv[1] += f * G(qx, 0, dx);
-                  }
-                  s0(dz, dy, qx) = uv[0];
-                  s1(dz, dy, qx) = uv[1];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(dz, z, d1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               MFEM_FOREACH_THREAD(qx, x, q1d)
-               {
-                  real_t uvw[3] = {0.0, 0.0, 0.0};
-                  for (int dy = 0; dy < d1d; dy++)
-                  {
-                     const real_t s0i = s0(dz, dy, qx);
-                     uvw[0] += s1(dz, dy, qx) * B(qy, 0, dy);
-                     uvw[1] += s0i * G(qy, 0, dy);
-                     uvw[2] += s0i * B(qy, 0, dy);
-                  }
-                  s2(dz, qy, qx) = uvw[0];
-                  s3(dz, qy, qx) = uvw[1];
-                  s4(dz, qy, qx) = uvw[2];
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(qz, z, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               MFEM_FOREACH_THREAD(qx, x, q1d)
-               {
-                  real_t uvw[3] = {0.0, 0.0, 0.0};
-                  for (int dz = 0; dz < d1d; dz++)
-                  {
-                     uvw[0] += s2(dz, qy, qx) * B(qz, 0, dz);
-                     uvw[1] += s3(dz, qy, qx) * B(qz, 0, dz);
-                     uvw[2] += s4(dz, qy, qx) * G(qz, 0, dz);
-                  }
-                  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;
-      }
-   }
-   // TODO: Create separate function for clarity
-   else if constexpr (
-      std::is_same_v<std::decay_t<field_operator_t>, Weight>)
-   {
-      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);
-      auto w = Reshape(&integration_weights[0], q1d, q1d, q1d);
-      auto f = Reshape(&field_qp[0], q1d, q1d, q1d);
-      MFEM_FOREACH_THREAD(qx, x, q1d)
-      {
-         MFEM_FOREACH_THREAD(qy, y, q1d)
-         {
-            MFEM_FOREACH_THREAD(qz, z, q1d)
-            {
-               f(qx, qy, qz) = w(qx, qy, qz);
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-   }
-   else if constexpr (is_identity_fop<std::decay_t<field_operator_t>>::value)
-   {
-      const int q1d = B.GetShape()[0];
-      auto field = Reshape(&field_e[0], input.size_on_qp, q1d * q1d * q1d);
-      field_qp = field;
-   }
-   else
-   {
-      static_assert(dfem::always_false<std::decay_t<field_operator_t>>,
-                    "can't map field to quadrature data");
-   }
-}
-
-template <typename field_operator_t>
-MFEM_HOST_DEVICE inline
-void map_field_to_quadrature_data_tensor_product_2d(
-   DeviceTensor<2> &field_qp,
-   const DofToQuadMap &dtq,
-   const DeviceTensor<1> &field_e,
-   const field_operator_t &input,
-   const DeviceTensor<1, const real_t> &integration_weights,
-   const std::array<DeviceTensor<1>, 6> &scratch_mem)
-{
-   [[maybe_unused]] auto B = dtq.B;
-   [[maybe_unused]] auto G = dtq.G;
-
-   if constexpr (is_value_fop<std::decay_t<field_operator_t>>::value)
-   {
-      auto [q1d, unused, d1d] = B.GetShape();
-      const int vdim = input.vdim;
-      const auto field = Reshape(&field_e[0], d1d, d1d, vdim);
-      auto fqp = Reshape(&field_qp[0], vdim, q1d, q1d);
-      auto s0 = Reshape(&scratch_mem[0](0), d1d, q1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(dy, y, d1d)
-         {
-            MFEM_FOREACH_THREAD(qx, x, q1d)
-            {
-               real_t acc = 0.0;
-               for (int dx = 0; dx < d1d; dx++)
-               {
-                  acc += B(qx, 0, dx) * field(dx, dy, vd);
-               }
-               s0(dy, qx) = acc;
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               real_t acc = 0.0;
-               for (int dy = 0; dy < d1d; dy++)
-               {
-                  acc += s0(dy, qx) * B(qy, 0, dy);
-               }
-               fqp(vd, qx, qy) = acc;
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   else if constexpr (
-      is_gradient_fop<std::decay_t<field_operator_t>>::value)
-   {
-      const auto [q1d, unused, d1d] = B.GetShape();
-      const int vdim = input.vdim;
-      const int dim = input.dim;
-      const auto field = Reshape(&field_e[0], d1d, d1d, vdim);
-      auto fqp = Reshape(&field_qp[0], vdim, dim, q1d, q1d);
-
-      auto s0 = Reshape(&scratch_mem[0](0), d1d, q1d);
-      auto s1 = Reshape(&scratch_mem[1](0), d1d, q1d);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         MFEM_FOREACH_THREAD(dy, y, d1d)
-         {
-            MFEM_FOREACH_THREAD(qx, x, q1d)
-            {
-               real_t uv[2] = {0.0, 0.0};
-               for (int dx = 0; dx < d1d; dx++)
-               {
-                  const real_t f = field(dx, dy, vd);
-                  uv[0] += f * B(qx, 0, dx);
-                  uv[1] += f * G(qx, 0, dx);
-               }
-               s0(dy, qx) = uv[0];
-               s1(dy, qx) = uv[1];
-            }
-         }
-         MFEM_SYNC_THREAD;
-
-         MFEM_FOREACH_THREAD(qy, y, q1d)
-         {
-            MFEM_FOREACH_THREAD(qx, x, q1d)
-            {
-               real_t uv[2] = {0.0, 0.0};
-               for (int dy = 0; dy < d1d; dy++)
-               {
-                  const real_t s0i = s0(dy, qx);
-                  uv[0] += s1(dy, qx) * B(qy, 0, dy);
-                  uv[1] += s0i * G(qy, 0, dy);
-               }
-               fqp(vd, 0, qx, qy) = uv[0];
-               fqp(vd, 1, qx, qy) = uv[1];
-            }
-         }
-         MFEM_SYNC_THREAD;
-      }
-   }
-   // TODO: Create separate function for clarity
-   else if constexpr (
-      std::is_same_v<std::decay_t<field_operator_t>, Weight>)
-   {
-      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);
-      auto w = Reshape(&integration_weights[0], q1d, q1d);
-      auto f = Reshape(&field_qp[0], q1d, q1d);
-      MFEM_FOREACH_THREAD(qx, x, q1d)
-      {
-         MFEM_FOREACH_THREAD(qy, y, q1d)
-         {
-            f(qx, qy) = w(qx, qy);
-         }
-      }
-      MFEM_SYNC_THREAD;
-   }
-   else if constexpr (is_identity_fop<std::decay_t<field_operator_t>>::value)
-   {
-      const int q1d = B.GetShape()[0];
-      auto field = Reshape(&field_e[0], input.size_on_qp, q1d * q1d);
-      field_qp = field;
-   }
-   else
-   {
-      static_assert(dfem::always_false<std::decay_t<field_operator_t>>,
-                    "can't map field to quadrature data");
-   }
-}
-
-template <typename field_operator_t>
-MFEM_HOST_DEVICE
-void map_field_to_quadrature_data(
-   DeviceTensor<2> field_qp,
-   const DofToQuadMap &dtq,
-   const DeviceTensor<1> &field_e,
-   const field_operator_t &input,
-   const DeviceTensor<1, const real_t> &integration_weights)
-{
-   [[maybe_unused]] auto B = dtq.B;
-   [[maybe_unused]] auto G = dtq.G;
-   if constexpr (is_value_fop<field_operator_t>::value)
-   {
-      auto [num_qp, dim, num_dof] = B.GetShape();
-      const int vdim = input.vdim;
-      const auto field = Reshape(&field_e(0), num_dof, vdim);
-
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         for (int qp = 0; qp < num_qp; qp++)
-         {
-            real_t acc = 0.0;
-            for (int dof = 0; dof < num_dof; dof++)
-            {
-               acc += B(qp, 0, dof) * field(dof, vd);
-            }
-            field_qp(vd, qp) = acc;
-         }
-      }
-   }
-   else if constexpr (is_gradient_fop<field_operator_t>::value)
-   {
-      const auto [num_qp, dim, num_dof] = G.GetShape();
-      const int vdim = input.vdim;
-      const auto field = Reshape(&field_e(0), num_dof, vdim);
-
-      auto f = Reshape(&field_qp[0], vdim, dim, num_qp);
-      for (int vd = 0; vd < vdim; vd++)
-      {
-         for (int qp = 0; qp < num_qp; qp++)
-         {
-            for (int d = 0; d < dim; d++)
-            {
-               real_t acc = 0.0;
-               for (int dof = 0; dof < num_dof; dof++)
-               {
-                  acc += G(qp, d, dof) * field(dof, vd);
-               }
-               f(vd, d, qp) = acc;
-            }
-         }
-      }
-   }
-   else if constexpr (std::is_same_v<field_operator_t, Weight>)
-   {
-      const int num_qp = integration_weights.GetShape()[0];
-      auto f = Reshape(&field_qp[0], num_qp);
-      for (int qp = 0; qp < num_qp; qp++)
-      {
-         f(qp) = integration_weights(qp);
-      }
-   }
-   else if constexpr (is_identity_fop<field_operator_t>::value)
-   {
-      auto [num_qp, unused, num_dof] = B.GetShape();
-      const int size_on_qp = input.size_on_qp;
-      const auto field = Reshape(&field_e[0], size_on_qp * num_qp);
-      auto f = Reshape(&field_qp[0], size_on_qp * num_qp);
-      for (int i = 0; i < size_on_qp * num_qp; i++)
-      {
-         f(i) = field(i);
-      }
-   }
-   else
-   {
-      static_assert(dfem::always_false<field_operator_t>,
-                    "can't map field to quadrature data");
-
-   }
-}
-
-template <typename field_operator_ts, size_t num_inputs, size_t num_fields>
-MFEM_HOST_DEVICE inline
-void map_fields_to_quadrature_data(
-   std::array<DeviceTensor<2>, num_inputs> &fields_qp,
-   const std::array<DeviceTensor<1>, num_fields> &fields_e,
-   const std::array<DofToQuadMap, num_inputs> &dtqmaps,
-   const std::array<int, num_inputs> &input_to_field,
-   const field_operator_ts &fops,
-   const DeviceTensor<1, const real_t> &integration_weights,
-   const std::array<DeviceTensor<1>, 6> &scratch_mem,
-   const int &dimension,
-   const bool &use_sum_factorization = false)
-{
-   // 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
-   // inside the functions it is passed to.
-   const auto dummy_field_weight = DeviceTensor<1>(nullptr, 0);
-   for_constexpr<num_inputs>([&](auto i)
-   {
-      const DeviceTensor<1> &field_e =
-         (input_to_field[i] == -1) ? dummy_field_weight : fields_e[input_to_field[i]];
-
-      if (use_sum_factorization)
-      {
-         if (dimension == 2)
-         {
-            map_field_to_quadrature_data_tensor_product_2d(
-               fields_qp[i], dtqmaps[i], field_e, get<i>(fops),
-               integration_weights, scratch_mem);
-         }
-         else if (dimension == 3)
-         {
-            map_field_to_quadrature_data_tensor_product_3d(
-               fields_qp[i], dtqmaps[i], field_e, get<i>(fops),
-               integration_weights, scratch_mem);
-         }
-         else
-         {
-#if !(defined(MFEM_USE_CUDA) || defined(MFEM_USE_HIP))
-            MFEM_ABORT("unsupported dimension");
-#endif
-         }
-      }
-      else
-      {
-         map_field_to_quadrature_data(
-            fields_qp[i], dtqmaps[i], field_e, get<i>(fops),
-            integration_weights);
-      }
-   });
-}
-
-template <typename field_operator_t>
-MFEM_HOST_DEVICE
-void map_field_to_quadrature_data_conditional(
-   DeviceTensor<2> &field_qp,
-   const DeviceTensor<1> &field_e,
-   const DofToQuadMap &dtqmap,
-   field_operator_t &fop,
-   const DeviceTensor<1, const real_t> &integration_weights,
-   const std::array<DeviceTensor<1>, 6> &scratch_mem,
-   const bool &condition,
-   const int &dimension,
-   const bool &use_sum_factorization = false)
-{
-   if (condition)
-   {
-      if (use_sum_factorization)
-      {
-         if (dimension == 2)
-         {
-            map_field_to_quadrature_data_tensor_product_3d(
-               field_qp, dtqmap, field_e, fop, integration_weights, scratch_mem);
-         }
-         else if (dimension == 3)
-         {
-            map_field_to_quadrature_data_tensor_product_2d(
-               field_qp, dtqmap, field_e, fop, integration_weights, scratch_mem);
-         }
-      }
-      else
-      {
-         map_field_to_quadrature_data(
-            field_qp, dtqmap, field_e, fop, integration_weights);
-      }
-   }
-}
-
-template <size_t num_fields, size_t num_inputs, typename field_operator_ts>
-MFEM_HOST_DEVICE
-void map_fields_to_quadrature_data_conditional(
-   std::array<DeviceTensor<2>, num_inputs> &fields_qp,
-   const std::array<DeviceTensor<1, const real_t>, num_fields> &fields_e,
-   const std::array<DofToQuadMap, num_inputs> &dtqmaps,
-   field_operator_ts fops,
-   const DeviceTensor<1, const real_t> &integration_weights,
-   const std::array<DeviceTensor<1>, 6> &scratch_mem,
-   const std::array<bool, num_inputs> &conditions,
-   const bool &use_sum_factorization = false)
-{
-   for_constexpr<num_inputs>([&](auto i)
-   {
-      map_field_to_quadrature_data_conditional(
-         fields_qp[i], fields_e[i], dtqmaps[i], get<i>(fops), integration_weights,
-         scratch_mem, conditions[i], use_sum_factorization);
-   });
-}
-
-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,
-   const DeviceTensor<1> &direction_e,
-   const std::array<DofToQuadMap, num_inputs> &dtqmaps,
-   field_operator_ts fops,
-   const DeviceTensor<1, const real_t> &integration_weights,
-   const std::array<DeviceTensor<1>, 6> &scratch_mem,
-   const std::array<bool, num_inputs> &conditions,
-   const int &dimension,
-   const bool &use_sum_factorization = false)
-{
-   for_constexpr<num_inputs>([&](auto i)
-   {
-      if (conditions[i])
-      {
-         if (use_sum_factorization)
-         {
-            if (dimension == 2)
-            {
-               map_field_to_quadrature_data_tensor_product_2d(
-                  directions_qp[i], dtqmaps[i], direction_e, get<i>(fops),
-                  integration_weights, scratch_mem);
-            }
-            else if (dimension == 3)
-            {
-               map_field_to_quadrature_data_tensor_product_3d(
-                  directions_qp[i], dtqmaps[i], direction_e, get<i>(fops),
-                  integration_weights, scratch_mem);
-            }
-         }
-         else
-         {
-            map_field_to_quadrature_data(
-               directions_qp[i], dtqmaps[i], direction_e, get<i>(fops),
-               integration_weights);
-         }
-      }
-   });
-}
-
-}
@@ -1,154 +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 "../fe/fe_base.hpp"
-#include "../../fem/fespace.hpp"
-
-namespace mfem::future
-{
-
-/// Base class for parametric spaces
-class ParameterSpace
-{
-public:
-   ParameterSpace(int vdim = 1) : vdim(vdim) {}
-
-   /// @brief Get vector dimension at each point
-   ///
-   /// This is the number of components at each point in the parametric space.
-   int GetVDim() const { return vdim; }
-
-   /// Get DofToQuad information
-   const DofToQuad& GetDofToQuad() const { return dtq; }
-
-   /// Get total size of the space (T-vector size)
-   ///
-   /// returns the true size vsize of the space
-   virtual int GetTrueVSize() const = 0;
-
-   /// Get local vector size (L-vector size)
-   ///
-   /// returns the local size of the space
-   virtual int GetVSize() const = 0;
-
-   /// Get spatial dimension
-   ///
-   /// returns always 1.
-   int Dimension() const
-   {
-      return 1;
-   }
-
-   /// @brief Get T-vector to L-vector transformation
-   ///
-   /// returns identity by default that is lazy evaluated.
-   virtual const Operator* GetProlongationMatrix() const
-   {
-      if (!prolongation)
-      {
-         prolongation.reset(new IdentityOperator(GetTrueVSize()));
-      }
-      return prolongation.get();
-   }
-
-   /// @brief Get L-vector to E-vector transformation
-   /// @note This is a mock call to replicate interface of FiniteElementSpace.
-   /// It should not be used by a user.
-   ///
-   /// returns identity by default that is lazy evaluated.
-   virtual const Operator* GetElementRestriction(ElementDofOrdering o) const
-   {
-      if (!elem_restr)
-      {
-         elem_restr.reset(new IdentityOperator(GetVSize()));
-      }
-      return elem_restr.get();
-   }
-
-protected:
-   int vdim;
-   DofToQuad dtq;
-   mutable std::unique_ptr<Operator> prolongation;
-   mutable std::unique_ptr<Operator> elem_restr;
-};
-
-/// @brief Uniform parameter space
-class UniformParameterSpace : public ParameterSpace
-{
-public:
-   /// @brief Constructor for a uniform parameter space
-   ///
-   /// @param mesh The mesh to determine dimension and number of elements.
-   /// @param ir The integration rule to determine the number of quadrature points.
-   /// @param vdim The vector dimension at each point.
-   /// @param used_in_tensor_product If true, the number of quadrature points is
-   /// calculated as the nth root of the number of points in the integration rule,
-   /// where n is the mesh dimension. If false, the number of quadrature points is
-   /// taken directly from the integration rule.
-   UniformParameterSpace(Mesh &mesh, const IntegrationRule &ir, int vdim,
-                         bool used_in_tensor_product = true) :
-      ParameterSpace(vdim)
-   {
-      // Setup DofToQuad information
-      dtq.nqpt = (int)floor(std::pow(ir.GetNPoints(), 1.0 / mesh.Dimension()) + 0.5);
-      dtq.ndof = dtq.nqpt;
-      dtq.mode = used_in_tensor_product ? DofToQuad::TENSOR : DofToQuad::FULL;
-
-      // Calculate sizes
-      const int num_qp = used_in_tensor_product ?
-                         static_cast<int>(std::pow(dtq.nqpt, mesh.Dimension())) :
-                         ir.GetNPoints();
-
-      tsize = vdim * num_qp * mesh.GetNE();
-      lsize = tsize;
-   }
-
-   int GetTrueVSize() const override
-   {
-      return tsize;
-   }
-
-   int GetVSize() const override
-   {
-      return lsize;
-   }
-
-private:
-   /// T-vector size
-   int tsize;
-
-   /// L-vector size
-   int lsize;
-};
-
-class ParameterFunction : public Vector
-{
-public:
-   ParameterFunction(ParameterSpace &space) :
-      Vector(space.GetTrueVSize()),
-      space(space)
-   {}
-
-   /// @brief Get the ParameterSpace
-   const ParameterSpace& GetParameterSpace() const
-   {
-      return space;
-   }
-
-   using Vector::operator=;
-
-private:
-   /// the parametric space
-   ParameterSpace &space;
-};
-
-} // namespace mfem::future
@@ -1,298 +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 "util.hpp"
-#include "qfunction_transform.hpp"
-
-namespace mfem::future
-{
-
-/// @brief Call a qfunction with the given parameters.
-///
-/// @param qfunc the qfunction to call.
-/// @param input_shmem the input shared memory.
-/// @param residual_shmem the residual shared memory.
-/// @param rs_qp the size of the residual.
-/// @param num_qp the number of quadrature points.
-/// @param q1d the number of quadrature points in 1D.
-/// @param dimension the spatial dimension.
-/// @param use_sum_factorization whether to use sum factorization.
-/// @tparam qf_param_ts the tuple type of the qfunction parameters.
-template <
-   typename qf_param_ts,
-   typename qfunc_t,
-   std::size_t num_fields>
-MFEM_HOST_DEVICE inline
-void call_qfunction(
-   qfunc_t &qfunc,
-   const std::array<DeviceTensor<2>, num_fields> &input_shmem,
-   DeviceTensor<2> &residual_shmem,
-   const int &rs_qp,
-   const int &num_qp,
-   const int &q1d,
-   const int &dimension,
-   const bool &use_sum_factorization)
-{
-   if (use_sum_factorization)
-   {
-      if (dimension == 2)
-      {
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               const int q = qx + q1d * qy;
-               auto qf_args = decay_tuple<qf_param_ts> {};
-               auto r = Reshape(&residual_shmem(0, q), rs_qp);
-               apply_kernel(r, qfunc, qf_args, input_shmem, q);
-            }
-         }
-      }
-      else if (dimension == 3)
-      {
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               MFEM_FOREACH_THREAD(qz, z, q1d)
-               {
-                  const int q = qx + q1d * (qy + q1d * qz);
-                  auto qf_args = decay_tuple<qf_param_ts> {};
-                  auto r = Reshape(&residual_shmem(0, q), rs_qp);
-                  apply_kernel(r, qfunc, qf_args, input_shmem, q);
-               }
-            }
-         }
-      }
-      else
-      {
-#if !(defined(MFEM_USE_CUDA) || defined(MFEM_USE_HIP))
-         MFEM_ABORT("unsupported dimension for sum factorization");
-#endif
-      }
-      MFEM_SYNC_THREAD;
-   }
-   else
-   {
-      MFEM_FOREACH_THREAD(q, x, num_qp)
-      {
-         auto qf_args = decay_tuple<qf_param_ts> {};
-         auto r = Reshape(&residual_shmem(0, q), rs_qp);
-         apply_kernel(r, qfunc, qf_args, input_shmem, q);
-      }
-   }
-}
-
-/// @brief Call a qfunction with the given parameters and
-/// compute it's derivative action.
-///
-/// @param qfunc the qfunction to call.
-/// @param input_shmem the input shared memory.
-/// @param shadow_shmem the shadow shared memory.
-/// @param residual_shmem the residual shared memory.
-/// @param das_qp the size of the derivative action.
-/// @param num_qp the number of quadrature points.
-/// @param q1d the number of quadrature points in 1D.
-/// @param dimension the spatial dimension.
-/// @param use_sum_factorization whether to use sum factorization.
-/// @tparam qf_param_ts the tuple type of the qfunction parameters.
-template <
-   typename qf_param_ts,
-   typename qfunc_t,
-   std::size_t num_fields>
-MFEM_HOST_DEVICE inline
-void call_qfunction_derivative_action(
-   qfunc_t &qfunc,
-   const std::array<DeviceTensor<2>, num_fields> &input_shmem,
-   const std::array<DeviceTensor<2>, num_fields> &shadow_shmem,
-   DeviceTensor<2> &residual_shmem,
-   const int &das_qp,
-   const int &num_qp,
-   const int &q1d,
-   const int &dimension,
-   const bool &use_sum_factorization)
-{
-   if (use_sum_factorization)
-   {
-      if (dimension == 2)
-      {
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               const int q = qx + q1d * qy;
-               auto r = Reshape(&residual_shmem(0, q), das_qp);
-               auto qf_args = decay_tuple<qf_param_ts> {};
-#ifdef MFEM_USE_ENZYME
-               auto qf_shadow_args = decay_tuple<qf_param_ts> {};
-               apply_kernel_fwddiff_enzyme(r, qfunc, qf_args, qf_shadow_args, input_shmem,
-                                           shadow_shmem, q);
-#else
-               apply_kernel_native_dual(r, qfunc, qf_args, input_shmem, shadow_shmem, q);
-#endif
-            }
-         }
-      }
-      else if (dimension == 3)
-      {
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            MFEM_FOREACH_THREAD(qy, y, q1d)
-            {
-               MFEM_FOREACH_THREAD(qz, z, q1d)
-               {
-                  const int q = qx + q1d * (qy + q1d * qz);
-                  auto r = Reshape(&residual_shmem(0, q), das_qp);
-                  auto qf_args = decay_tuple<qf_param_ts> {};
-#ifdef MFEM_USE_ENZYME
-                  auto qf_shadow_args = decay_tuple<qf_param_ts> {};
-                  apply_kernel_fwddiff_enzyme(r, qfunc, qf_args, qf_shadow_args, input_shmem,
-                                              shadow_shmem, q);
-#else
-                  apply_kernel_native_dual(r, qfunc, qf_args, input_shmem, shadow_shmem, q);
-#endif
-               }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-   }
-   else
-   {
-      MFEM_FOREACH_THREAD(q, x, num_qp)
-      {
-         auto r = Reshape(&residual_shmem(0, q), das_qp);
-         auto qf_args = decay_tuple<qf_param_ts> {};
-#ifdef MFEM_USE_ENZYME
-         auto qf_shadow_args = decay_tuple<qf_param_ts> {};
-         apply_kernel_fwddiff_enzyme(r, qfunc, qf_args, qf_shadow_args, input_shmem,
-                                     shadow_shmem, q);
-#else
-         apply_kernel_native_dual(r, qfunc, qf_args, input_shmem, shadow_shmem, q);
-#endif
-      }
-      MFEM_SYNC_THREAD;
-   }
-}
-
-template <typename qfunc_t, typename args_ts, size_t num_args>
-MFEM_HOST_DEVICE inline
-void apply_kernel(
-   DeviceTensor<1, real_t> &f_qp,
-   const qfunc_t &qfunc,
-   args_ts &args,
-   const std::array<DeviceTensor<2>, num_args> &u,
-   int qp)
-{
-   process_qf_args(u, args, qp);
-   process_qf_result(f_qp, get<0>(apply(qfunc, args)));
-}
-
-template <typename qfunc_t, typename arg_ts, size_t num_args>
-MFEM_HOST_DEVICE inline
-void apply_kernel_native_dual(
-   DeviceTensor<1, real_t> &f_qp,
-   const qfunc_t &qfunc,
-   arg_ts &args,
-   const std::array<DeviceTensor<2>, num_args> &u,
-   const std::array<DeviceTensor<2>, num_args> &v,
-   const int &qp_idx)
-{
-   process_qf_args(u, v, args, qp_idx);
-   auto r = get<0>(apply(qfunc, args));
-   process_derivative_from_native_dual(f_qp, r);
-}
-
-#ifdef MFEM_USE_ENZYME
-
-template <typename func_t, typename... arg_ts>
-MFEM_HOST_DEVICE inline
-auto qfunction_wrapper(const func_t &f, arg_ts &&...args)
-{
-   return f(args...);
-}
-
-// Version for active function arguments only
-//
-// This is an Enzyme regression and can be removed in later versions.
-template <typename qfunc_t, typename arg_ts, std::size_t... Is,
-          typename inactive_arg_ts>
-MFEM_HOST_DEVICE inline
-auto fwddiff_apply_enzyme_indexed(qfunc_t &qfunc, arg_ts &&args,
-                                  arg_ts &&shadow_args,
-                                  std::index_sequence<Is...>,
-                                  inactive_arg_ts &&inactive_args,
-                                  std::index_sequence<>)
-{
-   using qf_return_t = typename create_function_signature<
-                       decltype(&qfunc_t::operator())>::type::return_t;
-   return __enzyme_fwddiff<qf_return_t>(
-             qfunction_wrapper<qfunc_t, decltype(get<Is>(args))...>, enzyme_const,
-             (void *)&qfunc, enzyme_dup, &get<Is>(args)..., enzyme_interleave,
-             &get<Is>(shadow_args)...);
-}
-
-// Interleave function arguments for enzyme
-template <typename qfunc_t, typename arg_ts, std::size_t... Is,
-          typename inactive_arg_ts, std::size_t... Js>
-MFEM_HOST_DEVICE inline
-auto fwddiff_apply_enzyme_indexed(qfunc_t &qfunc, arg_ts &&args,
-                                  arg_ts &&shadow_args,
-                                  std::index_sequence<Is...>,
-                                  inactive_arg_ts &&inactive_args,
-                                  std::index_sequence<Js...>)
-{
-   using qf_return_t = typename create_function_signature<
-                       decltype(&qfunc_t::operator())>::type::return_t;
-   return __enzyme_fwddiff<qf_return_t>(
-             qfunction_wrapper<qfunc_t, decltype(get<Is>(args))...,
-             decltype(get<Js>(inactive_args))...>,
-             enzyme_const, (void *)&qfunc, enzyme_dup, &get<Is>(args)...,
-             enzyme_const, &get<Js>(inactive_args)..., enzyme_interleave,
-             &get<Is>(shadow_args)...);
-}
-
-template <typename qfunc_t, typename arg_ts, typename inactive_arg_ts>
-MFEM_HOST_DEVICE inline
-auto fwddiff_apply_enzyme(qfunc_t &qfunc, arg_ts &&args,
-                          arg_ts &&shadow_args,
-                          inactive_arg_ts &&inactive_args)
-{
-   auto arg_indices = std::make_index_sequence<
-                      tuple_size<std::remove_reference_t<arg_ts>>::value> {};
-
-   auto inactive_arg_indices = std::make_index_sequence<
-                               tuple_size<std::remove_reference_t<inactive_arg_ts>>::value> {};
-
-   return fwddiff_apply_enzyme_indexed(qfunc, args, shadow_args, arg_indices,
-                                       inactive_args, inactive_arg_indices);
-}
-
-template <typename qfunc_t, typename arg_ts, size_t num_args>
-MFEM_HOST_DEVICE inline
-void apply_kernel_fwddiff_enzyme(
-   DeviceTensor<1, real_t> &f_qp,
-   qfunc_t &qfunc,
-   arg_ts &args,
-   arg_ts &shadow_args,
-   const std::array<DeviceTensor<2>, num_args> &u,
-   const std::array<DeviceTensor<2>, num_args> &v,
-   int qp_idx)
-{
-   process_qf_args(u, args, qp_idx);
-   process_qf_args(v, shadow_args, qp_idx);
-   process_qf_result(f_qp,
-                     get<0>(fwddiff_apply_enzyme(qfunc, args, shadow_args, tuple<> {})));
-}
-#endif // MFEM_USE_ENZYME
-
-} // namespace mfem::future
@@ -1,338 +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 "util.hpp"
-#include "../../linalg/tensor.hpp"
-
-namespace mfem::future
-{
-
-template <typename T0, typename T1, typename T2>
-MFEM_HOST_DEVICE
-void process_qf_arg(const T0 &, const T1 &, T2 &)
-{
-   static_assert(dfem::always_false<T0, T1, T2>,
-                 "process_qf_arg not implemented for arg type");
-}
-
-template <typename T>
-MFEM_HOST_DEVICE
-void process_qf_arg(
-   const DeviceTensor<1, T> &u,
-   const DeviceTensor<1, T> &v,
-   T &arg)
-{
-   arg = u(0);
-}
-
-template <typename T, int n, int m>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1> &u,
-   tensor<dual<T, T>, n, m> &arg)
-{
-   for (int i = 0; i < m; i++)
-   {
-      for (int j = 0; j < n; j++)
-      {
-         arg(j, i).value = u((i * m) + j);
-      }
-   }
-}
-
-template <typename T>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1> &u,
-   dual<T, T> &arg)
-{
-   arg.value = u(0);
-}
-
-template <typename T>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1> &u,
-   const DeviceTensor<1> &v,
-   dual<T, T> &arg)
-{
-   arg.value = u(0);
-   arg.gradient = v(0);
-}
-
-template <typename T, int n>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1> &u,
-   const DeviceTensor<1> &v,
-   tensor<dual<T, T>, n> &arg)
-{
-   for (int i = 0; i < n; i++)
-   {
-      arg(i).value = u(i);
-      arg(i).gradient = v(i);
-   }
-}
-
-template <typename T, int n, int m>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1> &u,
-   const DeviceTensor<1> &v,
-   tensor<dual<T, T>, n, m> &arg)
-{
-   for (int i = 0; i < m; i++)
-   {
-      for (int j = 0; j < n; j++)
-      {
-         arg(j, i).value = u((i * m) + j);
-         arg(j, i).gradient = v((i * m) + j);
-      }
-   }
-}
-
-template <typename T, int n>
-MFEM_HOST_DEVICE inline
-void process_qf_result(
-   DeviceTensor<1, T> &r,
-   const tensor<dual<T, T>, n> &x)
-{
-   for (size_t i = 0; i < n; i++)
-   {
-      r(i) = x(i).value;
-   }
-}
-
-template <typename T, int n, int m>
-MFEM_HOST_DEVICE inline
-void process_qf_result(
-   DeviceTensor<1, T> &r,
-   const tensor<dual<T, T>, n, m> &x)
-{
-   for (size_t i = 0; i < n; i++)
-   {
-      for (size_t j = 0; j < m; j++)
-      {
-         r(i + n * j) = x(i, j).value;
-      }
-   }
-}
-
-template <typename arg_type>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<2> &u,
-   const DeviceTensor<2> &v,
-   arg_type &arg,
-   const int &qp)
-{
-   const auto u_qp = Reshape(&u(0, qp), u.GetShape()[0]);
-   const auto v_qp = Reshape(&v(0, qp), v.GetShape()[0]);
-   process_qf_arg(u_qp, v_qp, arg);
-}
-
-template <size_t num_fields, typename qf_args>
-MFEM_HOST_DEVICE inline
-void process_qf_args(
-   const std::array<DeviceTensor<2>, num_fields> &u,
-   const std::array<DeviceTensor<2>, num_fields> &v,
-   qf_args &args,
-   const int &qp)
-{
-   for_constexpr<tuple_size<qf_args>::value>([&](auto i)
-   {
-      process_qf_arg(u[i], v[i], get<i>(args), qp);
-   });
-}
-
-template <typename T, int n, int m>
-MFEM_HOST_DEVICE inline
-void process_derivative_from_native_dual(
-   DeviceTensor<1, T> &r,
-   const tensor<dual<T, T>, n, m> &x)
-{
-   for (size_t i = 0; i < n; i++)
-   {
-      for (size_t j = 0; j < m; j++)
-      {
-         r(i + n * j) = x(i, j).gradient;
-      }
-   }
-}
-
-template <typename T, int n>
-MFEM_HOST_DEVICE inline
-void process_derivative_from_native_dual(
-   DeviceTensor<1, T> &r,
-   const tensor<dual<T, T>, n> &x)
-{
-   for (size_t i = 0; i < n; i++)
-   {
-      r(i) = x(i).gradient;
-   }
-}
-
-
-template <typename T0, typename T1>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(const T0 &, T1 &)
-{
-   static_assert(dfem::always_false<T0, T1>,
-                 "process_qf_arg not implemented for arg type");
-}
-
-template <typename T>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1, T> &u,
-   T &arg)
-{
-   arg = u(0);
-}
-
-template <typename T>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1, T> &u,
-   tensor<T> &arg)
-{
-   arg(0) = u(0);
-}
-
-template <typename T, int n>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1> &u,
-   tensor<T, n> &arg)
-{
-   for (int i = 0; i < n; i++)
-   {
-      arg(i) = u(i);
-   }
-}
-
-template <typename T, int n, int m>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1> &u,
-   tensor<T, n, m> &arg)
-{
-   for (int i = 0; i < m; i++)
-   {
-      for (int j = 0; j < n; j++)
-      {
-         arg(j, i) = u((i * m) + j);
-      }
-   }
-}
-
-template <typename arg_type>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(const DeviceTensor<2> &u, arg_type &arg, int qp)
-{
-   const auto u_qp = Reshape(&u(0, qp), u.GetShape()[0]);
-   process_qf_arg(u_qp, arg);
-}
-
-template <size_t num_fields, typename qf_args>
-MFEM_HOST_DEVICE inline
-void process_qf_args(
-   const std::array<DeviceTensor<2>, num_fields> &u,
-   qf_args &args,
-   const int &qp)
-{
-   for_constexpr<tuple_size<qf_args>::value>([&](auto i)
-   {
-      process_qf_arg(u[i], get<i>(args), qp);
-   });
-}
-
-template <typename T0, typename T1>
-MFEM_HOST_DEVICE inline
-Vector process_qf_result(T0, T1)
-{
-   static_assert(dfem::always_false<T0, T1>,
-                 "process_qf_result not implemented for result type");
-   return Vector{};
-}
-
-template <typename T>
-MFEM_HOST_DEVICE inline
-void process_qf_result(
-   DeviceTensor<1, T> &r,
-   const T &x)
-{
-   r(0) = x;
-}
-
-template <typename T>
-MFEM_HOST_DEVICE inline
-void process_qf_result(
-   DeviceTensor<1> &r,
-   const dual<T, T> &x)
-{
-   r(0) = x.value;
-}
-
-template <typename T>
-MFEM_HOST_DEVICE inline
-void process_qf_result(
-   DeviceTensor<1, T> &r,
-   const tensor<T> &x)
-{
-   r(0) = x(0);
-}
-
-template <typename T, int n>
-MFEM_HOST_DEVICE inline
-void process_qf_result(
-   DeviceTensor<1, T> &r,
-   const tensor<T, n> &x)
-{
-   for (size_t i = 0; i < n; i++)
-   {
-      r(i) = x(i);
-   }
-}
-
-template <typename T, int n, int m>
-MFEM_HOST_DEVICE inline
-void process_qf_result(
-   DeviceTensor<1, T> &r,
-   const tensor<T, n, m> &x)
-{
-   for (size_t i = 0; i < n; i++)
-   {
-      for (size_t j = 0; j < m; j++)
-      {
-         r(i + n * j) = x(i, j);
-      }
-   }
-}
-
-template <typename T, int n, int m>
-MFEM_HOST_DEVICE inline
-void process_qf_arg(
-   const DeviceTensor<1, T> &u,
-   const DeviceTensor<1, T> &v,
-   tensor<T, n, m> &arg)
-{
-   for (int i = 0; i < m; i++)
-   {
-      for (int j = 0; j < n; j++)
-      {
-         arg(j, i) = u((i * m) + j);
-      }
-   }
-}
-
-} // namespace mfem::future
@@ -1,885 +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
-
-// This is serac's tuple implementation
-
-#include <ostream>
-#include "../../config/config.hpp"
-#include <utility>
-
-// Define a portable unreachable macro
-#if defined(__GNUC__) || defined(__clang__)
-#if defined(__CUDACC_VER_MAJOR__)
-#if __CUDACC_VER_MAJOR__ <= 11 && __CUDACC_VER_MINOR__ < 3
-// nvcc didn't add __builtin_unreachable() until cuda 11.3
-#define MFEM_UNREACHABLE()
-#else
-// nvcc >= 11.3
-#define MFEM_UNREACHABLE() __builtin_unreachable()
-#endif
-#else
-// host-only version
-#define MFEM_UNREACHABLE() __builtin_unreachable()
-#endif
-#elif defined(_MSC_VER)
-#define MFEM_UNREACHABLE() __assume(0)
-#endif
-
-namespace mfem::future
-{
-
-/**
- * @tparam T the types stored in the tuple
- * @brief This is a class that mimics most of std::tuple's interface,
- * except that it is usable in CUDA kernels and admits some arithmetic operator overloads.
- *
- * see https://en.cppreference.com/w/cpp/utility/tuple for more information about std::tuple
- */
-template <typename... T>
-struct tuple
-{
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- */
-template <typename T0>
-struct tuple<T0>
-{
-   T0 v0;  ///< The first member of the tuple
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- * @tparam T1 The second type stored in the tuple
- */
-template <typename T0, typename T1>
-struct tuple<T0, T1>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- * @tparam T1 The second type stored in the tuple
- * @tparam T2 The third type stored in the tuple
- */
-template <typename T0, typename T1, typename T2>
-struct tuple<T0, T1, T2>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-   T2 v2;  ///< The third member of the tuple
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- * @tparam T1 The second type stored in the tuple
- * @tparam T2 The third type stored in the tuple
- * @tparam T3 The fourth type stored in the tuple
- */
-template <typename T0, typename T1, typename T2, typename T3>
-struct tuple<T0, T1, T2, T3>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-   T2 v2;  ///< The third member of the tuple
-   T3 v3;  ///< The fourth member of the tuple
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- * @tparam T1 The second type stored in the tuple
- * @tparam T2 The third type stored in the tuple
- * @tparam T3 The fourth type stored in the tuple
- * @tparam T4 The fifth type stored in the tuple
- */
-template <typename T0, typename T1, typename T2, typename T3, typename T4>
-struct tuple<T0, T1, T2, T3, T4>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-   T2 v2;  ///< The third member of the tuple
-   T3 v3;  ///< The fourth member of the tuple
-   T4 v4;  ///< The fifth member of the tuple
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- * @tparam T1 The second type stored in the tuple
- * @tparam T2 The third type stored in the tuple
- * @tparam T3 The fourth type stored in the tuple
- * @tparam T4 The fifth type stored in the tuple
- * @tparam T5 The sixth type stored in the tuple
- */
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
-struct tuple<T0, T1, T2, T3, T4, T5>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-   T2 v2;  ///< The third member of the tuple
-   T3 v3;  ///< The fourth member of the tuple
-   T4 v4;  ///< The fifth member of the tuple
-   T5 v5;  ///< The sixth member of the tuple
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- * @tparam T1 The second type stored in the tuple
- * @tparam T2 The third type stored in the tuple
- * @tparam T3 The fourth type stored in the tuple
- * @tparam T4 The fifth type stored in the tuple
- * @tparam T5 The sixth type stored in the tuple
- * @tparam T6 The seventh type stored in the tuple
- */
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-struct tuple<T0, T1, T2, T3, T4, T5, T6>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-   T2 v2;  ///< The third member of the tuple
-   T3 v3;  ///< The fourth member of the tuple
-   T4 v4;  ///< The fifth member of the tuple
-   T5 v5;  ///< The sixth member of the tuple
-   T6 v6;  ///< The seventh member of the tuple
-};
-
-/**
- * @brief Type that mimics std::tuple
- *
- * @tparam T0 The first type stored in the tuple
- * @tparam T1 The second type stored in the tuple
- * @tparam T2 The third type stored in the tuple
- * @tparam T3 The fourth type stored in the tuple
- * @tparam T4 The fifth type stored in the tuple
- * @tparam T5 The sixth type stored in the tuple
- * @tparam T6 The seventh type stored in the tuple
- * @tparam T7 The eighth type stored in the tuple
- */
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-struct tuple<T0, T1, T2, T3, T4, T5, T6, T7>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-   T2 v2;  ///< The third member of the tuple
-   T3 v3;  ///< The fourth member of the tuple
-   T4 v4;  ///< The fifth member of the tuple
-   T5 v5;  ///< The sixth member of the tuple
-   T6 v6;  ///< The seventh member of the tuple
-   T7 v7;  ///< The eighth member of the tuple
-};
-
-template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-struct tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8>
-{
-   T0 v0;  ///< The first member of the tuple
-   T1 v1;  ///< The second member of the tuple
-   T2 v2;  ///< The third member of the tuple
-   T3 v3;  ///< The fourth member of the tuple
-   T4 v4;  ///< The fifth member of the tuple
-   T5 v5;  ///< The sixth member of the tuple
-   T6 v6;  ///< The seventh member of the tuple
-   T7 v7;  ///< The eighth member of the tuple
-   T8 v8;
-};
-
-/**
- * @brief Class template argument deduction rule for tuples
- * @tparam T The variadic template parameter for tuple types
- */
-template <typename... T>
-MFEM_HOST_DEVICE
-tuple(T...) -> tuple<T...>;
-
-/**
- * @brief helper function for combining a list of values into a tuple
- * @tparam T types of the values to be tuple-d
- * @param args the actual values to be put into a tuple
- */
-template <typename... T>
-MFEM_HOST_DEVICE tuple<T...> make_tuple(const T&... args)
-{
-   return tuple<T...> {args...};
-}
-
-template <class... Types>
-struct tuple_size
-{
-};
-
-template <class... Types>
-struct tuple_size<tuple<Types...>> :
-                                std::integral_constant<std::size_t, sizeof...(Types)>
-{
-};
-
-/**
- * @tparam i the tuple index to access
- * @tparam T the types stored in the tuple
- * @brief return a reference to the ith tuple entry
- */
-template <int i, typename... T>
-MFEM_HOST_DEVICE constexpr auto& get(tuple<T...>& values)
-{
-   static_assert(i < sizeof...(T));
-   if constexpr (i == 0)
-   {
-      return values.v0;
-   }
-   if constexpr (i == 1)
-   {
-      return values.v1;
-   }
-   if constexpr (i == 2)
-   {
-      return values.v2;
-   }
-   if constexpr (i == 3)
-   {
-      return values.v3;
-   }
-   if constexpr (i == 4)
-   {
-      return values.v4;
-   }
-   if constexpr (i == 5)
-   {
-      return values.v5;
-   }
-   if constexpr (i == 6)
-   {
-      return values.v6;
-   }
-   if constexpr (i == 7)
-   {
-      return values.v7;
-   }
-   if constexpr (i == 8)
-   {
-      return values.v8;
-   }
-   MFEM_UNREACHABLE();
-}
-
-/**
- * @tparam i the tuple index to access
- * @tparam T the types stored in the tuple
- * @brief return a copy of the ith tuple entry
- */
-template <int i, typename... T>
-MFEM_HOST_DEVICE constexpr const auto& get(const tuple<T...>& values)
-{
-   static_assert(i < sizeof...(T));
-   if constexpr (i == 0)
-   {
-      return values.v0;
-   }
-   if constexpr (i == 1)
-   {
-      return values.v1;
-   }
-   if constexpr (i == 2)
-   {
-      return values.v2;
-   }
-   if constexpr (i == 3)
-   {
-      return values.v3;
-   }
-   if constexpr (i == 4)
-   {
-      return values.v4;
-   }
-   if constexpr (i == 5)
-   {
-      return values.v5;
-   }
-   if constexpr (i == 6)
-   {
-      return values.v6;
-   }
-   if constexpr (i == 7)
-   {
-      return values.v7;
-   }
-   if constexpr (i == 8)
-   {
-      return values.v8;
-   }
-   MFEM_UNREACHABLE();
-}
-
-/**
- * @brief a function intended to be used for extracting the ith type from a tuple.
- *
- * @note type<i>(my_tuple) returns a value, whereas get<i>(my_tuple) returns a reference
- *
- * @tparam i the index of the tuple to query
- * @tparam T the types stored in the tuple
- * @param values the tuple of values
- * @return a copy of the ith entry of the input
- */
-template <int i, typename... T>
-MFEM_HOST_DEVICE constexpr auto type(const tuple<T...>& values)
-{
-   static_assert(i < sizeof...(T));
-   if constexpr (i == 0)
-   {
-      return values.v0;
-   }
-   if constexpr (i == 1)
-   {
-      return values.v1;
-   }
-   if constexpr (i == 2)
-   {
-      return values.v2;
-   }
-   if constexpr (i == 3)
-   {
-      return values.v3;
-   }
-   if constexpr (i == 4)
-   {
-      return values.v4;
-   }
-   if constexpr (i == 5)
-   {
-      return values.v5;
-   }
-   if constexpr (i == 6)
-   {
-      return values.v6;
-   }
-   if constexpr (i == 7)
-   {
-      return values.v7;
-   }
-   if constexpr (i == 8)
-   {
-      return values.v8;
-   }
-}
-
-/**
- * @brief A helper function for the + operator of tuples
- *
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param y tuple of values
- * @return the returned tuple sum
- */
-template <typename... S, typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto plus_helper(const tuple<S...>& x,
-                                            const tuple<T...>& y,
-                                            std::integer_sequence<int, i...>)
-{
-   return tuple{get<i>(x) + get<i>(y)...};
-}
-
-/**
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @param x a tuple of values
- * @param y a tuple of values
- * @brief return a tuple of values defined by elementwise sum of x and y
- */
-template <typename... S, typename... T>
-MFEM_HOST_DEVICE constexpr auto operator+(const tuple<S...>& x,
-                                          const tuple<T...>& y)
-{
-   static_assert(sizeof...(S) == sizeof...(T));
-   return plus_helper(x, y,
-                      std::make_integer_sequence<int, static_cast<int>(sizeof...(S))>());
-}
-
-/**
- * @brief A helper function for the += operator of tuples
- *
- * @tparam T the types stored in the tuples x and y
- * @tparam i integer sequence used to index the tuples
- * @param x tuple of values to be incremented
- * @param y tuple of increment values
- */
-template <typename... T, int... i>
-MFEM_HOST_DEVICE constexpr void plus_equals_helper(tuple<T...>& x,
-                                                   const tuple<T...>& y,
-                                                   std::integer_sequence<int, i...>)
-{
-   ((get<i>(x) += get<i>(y)), ...);
-}
-
-/**
- * @tparam T the types stored in the tuples x and y
- * @param x a tuple of values
- * @param y a tuple of values
- * @brief add values contained in y, to the tuple x
- */
-template <typename... T>
-MFEM_HOST_DEVICE constexpr auto operator+=(tuple<T...>& x,
-                                           const tuple<T...>& y)
-{
-   return plus_equals_helper(x, y,
-                             std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @brief A helper function for the -= operator of tuples
- *
- * @tparam T the types stored in the tuples x and y
- * @tparam i integer sequence used to index the tuples
- * @param x tuple of values to be subracted from
- * @param y tuple of values to subtract from x
- */
-template <typename... T, int... i>
-MFEM_HOST_DEVICE constexpr void minus_equals_helper(tuple<T...>& x,
-                                                    const tuple<T...>& y,
-                                                    std::integer_sequence<int, i...>)
-{
-   ((get<i>(x) -= get<i>(y)), ...);
-}
-
-/**
- * @tparam T the types stored in the tuples x and y
- * @param x a tuple of values
- * @param y a tuple of values
- * @brief add values contained in y, to the tuple x
- */
-template <typename... T>
-MFEM_HOST_DEVICE constexpr auto operator-=(tuple<T...>& x,
-                                           const tuple<T...>& y)
-{
-   return minus_equals_helper(x, y,
-                              std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @brief A helper function for the - operator of tuples
- *
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param y tuple of values
- * @return the returned tuple difference
- */
-template <typename... S, typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto minus_helper(const tuple<S...>& x,
-                                             const tuple<T...>& y,
-                                             std::integer_sequence<int, i...>)
-{
-   return tuple{get<i>(x) - get<i>(y)...};
-}
-
-/**
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @param x a tuple of values
- * @param y a tuple of values
- * @brief return a tuple of values defined by elementwise difference of x and y
- */
-template <typename... S, typename... T>
-MFEM_HOST_DEVICE constexpr auto operator-(const tuple<S...>& x,
-                                          const tuple<T...>& y)
-{
-   static_assert(sizeof...(S) == sizeof...(T));
-   return minus_helper(x, y,
-                       std::make_integer_sequence<int, static_cast<int>(sizeof...(S))>());
-}
-
-/**
- * @brief A helper function for the - operator of tuples
- *
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @return the returned tuple difference
- */
-template <typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto unary_minus_helper(const tuple<T...>& x,
-                                                   std::integer_sequence<int, i...>)
-{
-   return tuple{-get<i>(x)...};
-}
-
-/**
- * @tparam T the types stored in the tuple y
- * @param x a tuple of values
- * @brief return a tuple of values defined by applying the unary minus operator to each element of x
- */
-template <typename... T>
-MFEM_HOST_DEVICE constexpr auto operator-(const tuple<T...>& x)
-{
-   return unary_minus_helper(x,
-                             std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @brief A helper function for the / operator of tuples
- *
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param y tuple of values
- * @return the returned tuple ratio
- */
-template <typename... S, typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto div_helper(const tuple<S...>& x,
-                                           const tuple<T...>& y,
-                                           std::integer_sequence<int, i...>)
-{
-   return tuple{get<i>(x) / get<i>(y)...};
-}
-
-/**
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @param x a tuple of values
- * @param y a tuple of values
- * @brief return a tuple of values defined by elementwise division of x by y
- */
-template <typename... S, typename... T>
-MFEM_HOST_DEVICE constexpr auto operator/(const tuple<S...>& x,
-                                          const tuple<T...>& y)
-{
-   static_assert(sizeof...(S) == sizeof...(T));
-   return div_helper(x, y,
-                     std::make_integer_sequence<int, static_cast<int>(sizeof...(S))>());
-}
-
-/**
- * @brief A helper function for the / operator of tuples
- *
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param a the constant numerator
- * @return the returned tuple ratio
- */
-template <typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto div_helper(const real_t a,
-                                           const tuple<T...>& x, std::integer_sequence<int, i...>)
-{
-   return tuple{a / get<i>(x)...};
-}
-
-/**
- * @brief A helper function for the / operator of tuples
- *
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param a the constant denomenator
- * @return the returned tuple ratio
- */
-template <typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto div_helper(const tuple<T...>& x,
-                                           const real_t a, std::integer_sequence<int, i...>)
-{
-   return tuple{get<i>(x) / a...};
-}
-
-/**
- * @tparam T the types stored in the tuple x
- * @param a the numerator
- * @param x a tuple of denominator values
- * @brief return a tuple of values defined by division of a by the elements of x
- */
-template <typename... T>
-MFEM_HOST_DEVICE constexpr auto operator/(const real_t a, const tuple<T...>& x)
-{
-   return div_helper(a, x,
-                     std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @tparam T the types stored in the tuple y
- * @param x a tuple of numerator values
- * @param a a denominator
- * @brief return a tuple of values defined by elementwise division of x by a
- */
-template <typename... T>
-MFEM_HOST_DEVICE constexpr auto operator/(const tuple<T...>& x, const real_t a)
-{
-   return div_helper(x, a,
-                     std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @brief A helper function for the * operator of tuples
- *
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param y tuple of values
- * @return the returned tuple product
- */
-template <typename... S, typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto mult_helper(const tuple<S...>& x,
-                                            const tuple<T...>& y,
-                                            std::integer_sequence<int, i...>)
-{
-   return tuple{get<i>(x) * get<i>(y)...};
-}
-
-/**
- * @tparam S the types stored in the tuple x
- * @tparam T the types stored in the tuple y
- * @param x a tuple of values
- * @param y a tuple of values
- * @brief return a tuple of values defined by elementwise multiplication of x and y
- */
-template <typename... S, typename... T>
-MFEM_HOST_DEVICE constexpr auto operator*(const tuple<S...>& x,
-                                          const tuple<T...>& y)
-{
-   static_assert(sizeof...(S) == sizeof...(T));
-   return mult_helper(x, y,
-                      std::make_integer_sequence<int, static_cast<int>(sizeof...(S))>());
-}
-
-/**
- * @brief A helper function for the * operator of tuples
- *
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param a a constant multiplier
- * @return the returned tuple product
- */
-template <typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto mult_helper(const real_t a,
-                                            const tuple<T...>& x, std::integer_sequence<int, i...>)
-{
-   return tuple{a * get<i>(x)...};
-}
-
-/**
- * @brief A helper function for the * operator of tuples
- *
- * @tparam T the types stored in the tuple y
- * @tparam i The integer sequence to i
- * @param x tuple of values
- * @param a a constant multiplier
- * @return the returned tuple product
- */
-template <typename... T, int... i>
-MFEM_HOST_DEVICE constexpr auto mult_helper(const tuple<T...>& x,
-                                            const real_t a, std::integer_sequence<int, i...>)
-{
-   return tuple{get<i>(x) * a...};
-}
-
-/**
- * @tparam T the types stored in the tuple
- * @param a a scaling factor
- * @param x the tuple object
- * @brief multiply each component of x by the value a on the left
- */
-template <typename... T>
-MFEM_HOST_DEVICE constexpr auto operator*(const real_t a, const tuple<T...>& x)
-{
-   return mult_helper(a, x,
-                      std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @tparam T the types stored in the tuple
- * @param x the tuple object
- * @param a a scaling factor
- * @brief multiply each component of x by the value a on the right
- */
-template <typename... T>
-MFEM_HOST_DEVICE constexpr auto operator*(const tuple<T...>& x, const real_t a)
-{
-   return mult_helper(x, a,
-                      std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @tparam T the types stored in the tuple
- * @tparam i a list of indices used to acces each element of the tuple
- * @param out the ostream to write the output to
- * @param A the tuple of values
- * @brief helper used to implement printing a tuple of values
- */
-template <typename... T, std::size_t... i>
-auto& print_helper(std::ostream& out, const tuple<T...>& A,
-                   std::integer_sequence<size_t, i...>)
-{
-   out << "tuple{";
-   (..., (out << (i == 0 ? "" : ", ") << get<i>(A)));
-   out << "}";
-   return out;
-}
-
-/**
- * @tparam T the types stored in the tuple
- * @param out the ostream to write the output to
- * @param A the tuple of values
- * @brief print a tuple of values
- */
-template <typename... T>
-auto& operator<<(std::ostream& out, const tuple<T...>& A)
-{
-   return print_helper(out, A, std::make_integer_sequence<size_t, sizeof...(T)>());
-}
-
-/**
- * @brief A helper to apply a lambda to a tuple
- *
- * @tparam lambda The functor type
- * @tparam T The tuple types
- * @tparam i The integer sequence to i
- * @param f The functor to apply to the tuple
- * @param args The input tuple
- * @return The functor output
- */
-template <typename lambda, typename... T, int... i>
-MFEM_HOST_DEVICE auto apply_helper(lambda f, tuple<T...>& args,
-                                   std::integer_sequence<int, i...>)
-{
-   return f(get<i>(args)...);
-}
-
-/**
- * @tparam lambda a callable type
- * @tparam T the types of arguments to be passed in to f
- * @param f the callable object
- * @param args a tuple of arguments
- * @brief a way of passing an n-tuple to a function that expects n separate arguments
- *
- *   e.g. foo(bar, baz) is equivalent to apply(foo, mfem::tuple(bar,baz));
- */
-template <typename lambda, typename... T>
-MFEM_HOST_DEVICE auto apply(lambda f, tuple<T...>& args)
-{
-   return apply_helper(f, std::move(args),
-                       std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @overload
- */
-template <typename lambda, typename... T, int... i>
-MFEM_HOST_DEVICE auto apply_helper(lambda f, const tuple<T...>& args,
-                                   std::integer_sequence<int, i...>)
-{
-   return f(get<i>(args)...);
-}
-
-/**
- * @tparam lambda a callable type
- * @tparam T the types of arguments to be passed in to f
- * @param f the callable object
- * @param args a tuple of arguments
- * @brief a way of passing an n-tuple to a function that expects n separate arguments
- *
- *   e.g. foo(bar, baz) is equivalent to apply(foo, mfem::tuple(bar,baz));
- */
-template <typename lambda, typename... T>
-MFEM_HOST_DEVICE auto apply(lambda f, const tuple<T...>& args)
-{
-   return apply_helper(f, std::move(args),
-                       std::make_integer_sequence<int, static_cast<int>(sizeof...(T))>());
-}
-
-/**
- * @brief a struct used to determine the type at index I of a tuple
- *
- * @note see: https://en.cppreference.com/w/cpp/utility/tuple/tuple_element
- *
- * @tparam I the index of the desired type
- * @tparam T a tuple of different types
- */
-template <size_t I, class T>
-struct tuple_element;
-
-// recursive case
-/// @overload
-template <size_t I, class Head, class... Tail>
-struct tuple_element<I, tuple<Head, Tail...>> : tuple_element<I - 1,
-                                              tuple<Tail...>>
-{
-};
-
-// base case
-/// @overload
-template <class Head, class... Tail>
-struct tuple_element<0, tuple<Head, Tail...>>
-{
-   using type = Head;  ///< the type at the specified index
-};
-
-/**
- * @brief Trait for checking if a type is a @p mfem::tuple
- */
-template <typename T>
-struct is_tuple : std::false_type
-{
-};
-
-/// @overload
-template <typename... T>
-struct is_tuple<tuple<T...>> : std::true_type
-{
-};
-
-/**
- * @brief Trait for checking if a type if a @p mfem::tuple containing only @p mfem::tuple
- */
-template <typename T>
-struct is_tuple_of_tuples : std::false_type
-{
-};
-
-/**
- * @brief Trait for checking if a type if a @p mfem::tuple containing only @p mfem::tuple
- */
-template <typename... T>
-struct is_tuple_of_tuples<tuple<T...>>
-{
-   static constexpr bool value = (is_tuple<T>::value &&
-                                  ...);  ///< true/false result of type check
-};
-
-/** @brief Auxiliary template function that merges (concatenates) two
-    mfem::future::tuple types into a single std::tuple that is empty, i.e. it is
-    value initialized. */
-template <typename... T1s, typename... T2s>
-constexpr auto merge_mfem_tuples_as_empty_std_tuple(
-   const mfem::future::tuple<T1s...> &,
-   const mfem::future::tuple<T2s...> &)
-{
-   return std::tuple<T1s..., T2s...> {};
-}
-
-}  // namespace mfem::future
@@ -17,10 +17,7 @@
 namespace mfem
 {

-struct DGMassInvKernels { DGMassInvKernels(); };
-
-DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_orig,
-                             Coefficient *coeff,
+DGMassInverse::DGMassInverse(FiniteElementSpace &fes_orig, Coefficient *coeff,
                             const IntegrationRule *ir,
                             int btype)
   : Solver(fes_orig.GetTrueVSize()),
@@ -30,8 +27,6 @@ DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_orig,
         fes_orig.GetTypicalFE()->GetMapType()),
     fes(fes_orig.GetMesh(), &fec)
 {
-   static DGMassInvKernels kernels;
-
   MFEM_VERIFY(fes.IsDGSpace(), "Space must be DG.");
   MFEM_VERIFY(!fes.IsVariableOrder(), "Variable orders not supported.");

@@ -51,7 +46,7 @@ DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_orig,
      const FiniteElement &fe = *fes.GetTypicalFE();
      d2q = &fe_orig.GetDofToQuad(fe.GetNodes(), mode);

-      const int n = d2q->ndof;
+      int n = d2q->ndof;
      Array<real_t> B_inv = d2q->B; // deep copy
      Array<int> ipiv(n);
      // solver basis to original
@@ -76,7 +71,7 @@ DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_orig,
   // Only need transformed RHS if basis is different
   if (btype_orig != btype) { b2_.SetSize(height); }

-   M.reset(new BilinearForm(&fes));
+   M = new BilinearForm(&fes);
   M->AddDomainIntegrator(m); // M assumes ownership of m
   M->SetAssemblyLevel(AssemblyLevel::PARTIAL);

@@ -84,19 +79,19 @@ DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_orig,
   Update();
 }

-DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_, Coefficient &coeff,
+DGMassInverse::DGMassInverse(FiniteElementSpace &fes_, Coefficient &coeff,
                             int btype)
   : DGMassInverse(fes_, &coeff, nullptr, btype) { }

-DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_, Coefficient &coeff,
+DGMassInverse::DGMassInverse(FiniteElementSpace &fes_, Coefficient &coeff,
                             const IntegrationRule &ir, int btype)
   : DGMassInverse(fes_, &coeff, &ir, btype) { }

-DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_,
+DGMassInverse::DGMassInverse(FiniteElementSpace &fes_,
                             const IntegrationRule &ir, int btype)
   : DGMassInverse(fes_, nullptr, &ir, btype) { }

-DGMassInverse::DGMassInverse(const FiniteElementSpace &fes_, int btype)
+DGMassInverse::DGMassInverse(FiniteElementSpace &fes_, int btype)
   : DGMassInverse(fes_, nullptr, nullptr, btype) { }

 void DGMassInverse::SetOperator(const Operator &op)
@@ -117,7 +112,10 @@ void DGMassInverse::Update()
   diag_inv.Reciprocal();
 }

-DGMassInverse::~DGMassInverse() = default;
+DGMassInverse::~DGMassInverse()
+{
+   delete M;
+}

 template<int DIM, int D1D, int Q1D>
 void DGMassInverse::DGMassCGIteration(const Vector &b_, Vector &u_) const
@@ -271,58 +269,47 @@ void DGMassInverse::Mult(const Vector &Mu, Vector &u) const
   const int d1d = m->dofs1D;
   const int q1d = m->quad1D;

-   CGKernels::Run(dim, d1d, q1d, *this, Mu, u);
+   const int id = (d1d << 4) | q1d;
+
+   if (dim == 2)
+   {
+      switch (id)
+      {
+         case 0x11: return DGMassCGIteration<2,1,1>(Mu, u);
+         case 0x22: return DGMassCGIteration<2,2,2>(Mu, u);
+         case 0x33: return DGMassCGIteration<2,3,3>(Mu, u);
+         case 0x35: return DGMassCGIteration<2,3,5>(Mu, u);
+         case 0x44: return DGMassCGIteration<2,4,4>(Mu, u);
+         case 0x46: return DGMassCGIteration<2,4,6>(Mu, u);
+         case 0x55: return DGMassCGIteration<2,5,5>(Mu, u);
+         case 0x57: return DGMassCGIteration<2,5,7>(Mu, u);
+         case 0x66: return DGMassCGIteration<2,6,6>(Mu, u);
+         case 0x68: return DGMassCGIteration<2,6,8>(Mu, u);
+         default: return DGMassCGIteration<2>(Mu, u); // Fallback
+      }
+   }
+   else if (dim == 3)
+   {
+      switch (id)
+      {
+         case 0x22: return DGMassCGIteration<3,2,2>(Mu, u);
+         case 0x23: return DGMassCGIteration<3,2,3>(Mu, u);
+         case 0x33: return DGMassCGIteration<3,3,3>(Mu, u);
+         case 0x34: return DGMassCGIteration<3,3,4>(Mu, u);
+         case 0x35: return DGMassCGIteration<3,3,5>(Mu, u);
+         case 0x44: return DGMassCGIteration<3,4,4>(Mu, u);
+         case 0x45: return DGMassCGIteration<3,4,5>(Mu, u);
+         case 0x46: return DGMassCGIteration<3,4,6>(Mu, u);
+         case 0x48: return DGMassCGIteration<3,4,8>(Mu, u);
+         case 0x55: return DGMassCGIteration<3,5,5>(Mu, u);
+         case 0x56: return DGMassCGIteration<3,5,6>(Mu, u);
+         case 0x57: return DGMassCGIteration<3,5,7>(Mu, u);
+         case 0x58: return DGMassCGIteration<3,5,8>(Mu, u);
+         case 0x66: return DGMassCGIteration<3,6,6>(Mu, u);
+         case 0x67: return DGMassCGIteration<3,6,7>(Mu, u);
+         default: return DGMassCGIteration<3>(Mu, u); // Fallback
+      }
+   }
 }

-DGMassInvKernels::DGMassInvKernels()
-{
-   using k = DGMassInverse::CGKernels;
-   // 2D
-   k::Specialization<2,1,1>::Add();
-   k::Specialization<2,2,2>::Add();
-   k::Specialization<2,3,3>::Add();
-   k::Specialization<2,3,5>::Add();
-   k::Specialization<2,4,4>::Add();
-   k::Specialization<2,4,6>::Add();
-   k::Specialization<2,5,5>::Add();
-   k::Specialization<2,5,7>::Add();
-   k::Specialization<2,6,6>::Add();
-   k::Specialization<2,6,8>::Add();
-   // 3D
-   k::Specialization<3,2,2>::Add();
-   k::Specialization<3,2,3>::Add();
-   k::Specialization<3,3,3>::Add();
-   k::Specialization<3,3,4>::Add();
-   k::Specialization<3,3,5>::Add();
-   k::Specialization<3,4,4>::Add();
-   k::Specialization<3,4,5>::Add();
-   k::Specialization<3,4,6>::Add();
-   k::Specialization<3,4,8>::Add();
-   k::Specialization<3,5,5>::Add();
-   k::Specialization<3,5,6>::Add();
-   k::Specialization<3,5,7>::Add();
-   k::Specialization<3,5,8>::Add();
-   k::Specialization<3,6,6>::Add();
-   k::Specialization<3,6,7>::Add();
-}
-
-/// @cond Suppress_Doxygen_warnings
-
-template <int DIM, int D1D, int Q1D>
-DGMassInverse::CGKernelType DGMassInverse::CGKernels::Kernel()
-{
-   return &DGMassInverse::DGMassCGIteration<DIM,D1D,Q1D>;
-}
-
-DGMassInverse::CGKernelType DGMassInverse::CGKernels::Fallback(
-   int dim, int, int)
-{
-   if (dim == 1) { return &DGMassInverse::DGMassCGIteration<1>; }
-   else if (dim == 2) { return &DGMassInverse::DGMassCGIteration<2>; }
-   else if (dim == 3) { return &DGMassInverse::DGMassCGIteration<3>; }
-   else { MFEM_ABORT("Unsupported dimension."); }
-}
-
-/// @endcond
-
 } // namespace mfem
@@ -14,8 +14,6 @@

 #include "../linalg/operator.hpp"
 #include "fespace.hpp"
-#include "kernel_dispatch.hpp"
-#include <memory>

 namespace mfem
 {
@@ -34,7 +32,7 @@ protected:
   const DofToQuad *d2q; ///< Change of basis. Not owned.
   Array<real_t> B_; ///< Inverse of change of basis.
   Array<real_t> Bt_; ///< Inverse of change of basis, transposed.
-   std::unique_ptr<class BilinearForm> M; ///< Mass bilinear form.
+   class BilinearForm *M; ///< Mass bilinear form, owned.
   class MassIntegrator *m; ///< Mass integrator, owned by the form @ref M.
   Vector diag_inv; ///< Jacobi preconditioner.
   real_t rel_tol = 1e-12; ///< Relative CG tolerance.
@@ -50,7 +48,7 @@ protected:
   ///
   /// Custom coefficient and integration rule are used if @a coeff and @a ir
   /// are non-NULL.
-   DGMassInverse(const FiniteElementSpace &fes_, Coefficient *coeff,
+   DGMassInverse(FiniteElementSpace &fes_, Coefficient *coeff,
                 const IntegrationRule *ir, int btype);
 public:
   /// @brief Construct the DG inverse mass operator for @a fes_.
@@ -63,37 +61,36 @@ public:
   /// The solution and right-hand side used for the solver are not affected by
   /// this basis (they correspond to the basis of @a fes_). @a btype is only
   /// used internally, and only has an effect on the convergence rate.
-   DGMassInverse(const FiniteElementSpace &fes_,
-                 int btype=BasisType::GaussLegendre);
+   DGMassInverse(FiniteElementSpace &fes_, int btype=BasisType::GaussLegendre);
   /// @brief Construct the DG inverse mass operator for @a fes_ with
   /// Coefficient @a coeff.
   ///
   /// @sa DGMassInverse(FiniteElementSpace&, int) for information about @a
   /// btype.
-   DGMassInverse(const FiniteElementSpace &fes_, Coefficient &coeff,
+   DGMassInverse(FiniteElementSpace &fes_, Coefficient &coeff,
                 int btype=BasisType::GaussLegendre);
   /// @brief Construct the DG inverse mass operator for @a fes_ with
   /// Coefficient @a coeff and IntegrationRule @a ir.
   ///
   /// @sa DGMassInverse(FiniteElementSpace&, int) for information about @a
   /// btype.
-   DGMassInverse(const FiniteElementSpace &fes_, Coefficient &coeff,
+   DGMassInverse(FiniteElementSpace &fes_, Coefficient &coeff,
                 const IntegrationRule &ir, int btype=BasisType::GaussLegendre);
   /// @brief Construct the DG inverse mass operator for @a fes_ with
   /// IntegrationRule @a ir.
   ///
   /// @sa DGMassInverse(FiniteElementSpace&, int) for information about @a
   /// btype.
-   DGMassInverse(const FiniteElementSpace &fes_, const IntegrationRule &ir,
+   DGMassInverse(FiniteElementSpace &fes_, const IntegrationRule &ir,
                 int btype=BasisType::GaussLegendre);
   /// @brief Solve the system M b = u.
   ///
   /// If @ref iterative_mode is @a true, @a u is used as an initial guess.
-   void Mult(const Vector &b, Vector &u) const override;
+   void Mult(const Vector &b, Vector &u) const;
   /// Same as Mult() since the mass matrix is symmetric.
-   void MultTranspose(const Vector &b, Vector &u) const override { Mult(b, u); }
+   void MultTranspose(const Vector &b, Vector &u) const { Mult(b, u); }
   /// Not implemented. Aborts.
-   void SetOperator(const Operator &op) override;
+   void SetOperator(const Operator &op);
   /// Set the relative tolerance.
   void SetRelTol(const real_t rel_tol_);
   /// Set the absolute tolerance.
@@ -110,9 +107,6 @@ public:
   /// extended lambda used in an mfem::forall kernel (nvcc limitation)
   template<int DIM, int D1D = 0, int Q1D = 0>
   void DGMassCGIteration(const Vector &b_, Vector &u_) const;
-
-   using CGKernelType = void(DGMassInverse::*)(const Vector &b_, Vector &u) const;
-   MFEM_REGISTER_KERNELS(CGKernels, CGKernelType, (int, int, int));
 };

 } // namespace mfem
@@ -37,13 +37,6 @@ void DGMassApply(const int e,
   constexpr bool use_smem = (D1D > 0 && Q1D > 0);
   constexpr bool ACCUM = false;
   constexpr int NBZ = 1;
-
-   if (DIM == 1)
-   {
-      PAMassApply1D_Element<ACCUM>(e, NE, B, Bt, pa_data, x, y, d1d, q1d);
-      return;
-   }
-
   if (use_smem)
   {
      // cannot specialize functions below with D1D or Q1D equal to zero
@@ -179,43 +172,6 @@ real_t DGMassDot(const int e,
   return s_dot[0];
 }

-template<int T_D1D = 0>
-MFEM_HOST_DEVICE inline
-void DGMassBasis1D(const int e,
-                   const int NE,
-                   const real_t *b_,
-                   const real_t *x_,
-                   real_t *y_,
-                   const int d1d = 0)
-{
-   const int D1D = T_D1D ? T_D1D : d1d;
-
-   const auto b = Reshape(b_, D1D, D1D);
-   const auto x = Reshape(x_, D1D, NE);
-   auto y = Reshape(y_, D1D, NE);
-
-   constexpr int MD1 = T_D1D ? T_D1D : DofQuadLimits::MAX_D1D;
-   real_t Y[MD1];
-
-   MFEM_FOREACH_THREAD(i,x,D1D)
-   {
-      real_t val = 0.0;
-      for (int j = 0; j < D1D; ++j)
-      {
-         val += b(i,j)*x(j,e);
-      }
-      Y[i] = val;
-   }
-   MFEM_SYNC_THREAD;
-   if (MFEM_THREAD_ID(y) == 0)
-   {
-      MFEM_FOREACH_THREAD(i,x,D1D)
-      {
-         y(i,e) = Y[i];
-      }
-   }
-}
-
 template<int T_D1D = 0>
 MFEM_HOST_DEVICE inline
 void DGMassBasis2D(const int e,
@@ -313,11 +269,7 @@ void DGMassBasis(const int e,
                 real_t *y_,
                 const int d1d = 0)
 {
-   if (DIM == 1)
-   {
-      DGMassBasis1D<T_D1D>(e, NE, b_, x_, y_, d1d);
-   }
-   else if (DIM == 2)
+   if (DIM == 2)
   {
      DGMassBasis2D<T_D1D>(e, NE, b_, x_, y_, d1d);
   }
@@ -16,7 +16,9 @@ namespace mfem

 void DofTransformation::TransformPrimal(real_t *v) const
 {
-   if (IsIdentity()) { return; }
+   MFEM_ASSERT(dof_trans_,
+               "DofTransformation has no local transformation, call "
+               "SetDofTransformation first!");
   int size = dof_trans_->Size();

   if (vdim_ == 1 || (Ordering::Type)ordering_ == Ordering::byNODES)
@@ -46,7 +48,9 @@ void DofTransformation::TransformPrimal(real_t *v) const

 void DofTransformation::InvTransformPrimal(real_t *v) const
 {
-   if (IsIdentity()) { return; }
+   MFEM_ASSERT(dof_trans_,
+               "DofTransformation has no local transformation, call "
+               "SetDofTransformation first!");
   int size = dof_trans_->Height();

   if (vdim_ == 1 || (Ordering::Type)ordering_ == Ordering::byNODES)
@@ -76,7 +80,9 @@ void DofTransformation::InvTransformPrimal(real_t *v) const

 void DofTransformation::TransformDual(real_t *v) const
 {
-   if (IsIdentity()) { return; }
+   MFEM_ASSERT(dof_trans_,
+               "DofTransformation has no local transformation, call "
+               "SetDofTransformation first!");
   int size = dof_trans_->Size();

   if (vdim_ == 1 || (Ordering::Type)ordering_ == Ordering::byNODES)
@@ -106,7 +112,9 @@ void DofTransformation::TransformDual(real_t *v) const

 void DofTransformation::InvTransformDual(real_t *v) const
 {
-   if (IsIdentity()) { return; }
+   MFEM_ASSERT(dof_trans_,
+               "DofTransformation has no local transformation, call "
+               "SetDofTransformation first!");
   int size = dof_trans_->Size();

   if (vdim_ == 1 || (Ordering::Type)ordering_ == Ordering::byNODES)
@@ -134,33 +142,33 @@ void DofTransformation::InvTransformDual(real_t *v) const
   }
 }

-void TransformPrimal(const DofTransformation &ran_dof_trans,
-                     const DofTransformation &dom_dof_trans,
+void TransformPrimal(const DofTransformation *ran_dof_trans,
+                     const DofTransformation *dom_dof_trans,
                     DenseMatrix &elmat)
 {
   // No action if both transformations are NULL
-   if (!ran_dof_trans.IsIdentity())
+   if (ran_dof_trans)
   {
-      ran_dof_trans.TransformPrimalCols(elmat);
+      ran_dof_trans->TransformPrimalCols(elmat);
   }
-   if (!dom_dof_trans.IsIdentity())
+   if (dom_dof_trans)
   {
-      dom_dof_trans.TransformDualRows(elmat);
+      dom_dof_trans->TransformDualRows(elmat);
   }
 }

-void TransformDual(const DofTransformation &ran_dof_trans,
-                   const DofTransformation &dom_dof_trans,
+void TransformDual(const DofTransformation *ran_dof_trans,
+                   const DofTransformation *dom_dof_trans,
                   DenseMatrix &elmat)
 {
   // No action if both transformations are NULL
-   if (!ran_dof_trans.IsIdentity())
+   if (ran_dof_trans)
   {
-      ran_dof_trans.TransformDualCols(elmat);
+      ran_dof_trans->TransformDualCols(elmat);
   }
-   if (!dom_dof_trans.IsIdentity())
+   if (dom_dof_trans)
   {
-      dom_dof_trans.TransformDualRows(elmat);
+      dom_dof_trans->TransformDualRows(elmat);
   }
 }

@@ -201,19 +201,19 @@ public:
   inline int NumRows() const { return dof_trans_->NumRows(); }
   inline int Width() const { return dof_trans_->Width(); }
   inline int NumCols() const { return dof_trans_->NumCols(); }
-   inline bool IsIdentity() const { return !dof_trans_ || dof_trans_->IsIdentity(); }
+   inline bool IsIdentity() const { return dof_trans_->IsIdentity(); }

   /** Transform local DoFs to align with the global DoFs. For example, this
       transformation can be used to map the local vector computed by
       FiniteElement::Project() to the transformed vector stored within a
       GridFunction object. */
   void TransformPrimal(real_t *v) const;
-   inline void TransformPrimal(Vector &v) const { TransformPrimal(v.GetData()); }
+   inline void TransformPrimal(Vector &v) const
+   { TransformPrimal(v.GetData()); }

   /// Transform groups of DoFs stored as dense matrices
   inline void TransformPrimalCols(DenseMatrix &V) const
   {
-      if (IsIdentity()) { return; }
      for (int c=0; c<V.Width(); c++)
      {
         TransformPrimal(V.GetColumn(c));
@@ -251,7 +251,6 @@ public:
   /// Transform rows of a dense matrix containing dual DoFs
   inline void TransformDualRows(DenseMatrix &V) const
   {
-      if (IsIdentity()) { return; }
      Vector row;
      for (int r=0; r<V.Height(); r++)
      {
@@ -264,7 +263,6 @@ public:
   /// Transform columns of a dense matrix containing dual DoFs
   inline void TransformDualCols(DenseMatrix &V) const
   {
-      if (IsIdentity()) { return; }
      for (int c=0; c<V.Width(); c++)
      {
         TransformDual(V.GetColumn(c));
@@ -276,16 +274,16 @@ public:
    computed by a DiscreteInterpolator before copying into a
    DiscreteLinearOperator.
 */
-void TransformPrimal(const DofTransformation &ran_dof_trans,
-                     const DofTransformation &dom_dof_trans,
+void TransformPrimal(const DofTransformation *ran_dof_trans,
+                     const DofTransformation *dom_dof_trans,
                     DenseMatrix &elmat);

 /** Transform a matrix of dual DoFs entries from different finite element spaces
    as computed by a BilinearFormIntegrator before summing into a
    MixedBilinearForm object.
 */
-void TransformDual(const DofTransformation &ran_dof_trans,
-                   const DofTransformation &dom_dof_trans,
+void TransformDual(const DofTransformation *ran_dof_trans,
+                   const DofTransformation *dom_dof_trans,
                   DenseMatrix &elmat);

 /** Abstract base class for high-order Nedelec spaces on elements with
@@ -20,16 +20,6 @@ namespace mfem

 using namespace std;

-DofToQuad DofToQuad::Abs() const
-{
-   DofToQuad d2q(*this);
-   d2q.B.Abs();
-   d2q.Bt.Abs();
-   d2q.G.Abs();
-   d2q.Gt.Abs();
-   return d2q;
-}
-
 FiniteElement::FiniteElement(int D, Geometry::Type G,
                             int Do, int O, int F)
   : Nodes(Do)
@@ -219,9 +219,6 @@ public:
       - #ndof x #nqpt, for H(div) vector elements, or
       - #ndof x #nqpt x cdim, for H(curl) vector elements. */
   Array<real_t> Gt;
-
-   /// Returns absolute value of the maps
-   DofToQuad Abs() const;
 };

 /// Describes the function space on each element
@@ -1891,38 +1891,31 @@ L2Pos_PyramidElement::L2Pos_PyramidElement(const int p)

   Index idx;

-   if (p == 0)
-   {
-      dof_map[idx(0,0,0,0,0)] = 0;
-      Nodes.IntPoint(0).Set3(0.375, 0.375, 0.25);
-   }
-   else
-   {
-      for (int o = 0, k = 0; k <= p; k++)
-         for (int j = 0; j + k <= p; j++)
-         {
-            int i1 = p - j - k;
-            int i2 = 0;
-            int i3 = -1;
-            int i4 = j + 1;
-            const int i5 = k;
+   // interior
+   for (int o = 0, k = 0; k <= p; k++)
+      for (int j = 0; j + k <= p; j++)
+      {
+         int i1 = p - j - k;
+         int i2 = 0;
+         int i3 = -1;
+         int i4 = j + 1;
+         const int i5 = k;

-            for (int i = 0; i <= j; i++)
-            {
-               i3++;
-               i4--;
-               dof_map[idx(i1,i2,i3,i4,i5)] = o;
-               Nodes.IntPoint(o++).Set3(real_t(i)/p, real_t(j)/p, 0);
-            }
-            for (int i = j + 1; i + k <= p; i++)
-            {
-               i1--;
-               i2++;
-               dof_map[idx(i1,i2,i3,i4,i5)] = o;
-               Nodes.IntPoint(o++).Set3(real_t(i)/p, real_t(j)/p, 0);
-            }
+         for (int i = 0; i <= j; i++)
+         {
+            i3++;
+            i4--;
+            dof_map[idx(i1,i2,i3,i4,i5)] = o;
+            Nodes.IntPoint(o++).Set3(real_t(i)/p, real_t(j)/p, 0);
         }
-   }
+         for (int i = j + 1; i + k <= p; i++)
+         {
+            i1--;
+            i2++;
+            dof_map[idx(i1,i2,i3,i4,i5)] = o;
+            Nodes.IntPoint(o++).Set3(real_t(i)/p, real_t(j)/p, 0);
+         }
+      }
 }

 // static method
@@ -2204,6 +2197,7 @@ void L2Pos_PyramidElement::CalcDShape(const IntegrationPoint &ip,
      {
         dshape(it.second, d) = m_dshape(it.first, d);
      }
+
 }

 }
@@ -49,9 +49,6 @@
 #include "lor/lor.hpp"
 #include "dgmassinv.hpp"
 #include "hyperbolic.hpp"
-#include "bounds.hpp"
-
-#include "dfem/doperator.hpp"

 #ifdef MFEM_USE_MPI
 #include "pfespace.hpp"
@@ -331,6 +331,7 @@ void FiniteElementSpace::GetElementVDofs(int i, Array<int> &vdofs,
 DofTransformation *
 FiniteElementSpace::GetElementVDofs(int i, Array<int> &vdofs) const
 {
+   DoFTrans.SetDofTransformation(NULL);
   GetElementVDofs(i, vdofs, DoFTrans);
   return DoFTrans.GetDofTransformation() ? &DoFTrans : NULL;
 }
@@ -346,6 +347,7 @@ void FiniteElementSpace::GetBdrElementVDofs(int i, Array<int> &vdofs,
 DofTransformation *
 FiniteElementSpace::GetBdrElementVDofs(int i, Array<int> &vdofs) const
 {
+   DoFTrans.SetDofTransformation(NULL);
   GetBdrElementVDofs(i, vdofs, DoFTrans);
   return DoFTrans.GetDofTransformation() ? &DoFTrans : NULL;
 }
@@ -1934,7 +1936,6 @@ void FiniteElementSpace::RefinementOperator::Mult(const Vector &x,

   DenseMatrix eP;
   IsoparametricTransformation isotr;
-   DofTransformation doftrans;

   for (int k = 0; k < mesh_ref->GetNE(); k++)
   {
@@ -1955,10 +1956,10 @@ void FiniteElementSpace::RefinementOperator::Mult(const Vector &x,

      subY.SetSize(lP.Height());

-      fespace->GetElementDofs(k, dofs, doftrans);
+      DofTransformation *doftrans = fespace->GetElementDofs(k, dofs);
      old_elem_dof->GetRow(emb.parent, old_dofs);

-      if (doftrans.IsIdentity())
+      if (!doftrans)
      {
         for (int vd = 0; vd < rvdim; vd++)
         {
@@ -1978,7 +1979,7 @@ void FiniteElementSpace::RefinementOperator::Mult(const Vector &x,
         old_DoFTrans.SetDofTransformation(*old_DoFTransArray[geom]);
         old_DoFTrans.SetFaceOrientations(old_Fo);

-         doftrans.SetVDim();
+         doftrans->SetVDim();
         for (int vd = 0; vd < rvdim; vd++)
         {
            dofs.Copy(vdofs);
@@ -1989,10 +1990,10 @@ void FiniteElementSpace::RefinementOperator::Mult(const Vector &x,
            x.GetSubVector(old_vdofs, subX);
            old_DoFTrans.InvTransformPrimal(subX);
            lP.Mult(subX, subY);
-            doftrans.TransformPrimal(subY);
+            doftrans->TransformPrimal(subY);
            y.SetSubVector(vdofs, subY);
         }
-         doftrans.SetVDim(rvdim, fespace->GetOrdering());
+         doftrans->SetVDim(rvdim, fespace->GetOrdering());
      }
   }
 }
@@ -2019,7 +2020,6 @@ void FiniteElementSpace::RefinementOperator::MultTranspose(const Vector &x,
   DenseMatrix eP;
   IsoparametricTransformation isotr;
   const FiniteElement *fe = nullptr;
-   DofTransformation doftrans;

   for (int k = 0; k < mesh_ref->GetNE(); k++)
   {
@@ -2040,10 +2040,10 @@ void FiniteElementSpace::RefinementOperator::MultTranspose(const Vector &x,
      const DenseMatrix &lP = (fespace->IsVariableOrder()) ? eP : localP[geom](
                                 emb.matrix);

-      fespace->GetElementDofs(k, f_dofs, doftrans);
+      DofTransformation *doftrans = fespace->GetElementDofs(k, f_dofs);
      old_elem_dof->GetRow(emb.parent, c_dofs);

-      if (doftrans.IsIdentity())
+      if (!doftrans)
      {
         subY.SetSize(lP.Width());

@@ -2074,7 +2074,7 @@ void FiniteElementSpace::RefinementOperator::MultTranspose(const Vector &x,
         old_DoFTrans.SetDofTransformation(*old_DoFTransArray[geom]);
         old_DoFTrans.SetFaceOrientations(old_Fo);

-         doftrans.SetVDim();
+         doftrans->SetVDim();
         for (int vd = 0; vd < rvdim; vd++)
         {
            f_dofs.Copy(f_vdofs);
@@ -2083,7 +2083,7 @@ void FiniteElementSpace::RefinementOperator::MultTranspose(const Vector &x,
            fespace->DofsToVDofs(vd, c_vdofs, old_ndofs);

            x.GetSubVector(f_vdofs, subX);
-            doftrans.InvTransformDual(subX);
+            doftrans->InvTransformDual(subX);
            for (int p = 0; p < f_dofs.Size(); ++p)
            {
               if (processed[DecodeDof(f_dofs[p])])
@@ -2095,7 +2095,7 @@ void FiniteElementSpace::RefinementOperator::MultTranspose(const Vector &x,
            old_DoFTrans.TransformDual(subYt);
            y.AddElementVector(c_vdofs, subYt);
         }
-         doftrans.SetVDim(rvdim, fespace->GetOrdering());
+         doftrans->SetVDim(rvdim, fespace->GetOrdering());
      }

      for (int p = 0; p < f_dofs.Size(); ++p)
@@ -3407,8 +3407,6 @@ void FiniteElementSpace::GetElementDofs(int elem, Array<int> &dofs,
 {
   MFEM_VERIFY(!orders_changed, msg_orders_changed);

-   doftrans.SetDofTransformation(nullptr);
-
   if (elem_dof)
   {
      elem_dof->GetRow(elem, dofs);
@@ -3515,6 +3513,7 @@ void FiniteElementSpace::GetElementDofs(int elem, Array<int> &dofs,
 DofTransformation *FiniteElementSpace::GetElementDofs(int elem,
                                                      Array<int> &dofs) const
 {
+   DoFTrans.SetDofTransformation(NULL);
   GetElementDofs(elem, dofs, DoFTrans);
   return DoFTrans.GetDofTransformation() ? &DoFTrans : NULL;
 }
@@ -3524,8 +3523,6 @@ void FiniteElementSpace::GetBdrElementDofs(int bel, Array<int> &dofs,
 {
   MFEM_VERIFY(!orders_changed, msg_orders_changed);

-   doftrans.SetDofTransformation(nullptr);
-
   if (bdr_elem_dof)
   {
      bdr_elem_dof->GetRow(bel, dofs);
@@ -3620,6 +3617,7 @@ void FiniteElementSpace::GetBdrElementDofs(int bel, Array<int> &dofs,
 DofTransformation *FiniteElementSpace::GetBdrElementDofs(int bel,
                                                         Array<int> &dofs) const
 {
+   DoFTrans.SetDofTransformation(NULL);
   GetBdrElementDofs(bel, dofs, DoFTrans);
   return DoFTrans.GetDofTransformation() ? &DoFTrans : NULL;
 }
@@ -4278,6 +4276,9 @@ void FiniteElementSpace::Update(bool want_transform)
 void FiniteElementSpace::PRefineAndUpdate(const Array<pRefinement> & refs,
                                          bool want_transfer)
 {
+   MFEM_VERIFY(PRefinementSupported(),
+               "p-refinement is not supported in this space");
+
   if (want_transfer)
   {
      fesPrev.reset(new FiniteElementSpace(mesh, fec, vdim, ordering));
@@ -946,8 +946,8 @@ public:
   /// could be used to produce the appropriate offsets from these local dofs.
   ///@{

-   /// @brief Returns indices of degrees of freedom of element 'elem'. The
-   /// returned indices are offsets into an @ref ldof vector. See also
+   /// @brief Returns indices of degrees of freedom of element 'elem'.
+   /// The returned indices are offsets into an @ref ldof vector. See also
   /// GetElementVDofs().
   ///
   /// @note In many cases the returned DofTransformation object will be NULL.
@@ -957,18 +957,15 @@ public:
   /// needed for Nedelec basis functions of order 2 and above on 3D elements
   /// with triangular faces.
   ///
-   /// @deprecated Use of the returned object is deprecated. The returned object
-   /// should @b not be deleted by the caller. If the DofTransformation is
-   /// needed, use GetElementDofs(int, Array<int> &, DofTransformation &)
-   /// instead.
+   /// @note The returned object should NOT be deleted by the caller.
   DofTransformation *GetElementDofs(int elem, Array<int> &dofs) const;

-   /// @brief The same as GetElementDofs(), but with a user-provided
-   /// DofTransformation object.
-   ///
-   /// The user can use DofTransformation::IsIdentity on the returned @a
-   /// doftrans object to determine if the DofTransformation needs to actually
-   /// be used.
+   /// @brief The same as GetElementDofs(), but with a user-allocated
+   /// DofTransformation object. @a doftrans must be allocated in advance and
+   /// will be owned by the caller. The user can use the
+   /// DofTransformation::GetDofTransformation method on the returned
+   /// @a doftrans object to detect if the DofTransformation should actually be
+   /// used.
   virtual void GetElementDofs(int elem, Array<int> &dofs,
                               DofTransformation &doftrans) const;

@@ -983,18 +980,15 @@ public:
   /// needed for Nedelec basis functions of order 2 and above on 3D elements
   /// with triangular faces.
   ///
-   /// @deprecated Use of the returned object is deprecated. The returned object
-   /// should @b not be deleted by the caller. If the DofTransformation is
-   /// needed, use GetBdrElementDofs(int, Array<int> &, DofTransformation &)
-   /// instead.
+   /// @note The returned object should NOT be deleted by the caller.
   DofTransformation *GetBdrElementDofs(int bel, Array<int> &dofs) const;

-   /// @brief The same as GetBdrElementDofs(), but with a user-provided
-   /// DofTransformation object.
-   ///
-   /// The user can use DofTransformation::IsIdentity on the returned @a
-   /// doftrans object to determine if the DofTransformation needs to actually
-   /// be used.
+   /// @brief The same as GetBdrElementDofs(), but with a user-allocated
+   /// DofTransformation object. @a doftrans must be allocated in advance and
+   /// will be owned by the caller. The user can use the
+   /// DofTransformation::GetDofTransformation method on the returned
+   /// @a doftrans object to detect if the DofTransformation should actually be
+   /// used.
   virtual void GetBdrElementDofs(int bel, Array<int> &dofs,
                                  DofTransformation &doftrans) const;

@@ -1198,18 +1192,15 @@ public:
   /// needed for Nedelec basis functions of order 2 and above on 3D elements
   /// with triangular faces.
   ///
-   /// @deprecated Use of the returned object is deprecated. The returned object
-   /// should @b not be deleted by the caller. If the DofTransformation is
-   /// needed, use GetElementVDofs(int, Array<int> &, DofTransformation &)
-   /// instead.
+   /// @note The returned object should NOT be deleted by the caller.
   DofTransformation *GetElementVDofs(int i, Array<int> &vdofs) const;

-   /// @brief The same as GetElementVDofs(), but with a user-provided
-   /// DofTransformation object.
-   ///
-   /// The user can use DofTransformation::IsIdentity on the returned @a
-   /// doftrans object to determine if the DofTransformation needs to actually
-   /// be used.
+   /// @brief The same as GetElementVDofs(), but with a user-allocated
+   /// DofTransformation object. @a doftrans must be allocated in advance and
+   /// will be owned by the caller. The user can use the
+   /// DofTransformation::GetDofTransformation method on the returned
+   /// @a doftrans object to detect if the DofTransformation should actually be
+   /// used.
   void GetElementVDofs(int i, Array<int> &vdofs,
                        DofTransformation &doftrans) const;

@@ -1225,18 +1216,15 @@ public:
   /// needed for Nedelec basis functions of order 2 and above on 3D elements
   /// with triangular faces.
   ///
-   /// @deprecated Use of the returned object is deprecated. The returned object
-   /// should @b not be deleted by the caller. If the DofTransformation is
-   /// needed, use GetBdrElementVDofs(int, Array<int> &, DofTransformation &)
-   /// instead.
+   /// @note The returned object should NOT be deleted by the caller.
   DofTransformation *GetBdrElementVDofs(int i, Array<int> &vdofs) const;

-   /// @brief The same as GetBdrElementVDofs(), but with a user-provided
-   /// DofTransformation object.
-   ///
-   /// The user can use DofTransformation::IsIdentity on the returned @a
-   /// doftrans object to determine if the DofTransformation needs to actually
-   /// be used.
+   /// @brief The same as GetBdrElementVDofs(), but with a user-allocated
+   /// DofTransformation object. @a doftrans must be allocated in advance and
+   /// will be owned by the caller. The user can use the
+   /// DofTransformation::GetDofTransformation method on the returned
+   /// @a doftrans object to detect if the DofTransformation should actually be
+   /// used.
   void GetBdrElementVDofs(int i, Array<int> &vdofs,
                           DofTransformation &doftrans) const;

@@ -17,7 +17,6 @@
 #include "quadinterpolator.hpp"
 #include "transfer.hpp"
 #include "../mesh/nurbs.hpp"
-#include "../mesh/vtkhdf.hpp"
 #include "../general/text.hpp"

 #ifdef MFEM_USE_MPI
@@ -288,6 +287,8 @@ void GridFunction::SumFluxAndCount(BilinearFormIntegrator &blfi,
   GridFunction &u = *this;

   ElementTransformation *Transf;
+   DofTransformation *udoftrans;
+   DofTransformation *fdoftrans;

   FiniteElementSpace *ufes = u.FESpace();
   FiniteElementSpace *ffes = flux.FESpace();
@@ -300,7 +301,6 @@ void GridFunction::SumFluxAndCount(BilinearFormIntegrator &blfi,
   flux = 0.0;
   count = 0;

-   DofTransformation udoftrans, fdoftrans;
   for (int i = 0; i < nfe; i++)
   {
      if (subdomain >= 0 && ufes->GetAttribute(i) != subdomain)
@@ -308,17 +308,23 @@ void GridFunction::SumFluxAndCount(BilinearFormIntegrator &blfi,
         continue;
      }

-      ufes->GetElementVDofs(i, udofs, udoftrans);
-      ffes->GetElementVDofs(i, fdofs, fdoftrans);
+      udoftrans = ufes->GetElementVDofs(i, udofs);
+      fdoftrans = ffes->GetElementVDofs(i, fdofs);

      u.GetSubVector(udofs, ul);
-      udoftrans.InvTransformPrimal(ul);
+      if (udoftrans)
+      {
+         udoftrans->InvTransformPrimal(ul);
+      }

      Transf = ufes->GetElementTransformation(i);
      blfi.ComputeElementFlux(*ufes->GetFE(i), *Transf, ul,
                              *ffes->GetFE(i), fl, wcoef);

-      fdoftrans.TransformPrimal(fl);
+      if (fdoftrans)
+      {
+         fdoftrans->TransformPrimal(fl);
+      }
      flux.AddElementVector(fdofs, fl);

      FiniteElementSpace::AdjustVDofs(fdofs);
@@ -346,23 +352,12 @@ 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());
+   return fes->GetVectorDim();
 }

 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();
+   return fes->GetCurlDim();
 }

 void GridFunction::GetTrueDofs(Vector &tv) const
@@ -398,8 +393,7 @@ void GridFunction::GetNodalValues(int i, Array<real_t> &nval, int vdim) const
 {
   Array<int> vdofs;

-   DofTransformation doftrans;
-   fes->GetElementVDofs(i, vdofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementVDofs(i, vdofs);
   const FiniteElement *FElem = fes->GetFE(i);
   const IntegrationRule *ElemVert =
      Geometries.GetVertices(FElem->GetGeomType());
@@ -409,7 +403,10 @@ void GridFunction::GetNodalValues(int i, Array<real_t> &nval, int vdim) const
   vdim--;
   Vector loc_data;
   GetSubVector(vdofs, loc_data);
-   doftrans.InvTransformPrimal(loc_data);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(loc_data);
+   }

   if (FElem->GetRangeType() == FiniteElement::SCALAR)
   {
@@ -450,8 +447,7 @@ real_t GridFunction::GetValue(int i, const IntegrationPoint &ip, int vdim)
 const
 {
   Array<int> dofs;
-   DofTransformation doftrans;
-   fes->GetElementDofs(i, dofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementDofs(i, dofs);
   fes->DofsToVDofs(vdim-1, dofs);
   Vector DofVal(dofs.Size()), LocVec;
   const FiniteElement *fe = fes->GetFE(i);
@@ -466,7 +462,10 @@ const
      fe->CalcPhysShape(*Tr, DofVal);
   }
   GetSubVector(dofs, LocVec);
-   doftrans.InvTransformPrimal(LocVec);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(LocVec);
+   }

   return (DofVal * LocVec);
 }
@@ -477,11 +476,13 @@ void GridFunction::GetVectorValue(int i, const IntegrationPoint &ip,
   const FiniteElement *FElem = fes->GetFE(i);
   int dof = FElem->GetDof();
   Array<int> vdofs;
-   DofTransformation doftrans;
-   fes->GetElementVDofs(i, vdofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementVDofs(i, vdofs);
   Vector loc_data;
   GetSubVector(vdofs, loc_data);
-   doftrans.InvTransformPrimal(loc_data);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(loc_data);
+   }
   if (FElem->GetRangeType() == FiniteElement::SCALAR)
   {
      Vector shape(dof);
@@ -515,19 +516,22 @@ void GridFunction::GetVectorValue(int i, const IntegrationPoint &ip,
 }

 void GridFunction::GetValues(int i, const IntegrationRule &ir, Vector &vals,
-                             int vdim) const
+                             int vdim)
+const
 {
   Array<int> dofs;
   int n = ir.GetNPoints();
   vals.SetSize(n);
-   DofTransformation doftrans;
-   fes->GetElementDofs(i, dofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementDofs(i, dofs);
   fes->DofsToVDofs(vdim-1, dofs);
   const FiniteElement *FElem = fes->GetFE(i);
   int dof = FElem->GetDof();
   Vector DofVal(dof), loc_data(dof);
   GetSubVector(dofs, loc_data);
-   doftrans.InvTransformPrimal(loc_data);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(loc_data);
+   }
   if (FElem->GetMapType() == FiniteElement::VALUE)
   {
      for (int k = 0; k < n; k++)
@@ -860,12 +864,12 @@ void GridFunction::GetVectorValue(ElementTransformation &T,

   Array<int> vdofs;
   const FiniteElement *fe = NULL;
-   DofTransformation doftrans;
+   DofTransformation * doftrans = NULL;

   switch (T.ElementType)
   {
      case ElementTransformation::ELEMENT:
-         fes->GetElementVDofs(T.ElementNo, vdofs, doftrans);
+         doftrans = fes->GetElementVDofs(T.ElementNo, vdofs);
         fe = fes->GetFE(T.ElementNo);
         break;
      case ElementTransformation::EDGE:
@@ -955,7 +959,10 @@ void GridFunction::GetVectorValue(ElementTransformation &T,
   int dof = fe->GetDof();
   Vector loc_data;
   GetSubVector(vdofs, loc_data);
-   doftrans.InvTransformPrimal(loc_data);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(loc_data);
+   }
   if (fe->GetRangeType() == FiniteElement::SCALAR)
   {
      Vector shape(dof);
@@ -999,11 +1006,13 @@ void GridFunction::GetVectorValues(ElementTransformation &T,
   int dof = FElem->GetDof();

   Array<int> vdofs;
-   DofTransformation doftrans;
-   fes->GetElementVDofs(T.ElementNo, vdofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementVDofs(T.ElementNo, vdofs);
   Vector loc_data;
   GetSubVector(vdofs, loc_data);
-   doftrans.InvTransformPrimal(loc_data);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(loc_data);
+   }

   int nip = ir.GetNPoints();

@@ -1094,19 +1103,23 @@ void GridFunction::GetValuesFrom(const GridFunction &orig_func)
   // Without averaging ...

   const FiniteElementSpace *orig_fes = orig_func.FESpace();
+   DofTransformation * doftrans;
+   DofTransformation * orig_doftrans;
   Array<int> vdofs, orig_vdofs;
   Vector shape, loc_values, orig_loc_values;
   int i, j, d, ne, dof, odof, vdim;

   ne = fes->GetNE();
   vdim = fes->GetVDim();
-   DofTransformation doftrans, orig_doftrans;
   for (i = 0; i < ne; i++)
   {
-      fes->GetElementVDofs(i, vdofs, doftrans);
-      orig_fes->GetElementVDofs(i, orig_vdofs, orig_doftrans);
+      doftrans = fes->GetElementVDofs(i, vdofs);
+      orig_doftrans = orig_fes->GetElementVDofs(i, orig_vdofs);
      orig_func.GetSubVector(orig_vdofs, orig_loc_values);
-      orig_doftrans.InvTransformPrimal(orig_loc_values);
+      if (orig_doftrans)
+      {
+         orig_doftrans->InvTransformPrimal(orig_loc_values);
+      }
      const FiniteElement *fe = fes->GetFE(i);
      const FiniteElement *orig_fe = orig_fes->GetFE(i);
      dof = fe->GetDof();
@@ -1123,7 +1136,10 @@ void GridFunction::GetValuesFrom(const GridFunction &orig_func)
            loc_values(d*dof+j) = shape * (&orig_loc_values[d * odof]);
         }
      }
-      doftrans.TransformPrimal(loc_values);
+      if (doftrans)
+      {
+         doftrans->TransformPrimal(loc_values);
+      }
      SetSubVector(vdofs, loc_values);
   }
 }
@@ -1133,6 +1149,8 @@ void GridFunction::GetBdrValuesFrom(const GridFunction &orig_func)
   // Without averaging ...

   const FiniteElementSpace *orig_fes = orig_func.FESpace();
+   // DofTransformation * doftrans;
+   // DofTransformation * orig_doftrans;
   Array<int> vdofs, orig_vdofs;
   Vector shape, loc_values, loc_values_t, orig_loc_values, orig_loc_values_t;
   int i, j, d, nbe, dof, odof, vdim;
@@ -1172,8 +1190,7 @@ void GridFunction::GetVectorFieldValues(
   ElementTransformation *transf;

   const int n = ir.GetNPoints();
-   DofTransformation doftrans;
-   fes->GetElementVDofs(i, vdofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementVDofs(i, vdofs);
   const FiniteElement *fe = fes->GetFE(i);
   const int dof = fe->GetDof();
   const int sdim = fes->GetMesh()->SpaceDimension();
@@ -1185,7 +1202,10 @@ void GridFunction::GetVectorFieldValues(
   DenseMatrix vshape(dof, vdim);
   Vector loc_data, val(vdim);
   GetSubVector(vdofs, loc_data);
-   doftrans.InvTransformPrimal(loc_data);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(loc_data);
+   }
   for (int k = 0; k < n; k++)
   {
      const IntegrationPoint &ip = ir.IntPoint(k);
@@ -1376,7 +1396,6 @@ void GridFunction::GetVectorGradientHat(

 real_t GridFunction::GetDivergence(ElementTransformation &T) const
 {
-   DofTransformation doftrans;
   switch (T.ElementType)
   {
      case ElementTransformation::ELEMENT:
@@ -1404,10 +1423,13 @@ real_t GridFunction::GetDivergence(ElementTransformation &T) const
         {
            // Assuming RT-type space
            Array<int> dofs;
-            fes->GetElementDofs(elNo, dofs, doftrans);
+            DofTransformation * doftrans = fes->GetElementDofs(elNo, dofs);
            Vector loc_data, divshape(fe->GetDof());
            GetSubVector(dofs, loc_data);
-            doftrans.InvTransformPrimal(loc_data);
+            if (doftrans)
+            {
+               doftrans->InvTransformPrimal(loc_data);
+            }
            fe->CalcDivShape(T.GetIntPoint(), divshape);
            return (loc_data * divshape) / T.Weight();
         }
@@ -1460,7 +1482,6 @@ real_t GridFunction::GetDivergence(ElementTransformation &T) const

 void GridFunction::GetCurl(ElementTransformation &T, Vector &curl) const
 {
-   DofTransformation doftrans;
   switch (T.ElementType)
   {
      case ElementTransformation::ELEMENT:
@@ -1495,10 +1516,13 @@ void GridFunction::GetCurl(ElementTransformation &T, Vector &curl) const
         {
            // Assuming ND-type space
            Array<int> dofs;
-            fes->GetElementDofs(elNo, dofs, doftrans);
+            DofTransformation * doftrans = fes->GetElementDofs(elNo, dofs);
            Vector loc_data;
            GetSubVector(dofs, loc_data);
-            doftrans.InvTransformPrimal(loc_data);
+            if (doftrans)
+            {
+               doftrans->InvTransformPrimal(loc_data);
+            }
            DenseMatrix curl_shape(fe->GetDof(), fe->GetCurlDim());
            curl.SetSize(curl_shape.Width());
            fe->CalcPhysCurlShape(T, curl_shape);
@@ -1699,10 +1723,11 @@ void GridFunction::GetElementAverages(GridFunction &avgs) const
 {
   MassIntegrator Mi;
   DenseMatrix loc_mass;
+   DofTransformation * te_doftrans;
+   DofTransformation * tr_doftrans;
   Array<int> te_dofs, tr_dofs;
   Vector loc_avgs, loc_this;
   Vector int_psi(avgs.Size());
-   DofTransformation tr_doftrans, te_doftrans;

   avgs = 0.0;
   int_psi = 0.0;
@@ -1710,13 +1735,19 @@ void GridFunction::GetElementAverages(GridFunction &avgs) const
   {
      Mi.AssembleElementMatrix2(*fes->GetFE(i), *avgs.FESpace()->GetFE(i),
                                *fes->GetElementTransformation(i), loc_mass);
-      fes->GetElementDofs(i, tr_dofs, tr_doftrans);
-      avgs.FESpace()->GetElementDofs(i, te_dofs, te_doftrans);
+      tr_doftrans = fes->GetElementDofs(i, tr_dofs);
+      te_doftrans = avgs.FESpace()->GetElementDofs(i, te_dofs);
      GetSubVector(tr_dofs, loc_this);
-      tr_doftrans.InvTransformPrimal(loc_this);
+      if (tr_doftrans)
+      {
+         tr_doftrans->InvTransformPrimal(loc_this);
+      }
      loc_avgs.SetSize(te_dofs.Size());
      loc_mass.Mult(loc_this, loc_avgs);
-      te_doftrans.TransformPrimal(loc_avgs);
+      if (te_doftrans)
+      {
+         te_doftrans->TransformPrimal(loc_avgs);
+      }
      avgs.AddElementVector(te_dofs, loc_avgs);
      loc_this = 1.0; // assume the local basis for 'this' sums to 1
      loc_mass.Mult(loc_this, loc_avgs);
@@ -1731,10 +1762,12 @@ void GridFunction::GetElementAverages(GridFunction &avgs) const
 void GridFunction::GetElementDofValues(int el, Vector &dof_vals) const
 {
   Array<int> dof_idx;
-   DofTransformation doftrans;
-   fes->GetElementVDofs(el, dof_idx, doftrans);
+   DofTransformation * doftrans = fes->GetElementVDofs(el, dof_idx);
   GetSubVector(dof_idx, dof_vals);
-   doftrans.InvTransformPrimal(dof_vals);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(dof_vals);
+   }
 }

 void GridFunction::ProjectGridFunction(const GridFunction &src)
@@ -1759,7 +1792,6 @@ void GridFunction::ProjectGridFunction(const GridFunction &src)
   Array<int> src_vdofs, dest_vdofs;
   Vector src_lvec, dest_lvec(vdim*P.Height());

-   DofTransformation src_doftrans, doftrans;
   for (int i = 0; i < mesh->GetNE(); i++)
   {
      // Assuming the projection matrix P depends only on the element geometry
@@ -1771,15 +1803,21 @@ void GridFunction::ProjectGridFunction(const GridFunction &src)
         cached_geom = geom;
      }

-      src.fes->GetElementVDofs(i, src_vdofs, src_doftrans);
+      DofTransformation * src_doftrans = src.fes->GetElementVDofs(i, src_vdofs);
      src.GetSubVector(src_vdofs, src_lvec);
-      src_doftrans.InvTransformPrimal(src_lvec);
+      if (src_doftrans)
+      {
+         src_doftrans->InvTransformPrimal(src_lvec);
+      }
      for (int vd = 0; vd < vdim; vd++)
      {
         P.Mult(&src_lvec[vd*P.Width()], &dest_lvec[vd*P.Height()]);
      }
-      fes->GetElementVDofs(i, dest_vdofs, doftrans);
-      doftrans.TransformPrimal(dest_lvec);
+      DofTransformation * doftrans = fes->GetElementVDofs(i, dest_vdofs);
+      if (doftrans)
+      {
+         doftrans->TransformPrimal(dest_lvec);
+      }
      SetSubVector(dest_vdofs, dest_lvec);
   }
 }
@@ -1788,13 +1826,15 @@ void GridFunction::ImposeBounds(int i, const Vector &weights,
                                const Vector &lo_, const Vector &hi_)
 {
   Array<int> vdofs;
-   DofTransformation doftrans;
-   fes->GetElementVDofs(i, vdofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementVDofs(i, vdofs);
   int size = vdofs.Size();
   Vector vals, new_vals(size);

   GetSubVector(vdofs, vals);
-   doftrans.InvTransformPrimal(vals);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(vals);
+   }

   MFEM_ASSERT(weights.Size() == size, "Different # of weights and dofs.");
   MFEM_ASSERT(lo_.Size() == size, "Different # of lower bounds and dofs.");
@@ -1811,7 +1851,10 @@ void GridFunction::ImposeBounds(int i, const Vector &weights,
   slbqp.SetPrintLevel(0); // print messages only if not converged
   slbqp.Mult(vals, new_vals);

-   doftrans.TransformPrimal(new_vals);
+   if (doftrans)
+   {
+      doftrans->TransformPrimal(new_vals);
+   }
   SetSubVector(vdofs, new_vals);
 }

@@ -1819,12 +1862,14 @@ void GridFunction::ImposeBounds(int i, const Vector &weights,
                                real_t min_, real_t max_)
 {
   Array<int> vdofs;
-   DofTransformation doftrans;
-   fes->GetElementVDofs(i, vdofs, doftrans);
+   DofTransformation * doftrans = fes->GetElementVDofs(i, vdofs);
   int size = vdofs.Size();
   Vector vals, new_vals(size);
   GetSubVector(vdofs, vals);
-   doftrans.InvTransformPrimal(vals);
+   if (doftrans)
+   {
+      doftrans->InvTransformPrimal(vals);
+   }

   real_t max_val = vals.Max();
   real_t min_val = vals.Min();
@@ -1832,7 +1877,10 @@ void GridFunction::ImposeBounds(int i, const Vector &weights,
   if (max_val <= min_)
   {
      new_vals = min_;
-      doftrans.TransformPrimal(new_vals);
+      if (doftrans)
+      {
+         doftrans->TransformPrimal(new_vals);
+      }
      SetSubVector(vdofs, new_vals);
      return;
   }
@@ -1864,6 +1912,7 @@ void GridFunction::RestrictConforming()

 void GridFunction::GetNodalValues(Vector &nval, int vdim) const
 {
+   int i, j;
   Array<int> vertices;
   Array<real_t> values;
   Array<int> overlap(fes->GetNV());
@@ -1871,17 +1920,17 @@ void GridFunction::GetNodalValues(Vector &nval, int vdim) const
   nval = 0.0;
   overlap = 0;
   nval.HostReadWrite();
-   for (int i = 0; i < fes->GetNE(); i++)
+   for (i = 0; i < fes->GetNE(); i++)
   {
      fes->GetElementVertices(i, vertices);
      GetNodalValues(i, values, vdim);
-      for (int j = 0; j < vertices.Size(); j++)
+      for (j = 0; j < vertices.Size(); j++)
      {
         nval(vertices[j]) += values[j];
         overlap[vertices[j]]++;
      }
   }
-   for (int i = 0; i < overlap.Size(); i++)
+   for (i = 0; i < overlap.Size(); i++)
   {
      nval(i) /= overlap[i];
   }
@@ -2161,7 +2210,6 @@ void GridFunction::AccumulateAndCountBdrTangentValues(
   ElementTransformation *T;
   Array<int> dofs;
   Vector lvec;
-   DofTransformation dof_tr;

   values_counter.SetSize(Size());
   values_counter = 0;
@@ -2176,10 +2224,10 @@ void GridFunction::AccumulateAndCountBdrTangentValues(
      }
      fe = fes->GetBE(i);
      T = fes->GetBdrElementTransformation(i);
-      fes->GetBdrElementDofs(i, dofs, dof_tr);
+      DofTransformation *dof_tr = fes->GetBdrElementDofs(i, dofs);
      lvec.SetSize(fe->GetDof());
      fe->Project(vcoeff, *T, lvec);
-      dof_tr.TransformPrimal(lvec);
+      if (dof_tr) { dof_tr->TransformPrimal(lvec); }
      accumulate_dofs(dofs, lvec, *this, values_counter);
   }

@@ -2284,8 +2332,6 @@ void GridFunction::ProjectDeltaCoefficient(DeltaCoefficient &delta_coeff,
   DenseMatrix loc_mass;
   Array<int> vdofs, vertices;
   Vector vals, loc_mass_vals;
-   DofTransformation doftrans;
-
   for (int i = 0; i < mesh->GetNE(); i++)
   {
      mesh->GetElementVertices(i, vertices);
@@ -2297,8 +2343,11 @@ void GridFunction::ProjectDeltaCoefficient(DeltaCoefficient &delta_coeff,
                                     loc_mass);
            vals.SetSize(fe->GetDof());
            fe->ProjectDelta(j, vals);
-            fes->GetElementVDofs(i, vdofs, doftrans);
-            doftrans.TransformPrimal(vals);
+            const DofTransformation* const doftrans = fes->GetElementVDofs(i, vdofs);
+            if (doftrans)
+            {
+               doftrans->TransformPrimal(vals);
+            }
            SetSubVector(vdofs, vals);
            loc_mass_vals.SetSize(vals.Size());
            loc_mass.Mult(vals, loc_mass_vals);
@@ -2311,7 +2360,7 @@ void GridFunction::ProjectDeltaCoefficient(DeltaCoefficient &delta_coeff,
 void GridFunction::ProjectCoefficient(Coefficient &coeff)
 {
   DeltaCoefficient *delta_c = dynamic_cast<DeltaCoefficient *>(&coeff);
-   DofTransformation doftrans;
+   DofTransformation * doftrans = NULL;

   if (delta_c == NULL)
   {
@@ -2322,10 +2371,13 @@ void GridFunction::ProjectCoefficient(Coefficient &coeff)

         for (int i = 0; i < fes->GetNE(); i++)
         {
-            fes->GetElementVDofs(i, vdofs, doftrans);
+            doftrans = fes->GetElementVDofs(i, vdofs);
            vals.SetSize(vdofs.Size());
            fes->GetFE(i)->Project(coeff, *fes->GetElementTransformation(i), vals);
-            doftrans.TransformPrimal(vals);
+            if (doftrans)
+            {
+               doftrans->TransformPrimal(vals);
+            }
            SetSubVector(vdofs, vals);
         }
      }
@@ -2392,19 +2444,23 @@ void GridFunction::ProjectCoefficient(

 void GridFunction::ProjectCoefficient(VectorCoefficient &vcoeff)
 {
-   DofTransformation doftrans;
   if (fes->GetNURBSext() == NULL)
   {
      int i;
      Array<int> vdofs;
      Vector vals;

+      DofTransformation * doftrans = NULL;
+
      for (i = 0; i < fes->GetNE(); i++)
      {
-         fes->GetElementVDofs(i, vdofs, doftrans);
+         doftrans = fes->GetElementVDofs(i, vdofs);
         vals.SetSize(vdofs.Size());
         fes->GetFE(i)->Project(vcoeff, *fes->GetElementTransformation(i), vals);
-         doftrans.TransformPrimal(vals);
+         if (doftrans)
+         {
+            doftrans->TransformPrimal(vals);
+         }
         SetSubVector(vdofs, vals);
      }
   }
@@ -2471,7 +2527,8 @@ void GridFunction::ProjectCoefficient(VectorCoefficient &vcoeff, int attribute)
   int i;
   Array<int> vdofs;
   Vector vals;
-   DofTransformation doftrans;
+
+   DofTransformation * doftrans = NULL;

   for (i = 0; i < fes->GetNE(); i++)
   {
@@ -2480,10 +2537,13 @@ void GridFunction::ProjectCoefficient(VectorCoefficient &vcoeff, int attribute)
         continue;
      }

-      fes->GetElementVDofs(i, vdofs, doftrans);
+      doftrans = fes->GetElementVDofs(i, vdofs);
      vals.SetSize(vdofs.Size());
      fes->GetFE(i)->Project(vcoeff, *fes->GetElementTransformation(i), vals);
-      doftrans.TransformPrimal(vals);
+      if (doftrans)
+      {
+         doftrans->TransformPrimal(vals);
+      }
      SetSubVector(vdofs, vals);
   }
 }
@@ -2494,6 +2554,7 @@ void GridFunction::ProjectCoefficient(Coefficient *coeff[])
   real_t val;
   const FiniteElement *fe;
   ElementTransformation *transf;
+   // DofTransformation * doftrans;
   Array<int> vdofs;

   vdim = fes->GetVDim();
@@ -2676,7 +2737,6 @@ void GridFunction::ProjectBdrCoefficientNormal(
   Array<int> dofs;
   int dim = vcoeff.GetVDim();
   Vector vc(dim), nor(dim), lvec;
-   DofTransformation doftrans;

   for (int i = 0; i < fes->GetNBE(); i++)
   {
@@ -2696,8 +2756,11 @@ void GridFunction::ProjectBdrCoefficientNormal(
         CalcOrtho(T->Jacobian(), nor);
         lvec(j) = (vc * nor);
      }
-      fes->GetBdrElementDofs(i, dofs, doftrans);
-      doftrans.TransformPrimal(lvec);
+      const DofTransformation* const doftrans = fes->GetBdrElementDofs(i, dofs);
+      if (doftrans)
+      {
+         doftrans->TransformPrimal(lvec);
+      }
      SetSubVector(dofs, lvec);
   }
 #endif
@@ -3753,32 +3816,6 @@ void GridFunction::SaveVTK(std::ostream &os, const std::string &field_name,
   os.flush();
 }

-#ifdef MFEM_USE_HDF5
-
-void GridFunction::SaveVTKHDF(const std::string &fname, const std::string &name,
-                              bool high_order, int ref)
-{
-   if (ref == -1) { ref = high_order ? fes->GetMaxElementOrder() : 1; }
-#ifdef MFEM_USE_MPI
-   if (ParFiniteElementSpace* pfes = dynamic_cast<ParFiniteElementSpace*>(fes))
-   {
-#ifdef MFEM_PARALLEL_HDF5
-      VTKHDF vtkhdf(fname, pfes->GetComm());
-      vtkhdf.SaveMesh(*fes->GetMesh(), high_order, ref);
-      vtkhdf.SaveGridFunction(*this, name);
-      return;
-#else
-      MFEM_ABORT("Requires HDF5 library with parallel support enabled");
-#endif
-   }
-#endif
-   VTKHDF vtkhdf(fname);
-   vtkhdf.SaveMesh(*fes->GetMesh(), high_order, ref);
-   vtkhdf.SaveGridFunction(*this, name);
-}
-
-#endif
-
 void GridFunction::SaveSTLTri(std::ostream &os, real_t p1[], real_t p2[],
                              real_t p3[])
 {
@@ -3995,7 +4032,6 @@ real_t ZZErrorEstimator(BilinearFormIntegrator &blfi,
   FiniteElementSpace *ufes = u.FESpace();
   FiniteElementSpace *ffes = flux.FESpace();
   ElementTransformation *Transf;
-   DofTransformation utrans, ftrans;

   int dim = ufes->GetMesh()->Dimension();
   int nfe = ufes->GetNE();
@@ -4027,13 +4063,19 @@ real_t ZZErrorEstimator(BilinearFormIntegrator &blfi,
      {
         if (with_subdomains && ufes->GetAttribute(i) != s) { continue; }

-         ufes->GetElementVDofs(i, udofs, utrans);
-         ffes->GetElementVDofs(i, fdofs, ftrans);
+         const DofTransformation* const utrans = ufes->GetElementVDofs(i, udofs);
+         const DofTransformation* const ftrans = ffes->GetElementVDofs(i, fdofs);

         u.GetSubVector(udofs, ul);
         flux.GetSubVector(fdofs, fla);
-         utrans.InvTransformPrimal(ul);
-         ftrans.InvTransformPrimal(fla);
+         if (utrans)
+         {
+            utrans->InvTransformPrimal(ul);
+         }
+         if (ftrans)
+         {
+            ftrans->InvTransformPrimal(fla);
+         }

         Transf = ufes->GetElementTransformation(i);
         blfi.ComputeElementFlux(*ufes->GetFE(i), *Transf, ul,
@@ -4248,7 +4290,6 @@ real_t LSZZErrorEstimator(BilinearFormIntegrator &blfi,  // input
   MFEM_VERIFY(tichonov_coeff >= 0.0, "tichonov_coeff cannot be negative");
   FiniteElementSpace *ufes = u.FESpace();
   ElementTransformation *Transf;
-   DofTransformation utrans;

   Mesh *mesh = ufes->GetMesh();
   int dim = mesh->Dimension();
@@ -4330,11 +4371,14 @@ real_t LSZZErrorEstimator(BilinearFormIntegrator &blfi,  // input
                                                    flux_order));
         int num_integration_pts = ir->GetNPoints();

-         ufes->GetElementVDofs(ielem, udofs, utrans);
+         const DofTransformation* const utrans = ufes->GetElementVDofs(ielem, udofs);
         u.GetSubVector(udofs, ul);
-         utrans.InvTransformPrimal(ul);
+         if (utrans)
+         {
+            utrans->InvTransformPrimal(ul);
+         }
         Transf = ufes->GetElementTransformation(ielem);
-         const auto *dummy = ufes->GetFE(ielem);
+         FiniteElement *dummy = nullptr;
         blfi.ComputeElementFlux(*ufes->GetFE(ielem), *Transf, ul,
                                 *dummy, fl, with_coeff, ir);

@@ -4563,135 +4607,4 @@ GridFunction *Extrude1DGridFunction(Mesh *mesh, Mesh *mesh2d,
   return sol2d;
 }

-void GridFunction::GetElementBoundsAtControlPoints(const int elem,
-                                                   const PLBound &plb,
-                                                   Vector &lower, Vector &upper,
-                                                   const int vdim)
-{
-   const FiniteElement *fe = fes->GetFE(elem);
-   int fes_dim  = fes->GetVDim();
-   int rdim  = fe->GetDim();
-
-   const TensorBasisElement *tbe =
-      dynamic_cast<const TensorBasisElement *>(fe);
-   MFEM_VERIFY(tbe != NULL, "TensorBasis FiniteElement expected.");
-   const Array<int> &dof_map = tbe->GetDofMap();
-
-   Vector loc_data;
-   Array<int> dof_idx;
-   fes->GetElementDofs(elem, dof_idx);
-   int ndofs = dof_idx.Size();
-
-   int n_c_pts = std::pow(plb.GetNControlPoints(), rdim);
-   lower.SetSize(n_c_pts*(vdim > 0 ? 1 : fes_dim));
-   upper.SetSize(n_c_pts*(vdim > 0 ? 1 : fes_dim));
-
-   for (int d = 0; d < fes_dim; d++)
-   {
-      if (vdim > 0 && d != vdim-1) { continue; }
-      const int d_off = vdim > 0 ? 0 : d;
-      Array<int> dof_idx_c = dof_idx;
-      Vector lowerT(lower, d_off*n_c_pts, n_c_pts);
-      Vector upperT(upper, d_off*n_c_pts, n_c_pts);
-      fes->DofsToVDofs(vdim > 0 ? vdim-1 : d, dof_idx_c);
-      GetSubVector(dof_idx_c, loc_data);
-      Vector nodal_data;
-      if (dof_map.Size() == 0)
-      {
-         nodal_data.SetDataAndSize(loc_data.GetData(), ndofs);
-      }
-      else
-      {
-         nodal_data.SetSize(ndofs);
-         for (int j = 0; j < ndofs; j++)
-         {
-            nodal_data(j) = loc_data(dof_map[j]);
-         }
-      }
-      plb.GetNDBounds(rdim, nodal_data, lowerT, upperT);
-   }
 }
-
-void GridFunction::GetElementBounds(const int elem, const PLBound &plb,
-                                    Vector &lower, Vector &upper,
-                                    const int vdim)
-{
-   Vector lowerC, upperC;
-   GetElementBoundsAtControlPoints(elem, plb, lowerC, upperC, vdim);
-   const FiniteElement *fe = fes->GetFE(elem);
-   int rdim  = fe->GetDim();
-   int n_c_pts = std::pow(plb.GetNControlPoints(), rdim);
-   int fes_dim  = fes->GetVDim();
-   lower.SetSize((vdim > 0 ? 1 :fes_dim));
-   upper.SetSize((vdim > 0 ? 1 :fes_dim));
-   for (int d = 0; d < fes_dim; d++)
-   {
-      if (vdim > 0 && d != vdim-1) { continue; }
-      const int d_off = vdim > 0 ? 0 : d;
-      Vector lowerT(lowerC, d_off*n_c_pts, n_c_pts);
-      Vector upperT(upperC, d_off*n_c_pts, n_c_pts);
-      lower(d_off) = lowerT.Min();
-      upper(d_off) = upperT.Max();
-   }
-}
-
-void GridFunction::GetElementBounds(const PLBound &plb,
-                                    Vector &lower, Vector &upper,
-                                    const int vdim)
-{
-   int nel  = fes->GetNE();
-   int fes_dim  = fes->GetVDim();
-   lower.SetSize(nel*(vdim > 0 ? 1 :fes_dim));
-   upper.SetSize(nel*(vdim > 0 ? 1 :fes_dim));
-   for (int e = 0; e < nel; e++)
-   {
-      Vector lt, ut;
-      GetElementBounds(e, plb, lt, ut, vdim);
-      for (int d = 0; d < fes_dim ; d++)
-      {
-         if (vdim > 0 && d != vdim-1) { continue; }
-         const int d_off = vdim > 0 ? 0 : d;
-         lower(e + d_off*nel) = lt(d_off);
-         upper(e + d_off*nel) = ut(d_off);
-      }
-   }
-}
-
-PLBound GridFunction::GetElementBounds(Vector &lower,
-                                       Vector &upper,
-                                       const int ref_factor,
-                                       const int vdim)
-{
-   int max_order = fes->GetMaxElementOrder();
-   PLBound plb(fes, ref_factor*(max_order+1));
-   GetElementBounds(plb, lower, upper, vdim);
-   return plb;
-}
-
-PLBound GridFunction::GetBounds(Vector &lower, Vector &upper,
-                                const int ref_factor, const int vdim)
-{
-   int max_order = fes->GetMaxElementOrder();
-   PLBound plb(fes, ref_factor*(max_order+1));
-   Vector lel, uel;
-   GetElementBounds(plb, lel, uel, vdim);
-
-   int nel  = fes->GetNE();
-   int fes_dim  = fes->GetVDim();
-   lower.SetSize(vdim > 0 ? 1 : fes_dim);
-   upper.SetSize(vdim > 0 ? 1 : fes_dim);
-   for (int d = 0; d < fes_dim; d++)
-   {
-      if (vdim > 0 && d != vdim-1) { continue; }
-      const int d_off = vdim > 0 ? 0 : d;
-      Vector lelt(lel, d_off*nel, nel);
-      Vector uelt(uel, d_off*nel, nel);
-      lower(d_off) = lelt.Min();
-      upper(d_off) = uelt.Max();
-   }
-   return plb;
-}
-
-}
-
-
@@ -16,7 +16,6 @@
 #include "fespace.hpp"
 #include "coefficient.hpp"
 #include "bilininteg.hpp"
-#include "bounds.hpp"
 #ifdef MFEM_USE_ADIOS2
 #include "../general/adios2stream.hpp"
 #endif
@@ -1545,73 +1544,15 @@ public:
       Mesh::PrintVTK. */
   void SaveVTK(std::ostream &out, const std::string &field_name, int ref);

-#ifdef MFEM_USE_HDF5
-   /// @brief Save the GridFunction in %VTKHDF format.
-   ///
-   /// If @a high-order is true, then @a ref controls the order of output. If
-   /// @a ref is -1, then the order of the grid function will be used.
-   ///
-   /// If @a high-order is false, then low-order output will be used. @a ref
-   /// controls the number of mesh refinements; if @a ref is -1, no refinements
-   /// will be performed.
-   void SaveVTKHDF(const std::string &fname, const std::string &name="u",
-                   bool high_order=true, int ref=-1);
-#endif
-
   /** @brief Write the GridFunction in STL format. Note that the mesh dimension
       must be 2 and that quad elements will be broken into two triangles.*/
   void SaveSTL(std::ostream &out, int TimesToRefine = 1);

-   /** @name Methods to compute bounds on the grid function
-       \brief See bounds.hpp for \ref PLBound that constructs piecewise linear
-       bounds for a given set of bases. These piecewise bounds can be used to compute bounds on a grid function. Currently tensor-product elements are
-       supported with Lagrange interpolants on Gauss Legendre nodes and Gauss Lobatto Legendre nodes, and Bernstein bases.
-    */
-   ///@{
-   /// Computes the \ref PLBound for the gridfunction with number of control
-   /// 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 @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);
-
-   /// Computes the \ref PLBound for the gridfunction with number of control
-   /// 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 @a vdim < 1.
-   PLBound GetElementBounds(Vector &lower, Vector &upper,
-                            const int ref_factor=1, const int vdim=-1);
-
-   /// Compute piecewise linear bounds on the given element at the grid of
-   /// [plb.ncp x plb.ncp x plb.ncp] control points for each of the vdim
-   /// components of the gridfunction.
-   void GetElementBoundsAtControlPoints(const int elem, const PLBound &plb,
-                                        Vector &lower, Vector &upper,
-                                        const int vdim = -1);
-
-   /// 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,
-                         Vector &lower, Vector &upper,
-                         const int vdim = -1);
-
-   /// Compute bounds on the grid function for all the elements. The bounds
-   /// 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);
-   ///@}
-
   /// Destroys grid function.
   virtual ~GridFunction() { Destroy(); }
 };

+
 /** Overload operator<< for std::ostream and GridFunction; valid also for the
    derived class ParGridFunction */
 std::ostream &operator<<(std::ostream &out, const GridFunction &sol);
@@ -30,9 +30,7 @@ namespace mfem
 {

 /** \brief FindPointsGSLIB can robustly evaluate a GridFunction on an arbitrary
- *  collection of points. See Mittal et al., "General Field Evaluation in
- *  High-Order Meshes on GPUs". (2025). Computers & Fluids. for technical
- *  details.
+ *  collection of points.
 *
 *  There are three key functions in FindPointsGSLIB:
 *
@@ -255,16 +255,9 @@ void HybridizationExtension::FactorElementMatrices(Vector &AhatInvCt_mat)
         // Write out to global memory
         if (!GLOBAL)
         {
-            // Note: in the following constructors, avoid using index 0 in
-            //       d_A_{bi,ib,bb}_all when their size is 0.
-            DeviceMatrix d_A_bi((nbfdofs && nidofs) ?
-                                &d_A_bi_all(0,e) : nullptr,
-                                nbfdofs, nidofs);
-            DeviceMatrix d_A_ib((nbfdofs && nidofs) ?
-                                &d_A_ib_all(0,e) : nullptr,
-                                nidofs, nbfdofs);
-            DeviceMatrix d_A_bb((nbfdofs) ? &d_A_bb_all(0,e) : nullptr,
-                                nbfdofs, nbfdofs);
+            DeviceMatrix d_A_bi(&d_A_bi_all(0,e), nbfdofs, nidofs);
+            DeviceMatrix d_A_ib(&d_A_ib_all(0,e), nidofs, nbfdofs);
+            DeviceMatrix d_A_bb(&d_A_bb_all(0,e), nbfdofs, nbfdofs);

            for (int j = 0; j < nidofs; j++)
            {
@@ -306,28 +299,16 @@ void HybridizationExtension::ConstructH()
   Vector AhatInvCt_mat;

   {
-      // The dispatch below is based on the following sizes, sorted
-      // appropriately.
-      //
-      // RT(k) in 2D (quads): (interior,boundary) dofs:
-      // - arbitrary k: 2*(k+1)*(k+2)-4*(k+1), 4*(k+1)
-      // - k=0: (0,4)
-      // - k=1: (4,8)
-      // - k=2: (12,12)
-      // - k=3: (24,16)
-      // RT(k) in 3D (hexes): (interior,boundary) dofs:
-      // - arbitrary k: 3*(k+1)^2*(k+2)-6*(k+1)^2, 6*(k+1)^2
-      // - k=0: (0,6)
-      // - k=1: (12,24)
-      // - k=2: (54,54)
      const int NI = idofs.Size();
      const int NB = bdofs.Size();
+      // 2D
      if (NI == 0 && NB <= 4) { FactorElementMatrices<0,4>(AhatInvCt_mat); }
-      else if (NI == 0 && NB <= 6) { FactorElementMatrices<0,6>(AhatInvCt_mat); }
      else if (NI <= 4 && NB <= 8) { FactorElementMatrices<4,8>(AhatInvCt_mat); }
      else if (NI <= 12 && NB <= 12) { FactorElementMatrices<12,12>(AhatInvCt_mat); }
+      else if (NI <= 24 && NB <= 16) { FactorElementMatrices<12,16>(AhatInvCt_mat); }
+      // 3D
+      else if (NI <= 0 && NB <= 6) { FactorElementMatrices<0,6>(AhatInvCt_mat); }
      else if (NI <= 12 && NB <= 24) { FactorElementMatrices<12,24>(AhatInvCt_mat); }
-      else if (NI <= 24 && NB <= 16) { FactorElementMatrices<24,16>(AhatInvCt_mat); }
      else if (NI <= 54 && NB <= 54) { FactorElementMatrices<54,54>(AhatInvCt_mat); }
      // Fallback
      else { FactorElementMatrices<0,0>(AhatInvCt_mat); }
@@ -202,68 +202,4 @@ void CurlCurlIntegrator::AddMultPA(const Vector &x, Vector &y) const
   }
 }

-void CurlCurlIntegrator::AddAbsMultPA(const Vector &x, Vector &y) const
-{
-   Vector abs_pa_data(pa_data);
-   abs_pa_data.Abs();
-   auto absO = mapsO->Abs();
-   auto absC = mapsC->Abs();
-
-   if (dim == 3)
-   {
-      if (Device::Allows(Backend::DEVICE_MASK))
-      {
-         const int ID = (dofs1D << 4) | quad1D;
-         switch (ID)
-         {
-            case 0x23:
-               return internal::SmemPACurlCurlApply3D<2,3>(
-                         dofs1D, quad1D,
-                         symmetric, ne,
-                         absO.B, absC.B, absO.Bt, absC.Bt,
-                         absC.G, absC.Gt, abs_pa_data, x, y, true);
-            case 0x34:
-               return internal::SmemPACurlCurlApply3D<3,4>(
-                         dofs1D, quad1D,
-                         symmetric, ne,
-                         absO.B, absC.B, absO.Bt, absC.Bt,
-                         absC.G, absC.Gt, abs_pa_data, x, y, true);
-            case 0x45:
-               return internal::SmemPACurlCurlApply3D<4,5>(
-                         dofs1D, quad1D,
-                         symmetric, ne,
-                         absO.B, absC.B, absO.Bt, absC.Bt,
-                         absC.G, absC.Gt, abs_pa_data, x, y, true);
-            case 0x56:
-               return internal::SmemPACurlCurlApply3D<5,6>(
-                         dofs1D, quad1D,
-                         symmetric, ne,
-                         absO.B, absC.B, absO.Bt, absC.Bt,
-                         absC.G, absC.Gt, abs_pa_data, x, y, true);
-            default:
-               return internal::SmemPACurlCurlApply3D<0,0>(
-                         dofs1D, quad1D, symmetric, ne,
-                         absO.B, absC.B, absO.Bt, absC.Bt,
-                         absC.G, absC.Gt, abs_pa_data, x, y, true);
-         }
-      }
-      else
-      {
-         internal::PACurlCurlApply3D<0,0>(
-            dofs1D, quad1D, symmetric, ne,
-            absO.B, absC.B, absO.Bt, absC.Bt, absC.G, absC.Gt,
-            abs_pa_data, x, y, true);
-      }
-   }
-   else if (dim == 2)
-   {
-      internal::PACurlCurlApply2D(dofs1D, quad1D, ne, absO.B, absO.Bt,
-                                  absC.G, absC.Gt, abs_pa_data, x, y, true);
-   }
-   else
-   {
-      MFEM_ABORT("Unsupported dimension!");
-   }
-}
-
 } // namespace mfem
@@ -200,7 +200,7 @@ void PADiffusionSetup2D<3>(const int Q1D,
            const real_t E = J11*J11 + J21*J21 + J31*J31;
            const real_t G = J12*J12 + J22*J22 + J32*J32;
            const real_t F = J11*J12 + J21*J22 + J31*J32;
-            const real_t iw = 1.0 / std::sqrt(E*G - F*F);
+            const real_t iw = 1.0 / sqrt(E*G - F*F);
            const real_t coeff = const_c ? C(0,0,0) : C(qx,qy,e);
            const real_t alpha = wq * coeff * iw;
            D(qx,qy,0,e) =  alpha * G; // 1,1
@@ -483,6 +483,19 @@ inline void SmemPADiffusionDiagonal3D(const int NE,
   });
 }

+void PADiffusionApply(const int dim,
+                      const int D1D,
+                      const int Q1D,
+                      const int NE,
+                      const bool symm,
+                      const Array<real_t> &B,
+                      const Array<real_t> &G,
+                      const Array<real_t> &Bt,
+                      const Array<real_t> &Gt,
+                      const Vector &D,
+                      const Vector &X,
+                      Vector &Y);
+
 #ifdef MFEM_USE_OCCA
 // OCCA PA Diffusion Apply 2D kernel
 void OccaPADiffusionApply2D(const int D1D,
@@ -1009,7 +1022,6 @@ inline void SmemPADiffusionApply3D(const int NE,
   auto d = Reshape(d_.Read(), Q1D, Q1D, Q1D, symmetric ? 6 : 9, NE);
   auto x = Reshape(x_.Read(), D1D, D1D, D1D, NE);
   auto y = Reshape(y_.ReadWrite(), D1D, D1D, D1D, NE);
-   MFEM_VERIFY(D1D <= Q1D, "THREAD_DIRECT requires D1D <= Q1D");
   mfem::forall_3D(NE, Q1D, Q1D, Q1D, [=] MFEM_HOST_DEVICE (int e)
   {
      const int D1D = T_D1D ? T_D1D : d1d;
@@ -1039,11 +1051,11 @@ inline void SmemPADiffusionApply3D(const int NE,
      real_t (*QDD0)[MD1][MD1] = (real_t (*)[MD1][MD1]) (sm0+0);
      real_t (*QDD1)[MD1][MD1] = (real_t (*)[MD1][MD1]) (sm0+1);
      real_t (*QDD2)[MD1][MD1] = (real_t (*)[MD1][MD1]) (sm0+2);
-      MFEM_FOREACH_THREAD_DIRECT(dz,z,D1D)
+      MFEM_FOREACH_THREAD(dz,z,D1D)
      {
-         MFEM_FOREACH_THREAD_DIRECT(dy,y,D1D)
+         MFEM_FOREACH_THREAD(dy,y,D1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(dx,x,D1D)
+            MFEM_FOREACH_THREAD(dx,x,D1D)
            {
               X[dz][dy][dx] = x(dx,dy,dz,e);
            }
@@ -1051,9 +1063,9 @@ inline void SmemPADiffusionApply3D(const int NE,
      }
      if (MFEM_THREAD_ID(z) == 0)
      {
-         MFEM_FOREACH_THREAD_DIRECT(dy,y,D1D)
+         MFEM_FOREACH_THREAD(dy,y,D1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(qx,x,Q1D)
+            MFEM_FOREACH_THREAD(qx,x,Q1D)
            {
               B[qx][dy] = b(qx,dy);
               G[qx][dy] = g(qx,dy);
@@ -1061,11 +1073,11 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD_DIRECT(dz,z,D1D)
+      MFEM_FOREACH_THREAD(dz,z,D1D)
      {
-         MFEM_FOREACH_THREAD_DIRECT(dy,y,D1D)
+         MFEM_FOREACH_THREAD(dy,y,D1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(qx,x,Q1D)
+            MFEM_FOREACH_THREAD(qx,x,Q1D)
            {
               real_t u = 0.0, v = 0.0;
               MFEM_UNROLL(MD1)
@@ -1081,11 +1093,11 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD_DIRECT(dz,z,D1D)
+      MFEM_FOREACH_THREAD(dz,z,D1D)
      {
-         MFEM_FOREACH_THREAD_DIRECT(qy,y,Q1D)
+         MFEM_FOREACH_THREAD(qy,y,Q1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(qx,x,Q1D)
+            MFEM_FOREACH_THREAD(qx,x,Q1D)
            {
               real_t u = 0.0, v = 0.0, w = 0.0;
               MFEM_UNROLL(MD1)
@@ -1102,11 +1114,11 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD_DIRECT(qz,z,Q1D)
+      MFEM_FOREACH_THREAD(qz,z,Q1D)
      {
-         MFEM_FOREACH_THREAD_DIRECT(qy,y,Q1D)
+         MFEM_FOREACH_THREAD(qy,y,Q1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(qx,x,Q1D)
+            MFEM_FOREACH_THREAD(qx,x,Q1D)
            {
               real_t u = 0.0, v = 0.0, w = 0.0;
               MFEM_UNROLL(MD1)
@@ -1137,9 +1149,9 @@ inline void SmemPADiffusionApply3D(const int NE,
      MFEM_SYNC_THREAD;
      if (MFEM_THREAD_ID(z) == 0)
      {
-         MFEM_FOREACH_THREAD_DIRECT(dy,y,D1D)
+         MFEM_FOREACH_THREAD(dy,y,D1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(qx,x,Q1D)
+            MFEM_FOREACH_THREAD(qx,x,Q1D)
            {
               Bt[dy][qx] = b(qx,dy);
               Gt[dy][qx] = g(qx,dy);
@@ -1147,11 +1159,11 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD_DIRECT(qz,z,Q1D)
+      MFEM_FOREACH_THREAD(qz,z,Q1D)
      {
-         MFEM_FOREACH_THREAD_DIRECT(qy,y,Q1D)
+         MFEM_FOREACH_THREAD(qy,y,Q1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(dx,x,D1D)
+            MFEM_FOREACH_THREAD(dx,x,D1D)
            {
               real_t u = 0.0, v = 0.0, w = 0.0;
               MFEM_UNROLL(MQ1)
@@ -1168,11 +1180,11 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD_DIRECT(qz,z,Q1D)
+      MFEM_FOREACH_THREAD(qz,z,Q1D)
      {
-         MFEM_FOREACH_THREAD_DIRECT(dy,y,D1D)
+         MFEM_FOREACH_THREAD(dy,y,D1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(dx,x,D1D)
+            MFEM_FOREACH_THREAD(dx,x,D1D)
            {
               real_t u = 0.0, v = 0.0, w = 0.0;
               MFEM_UNROLL(Q1D)
@@ -1189,11 +1201,11 @@ inline void SmemPADiffusionApply3D(const int NE,
         }
      }
      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD_DIRECT(dz,z,D1D)
+      MFEM_FOREACH_THREAD(dz,z,D1D)
      {
-         MFEM_FOREACH_THREAD_DIRECT(dy,y,D1D)
+         MFEM_FOREACH_THREAD(dy,y,D1D)
         {
-            MFEM_FOREACH_THREAD_DIRECT(dx,x,D1D)
+            MFEM_FOREACH_THREAD(dx,x,D1D)
            {
               real_t u = 0.0, v = 0.0, w = 0.0;
               MFEM_UNROLL(MQ1)
@@ -164,36 +164,6 @@ void DiffusionIntegrator::AssemblePatchPA(const int patch,
   SetupPatchPA(patch, mesh);  // For full quadrature, unitWeights = false
 }

-void DiffusionIntegrator::AddAbsMultPA(const Vector &x, Vector &y) const
-{
-   if (DeviceCanUseCeed())
-   {
-      MFEM_ABORT("Ceed AbsMult not implemented yet");
-   }
-   Vector abs_pa_data(pa_data);
-   abs_pa_data.Abs();
-   auto abs_maps = maps->Abs();
-
-   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,
-                                                Vector &y) const
-{
-   if (symmetric)
-   {
-      AddAbsMultPA(x, y);
-   }
-   else
-   {
-      MFEM_ABORT("DiffusionIntegrator::AddAbsMultTransposePA only implemented "
-                 "in the symmetric case.")
-   }
-}
-
-
 // This version uses full 1D quadrature rules, taking into account the
 // minimum interaction between basis functions and integration points.
 void DiffusionIntegrator::AddMultPatchPA(const int patch, const Vector &x,
@@ -147,11 +147,6 @@ void ElasticityAddMultPA_(const int nDofs, const FiniteElementSpace &fespace,
                          const GeometricFactors &geom, const DofToQuad &maps, const Vector &x,
                          QuadratureFunction &QVec, Vector &y)
 {
-   using future::tensor;
-   using future::make_tensor;
-   using future::det;
-   using future::inv;
-
   static_assert((i_block < 0) == (j_block < 0),
                 "i_block and j_block must both be non-negative or strictly negative.");
   static constexpr int d = dim;
@@ -212,7 +207,7 @@ void ElasticityAddMultPA_(const int nDofs, const FiniteElementSpace &fespace,
            const int iIndex = isComponent ? 0 : i;
            div += gradx(iIndex,i);
         }
-         const real_t w = ipWeights[p]/det(invJ);
+         const real_t w = ipWeights[p] /det(invJ);
         for (int m = 0; m < d; m++)
         {
            for (int q = qLower; q < qUpper; q++)
@@ -226,8 +221,8 @@ void ElasticityAddMultPA_(const int nDofs, const FiniteElementSpace &fespace,
               {
                  for (int a = 0; a < d; a++)
                  {
-                     contraction += 2*((a == q)*invJ(m,j_block)
-                                       + (j_block==q)*invJ(m,a))*(gradx(0, a));
+                     contraction += 2*((a == q)*invJ(m,j_block) + (j_block==q)*invJ(m,a))*(gradx(0,
+                                                                                                 a));
                  }
               }
               else
@@ -236,7 +231,7 @@ void ElasticityAddMultPA_(const int nDofs, const FiniteElementSpace &fespace,
                  {
                     for (int b = 0; b < d; b++)
                     {
-                        contraction += ((a == q)*invJ(m,b) + (b == q)*invJ(m,a))
+                        contraction += ((a == q)*invJ(m,b) + (b==q)*invJ(m,a))
                                       *(gradx(a,b) + gradx(b, a));
                     }
                  }
@@ -244,8 +239,7 @@ void ElasticityAddMultPA_(const int nDofs, const FiniteElementSpace &fespace,
               // lambda*div(u)*div(v) + 2*mu*sym(grad(u))*sym(grad(v))
               // contraction = 4*sym(grad(u))sym(grad(v))
               const int qIndex = isComponent ? 0 : q;
-               Q(p,m,qIndex,e) = w*(lamDev(p, e)*invJ(m,q)*div
-                                    + 0.5*muDev(p, e)*contraction);
+               Q(p,m,qIndex,e) = w*(lamDev(p, e)*invJ(m,q)*div + 0.5*muDev(p, e)*contraction);
            }
         }
      }
@@ -283,11 +277,6 @@ void ElasticityAssembleDiagonalPA_(const int nDofs,
                                   const CoefficientVector &mu, const GeometricFactors &geom,
                                   const DofToQuad &maps, QuadratureFunction &QVec, Vector &diag)
 {
-   using future::tensor;
-   using future::make_tensor;
-   using future::det;
-   using future::inv;
-
   // Assuming all elements are the same
   const auto &ir = QVec.GetIntRule(0);
   static constexpr int d = dim;
@@ -372,11 +361,6 @@ void ElasticityAssembleEA_(const int i_block,
                           const DofToQuad &maps,
                           Vector &emat)
 {
-   using future::tensor;
-   using future::make_tensor;
-   using future::det;
-   using future::inv;
-
   // Assuming all elements are the same
   static constexpr int d = dim;
   const int numPoints = ir.GetNPoints();
@@ -662,8 +662,7 @@ void PACurlCurlApply2D(const int D1D,
                       const Array<real_t> &gct,
                       const Vector &pa_data,
                       const Vector &x,
-                       Vector &y,
-                       const bool useAbs)
+                       Vector &y)
 {

   auto Bo = Reshape(bo.Read(), Q1D, D1D-1);
@@ -718,8 +717,7 @@ void PACurlCurlApply2D(const int D1D,

            for (int qy = 0; qy < Q1D; ++qy)
            {
-               const int sign = useAbs ? 1 : -1;
-               const real_t wy = (c == 0) ? (sign*Gc(qy,dy)) : Bo(qy,dy);
+               const real_t wy = (c == 0) ? -Gc(qy,dy) : Bo(qy,dy);
               for (int qx = 0; qx < Q1D; ++qx)
               {
                  curl[qy][qx] += gradX[qx] * wy;
@@ -762,8 +760,7 @@ void PACurlCurlApply2D(const int D1D,
            }
            for (int dy = 0; dy < D1Dy; ++dy)
            {
-               const int sign = useAbs ? 1 : -1;
-               const real_t wy = (c == 0) ? (sign*Gct(dy,qy)) : Bot(dy,qy);
+               const real_t wy = (c == 0) ? -Gct(dy,qy) : Bot(dy,qy);

               for (int dx = 0; dx < D1Dx; ++dx)
               {
@@ -828,7 +828,7 @@ inline void SmemPACurlCurlAssembleDiagonal3D(const int d1d,
   }); // end of element loop
 }

-// PA H(curl) curl-curl Apply/AbsApply 2D kernel
+// PA H(curl) curl-curl Apply 2D kernel
 void PACurlCurlApply2D(const int D1D,
                       const int Q1D,
                       const int NE,
@@ -838,10 +838,9 @@ void PACurlCurlApply2D(const int D1D,
                       const Array<real_t> &gct,
                       const Vector &pa_data,
                       const Vector &x,
-                       Vector &y,
-                       const bool useAbs = false);
+                       Vector &y);

-// PA H(curl) curl-curl Apply/AbsApply 3D kernel
+// PA H(curl) curl-curl Apply 3D kernel
 template<int T_D1D = 0, int T_Q1D = 0>
 inline void PACurlCurlApply3D(const int d1d,
                              const int q1d,
@@ -855,8 +854,7 @@ inline void PACurlCurlApply3D(const int d1d,
                              const Array<real_t> &gct,
                              const Vector &pa_data,
                              const Vector &x,
-                              Vector &y,
-                              const bool useAbs = false)
+                              Vector &y)
 {
   MFEM_VERIFY(T_D1D || d1d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D,
               "Error: d1d > HCURL_MAX_D1D");
@@ -972,16 +970,7 @@ inline void PACurlCurlApply3D(const int d1d,
                  {
                     // \hat{\nabla}\times\hat{u} is [0, (u_0)_{x_2}, -(u_0)_{x_1}]
                     curl[qz][qy][qx][1] += gradXY[qy][qx][1] * wDz; // (u_0)_{x_2}
-                     if (useAbs)
-                     {
-                        // +(u_0)_{x_1}
-                        curl[qz][qy][qx][2] += gradXY[qy][qx][0] * wz;
-                     }
-                     else
-                     {
-                        // -(u_0)_{x_1}
-                        curl[qz][qy][qx][2] -= gradXY[qy][qx][0] * wz;
-                     }
+                     curl[qz][qy][qx][2] -= gradXY[qy][qx][0] * wz;  // -(u_0)_{x_1}
                  }
               }
            }
@@ -1049,16 +1038,7 @@ inline void PACurlCurlApply3D(const int d1d,
                  for (int qx = 0; qx < Q1D; ++qx)
                  {
                     // \hat{\nabla}\times\hat{u} is [-(u_1)_{x_2}, 0, (u_1)_{x_0}]
-                     if (useAbs)
-                     {
-                        // +(u_1)_{x_2}
-                        curl[qz][qy][qx][0] += gradXY[qy][qx][1] * wDz;
-                     }
-                     else
-                     {
-                        // -(u_1)_{x_2}
-                        curl[qz][qy][qx][0] -= gradXY[qy][qx][1] * wDz;
-                     }
+                     curl[qz][qy][qx][0] -= gradXY[qy][qx][1] * wDz; // -(u_1)_{x_2}
                     curl[qz][qy][qx][2] += gradXY[qy][qx][0] * wz;  // (u_1)_{x_0}
                  }
               }
@@ -1129,16 +1109,7 @@ inline void PACurlCurlApply3D(const int d1d,
                  {
                     // \hat{\nabla}\times\hat{u} is [(u_2)_{x_1}, -(u_2)_{x_0}, 0]
                     curl[qz][qy][qx][0] += gradYZ[qz][qy][1] * wx;  // (u_2)_{x_1}
-                     if (useAbs)
-                     {
-                        // +(u_2)_{x_0}
-                        curl[qz][qy][qx][1] += gradYZ[qz][qy][0] * wDx;
-                     }
-                     else
-                     {
-                        // -(u_2)_{x_0}
-                        curl[qz][qy][qx][1] -= gradYZ[qz][qy][0] * wDx;
-                     }
+                     curl[qz][qy][qx][1] -= gradYZ[qz][qy][0] * wDx; // -(u_2)_{x_0}
                  }
               }
            }
@@ -1238,21 +1209,9 @@ inline void PACurlCurlApply3D(const int d1d,
                  for (int dx = 0; dx < D1Dx; ++dx)
                  {
                     // \hat{\nabla}\times\hat{u} is [0, (u_0)_{x_2}, -(u_0)_{x_1}]
-                     const int idx = dx + ((dy + (dz * D1Dy)) * D1Dx) + osc;
-                     if (useAbs)
-                     {
-                        // (u_0)_{x_2} * (op * curl)_1 +
-                        // (u_0)_{x_1} * (op * curl)_2
-                        Y(idx, e) += (gradXY21[dy][dx] * wDz) +
-                                     (gradXY12[dy][dx] * wz);
-                     }
-                     else
-                     {
-                        // (u_0)_{x_2} * (op * curl)_1 -
-                        // (u_0)_{x_1} * (op * curl)_2
-                        Y(idx, e) += (gradXY21[dy][dx] * wDz) -
-                                     (gradXY12[dy][dx] * wz);
-                     }
+                     // (u_0)_{x_2} * (op * curl)_1 - (u_0)_{x_1} * (op * curl)_2
+                     Y(dx + ((dy + (dz * D1Dy)) * D1Dx) + osc,
+                       e) += (gradXY21[dy][dx] * wDz) - (gradXY12[dy][dx] * wz);
                  }
               }
            }
@@ -1319,22 +1278,10 @@ inline void PACurlCurlApply3D(const int d1d,
               {
                  for (int dx = 0; dx < D1Dx; ++dx)
                  {
-                     const int idx = dx + ((dy + (dz * D1Dy)) * D1Dx) + osc;
                     // \hat{\nabla}\times\hat{u} is [-(u_1)_{x_2}, 0, (u_1)_{x_0}]
-                     if (useAbs)
-                     {
-                        // +(u_1)_{x_2} * (op * curl)_0 +
-                        //  (u_1)_{x_0} * (op * curl)_2
-                        Y(idx, e) += (gradXY20[dy][dx] * wDz) +
-                                     (gradXY02[dy][dx] * wz);
-                     }
-                     else
-                     {
-                        // -(u_1)_{x_2} * (op * curl)_0 +
-                        //  (u_1)_{x_0} * (op * curl)_2
-                        Y(idx, e) += (-gradXY20[dy][dx] * wDz) +
-                                     (gradXY02[dy][dx] * wz);
-                     }
+                     // -(u_1)_{x_2} * (op * curl)_0 + (u_1)_{x_0} * (op * curl)_2
+                     Y(dx + ((dy + (dz * D1Dy)) * D1Dx) + osc,
+                       e) += (-gradXY20[dy][dx] * wDz) + (gradXY02[dy][dx] * wz);
                  }
               }
            }
@@ -1404,22 +1351,10 @@ inline void PACurlCurlApply3D(const int d1d,
               {
                  for (int dz = 0; dz < D1Dz; ++dz)
                  {
-                     const int idx = dx + ((dy + (dz * D1Dy)) * D1Dx) + osc;
                     // \hat{\nabla}\times\hat{u} is [(u_2)_{x_1}, -(u_2)_{x_0}, 0]
-                     if (useAbs)
-                     {
-                        // (u_2)_{x_1} * (op * curl)_0 +
-                        // (u_2)_{x_0} * (op * curl)_1
-                        Y(idx, e) += (gradYZ10[dz][dy] * wx) +
-                                     (gradYZ01[dz][dy] * wDx);
-                     }
-                     else
-                     {
-                        // (u_2)_{x_1} * (op * curl)_0 -
-                        // (u_2)_{x_0} * (op * curl)_1
-                        Y(idx, e) += (gradYZ10[dz][dy] * wx) -
-                                     (gradYZ01[dz][dy] * wDx);
-                     }
+                     // (u_2)_{x_1} * (op * curl)_0 - (u_2)_{x_0} * (op * curl)_1
+                     Y(dx + ((dy + (dz * D1Dy)) * D1Dx) + osc,
+                       e) += (gradYZ10[dz][dy] * wx) - (gradYZ01[dz][dy] * wDx);
                  }
               }
            }
@@ -1428,7 +1363,7 @@ inline void PACurlCurlApply3D(const int d1d,
   }); // end of element loop
 }

-// Shared memory PA H(curl) curl-curl Apply/AbsApply 3D kernel
+// Shared memory PA H(curl) curl-curl Apply 3D kernel
 template<int T_D1D = 0, int T_Q1D = 0>
 inline void SmemPACurlCurlApply3D(const int d1d,
                                  const int q1d,
@@ -1442,8 +1377,7 @@ inline void SmemPACurlCurlApply3D(const int d1d,
                                  const Array<real_t> &gct,
                                  const Vector &pa_data,
                                  const Vector &x,
-                                  Vector &y,
-                                  const bool useAbs = false)
+                                  Vector &y)
 {
   MFEM_VERIFY(T_D1D || d1d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D,
               "Error: d1d > HCURL_MAX_D1D");
@@ -1597,8 +1531,7 @@ inline void SmemPACurlCurlApply3D(const int d1d,
                        }

                        curl[qy][qx][1] += v; // (u_0)_{x_2}
-                        if (useAbs) { curl[qy][qx][2] += u; } // +(u_0)_{x_1}
-                        else { curl[qy][qx][2] -= u; } // -(u_0)_{x_1}
+                        curl[qy][qx][2] -= u;  // -(u_0)_{x_1}
                     }
                     else if (c == 1)  // y component
                     {
@@ -1625,8 +1558,7 @@ inline void SmemPACurlCurlApply3D(const int d1d,
                           }
                        }

-                        if (useAbs) { curl[qy][qx][0] += v; } // +(u_1)_{x_2}
-                        else { curl[qy][qx][0] -= v; } // -(u_1)_{x_2}
+                        curl[qy][qx][0] -= v; // -(u_1)_{x_2}
                        curl[qy][qx][2] += u; // (u_1)_{x_0}
                     }
                     else // z component
@@ -1655,8 +1587,7 @@ inline void SmemPACurlCurlApply3D(const int d1d,
                        }

                        curl[qy][qx][0] += v; // (u_2)_{x_1}
-                        if (useAbs) { curl[qy][qx][1] += u; }// +(u_2)_{x_0}
-                        else { curl[qy][qx][1] -= u; } // -(u_2)_{x_0}
+                        curl[qy][qx][1] -= u; // -(u_2)_{x_0}
                     }
                  } // qx
               } // qy
@@ -1711,54 +1642,18 @@ inline void SmemPACurlCurlApply3D(const int d1d,
                        if (dx < D1D-1)
                        {
                           // \hat{\nabla}\times\hat{u} is [0, (u_0)_{x_2}, -(u_0)_{x_1}]
+                           // (u_0)_{x_2} * (op * curl)_1 - (u_0)_{x_1} * (op * curl)_2
                           const real_t wx = sBo[dx][qx];
-                           if (useAbs)
-                           {
-                              // (u_0)_{x_2} * (op * curl)_1 +
-                              // (u_0)_{x_1} * (op * curl)_2
-                              dxyz1 += (wx * c2 * wcy * wcDz) +
-                                       (wx * c3 * wcDy * wcz);
-                           }
-                           else
-                           {
-                              // (u_0)_{x_2} * (op * curl)_1 -
-                              // (u_0)_{x_1} * (op * curl)_2
-                              dxyz1 += (wx * c2 * wcy * wcDz) -
-                                       (wx * c3 * wcDy * wcz);
-                           }
+                           dxyz1 += (wx * c2 * wcy * wcDz) - (wx * c3 * wcDy * wcz);
                        }

                        // \hat{\nabla}\times\hat{u} is [-(u_1)_{x_2}, 0, (u_1)_{x_0}]
-                        if (useAbs)
-                        {
-                           // +(u_1)_{x_2} * (op * curl)_0 +
-                           //  (u_1)_{x_0} * (op * curl)_2
-                           dxyz2 += (wy * c1 * wcx * wcDz) +
-                                    (wy * c3 * wDx * wcz);
-                        }
-                        else
-                        {
-                           // -(u_1)_{x_2} * (op * curl)_0 +
-                           //  (u_1)_{x_0} * (op * curl)_2
-                           dxyz2 += (-wy * c1 * wcx * wcDz) +
-                                    (wy * c3 * wDx * wcz);
-                        }
+                        // -(u_1)_{x_2} * (op * curl)_0 + (u_1)_{x_0} * (op * curl)_2
+                        dxyz2 += (-wy * c1 * wcx * wcDz) + (wy * c3 * wDx * wcz);

                        // \hat{\nabla}\times\hat{u} is [(u_2)_{x_1}, -(u_2)_{x_0}, 0]
-                        if (useAbs)
-                        {
-                           // (u_2)_{x_1} * (op * curl)_0 +
-                           // (u_2)_{x_0} * (op * curl)_1
-                           dxyz3 += (wcDy * wz * c1 * wcx) +
-                                    (wcy * wz * c2 * wDx);
-                        }
-                        else
-                        {
-                           // (u_2)_{x_1} * (op * curl)_0 -
-                           // (u_2)_{x_0} * (op * curl)_1
-                           dxyz3 += (wcDy * wz * c1 * wcx) -
-                                    (wcy * wz * c2 * wDx);
-                        }
+                        // (u_2)_{x_1} * (op * curl)_0 - (u_2)_{x_0} * (op * curl)_1
+                        dxyz3 += (wcDy * wz * c1 * wcx) - (wcy * wz * c2 * wDx);
                     } // qx
                  } // qy
               } // dx
@@ -50,7 +50,6 @@ static void PAMassAssembleDiagonal1D(const int NE,
   });
 }

-template <bool ACCUMULATE = true>
 MFEM_HOST_DEVICE inline
 void PAMassApply1D_Element(const int e,
                           const int NE,
@@ -70,14 +69,6 @@ void PAMassApply1D_Element(const int e,
   auto X = ConstDeviceMatrix(x_, D1D, NE);
   auto Y = DeviceMatrix(y_, D1D, NE);

-   if (!ACCUMULATE)
-   {
-      for (int dx = 0; dx < D1D; ++dx)
-      {
-         Y(dx, e) = 0.0;
-      }
-   }
-
   real_t XQ[DofQuadLimits::MAX_Q1D];
   for (int qx = 0; qx < Q1D; ++qx)
   {
@@ -60,25 +60,58 @@ void MassIntegrator::AssemblePA(const FiniteElementSpace &fes)
   QuadratureSpace qs(*mesh, *ir);
   CoefficientVector coeff(Q, qs, CoefficientStorage::COMPRESSED);

-   const int NE = ne;
-   const int Q1D = quad1D;
-   const int NQ = static_cast<int>(std::pow(Q1D, dim));
-   const bool const_c = coeff.Size() == 1;
-   const bool by_val = map_type == FiniteElement::VALUE;
-   const auto W = Reshape(ir->GetWeights().Read(), NQ);
-   const auto J = Reshape(geom->detJ.Read(), NQ, NE);
-   const auto C = const_c ? Reshape(coeff.Read(), 1, 1) :
-                  Reshape(coeff.Read(), NQ,NE);
-   auto v = Reshape(pa_data.Write(), NQ, NE);
-   mfem::forall_2D(NE, NQ, 1, [=] MFEM_HOST_DEVICE (int e)
+   if (dim==1) { MFEM_ABORT("Not supported yet... stay tuned!"); }
+   if (dim==2)
   {
-      MFEM_FOREACH_THREAD(i, x, NQ)
+      const int NE = ne;
+      const int Q1D = quad1D;
+      const bool const_c = coeff.Size() == 1;
+      const bool by_val = map_type == FiniteElement::VALUE;
+      const auto W = Reshape(ir->GetWeights().Read(), Q1D,Q1D);
+      const auto J = Reshape(geom->detJ.Read(), Q1D,Q1D,NE);
+      const auto C = const_c ? Reshape(coeff.Read(), 1,1,1) :
+                     Reshape(coeff.Read(), Q1D,Q1D,NE);
+      auto v = Reshape(pa_data.Write(), Q1D,Q1D, NE);
+      mfem::forall_2D(NE,Q1D,Q1D, [=] MFEM_HOST_DEVICE (int e)
      {
-         const real_t detJ = J(i,e);
-         const real_t coeff = const_c ? C(0,0) : C(i,e);
-         v(i,e) =  W(i) * coeff * (by_val ? detJ : 1.0/detJ);
-      }
-   });
+         MFEM_FOREACH_THREAD(qx,x,Q1D)
+         {
+            MFEM_FOREACH_THREAD(qy,y,Q1D)
+            {
+               const real_t detJ = J(qx,qy,e);
+               const real_t coeff = const_c ? C(0,0,0) : C(qx,qy,e);
+               v(qx,qy,e) =  W(qx,qy) * coeff * (by_val ? detJ : 1.0/detJ);
+            }
+         }
+      });
+   }
+   if (dim==3)
+   {
+      const int NE = ne;
+      const int Q1D = quad1D;
+      const bool const_c = coeff.Size() == 1;
+      const bool by_val = map_type == FiniteElement::VALUE;
+      const auto W = Reshape(ir->GetWeights().Read(), Q1D,Q1D,Q1D);
+      const auto J = Reshape(geom->detJ.Read(), Q1D,Q1D,Q1D,NE);
+      const auto C = const_c ? Reshape(coeff.Read(), 1,1,1,1) :
+                     Reshape(coeff.Read(), Q1D,Q1D,Q1D,NE);
+      auto v = Reshape(pa_data.Write(), Q1D,Q1D,Q1D,NE);
+      mfem::forall_3D(NE, Q1D, Q1D, Q1D, [=] MFEM_HOST_DEVICE (int e)
+      {
+         MFEM_FOREACH_THREAD(qx,x,Q1D)
+         {
+            MFEM_FOREACH_THREAD(qy,y,Q1D)
+            {
+               MFEM_FOREACH_THREAD(qz,z,Q1D)
+               {
+                  const real_t detJ = J(qx,qy,qz,e);
+                  const real_t coeff = const_c ? C(0,0,0,0) : C(qx,qy,qz,e);
+                  v(qx,qy,qz,e) = W(qx,qy,qz) * coeff * (by_val ? detJ : 1.0/detJ);
+               }
+            }
+         }
+      });
+   }
 }

 void MassIntegrator::AssemblePABoundary(const FiniteElementSpace &fes)
@@ -199,37 +232,10 @@ void MassIntegrator::AddMultPA(const Vector &x, Vector &y) const
   }
 }

-void MassIntegrator::AddAbsMultPA(const Vector &x, Vector &y) const
-{
-   if (DeviceCanUseCeed())
-   {
-      MFEM_ABORT("AddAbsMultPA not implemented with CEED!");
-      ceedOp->AddMult(x, y);
-   }
-   else
-   {
-      Vector abs_pa_data(pa_data);
-      abs_pa_data.Abs();
-      Array<real_t> absB(maps->B);
-      Array<real_t> absBt(maps->Bt);
-      absB.Abs();
-      absBt.Abs();
-
-      ApplyPAKernels::Run(dim, dofs1D, quad1D, ne, absB, absBt, abs_pa_data,
-                          x, y, dofs1D, quad1D);
-   }
-}
-
 void MassIntegrator::AddMultTransposePA(const Vector &x, Vector &y) const
 {
   // Mass integrator is symmetric
   AddMultPA(x, y);
 }

-void MassIntegrator::AddAbsMultTransposePA(const Vector &x, Vector &y) const
-{
-   // Mass integrator is symmetric
-   AddAbsMultPA(x, y);
-}
-
 } // namespace mfem
@@ -313,129 +313,6 @@ void VectorFEMassIntegrator::AddMultPA(const Vector &x, Vector &y) const
   }
 }

-void VectorFEMassIntegrator::AddAbsMultPA(const Vector &x, Vector &y) const
-{
-   const bool trial_curl = (trial_fetype == mfem::FiniteElement::CURL);
-   const bool trial_div = (trial_fetype == mfem::FiniteElement::DIV);
-   const bool test_curl = (test_fetype == mfem::FiniteElement::CURL);
-   const bool test_div = (test_fetype == mfem::FiniteElement::DIV);
-
-   Vector abs_pa_data(pa_data);
-   abs_pa_data.Abs();
-
-   Array<real_t> absBo(mapsO->B);
-   Array<real_t> absBc(mapsC->B);
-   Array<real_t> absBto(mapsO->Bt);
-   Array<real_t> absBtc(mapsC->Bt);
-   Array<real_t> absBto_t(mapsOtest->Bt);
-   Array<real_t> absBtc_t(mapsCtest->Bt);
-
-   absBo.Abs();
-   absBc.Abs();
-   absBto.Abs();
-   absBtc.Abs();
-   absBto_t.Abs();
-   absBtc_t.Abs();
-
-   if (dim == 3)
-   {
-      if (trial_curl && test_curl)
-      {
-         if (Device::Allows(Backend::DEVICE_MASK))
-         {
-            const int ID = (dofs1D << 4) | quad1D;
-            switch (ID)
-            {
-               case 0x23:
-                  return internal::SmemPAHcurlMassApply3D<2,3>(
-                            dofs1D, quad1D, ne, symmetric,
-                            absBo, absBc, absBto, absBtc,
-                            abs_pa_data, x, y);
-               case 0x34:
-                  return internal::SmemPAHcurlMassApply3D<3,4>(
-                            dofs1D, quad1D, ne, symmetric,
-                            absBo, absBc, absBto, absBtc,
-                            abs_pa_data, x, y);
-               case 0x45:
-                  return internal::SmemPAHcurlMassApply3D<4,5>(
-                            dofs1D, quad1D, ne, symmetric,
-                            absBo, absBc, absBto, absBtc,
-                            abs_pa_data, x, y);
-               case 0x56:
-                  return internal::SmemPAHcurlMassApply3D<5,6>(
-                            dofs1D, quad1D, ne, symmetric,
-                            absBo, absBc, absBto, absBtc,
-                            abs_pa_data, x, y);
-               default:
-                  return internal::SmemPAHcurlMassApply3D(
-                            dofs1D, quad1D, ne, symmetric,
-                            absBo, absBc, absBto, absBtc,
-                            abs_pa_data, x, y);
-            }
-         }
-         else
-         {
-            internal::PAHcurlMassApply3D(dofs1D, quad1D, ne, symmetric,
-                                         absBo, absBc, absBto, absBtc,
-                                         abs_pa_data, x, y);
-         }
-      }
-      else if (trial_div && test_div)
-      {
-         internal::PAHdivMassApply(3, dofs1D, quad1D, ne, symmetric,
-                                   absBo, absBc, absBto, absBtc,
-                                   abs_pa_data, x, y);
-      }
-      else if (trial_curl && test_div)
-      {
-         const bool scalarCoeff = !(DQ || MQ);
-         internal::PAHcurlHdivMassApply3D(dofs1D, dofs1Dtest, quad1D, ne,
-                                          scalarCoeff, true, false,
-                                          absBo, absBc, absBto_t, absBtc_t,
-                                          abs_pa_data, x, y);
-      }
-      else if (trial_div && test_curl)
-      {
-         const bool scalarCoeff = !(DQ || MQ);
-         internal::PAHcurlHdivMassApply3D(dofs1D, dofs1Dtest, quad1D, ne,
-                                          scalarCoeff, false, false,
-                                          absBo, absBc, absBto_t, absBtc_t,
-                                          abs_pa_data, x, y);
-      }
-      else
-      {
-         MFEM_ABORT("Unknown kernel.");
-      }
-   }
-   else // 2D
-   {
-      if (trial_curl && test_curl)
-      {
-         internal::PAHcurlMassApply2D(dofs1D, quad1D, ne, symmetric,
-                                      absBo, absBc, absBto, absBtc,
-                                      abs_pa_data, x, y);
-      }
-      else if (trial_div && test_div)
-      {
-         internal::PAHdivMassApply(2, dofs1D, quad1D, ne, symmetric,
-                                   absBo, absBc, absBto, absBtc,
-                                   abs_pa_data, x, y);
-      }
-      else if ((trial_curl && test_div) || (trial_div && test_curl))
-      {
-         const bool scalarCoeff = !(DQ || MQ);
-         internal::PAHcurlHdivMassApply2D(dofs1D, dofs1Dtest, quad1D, ne,
-                                          scalarCoeff, trial_curl, false,
-                                          absBo, absBc, absBto_t, absBtc_t,
-                                          abs_pa_data, x, y);
-      }
-      else
-      {
-         MFEM_ABORT("Unknown kernel.");
-      }
-   }
-}
-
 void VectorFEMassIntegrator::AddMultTransposePA(const Vector &x,
                                                Vector &y) const
 {
@@ -16,7 +16,6 @@
 #include "kernel_reporter.hpp"
 #include <unordered_map>
 #include <tuple>
-#include <type_traits>
 #include <cstddef>

 namespace mfem
@@ -132,37 +131,12 @@ class KernelDispatchTable<Kernels,
         Signature, KernelDispatchKeyHash<Params...>>;
   TableType table;

-   /// @brief Call function @a f with arguments @a args (perfect forwaring).
-   ///
-   /// Only valid when the function @a f is not a member function.
-   template <typename F, typename... Args,
-             typename std::enable_if<std::is_pointer<F>::value,bool>::type=true>
-   static void Invoke(F f, Args&&... args)
-   {
-      f(std::forward<Args>(args)...);
-   }
-
-   /// @brief Calls member function @a f on object @a t with arguments @a args
-   /// (perfect forwarding).
-   ///
-   /// Only valid when @a f is a member function of class @a T.
-   template <typename F, typename T, typename... Args,
-             typename std::enable_if<
-                std::is_member_function_pointer<F>::value,bool>::type=true>
-   static void Invoke(F f, T&& t, Args&&... args)
-   {
-      (t.*f)(std::forward<Args>(args)...);
-   }
-
 public:
   /// @brief Run the kernel with the given dispatch parameters and arguments.
   ///
   /// If a compile-time specialized version of the kernel with the given
   /// parameters has been registered, it will be called. Otherwise, the
   /// fallback kernel will be called.
-   ///
-   /// If the kernel is a member function, then the first argument after @a
-   /// params should be the object on which it is called.
   template<typename... Args>
   static void Run(Params... params, Args&&... args)
   {
@@ -171,12 +145,12 @@ public:
      const auto it = table.find(key);
      if (it != table.end())
      {
-         Invoke(it->second, std::forward<Args>(args)...);
+         it->second(std::forward<Args>(args)...);
      }
      else
      {
         KernelReporter::ReportFallback(Kernels::Get().kernel_name, params...);
-         Invoke(Kernels::Fallback(params...), std::forward<Args>(args)...);
+         Kernels::Fallback(params...)(std::forward<Args>(args)...);
      }
   }

@@ -173,6 +173,7 @@ void LinearForm::Assemble()
 {
   Array<int> vdofs;
   ElementTransformation *eltrans;
+   DofTransformation *doftrans;
   Vector elemvect;

   Vector::operator=(0.0);
@@ -197,7 +198,6 @@ void LinearForm::Assemble()
         }
      }

-      DofTransformation doftrans;
      for (int i = 0; i < fes -> GetNE(); i++)
      {
         int elem_attr = fes->GetMesh()->GetAttribute(i);
@@ -207,11 +207,14 @@ void LinearForm::Assemble()
            if (markers) { markers->HostRead(); }
            if ( markers == NULL || (*markers)[elem_attr-1] == 1 )
            {
-               fes -> GetElementVDofs (i, vdofs, doftrans);
+               doftrans = fes -> GetElementVDofs (i, vdofs);
               eltrans = fes -> GetElementTransformation (i);
               domain_integs[k]->AssembleRHSElementVect(*fes->GetFE(i),
                                                        *eltrans, elemvect);
-               doftrans.TransformDual(elemvect);
+               if (doftrans)
+               {
+                  doftrans->TransformDual(elemvect);
+               }
               AddElementVector (vdofs, elemvect);
            }
         }
@@ -244,12 +247,11 @@ void LinearForm::Assemble()
         }
      }

-      DofTransformation doftrans;
      for (int i = 0; i < fes -> GetNBE(); i++)
      {
         const int bdr_attr = mesh->GetBdrAttribute(i);
         if (bdr_attr_marker[bdr_attr-1] == 0) { continue; }
-         fes -> GetBdrElementVDofs (i, vdofs, doftrans);
+         doftrans = fes -> GetBdrElementVDofs (i, vdofs);
         eltrans = fes -> GetBdrElementTransformation (i);
         for (int k=0; k < boundary_integs.Size(); k++)
         {
@@ -258,7 +260,11 @@ void LinearForm::Assemble()

            boundary_integs[k]->AssembleRHSElementVect(*fes->GetBE(i),
                                                       *eltrans, elemvect);
-            doftrans.TransformDual(elemvect);
+
+            if (doftrans)
+            {
+               doftrans->TransformDual(elemvect);
+            }
            AddElementVector (vdofs, elemvect);
         }
      }
@@ -673,7 +673,7 @@ public:
      int myid;
      MPI_Comm_rank(comm, &myid);

-      int seed = (seed_ > 0) ? seed_ + myid : time(nullptr) + myid;
+      int seed = (seed_ > 0) ? seed_ + myid : (int)time(0) + myid;
      SetSeed(seed);
   }
 #else
@@ -48,7 +48,7 @@ void LORBase::AddIntegratorsAndMarkers(BilinearForm &a_from,
   for (int i=0; i<integrators->Size(); ++i)
   {
      BilinearFormIntegrator *integrator = (*integrators)[i];
-      if (markers[i] != nullptr)
+      if (*markers[i])
      {
         (a_to.*add_integrator_marker)(integrator, *markers[i]);
      }
@@ -485,17 +485,10 @@ void BatchedLORAssembly::Assemble(
 #endif

   AssembleWithoutBC(a, A);
+   SparseMatrix *A_mat = A.As<SparseMatrix>();

-   const SparseMatrix *P = fes_ho.GetConformingProlongation();
-   if (P)
-   {
-      std::unique_ptr<SparseMatrix> R(Transpose(*P));
-      std::unique_ptr<SparseMatrix> RA(mfem::Mult(*R, *A.As<SparseMatrix>()));
-      A.Reset(mfem::Mult(*RA, *P));
-   }
-
-   A.As<SparseMatrix>()->EliminateBC(ess_dofs,
-                                     Operator::DiagonalPolicy::DIAG_KEEP);
+   A_mat->EliminateBC(ess_dofs,
+                      Operator::DiagonalPolicy::DIAG_KEEP);
 }

 BatchedLORAssembly::BatchedLORAssembly(FiniteElementSpace &fes_ho_)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vladimir Z Tomov	eb378fac0e	Time step estimates for the CG case - global vs local.	2026-05-22 10:43:48 -07:00
Vladimir Z Tomov	4626eb5e68	style	2025-04-18 17:47:53 -07:00
Vladimir Z Tomov	0eb3b098e2	Cleaned raw pointers.	2025-04-18 17:35:15 -07:00
Vladimir Z Tomov	d69f3c9dd7	Merge branch 'master' into ex9CG	2025-04-18 09:26:22 -07:00
Vladimir Z Tomov	a1f9bb47ad	Reused repeated code for serial and parallel.	2025-04-18 09:25:29 -07:00
Vladimir Z Tomov	b170c87236	Merge branch 'master' into ex9CG	2025-04-11 15:05:33 -07:00
Paul Moujaes:MAIL:TERMINAL:CLOUD	f034f56fd2	lines adjusted to have max. 80 characters per line, hopefully I did not mess something up, bc I had some problems with git	2025-01-20 17:07:20 +01:00
Vladimir Z Tomov	590ef8c2b3	style	2024-11-10 14:44:40 -08:00
Vladimir Z Tomov	1d52c34c3b	Merge branch 'master' into ex9CG	2024-11-10 14:41:12 -08:00
Paul Moujaes:MAIL:TERMINAL:CLOUD	6cc6f093e4	small changes to comments	2024-10-01 16:32:21 +02:00
Moujaes	1098ef093d	initializing pointers as NULL	2024-09-13 16:15:48 -07:00
Moujaes	a624c23c4c	zeros in the min max function calls fixed	2024-09-13 15:34:58 -07:00
Moujaes	0e56e8779c	astyle	2024-09-13 15:08:59 -07:00
Moujaes	48e43f7b4d	fixing warning of potentially uninitialized pointer	2024-09-13 15:05:08 -07:00
Moujaes	7c1fbeb8f4	initialize order of CG_FE_Evolution	2024-09-13 14:49:44 -07:00
Moujaes	fdca557b08	pull request	2024-09-13 14:10:31 -07:00
Moujaes	27c0aeb778	astyle	2024-09-12 15:41:35 -07:00
Moujaes	f142d1a807	master merged to get up to date	2024-09-12 15:27:08 -07:00
Moujaes	7589e562df	lumped boundary condition and added example runs to serial code	2024-09-12 15:18:08 -07:00
Moujaes	6706348043	fixed possible mistake in bounding fluxes for C&S	2024-09-11 15:12:57 -07:00
Moujaes	bf913dbb08	astyle of ex9 and ex9p	2024-09-10 16:49:43 -07:00
Moujaes	0bea336b6e	limiter added to ex9 serial	2024-09-10 12:57:28 -07:00
Moujaes	7c7d4f746f	commenting	2024-09-10 11:24:17 -07:00
Moujaes	65cca1288a	astyle second try	2024-09-09 17:14:03 -07:00
Moujaes	2427b4cc24	astyle	2024-09-09 16:40:24 -07:00
Moujaes	c9a2cea4e9	Class implementations moved below main	2024-09-09 14:23:43 -07:00
Moujaes	ac53487552	TargetScheme and low order implemented, some aborts for CG like when mesh is non-conforming, DG uses HypreParVector again such that -ea works again	2024-09-09 13:06:27 -07:00
Moujaes	a3fb28cffe	small cleanup	2024-09-06 16:27:57 -07:00
Moujaes	db27161e5e	Clip and Scale	2024-09-06 13:38:48 -07:00
Moujaes	cfb5c01de2	Merge branch 'master' into ex9CG	2024-09-05 10:25:24 -07:00
Moujaes	6d46935f90	init	2024-09-05 10:22:17 -07:00