adding the missing makefile and updating some of the files, cleanup, etc

simple interior-point solver code with generic problem structure and a few example problems
2024-10-16 10:30:28 -07:00 · 2024-10-15 17:20:18 -07:00
1040 changed files with 8322 additions and 32046 deletions
@@ -0,0 +1,61 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 30
+
+# Number of days of inactivity before an Issue or Pull Request with the stale
+# label is closed.  Set to false to disable. If disabled, issues still need to
+# be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale.
+# Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set
+# to `[]` to disable
+exemptLabels:
+  - bug
+  - WIP
+  - ready-for-review
+  - in-review
+  - in-next
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  :warning: This issue or PR has been automatically marked as stale because it has not
+  had any activity in the last month. *If no activity occurs in the next week, it will
+  be automatically closed.* Thank you for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -29,10 +29,6 @@ on:
  pull_request:
  workflow_dispatch:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  HYPRE_ARCHIVE: v2.19.0.tar.gz
  HYPRE_TOP_DIR: hypre-2.19.0
@@ -96,7 +92,6 @@ jobs:
            build-system: cmake
            hypre-target: int32
            precision: fp64
-            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'
@@ -119,6 +114,13 @@ jobs:
    runs-on: ${{ matrix.os }}

    steps:
+      # This external action allows to interrupt a workflow already running on
+      # the same branch to save resources.
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.12.1
+        with:
+          access_token: ${{ github.token }}
+
      # Fix 'No space left on device' errors for Ubuntu builds.
      - name: Run Actions Cleaner
        if: matrix.os == 'ubuntu-latest'
@@ -304,22 +306,6 @@ jobs:
          ctest --rerun-failed --output-on-failure -C ${CTEST_CONFIG}
        shell: bash

-      - name: make install
-        if: matrix.build-system == 'make'
-        run: |
-          cd ${{ env.MFEM_TOP_DIR }} && make install
-
-      - name: cmake install
-        if: matrix.build-system == 'cmake'
-        run: |
-          CONFIG="Release"
-          [[ ${{ matrix.target }} == 'dbg' ]] && CONFIG="Debug"
-          TARGET="install"
-          [[ ${{ matrix.os }} == 'windows-latest' ]] && TARGET="INSTALL"
-          cd ${{ env.MFEM_TOP_DIR }} && \
-          cmake --build build --target ${TARGET} --config ${CONFIG}
-        shell: bash
-
      # Code coverage (process and upload reports)
      - name: codecov
        if: matrix.codecov == 'YES'
@@ -18,10 +18,6 @@ on:
    # The branches below must be a subset of the branches above
    branches: ["master"]

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  analyze:
    name: Analyze
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -22,10 +22,6 @@ on:
  pull_request:
  workflow_dispatch:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  HYPRE_ARCHIVE: v2.19.0.tar.gz
  HYPRE_TOP_DIR: hypre-2.19.0
@@ -38,6 +34,11 @@ jobs:
    runs-on: ubuntu-latest

    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.12.1
+        with:
+          access_token: ${{ github.token }}
+
      - name: checkout MFEM
        uses: actions/checkout@v4
        with:
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -22,15 +22,22 @@ on:
  pull_request:
  workflow_dispatch:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  Serial:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest

    steps:
+      - name: Temporary workaround for sanitizer crashes
+        # See https://github.com/actions/runner-images/issues/9491
+        # The issue should be fixed in the next runner image for Ubuntu 22.04,
+        # see https://github.com/actions/runner-images/pull/9513
+        run: sudo sysctl vm.mmap_rnd_bits=28
+
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.12.1
+        with:
+          access_token: ${{ github.token }}
+
      - name: MFEM Checkout
        uses: actions/checkout@v4
        with:
@@ -48,7 +55,7 @@ jobs:
          build-system: make
          library-only: false
          config-options:
-            CXX="clang++-18"
+            CXX="clang++-14"
            CXXFLAGS="-g -O1 -std=c++11
                      -fsanitize=address
                      -fno-omit-frame-pointer
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -19,10 +19,6 @@ on:
  pull_request:
  workflow_dispatch:

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 # This workflow is run on pushes to any branch in the MFEM repo (with or without
 # PRs), as well as on updates to PRs from forks. In particular, we do not
 # duplicate work by running on both pushes and updates to local PRs. We do that
@@ -37,6 +33,11 @@ jobs:
      (github.event_name == 'push' ||
       github.event.pull_request.head.repo.full_name != github.repository)
    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.12.1
+        with:
+          access_token: ${{ github.token }}
+
      - name: checkout mfem
        uses: actions/checkout@v4

@@ -1,31 +0,0 @@
-# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
-# For more information, see: https://github.com/actions/stale
-name: Mark stale issues and pull requests
-
-on:
-  workflow_dispatch:
-  schedule:
-  - cron: '0 0 * * *'
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-      actions: write
-
-    steps:
-    - uses: actions/stale@v9
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: ':warning: This issue has been automatically marked as stale because it has not had any activity in the last month. *If no activity occurs in the next week, it will be automatically closed.* Thank you for your contributions.'
-        stale-pr-message: ':warning: This PR has been automatically marked as stale because it has not had any activity in the last month. *If no activity occurs in the next week, it will be automatically closed.* Thank you for your contributions.'
-        days-before-stale: 30
-        days-before-close: 7
-        stale-issue-label: 'stale'
-        stale-pr-label: 'stale'
-        operations-per-run: 500
-        exempt-issue-labels: "bug,WIP,ready-for-review,in-review,in-next"
-        exempt-pr-labels: "bug,WIP,ready-for-review,in-review,in-next"
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -8,7 +8,6 @@

 # Object and library files
 *.o
-*.o.tmp
 /libmfem.*
 /miniapps/common/libmfem-common.*

@@ -227,7 +226,6 @@ miniapps/meshing/extruder
 miniapps/meshing/fit-node-position
 miniapps/meshing/trimmer
 miniapps/meshing/reflector
-miniapps/meshing/ref321
 miniapps/meshing/mesh-optimizer
 miniapps/meshing/pmesh-optimizer
 miniapps/meshing/pmesh-fitting
@@ -247,8 +245,6 @@ miniapps/meshing/shaper.mesh
 miniapps/meshing/extruder.mesh
 miniapps/meshing/trimmer.mesh
 miniapps/meshing/reflected.mesh
-miniapps/meshing/ref321.mesh
-miniapps/meshing/sol.gf
 miniapps/meshing/optimized*
 miniapps/meshing/perturbed*
 miniapps/meshing/polar-nc.mesh
@@ -343,7 +339,6 @@ miniapps/toys/rubik
 miniapps/toys/snake
 miniapps/toys/lissajous
 miniapps/toys/mondrian
-miniapps/toys/spiral
 miniapps/toys/snake-init.mesh
 miniapps/toys/snake-user.mesh
 miniapps/toys/snake-joined.mesh
@@ -432,9 +427,3 @@ pkg.gitcommit

 # Jupyter Notebook Checkpoints
 .ipynb_checkpoints
-
-# emacs tag file
-TAGS
-
-# vs code
-.vscode
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -10,10 +10,6 @@

 Version 4.7.1 (development)
 ===========================
- Refactored ALGOIM cut integration rules. The interface is unified with
-  the interface for moment based cut integration rules.
- Altered (Par)GridFunction::Compute*Error functions to ensure they return
-  non-negative values and therefore behave as "norms".

 Discretization improvements
 ---------------------------
@@ -22,32 +18,11 @@ Discretization improvements

 - Added support for boundary constraints to the hybridization class.

- Added support for external boundary submeshes with nonconformal mesh adaptation.
-
- Added assembly of Jacobians to `HyperbolicFormIntegrator`.
-
- Added average fluxes to `NumericalFlux` (formerly `RiemannSolver`)
-  and `FluxFunction`.
-
- Added component-wise upwinded flux (`ComponentwiseUpwindFlux`).
-
- Added support for H(div) spaces in class QuadratureInterpolator. For now, only
-  (vector) VALUES, (vector) PHYSICAL_VALUES, and PHYSICAL_MAGNITUDES evaluations
-  are implemented. [PR #4669]
-
 Meshing improvements
 --------------------
- Added native AD support for numerous TMOP metrics that didn't have first or
-  second derivative implementations.
-
 - The ExodusII reader now handles pyramid and wedge element types. Mixed meshes
  are also supported.

- Added support for nonuniform anisotropic (nonconforming) mesh refinement with
-  arbitrary spacing in each direction, for quadrilateral (2D) and hexahedral
-  (3D) meshes. This enables in particular 3:1 refinement, as demonstrated in the
-  new meshing miniapp ref321.
-
 New and updated examples and miniapps
 -------------------------------------
 - Added miniapps to demonstrate the H(div) and H(curl) NURBS elements.
@@ -55,9 +30,6 @@ New and updated examples and miniapps
 - Added an MFEM example for the eikonal equation. This new solver is based on
  the proximal Galerkin method introduced by Keith and Surowiec.

- Added a new toy miniapp that animates an interesting fidget spiral cone toy.
-  See miniapps/toys/spiral.cpp.
-
 - Added a command line option to all miniapps (`-p` or `--send-port`) for
  specifying the GLVis server socket port (19916 by default).

@@ -78,22 +50,8 @@ GPU computing
  or by explicitly calling `KernelReporter::Enable`. Users can then add
  specializations for these kernels to achieve higher performance.

- Element assembly kernels have been added for low-order refined to
-  high-order transfer operators. New kernels can be offloaded as device
-  kernels. Example usage may be found in lor-transfer.cpp under miniapps/tools.
-
- Added support for GPU accelerated FindPointsGSLIB. Note that this will require
-  the users to switch from gslib v1.0.7 to v1.0.9.
-
- Allow BlockLowerTriangularPreconditioner to run on GPU.
-
- Use device vectors in GMRES, FGMRES and other iterative methods.
-
 Miscellaneous
 -------------
- Added support for SUNDIALS v7. See the section "API changes" for some small
-  changes related to this new version.
-
 - Refactored the `ARKStepSolver` class (ARKODE interface) to use
  `TimeDependentOperator::Mult` only when the associated ODE operator is
  expressed in explicit form (i.e., `TimeDependentOperator::isExplicit()`),
@@ -106,61 +64,10 @@ Miscellaneous

 - Added support for custom interpolation procedure in FindPointsGSLIB.

- `FiniteElementSpace` has new methods to directly set prolongation and
-  restriction operators to arbitrary sparse matrices.
-
- There are new convenience constructors for NURBS patches and knot vectors.
-
- Added convenience methods for manipulating boundary attribute marker arrays;
-  `(Par)Mesh::MarkExternalBoundaries`, `(Par)Mesh::UnmarkInternalBoundaries`,
-  `(Par)Mesh::MarkNamedBoundaries`, and `(Par)Mesh::UnmarkNamedBoundaries`.
-  See examples `ex1.cpp`, `ex1p.cpp`, and `ex11p.cpp` for basic usage.
-
- Added `(Par)Mesh::GetExteriorFaceMarker` for identifying faces on the
-  exterior of the mesh irrespective of their presence in the list of "boundary
-  elements".
-
- Added methods to `(Par)FiniteElementSpace` to identify all degrees of freedom
-  located on the exterior of the domain without reference to the list of
-  "boundary elements"; `GetExteriorVDofs` and `GetExteriorTrueDofs`.
-
- `LinearFormIntegrator` and `NonlinearFormIntegrator` (including
-  `BilinearFormIntegrator`) now all inherit from a base class `Integrator`
-  that combines some logic related to selecting quadrature rules. This includes
-  a virtual method `Integrator::GetDefaultIntegrationRule`, which should be
-  favored over directly defining a default integration rule in the element-level
-  assembly routines (although the latter is still possible, by leaving the new
-  virtual method as its default base implementation of returning `NULL`).
-
- Updated the benchmarks (in tests/benchmarks) to work with the latest Google
-  Benchmarks classes (version 1.9.1). Renamed the MFEM_ENABLE_GOOGLE_BENCHMARKS
-  CMake option to just MFEM_ENABLE_BENCHMARKS.
-
- Changed the name of `IterativeSolverMonitor` to `IterativeSolverController`
-  which now allows for declaring convergence by a user defined criterion. For
-  backward compatibility, the old name is still available.
-
 API changes
 -----------
- API change: 'TMOP_Metric_skew2D' has been marked as deprecated.
-
 - API change: in class GridFunction, 'fec' was renamed to 'fec_owned'.

- API change: `RiemannSolver` was renamed to `NumericalFlux` (the old name has
-  been been deprecated through typedef)
-
- API change: support for SUNDIALS v7:
-  * the SUNDIALS types `realtype` and `booleantype` are no longer defined by v7
-    and therefore MFEM now uses the new type names `sunrealtype` and
-    `sunbooleantype`, respectively, which MFEM defines when using SUNDIALS < v6
-    where these types were not defined.
-  * The SUNDIALS macro `SUNLS_SUCCESS` and some other `*_SUCCESS` macros were
-    removed and replaced by `SUN_SUCCESS` in v7, so to avoid tedious checks for
-    SUNDIALS versions, MFEM now defines and uses the constant `SUN_SUCCESS` when
-    using SUNDIALS < v7.
-  * The constants `SUN_PREC_*`, introduced by SUNDIALS v6 are now introduced by
-    MFEM when using SUNDIALS < v6 to avoid tedious version checks.
-

 Version 4.7, released on May 7, 2024
 ====================================
@@ -247,15 +154,6 @@ New and updated examples and miniapps
 - Added two new example codes: 38 and 39/39p described above. Substantially
  updated Example 18/18p.

- Added ODE solvers selection routines. This creates a uniformity across examples,
-  miniapps and other executables in regard to ODE(time-integrator) selection.
-
- Added new mechanism for retrieving and setting state vectors in ODE solvers.
-  This is relevant for AB/AM and gen-alpha solvers.
-
- Added ODEsolver/ODEsolver2 unit tests to verify order of convergence and
-  read/write functionality.
-
 Miscellaneous
 -------------
 - Updated the Doxygen documentation style, which now requires Doxygen version
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -87,16 +87,13 @@ if (MFEM_USE_STRUMPACK OR MFEM_USE_MUMPS)
  # Just needed to find the MPI_Fortran libraries to link with
  set(XSDK_ENABLE_Fortran ON)
 endif()
-# Ginkgo requires C++17:
-if ((MFEM_USE_GINKGO) AND ("${CMAKE_CXX_STANDARD}" LESS "17"))
-  set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use." FORCE)
-# Google Benchmark, SUNDIALS, STRUMPACK, Tribol, RAJA and Umpire require C++14:
-elseif ((MFEM_USE_BENCHMARK OR
-         MFEM_USE_SUNDIALS OR
-         MFEM_USE_STRUMPACK OR
-         MFEM_USE_TRIBOL OR
-         MFEM_USE_RAJA OR
-         MFEM_USE_UMPIRE) AND
+# SUNDIALS, STRUMPACK, Ginkgo, Tribol, RAJA and Umpire require C++14:
+if ((MFEM_USE_SUNDIALS OR
+     MFEM_USE_STRUMPACK OR
+     MFEM_USE_GINKGO OR
+     MFEM_USE_TRIBOL OR
+     MFEM_USE_RAJA OR
+     MFEM_USE_UMPIRE) AND
    ("${CMAKE_CXX_STANDARD}" LESS "14"))
  set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to use." FORCE)
 endif()
@@ -343,10 +340,7 @@ if (MFEM_USE_SUNDIALS)
  if (MFEM_USE_HIP)
    list(APPEND SUNDIALS_COMPONENTS NVector_Hip)
  endif()
-  # The Core component was added in SUNDIALS v7, so we treat it as optional in
-  # order to support older versions.
-  find_package(SUNDIALS REQUIRED ${SUNDIALS_COMPONENTS}
-    OPTIONAL_COMPONENTS Core)
+  find_package(SUNDIALS REQUIRED ${SUNDIALS_COMPONENTS})
 endif()

 # SuperLU_DIST can only be enabled in parallel
@@ -526,11 +520,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)
-    set(ENZYME_FOUND 1)
+   find_package(ENZYME REQUIRED)
 endif()

 # MFEM_TIMER_TYPE
@@ -623,37 +615,15 @@ set(MASTER_HEADERS
  ${PROJECT_SOURCE_DIR}/mfem.hpp
  ${PROJECT_SOURCE_DIR}/mfem-performance.hpp)

-# Installation options (we use GNUInstallDirs but prefer lib by default)
-set(MFEM_USE_GNUINSTALLDIRS OFF CACHE BOOL
-  "Use CMAKE_INSTALL_LIBDIR as defined by the GNUInstallDirs CMake module.")
-if (NOT MFEM_USE_GNUINSTALLDIRS)
-  mfem_cache_path(CMAKE_INSTALL_LIBDIR "lib" "Object code libraries (lib)")
-endif()
-include(GNUInstallDirs)
-mfem_cache_path(INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}"
-  "Relative or absolute path for installing header files.")
-mfem_cache_path(INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}"
-  "Relative or absolute path for installing the binaries.")
-mfem_cache_path(INSTALL_LIB_DIR "${CMAKE_INSTALL_LIBDIR}"
-  "Relative or absolute path for installing the library.")
-mfem_cache_path(INSTALL_SHARE_DIR "${CMAKE_INSTALL_DATAROOTDIR}"
-  "Relative or absolute path for installing shared data.")
-# other options: "share/mfem/cmake", "lib/mfem/cmake"
-mfem_cache_path(INSTALL_CMAKE_DIR "${INSTALL_LIB_DIR}/cmake/mfem"
-  "Relative or absolute path for installing cmake config files.")
-
-mfem_path_to_fullpath("${INSTALL_LIB_DIR}" "${CMAKE_INSTALL_PREFIX}" _lib_path)
+set(_lib_path "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON CACHE BOOL "")
-if(NOT DEFINED CMAKE_INSTALL_RPATH)
-  set(CMAKE_INSTALL_RPATH "${_lib_path}")
-endif()
-if(NOT DEFINED CMAKE_INSTALL_NAME_DIR)
-  set(CMAKE_INSTALL_NAME_DIR "${_lib_path}")
-endif()
+set(CMAKE_INSTALL_RPATH "${_lib_path}" CACHE PATH "")
+set(CMAKE_INSTALL_NAME_DIR "${_lib_path}" CACHE PATH "")

-# Variables used when generating _config.hpp, and config.mk
-set(MFEM_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(MFEM_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
+set(MFEM_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
+    "The MFEM source directory" FORCE)
+set(MFEM_INSTALL_DIR ${CMAKE_INSTALL_PREFIX} CACHE PATH
+    "The MFEM install directory" FORCE)

 # Declaring the library
 mfem_add_library(mfem ${SOURCES} ${HEADERS} ${MASTER_HEADERS})
@@ -682,9 +652,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}")
@@ -752,17 +719,11 @@ if (MFEM_ENABLE_TESTING)
  add_mfem_target(${MFEM_ALL_TESTS_TARGET_NAME} OFF)
  add_subdirectory(tests EXCLUDE_FROM_ALL)

-  if (MFEM_USE_BENCHMARK)
-    # Create a target for all benchmarks and, optionally, enable it.
-    set(MFEM_ALL_BENCHMARKS_TARGET_NAME benchmarks)
-    add_mfem_target(${MFEM_ALL_BENCHMARKS_TARGET_NAME}
-                    ${MFEM_ENABLE_BENCHMARKS})
-    if (MFEM_ENABLE_BENCHMARKS)
-      add_subdirectory(tests/benchmarks) #install benchmarks if enabled
-    else()
-      add_subdirectory(tests/benchmarks EXCLUDE_FROM_ALL)
-    endif()
-  endif()
+  # Create a target for all benchmarks and, optionally, enable it.
+  set(MFEM_ALL_BENCHMARKS_TARGET_NAME benchmarks)
+  add_mfem_target(${MFEM_ALL_BENCHMARKS_TARGET_NAME}
+                  ${MFEM_ENABLE_GOOGLE_BENCHMARKS})
+  add_subdirectory(tests/benchmarks EXCLUDE_FROM_ALL)
 endif()

 # Define a target that all examples and miniapps will depend on.
@@ -781,11 +742,7 @@ endif()
 # Create a target for all miniapps and, optionally, enable it.
 set(MFEM_ALL_MINIAPPS_TARGET_NAME miniapps)
 add_mfem_target(${MFEM_ALL_MINIAPPS_TARGET_NAME} ${MFEM_ENABLE_MINIAPPS})
-if (MFEM_ENABLE_MINIAPPS)
-  add_subdirectory(miniapps) #install miniapps if enabled
-else()
-  add_subdirectory(miniapps EXCLUDE_FROM_ALL)
-endif()
+add_subdirectory(miniapps EXCLUDE_FROM_ALL)

 # Target to build all executables, i.e. everything.
 add_custom_target(exec)
@@ -835,6 +792,15 @@ add_subdirectory(doc)
 #-------------------------------------------------------------------------------

 message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
+set(INSTALL_INCLUDE_DIR include
+  CACHE PATH "Relative path for installing header files.")
+set(INSTALL_BIN_DIR bin
+  CACHE PATH "Relative path for installing the binaries.")
+set(INSTALL_LIB_DIR lib
+  CACHE PATH "Relative path for installing the library.")
+# other options: "share/mfem/cmake", "lib/mfem/cmake"
+set(INSTALL_CMAKE_DIR lib/cmake/mfem
+  CACHE PATH "Relative path for installing cmake config files.")

 target_include_directories(mfem BEFORE
  PUBLIC
@@ -859,7 +825,7 @@ foreach(Header mfem.hpp mfem-performance.hpp)
 endforeach()
 install(FILES ${MASTER_HEADERS} DESTINATION ${INSTALL_INCLUDE_DIR}/mfem)

-# Install the headers (except common miniapp which is installed from its subdir)
+# Install the headers; currently, the miniapps headers are excluded
 install(DIRECTORY ${MFEM_SOURCE_DIRS}
  DESTINATION ${INSTALL_INCLUDE_DIR}/mfem
  FILES_MATCHING PATTERN "*.hpp")
@@ -220,10 +220,9 @@ An optional installation of the library and the headers can be performed with

   make install [PREFIX=<dir>]

-The library will be installed in ${PREFIX}/lib, the headers in
-${PREFIX}/include, and the configuration and testing makefiles (config.mk and
-test.mk) in ${PREFIX}/share/mfem. The PREFIX option can also be set during
-configuration.
+The library will be installed in $(PREFIX)/lib, the headers in
+$(PREFIX)/include, and the configuration makefile (config.mk) in
+$(PREFIX)/share/mfem. The PREFIX option can also be set during configuration.

 Information about the current build configuration can be viewed using

@@ -272,9 +271,8 @@ Build options:

 Installation options:
   PREFIX  - Specify the installation directory. The library (libmfem.a) will be
-             installed in ${PREFIX}/lib, the headers in ${PREFIX}/include, and
-             the configuration and testing makefiles (config.mk and test.mk) in
-             ${PREFIX}/share/mfem.
+             installed in $(PREFIX)/lib, the headers in $(PREFIX)/include, and
+             the configuration makefile (config.mk) in $(PREFIX)/share/mfem.
   INSTALL - Specify the install program, default = /usr/bin/install
   INSTALL_DEF_PERM - Specify the default install permissions. This affects
                      headers and configuration makefiles, default = 644
@@ -504,14 +502,10 @@ MFEM_USE_CODIPACK = YES/NO
 MFEM_USE_ALGOIM = YES/NO
  Enable the usage of Algoim - a collection of high-order accurate numerical
  methods and C++ algorithms for working with implicitly-defined geometry and
-  level set methods, see https://algoim.github.io. MFEM provides interface to
-  Algoim v1. To check out the specific Algoim state use:
-  https://github.com/algoim/algoim
+  level set methods. The Algoim library requires the Blitz++ library. The MFEM
+  provides interface to Algoim v1. Thus, to check out the specific state use:
  git checkout 9c9ca0ef094d8ab0390ed36367a1151b459bbe0a
-  The Algoim library requires the Blitz++ library. To use the latest state of
-  Blitz++ that has been tested with MFEM, use:
-  https://github.com/blitzpp/blitz
-  git checkout f24a250a43dff88c31ad92916da828b7ea9a98b7
+  https://algoim.github.io

 MFEM_USE_ADFORWARD = YES/NO
  Enable forward mode for AD packages. This option is valid
@@ -704,12 +698,12 @@ The specific libraries and their options are:
  Versions: STRUMPACK >= 3.0.0.

 - Ginkgo (optional), used when MFEM_USE_GINKGO = YES. Note that Ginkgo needs a
-  C++ compiler that supports the C++-17 standard. For additional requirements
+  C++ compiler that supports the C++-14 standard. For additional requirements
  and dependencies of specific modules, see the Ginkgo webpage below.
  URL: https://ginkgo-project.github.io
  Options: GINKGO_OPT, GINKGO_LIB, GINKGO_DIR, GINKGO_BUILD_TYPE (Release or
           Debug).
-  Versions: Ginkgo >= 1.9.0.
+  Versions: Ginkgo >= 1.4.0.

 - AmgX (optional), used when MFEM_USE_AMGX = YES.
  URL: https://github.com/NVIDIA/AMGX
@@ -793,14 +787,14 @@ The specific libraries and their options are:
  Versions: 1.9.3

 - GSLIB (optional), used when MFEM_USE_GSLIB = YES. The gslib library must be
-  built prior to the MFEM build, as follows: download gslib-1.0.9, untar it at
-  the same level as MFEM and create a symbolic link: "ln -s gslib-1.0.9 gslib".
+  built prior to the MFEM build, as follows: download gslib-1.0.7, untar it at
+  the same level as MFEM and create a symbolic link: "ln -s gslib-1.0.7 gslib".
  Build gslib in parallel or in serial based on the desired MFEM build: "make
  clean; make CC=mpicc" or "make clean; make CC=gcc MPI=0". Build MFEM with
  MFEM_USE_GSLIB=YES.
-  URL: https://github.com/gslib/gslib/archive/v1.0.9.tar.gz
+  URL: https://github.com/gslib/gslib/archive/v1.0.7.tar.gz
  Options: GSLIB_OPT, GSLIB_LIB.
-  Versions: GSLIB >= 1.0.9.
+  Versions: GSLIB >= 1.0.7.

 - ALGOIM (optional), used when MFEM_USE_ALGOIM=YES. The library provides only
  headers so it just needs to be downloaded at the same level as MFEM. Download
@@ -982,20 +976,8 @@ or
   cmake --build . --config Release --target install  [Xcode]
   cmake --build . --config Release --target INSTALL  [Visual Studio]

-By default, the library will be installed in ${CMAKE_INSTALL_PREFIX}/lib, the
-headers in ${CMAKE_INSTALL_PREFIX}/include, the configuration CMake files in
-${CMAKE_INSTALL_PREFIX}/lib/cmake/mfem, and the configuration and testing GNU
-make files in ${CMAKE_INSTALL_PREFIX}/share/mfem. For fine-tuning the
-installation directories the following variables can be used:
-INSTALL_INCLUDE_DIR, INSTALL_LIB_DIR, INSTALL_BIN_DIR (e.g. for dll files on
-Windows), INSTALL_SHARE_DIR, and INSTALL_CMAKE_DIR; alternatively, with lower
-precedence, the CMake GNUInstallDirs variables can also be used:
-CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_LIBDIR, CMAKE_INSTALL_BINDIR and
-CMAKE_INSTALL_DATAROOTDIR. Note that the default for INSTALL_LIB_DIR and
-CMAKE_INSTALL_LIBDIR is lib. This is in contrast to the default behavior for
-GNUInstallDirs, which defines a platform-dependent default value for
-CMAKE_INSTALL_LIBDIR (lib or lib64 or lib/<multiarch-tuple> on Debian). To
-restore this behavior, the user can set MFEM_USE_GNUINSTALLDIRS=YES.
+The library will be installed in <PREFIX>/lib, the headers in <PREFIX>/include,
+and the configuration CMake files in <PREFIX>/lib/cmake/mfem.


 Configuration variables (CMake)
@@ -1,6 +1,6 @@
 BSD 3-Clause License

-Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC
+Copyright (c) 2010-2024, Lawrence Livermore National Security, LLC
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -50,7 +50,6 @@ set(MFEM_USE_FMS @MFEM_USE_FMS@)
 set(MFEM_USE_CONDUIT @MFEM_USE_CONDUIT@)
 set(MFEM_USE_PUMI @MFEM_USE_PUMI@)
 set(MFEM_USE_CUDA @MFEM_USE_CUDA@)
-set(MFEM_USE_HIP @MFEM_USE_HIP@)
 set(MFEM_USE_OCCA @MFEM_USE_OCCA@)
 set(MFEM_USE_RAJA @MFEM_USE_RAJA@)
 set(MFEM_USE_CEED @MFEM_USE_CEED@)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+// Copyright (c) 2010-2024, 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.
 //
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -117,8 +117,8 @@ macro (MULTIPASS_SOURCE_RUNS includes libraries source runs language)
  math (EXPR _tmp "${MULTIPASS_TEST_COUNT} + 1") # Why can't I add to a cache variable?
  set (MULTIPASS_TEST_COUNT ${_tmp} CACHE INTERNAL "Unique test ID")
  set (testname MULTIPASS_TEST_${MULTIPASS_TEST_COUNT}_${runs})
-  set (CMAKE_REQUIRED_INCLUDES ${includes} ${MPI_${language}_INCLUDE_PATH})
-  set (CMAKE_REQUIRED_LIBRARIES ${libraries} ${MPI_${language}_LIBRARIES})
+  set (CMAKE_REQUIRED_INCLUDES ${includes})
+  set (CMAKE_REQUIRED_LIBRARIES ${libraries})
  if(${language} STREQUAL "C")
    check_c_source_runs ("${source}" ${testname})
  elseif(${language} STREQUAL "CXX")
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -14,7 +14,7 @@
 #   - SLEPC_INCLUDE_DIRS
 #   - SLEPC_LIBRARIES

-set(SLEPc_REQUIRED_PACKAGES "PETSC" "MPI" CACHE STRING
+set(SLEPc_REQUIRED_PACKAGES "PETSC" CACHE STRING
  "Additional packages required by SLEPc")

 include(MfemCmakeUtilities)
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -31,5 +31,4 @@ mfem_find_package(SUNDIALS SUNDIALS SUNDIALS_DIR
  ADD_COMPONENT CVODE "include" cvode/cvode.h "lib" sundials_cvode
  ADD_COMPONENT CVODES "include" cvodes/cvodes.h "lib" sundials_cvodes
  ADD_COMPONENT ARKODE "include" arkode/arkode.h "lib" sundials_arkode
-  ADD_COMPONENT KINSOL "include" kinsol/kinsol.h "lib" sundials_kinsol
-  ADD_COMPONENT Core "include" sundials/sundials_core.h "lib" sundials_core)
+  ADD_COMPONENT KINSOL "include" kinsol/kinsol.h "lib" sundials_kinsol)
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -138,8 +138,6 @@ macro(add_mfem_miniapp MFEM_EXE_NAME)
  # Actually add the executable
  mfem_add_executable(${MFEM_EXE_NAME} ${MAIN_LIST}
      ${EXTRA_SOURCES_LIST} ${EXTRA_HEADERS_LIST})
-  install(TARGETS ${MFEM_EXE_NAME}
-          RUNTIME DESTINATION miniapps)
  add_dependencies(${MFEM_ALL_MINIAPPS_TARGET_NAME} ${MFEM_EXE_NAME})
  add_dependencies(${MFEM_EXE_NAME} ${MFEM_EXEC_PREREQUISITES_TARGET_NAME})

@@ -827,20 +825,6 @@ function(mfem_get_target_options Target CompileOptsVar LinkOptsVar)
 endfunction(mfem_get_target_options)


-#
-# If ${Path} is not an absolute path, assign ${Prefix}/${Path} to the variable
-# ${OutVar}. If ${Path} is an absolute path, assign ${Path} to the variable
-# ${OutVar}.
-#
-function(mfem_path_to_fullpath Path Prefix OutVar)
-  if(IS_ABSOLUTE "${Path}")
-    set(${OutVar} "${Path}" PARENT_SCOPE)
-  else()
-    set(${OutVar} "${Prefix}/${Path}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-
 #
 #   Function that creates 'config.mk' from 'config.mk.in' for the both the
 #   build- and the install-locations and define install rules for 'config.mk'
@@ -1007,12 +991,9 @@ function(mfem_export_mk_files)
    "${PROJECT_BINARY_DIR}/config/test.mk" COPYONLY)

  # Update variables for the install-tree version of 'config.mk'
-  mfem_path_to_fullpath(
-    "${INSTALL_INCLUDE_DIR}" "${CMAKE_INSTALL_PREFIX}" MFEM_INC_DIR)
-  mfem_path_to_fullpath(
-    "${INSTALL_LIB_DIR}" "${CMAKE_INSTALL_PREFIX}" MFEM_LIB_DIR)
-  mfem_path_to_fullpath(
-    "${INSTALL_SHARE_DIR}/mfem/test.mk" "${CMAKE_INSTALL_PREFIX}" MFEM_TEST_MK)
+  set(MFEM_INC_DIR "${CMAKE_INSTALL_PREFIX}/include")
+  set(MFEM_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+  set(MFEM_TEST_MK "${CMAKE_INSTALL_PREFIX}/share/mfem/test.mk")
  set(MFEM_CONFIG_EXTRA "")

  # Create the install-tree version of 'config.mk'
@@ -1022,30 +1003,8 @@ function(mfem_export_mk_files)

  # Install rules for 'config.mk' and 'test.mk'
  install(FILES ${PROJECT_SOURCE_DIR}/config/test.mk
-    DESTINATION ${INSTALL_SHARE_DIR}/mfem/)
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mfem/)
  install(FILES ${PROJECT_BINARY_DIR}/config/config-install.mk
-    DESTINATION ${INSTALL_SHARE_DIR}/mfem/
-    RENAME config.mk)
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mfem/ RENAME config.mk)

 endfunction()
-
-
-#
-# Function similar to the macro _GNUInstallDirs_cache_path from the module
-# GNUInstallDirs. Used to process variables like INSTALL_LIB_DIR if they are
-# set on the cmake command line without specifying type: -DINSTALL_LIB_DIR=lib.
-# Without this special treatment, relative paths are expanded to full paths
-# and we want to avoid that.
-#
-function(mfem_cache_path PathVar DefaultPath HelpStr)
-  if(NOT DEFINED ${PathVar})
-    set(${PathVar} "${DefaultPath}" CACHE PATH "${HelpStr}")
-  endif()
-  get_property(cache_type CACHE ${PathVar} PROPERTY TYPE)
-  if(cache_type STREQUAL "UNINITIALIZED")
-    file(TO_CMAKE_PATH "${${PathVar}}" cmakepath)
-    set_property(CACHE ${PathVar} PROPERTY TYPE PATH)
-    set_property(CACHE ${PathVar} PROPERTY VALUE "${cmakepath}")
-    set_property(CACHE ${PathVar} PROPERTY HELPSTRING "${HelpStr}")
-  endif()
-endfunction()
@@ -1,4 +1,4 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+// Copyright (c) 2010-2024, 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.
 //
@@ -1,4 +1,4 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+// Copyright (c) 2010-2024, 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.
 //
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -86,7 +86,7 @@ set(MFEM_MPI_NP 4 CACHE STRING "Number of processes used for MPI tests")
 option(MFEM_ENABLE_TESTING "Enable the ctest framework for testing" ON)
 option(MFEM_ENABLE_EXAMPLES "Build all of the examples" OFF)
 option(MFEM_ENABLE_MINIAPPS "Build all of the miniapps" OFF)
-option(MFEM_ENABLE_BENCHMARKS "Build all of the benchmarks" OFF)
+option(MFEM_ENABLE_GOOGLE_BENCHMARKS "Build all of the Google benchmarks" OFF)

 # Setting CXX/MPICXX on the command line or in user.cmake will overwrite the
 # autodetected C++ compiler.
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -271,6 +271,10 @@ POSIX_CLOCKS_LIB = -lrt
 # For sundials_nvecmpiplusx and nvecparallel remember to build with MPI_ENABLE=ON
 # and modify cmake variables for hypre for sundials
 SUNDIALS_DIR = @MFEM_DIR@/../sundials-5.0.0/instdir
+# SUNDIALS >= 6.4.0 requires C++14:
+ifeq ($(MFEM_USE_SUNDIALS),YES)
+   BASE_FLAGS = -std=c++14
+endif
 SUNDIALS_OPT = -I$(SUNDIALS_DIR)/include
 SUNDIALS_LIB = $(XLINKER)-rpath,$(SUNDIALS_DIR)/lib64\
 $(XLINKER)-rpath,$(SUNDIALS_DIR)/lib\
@@ -285,13 +289,6 @@ endif
 ifeq ($(MFEM_USE_HIP),YES)
   SUNDIALS_LIB += -lsundials_nvechip
 endif
-SUNDIALS_CORE_PAT = $(subst\
- @MFEM_DIR@,$(MFEM_DIR),$(SUNDIALS_DIR))/lib*/libsundials_core.*
-ifeq ($(MFEM_USE_SUNDIALS),YES)
-   ifneq ($(wildcard $(SUNDIALS_CORE_PAT)),)
-      SUNDIALS_LIB += -lsundials_core
-   endif
-endif
 # If SUNDIALS was built with KLU:
 # MFEM_USE_SUITESPARSE = YES

@@ -349,6 +346,9 @@ MUMPS_LIB += -lmumps_common -lpord $(SCALAPACK_LIB) $(LAPACK_LIB) $(MPI_FORTRAN_

 # STRUMPACK library configuration
 STRUMPACK_DIR = @MFEM_DIR@/../STRUMPACK-build
+ifeq ($(MFEM_USE_STRUMPACK),YES)
+   BASE_FLAGS = -std=c++14
+endif
 STRUMPACK_OPT = -I$(STRUMPACK_DIR)/include $(SCOTCH_OPT)
 # If STRUMPACK was build with OpenMP support, the following may be need:
 # STRUMPACK_OPT += $(OPENMP_OPT)
@@ -359,6 +359,9 @@ STRUMPACK_LIB = -L$(STRUMPACK_DIR)/lib -lstrumpack $(MPI_FORTRAN_LIB)\
 GINKGO_DIR = @MFEM_DIR@/../ginkgo/install
 GINKGO_SEARCH_DIR = $(subst @MFEM_DIR@,$(MFEM_DIR),$(GINKGO_DIR))
 GINKGO_BUILD_TYPE=Release
+ifeq ($(MFEM_USE_GINKGO),YES)
+   BASE_FLAGS = -std=c++14
+endif
 GINKGO_OPT = -isystem $(GINKGO_DIR)/include
 GINKGO_LIB_DIR = $(sort $(dir $(wildcard\
 $(GINKGO_SEARCH_DIR)/lib*/libginkgo*.a\
@@ -530,10 +533,8 @@ ifdef GOTCHA_DIR
 endif

 # BLITZ library configuration
-# BLITZ_DIR must be the custom installation folder (-DCMAKE_INSTALL_PREFIX).
-BLITZ_DIR = @MFEM_DIR@/../blitz/install
+BLITZ_DIR = @MFEM_DIR@/../blitz
 BLITZ_OPT = -I$(BLITZ_DIR)/include
-# On intel machines, use /lib64 instead of /lib.
 BLITZ_LIB = $(XLINKER)-rpath,$(BLITZ_DIR)/lib -L$(BLITZ_DIR)/lib -lblitz

 # ALGOIM library configuration
@@ -552,6 +553,9 @@ CEED_OPT = -I$(CEED_DIR)/include
 CEED_LIB = $(XLINKER)-rpath,$(CEED_DIR)/lib -L$(CEED_DIR)/lib -lceed

 # RAJA library configuration
+ifeq ($(MFEM_USE_RAJA),YES)
+   BASE_FLAGS = -std=c++14
+endif
 RAJA_DIR = @MFEM_DIR@/../raja
 RAJA_OPT = -I$(RAJA_DIR)/include
 ifdef CUB_DIR
@@ -566,6 +570,9 @@ endif
 RAJA_LIB = $(XLINKER)-rpath,$(RAJA_DIR)/lib -L$(RAJA_DIR)/lib -lRAJA $(CAMP_LIB)

 # UMPIRE library configuration
+ifeq ($(MFEM_USE_UMPIRE),YES)
+   BASE_FLAGS = -std=c++14
+endif
 UMPIRE_DIR = @MFEM_DIR@/../umpire
 UMPIRE_OPT = -I$(UMPIRE_DIR)/include $(if $(CAMP_DIR), -I$(CAMP_DIR)/include)
 UMPIRE_LIB = -L$(UMPIRE_DIR)/lib -lumpire $(CAMP_LIB)
@@ -593,6 +600,9 @@ PARELAG_OPT = -I$(PARELAG_DIR)/src -I$(PARELAG_DIR)/build/src
 PARELAG_LIB = -L$(PARELAG_DIR)/build/src -lParELAG

 # Tribol library configuration
+ifeq ($(MFEM_USE_TRIBOL),YES)
+   BASE_FLAGS = -std=c++14
+endif
 AXOM_DIR = @MFEM_DIR@/../axom
 TRIBOL_DIR = @MFEM_DIR@/../tribol
 TRIBOL_OPT = -I$(TRIBOL_DIR)/include -I$(AXOM_DIR)/include
@@ -615,15 +625,6 @@ 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
-
 # If YES, enable some informational messages
 VERBOSE = NO

@@ -1,4 +1,4 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+// Copyright (c) 2010-2024, 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.
 //
@@ -1,4 +1,4 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+// Copyright (c) 2010-2024, 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.
 //
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -36,8 +36,8 @@ cd $(git rev-parse --show-toplevel)
 # copyright check
 copyright=true
 if [[ "${option}" == "--copyright" || "${option}" == "" ]]; then
-  if git grep -n "^\(#\|//\).*Copyright.*2010-20\(2[^5]\|[^2].\)" > matches.txt; then
-    echo "Please update the following files to Copyright (c) 2010-2025:"
+  if git grep -n "^\(#\|//\).*Copyright.*2010-20\(2[^4]\|[^2].\)" > matches.txt; then
+    echo "Please update the following files to Copyright (c) 2010-2024:"
    cat matches.txt
    copyright=false
  fi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -110,5 +110,4 @@ config-mk:

 clean:
 	rm -f $(CONFIG_HPP) $(CONFIG_MK) sample-runs-build.log
-	rm -f $(GHV) $(GHV).out $(GMV) $(GMV).out
-	rm -rf *.dSYM
+	rm -f $(GHV) $(GHV).out $(GMV) $(GMV).out *.dSYM
@@ -1,6 +1,6 @@
 #!/bin/bash

-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+// Copyright (c) 2010-2024, 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.
 //
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -249,5 +249,3 @@ endif()
 if(MFEM_USE_MOONOLITH)
  add_subdirectory(moonolith)
 endif()
-
-add_subdirectory(dfem)
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2024, 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.
 #
@@ -1,116 +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.
-
-set(DFEM_EXAMPLES_SRCS)
-
-if (MFEM_USE_MPI)
-    list(APPEND DFEM_EXAMPLES_SRCS
-        plasticity.cpp
-        laghos.cpp
-    )
-endif()
-
-# Include the source directory where mfem.hpp and mfem-performance.hpp are.
-include_directories(BEFORE ${PROJECT_BINARY_DIR})
-
-# Add "test_dfem" target, see below.
-add_custom_target(test_dfem
-  ${CMAKE_CTEST_COMMAND} -R dfem USES_TERMINAL)
-
-# Add one executable per cpp file, adding "dfem_" as prefix so the CMake
-# target is unique from those in the non-dFEM examples. Also sets
-# "test_dfem" as a target that depends on the given dFEM examples.
-set(PFX dfem_)
-add_mfem_examples(DFEM_EXAMPLES_SRCS ${PFX} "" test_dfem)
-
-# Remove "dfem_" prefix from exectuable name for consistency with GNU build
-# system.
-foreach(SRC_FILE ${DFEM_EXAMPLES_SRCS})
-    get_filename_component(SRC_FILENAME ${SRC_FILE} NAME)
-    string(REPLACE ".cpp" "" TARGET_NAME "${PFX}${SRC_FILENAME}")
-    string(REPLACE ${PFX} "" EXE_NAME ${TARGET_NAME})
-    set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME ${EXE_NAME})
-endforeach()
-
-# Testing.
-# The dFEM tests can be run separately using the target "test_dfem"
-# which builds the examples and runs:
-#   ctest -R dfem
-
-if (MFEM_ENABLE_TESTING)
-    # Command line options for the tests.
-    # Example 9: test CVODE with CV_ADAMS (non-stiff implicit) time stepping
-    # set(EX9_COMMON_OPTS -m ../../data/periodic-hexagon.mesh -p 0 -s 7)
-    # set(EX9_TEST_OPTS ${EX9_COMMON_OPTS}  -r  2 -dt 0.0018 -vs 25)
-    # set(EX9P_TEST_OPTS ${EX9_COMMON_OPTS} -rp 1 -dt 0.0009 -vs 50)
-    # Example 10: test CVODE with CV_BDF (stiff implicit) time stepping
-    # set(EX10_COMMON_OPTS -m ../../data/beam-quad.mesh -o 2 -s 5 -dt 0.15 -tf 6 -vs 10)
-    # set(EX10_TEST_OPTS ${EX10_COMMON_OPTS}  -r  2)
-    # set(EX10P_TEST_OPTS ${EX10_COMMON_OPTS} -rp 1)
-    # Example 16: test ARKODE with implicit time stepping using mass form
-    # set(EX16_COMMON_OPTS -s 15)
-    # set(EX16_TEST_OPTS ${EX16_COMMON_OPTS})
-    # set(EX16P_TEST_OPTS ${EX16_COMMON_OPTS})
-
-    # Add the tests: one test per source file.
-    foreach(SRC_FILE ${DFEM_EXAMPLES_SRCS})
-        get_filename_component(SRC_FILENAME ${SRC_FILE} NAME)
-        string(REPLACE ".cpp" "" TEST_NAME ${SRC_FILENAME})
-        string(TOUPPER ${TEST_NAME} UP_TEST_NAME)
-        set(TEST_NAME ${PFX}${TEST_NAME})
-
-        set(THIS_TEST_OPTIONS "-no-vis")
-        list(APPEND THIS_TEST_OPTIONS ${${UP_TEST_NAME}_TEST_OPTS})
-        # message(STATUS "Test ${TEST_NAME} options: ${THIS_TEST_OPTIONS}")
-
-        if (NOT (${TEST_NAME} MATCHES ".*p$"))
-            add_test(NAME ${TEST_NAME}_ser
-        COMMAND ${TEST_NAME} ${THIS_TEST_OPTIONS})
-        else()
-            add_test(NAME ${TEST_NAME}_np=${MFEM_MPI_NP}
-        COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MFEM_MPI_NP}
-        ${MPIEXEC_PREFLAGS}
-        $<TARGET_FILE:${TEST_NAME}> ${THIS_TEST_OPTIONS}
-        ${MPIEXEC_POSTFLAGS})
-        endif()
-    endforeach()
-
-    # Add CUDA/HIP tests.
-    set(DEVICE_EXAMPLES
-      # parallel examples with device support:
-      # ex9p
-    )
-    set(MFEM_TEST_DEVICE)
-    if (MFEM_USE_CUDA)
-        set(MFEM_TEST_DEVICE "cuda")
-    elseif (MFEM_USE_HIP)
-        set(MFEM_TEST_DEVICE "hip")
-    endif()
-    if (MFEM_TEST_DEVICE)
-        foreach(TEST_NAME ${DEVICE_EXAMPLES})
-            string(TOUPPER ${TEST_NAME} UP_TEST_NAME)
-
-            set(THIS_TEST_OPTIONS "-no-vis" "-d" "${MFEM_TEST_DEVICE}")
-            list(APPEND THIS_TEST_OPTIONS ${${UP_TEST_NAME}_TEST_OPTS})
-
-            if (NOT (${TEST_NAME} MATCHES ".*p$"))
-                add_test(NAME ${PFX}${TEST_NAME}_${MFEM_TEST_DEVICE}_ser
-          COMMAND ${PFX}${TEST_NAME} ${THIS_TEST_OPTIONS})
-            else()
-                add_test(NAME ${PFX}${TEST_NAME}_${MFEM_TEST_DEVICE}_np=${MFEM_MPI_NP}
-          COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MFEM_MPI_NP}
-          ${MPIEXEC_PREFLAGS}
-          $<TARGET_FILE:${PFX}${TEST_NAME}> ${THIS_TEST_OPTIONS}
-          ${MPIEXEC_POSTFLAGS})
-            endif()
-        endforeach()
-    endif(MFEM_TEST_DEVICE)
-endif(MFEM_ENABLE_TESTING)
@@ -1,587 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-#include <mfem.hpp>
-
-// TODO: Do we want this to be included from mfem.hpp automatically now?
-#include <fem/dfem/doperator.hpp>
-#include <linalg/tensor.hpp>
-
-#include <fstream>
-
-using namespace mfem;
-using mfem::internal::tensor;
-
-constexpr int DIMENSION = 2;
-
-template <typename T, int dim>
-MFEM_HOST_DEVICE inline
-tensor<T, 3, 3> tensor_to_3D(const tensor<T, dim, dim>& A)
-{
-   tensor<T, 3, 3> A3D{};
-   for (int i = 0; i < dim; i++)
-   {
-      for (int j = 0; j < dim; j++)
-      {
-         A3D[i][j] = A[i][j];
-      }
-   }
-   return A3D;
-}
-
-template <typename Material, int dim = DIMENSION>
-struct InternalStateQFunction
-{
-   InternalStateQFunction() = default;
-
-   MFEM_HOST_DEVICE inline
-   auto operator()(
-      const tensor<real_t, dim, dim> &dudxi,
-      const tensor<real_t, dim, dim> &J,
-      const tensor<real_t, 10> &internal_state,
-      const double &w) const
-   {
-      auto invJ = inv(J);
-      auto dudX = dudxi * invJ;
-      auto dudX3D = tensor_to_3D(dudX);
-      //auto internal_state_new = get<1>(material(dudX3D, internal_state));
-      auto [stress, internal_state_new] = material(dudX3D, internal_state);
-      // real_t vm = sqrt(1.5)*norm(dev(stress));
-      // out << vm << " " << internal_state_new[9] << std::endl;
-      return mfem::tuple{internal_state_new};
-   }
-
-   Material material;
-};
-
-template <typename Material, int dim = DIMENSION>
-struct MomentumRefStateQFunction
-{
-   MomentumRefStateQFunction() = default;
-
-   MFEM_HOST_DEVICE inline
-   auto operator()(
-      const tensor<real_t, dim, dim> &dudxi,
-      const tensor<real_t, dim, dim> &J,
-      const tensor<real_t, 10> &internal_state,
-      const double &w) const
-   {
-      auto invJ = inv(J);
-      auto dudX = dudxi * invJ;
-      auto dudX3D = tensor_to_3D(dudX);
-      auto [P3D, Qnew] = material(dudX3D, internal_state);
-      auto P = mfem::internal::make_tensor<dim, dim>([&P3D](int i, int j) { return P3D[i][j]; });
-      auto JxW = det(J) * w * transpose(invJ);
-      return mfem::tuple{P * JxW};
-   }
-
-   Material material;
-};
-
-
-struct J2SmallStrain
-{
-   static constexpr int dim = 3;         ///< spatial dimension
-   static constexpr int n_internal_states = 10;
-   static constexpr double tol =
-      1e-10;  ///< relative tolerance on residual mag to judge convergence of return map
-
-   real_t E;                 ///< Young's modulus
-   real_t nu;                ///< Poisson's ratio
-   real_t sigma_y;           ///< Yield strength
-   real_t Hi;                ///< Isotropic hardening modulus
-   real_t density;           ///< Mass density
-
-   /// @brief variables required to characterize the hysteresis response
-   struct InternalState
-   {
-      tensor<double, dim, dim> plastic_strain;  ///< plastic strain
-      double accumulated_plastic_strain;        ///< uniaxial equivalent plastic strain
-   };
-
-   MFEM_HOST_DEVICE inline
-   InternalState unpack_internal_state(const tensor<real_t, n_internal_states> &
-                                       packed_state) const
-   {
-      // we could use type punning here to avoid copies
-      auto plastic_strain = mfem::internal::make_tensor<dim, dim>(
-      [&packed_state](int i, int j) { return packed_state[dim*i + j]; });
-      real_t accumulated_plastic_strain = packed_state[n_internal_states - 1];
-      return {plastic_strain, accumulated_plastic_strain};
-   }
-
-   MFEM_HOST_DEVICE inline
-   tensor<real_t, n_internal_states> pack_internal_state(const
-                                                         tensor<real_t, dim, dim> & plastic_strain,
-                                                         real_t accumulated_plastic_strain) const
-   {
-      tensor<real_t, n_internal_states> packed_state{};
-      for (int i = 0, ij = 0; i < dim; i++)
-      {
-         for (int j = 0; j < dim; j++, ij++)
-         {
-            packed_state[ij] = plastic_strain[i][j];
-         }
-      }
-      packed_state[n_internal_states - 1] = accumulated_plastic_strain;
-      return packed_state;
-   }
-
-   MFEM_HOST_DEVICE inline
-   tuple<tensor<real_t, dim, dim>, tensor<real_t, n_internal_states>>
-                                                                   operator()(const tensor<real_t, dim, dim> & dudX,
-                                                                              const tensor<real_t, n_internal_states> & internal_state) const
-   {
-      auto I = mfem::internal::Identity<dim>();
-      const real_t K = E / (3.0 * (1.0 - 2.0 * nu));
-      const real_t G = 0.5 * E / (1.0 + nu);
-
-      auto [plastic_strain, accumulated_plastic_strain] = unpack_internal_state(
-                                                             internal_state);
-
-      // (i) elastic predictor
-      auto el_strain = sym(dudX) - plastic_strain;
-      auto p = K * tr(el_strain);
-      auto s = 2.0 * G * dev(el_strain);
-      auto q = sqrt(1.5) * norm(s);
-      [[maybe_unused]] real_t delta_eqps = 0.0;
-
-      [[maybe_unused]] auto flow_strength = [this](real_t eqps) { return this->sigma_y + this->Hi*eqps; };
-
-      // (ii) admissibility
-      if (q - (sigma_y + Hi*accumulated_plastic_strain) > tol*sigma_y)
-      {
-         // (iii) return mapping
-         real_t delta_eqps = (q - sigma_y - Hi*accumulated_plastic_strain)/(3*G + Hi);
-         auto Np = 1.5 * s / q;
-         s -= 2.0 * G * delta_eqps * Np;
-         plastic_strain += delta_eqps * Np;
-         accumulated_plastic_strain += delta_eqps;
-      }
-      auto stress = s + p * I;
-      auto internal_state_new = pack_internal_state(plastic_strain,
-                                                    accumulated_plastic_strain);
-      return {stress, internal_state_new};
-   }
-};
-
-class ElasticityOperator : public Operator
-{
-   static constexpr int Displacement = 0;
-   static constexpr int Coordinates = 1;
-   static constexpr int InternalState = 2;
-
-public:
-   class ElasticityJacobianOperator : public Operator
-   {
-   public:
-      ElasticityJacobianOperator(const ElasticityOperator *elasticity,
-                                 const Vector &x) :
-         Operator(elasticity->Height()),
-         elasticity(elasticity),
-         z(elasticity->Height())
-      {
-         ParGridFunction u(&elasticity->displacement_fes);
-         u.SetFromTrueDofs(x);
-         auto mesh_nodes = static_cast<ParGridFunction*>
-                           (elasticity->displacement_fes.GetParMesh()->GetNodes());
-         momentum_du = elasticity->momentum->GetDerivative(Displacement, {&u}, {mesh_nodes, &elasticity->internal_state});
-      }
-
-      void Mult(const Vector &x, Vector &y) const override
-      {
-         z = x;
-         z.SetSubVector(elasticity->displacement_ess_tdof, 0.0);
-
-         momentum_du->Mult(z, y);
-
-         for (int i = 0; i < elasticity->displacement_ess_tdof.Size(); i++)
-         {
-            y[elasticity->displacement_ess_tdof[i]] =
-               x[elasticity->displacement_ess_tdof[i]];
-         }
-      }
-
-      const ElasticityOperator *elasticity;
-      std::shared_ptr<DerivativeOperator> momentum_du;
-      mutable Vector z;
-   };
-
-   template <typename Material>
-   ElasticityOperator(ParFiniteElementSpace &displacement_fes,
-                      Array<int> &vel_ess_tdofs,
-                      const IntegrationRule &displacement_ir,
-                      ParametricFunction &internal_state,
-                      Material material) :
-      Operator(displacement_fes.GetTrueVSize()),
-      density(1.0e3),
-      body_force(displacement_fes.GetTrueVSize()),
-      displacement_ess_tdof(vel_ess_tdofs),
-      displacement_fes(displacement_fes),
-      displacement_ir(displacement_ir),
-      internal_state(internal_state)
-   {
-      auto mesh = displacement_fes.GetParMesh();
-      mesh_nodes = static_cast<ParGridFunction*>(mesh->GetNodes());
-      ParFiniteElementSpace& mesh_fes = *mesh_nodes->ParFESpace();
-
-      {
-         auto solutions = std::vector
-         {
-            FieldDescriptor{Displacement, &displacement_fes},
-         };
-
-         auto parameters = std::vector
-         {
-            FieldDescriptor{Coordinates, &mesh_fes},
-            FieldDescriptor{InternalState, &internal_state.space}
-         };
-
-         momentum =
-            std::make_shared<DifferentiableOperator>(solutions, parameters, *mesh);
-         momentum->DisableTensorProductStructure();
-
-         mfem::tuple inputs{Gradient<Displacement>{}, Gradient<Coordinates>{}, None<InternalState>{}, Weight{}};
-         mfem::tuple outputs{Gradient<Displacement>{}};
-
-         auto momentum_qf = MomentumRefStateQFunction<Material, DIMENSION> {.material = material};
-         auto derivatives = std::integer_sequence<size_t, Displacement> {};
-         Array<int> solid_domain_attr(mesh->attributes.Max());
-         solid_domain_attr[0] = 1;
-         momentum->AddDomainIntegrator(
-            momentum_qf, inputs, outputs, displacement_ir, solid_domain_attr, derivatives);
-      }
-
-      {
-         Vector g(DIMENSION);
-         g = 0.0;
-
-         ParLinearForm body_force_lf(&displacement_fes);
-         body_force_coef = new VectorConstantCoefficient(g);
-         auto integ = new VectorDomainLFIntegrator(*body_force_coef);
-         integ->SetIntRule(&displacement_ir);
-         body_force_lf.AddDomainIntegrator(integ);
-         body_force_lf.Assemble();
-         body_force_lf.ParallelAssemble(body_force);
-      }
-   }
-
-   void Mult(const Vector &displacement, Vector &r) const override
-   {
-      momentum->SetParameters({mesh_nodes, &internal_state});
-      momentum->Mult(displacement, r);
-      r -= body_force;
-      r.SetSubVector(displacement_ess_tdof, 0.0);
-   }
-
-   void Reaction(const Vector &displacement, Vector &r) const
-   {
-      momentum->SetParameters({mesh_nodes, &internal_state});
-      momentum->Mult(displacement, r);
-      r -= body_force;
-      r.Neg();
-   }
-
-   Operator &GetGradient(const Vector &x) const override
-   {
-      jacobian_operator = std::make_shared<ElasticityJacobianOperator>(this, x);
-      return *jacobian_operator;
-
-      // fd_jacobian = std::make_shared<FDJacobian>(*this, x);
-      // return *fd_jacobian;
-   }
-
-   real_t density;
-   std::shared_ptr<DifferentiableOperator> momentum;
-   mutable std::shared_ptr<HypreParMatrix> A;
-   VectorConstantCoefficient *body_force_coef = nullptr;
-   Vector body_force;
-
-   ParGridFunction *mesh_nodes;
-
-   const Array<int> displacement_ess_tdof;
-
-   ParFiniteElementSpace &displacement_fes;
-   IntegrationRule displacement_ir;
-
-   ParametricFunction& internal_state;
-
-   mutable std::shared_ptr<ElasticityJacobianOperator> jacobian_operator;
-   mutable std::shared_ptr<FDJacobian> fd_jacobian;
-};
-
-
-class InternalStateUpdater : public Operator
-{
-public:
-
-   static constexpr int Displacement = 0;
-   static constexpr int Coordinates = 1;
-   static constexpr int InternalState = 2;
-
-   template <typename Material>
-   InternalStateUpdater(ParFiniteElementSpace &displacement_fes,
-                        const IntegrationRule &displacement_ir,
-                        ParametricFunction &internal_state,
-                        Material material) :
-      Operator(displacement_fes.GetTrueVSize()),
-      displacement_fes(displacement_fes),
-      displacement_ir(displacement_ir),
-      internal_state(internal_state)
-   {
-      auto mesh = displacement_fes.GetParMesh();
-      mesh_nodes = static_cast<ParGridFunction*>(mesh->GetNodes());
-      ParFiniteElementSpace& mesh_fes = *mesh_nodes->ParFESpace();
-
-      auto solutions = std::vector
-      {
-         FieldDescriptor{Displacement, &displacement_fes}
-      };
-
-      auto parameters = std::vector
-      {
-         FieldDescriptor{Coordinates, &mesh_fes},
-         FieldDescriptor{InternalState, &internal_state.space}
-      };
-
-      op = std::make_shared<DifferentiableOperator>(solutions, parameters, *mesh);
-      op->DisableTensorProductStructure();
-
-      mfem::tuple inputs{Gradient<Displacement>{}, Gradient<Coordinates>{}, None<InternalState>{}, Weight{}};
-      mfem::tuple outputs{None<InternalState>{}};
-
-      auto qfunction = InternalStateQFunction<Material, DIMENSION> {.material = material};
-      // just a placeholder for now. We want vjps wrt both displacement and old internal state eventually
-      auto derivatives = std::integer_sequence<size_t, Displacement> {};
-      Array<int> solid_domain_attr(mesh->attributes.Max());
-      solid_domain_attr[0] = 1;
-      op->AddDomainIntegrator(
-         qfunction, inputs, outputs, displacement_ir, solid_domain_attr, derivatives);
-   }
-
-   void Mult(const Vector &displacement, Vector& internal_state_new) const override
-   {
-      op->SetParameters({mesh_nodes, &internal_state});
-      op->Mult(displacement, internal_state_new);
-   }
-
-   void VjpDisplacement(ParGridFunction &u, Vector& internal_state_old,
-                        Vector& internal_state_new_bar, Vector& displacement_bar) const
-   {
-      // u, internal_state_old, internal_state_new_bar should be const
-      out << "Sizes " << "u " << u.Size() << ", qold " << internal_state_old.Size() <<
-          ", qbar " << internal_state_new_bar.Size() << ", ubar " <<
-          displacement_bar.Size() << std::endl;
-      auto grad_op = op->GetDerivative(Displacement, {&u}, {mesh_nodes, &internal_state_old});
-      out << "grad_op " << grad_op->Height() << " " << grad_op->Width() << std::endl;
-      out << "grad_op^T " << grad_op->Width() << " " << grad_op->Height() <<
-          std::endl;
-      grad_op->MultTranspose(internal_state_new_bar, displacement_bar);
-   }
-
-   ParGridFunction *mesh_nodes;
-   ParFiniteElementSpace &displacement_fes;
-   std::shared_ptr<DifferentiableOperator> op;
-   IntegrationRule displacement_ir;
-   ParametricFunction& internal_state;
-};
-
-
-int main(int argc, char* argv[])
-{
-   constexpr int dim = 2;
-
-   Mpi::Init();
-
-   const char* device_config = "cpu";
-   int polynomial_order = 1;
-   int ir_order = 2;
-   int refinements = 0;
-   int nonlinear_solver_type = 0;
-
-   OptionsParser args(argc, argv);
-   args.AddOption(&polynomial_order, "-o", "--order", "");
-   args.AddOption(&refinements, "-r", "--refinements", "");
-   args.AddOption(&ir_order, "-iro", "--integration-rule-order", "");
-   args.AddOption(&device_config, "-d", "--device",
-                  "Device configuration string, see Device::Configure().");
-   args.AddOption(&nonlinear_solver_type, "-nls", "--nonlinear-solver", "");
-   args.ParseCheck();
-
-   Device device(device_config);
-   if (Mpi::Root() == 0)
-   {
-      device.Print();
-   }
-
-   out << std::setprecision(8);
-
-   Mesh mesh_serial = Mesh::MakeCartesian2D(1, 1, Element::QUADRILATERAL,
-                                            false, 1.0, 0.1);
-   mesh_serial.EnsureNodes();
-   auto mesh_beam = ParMesh(MPI_COMM_WORLD, mesh_serial);
-
-   out << "#el: " << mesh_beam.GetNE() << "\n";
-
-   H1_FECollection displacement_fec(polynomial_order, dim);
-   ParFiniteElementSpace displacement_fes(&mesh_beam, &displacement_fec, dim);
-
-   HYPRE_BigInt global_size = displacement_fes.GlobalTrueVSize();
-   if (Mpi::Root())
-   {
-      out << "Number of unknowns: " << global_size << "\n";
-   }
-
-   const IntegrationRule &displacement_ir =
-      IntRules.Get(displacement_fes.GetFE(0)->GetGeomType(),
-                   2 * ir_order + displacement_fes.GetFE(0)->GetOrder());
-
-   constexpr int n_internal_state_variables = 10;
-   ParametricSpace internal_state_space(dim, n_internal_state_variables,
-                                        displacement_ir.GetNPoints(),
-                                        n_internal_state_variables*displacement_ir.GetNPoints()*mesh_beam.GetNE());
-
-   ParametricFunction internal_state(internal_state_space);
-   internal_state = 0.0;
-   ParametricFunction internal_state_old(internal_state_space);
-   internal_state_old = 0.0;
-
-   Array<int> bdr_attr_is_ess(mesh_beam.bdr_attributes.Max());
-   Array<int> displacement_ess_tdof;
-   Array<int> bc_tdof;
-
-   bdr_attr_is_ess = 0;
-   bdr_attr_is_ess[0] = 1;
-   displacement_fes.GetEssentialTrueDofs(bdr_attr_is_ess, bc_tdof, 1);
-   for (auto td : bc_tdof) { displacement_ess_tdof.Append(td); };
-
-   bdr_attr_is_ess = 0;
-   bdr_attr_is_ess[3] = 1;
-   displacement_fes.GetEssentialTrueDofs(bdr_attr_is_ess, bc_tdof, 0);
-   for (auto td : bc_tdof) { displacement_ess_tdof.Append(td); };
-
-   bdr_attr_is_ess = 0;
-   bdr_attr_is_ess[1] = 1;
-   displacement_fes.GetEssentialTrueDofs(bdr_attr_is_ess, bc_tdof, 0);
-   for (auto td : bc_tdof) { displacement_ess_tdof.Append(td); };
-
-   ParGridFunction u(&displacement_fes);
-   u = 0.0;
-
-   using Material = J2SmallStrain; // StVenantKirchhoff
-   Material material{.E = 1000.0, .nu = 0.25, .sigma_y = 0.53333, .Hi = 40.0, .density = 1.0};
-   // Material material{.mu = 0.5e6, .nu = 0.4};
-
-   ElasticityOperator elasticity(displacement_fes, displacement_ess_tdof,
-                                 displacement_ir, internal_state, material);
-
-   CGSolver solver(MPI_COMM_WORLD);
-   solver.SetAbsTol(0.0);
-   solver.SetRelTol(1e-10);
-   solver.SetMaxIter(1000);
-   solver.SetPrintLevel(2);
-
-   std::shared_ptr<NewtonSolver> nonlinear_solver;
-   if (nonlinear_solver_type == 0)
-   {
-      nonlinear_solver = std::make_shared<NewtonSolver>(MPI_COMM_WORLD);
-   }
-   // else if (nonlinear_solver_type == 1)
-   // {
-   //    nonlinear_solver = std::make_shared<KINSolver>(MPI_COMM_WORLD, KIN_LINESEARCH);
-   // }
-   else
-   {
-      MFEM_ABORT("invalid nonlinear solver type");
-   }
-   nonlinear_solver->SetOperator(elasticity);
-   nonlinear_solver->SetRelTol(1e-9);
-   nonlinear_solver->SetMaxIter(25);
-   nonlinear_solver->SetSolver(solver);
-   nonlinear_solver->SetPrintLevel(1);
-
-   // variables for output
-   QuadratureSpace output_internal_state_space(mesh_beam, displacement_ir);
-   QuadratureFunction output_internal_state(&output_internal_state_space,
-                                            internal_state.GetData(), material.n_internal_states);
-   Vector r(displacement_fes.GetTrueVSize());
-   ParGridFunction reaction(&displacement_fes);
-   Vector end_forces_x(bc_tdof.Size());
-
-   ParaViewDataCollection dc("dfem_plasticity", &mesh_beam);
-   dc.SetHighOrderOutput(true);
-   dc.SetLevelsOfDetail(1);
-   dc.RegisterField("displacement", &u);
-   dc.RegisterField("reaction", &reaction);
-   dc.RegisterQField("internal_state", &output_internal_state);
-   dc.SetCycle(0);
-   dc.Save();
-
-   InternalStateUpdater internal_state_update(displacement_fes, displacement_ir,
-                                              internal_state, material);
-   //Vector q(internal_state_space.GetTotalSize());
-
-   auto applied_displacement = [](double t) { return 1.2e-2*t; };
-
-   real_t time = 0.0;
-   std::ofstream history_file("history_output.csv");
-   history_file << applied_displacement(time) << " " << 0.0 << std::endl;
-
-   Vector zero, x(displacement_fes.GetTrueVSize());
-
-   constexpr int max_cycles = 3;
-   const real_t dt = 1.0/(max_cycles - 1);
-   for (int cycle = 1; cycle < max_cycles; cycle++)
-   {
-      time += dt;
-      out << "-------------------------------------------" << std::endl;
-      out << "TIME STEP " << cycle << std::endl;
-      out << "t = " << time << std::endl;
-
-      real_t ubc = applied_displacement(time);
-      u.SetSubVector(bc_tdof, ubc);
-
-      u.GetTrueDofs(x);
-      nonlinear_solver->Mult(zero, x);
-      u.SetFromTrueDofs(x);
-
-      // update internal variables
-      internal_state_old.Set(1.0, internal_state);
-      internal_state_update.Mult(u, internal_state);
-
-      // Compute reactions
-      elasticity.Reaction(x, r);
-      reaction.SetFromTrueDofs(r);
-      reaction.GetSubVector(bc_tdof, end_forces_x);
-      real_t force = -end_forces_x.Sum();
-      out << "u = " << applied_displacement(time) << ", Force = " << force <<
-          std::endl;
-      history_file << applied_displacement(time) << " " << force << std::endl;
-
-      output_internal_state = internal_state;
-
-      dc.SetCycle(cycle);
-      dc.SetTime(time);
-      dc.Save();
-   }
-
-   // try to use the derivative to see if it works
-   ParametricFunction internal_state_bar(internal_state_space);
-   internal_state_bar = 1.0;
-   //ParGridFunction u_bar(displacement_fes);
-   Vector u_bar(displacement_fes.GetTrueVSize());
-   internal_state_update.VjpDisplacement(u, internal_state_old, internal_state_bar,
-                                         u_bar);
-
-   pretty_print(u_bar);
-
-   history_file.close();
-   return 0;
-}
@@ -163,18 +163,13 @@ int main(int argc, char *argv[])

   // 6. Determine the list of true (i.e. conforming) essential boundary dofs.
   //    In this example, the boundary conditions are defined by marking all
-   //    the external boundary attributes from the mesh as essential (Dirichlet)
-   //    and converting them to a list of true dofs.
+   //    the boundary attributes from the mesh as essential (Dirichlet) and
+   //    converting them to a list of true dofs.
   Array<int> ess_tdof_list;
   if (mesh.bdr_attributes.Size())
   {
      Array<int> ess_bdr(mesh.bdr_attributes.Max());
-      ess_bdr = 0;
-      // Apply boundary conditions on all external boundaries:
-      mesh.MarkExternalBoundaries(ess_bdr);
-      // Boundary conditions can also be applied based on named attributes:
-      // mesh.MarkNamedBoundaries(set_name, ess_bdr)
-
+      ess_bdr = 1;
      fespace.GetEssentialTrueDofs(ess_bdr, ess_tdof_list);
   }

@@ -3,14 +3,14 @@
 // Compile with: make ex10
 //
 // Sample runs:
-//    ex10 -m ../data/beam-quad.mesh -s 23 -r 2 -o 2 -dt 3
-//    ex10 -m ../data/beam-tri.mesh -s 23 -r 2 -o 2 -dt 3
-//    ex10 -m ../data/beam-hex.mesh -s 22 -r 1 -o 2 -dt 3
-//    ex10 -m ../data/beam-tet.mesh -s 22 -r 1 -o 2 -dt 3
-//    ex10 -m ../data/beam-wedge.mesh -s 22 -r 1 -o 2 -dt 3
-//    ex10 -m ../data/beam-quad.mesh -s 4 -r 2 -o 2 -dt 0.03 -vs 20
-//    ex10 -m ../data/beam-hex.mesh -s 4 -r 1 -o 2 -dt 0.05 -vs 20
-//    ex10 -m ../data/beam-quad-amr.mesh -s 23 -r 2 -o 2 -dt 3
+//    ex10 -m ../data/beam-quad.mesh -s 3 -r 2 -o 2 -dt 3
+//    ex10 -m ../data/beam-tri.mesh -s 3 -r 2 -o 2 -dt 3
+//    ex10 -m ../data/beam-hex.mesh -s 2 -r 1 -o 2 -dt 3
+//    ex10 -m ../data/beam-tet.mesh -s 2 -r 1 -o 2 -dt 3
+//    ex10 -m ../data/beam-wedge.mesh -s 2 -r 1 -o 2 -dt 3
+//    ex10 -m ../data/beam-quad.mesh -s 14 -r 2 -o 2 -dt 0.03 -vs 20
+//    ex10 -m ../data/beam-hex.mesh -s 14 -r 1 -o 2 -dt 0.05 -vs 20
+//    ex10 -m ../data/beam-quad-amr.mesh -s 3 -r 2 -o 2 -dt 3
 //
 // Description:  This examples solves a time dependent nonlinear elasticity
 //               problem of the form dv/dt = H(x) + S v, dx/dt = v, where H is a
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
   const char *mesh_file = "../data/beam-quad.mesh";
   int ref_levels = 2;
   int order = 2;
-   int ode_solver_type = 23;
+   int ode_solver_type = 3;
   real_t t_final = 300.0;
   real_t dt = 3.0;
   real_t visc = 1e-2;
@@ -177,7 +177,11 @@ int main(int argc, char *argv[])
   args.AddOption(&order, "-o", "--order",
                  "Order (degree) of the finite elements.");
   args.AddOption(&ode_solver_type, "-s", "--ode-solver",
-                  ODESolver::Types.c_str());
+                  "ODE solver: 1 - Backward Euler, 2 - SDIRK2, 3 - SDIRK3,\n\t"
+                  "            11 - Forward Euler, 12 - RK2,\n\t"
+                  "            13 - RK3 SSP, 14 - RK4."
+                  "            22 - Implicit Midpoint Method,\n\t"
+                  "            23 - SDIRK23 (A-stable), 24 - SDIRK34");
   args.AddOption(&t_final, "-tf", "--t-final",
                  "Final time; start time is 0.");
   args.AddOption(&dt, "-dt", "--time-step",
@@ -209,7 +213,28 @@ int main(int argc, char *argv[])
   // 3. Define the ODE solver used for time integration. Several implicit
   //    singly diagonal implicit Runge-Kutta (SDIRK) methods, as well as
   //    explicit Runge-Kutta methods are available.
-   unique_ptr<ODESolver> ode_solver = ODESolver::Select(ode_solver_type);
+   ODESolver *ode_solver;
+   switch (ode_solver_type)
+   {
+      // Implicit L-stable methods
+      case 1: ode_solver = new BackwardEulerSolver; break;
+      case 2: ode_solver = new SDIRK23Solver(2); break;
+      case 3: ode_solver = new SDIRK33Solver; break;
+      // Explicit methods
+      case 11: ode_solver = new ForwardEulerSolver; break;
+      case 12: ode_solver = new RK2Solver(0.5); break; // midpoint method
+      case 13: ode_solver = new RK3SSPSolver; break;
+      case 14: ode_solver = new RK4Solver; break;
+      case 15: ode_solver = new GeneralizedAlphaSolver(0.5); break;
+      // Implicit A-stable methods (not L-stable)
+      case 22: ode_solver = new ImplicitMidpointSolver; break;
+      case 23: ode_solver = new SDIRK23Solver; break;
+      case 24: ode_solver = new SDIRK34Solver; break;
+      default:
+         cout << "Unknown ODE solver type: " << ode_solver_type << '\n';
+         delete mesh;
+         return 3;
+   }

   // 4. Refine the mesh to increase the resolution. In this example we do
   //    'ref_levels' of uniform refinement, where 'ref_levels' is a
@@ -346,6 +371,7 @@ int main(int argc, char *argv[])
   }

   // 10. Free the used memory.
+   delete ode_solver;
   delete mesh;

   return 0;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tucker Hartland	17e11faf07	adding the missing makefile and updating some of the files, cleanup, etc	2024-10-16 10:30:28 -07:00
Tucker Hartland	2a482c0c9e	simple interior-point solver code with generic problem structure and a few example problems	2024-10-15 17:20:18 -07:00