Merge branch 'master' into lor-consistent-mass-dev

CHANGELOG

@@ -66,15 +66,11 @@ Linear and nonlinear solvers
 
 GPU computing
 -------------
-- Added device assembly support for 3D H(curl) VectorFEDomainLFIntegrator.
-
 - Added NVIDIA cuDSS library interface. Implementation examples have been
   added to ex1 and ex1p. See https://developer.nvidia.com/cudss for more
   details. Supported versions >= 0.6.0.
 
 - Allow specifying GPU kernel launch bounds for native and RAJA GPU backends.
-- Added support for FiniteElement::MapType::INTEGRAL spaces to
-  QuadratureInterpolator.
 
 New and updated examples and miniapps
 -------------------------------------

config/cmake/modules/FindGSLIB.cmake

@@ -18,17 +18,19 @@
 
 if (MFEM_FETCH_GSLIB OR MFEM_FETCH_TPLS)
   enable_language(C)
-  set(GSLIB_FETCH_VERSION 1.0.9)
-  add_library(GSLIB STATIC IMPORTED)
-  # set options (technically flags because GSLIB does not use cmake)
   string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
-  set(GSLIB_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}")
-  if (BUILD_SHARED_LIBS)
-    set(GSLIB_FLAGS "${GSLIB_FLAGS} -fPIC")
+  set(GSLIB_FETCH_VERSION 1.0.9)
+  set(GSLIB_C_FLAGS ${CMAKE_C_FLAGS_${BUILD_TYPE}})
+  if (CMAKE_C_FLAGS)
+    set(GSLIB_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}")
   endif()
+  if (BUILD_SHARED_LIBS)
+    set(GSLIB_C_FLAGS "${GSLIB_C_FLAGS} -fPIC")
+  endif()
+  add_library(GSLIB STATIC IMPORTED)
   # define external project and create future include directory so it is present
   # to pass CMake checks at end of MFEM configuration step
-  message(STATUS "Will fetch GSLIB ${GSLIB_FETCH_VERSION} to be built with ${GSLIB_FLAGS}")
+  message(STATUS "Will fetch GSLIB ${GSLIB_FETCH_VERSION} to be built with ${GSLIB_C_FLAGS}")
   set(PREFIX ${CMAKE_BINARY_DIR}/fetch/gslib)
   include(ExternalProject)
   ExternalProject_Add(gslib
@@ -38,7 +40,7 @@ if (MFEM_FETCH_GSLIB OR MFEM_FETCH_TPLS)
     UPDATE_DISCONNECTED TRUE
     PREFIX ${PREFIX}
     CONFIGURE_COMMAND ""
-    BUILD_COMMAND cd ${PREFIX}/src/gslib && $(MAKE) clean && $(MAKE) DESTDIR=${PREFIX} MPI=$<BOOL:${MFEM_USE_MPI}> "CFLAGS=${GSLIB_FLAGS}"
+    BUILD_COMMAND cd ${PREFIX}/src/gslib && $(MAKE) clean && $(MAKE) DESTDIR=${PREFIX} MPI=$<BOOL:${MFEM_USE_MPI}> "CFLAGS= ${GSLIB_C_FLAGS}"
     INSTALL_COMMAND "")
   file(MAKE_DIRECTORY ${PREFIX}/include)
   # set imported library target properties

config/cmake/modules/FindHYPRE.cmake

@@ -44,9 +44,6 @@ if (MFEM_FETCH_HYPRE OR MFEM_FETCH_TPLS)
   # set options and associated dependencies
   set(HYPRE_CMAKE_OPTIONS "")
   list(APPEND HYPRE_CMAKE_OPTIONS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
-  if (BUILD_SHARED_LIBS)
-    list(APPEND HYPRE_CMAKE_OPTIONS -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON)
-  endif()
   # collect all HYPRE_ENABLE variables and pass them to hypre, assuming they are BOOL.
   get_cmake_property(all_vars VARIABLES)
   foreach(var ${all_vars})
@@ -98,6 +95,7 @@ if (MFEM_FETCH_HYPRE OR MFEM_FETCH_TPLS)
     UPDATE_DISCONNECTED TRUE
     SOURCE_SUBDIR src
     PREFIX ${HYPRE_INSTALL}
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . -- -j${CMAKE_BUILD_PARALLEL_LEVEL}
     CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${HYPRE_INSTALL} -DCMAKE_INSTALL_LIBDIR:PATH=lib ${HYPRE_CMAKE_OPTIONS})
   file(MAKE_DIRECTORY ${HYPRE_INSTALL}/include)
   # set imported library target properties

config/cmake/modules/FindMETIS.cmake

@@ -19,18 +19,10 @@
 #   - METIS_VERSION_5 (cache variable)
 
 if (MFEM_FETCH_METIS OR MFEM_FETCH_TPLS)
-  enable_language(C)
   set(METIS_FETCH_VERSION 4.0.3)
   add_library(METIS STATIC IMPORTED)
-  # set options (technically flags because METIS does not use cmake)
-  set(METIS_FLAGS "-Wno-implicit-int -Wno-incompatible-pointer-types")
-  string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
-  set(METIS_FLAGS "${METIS_FLAGS} ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}")
-  if (BUILD_SHARED_LIBS)
-    set(METIS_FLAGS "${METIS_FLAGS} -fPIC")
-  endif()
   # define external project
-  message(STATUS "Will fetch METIS ${METIS_FETCH_VERSION} to be built with ${METIS_FLAGS}")
+  message(STATUS "Will fetch METIS ${METIS_FETCH_VERSION} to be built with default options")
   set(PREFIX ${CMAKE_BINARY_DIR}/fetch/metis)
   include(ExternalProject)
   ExternalProject_Add(metis
@@ -40,7 +32,7 @@ if (MFEM_FETCH_METIS OR MFEM_FETCH_TPLS)
     UPDATE_DISCONNECTED TRUE
     PREFIX ${PREFIX}
     CONFIGURE_COMMAND tar -xzf ../metis/metis-${METIS_FETCH_VERSION}-mac.tgz --strip=1
-    BUILD_COMMAND $(MAKE) clean && $(MAKE) "OPTFLAGS=${METIS_FLAGS}"
+    BUILD_COMMAND $(MAKE) COPTIONS=-Wno-incompatible-pointer-types
     INSTALL_COMMAND mkdir -p ${PREFIX}/lib && cp libmetis.a ${PREFIX}/lib/)
   # set imported library target properties
   add_dependencies(METIS metis)

fem/bilinearform.cpp

@@ -1255,31 +1255,6 @@ void BilinearForm::Mult(const Vector &x, Vector &y) const
    }
 }
 
-void BilinearForm::AddMult(const Vector &x, Vector &y, const real_t a) const
-{
-   if (ext)
-   {
-      ext->AddMult(x, y, a);
-   }
-   else
-   {
-      mat->AddMult(x, y, a);
-   }
-}
-
-void BilinearForm::AddMultTranspose(const Vector &x, Vector &y,
-                                    const real_t a) const
-{
-   if (ext)
-   {
-      ext->AddMultTranspose(x, y, a);
-   }
-   else
-   {
-      mat->AddMultTranspose(x, y, a);
-   }
-}
-
 void BilinearForm::MultTranspose(const Vector & x, Vector & y) const
 {
    if (ext)

fem/bilinearform.hpp

@@ -307,8 +307,8 @@ public:
    { mat->Mult(x, y); mat_e->AddMult(x, y); }
 
    /// Add the matrix vector multiple to a vector:  $ y += a M x $
-   void AddMult(const Vector &x, Vector &y,
-                const real_t a = 1.0) const override;
+   void AddMult(const Vector &x, Vector &y, const real_t a = 1.0) const override
+   { mat -> AddMult (x, y, a); }
 
    /** @brief Add the original uneliminated matrix vector multiple to a vector.
        The original matrix is $ M + Me $ so we have:
@@ -318,7 +318,8 @@ public:
 
    /// Add the matrix transpose vector multiplication:  $ y += a M^T x $
    void AddMultTranspose(const Vector & x, Vector & y,
-                         const real_t a = 1.0) const override;
+                         const real_t a = 1.0) const override
+   { mat->AddMultTranspose(x, y, a); }
 
    /** @brief Add the original uneliminated matrix transpose vector
        multiple to a vector. The original matrix is $ M + M_e $

fem/bilininteg.hpp

@@ -1110,36 +1110,20 @@ public:
    MixedDotProductIntegrator(VectorCoefficient &vq)
       : MixedScalarVectorIntegrator(vq, true) {}
 
-   inline bool VerifyFiniteElementTypes(
+   inline virtual bool VerifyFiniteElementTypes(
       const FiniteElement & trial_fe,
-      const FiniteElement & test_fe) const override
+      const FiniteElement & test_fe) const
    {
       return (trial_fe.GetRangeType() == mfem::FiniteElement::VECTOR &&
               test_fe.GetRangeType()  == mfem::FiniteElement::SCALAR );
    }
 
-   inline const char * FiniteElementTypeFailureMessage() const override
+   inline virtual const char * FiniteElementTypeFailureMessage() const
    {
       return "MixedDotProductIntegrator:  "
              "Trial space must be a vector field "
              "and the test space must be a scalar field";
    }
-
-   using BilinearFormIntegrator::AssemblePA;
-   void AssemblePA(const FiniteElementSpace &trial_fes,
-                   const FiniteElementSpace &test_fes) override;
-
-   void AddMultPA(const Vector&, Vector&) const override;
-   void AddMultTransposePA(const Vector&, Vector&) const override;
-
-private:
-   Vector pa_data;
-   const DofToQuad *mapsO = nullptr;      ///< Not owned. Trial open map.
-   const DofToQuad *mapsC = nullptr;      ///< Not owned. Trial closed map.
-   const DofToQuad *mapsTest = nullptr;   ///< Not owned. Scalar test map.
-   const GeometricFactors *geom = nullptr;///< Not owned.
-   int dim = 0, ne = 0, dofs1D = 0, dofs1Dtest = 0, quad1D = 0;
-   bool test_map_integral = false;
 };
 
 /** Class for integrating the bilinear form $a(u,v) := (-\vec{V} \cdot u, \nabla \cdot v)$ in 2D or
@@ -3011,10 +2995,11 @@ public:
     vector (diagonal matrix), or matrix), trial function $u$ is in $H(curl$ or
     $H(div)$, and test function $v$ is in $H(curl$, $H(div)$, or $v=(v_1,\dots,v_n)$, where
     $v_i$ are in $H^1$. */
-class VectorFEMassIntegrator : public BilinearFormIntegrator
+class VectorFEMassIntegrator: public BilinearFormIntegrator
 {
 private:
-   void Init(Coefficient *q, DiagonalMatrixCoefficient *dq, MatrixCoefficient *mq);
+   void Init(Coefficient *q, DiagonalMatrixCoefficient *dq, MatrixCoefficient *mq)
+   { Q = q; DQ = dq; MQ = mq; }
 
 #ifndef MFEM_THREAD_SAFE
    Vector shape;
@@ -3037,8 +3022,7 @@ protected:
    const DofToQuad *mapsOtest;     ///< Not owned. DOF-to-quad map, open.
    const DofToQuad *mapsCtest;     ///< Not owned. DOF-to-quad map, closed.
    const GeometricFactors *geom;   ///< Not owned
-   int dim, ne, nq, dofs1D, dofs1Dtest, quad1D;
-   FiniteElement::DerivType trial_fetype, test_fetype;
+   int dim, ne, nq, dofs1D, dofs1Dtest, quad1D, trial_fetype, test_fetype;
    bool symmetric = true; ///< False if using a nonsymmetric matrix coefficient
 
 public:
@@ -3069,29 +3053,6 @@ public:
                    const bool add) override;
 
    const Coefficient *GetCoefficient() const { return Q; }
-
-   using ApplyKernelType =
-      void (*)(const int NE, bool symmetric, const bool scalar_coeff,
-               const Array<real_t> &trialBO, const Array<real_t> &trialBC,
-               const Array<real_t> &testBOt, const Array<real_t> &testBCt,
-               const Vector &pa_data, const Vector &x, Vector &y,
-               const int triald1d, const int testd1d, const int q1d);
-
-   /// parameters: trial_fetype, test_fetype, ndims, trial_d1d, test_d1d, q1d
-   MFEM_REGISTER_KERNELS(ApplyPAKernels, ApplyKernelType,
-                         (FiniteElement::DerivType, FiniteElement::DerivType,
-                          int, int, int, int));
-
-   struct Kernels { Kernels(); };
-
-   template <FiniteElement::DerivType TrialType,
-             FiniteElement::DerivType TestType, int DIM, int TRIAL_D1D,
-             int TEST_D1D, int Q1D>
-   static void AddSpecialization()
-   {
-      ApplyPAKernels::Specialization<TrialType, TestType, DIM, TRIAL_D1D,
-                     TEST_D1D, Q1D>::Add();
-   }
 };
 
 /** Integrator for $(Q \nabla \cdot u, v)$ where $u=(u_1,\cdots,u_n)$ and all $u_i$ are in the same
@@ -3945,7 +3906,7 @@ class DiscreteInterpolator : public BilinearFormIntegrator { };
 
 
 /** Class for constructing the gradient as a DiscreteLinearOperator from an
-    $H^1$-conforming space to an $H(curl)$-conforming space. The range space can be
+    $H^1$-conforming space to an $H(curl$-conforming space. The range space can be
     vector $L_2$ space as well. */
 class GradientInterpolator : public DiscreteInterpolator
 {
@@ -4054,48 +4015,12 @@ public:
     discrete curl matrix. */
 class CurlInterpolator : public DiscreteInterpolator
 {
-   int dim, ne;
-   // "dof" are the domain fespace dof counts
-   int ndof_o;
-   // "quads" are the range fespace dof counts
-   int nquad_o;
-
-   Vector pa_data;
-
 public:
-   CurlInterpolator();
-
    void AssembleElementMatrix2(const FiniteElement &dom_fe,
                                const FiniteElement &ran_fe,
                                ElementTransformation &Trans,
                                DenseMatrix &elmat) override
    { ran_fe.ProjectCurl(dom_fe, Trans, elmat); }
-
-   void AssemblePA(const FiniteElementSpace &dom_fes,
-                   const FiniteElementSpace &ran_fes) override;
-   void AssemblePA(const FiniteElementSpace &fes) override
-   {
-      AssemblePA(fes, fes);
-   }
-   void AddMultPA(const Vector &x, Vector &y) const override;
-   void AddMultTransposePA(const Vector &x, Vector &y) const override;
-
-   using ApplyKernelType = void (*)(const int ne, const int ndof_o,
-                                    const int nquad_o, const Vector &pa,
-                                    const Vector &x, Vector &y);
-
-   /// arguments: DIM, ndof_o, nquad_o
-   MFEM_REGISTER_KERNELS(ApplyPAKernels, ApplyKernelType, (int, int, int));
-   /// arguments: DIM, ndof_o, nquad_o
-   MFEM_REGISTER_KERNELS(ApplyTPAKernels, ApplyKernelType, (int, int, int));
-
-   template <int DIM, int NDOF_O, int NQUAD_O> static void AddSpecialization()
-   {
-      ApplyPAKernels::Specialization<DIM, NDOF_O, NQUAD_O>::Add();
-      ApplyTPAKernels::Specialization<DIM, NDOF_O, NQUAD_O>::Add();
-   }
-
-   struct Kernels { Kernels(); };
 };
 
 

fem/coefficient.cpp

@@ -54,8 +54,6 @@ void Coefficient::Project(QuadratureFunction &qf)
    QuadratureSpaceBase &qspace = *qf.GetSpace();
    const int ne = qspace.GetNE();
    Vector values;
-   // GetValues makes a reference, but we need it to be valid on Host
-   qf.HostWrite();
    for (int iel = 0; iel < ne; ++iel)
    {
       qf.GetValues(iel, values);
@@ -329,8 +327,6 @@ void VectorCoefficient::Project(QuadratureFunction &qf)
    const int ne = qspace.GetNE();
    DenseMatrix values;
    Vector col;
-   // GetValues makes a reference, but we need it to be valid on Host
-   qf.HostWrite();
    for (int iel = 0; iel < ne; ++iel)
    {
       qf.GetValues(iel, values);
@@ -699,8 +695,6 @@ void MatrixCoefficient::Project(QuadratureFunction &qf, bool transpose)
    QuadratureSpaceBase &qspace = *qf.GetSpace();
    const int ne = qspace.GetNE();
    DenseMatrix values, matrix;
-   // GetValues makes a reference, but we need it to be valid on Host
-   qf.HostWrite();
    for (int iel = 0; iel < ne; ++iel)
    {
       qf.GetValues(iel, values);

fem/fe/fe_base.hpp

@@ -1446,8 +1446,6 @@ public:
                                 dof2quad_array_open);
    }
 
-   const Poly_1D::Basis &GetOpenBasis1D() const { return obasis1d; }
-
    virtual ~VectorTensorFiniteElement();
 };
 

fem/integ/bilininteg_diffusion_kernels.hpp

@@ -19,8 +19,6 @@
 #include "../../linalg/vector.hpp"
 #include "../bilininteg.hpp"
 
-#include "bilininteg_diffusion_pa_simplices.hpp"
-
 namespace mfem
 {
 

fem/integ/bilininteg_hcurl_kernels.cpp

@@ -147,15 +147,18 @@ void PAHcurlMassAssembleDiagonal3D(const int D1D,
    }); // end of element loop
 }
 
-void PAHcurlMassApply2D(const int NE, const bool symmetric,
-                        const bool scalar_coeff, const Array<real_t> &bo,
-                        const Array<real_t> &bc, const Array<real_t> &bot,
-                        const Array<real_t> &bct, const Vector &pa_data,
-                        const Vector &x, Vector &y, const int D1D,
-                        const int TestD1D, const int Q1D)
+void PAHcurlMassApply2D(const int D1D,
+                        const int Q1D,
+                        const int NE,
+                        const bool symmetric,
+                        const Array<real_t> &bo,
+                        const Array<real_t> &bc,
+                        const Array<real_t> &bot,
+                        const Array<real_t> &bct,
+                        const Vector &pa_data,
+                        const Vector &x,
+                        Vector &y)
 {
-   MFEM_ASSERT(D1D == TestD1D,
-               "Trial and Test space must have the same number of dofs");
    auto Bo = Reshape(bo.Read(), Q1D, D1D-1);
    auto Bc = Reshape(bc.Read(), Q1D, D1D);
    auto Bot = Reshape(bot.Read(), D1D-1, Q1D);
@@ -274,15 +277,18 @@ void PAHcurlMassApply2D(const int NE, const bool symmetric,
    }); // end of element loop
 }
 
-void PAHcurlMassApply3D(const int NE, const bool symmetric,
-                        const bool scalar_coeff, const Array<real_t> &bo,
-                        const Array<real_t> &bc, const Array<real_t> &bot,
-                        const Array<real_t> &bct, const Vector &pa_data,
-                        const Vector &x, Vector &y, const int D1D,
-                        const int TestD1D, const int Q1D)
+void PAHcurlMassApply3D(const int D1D,
+                        const int Q1D,
+                        const int NE,
+                        const bool symmetric,
+                        const Array<real_t> &bo,
+                        const Array<real_t> &bc,
+                        const Array<real_t> &bot,
+                        const Array<real_t> &bct,
+                        const Vector &pa_data,
+                        const Vector &x,
+                        Vector &y)
 {
-   MFEM_VERIFY(D1D == TestD1D,
-               "Trial and test spaces must have same number of dofs");
    MFEM_VERIFY(D1D <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D,
                "Error: D1D > MAX_D1D");
    MFEM_VERIFY(Q1D <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D,

fem/integ/bilininteg_hcurl_kernels.hpp

@@ -181,309 +181,228 @@ inline void SmemPAHcurlMassAssembleDiagonal3D(const int d1d,
 }
 
 // PA H(curl) Mass Apply 2D kernel
-void PAHcurlMassApply2D(const int NE, const bool symmetric,
-                        const bool scalar_coeff, const Array<real_t> &bo,
-                        const Array<real_t> &bc, const Array<real_t> &bot,
-                        const Array<real_t> &bct, const Vector &pa_data,
-                        const Vector &x, Vector &y, const int TrialD1D,
-                        const int TestD1D, const int Q1D);
+void PAHcurlMassApply2D(const int D1D,
+                        const int Q1D,
+                        const int NE,
+                        const bool symmetric,
+                        const Array<real_t> &bo,
+                        const Array<real_t> &bc,
+                        const Array<real_t> &bot,
+                        const Array<real_t> &bct,
+                        const Vector &pa_data,
+                        const Vector &x,
+                        Vector &y);
 
 // PA H(curl) Mass Apply 3D kernel
-void PAHcurlMassApply3D(const int NE, const bool symmetric,
-                        const bool scalar_coeff, const Array<real_t> &bo,
-                        const Array<real_t> &bc, const Array<real_t> &bot,
-                        const Array<real_t> &bct, const Vector &pa_data,
-                        const Vector &x, Vector &y, const int TrialD1D,
-                        const int TestD1D, const int Q1D);
+void PAHcurlMassApply3D(const int D1D,
+                        const int Q1D,
+                        const int NE,
+                        const bool symmetric,
+                        const Array<real_t> &bo,
+                        const Array<real_t> &bc,
+                        const Array<real_t> &bot,
+                        const Array<real_t> &bct,
+                        const Vector &pa_data,
+                        const Vector &x,
+                        Vector &y);
 
 // Shared memory PA H(curl) Mass Apply 3D kernel
-template <int T_D1D = 0, int T_Q1D = 0, int TBATCH = 0, bool ACCUMULATE = true>
-inline void SmemPAHcurlMassApply3D(
-   const int NE, const bool symmetric, const bool scalar_coeff,
-   const Array<real_t> &bo, const Array<real_t> &bc, const Array<real_t> &bot,
-   const Array<real_t> &bct, const Vector &pa_data, const Vector &x, Vector &y,
-   const int d1d = 0, const int = 0, const int q1d = 0)
+template<int T_D1D = 0, int T_Q1D = 0>
+inline void SmemPAHcurlMassApply3D(const int d1d,
+                                   const int q1d,
+                                   const int NE,
+                                   const bool symmetric,
+                                   const Array<real_t> &bo,
+                                   const Array<real_t> &bc,
+                                   const Array<real_t> &bot,
+                                   const Array<real_t> &bct,
+                                   const Vector &pa_data,
+                                   const Vector &x,
+                                   Vector &y)
 {
-   const int D1D = T_D1D ? T_D1D : d1d;
-   const int Q1D = T_Q1D ? T_Q1D : q1d;
-
    MFEM_VERIFY(T_D1D || d1d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D,
                "Error: d1d > HCURL_MAX_D1D");
    MFEM_VERIFY(T_Q1D || q1d <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D,
                "Error: q1d > HCURL_MAX_Q1D");
-   MFEM_ASSERT(Q1D >= D1D, "Expected Q1D >= D1D");
+   const int D1D = T_D1D ? T_D1D : d1d;
+   const int Q1D = T_Q1D ? T_Q1D : q1d;
+
    const int dataSize = symmetric ? 6 : 9;
 
-   // assume trial space == test space
-   auto Bo = bo.Read();
-   auto Bc = bc.Read();
-   auto op =
-      Reshape(pa_data.Read(), Q1D, Q1D, Q1D, dataSize, NE);
-   auto X_ = Reshape(x.Read(), 3 * (D1D - 1) * D1D * D1D, NE);
-   auto y_ = y.ReadWrite();
+   auto Bo = Reshape(bo.Read(), Q1D, D1D-1);
+   auto Bc = Reshape(bc.Read(), Q1D, D1D);
+   auto op = Reshape(pa_data.Read(), Q1D, Q1D, Q1D, dataSize, NE);
+   auto X = Reshape(x.Read(), 3*(D1D-1)*D1D*D1D, NE);
+   auto Y = Reshape(y.ReadWrite(), 3*(D1D-1)*D1D*D1D, NE);
 
-   constexpr int MD_ = T_D1D ? T_D1D : DofQuadLimits::HCURL_MAX_D1D;
-   constexpr int MQ_ = T_Q1D ? T_Q1D : DofQuadLimits::HCURL_MAX_Q1D;
-   constexpr int MDQ_ = std::max(MD_, MQ_);
-   constexpr int MB_ = TBATCH ? TBATCH : 1;
-
-   mfem::forall_2D_batch<MDQ_ * MDQ_ * MDQ_ * MB_>(
-      NE, MDQ_ * MDQ_ * MDQ_, 1, MB_, [=] MFEM_HOST_DEVICE(int e)
+   mfem::forall_3D(NE, Q1D, Q1D, Q1D, [=] MFEM_HOST_DEVICE (int e)
    {
-#if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-      constexpr int nbz = TBATCH ? TBATCH : 1;
-      int tidz = MFEM_THREAD_ID(z);
-#else
-      constexpr int nbz = 1;
-      constexpr int tidz = 0;
-#endif
-
       constexpr int VDIM = 3;
       constexpr int MD1D = T_D1D ? T_D1D : DofQuadLimits::HCURL_MAX_D1D;
       constexpr int MQ1D = T_Q1D ? T_Q1D : DofQuadLimits::HCURL_MAX_Q1D;
-      constexpr int MDQ = std::max(MD1D, MQ1D);
+      const int D1D = T_D1D ? T_D1D : d1d;
+      const int Q1D = T_Q1D ? T_Q1D : q1d;
 
-      // nvcc limit work-around: can't have Y_ be captured first in
-      // if constexpr, so capture y_ and construct Y_ locally
-      // only works on GPU
-      auto Y = Reshape(y_, VDIM * (D1D - 1) * D1D * D1D, NE);
+      MFEM_SHARED real_t sBo[MQ1D][MD1D];
+      MFEM_SHARED real_t sBc[MQ1D][MD1D];
 
-      MFEM_SHARED real_t sBo[MDQ * (MD1D - 1)];
-      MFEM_SHARED real_t sBc[MDQ * MD1D];
-      auto BO = Reshape(sBo, Q1D, D1D - 1);
-      auto BC = Reshape(sBc, Q1D, D1D);
+      real_t op9[9];
+      MFEM_SHARED real_t sop[9*MQ1D*MQ1D];
+      MFEM_SHARED real_t mass[MQ1D][MQ1D][3];
 
-      MFEM_SHARED real_t sX[nbz * VDIM * (MD1D - 1) * MD1D * MD1D];
-      MFEM_SHARED real_t sm0[nbz * VDIM * MDQ * MDQ * MDQ];
-      MFEM_SHARED real_t sm1[nbz * VDIM * MDQ * MDQ * MDQ];
+      MFEM_SHARED real_t sX[MD1D][MD1D][MD1D];
 
-      real_t(*X)[nbz][(MD1D - 1) * MD1D * MD1D] =
-         (real_t(*)[nbz][(MD1D - 1) * MD1D * MD1D])(sX);
-      // shapes of buffers always use MQ1D to mitigate shared memory bank
-      // conflicts
-      real_t(*DDQ)[nbz][MQ1D][MQ1D][MQ1D] =
-         (real_t(*)[nbz][MQ1D][MQ1D][MQ1D])(sm0);
-      real_t(*DQQ)[nbz][MQ1D][MQ1D][MQ1D] =
-         (real_t(*)[nbz][MQ1D][MQ1D][MQ1D])(sm1);
-      real_t(*QQQ)[nbz][MQ1D][MQ1D][MQ1D] =
-         (real_t(*)[nbz][MQ1D][MQ1D][MQ1D])(sm0);
-      real_t(*QQD)[nbz][MQ1D][MQ1D][MQ1D] =
-         (real_t(*)[nbz][MQ1D][MQ1D][MQ1D])(sm1);
-      real_t(*QDD)[nbz][MQ1D][MQ1D][MQ1D] =
-         (real_t(*)[nbz][MQ1D][MQ1D][MQ1D])(sm0);
-
-      // load dofs into smem
-      const int offset = (D1D - 1) * D1D * D1D;
-      MFEM_FOREACH_THREAD_DIRECT(ix, x, offset)
+      MFEM_FOREACH_THREAD(qx,x,Q1D)
       {
-         for (int dim = 0; dim < VDIM; ++dim)
+         MFEM_FOREACH_THREAD(qy,y,Q1D)
          {
-            X[dim][tidz][ix] = X_(ix + dim * offset, e);
+            MFEM_FOREACH_THREAD(qz,z,Q1D)
+            {
+               for (int i=0; i<dataSize; ++i)
+               {
+                  op9[i] = op(qx,qy,qz,i,e);
+               }
+            }
          }
       }
-      // load basis functions data
+
+      const int tidx = MFEM_THREAD_ID(x);
+      const int tidy = MFEM_THREAD_ID(y);
+      const int tidz = MFEM_THREAD_ID(z);
+
       if (tidz == 0)
       {
-         MFEM_FOREACH_THREAD_DIRECT(ix, x, D1D * Q1D) { sBc[ix] = Bc[ix]; }
-         MFEM_FOREACH_THREAD_DIRECT(ix, x, (D1D - 1) * Q1D)
+         MFEM_FOREACH_THREAD(d,y,D1D)
          {
-            sBo[ix] = Bo[ix];
+            MFEM_FOREACH_THREAD(q,x,Q1D)
+            {
+               sBc[q][d] = Bc(q,d);
+               if (d < D1D-1)
+               {
+                  sBo[q][d] = Bo(q,d);
+               }
+            }
          }
       }
+      MFEM_SYNC_THREAD;
 
-      for (int dim0 = 0; dim0 < VDIM; ++dim0)
+      for (int qz=0; qz < Q1D; ++qz)
       {
-         MFEM_SYNC_THREAD;
-         // sum factor to QQQ = Q_{dim0,dim1} B X_{dim1}
-         for (int dim1 = 0; dim1 < VDIM; ++dim1)
+         int osc = 0;
+         for (int c = 0; c < VDIM; ++c)  // loop over x, y, z components
          {
-            const int D1Dz = (dim1 == 2) ? D1D - 1 : D1D;
-            const int D1Dy = (dim1 == 1) ? D1D - 1 : D1D;
-            const int D1Dx = (dim1 == 0) ? D1D - 1 : D1D;
+            const int D1Dz = (c == 2) ? D1D - 1 : D1D;
+            const int D1Dy = (c == 1) ? D1D - 1 : D1D;
+            const int D1Dx = (c == 0) ? D1D - 1 : D1D;
 
-            // threads assigned to mitigate bank conflicts
-            MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, dy, dz, x, Q1D, D1Dy, D1Dz,
-                                                 Q1D, Q1D, Q1D)
+            MFEM_FOREACH_THREAD(dz,z,D1Dz)
             {
-               real_t u = 0;
-               for (int dx = 0; dx < D1Dx; ++dx)
+               MFEM_FOREACH_THREAD(dy,y,D1Dy)
                {
-                  real_t b;
-                  if (dim1 == 0)
+                  MFEM_FOREACH_THREAD(dx,x,D1Dx)
                   {
-                     b = BO(qx, dx);
+                     sX[dz][dy][dx] = X(dx + ((dy + (dz * D1Dy)) * D1Dx) + osc, e);
                   }
-                  else
-                  {
-                     b = BC(qx, dx);
-                  }
-                  u += X[dim1][tidz][dx + (dy + dz * D1Dy) * D1Dx] * b;
-               }
-               DDQ[dim1][tidz][dz][dy][qx] = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-         for (int dim1 = 0; dim1 < VDIM; ++dim1)
-         {
-            const int D1Dz = (dim1 == 2) ? D1D - 1 : D1D;
-            const int D1Dy = (dim1 == 1) ? D1D - 1 : D1D;
-            // const int D1Dx = (dim1 == 0) ? D1D - 1 : D1D;
-            // threads assigned to mitigate bank conflicts
-            MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, dz, x, Q1D, Q1D, D1Dz,
-                                                 Q1D, Q1D, Q1D)
-            {
-               real_t u = 0;
-               for (int dy = 0; dy < D1Dy; ++dy)
-               {
-                  real_t b;
-                  if (dim1 == 1)
-                  {
-                     b = BO(qy, dy);
-                  }
-                  else
-                  {
-                     b = BC(qy, dy);
-                  }
-                  u += DDQ[dim1][tidz][dz][dy][qx] * b;
-               }
-               DQQ[dim1][tidz][dz][qy][qx] = u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-         for (int dim1 = 0; dim1 < VDIM; ++dim1)
-         {
-            const int D1Dz = (dim1 == 2) ? D1D - 1 : D1D;
-            // const int D1Dy = (dim1 == 1) ? D1D - 1 : D1D;
-            // const int D1Dx = (dim1 == 0) ? D1D - 1 : D1D;
-            MFEM_FOREACH_THREAD_DIRECT_3D(qx, qy, qz, x, Q1D, Q1D, Q1D)
-            {
-               real_t u = 0;
-               for (int dz = 0; dz < D1Dz; ++dz)
-               {
-                  real_t b;
-                  if (dim1 == 2)
-                  {
-                     b = BO(qz, dz);
-                  }
-                  else
-                  {
-                     b = BC(qz, dz);
-                  }
-                  u += DQQ[dim1][tidz][dz][qy][qx] * b;
-               }
-               // pa_data is row major
-               int idx;
-               if (symmetric)
-               {
-                  int row;
-                  int col;
-                  if (dim0 > dim1)
-                  {
-                     row = dim1;
-                     col = dim0;
-                  }
-                  else
-                  {
-                     row = dim0;
-                     col = dim1;
-                  }
-                  idx = col + VDIM * row - row * (row + 1) / 2;
-               }
-               else
-               {
-                  idx = dim0 * VDIM + dim1;
-               }
-               QQQ[dim1][tidz][qz][qy][qx] = op(qx, qy, qz, idx, e) * u;
-            }
-         }
-         MFEM_SYNC_THREAD;
-         // sum factor back to Y
-         // Assume bot and bct == bo^t and bc^t respectively (i.e. test ==
-         // trial functions), skip loading them again.
-         {
-            const int D1Dz = (dim0 == 2) ? D1D - 1 : D1D;
-            const int D1Dy = (dim0 == 1) ? D1D - 1 : D1D;
-            const int D1Dx = (dim0 == 0) ? D1D - 1 : D1D;
-            // threads assigned to mitigate bank conflicts
-            MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dz, qx, qy, x, D1Dz, Q1D, Q1D,
-                                                 Q1D, Q1D, Q1D)
-            {
-               for (int dim1 = 0; dim1 < VDIM; ++dim1)
-               {
-                  real_t u = 0;
-                  for (int qz = 0; qz < Q1D; ++qz)
-                  {
-                     real_t b = 0;
-                     if (dim0 == 2)
-                     {
-                        b = BO(qz, dz);
-                     }
-                     else
-                     {
-                        b = BC(qz, dz);
-                     }
-                     u += QQQ[dim1][tidz][qz][qy][qx] * b;
-                  }
-                  QQD[dim1][tidz][qy][qx][dz] = u;
-               }
-            }
-            MFEM_SYNC_THREAD;
-            // threads assigned to mitigate bank conflicts
-            MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dy, dz, qx, x, D1Dy, D1Dz, Q1D,
-                                                 Q1D, Q1D, Q1D)
-            {
-               for (int dim1 = 0; dim1 < VDIM; ++dim1)
-               {
-                  real_t u = 0;
-                  for (int qy = 0; qy < Q1D; ++qy)
-                  {
-                     real_t b;
-                     if (dim0 == 1)
-                     {
-                        b = BO(qy, dy);
-                     }
-                     else
-                     {
-                        b = BC(qy, dy);
-                     }
-                     u += QQD[dim1][tidz][qy][qx][dz] * b;
-                  }
-                  QDD[dim1][tidz][qx][dz][dy] = u;
                }
             }
             MFEM_SYNC_THREAD;
 
-            MFEM_FOREACH_THREAD_DIRECT_3D(dx, dy, dz, x, D1Dx, D1Dy, D1Dz)
+            if (tidz == qz)
             {
-               int ix = dx + D1Dx * (dy + D1Dy * dz);
-               real_t u = 0;
-               for (int qx = 0; qx < Q1D; ++qx)
+               for (int i=0; i<dataSize; ++i)
                {
-                  real_t b;
-                  if (dim0 == 0)
-                  {
-                     b = BO(qx, dx);
-                  }
-                  else
-                  {
-                     b = BC(qx, dx);
-                  }
-                  for (int dim1 = 0; dim1 < VDIM; ++dim1)
-                  {
-                     u += QDD[dim1][tidz][qx][dz][dy] * b;
-                  }
+                  sop[i + (dataSize*tidx) + (dataSize*Q1D*tidy)] = op9[i];
                }
-               if constexpr (ACCUMULATE)
+
+               MFEM_FOREACH_THREAD(qy,y,Q1D)
                {
-                  Y(ix + dim0 * offset, e) += u;
-               }
-               else
+                  MFEM_FOREACH_THREAD(qx,x,Q1D)
+                  {
+                     real_t u = 0.0;
+
+                     for (int dz = 0; dz < D1Dz; ++dz)
+                     {
+                        const real_t wz = (c == 2) ? sBo[qz][dz] : sBc[qz][dz];
+                        for (int dy = 0; dy < D1Dy; ++dy)
+                        {
+                           const real_t wy = (c == 1) ? sBo[qy][dy] : sBc[qy][dy];
+                           for (int dx = 0; dx < D1Dx; ++dx)
+                           {
+                              const real_t t = sX[dz][dy][dx];
+                              const real_t wx = (c == 0) ? sBo[qx][dx] : sBc[qx][dx];
+                              u += t * wx * wy * wz;
+                           }
+                        }
+                     }
+
+                     mass[qy][qx][c] = u;
+                  } // qx
+               } // qy
+            } // tidz == qz
+
+            osc += D1Dx * D1Dy * D1Dz;
+            MFEM_SYNC_THREAD;
+         } // c
+
+         MFEM_SYNC_THREAD;  // Sync mass[qy][qx][d] and sop
+
+         osc = 0;
+         for (int c = 0; c < VDIM; ++c)  // loop over x, y, z components
+         {
+            const int D1Dz = (c == 2) ? D1D - 1 : D1D;
+            const int D1Dy = (c == 1) ? D1D - 1 : D1D;
+            const int D1Dx = (c == 0) ? D1D - 1 : D1D;
+
+            real_t dxyz = 0.0;
+
+            MFEM_FOREACH_THREAD(dz,z,D1Dz)
+            {
+               const real_t wz = (c == 2) ? sBo[qz][dz] : sBc[qz][dz];
+
+               MFEM_FOREACH_THREAD(dy,y,D1Dy)
                {
-                  Y(ix + dim0 * offset, e) = u;
+                  MFEM_FOREACH_THREAD(dx,x,D1Dx)
+                  {
+                     for (int qy = 0; qy < Q1D; ++qy)
+                     {
+                        const real_t wy = (c == 1) ? sBo[qy][dy] : sBc[qy][dy];
+                        for (int qx = 0; qx < Q1D; ++qx)
+                        {
+                           const int os = (dataSize*qx) + (dataSize*Q1D*qy);
+                           const int id1 = os + ((c == 0) ? 0 : ((c == 1) ? (symmetric ? 1 : 3) :
+                                                                 (symmetric ? 2 : 6))); // O11, O21, O31
+                           const int id2 = os + ((c == 0) ? 1 : ((c == 1) ? (symmetric ? 3 : 4) :
+                                                                 (symmetric ? 4 : 7))); // O12, O22, O32
+                           const int id3 = os + ((c == 0) ? 2 : ((c == 1) ? (symmetric ? 4 : 5) :
+                                                                 (symmetric ? 5 : 8))); // O13, O23, O33
+
+                           const real_t m_c = (sop[id1] * mass[qy][qx][0]) + (sop[id2] * mass[qy][qx][1]) +
+                                              (sop[id3] * mass[qy][qx][2]);
+
+                           const real_t wx = (c == 0) ? sBo[qx][dx] : sBc[qx][dx];
+                           dxyz += m_c * wx * wy * wz;
+                        }
+                     }
+                  }
                }
             }
-         }
-      }
+
+            MFEM_SYNC_THREAD;
+
+            MFEM_FOREACH_THREAD(dz,z,D1Dz)
+            {
+               MFEM_FOREACH_THREAD(dy,y,D1Dy)
+               {
+                  MFEM_FOREACH_THREAD(dx,x,D1Dx)
+                  {
+                     Y(dx + ((dy + (dz * D1Dy)) * D1Dx) + osc, e) += dxyz;
+                  }
+               }
+            }
+
+            osc += D1Dx * D1Dy * D1Dz;
+         } // c loop
+      } // qz
    }); // end of element loop
 }
 

fem/integ/bilininteg_hcurlhdiv_kernels.hpp

@@ -62,30 +62,6 @@ void PAHcurlHdivMassApply2D(const int D1D,
                             const Vector &x_,
                             Vector &y_);
 
-/// H(curl) test, H(div) trial
-inline void
-PAHcurlHdivMassApply2D(const int NE, const bool, const bool scalarCoeff,
-                       const Array<real_t> &Bo_, const Array<real_t> &Bc_,
-                       const Array<real_t> &Bot_, const Array<real_t> &Bct_,
-                       const Vector &op_, const Vector &x_, Vector &y_,
-                       const int D1D, const int D1Dtest, const int Q1D)
-{
-   return PAHcurlHdivMassApply2D(D1D, D1Dtest, Q1D, NE, scalarCoeff, false,
-                                 false, Bo_, Bc_, Bot_, Bct_, op_, x_, y_);
-}
-
-/// H(div) test, H(curl) trial
-inline void
-PAHdivHcurlMassApply2D(const int NE, const bool, const bool scalarCoeff,
-                       const Array<real_t> &Bo_, const Array<real_t> &Bc_,
-                       const Array<real_t> &Bot_, const Array<real_t> &Bct_,
-                       const Vector &op_, const Vector &x_, Vector &y_,
-                       const int D1D, const int D1Dtest, const int Q1D)
-{
-   return PAHcurlHdivMassApply2D(D1D, D1Dtest, Q1D, NE, scalarCoeff, true,
-                                 false, Bo_, Bc_, Bot_, Bct_, op_, x_, y_);
-}
-
 // PA H(curl)-H(div) Mass Apply 3D kernel
 void PAHcurlHdivMassApply3D(const int D1D,
                             const int D1Dtest,
@@ -102,30 +78,6 @@ void PAHcurlHdivMassApply3D(const int D1D,
                             const Vector &x_,
                             Vector &y_);
 
-/// H(curl) test, H(div) trial
-inline void
-PAHcurlHdivMassApply3D(const int NE, const bool, const bool scalarCoeff,
-                       const Array<real_t> &Bo_, const Array<real_t> &Bc_,
-                       const Array<real_t> &Bot_, const Array<real_t> &Bct_,
-                       const Vector &op_, const Vector &x_, Vector &y_,
-                       const int D1D, const int D1Dtest, const int Q1D)
-{
-   PAHcurlHdivMassApply3D(D1D, D1Dtest, Q1D, NE, scalarCoeff, false, false, Bo_,
-                          Bc_, Bot_, Bct_, op_, x_, y_);
-}
-
-/// H(div) test, H(curl) trial
-inline void
-PAHdivHcurlMassApply3D(const int NE, const bool, const bool scalarCoeff,
-                       const Array<real_t> &Bo_, const Array<real_t> &Bc_,
-                       const Array<real_t> &Bot_, const Array<real_t> &Bct_,
-                       const Vector &op_, const Vector &x_, Vector &y_,
-                       const int D1D, const int D1Dtest, const int Q1D)
-{
-   PAHcurlHdivMassApply3D(D1D, D1Dtest, Q1D, NE, scalarCoeff, true, false, Bo_,
-                          Bc_, Bot_, Bct_, op_, x_, y_);
-}
-
 // PA H(curl)-H(div) Curl Apply 3D kernel
 template<int T_D1D = 0, int T_D1D_TEST = 0, int T_Q1D = 0>
 inline void PAHcurlHdivApply3D(const int d1d,
@@ -864,656 +816,8 @@ inline void PAHcurlHdivApplyTranspose3D(const int d1d,
    }); // end of element loop
 }
 
-namespace curlinterp
-{
-constexpr int NBZ3D(int ndof_o, int nquad_o, int mdq)
-{
-   if (ndof_o <= 0 || nquad_o <= 0)
-   {
-      return 1;
-   }
-   int ndof_c = ndof_o + 1;
-   int nquad_c = nquad_o + 1;
-   // z dimension is capped at 64 on nvidia and amd gpus
-   int tmp =
-      std::min((128 + mdq * mdq * (mdq - 1) - 1) / (mdq * mdq * (mdq - 1)), 64);
-   int smem_req =
-      sizeof(mfem::real_t) *
-      ((3 * ndof_c * ndof_c * ndof_o + 2 * 2 * mdq * mdq * mdq) * tmp +
-       ndof_c * nquad_o + ndof_c * nquad_c + ndof_o * nquad_o);
-   // assume GPU has at least 48k shared memory
-   return std::max(std::min(tmp, (48 * 1024 + smem_req - 1) / smem_req), 1);
-}
-}
-
-template <int T_NDOF_O, int T_NQUAD_O>
-void CurlInterpolatorApply3DSmem(const int ne, const int ndof_o,
-                                 const int nquad_o, const Vector &pa,
-                                 const Vector &x_, Vector &y_)
-{
-   constexpr int mnd_o = T_NDOF_O ? T_NDOF_O : DofQuadLimits::HCURL_MAX_D1D - 1;
-   constexpr int mnq_o =
-      T_NQUAD_O ? T_NQUAD_O : DofQuadLimits::HDIV_MAX_D1D - 1;
-   constexpr int mndq = std::max(mnd_o + 1, mnq_o + 1);
-   constexpr int tbatch = curlinterp::NBZ3D(T_NDOF_O, T_NQUAD_O, mndq);
-   MFEM_VERIFY(ndof_o <= mnd_o, "Error: H(curl) order larger than supported");
-   MFEM_VERIFY(nquad_o <= mnq_o, "Error: H(div) order larger than supported");
-   int mnq = std::max(ndof_o + 1, nquad_o + 1);
-   auto pa_data = pa.Read();
-   auto x_d = x_.Read();
-   auto y_d = y_.ReadWrite();
-   mfem::forall_2D_batch<mndq * mndq * (mndq - 1) * tbatch>(
-      ne, mnq * mnq * (mnq - 1), 1, tbatch, [=] MFEM_HOST_DEVICE(int e)
-   {
-      constexpr int MND_O =
-         T_NDOF_O ? T_NDOF_O : DofQuadLimits::HCURL_MAX_D1D - 1;
-      constexpr int MNQ_O =
-         T_NQUAD_O ? T_NQUAD_O : DofQuadLimits::HDIV_MAX_D1D - 1;
-      constexpr int MNDQ = std::max(MND_O + 1, MNQ_O + 1);
-#if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-      constexpr int nbz = curlinterp::NBZ3D(T_NDOF_O, T_NQUAD_O, MNDQ);
-      int tidz = MFEM_THREAD_ID(z);
-      // Make mnq a local variable since capturing would result in different
-      // captures between host/device versions, and spuriously fails
-      int mnq = std::max(ndof_o + 1, nquad_o + 1);
-#else
-      constexpr int nbz = 1;
-      constexpr int tidz = 0;
-#endif
-      const int NDOF_O = T_NDOF_O ? T_NDOF_O : ndof_o;
-      const int NQUAD_O = T_NQUAD_O ? T_NQUAD_O : nquad_o;
-      const int NDOF_C = NDOF_O + 1;
-      const int NQUAD_C = NQUAD_O + 1;
-      MFEM_SHARED real_t
-      sBG[(MND_O + 1) * MNQ_O + (MND_O + 1) * (MNQ_O + 1) + MND_O * MNQ_O];
-      auto X_ = Reshape(x_d, 3 * NDOF_C * NDOF_C * NDOF_O, ne);
-      auto Y = Reshape(y_d, 3 * NQUAD_C * NQUAD_O * NQUAD_O, ne);
-      auto Gco = Reshape(sBG, NQUAD_O, NDOF_C);
-      auto Bcc = Reshape(sBG + NDOF_C * NQUAD_O, NQUAD_C, NDOF_C);
-      auto Boo =
-         Reshape(sBG + NDOF_C * NQUAD_O + NDOF_C * NQUAD_C, NQUAD_O, NDOF_O);
-      MFEM_SHARED real_t X[3][nbz][MND_O * (MND_O + 1) * (MND_O + 1)];
-      MFEM_SHARED real_t sm0[nbz * 2 * MNDQ * MNDQ * MNDQ];
-      MFEM_SHARED real_t sm1[nbz * 2 * MNDQ * MNDQ * MNDQ];
-
-      // shapes of buffers always use MNDQ to mitigate shared memory bank
-      // conflicts
-      real_t(*DDQ)[nbz][MNDQ][MNDQ][MNDQ] =
-         (real_t(*)[nbz][MNDQ][MNDQ][MNDQ])(sm0);
-      real_t(*DQQ)[nbz][MNDQ][MNDQ][MNDQ] =
-         (real_t(*)[nbz][MNDQ][MNDQ][MNDQ])(sm1);
-      real_t(*QQQ)[nbz][MNDQ][MNDQ][MNDQ] =
-         (real_t(*)[nbz][MNDQ][MNDQ][MNDQ])(sm0);
-      const int offset = NDOF_O * NDOF_C * NDOF_C;
-      const int offsetq = NQUAD_C * NQUAD_O * NQUAD_O;
-      MFEM_FOREACH_THREAD_DIRECT(ix, x, offset)
-      {
-         for (int dim = 0; dim < 3; ++dim)
-         {
-            X[dim][tidz][ix] = X_(ix + dim * offset, e);
-         }
-      }
-      // load basis functions data
-      if (tidz == 0)
-      {
-         auto npts = NDOF_C * NQUAD_O + NDOF_C * NQUAD_C + NDOF_O * NQUAD_O;
-         MFEM_FOREACH_THREAD(ix, x, npts) { sBG[ix] = pa_data[ix]; }
-      }
-      MFEM_SYNC_THREAD;
-
-      // x: Vz Bcc Gco Boo - Vy Bcc Boo Gco
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, dy, dz, x, NQUAD_C, NDOF_C,
-                                           NDOF_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int dx = 0; dx < NDOF_C; ++dx)
-         {
-            u += X[2][tidz][dx + (dy + dz * NDOF_C) * NDOF_C] * Bcc(qx, dx);
-         }
-         DDQ[0][tidz][dz][dy][qx] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, dy, dz, x, NQUAD_C, NDOF_O,
-                                           NDOF_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int dx = 0; dx < NDOF_C; ++dx)
-         {
-            u += X[1][tidz][dx + (dy + dz * NDOF_O) * NDOF_C] * Bcc(qx, dx);
-         }
-         DDQ[1][tidz][dz][dy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, dz, x, NQUAD_C, NQUAD_O,
-                                           NDOF_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int dy = 0; dy < NDOF_C; ++dy)
-         {
-            u += DDQ[0][tidz][dz][dy][qx] * Gco(qy, dy);
-         }
-         DQQ[0][tidz][dz][qy][qx] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, dz, x, NQUAD_C, NQUAD_O,
-                                           NDOF_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int dy = 0; dy < NDOF_O; ++dy)
-         {
-            u += DDQ[1][tidz][dz][dy][qx] * Boo(qy, dy);
-         }
-         DQQ[1][tidz][dz][qy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, qz, x, NQUAD_C, NQUAD_O,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int dz = 0; dz < NDOF_O; ++dz)
-         {
-            u += DQQ[0][tidz][dz][qy][qx] * Boo(qz, dz);
-         }
-         QQQ[0][tidz][qz][qy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, qz, x, NQUAD_C, NQUAD_O,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int dz = 0; dz < NDOF_C; ++dz)
-         {
-            u += DQQ[1][tidz][dz][qy][qx] * Gco(qz, dz);
-         }
-         Y(qx + (qy + qz * NQUAD_O) * NQUAD_C, e) =
-            QQQ[0][tidz][qz][qy][qx] - u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // y: Vx Boo Bcc Gco - Vz Gco Bcc Boo
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, dy, dz, x, NQUAD_O, NDOF_C,
-                                           NDOF_C, mnq - 1, mnq, mnq)
-      {
-         real_t u = 0;
-         for (int dx = 0; dx < NDOF_O; ++dx)
-         {
-            u += X[0][tidz][dx + (dy + dz * NDOF_C) * NDOF_O] * Boo(qx, dx);
-         }
-         DDQ[0][tidz][dz][dy][qx] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, dy, dz, x, NQUAD_O, NDOF_C,
-                                           NDOF_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int dx = 0; dx < NDOF_C; ++dx)
-         {
-            u += X[2][tidz][dx + (dy + dz * NDOF_C) * NDOF_C] * Gco(qx, dx);
-         }
-         DDQ[1][tidz][dz][dy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, dz, x, NQUAD_O, NQUAD_C,
-                                           NDOF_C, mnq - 1, mnq, mnq)
-      {
-         real_t u = 0;
-         for (int dy = 0; dy < NDOF_C; ++dy)
-         {
-            u += DDQ[0][tidz][dz][dy][qx] * Bcc(qy, dy);
-         }
-         DQQ[0][tidz][dz][qy][qx] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, dz, x, NQUAD_O, NQUAD_C,
-                                           NDOF_O, mnq - 1, mnq, mnq)
-      {
-         real_t u = 0;
-         for (int dy = 0; dy < NDOF_C; ++dy)
-         {
-            u += DDQ[1][tidz][dz][dy][qx] * Bcc(qy, dy);
-         }
-         DQQ[1][tidz][dz][qy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, qz, x, NQUAD_O, NQUAD_C,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int dz = 0; dz < NDOF_C; ++dz)
-         {
-            u += DQQ[0][tidz][dz][qy][qx] * Gco(qz, dz);
-         }
-         QQQ[0][tidz][qz][qy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, qz, x, NQUAD_O, NQUAD_C,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int dz = 0; dz < NDOF_O; ++dz)
-         {
-            u += DQQ[1][tidz][dz][qy][qx] * Boo(qz, dz);
-         }
-         Y(qx + (qy + qz * NQUAD_C) * NQUAD_O + offsetq, e) =
-            QQQ[0][tidz][qz][qy][qx] - u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // z: Vy Gco Boo Bcc - Vx Boo Gco Bcc
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, dy, dz, x, NQUAD_O, NDOF_O,
-                                           NDOF_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int dx = 0; dx < NDOF_C; ++dx)
-         {
-            u += X[1][tidz][dx + (dy + dz * NDOF_O) * NDOF_C] * Gco(qx, dx);
-         }
-         DDQ[0][tidz][dz][dy][qx] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, dy, dz, x, NQUAD_O, NDOF_C,
-                                           NDOF_C, mnq - 1, mnq, mnq)
-      {
-         real_t u = 0;
-         for (int dx = 0; dx < NDOF_O; ++dx)
-         {
-            u += X[0][tidz][dx + (dy + dz * NDOF_C) * NDOF_O] * Boo(qx, dx);
-         }
-         DDQ[1][tidz][dz][dy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, dz, x, NQUAD_O, NQUAD_O,
-                                           NDOF_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int dy = 0; dy < NDOF_O; ++dy)
-         {
-            u += DDQ[0][tidz][dz][dy][qx] * Boo(qy, dy);
-         }
-         DQQ[0][tidz][dz][qy][qx] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, dz, x, NQUAD_O, NQUAD_O,
-                                           NDOF_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int dy = 0; dy < NDOF_C; ++dy)
-         {
-            u += DDQ[1][tidz][dz][dy][qx] * Gco(qy, dy);
-         }
-         DQQ[1][tidz][dz][qy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, qz, x, NQUAD_O, NQUAD_O,
-                                           NQUAD_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int dz = 0; dz < NDOF_C; ++dz)
-         {
-            u += DQQ[0][tidz][dz][qy][qx] * Bcc(qz, dz);
-         }
-         QQQ[0][tidz][qz][qy][qx] = u;
-      }
-      MFEM_SYNC_THREAD;
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(qx, qy, qz, x, NQUAD_O, NQUAD_O,
-                                           NQUAD_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int dz = 0; dz < NDOF_C; ++dz)
-         {
-            u += DQQ[1][tidz][dz][qy][qx] * Bcc(qz, dz);
-         }
-         Y(qx + (qy + qz * NQUAD_O) * NQUAD_O + 2 * offsetq, e) =
-            QQQ[0][tidz][qz][qy][qx] - u;
-      }
-      MFEM_SYNC_THREAD;
-   });
-}
-
-template <int T_NDOF_O, int T_NQUAD_O>
-void CurlInterpolatorTApply3DSmem(const int ne, const int ndof_o,
-                                  const int nquad_o, const Vector &pa,
-                                  const Vector &x_, Vector &y_)
-{
-   constexpr int mnd_o = T_NDOF_O ? T_NDOF_O : DofQuadLimits::HCURL_MAX_D1D - 1;
-   constexpr int mnq_o =
-      T_NQUAD_O ? T_NQUAD_O : DofQuadLimits::HDIV_MAX_D1D - 1;
-   constexpr int mndq = std::max(mnd_o + 1, mnq_o + 1);
-   constexpr int tbatch = curlinterp::NBZ3D(T_NDOF_O, T_NQUAD_O, mndq);
-   MFEM_VERIFY(ndof_o <= mnd_o, "Error: H(curl) order larger than supported");
-   MFEM_VERIFY(nquad_o <= mnq_o, "Error: H(div) order larger than supported");
-   int mnq = std::max(ndof_o + 1, nquad_o + 1);
-   auto pa_data = pa.Read();
-   auto x_d = x_.Read();
-   auto y_d = y_.ReadWrite();
-   mfem::forall_2D_batch<mndq * mndq * (mndq - 1) * tbatch>(
-      ne, mnq * mnq * (mnq - 1), 1, tbatch, [=] MFEM_HOST_DEVICE(int e)
-   {
-      constexpr int MND_O =
-         T_NDOF_O ? T_NDOF_O : DofQuadLimits::HCURL_MAX_D1D - 1;
-      constexpr int MNQ_O =
-         T_NQUAD_O ? T_NQUAD_O : DofQuadLimits::HDIV_MAX_D1D - 1;
-      constexpr int MNDQ = std::max(MND_O + 1, MNQ_O + 1);
-#if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-      constexpr int nbz = curlinterp::NBZ3D(T_NDOF_O, T_NQUAD_O, MNDQ);
-      int tidz = MFEM_THREAD_ID(z);
-      // Make mnq a local variable since capturing would result in different
-      // captures between host/device versions, and spuriously fails
-      int mnq = std::max(ndof_o + 1, nquad_o + 1);
-#else
-      constexpr int nbz = 1;
-      constexpr int tidz = 0;
-#endif
-      const int NDOF_O = T_NDOF_O ? T_NDOF_O : ndof_o;
-      const int NQUAD_O = T_NQUAD_O ? T_NQUAD_O : nquad_o;
-      const int NDOF_C = NDOF_O + 1;
-      const int NQUAD_C = NQUAD_O + 1;
-      MFEM_SHARED real_t
-      sBG[(MND_O + 1) * MNQ_O + (MND_O + 1) * (MNQ_O + 1) + MND_O * MNQ_O];
-      auto X_ = Reshape(x_d, 3 * NQUAD_C * NQUAD_O * NQUAD_O, ne);
-      auto Y = Reshape(y_d, 3 * NDOF_C * NDOF_C * NDOF_O, ne);
-      auto Gco = Reshape(sBG, NQUAD_O, NDOF_C);
-      auto Bcc = Reshape(sBG + NDOF_C * NQUAD_O, NQUAD_C, NDOF_C);
-      auto Boo =
-         Reshape(sBG + NDOF_C * NQUAD_O + NDOF_C * NQUAD_C, NQUAD_O, NDOF_O);
-      MFEM_SHARED real_t X[3][nbz][MNQ_O * MNQ_O * (MNQ_O + 1)];
-      MFEM_SHARED real_t sm0[nbz * 2 * MNDQ * MNDQ * MNDQ];
-      MFEM_SHARED real_t sm1[nbz * 2 * MNDQ * MNDQ * MNDQ];
-
-      // shapes of buffers always use MNDQ to mitigate shared memory bank
-      // conflicts
-      real_t(*QQD)[nbz][MNDQ][MNDQ][MNDQ] =
-         (real_t(*)[nbz][MNDQ][MNDQ][MNDQ])(sm0);
-      real_t(*QDD)[nbz][MNDQ][MNDQ][MNDQ] =
-         (real_t(*)[nbz][MNDQ][MNDQ][MNDQ])(sm1);
-      real_t(*DDD)[nbz][MNDQ][MNDQ][MNDQ] =
-         (real_t(*)[nbz][MNDQ][MNDQ][MNDQ])(sm0);
-      const int offset = NDOF_O * NDOF_C * NDOF_C;
-      const int offsetq = NQUAD_C * NQUAD_O * NQUAD_O;
-      MFEM_FOREACH_THREAD_DIRECT(ix, x, offsetq)
-      {
-         for (int dim = 0; dim < 3; ++dim)
-         {
-            X[dim][tidz][ix] = X_(ix + dim * offsetq, e);
-         }
-      }
-      // load basis functions data
-      if (tidz == 0)
-      {
-         auto npts = NDOF_C * NQUAD_O + NDOF_C * NQUAD_C + NDOF_O * NQUAD_O;
-         MFEM_FOREACH_THREAD(ix, x, npts) { sBG[ix] = pa_data[ix]; }
-      }
-      MFEM_SYNC_THREAD;
-
-      // x: Vy Boo Bcc Gco - Vz Boo Gco Bcc
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dz, qx, qy, x, NDOF_C, NQUAD_O,
-                                           NQUAD_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int qz = 0; qz < NQUAD_O; ++qz)
-         {
-            u += X[1][tidz][qx + (qy + qz * NQUAD_C) * NQUAD_O] * Gco(qz, dz);
-         }
-         QQD[0][tidz][qy][qx][dz] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dz, qx, qy, x, NDOF_C, NQUAD_O,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qz = 0; qz < NQUAD_C; ++qz)
-         {
-            u += X[2][tidz][qx + (qy + qz * NQUAD_O) * NQUAD_O] * Bcc(qz, dz);
-         }
-         QQD[1][tidz][qy][qx][dz] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dy, dz, qx, x, NDOF_C, NDOF_C,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qy = 0; qy < NQUAD_C; ++qy)
-         {
-            u += QQD[0][tidz][qy][qx][dz] * Bcc(qy, dy);
-         }
-         QDD[0][tidz][qx][dz][dy] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dy, dz, qx, x, NDOF_C, NDOF_C,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qy = 0; qy < NQUAD_O; ++qy)
-         {
-            u += QQD[1][tidz][qy][qx][dz] * Gco(qy, dy);
-         }
-         QDD[1][tidz][qx][dz][dy] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dx, dy, dz, x, NDOF_O, NDOF_C,
-                                           NDOF_C, mnq - 1, mnq, mnq)
-      {
-         real_t u = 0;
-         for (int qx = 0; qx < NQUAD_O; ++qx)
-         {
-            u += QDD[0][tidz][qx][dz][dy] * Boo(qx, dx);
-         }
-         DDD[0][tidz][dz][dy][dx] = u;
-      }
-      MFEM_SYNC_THREAD;
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dx, dy, dz, x, NDOF_O, NDOF_C,
-                                           NDOF_C, mnq - 1, mnq, mnq)
-      {
-         real_t u = 0;
-         for (int qx = 0; qx < NQUAD_O; ++qx)
-         {
-            u += QDD[1][tidz][qx][dz][dy] * Boo(qx, dx);
-         }
-         Y(dx + (dy + dz * NDOF_C) * NDOF_O, e) =
-            DDD[0][tidz][dz][dy][dx] - u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // y: Vz Gco Boo Bcc - Vx Bcc Boo Gco
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dz, qx, qy, x, NDOF_C, NQUAD_O,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qz = 0; qz < NQUAD_C; ++qz)
-         {
-            u += X[2][tidz][qx + (qy + qz * NQUAD_O) * NQUAD_O] * Bcc(qz, dz);
-         }
-         QQD[0][tidz][qy][qx][dz] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dz, qx, qy, x, NDOF_C, NQUAD_C,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qz = 0; qz < NQUAD_O; ++qz)
-         {
-            u += X[0][tidz][qx + (qy + qz * NQUAD_O) * NQUAD_C] * Gco(qz, dz);
-         }
-         QQD[1][tidz][qy][qx][dz] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dy, dz, qx, x, NDOF_O, NDOF_C,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qy = 0; qy < NQUAD_O; ++qy)
-         {
-            u += QQD[0][tidz][qy][qx][dz] * Boo(qy, dy);
-         }
-         QDD[0][tidz][qx][dz][dy] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dy, dz, qx, x, NDOF_O, NDOF_C,
-                                           NQUAD_C, mnq - 1, mnq, mnq)
-      {
-         real_t u = 0;
-         for (int qy = 0; qy < NQUAD_O; ++qy)
-         {
-            u += QQD[1][tidz][qy][qx][dz] * Boo(qy, dy);
-         }
-         QDD[1][tidz][qx][dz][dy] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dx, dy, dz, x, NDOF_C, NDOF_O,
-                                           NDOF_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int qx = 0; qx < NQUAD_O; ++qx)
-         {
-            u += QDD[0][tidz][qx][dz][dy] * Gco(qx, dx);
-         }
-         DDD[0][tidz][dz][dy][dx] = u;
-      }
-      MFEM_SYNC_THREAD;
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dx, dy, dz, x, NDOF_C, NDOF_O,
-                                           NDOF_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int qx = 0; qx < NQUAD_C; ++qx)
-         {
-            u += QDD[1][tidz][qx][dz][dy] * Bcc(qx, dx);
-         }
-         Y(dx + (dy + dz * NDOF_O) * NDOF_C + offset, e) =
-            DDD[0][tidz][dz][dy][dx] - u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // z: Vx Bcc Gco Boo - Vy Gco Bcc Boo
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dz, qx, qy, x, NDOF_O, NQUAD_C,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qz = 0; qz < NQUAD_O; ++qz)
-         {
-            u += X[0][tidz][qx + (qy + qz * NQUAD_O) * NQUAD_C] * Boo(qz, dz);
-         }
-         QQD[0][tidz][qy][qx][dz] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dz, qx, qy, x, NDOF_O, NQUAD_O,
-                                           NQUAD_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int qz = 0; qz < NQUAD_O; ++qz)
-         {
-            u += X[1][tidz][qx + (qy + qz * NQUAD_C) * NQUAD_O] * Boo(qz, dz);
-         }
-         QQD[1][tidz][qy][qx][dz] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dy, dz, qx, x, NDOF_C, NDOF_O,
-                                           NQUAD_C, mnq, mnq - 1, mnq)
-      {
-         real_t u = 0;
-         for (int qy = 0; qy < NQUAD_O; ++qy)
-         {
-            u += QQD[0][tidz][qy][qx][dz] * Gco(qy, dy);
-         }
-         QDD[0][tidz][qx][dz][dy] = u;
-      }
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dy, dz, qx, x, NDOF_C, NDOF_O,
-                                           NQUAD_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qy = 0; qy < NQUAD_C; ++qy)
-         {
-            u += QQD[1][tidz][qy][qx][dz] * Bcc(qy, dy);
-         }
-         QDD[1][tidz][qx][dz][dy] = u;
-      }
-      MFEM_SYNC_THREAD;
-
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dx, dy, dz, x, NDOF_C, NDOF_C,
-                                           NDOF_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qx = 0; qx < NQUAD_C; ++qx)
-         {
-            u += QDD[0][tidz][qx][dz][dy] * Bcc(qx, dx);
-         }
-         DDD[0][tidz][dz][dy][dx] = u;
-      }
-      MFEM_SYNC_THREAD;
-      // threads assigned to mitigate bank conflicts
-      MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(dx, dy, dz, x, NDOF_C, NDOF_C,
-                                           NDOF_O, mnq, mnq, mnq - 1)
-      {
-         real_t u = 0;
-         for (int qx = 0; qx < NQUAD_O; ++qx)
-         {
-            u += QDD[1][tidz][qx][dz][dy] * Gco(qx, dx);
-         }
-         Y(dx + (dy + dz * NDOF_C) * NDOF_C + 2 * offset, e) =
-            DDD[0][tidz][dz][dy][dx] - u;
-      }
-      MFEM_SYNC_THREAD;
-   });
-}
-
 } // namespace internal
 
-template <int DIM, int NDOF_O, int NQUAD_O>
-CurlInterpolator::ApplyKernelType
-CurlInterpolator::ApplyPAKernels::Kernel()
-{
-   if constexpr (DIM == 3)
-   {
-      return internal::CurlInterpolatorApply3DSmem<NDOF_O, NQUAD_O>;
-   }
-   MFEM_ABORT("Bad dimension!");
-}
-
-template <int DIM, int NDOF_O, int NQUAD_O>
-CurlInterpolator::ApplyKernelType
-CurlInterpolator::ApplyTPAKernels::Kernel()
-{
-   if constexpr (DIM == 3)
-   {
-      return internal::CurlInterpolatorTApply3DSmem<NDOF_O, NQUAD_O>;
-   }
-   MFEM_ABORT("Bad dimension!");
-}
-
 } // namespace mfem
 
 /// \endcond DO_NOT_DOCUMENT

fem/integ/bilininteg_hdiv_kernels.cpp

@@ -294,14 +294,61 @@ void PAHdivMassAssembleDiagonal3D(const int D1D,
    }); // end of element loop
 }
 
-void PAHdivMassApply2D(const int NE, const bool symmetric, const bool,
-                       const Array<real_t> &Bo_, const Array<real_t> &Bc_,
-                       const Array<real_t> &Bot_, const Array<real_t> &Bct_,
-                       const Vector &op_, const Vector &x_, Vector &y_,
-                       const int D1D, const int TestD1D, const int Q1D)
+void PAHdivMassApply(const int dim,
+                     const int D1D,
+                     const int Q1D,
+                     const int NE,
+                     const bool symmetric,
+                     const Array<real_t> &Bo,
+                     const Array<real_t> &Bc,
+                     const Array<real_t> &Bot,
+                     const Array<real_t> &Bct,
+                     const Vector &op,
+                     const Vector &x,
+                     Vector &y)
+{
+   const int id = (D1D << 4) | Q1D;
+
+   if (dim == 2)
+   {
+      switch (id)
+      {
+         case 0x22: return SmemPAHdivMassApply2D<2,2>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x33: return SmemPAHdivMassApply2D<3,3>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x44: return SmemPAHdivMassApply2D<4,4>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x55: return SmemPAHdivMassApply2D<5,5>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         default: // fallback
+            return PAHdivMassApply2D(D1D,Q1D,NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+      }
+   }
+   else if (dim == 3)
+   {
+      switch (id)
+      {
+         case 0x23: return SmemPAHdivMassApply3D<2,3>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x34: return SmemPAHdivMassApply3D<3,4>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x45: return SmemPAHdivMassApply3D<4,5>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x56: return SmemPAHdivMassApply3D<5,6>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x67: return SmemPAHdivMassApply3D<6,7>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         case 0x78: return SmemPAHdivMassApply3D<7,8>(NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+         default: // fallback
+            return PAHdivMassApply3D(D1D,Q1D,NE,symmetric,Bo,Bc,Bot,Bct,op,x,y);
+      }
+   }
+}
+
+void PAHdivMassApply2D(const int D1D,
+                       const int Q1D,
+                       const int NE,
+                       const bool symmetric,
+                       const Array<real_t> &Bo_,
+                       const Array<real_t> &Bc_,
+                       const Array<real_t> &Bot_,
+                       const Array<real_t> &Bct_,
+                       const Vector &op_,
+                       const Vector &x_,
+                       Vector &y_)
 {
-   MFEM_VERIFY(D1D == TestD1D,
-               "Trial and test spaces must have same number of dofs");
    auto Bo = Reshape(Bo_.Read(), Q1D, D1D-1);
    auto Bc = Reshape(Bc_.Read(), Q1D, D1D);
    auto Bot = Reshape(Bot_.Read(), D1D-1, Q1D);
@@ -421,14 +468,18 @@ void PAHdivMassApply2D(const int NE, const bool symmetric, const bool,
    }); // end of element loop
 }
 
-void PAHdivMassApply3D(const int NE, const bool symmetric, const bool,
-                       const Array<real_t> &Bo_, const Array<real_t> &Bc_,
-                       const Array<real_t> &Bot_, const Array<real_t> &Bct_,
-                       const Vector &op_, const Vector &x_, Vector &y_,
-                       const int D1D, const int TestD1D, const int Q1D)
+void PAHdivMassApply3D(const int D1D,
+                       const int Q1D,
+                       const int NE,
+                       const bool symmetric,
+                       const Array<real_t> &Bo_,
+                       const Array<real_t> &Bc_,
+                       const Array<real_t> &Bot_,
+                       const Array<real_t> &Bct_,
+                       const Vector &op_,
+                       const Vector &x_,
+                       Vector &y_)
 {
-   MFEM_VERIFY(D1D == TestD1D,
-               "Trial and test spaces must have same number of dofs");
    MFEM_VERIFY(D1D <= DeviceDofQuadLimits::Get().HDIV_MAX_D1D,
                "Error: D1D > HDIV_MAX_D1D");
    MFEM_VERIFY(Q1D <= DeviceDofQuadLimits::Get().HDIV_MAX_Q1D,

fem/integ/bilininteg_hdiv_kernels.hpp

@@ -66,29 +66,58 @@ void PAHdivMassAssembleDiagonal3D(const int D1D,
                                   const Vector &op_,
                                   Vector &diag_);
 
+void PAHdivMassApply(const int dim,
+                     const int D1D,
+                     const int Q1D,
+                     const int NE,
+                     const bool symmetric,
+                     const Array<real_t> &Bo,
+                     const Array<real_t> &Bc,
+                     const Array<real_t> &Bot,
+                     const Array<real_t> &Bct,
+                     const Vector &op,
+                     const Vector &x,
+                     Vector &y);
+
 // PA H(div) Mass Apply 2D kernel
-void PAHdivMassApply2D(const int NE, const bool symmetric,
-                       const bool scalar_coeff, const Array<real_t> &Bo_,
-                       const Array<real_t> &Bc_, const Array<real_t> &Bot_,
-                       const Array<real_t> &Bct_, const Vector &op_,
-                       const Vector &x_, Vector &y_, const int D1D,
-                       const int TestD1D, const int Q1D);
+void PAHdivMassApply2D(const int D1D,
+                       const int Q1D,
+                       const int NE,
+                       const bool symmetric,
+                       const Array<real_t> &Bo_,
+                       const Array<real_t> &Bc_,
+                       const Array<real_t> &Bot_,
+                       const Array<real_t> &Bct_,
+                       const Vector &op_,
+                       const Vector &x_,
+                       Vector &y_);
 
 // PA H(div) Mass Apply 3D kernel
-void PAHdivMassApply3D(const int NE, const bool symmetric,
-                       const bool scalar_coeff, const Array<real_t> &Bo_,
-                       const Array<real_t> &Bc_, const Array<real_t> &Bot_,
-                       const Array<real_t> &Bct_, const Vector &op_,
-                       const Vector &x_, Vector &y_, const int D1D,
-                       const int TestD1D, const int Q1D);
+void PAHdivMassApply3D(const int D1D,
+                       const int Q1D,
+                       const int NE,
+                       const bool symmetric,
+                       const Array<real_t> &Bo_,
+                       const Array<real_t> &Bc_,
+                       const Array<real_t> &Bot_,
+                       const Array<real_t> &Bct_,
+                       const Vector &op_,
+                       const Vector &x_,
+                       Vector &y_);
 
 // Shared memory PA H(div) Mass Apply 2D kernel
-template <int T_D1D = 0, int T_Q1D = 0>
-inline void SmemPAHdivMassApply2D(
-   const int NE, const bool symmetric, const bool, const Array<real_t> &Bo_,
-   const Array<real_t> &Bc_, const Array<real_t> &Bot_,
-   const Array<real_t> &Bct_, const Vector &op_, const Vector &x_, Vector &y_,
-   const int d1d = 0, const int = 0, const int q1d = 0)
+template<int T_D1D = 0, int T_Q1D = 0>
+inline void SmemPAHdivMassApply2D(const int NE,
+                                  const bool symmetric,
+                                  const Array<real_t> &Bo_,
+                                  const Array<real_t> &Bc_,
+                                  const Array<real_t> &Bot_,
+                                  const Array<real_t> &Bct_,
+                                  const Vector &op_,
+                                  const Vector &x_,
+                                  Vector &y_,
+                                  const int d1d = 0,
+                                  const int q1d = 0)
 {
    MFEM_CONTRACT_VAR(Bot_);
    MFEM_CONTRACT_VAR(Bct_);
@@ -251,13 +280,18 @@ inline void SmemPAHdivMassApply2D(
 }
 
 // Shared memory PA H(div) Mass Apply 3D kernel
-template <int T_D1D = 0, int T_Q1D = 0>
-inline void
-SmemPAHdivMassApply3D(const int NE, const bool symmetric, const bool,
-                      const Array<real_t> &Bo_, const Array<real_t> &Bc_,
-                      const Array<real_t> &Bot_, const Array<real_t> &Bct_,
-                      const Vector &op_, const Vector &x_, Vector &y_,
-                      const int d1d = 0, const int = 0, const int q1d = 0)
+template<int T_D1D = 0, int T_Q1D = 0>
+inline void SmemPAHdivMassApply3D(const int NE,
+                                  const bool symmetric,
+                                  const Array<real_t> &Bo_,
+                                  const Array<real_t> &Bc_,
+                                  const Array<real_t> &Bot_,
+                                  const Array<real_t> &Bct_,
+                                  const Vector &op_,
+                                  const Vector &x_,
+                                  Vector &y_,
+                                  const int d1d = 0,
+                                  const int q1d = 0)
 {
    MFEM_CONTRACT_VAR(Bot_);
    MFEM_CONTRACT_VAR(Bct_);

fem/integ/bilininteg_interp_pa.cpp

@@ -14,8 +14,6 @@
 #include "../gridfunc.hpp"
 #include "../qfunction.hpp"
 
-#include "bilininteg_hcurlhdiv_kernels.hpp"
-
 namespace mfem
 {
 
@@ -1952,138 +1950,4 @@ void IdentityInterpolator::AddMultTransposePA(const Vector &x, Vector &y) const
    }
 }
 
-void CurlInterpolator::AssemblePA(const FiniteElementSpace &dom_fes,
-                                  const FiniteElementSpace &ran_fes)
-{
-   // TODO: 1D and 2D meshes
-   Mesh *mesh = dom_fes.GetMesh();
-   const VectorTensorFiniteElement *dom_el =
-      dynamic_cast<const VectorTensorFiniteElement *>(dom_fes.GetTypicalFE());
-   const VectorTensorFiniteElement *ran_el =
-      dynamic_cast<const VectorTensorFiniteElement *>(ran_fes.GetTypicalFE());
-   MFEM_VERIFY(dom_el != NULL, "Only VectorTensorFiniteElement is supported!");
-   MFEM_VERIFY(ran_el != NULL, "Only VectorTensorFiniteElement is supported!");
-   // only supports H(curl) -> H(div) because of discontinuity requirements
-   MFEM_VERIFY(dom_el->GetDerivType() == FiniteElement::CURL,
-               "Domain space must be H(curl)");
-   MFEM_VERIFY(ran_el->GetDerivType() == FiniteElement::DIV,
-               "Range space must be H(div)");
-
-   const int dims = dom_el->GetDim();
-   MFEM_VERIFY(dims == 3, "");
-   dim = mesh->Dimension();
-
-   ne = dom_fes.GetNE();
-   ndof_o = dom_el->GetOrder();
-   int ndof_c = ndof_o + 1;
-   nquad_o = ran_el->GetOrder();
-   int nquad_c = nquad_o + 1;
-
-   // extract the tensor product range dof locations
-   std::vector<real_t> qc(nquad_c);
-   std::vector<real_t> qo(nquad_o);
-   {
-      const IntegrationRule &ran_nodes = ran_el->GetNodes();
-      const Array<int> &quad_map = ran_el->GetDofMap();
-      for (int i = 0; i < nquad_c; ++i)
-      {
-         int idx = UnsignIndex(quad_map[i]);
-         qc[i] = ran_nodes.IntPoint(idx).x;
-      }
-      int offset = ndof_c * ndof_o * ndof_o;
-      for (int i = 0; i < nquad_o; ++i)
-      {
-         int idx = UnsignIndex(quad_map[i + offset]);
-         qo[i] = ran_nodes.IntPoint(idx).x;
-      }
-   }
-
-   // evaluate closed/open 1D basis (and their derivatives) at closed and
-   // open quads
-   // storage order: GCO, BCC, BOO
-   pa_data.SetSize(ndof_c * nquad_o + ndof_c * nquad_c + ndof_o * nquad_o);
-   auto ptr = pa_data.HostWrite();
-   auto &cbasis1d = dom_el->GetBasis1D();
-   auto &obasis1d = dom_el->GetOpenBasis1D();
-   Vector b, g;
-   b.SetSize(ndof_c);
-   g.SetSize(ndof_c);
-   for (int j = 0; j < nquad_o; ++j)
-   {
-      cbasis1d.Eval(qo[j], b, g);
-      for (int i = 0; i < ndof_c; ++i)
-      {
-         ptr[j + i * nquad_o] = g[i];
-      }
-   }
-   ptr += nquad_o * ndof_c;
-
-   for (int j = 0; j < nquad_c; ++j)
-   {
-      cbasis1d.Eval(qc[j], b);
-      for (int i = 0; i < ndof_c; ++i)
-      {
-         ptr[j + i * nquad_c] = b[i];
-      }
-   }
-   ptr += ndof_c * nquad_c;
-
-   b.SetSize(ndof_o);
-   for (int j = 0; j < nquad_o; ++j)
-   {
-      obasis1d.Eval(qo[j], b);
-      for (int i = 0; i < ndof_o; ++i)
-      {
-         ptr[j + i * nquad_o] = b[i];
-      }
-   }
-}
-
-CurlInterpolator::Kernels::Kernels()
-{
-   CurlInterpolator::AddSpecialization<3, 1, 1>();
-   CurlInterpolator::AddSpecialization<3, 2, 2>();
-   CurlInterpolator::AddSpecialization<3, 3, 3>();
-   CurlInterpolator::AddSpecialization<3, 4, 4>();
-   CurlInterpolator::AddSpecialization<3, 5, 5>();
-}
-
-CurlInterpolator::CurlInterpolator() { static Kernels kernels{}; }
-
-void CurlInterpolator::AddMultPA(const Vector &x, Vector &y) const
-{
-   ApplyPAKernels::Run(dim, ndof_o, nquad_o, ne, ndof_o, nquad_o, pa_data, x,
-                       y);
-}
-
-void CurlInterpolator::AddMultTransposePA(const Vector &x, Vector &y) const
-{
-   ApplyTPAKernels::Run(dim, ndof_o, nquad_o, ne, ndof_o, nquad_o, pa_data, x,
-                        y);
-}
-
-/// \cond DO_NOT_DOCUMENT
-
-CurlInterpolator::ApplyKernelType
-CurlInterpolator::ApplyPAKernels::Fallback(int DIM, int, int)
-{
-   if (DIM == 3)
-   {
-      return internal::CurlInterpolatorApply3DSmem<0, 0>;
-   }
-   MFEM_ABORT("Bad dimension!");
-}
-
-CurlInterpolator::ApplyKernelType
-CurlInterpolator::ApplyTPAKernels::Fallback(int DIM, int, int)
-{
-   if (DIM == 3)
-   {
-      return internal::CurlInterpolatorTApply3DSmem<0, 0>;
-   }
-   MFEM_ABORT("Bad dimension!");
-}
-
-/// \endcond DO_NOT_DOCUMENT
-
 } // namespace mfem

fem/integ/bilininteg_mass_kernels.hpp

@@ -19,8 +19,6 @@
 #include "../../linalg/vector.hpp"
 #include "../bilininteg.hpp"
 
-#include "bilininteg_mass_pa_simplices.hpp"
-
 namespace mfem
 {
 

fem/integ/bilininteg_mixedcurl_pa.cpp

@@ -18,779 +18,6 @@
 namespace mfem
 {
 
-namespace
-{
-
-void PAHcurlDotSetup2D(const int q1d,
-                       const int ne,
-                       const bool test_map_integral,
-                       const Array<real_t> &w,
-                       const Vector &jacobians,
-                       const Vector &coeff,
-                       Vector &op)
-{
-   auto W = Reshape(w.Read(), q1d, q1d);
-   auto J = Reshape(jacobians.Read(), q1d, q1d, 2, 2, ne);
-   auto C = Reshape(coeff.Read(), 2, q1d, q1d, ne);
-   auto O = Reshape(op.Write(), 2, q1d, q1d, ne);
-
-   mfem::forall_2D(ne, q1d, q1d, [=] MFEM_HOST_DEVICE (int e)
-   {
-      MFEM_FOREACH_THREAD(qy, y, q1d)
-      {
-         MFEM_FOREACH_THREAD(qx, x, q1d)
-         {
-            const real_t J11 = J(qx, qy, 0, 0, e);
-            const real_t J12 = J(qx, qy, 1, 0, e);
-            const real_t J21 = J(qx, qy, 0, 1, e);
-            const real_t J22 = J(qx, qy, 1, 1, e);
-            const real_t detJ = (J11 * J22) - (J21 * J12);
-            const real_t scale = W(qx, qy) * (test_map_integral ? 1.0 / detJ : 1.0);
-            const real_t Vx = C(0, qx, qy, e);
-            const real_t Vy = C(1, qx, qy, e);
-
-            O(0, qx, qy, e) = scale * ( J22 * Vx - J12 * Vy);
-            O(1, qx, qy, e) = scale * (-J21 * Vx + J11 * Vy);
-         }
-      }
-   });
-}
-
-void PAHcurlDotSetup3D(const int q1d,
-                       const int ne,
-                       const bool test_map_integral,
-                       const Array<real_t> &w,
-                       const Vector &jacobians,
-                       const Vector &coeff,
-                       Vector &op)
-{
-   auto W = Reshape(w.Read(), q1d, q1d, q1d);
-   auto J = Reshape(jacobians.Read(), q1d, q1d, q1d, 3, 3, ne);
-   auto C = Reshape(coeff.Read(), 3, q1d, q1d, q1d, ne);
-   auto O = Reshape(op.Write(), 3, q1d, q1d, q1d, ne);
-
-   mfem::forall_3D(ne, q1d, q1d, q1d, [=] MFEM_HOST_DEVICE (int e)
-   {
-      MFEM_FOREACH_THREAD(qz, z, q1d)
-      {
-         MFEM_FOREACH_THREAD(qy, y, q1d)
-         {
-            MFEM_FOREACH_THREAD(qx, x, q1d)
-            {
-               const real_t J11 = J(qx, qy, qz, 0, 0, e);
-               const real_t J12 = J(qx, qy, qz, 0, 1, e);
-               const real_t J13 = J(qx, qy, qz, 0, 2, e);
-               const real_t J21 = J(qx, qy, qz, 1, 0, e);
-               const real_t J22 = J(qx, qy, qz, 1, 1, e);
-               const real_t J23 = J(qx, qy, qz, 1, 2, e);
-               const real_t J31 = J(qx, qy, qz, 2, 0, e);
-               const real_t J32 = J(qx, qy, qz, 2, 1, e);
-               const real_t J33 = J(qx, qy, qz, 2, 2, e);
-               const real_t detJ = J11 * (J22 * J33 - J32 * J23)
-                                   - J21 * (J12 * J33 - J32 * J13)
-                                   + J31 * (J12 * J23 - J22 * J13);
-               const real_t scale = W(qx, qy, qz) *
-                                    (test_map_integral ? 1.0 / detJ : 1.0);
-               const real_t Vx = C(0, qx, qy, qz, e);
-               const real_t Vy = C(1, qx, qy, qz, e);
-               const real_t Vz = C(2, qx, qy, qz, e);
-
-               O(0, qx, qy, qz, e) = scale *
-                                     ((J22 * J33 - J23 * J32) * Vx +
-                                      (J13 * J32 - J12 * J33) * Vy +
-                                      (J12 * J23 - J13 * J22) * Vz);
-               O(1, qx, qy, qz, e) = scale *
-                                     ((J23 * J31 - J21 * J33) * Vx +
-                                      (J11 * J33 - J13 * J31) * Vy +
-                                      (J13 * J21 - J11 * J23) * Vz);
-               O(2, qx, qy, qz, e) = scale *
-                                     ((J21 * J32 - J22 * J31) * Vx +
-                                      (J12 * J31 - J11 * J32) * Vy +
-                                      (J11 * J22 - J12 * J21) * Vz);
-            }
-         }
-      }
-   });
-}
-
-void PAHcurlDotApply2D(const int d1d,
-                       const int d1d_test,
-                       const int q1d,
-                       const int ne,
-                       const Array<real_t> &bo,
-                       const Array<real_t> &bc,
-                       const Array<real_t> &bt,
-                       const Vector &pa_data,
-                       const Vector &x,
-                       Vector &y)
-{
-   MFEM_VERIFY(d1d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D, "");
-   MFEM_VERIFY(d1d_test <= DeviceDofQuadLimits::Get().MAX_D1D, "");
-   MFEM_VERIFY(q1d <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D, "");
-
-   auto Bo = Reshape(bo.Read(), q1d, d1d - 1);
-   auto Bc = Reshape(bc.Read(), q1d, d1d);
-   auto Bt = Reshape(bt.Read(), d1d_test, q1d);
-   auto O = Reshape(pa_data.Read(), 2, q1d, q1d, ne);
-   auto X = Reshape(x.Read(), 2 * (d1d - 1) * d1d, ne);
-   auto Y = Reshape(y.ReadWrite(), d1d_test, d1d_test, ne);
-
-   mfem::forall(ne, [=] MFEM_HOST_DEVICE (int e)
-   {
-      constexpr int MAX_D1D = DofQuadLimits::MAX_D1D;
-      constexpr int MAX_Q1D = DofQuadLimits::HCURL_MAX_Q1D;
-
-      real_t u0[MAX_Q1D][MAX_Q1D];
-      real_t u1[MAX_Q1D][MAX_Q1D];
-
-      for (int qy = 0; qy < q1d; ++qy)
-      {
-         for (int qx = 0; qx < q1d; ++qx)
-         {
-            u0[qy][qx] = 0.0;
-            u1[qy][qx] = 0.0;
-         }
-      }
-
-      int osc = 0;
-      for (int dy = 0; dy < d1d; ++dy)
-      {
-         real_t mass_x[MAX_Q1D];
-         for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] = 0.0; }
-         for (int dx = 0; dx < d1d - 1; ++dx)
-         {
-            const real_t t = X(dx + (dy * (d1d - 1)) + osc, e);
-            for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] += t * Bo(qx, dx); }
-         }
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            const real_t wy = Bc(qy, dy);
-            for (int qx = 0; qx < q1d; ++qx) { u0[qy][qx] += mass_x[qx] * wy; }
-         }
-      }
-
-      osc += (d1d - 1) * d1d;
-      for (int dy = 0; dy < d1d - 1; ++dy)
-      {
-         real_t mass_x[MAX_Q1D];
-         for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] = 0.0; }
-         for (int dx = 0; dx < d1d; ++dx)
-         {
-            const real_t t = X(dx + (dy * d1d) + osc, e);
-            for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] += t * Bc(qx, dx); }
-         }
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            const real_t wy = Bo(qy, dy);
-            for (int qx = 0; qx < q1d; ++qx) { u1[qy][qx] += mass_x[qx] * wy; }
-         }
-      }
-
-      for (int qy = 0; qy < q1d; ++qy)
-      {
-         real_t sol_x[MAX_D1D];
-         for (int dx = 0; dx < d1d_test; ++dx) { sol_x[dx] = 0.0; }
-         for (int qx = 0; qx < q1d; ++qx)
-         {
-            const real_t s = O(0, qx, qy, e) * u0[qy][qx]
-                             + O(1, qx, qy, e) * u1[qy][qx];
-            for (int dx = 0; dx < d1d_test; ++dx)
-            {
-               sol_x[dx] += s * Bt(dx, qx);
-            }
-         }
-         for (int dy = 0; dy < d1d_test; ++dy)
-         {
-            const real_t wy = Bt(dy, qy);
-            for (int dx = 0; dx < d1d_test; ++dx)
-            {
-               Y(dx, dy, e) += sol_x[dx] * wy;
-            }
-         }
-      }
-   });
-}
-
-void PAHcurlDotApplyTranspose2D(const int d1d,
-                                const int d1d_test,
-                                const int q1d,
-                                const int ne,
-                                const Array<real_t> &bo,
-                                const Array<real_t> &bc,
-                                const Array<real_t> &b,
-                                const Vector &pa_data,
-                                const Vector &x,
-                                Vector &y)
-{
-   MFEM_VERIFY(d1d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D, "");
-   MFEM_VERIFY(d1d_test <= DeviceDofQuadLimits::Get().MAX_D1D, "");
-   MFEM_VERIFY(q1d <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D, "");
-
-   auto Bo = Reshape(bo.Read(), q1d, d1d - 1);
-   auto Bc = Reshape(bc.Read(), q1d, d1d);
-   auto B = Reshape(b.Read(), q1d, d1d_test);
-   auto O = Reshape(pa_data.Read(), 2, q1d, q1d, ne);
-   auto X = Reshape(x.Read(), d1d_test, d1d_test, ne);
-   auto Y = Reshape(y.ReadWrite(), 2 * (d1d - 1) * d1d, ne);
-
-   mfem::forall(ne, [=] MFEM_HOST_DEVICE (int e)
-   {
-      constexpr int MAX_D1D = DofQuadLimits::MAX_D1D;
-      constexpr int MAX_Q1D = DofQuadLimits::HCURL_MAX_Q1D;
-
-      real_t mass[MAX_Q1D][MAX_Q1D];
-      for (int qy = 0; qy < q1d; ++qy)
-      {
-         for (int qx = 0; qx < q1d; ++qx)
-         {
-            mass[qy][qx] = 0.0;
-         }
-      }
-
-      for (int dy = 0; dy < d1d_test; ++dy)
-      {
-         real_t sol_x[MAX_Q1D];
-         for (int qx = 0; qx < q1d; ++qx) { sol_x[qx] = 0.0; }
-         for (int dx = 0; dx < d1d_test; ++dx)
-         {
-            const real_t t = X(dx, dy, e);
-            for (int qx = 0; qx < q1d; ++qx) { sol_x[qx] += t * B(qx, dx); }
-         }
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            const real_t wy = B(qy, dy);
-            for (int qx = 0; qx < q1d; ++qx) { mass[qy][qx] += sol_x[qx] * wy; }
-         }
-      }
-
-      int osc = 0;
-      for (int qy = 0; qy < q1d; ++qy)
-      {
-         real_t mass_x[MAX_D1D];
-         for (int dx = 0; dx < d1d - 1; ++dx) { mass_x[dx] = 0.0; }
-         for (int qx = 0; qx < q1d; ++qx)
-         {
-            const real_t s = O(0, qx, qy, e) * mass[qy][qx];
-            for (int dx = 0; dx < d1d - 1; ++dx) { mass_x[dx] += s * Bo(qx, dx); }
-         }
-         for (int dy = 0; dy < d1d; ++dy)
-         {
-            const real_t wy = Bc(qy, dy);
-            for (int dx = 0; dx < d1d - 1; ++dx)
-            {
-               Y(dx + (dy * (d1d - 1)) + osc, e) += mass_x[dx] * wy;
-            }
-         }
-      }
-
-      osc += (d1d - 1) * d1d;
-      for (int qy = 0; qy < q1d; ++qy)
-      {
-         real_t mass_x[MAX_D1D];
-         for (int dx = 0; dx < d1d; ++dx) { mass_x[dx] = 0.0; }
-         for (int qx = 0; qx < q1d; ++qx)
-         {
-            const real_t s = O(1, qx, qy, e) * mass[qy][qx];
-            for (int dx = 0; dx < d1d; ++dx) { mass_x[dx] += s * Bc(qx, dx); }
-         }
-         for (int dy = 0; dy < d1d - 1; ++dy)
-         {
-            const real_t wy = Bo(qy, dy);
-            for (int dx = 0; dx < d1d; ++dx)
-            {
-               Y(dx + (dy * d1d) + osc, e) += mass_x[dx] * wy;
-            }
-         }
-      }
-   });
-}
-
-void PAHcurlDotApply3D(const int d1d,
-                       const int d1d_test,
-                       const int q1d,
-                       const int ne,
-                       const Array<real_t> &bo,
-                       const Array<real_t> &bc,
-                       const Array<real_t> &bt,
-                       const Vector &pa_data,
-                       const Vector &x,
-                       Vector &y)
-{
-   MFEM_VERIFY(d1d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D, "");
-   MFEM_VERIFY(d1d_test <= DeviceDofQuadLimits::Get().MAX_D1D, "");
-   MFEM_VERIFY(q1d <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D, "");
-
-   auto Bo = Reshape(bo.Read(), q1d, d1d - 1);
-   auto Bc = Reshape(bc.Read(), q1d, d1d);
-   auto Bt = Reshape(bt.Read(), d1d_test, q1d);
-   auto O = Reshape(pa_data.Read(), 3, q1d, q1d, q1d, ne);
-   auto X = Reshape(x.Read(), 3 * (d1d - 1) * d1d * d1d, ne);
-   auto Y = Reshape(y.ReadWrite(), d1d_test, d1d_test, d1d_test, ne);
-
-   mfem::forall(ne, [=] MFEM_HOST_DEVICE (int e)
-   {
-      constexpr int MAX_D1D = DofQuadLimits::MAX_D1D;
-      constexpr int MAX_Q1D = DofQuadLimits::HCURL_MAX_Q1D;
-
-      real_t u[MAX_Q1D][MAX_Q1D][MAX_Q1D][3];
-      for (int qz = 0; qz < q1d; ++qz)
-      {
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            for (int qx = 0; qx < q1d; ++qx)
-            {
-               for (int c = 0; c < 3; ++c) { u[qz][qy][qx][c] = 0.0; }
-            }
-         }
-      }
-
-      int osc = 0;
-      for (int dz = 0; dz < d1d; ++dz)
-      {
-         real_t mass_xy[MAX_Q1D][MAX_Q1D];
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] = 0.0; }
-         }
-
-         for (int dy = 0; dy < d1d; ++dy)
-         {
-            real_t mass_x[MAX_Q1D];
-            for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] = 0.0; }
-            for (int dx = 0; dx < d1d - 1; ++dx)
-            {
-               const real_t t = X(dx + ((dy + (dz * d1d)) * (d1d - 1)) + osc, e);
-               for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] += t * Bo(qx, dx); }
-            }
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               const real_t wy = Bc(qy, dy);
-               for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] += mass_x[qx] * wy; }
-            }
-         }
-
-         for (int qz = 0; qz < q1d; ++qz)
-         {
-            const real_t wz = Bc(qz, dz);
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               for (int qx = 0; qx < q1d; ++qx) { u[qz][qy][qx][0] += mass_xy[qy][qx] * wz; }
-            }
-         }
-      }
-
-      osc += (d1d - 1) * d1d * d1d;
-      for (int dz = 0; dz < d1d; ++dz)
-      {
-         real_t mass_xy[MAX_Q1D][MAX_Q1D];
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] = 0.0; }
-         }
-
-         for (int dy = 0; dy < d1d - 1; ++dy)
-         {
-            real_t mass_x[MAX_Q1D];
-            for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] = 0.0; }
-            for (int dx = 0; dx < d1d; ++dx)
-            {
-               const real_t t = X(dx + ((dy + (dz * (d1d - 1))) * d1d) + osc, e);
-               for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] += t * Bc(qx, dx); }
-            }
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               const real_t wy = Bo(qy, dy);
-               for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] += mass_x[qx] * wy; }
-            }
-         }
-
-         for (int qz = 0; qz < q1d; ++qz)
-         {
-            const real_t wz = Bc(qz, dz);
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               for (int qx = 0; qx < q1d; ++qx) { u[qz][qy][qx][1] += mass_xy[qy][qx] * wz; }
-            }
-         }
-      }
-
-      osc += (d1d - 1) * d1d * d1d;
-      for (int dz = 0; dz < d1d - 1; ++dz)
-      {
-         real_t mass_xy[MAX_Q1D][MAX_Q1D];
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] = 0.0; }
-         }
-
-         for (int dy = 0; dy < d1d; ++dy)
-         {
-            real_t mass_x[MAX_Q1D];
-            for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] = 0.0; }
-            for (int dx = 0; dx < d1d; ++dx)
-            {
-               const real_t t = X(dx + ((dy + (dz * d1d)) * d1d) + osc, e);
-               for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] += t * Bc(qx, dx); }
-            }
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               const real_t wy = Bc(qy, dy);
-               for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] += mass_x[qx] * wy; }
-            }
-         }
-
-         for (int qz = 0; qz < q1d; ++qz)
-         {
-            const real_t wz = Bo(qz, dz);
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               for (int qx = 0; qx < q1d; ++qx) { u[qz][qy][qx][2] += mass_xy[qy][qx] * wz; }
-            }
-         }
-      }
-
-      for (int qz = 0; qz < q1d; ++qz)
-      {
-         real_t mass_xy[MAX_D1D][MAX_D1D];
-         for (int dy = 0; dy < d1d_test; ++dy)
-         {
-            for (int dx = 0; dx < d1d_test; ++dx) { mass_xy[dy][dx] = 0.0; }
-         }
-
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            real_t mass_x[MAX_D1D];
-            for (int dx = 0; dx < d1d_test; ++dx) { mass_x[dx] = 0.0; }
-            for (int qx = 0; qx < q1d; ++qx)
-            {
-               const real_t s = O(0, qx, qy, qz, e) * u[qz][qy][qx][0]
-                                + O(1, qx, qy, qz, e) * u[qz][qy][qx][1]
-                                + O(2, qx, qy, qz, e) * u[qz][qy][qx][2];
-               for (int dx = 0; dx < d1d_test; ++dx) { mass_x[dx] += s * Bt(dx, qx); }
-            }
-            for (int dy = 0; dy < d1d_test; ++dy)
-            {
-               const real_t wy = Bt(dy, qy);
-               for (int dx = 0; dx < d1d_test; ++dx) { mass_xy[dy][dx] += mass_x[dx] * wy; }
-            }
-         }
-
-         for (int dz = 0; dz < d1d_test; ++dz)
-         {
-            const real_t wz = Bt(dz, qz);
-            for (int dy = 0; dy < d1d_test; ++dy)
-            {
-               for (int dx = 0; dx < d1d_test; ++dx)
-               {
-                  Y(dx, dy, dz, e) += mass_xy[dy][dx] * wz;
-               }
-            }
-         }
-      }
-   });
-}
-
-void PAHcurlDotApplyTranspose3D(const int d1d,
-                                const int d1d_test,
-                                const int q1d,
-                                const int ne,
-                                const Array<real_t> &bo,
-                                const Array<real_t> &bc,
-                                const Array<real_t> &b,
-                                const Vector &pa_data,
-                                const Vector &x,
-                                Vector &y)
-{
-   MFEM_VERIFY(d1d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D, "");
-   MFEM_VERIFY(d1d_test <= DeviceDofQuadLimits::Get().MAX_D1D, "");
-   MFEM_VERIFY(q1d <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D, "");
-
-   auto Bo = Reshape(bo.Read(), q1d, d1d - 1);
-   auto Bc = Reshape(bc.Read(), q1d, d1d);
-   auto B = Reshape(b.Read(), q1d, d1d_test);
-   auto O = Reshape(pa_data.Read(), 3, q1d, q1d, q1d, ne);
-   auto X = Reshape(x.Read(), d1d_test, d1d_test, d1d_test, ne);
-   auto Y = Reshape(y.ReadWrite(), 3 * (d1d - 1) * d1d * d1d, ne);
-
-   mfem::forall(ne, [=] MFEM_HOST_DEVICE (int e)
-   {
-      constexpr int MAX_D1D = DofQuadLimits::MAX_D1D;
-      constexpr int MAX_Q1D = DofQuadLimits::HCURL_MAX_Q1D;
-
-      real_t mass[MAX_Q1D][MAX_Q1D][MAX_Q1D];
-      for (int qz = 0; qz < q1d; ++qz)
-      {
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            for (int qx = 0; qx < q1d; ++qx) { mass[qz][qy][qx] = 0.0; }
-         }
-      }
-
-      for (int dz = 0; dz < d1d_test; ++dz)
-      {
-         real_t mass_xy[MAX_Q1D][MAX_Q1D];
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] = 0.0; }
-         }
-
-         for (int dy = 0; dy < d1d_test; ++dy)
-         {
-            real_t mass_x[MAX_Q1D];
-            for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] = 0.0; }
-            for (int dx = 0; dx < d1d_test; ++dx)
-            {
-               const real_t t = X(dx, dy, dz, e);
-               for (int qx = 0; qx < q1d; ++qx) { mass_x[qx] += t * B(qx, dx); }
-            }
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               const real_t wy = B(qy, dy);
-               for (int qx = 0; qx < q1d; ++qx) { mass_xy[qy][qx] += mass_x[qx] * wy; }
-            }
-         }
-
-         for (int qz = 0; qz < q1d; ++qz)
-         {
-            const real_t wz = B(qz, dz);
-            for (int qy = 0; qy < q1d; ++qy)
-            {
-               for (int qx = 0; qx < q1d; ++qx) { mass[qz][qy][qx] += mass_xy[qy][qx] * wz; }
-            }
-         }
-      }
-
-      int osc = 0;
-      for (int qz = 0; qz < q1d; ++qz)
-      {
-         real_t mass_xy[MAX_D1D][MAX_D1D];
-         for (int dy = 0; dy < d1d; ++dy)
-         {
-            for (int dx = 0; dx < d1d - 1; ++dx) { mass_xy[dy][dx] = 0.0; }
-         }
-
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            real_t mass_x[MAX_D1D];
-            for (int dx = 0; dx < d1d - 1; ++dx) { mass_x[dx] = 0.0; }
-            for (int qx = 0; qx < q1d; ++qx)
-            {
-               const real_t s = O(0, qx, qy, qz, e) * mass[qz][qy][qx];
-               for (int dx = 0; dx < d1d - 1; ++dx) { mass_x[dx] += s * Bo(qx, dx); }
-            }
-            for (int dy = 0; dy < d1d; ++dy)
-            {
-               const real_t wy = Bc(qy, dy);
-               for (int dx = 0; dx < d1d - 1; ++dx) { mass_xy[dy][dx] += mass_x[dx] * wy; }
-            }
-         }
-
-         for (int dz = 0; dz < d1d; ++dz)
-         {
-            const real_t wz = Bc(qz, dz);
-            for (int dy = 0; dy < d1d; ++dy)
-            {
-               for (int dx = 0; dx < d1d - 1; ++dx)
-               {
-                  Y(dx + ((dy + (dz * d1d)) * (d1d - 1)) + osc, e) += mass_xy[dy][dx] * wz;
-               }
-            }
-         }
-      }
-
-      osc += (d1d - 1) * d1d * d1d;
-      for (int qz = 0; qz < q1d; ++qz)
-      {
-         real_t mass_xy[MAX_D1D][MAX_D1D];
-         for (int dy = 0; dy < d1d - 1; ++dy)
-         {
-            for (int dx = 0; dx < d1d; ++dx) { mass_xy[dy][dx] = 0.0; }
-         }
-
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            real_t mass_x[MAX_D1D];
-            for (int dx = 0; dx < d1d; ++dx) { mass_x[dx] = 0.0; }
-            for (int qx = 0; qx < q1d; ++qx)
-            {
-               const real_t s = O(1, qx, qy, qz, e) * mass[qz][qy][qx];
-               for (int dx = 0; dx < d1d; ++dx) { mass_x[dx] += s * Bc(qx, dx); }
-            }
-            for (int dy = 0; dy < d1d - 1; ++dy)
-            {
-               const real_t wy = Bo(qy, dy);
-               for (int dx = 0; dx < d1d; ++dx) { mass_xy[dy][dx] += mass_x[dx] * wy; }
-            }
-         }
-
-         for (int dz = 0; dz < d1d; ++dz)
-         {
-            const real_t wz = Bc(qz, dz);
-            for (int dy = 0; dy < d1d - 1; ++dy)
-            {
-               for (int dx = 0; dx < d1d; ++dx)
-               {
-                  Y(dx + ((dy + (dz * (d1d - 1))) * d1d) + osc, e) += mass_xy[dy][dx] * wz;
-               }
-            }
-         }
-      }
-
-      osc += (d1d - 1) * d1d * d1d;
-      for (int qz = 0; qz < q1d; ++qz)
-      {
-         real_t mass_xy[MAX_D1D][MAX_D1D];
-         for (int dy = 0; dy < d1d; ++dy)
-         {
-            for (int dx = 0; dx < d1d; ++dx) { mass_xy[dy][dx] = 0.0; }
-         }
-
-         for (int qy = 0; qy < q1d; ++qy)
-         {
-            real_t mass_x[MAX_D1D];
-            for (int dx = 0; dx < d1d; ++dx) { mass_x[dx] = 0.0; }
-            for (int qx = 0; qx < q1d; ++qx)
-            {
-               const real_t s = O(2, qx, qy, qz, e) * mass[qz][qy][qx];
-               for (int dx = 0; dx < d1d; ++dx) { mass_x[dx] += s * Bc(qx, dx); }
-            }
-            for (int dy = 0; dy < d1d; ++dy)
-            {
-               const real_t wy = Bc(qy, dy);
-               for (int dx = 0; dx < d1d; ++dx) { mass_xy[dy][dx] += mass_x[dx] * wy; }
-            }
-         }
-
-         for (int dz = 0; dz < d1d - 1; ++dz)
-         {
-            const real_t wz = Bo(qz, dz);
-            for (int dy = 0; dy < d1d; ++dy)
-            {
-               for (int dx = 0; dx < d1d; ++dx)
-               {
-                  Y(dx + ((dy + (dz * d1d)) * d1d) + osc, e) += mass_xy[dy][dx] * wz;
-               }
-            }
-         }
-      }
-   });
-}
-
-} // namespace
-
-void MixedDotProductIntegrator::AssemblePA(const FiniteElementSpace &trial_fes,
-                                           const FiniteElementSpace &test_fes)
-{
-   Mesh *mesh = trial_fes.GetMesh();
-   const FiniteElement *trial_fel = trial_fes.GetTypicalFE();
-   const FiniteElement *test_fel = test_fes.GetTypicalFE();
-
-   const VectorTensorFiniteElement *trial_el =
-      dynamic_cast<const VectorTensorFiniteElement*>(trial_fel);
-   MFEM_VERIFY(trial_el != NULL, "Only VectorTensorFiniteElement is supported!");
-
-   const TensorBasisElement *test_tensor_el =
-      dynamic_cast<const TensorBasisElement*>(test_fel);
-   MFEM_VERIFY(test_tensor_el != NULL,
-               "Only tensor-product scalar test elements are supported!");
-
-   MFEM_VERIFY(trial_el->GetDerivType() == mfem::FiniteElement::CURL,
-               "Only H(curl) trial spaces are supported!");
-
-   const IntegrationRule *ir = IntRule;
-   if (ir == nullptr)
-   {
-      const int order = trial_fel->GetOrder() + test_fel->GetOrder()
-                        + mesh->GetTypicalElementTransformation()->OrderW();
-      ir = &IntRules.Get(trial_fel->GetGeomType(), order);
-   }
-
-   dim = mesh->Dimension();
-   MFEM_VERIFY(dim == 2 || dim == 3, "Unsupported dimension!");
-   MFEM_VERIFY(trial_el->GetDim() == dim && test_fel->GetDim() == dim,
-               "Trial/test dimension mismatch.");
-
-   ne = trial_fes.GetNE();
-   MFEM_VERIFY(ne == test_fes.GetNE(),
-               "Different meshes for test and trial spaces");
-
-   geom = mesh->GetGeometricFactors(*ir, GeometricFactors::JACOBIANS);
-   mapsC = &trial_el->GetDofToQuad(*ir, DofToQuad::TENSOR);
-   mapsO = &trial_el->GetDofToQuadOpen(*ir, DofToQuad::TENSOR);
-   mapsTest = &test_fel->GetDofToQuad(*ir, DofToQuad::TENSOR);
-
-   dofs1D = mapsC->ndof;
-   dofs1Dtest = mapsTest->ndof;
-   quad1D = mapsC->nqpt;
-   test_map_integral = (test_fel->GetMapType() == FiniteElement::INTEGRAL);
-
-   MFEM_VERIFY(dofs1D == mapsO->ndof + 1 && quad1D == mapsO->nqpt, "");
-   MFEM_VERIFY(quad1D == mapsTest->nqpt, "Trial/test quadrature mismatch");
-   MFEM_VERIFY(dofs1D <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D, "");
-   MFEM_VERIFY(dofs1Dtest <= DeviceDofQuadLimits::Get().MAX_D1D, "");
-   MFEM_VERIFY(quad1D <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D, "");
-
-   const int nq = ir->GetNPoints();
-   if (dim == 2) { MFEM_VERIFY(nq == quad1D * quad1D, ""); }
-   else { MFEM_VERIFY(nq == quad1D * quad1D * quad1D, ""); }
-
-   QuadratureSpace qs(*mesh, *ir);
-   CoefficientVector coeff(*VQ, qs, CoefficientStorage::FULL);
-   MFEM_VERIFY(coeff.GetVDim() == dim, "Vector coefficient dimension mismatch.");
-
-   pa_data.SetSize(dim * nq * ne, Device::GetMemoryType());
-
-   if (dim == 2)
-   {
-      PAHcurlDotSetup2D(quad1D, ne, test_map_integral, ir->GetWeights(),
-                        geom->J, coeff, pa_data);
-   }
-   else
-   {
-      PAHcurlDotSetup3D(quad1D, ne, test_map_integral, ir->GetWeights(),
-                        geom->J, coeff, pa_data);
-   }
-}
-
-void MixedDotProductIntegrator::AddMultPA(const Vector &x, Vector &y) const
-{
-   if (dim == 2)
-   {
-      PAHcurlDotApply2D(dofs1D, dofs1Dtest, quad1D, ne,
-                        mapsO->B, mapsC->B, mapsTest->Bt, pa_data, x, y);
-   }
-   else if (dim == 3)
-   {
-      PAHcurlDotApply3D(dofs1D, dofs1Dtest, quad1D, ne,
-                        mapsO->B, mapsC->B, mapsTest->Bt, pa_data, x, y);
-   }
-   else
-   {
-      MFEM_ABORT("Unsupported dimension!");
-   }
-}
-
-void MixedDotProductIntegrator::AddMultTransposePA(const Vector &x,
-                                                   Vector &y) const
-{
-   if (dim == 2)
-   {
-      PAHcurlDotApplyTranspose2D(dofs1D, dofs1Dtest, quad1D, ne,
-                                 mapsO->B, mapsC->B, mapsTest->B,
-                                 pa_data, x, y);
-   }
-   else if (dim == 3)
-   {
-      PAHcurlDotApplyTranspose3D(dofs1D, dofs1Dtest, quad1D, ne,
-                                 mapsO->B, mapsC->B, mapsTest->B,
-                                 pa_data, x, y);
-   }
-   else
-   {
-      MFEM_ABORT("Unsupported dimension!");
-   }
-}
-
 void MixedScalarCurlIntegrator::AssemblePA(const FiniteElementSpace &trial_fes,
                                            const FiniteElementSpace &test_fes)
 {
@@ -1093,7 +320,6 @@ void MixedVectorWeakCurlIntegrator::AssemblePA(const FiniteElementSpace
    CoefficientVector coeff(qs, CoefficientStorage::FULL);
    if (Q) { coeff.Project(*Q); }
    else if (DQ) { coeff.Project(*DQ); }
-   else if (MQ) { MFEM_ABORT("Not implemented."); }
    else { coeff.SetConstant(1.0); }
 
    if (trialType == mfem::FiniteElement::CURL && dim == 3)

fem/integ/bilininteg_vectorfemass_kernels.hpp

@@ -1,131 +0,0 @@
-// Copyright (c) 2010-2025, Lawrence Livermore National Security, LLC. Produced
-// at the Lawrence Livermore National Laboratory. All Rights reserved. See files
-// LICENSE and NOTICE for details. LLNL-CODE-806117.
-//
-// This file is part of the MFEM library. For more information and source code
-// availability visit https://mfem.org.
-//
-// MFEM is free software; you can redistribute it and/or modify it under the
-// terms of the BSD-3 license. We welcome feedback and contributions, see file
-// CONTRIBUTING.md for details.
-
-#ifndef MFEM_BILININTEG_VECTORFEMASS_KERNELS_HPP
-#define MFEM_BILININTEG_VECTORFEMASS_KERNELS_HPP
-
-#include "../../config/config.hpp"
-#include "../../general/array.hpp"
-#include "../../general/forall.hpp"
-#include "../../linalg/dtensor.hpp"
-#include "../../linalg/vector.hpp"
-#include "../bilininteg.hpp"
-
-#include "bilininteg_diffusion_kernels.hpp"
-#include "bilininteg_hcurl_kernels.hpp"
-#include "bilininteg_hdiv_kernels.hpp"
-#include "bilininteg_hcurlhdiv_kernels.hpp"
-
-namespace mfem
-{
-/// \cond DO_NOT_DOCUMENT
-namespace internal
-{
-namespace hcurlmass
-{
-constexpr int NBZ3D(int d1d, int q1d)
-{
-   if (d1d <= 1 || q1d <= 0)
-   {
-      return 1;
-   }
-   // assume q1d >= d1d
-   // z dimension is capped at 64 on nvidia and amd gpus
-   int tmp = std::min((128 + q1d * q1d * q1d - 1) / (q1d * q1d * q1d), 64);
-   int smem_req =
-      sizeof(mfem::real_t) *
-      (3 * ((d1d - 1) * d1d * d1d + 2 * q1d * q1d * q1d) * tmp +
-       q1d * (d1d - 1) + q1d * d1d);
-   // assume GPU has at least 48k shared memory
-   return std::max(std::min(tmp, (48 * 1024 + smem_req - 1) / smem_req), 1);
-}
-} // namespace hcurlmass
-} // namespace internal
-
-template <FiniteElement::DerivType TrialType, FiniteElement::DerivType TestType,
-          int DIM, int TrialD1D, int TestD1D, int Q1D>
-VectorFEMassIntegrator::ApplyKernelType
-VectorFEMassIntegrator::ApplyPAKernels::Kernel()
-{
-   constexpr bool trial_curl = (TrialType == mfem::FiniteElement::CURL);
-   constexpr bool trial_div = (TrialType == mfem::FiniteElement::DIV);
-   constexpr bool test_curl = (TestType == mfem::FiniteElement::CURL);
-   constexpr bool test_div = (TestType == mfem::FiniteElement::DIV);
-
-   if constexpr (DIM == 3)
-   {
-      if constexpr (trial_curl && test_curl)
-      {
-         if (Device::Allows(Backend::DEVICE_MASK))
-         {
-            // assume TrialD1D == TestD1D
-            return internal::SmemPAHcurlMassApply3D<
-                   TrialD1D, Q1D, internal::hcurlmass::NBZ3D(TrialD1D, Q1D)>;
-         }
-         else
-         {
-            return internal::PAHcurlMassApply3D;
-         }
-      }
-      else if constexpr (trial_div && test_div)
-      {
-         if (Device::Allows(Backend::DEVICE_MASK))
-         {
-            // assumes TrialD1D == TestD1D
-            return internal::SmemPAHdivMassApply3D<TrialD1D, Q1D>;
-         }
-         else
-         {
-            return internal::PAHdivMassApply3D;
-         }
-      }
-      else if constexpr (trial_curl && test_div)
-      {
-         return internal::PAHdivHcurlMassApply3D;
-      }
-      else if constexpr (trial_div && test_curl)
-      {
-         return internal::PAHcurlHdivMassApply3D;
-      }
-   }
-   else if constexpr (DIM == 2) // 2D
-   {
-      if constexpr (trial_curl && test_curl)
-      {
-         return internal::PAHcurlMassApply2D;
-      }
-      else if constexpr (trial_div && test_div)
-      {
-         if (Device::Allows(Backend::DEVICE_MASK))
-         {
-            // assumes TrialD1D == TestD1D
-            return internal::SmemPAHdivMassApply2D<TrialD1D, Q1D>;
-         }
-         else
-         {
-            return internal::PAHdivMassApply2D;
-         }
-      }
-      else if constexpr (trial_curl && test_div)
-      {
-         return internal::PAHdivHcurlMassApply2D;
-      }
-      else if constexpr (trial_div && test_curl)
-      {
-         return internal::PAHcurlHdivMassApply2D;
-      }
-   }
-   MFEM_ABORT("Unknown kernel.");
-}
-/// \endcond DO_NOT_DOCUMENT
-}
-
-#endif

fem/integ/bilininteg_vectorfemass_pa.cpp

@@ -12,115 +12,13 @@
 #include "../bilininteg.hpp"
 #include "../gridfunc.hpp"
 #include "../qfunction.hpp"
-#include "bilininteg_vectorfemass_kernels.hpp"
+#include "bilininteg_diffusion_kernels.hpp"
+#include "bilininteg_hcurl_kernels.hpp"
+#include "bilininteg_hdiv_kernels.hpp"
+#include "bilininteg_hcurlhdiv_kernels.hpp"
 
 namespace mfem
 {
-/// \cond DO_NOT_DOCUMENT
-VectorFEMassIntegrator::ApplyKernelType
-VectorFEMassIntegrator::ApplyPAKernels::Fallback(
-   FiniteElement::DerivType TrialType, FiniteElement::DerivType TestType,
-   int dim, int, int, int)
-{
-   const bool trial_curl = (TrialType == mfem::FiniteElement::CURL);
-   const bool trial_div = (TrialType == mfem::FiniteElement::DIV);
-   const bool test_curl = (TestType == mfem::FiniteElement::CURL);
-   const bool test_div = (TestType == mfem::FiniteElement::DIV);
-
-   if (dim == 3)
-   {
-      if (trial_curl && test_curl)
-      {
-         return internal::PAHcurlMassApply3D;
-      }
-      else if (trial_div && test_div)
-      {
-         return internal::PAHdivMassApply3D;
-      }
-      else if (trial_curl && test_div)
-      {
-         return internal::PAHdivHcurlMassApply3D;
-      }
-      else if (trial_div && test_curl)
-      {
-         return internal::PAHcurlHdivMassApply3D;
-      }
-   }
-   else if (dim == 2) // 2D
-   {
-      if (trial_curl && test_curl)
-      {
-         return internal::PAHcurlMassApply2D;
-      }
-      else if (trial_div && test_div)
-      {
-         return internal::PAHdivMassApply2D;
-      }
-      else if (trial_curl && test_div)
-      {
-         return internal::PAHdivHcurlMassApply2D;
-      }
-      else if (trial_div && test_curl)
-      {
-         return internal::PAHcurlHdivMassApply2D;
-      }
-   }
-   MFEM_ABORT("Unknown kernel.");
-}
-/// \endcond DO_NOT_DOCUMENT
-
-VectorFEMassIntegrator::Kernels::Kernels()
-{
-   // h(curl), h(curl)
-   // P = Q (3D)
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 2, 2, 2>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 3, 3, 3>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 4, 4, 4>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 5, 5, 5>();
-
-   // P = Q + 1 (3D)
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 2, 2, 3>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 3, 3, 4>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 4, 4, 5>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::CURL,
-                          FiniteElement::CURL, 3, 5, 5, 6>();
-   // h(div), h(div)
-   // P = Q (2D)
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 2, 2, 2, 2>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 2, 3, 3, 3>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 2, 4, 4, 4>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 2, 5, 5, 5>();
-
-   // P = Q + 1 (3D)
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 3, 2, 2, 3>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 3, 3, 3, 4>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 3, 4, 4, 5>();
-   VectorFEMassIntegrator::AddSpecialization<FiniteElement::DIV,
-                          FiniteElement::DIV, 3, 5, 5, 6>();
-}
-
-void VectorFEMassIntegrator::Init(Coefficient *q, DiagonalMatrixCoefficient *dq,
-                                  MatrixCoefficient *mq)
-{
-   static Kernels kernels{};
-   Q = q;
-   DQ = dq;
-   MQ = mq;
-}
 
 void VectorFEMassIntegrator::AssemblePA(const FiniteElementSpace &fes)
 {
@@ -169,8 +67,8 @@ void VectorFEMassIntegrator::AssemblePA(const FiniteElementSpace &trial_fes,
 
    MFEM_VERIFY(dofs1D == mapsO->ndof + 1 && quad1D == mapsO->nqpt, "");
 
-   trial_fetype = static_cast<FiniteElement::DerivType>(trial_el->GetDerivType());
-   test_fetype = static_cast<FiniteElement::DerivType>(test_el->GetDerivType());
+   trial_fetype = trial_el->GetDerivType();
+   test_fetype = test_el->GetDerivType();
 
    const bool trial_curl = (trial_fetype == mfem::FiniteElement::CURL);
    const bool trial_div = (trial_fetype == mfem::FiniteElement::DIV);
@@ -317,36 +215,225 @@ void VectorFEMassIntegrator::AssembleDiagonalPA(Vector& diag)
 
 void VectorFEMassIntegrator::AddMultPA(const Vector &x, Vector &y) const
 {
-   const bool scalar_coeff = !(DQ || MQ);
-   ApplyPAKernels::Run(trial_fetype, test_fetype, dim, dofs1D, dofs1Dtest,
-                       quad1D, ne, symmetric, scalar_coeff, mapsO->B, mapsC->B,
-                       mapsOtest->Bt, mapsCtest->Bt, pa_data, x, y, dofs1D,
-                       dofs1Dtest, quad1D);
+   const bool trial_curl = (trial_fetype == mfem::FiniteElement::CURL);
+   const bool trial_div = (trial_fetype == mfem::FiniteElement::DIV);
+   const bool test_curl = (test_fetype == mfem::FiniteElement::CURL);
+   const bool test_div = (test_fetype == mfem::FiniteElement::DIV);
+
+   if (dim == 3)
+   {
+      if (trial_curl && test_curl)
+      {
+         if (Device::Allows(Backend::DEVICE_MASK))
+         {
+            const int ID = (dofs1D << 4) | quad1D;
+            switch (ID)
+            {
+               case 0x23:
+                  return internal::SmemPAHcurlMassApply3D<2,3>(
+                            dofs1D, quad1D, ne, symmetric,
+                            mapsO->B, mapsC->B, mapsO->Bt,
+                            mapsC->Bt, pa_data, x, y);
+               case 0x34:
+                  return internal::SmemPAHcurlMassApply3D<3,4>(
+                            dofs1D, quad1D, ne, symmetric,
+                            mapsO->B, mapsC->B, mapsO->Bt,
+                            mapsC->Bt, pa_data, x, y);
+               case 0x45:
+                  return internal::SmemPAHcurlMassApply3D<4,5>(
+                            dofs1D, quad1D, ne, symmetric,
+                            mapsO->B, mapsC->B, mapsO->Bt,
+                            mapsC->Bt, pa_data, x, y);
+               case 0x56:
+                  return internal::SmemPAHcurlMassApply3D<5,6>(
+                            dofs1D, quad1D, ne, symmetric,
+                            mapsO->B, mapsC->B, mapsO->Bt,
+                            mapsC->Bt, pa_data, x, y);
+               default:
+                  return internal::SmemPAHcurlMassApply3D(
+                            dofs1D, quad1D, ne, symmetric,
+                            mapsO->B, mapsC->B, mapsO->Bt,
+                            mapsC->Bt, pa_data, x, y);
+            }
+         }
+         else
+         {
+            internal::PAHcurlMassApply3D(dofs1D, quad1D, ne, symmetric, mapsO->B, mapsC->B,
+                                         mapsO->Bt, mapsC->Bt, pa_data, x, y);
+         }
+      }
+      else if (trial_div && test_div)
+      {
+         internal::PAHdivMassApply(3, dofs1D, quad1D, ne, symmetric, mapsO->B, mapsC->B,
+                                   mapsO->Bt, mapsC->Bt, pa_data, x, y);
+      }
+      else if (trial_curl && test_div)
+      {
+         const bool scalarCoeff = !(DQ || MQ);
+         internal::PAHcurlHdivMassApply3D(dofs1D, dofs1Dtest, quad1D, ne, scalarCoeff,
+                                          true, false, mapsO->B, mapsC->B, mapsOtest->Bt,
+                                          mapsCtest->Bt, pa_data, x, y);
+      }
+      else if (trial_div && test_curl)
+      {
+         const bool scalarCoeff = !(DQ || MQ);
+         internal::PAHcurlHdivMassApply3D(dofs1D, dofs1Dtest, quad1D, ne, scalarCoeff,
+                                          false, false, mapsO->B, mapsC->B, mapsOtest->Bt,
+                                          mapsCtest->Bt, pa_data, x, y);
+      }
+      else
+      {
+         MFEM_ABORT("Unknown kernel.");
+      }
+   }
+   else // 2D
+   {
+      if (trial_curl && test_curl)
+      {
+         internal::PAHcurlMassApply2D(dofs1D, quad1D, ne, symmetric, mapsO->B, mapsC->B,
+                                      mapsO->Bt, mapsC->Bt, pa_data, x, y);
+      }
+      else if (trial_div && test_div)
+      {
+         internal::PAHdivMassApply(2, dofs1D, quad1D, ne, symmetric, mapsO->B, mapsC->B,
+                                   mapsO->Bt,
+                                   mapsC->Bt, pa_data, x, y);
+      }
+      else if ((trial_curl && test_div) || (trial_div && test_curl))
+      {
+         const bool scalarCoeff = !(DQ || MQ);
+         internal::PAHcurlHdivMassApply2D(dofs1D, dofs1Dtest, quad1D, ne, scalarCoeff,
+                                          trial_curl, false, mapsO->B, mapsC->B,
+                                          mapsOtest->Bt, mapsCtest->Bt, pa_data, x, y);
+      }
+      else
+      {
+         MFEM_ABORT("Unknown kernel.");
+      }
+   }
 }
 
 void VectorFEMassIntegrator::AddAbsMultPA(const Vector &x, Vector &y) const
 {
-   const bool scalar_coeff = !(DQ || MQ);
+   const bool trial_curl = (trial_fetype == mfem::FiniteElement::CURL);
+   const bool trial_div = (trial_fetype == mfem::FiniteElement::DIV);
+   const bool test_curl = (test_fetype == mfem::FiniteElement::CURL);
+   const bool test_div = (test_fetype == mfem::FiniteElement::DIV);
 
    Vector abs_pa_data(pa_data);
    abs_pa_data.Abs();
 
    Array<real_t> absBo(mapsO->B);
    Array<real_t> absBc(mapsC->B);
-   // Array<real_t> absBto(mapsO->Bt);
-   // Array<real_t> absBtc(mapsC->Bt);
+   Array<real_t> absBto(mapsO->Bt);
+   Array<real_t> absBtc(mapsC->Bt);
    Array<real_t> absBto_t(mapsOtest->Bt);
    Array<real_t> absBtc_t(mapsCtest->Bt);
 
    absBo.Abs();
    absBc.Abs();
+   absBto.Abs();
+   absBtc.Abs();
    absBto_t.Abs();
    absBtc_t.Abs();
 
-   ApplyPAKernels::Run(trial_fetype, test_fetype, dim, dofs1D, dofs1Dtest,
-                       quad1D, ne, symmetric, scalar_coeff, absBo, absBc,
-                       absBto_t, absBtc_t, abs_pa_data, x, y, dofs1D,
-                       dofs1Dtest, quad1D);
+   if (dim == 3)
+   {
+      if (trial_curl && test_curl)
+      {
+         if (Device::Allows(Backend::DEVICE_MASK))
+         {
+            const int ID = (dofs1D << 4) | quad1D;
+            switch (ID)
+            {
+               case 0x23:
+                  return internal::SmemPAHcurlMassApply3D<2,3>(
+                            dofs1D, quad1D, ne, symmetric,
+                            absBo, absBc, absBto, absBtc,
+                            abs_pa_data, x, y);
+               case 0x34:
+                  return internal::SmemPAHcurlMassApply3D<3,4>(
+                            dofs1D, quad1D, ne, symmetric,
+                            absBo, absBc, absBto, absBtc,
+                            abs_pa_data, x, y);
+               case 0x45:
+                  return internal::SmemPAHcurlMassApply3D<4,5>(
+                            dofs1D, quad1D, ne, symmetric,
+                            absBo, absBc, absBto, absBtc,
+                            abs_pa_data, x, y);
+               case 0x56:
+                  return internal::SmemPAHcurlMassApply3D<5,6>(
+                            dofs1D, quad1D, ne, symmetric,
+                            absBo, absBc, absBto, absBtc,
+                            abs_pa_data, x, y);
+               default:
+                  return internal::SmemPAHcurlMassApply3D(
+                            dofs1D, quad1D, ne, symmetric,
+                            absBo, absBc, absBto, absBtc,
+                            abs_pa_data, x, y);
+            }
+         }
+         else
+         {
+            internal::PAHcurlMassApply3D(dofs1D, quad1D, ne, symmetric,
+                                         absBo, absBc, absBto, absBtc,
+                                         abs_pa_data, x, y);
+         }
+      }
+      else if (trial_div && test_div)
+      {
+         internal::PAHdivMassApply(3, dofs1D, quad1D, ne, symmetric,
+                                   absBo, absBc, absBto, absBtc,
+                                   abs_pa_data, x, y);
+      }
+      else if (trial_curl && test_div)
+      {
+         const bool scalarCoeff = !(DQ || MQ);
+         internal::PAHcurlHdivMassApply3D(dofs1D, dofs1Dtest, quad1D, ne,
+                                          scalarCoeff, true, false,
+                                          absBo, absBc, absBto_t, absBtc_t,
+                                          abs_pa_data, x, y);
+      }
+      else if (trial_div && test_curl)
+      {
+         const bool scalarCoeff = !(DQ || MQ);
+         internal::PAHcurlHdivMassApply3D(dofs1D, dofs1Dtest, quad1D, ne,
+                                          scalarCoeff, false, false,
+                                          absBo, absBc, absBto_t, absBtc_t,
+                                          abs_pa_data, x, y);
+      }
+      else
+      {
+         MFEM_ABORT("Unknown kernel.");
+      }
+   }
+   else // 2D
+   {
+      if (trial_curl && test_curl)
+      {
+         internal::PAHcurlMassApply2D(dofs1D, quad1D, ne, symmetric,
+                                      absBo, absBc, absBto, absBtc,
+                                      abs_pa_data, x, y);
+      }
+      else if (trial_div && test_div)
+      {
+         internal::PAHdivMassApply(2, dofs1D, quad1D, ne, symmetric,
+                                   absBo, absBc, absBto, absBtc,
+                                   abs_pa_data, x, y);
+      }
+      else if ((trial_curl && test_div) || (trial_div && test_curl))
+      {
+         const bool scalarCoeff = !(DQ || MQ);
+         internal::PAHcurlHdivMassApply2D(dofs1D, dofs1Dtest, quad1D, ne,
+                                          scalarCoeff, trial_curl, false,
+                                          absBo, absBc, absBto_t, absBtc_t,
+                                          abs_pa_data, x, y);
+      }
+      else
+      {
+         MFEM_ABORT("Unknown kernel.");
+      }
+   }
 }
 
 void VectorFEMassIntegrator::AddMultTransposePA(const Vector &x,

fem/integ/lininteg_domain_kernels.hpp

@@ -307,506 +307,6 @@ DomainLFIntegrator::AssembleKernels::Kernel()
    MFEM_ABORT("");
 }
 
-template <int T_D1D = 0, int T_Q1D = 0>
-static void HdivDLFAssemble2D(const int ne, const Array<int> &markers,
-                              const Vector &jac, const Array<real_t> &weights,
-                              const Array<real_t> &testBO,
-                              const Array<real_t> &testBC, const Vector &coeff,
-                              Vector &y, const int d, const int q)
-{
-   MFEM_VERIFY(T_D1D || d <= DeviceDofQuadLimits::Get().HDIV_MAX_D1D,
-               "Problem size too large.");
-   MFEM_VERIFY(T_Q1D || q <= DeviceDofQuadLimits::Get().HDIV_MAX_Q1D,
-               "Problem size too large.");
-   MFEM_VERIFY(y.Size() == 2 * (d - 1) * d * ne, "");
-
-   constexpr int vdim = 2;
-   const auto F = coeff.Read();
-   const auto M = markers.Read();
-   const auto BO = Reshape(testBO.Read(), q, d-1);
-   const auto BC = Reshape(testBC.Read(), q, d);
-   const auto J = Reshape(jac.Read(), q, q, vdim, vdim, ne);
-   const auto W = Reshape(weights.Read(), q, q);
-   const bool cst = coeff.Size() == vdim;
-   const auto C = cst ? Reshape(F,vdim,1,1,1) : Reshape(F,vdim,q,q,ne);
-   auto Y = y.ReadWrite();
-
-   mfem::forall_3D(ne, q, q, vdim, [=] MFEM_HOST_DEVICE (int e)
-   {
-      constexpr int vdim = 2;
-      if (M[e] == 0) { return; } // ignore
-
-      constexpr int Q = T_Q1D ? T_Q1D : DofQuadLimits::HDIV_MAX_Q1D;
-      constexpr int D = T_D1D ? T_D1D : DofQuadLimits::HDIV_MAX_D1D;
-
-      MFEM_SHARED real_t sBot[Q*D];
-      MFEM_SHARED real_t sBct[Q*D];
-      MFEM_SHARED real_t sQQ[vdim*Q*Q];
-      MFEM_SHARED real_t sQD[vdim*Q*D];
-
-      // Bo and Bc into shared memory
-      const DeviceMatrix Bot(sBot, d-1, q);
-      kernels::internal::LoadB<D,Q>(d-1, q, BO, sBot);
-      const DeviceMatrix Bct(sBct, d, q);
-      kernels::internal::LoadB<D,Q>(d, q, BC, sBct);
-
-      const DeviceCube QQ(sQQ, q, q, vdim);
-      const DeviceCube QD(sQD, q, d, vdim);
-
-      MFEM_FOREACH_THREAD(vd,z,vdim)
-      {
-         const real_t cst_val_0 = C(0,0,0,0);
-         const real_t cst_val_1 = C(1,0,0,0);
-         MFEM_FOREACH_THREAD(y,y,q)
-         {
-            MFEM_FOREACH_THREAD(x,x,q)
-            {
-               const real_t J0 = J(x,y,0,vd,e);
-               const real_t J1 = J(x,y,1,vd,e);
-               const real_t C0 = cst ? cst_val_0 : C(0,x,y,e);
-               const real_t C1 = cst ? cst_val_1 : C(1,x,y,e);
-               QQ(x,y,vd) = W(x,y)*(J0*C0 + J1*C1);
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD(vd,z,vdim)
-      {
-         const int nx = (vd == 0) ? d : d-1;
-         DeviceMatrix Btx = (vd == 0) ? Bct : Bot;
-         MFEM_FOREACH_THREAD(qy,y,q)
-         {
-            MFEM_FOREACH_THREAD(dx,x,nx)
-            {
-               real_t qd = 0.0;
-               for (int qx = 0; qx < q; ++qx)
-               {
-                  qd += QQ(qx,qy,vd) * Btx(dx,qx);
-               }
-               QD(dx,qy,vd) = qd;
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD(vd,z,vdim)
-      {
-         const int nx = (vd == 0) ? d : d-1;
-         const int ny = (vd == 1) ? d : d-1;
-         DeviceMatrix Bty = (vd == 1) ? Bct : Bot;
-         DeviceTensor<4> Yxy(Y, nx, ny, vdim, ne);
-         MFEM_FOREACH_THREAD(dy,y,ny)
-         {
-            MFEM_FOREACH_THREAD(dx,x,nx)
-            {
-               real_t dd = 0.0;
-               for (int qy = 0; qy < q; ++qy)
-               {
-                  dd += QD(dx,qy,vd) * Bty(dy,qy);
-               }
-               Yxy(dx,dy,vd,e) += dd;
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-   });
-}
-
-template <int T_D1D = 0, int T_Q1D = 0>
-static void HdivDLFAssemble3D(const int ne, const Array<int> &markers,
-                              const Vector &jac, const Array<real_t> &weights,
-                              const Array<real_t> &testBO,
-                              const Array<real_t> &testBC, const Vector &coeff,
-                              Vector &y, const int d, const int q)
-{
-   MFEM_VERIFY(T_D1D || d <= DeviceDofQuadLimits::Get().HDIV_MAX_D1D,
-               "Problem size too large.");
-   MFEM_VERIFY(T_Q1D || q <= DeviceDofQuadLimits::Get().HDIV_MAX_Q1D,
-               "Problem size too large.");
-   MFEM_VERIFY(y.Size() == 3 * (d - 1) * (d - 1) * d * ne, "y wrong length");
-
-   constexpr int vdim = 3;
-   const auto F = coeff.Read();
-   const auto M = markers.Read();
-   const auto BO = Reshape(testBO.Read(), q, d-1);
-   const auto BC = Reshape(testBC.Read(), q, d);
-   const auto J = Reshape(jac.Read(), q, q, q, vdim, vdim, ne);
-   const auto W = Reshape(weights.Read(), q, q, q);
-   const bool cst = coeff.Size() == vdim;
-   const auto C = cst ? Reshape(F,vdim,1,1,1,1) : Reshape(F,vdim,q,q,q,ne);
-   auto Y = y.ReadWrite();
-
-   mfem::forall_3D(ne, q, q, vdim, [=] MFEM_HOST_DEVICE (int e)
-   {
-      constexpr int vdim = 3;
-      if (M[e] == 0) { return; } // ignore
-
-      constexpr int Q = T_Q1D ? T_Q1D : DofQuadLimits::HDIV_MAX_Q1D;
-      constexpr int D = T_D1D ? T_D1D : DofQuadLimits::HDIV_MAX_D1D;
-
-      MFEM_SHARED real_t sBot[Q*D];
-      MFEM_SHARED real_t sBct[Q*D];
-
-      // Bo and Bc into shared memory
-      const DeviceMatrix Bot(sBot, d-1, q);
-      kernels::internal::LoadB<D,Q>(d-1, q, BO, sBot);
-      const DeviceMatrix Bct(sBct, d, q);
-      kernels::internal::LoadB<D,Q>(d, q, BC, sBct);
-
-      MFEM_SHARED real_t sm0[vdim*Q*Q*Q];
-      MFEM_SHARED real_t sm1[vdim*Q*Q*Q];
-      DeviceTensor<4> QQQ(sm1, q, q, q, vdim);
-      DeviceTensor<4> DQQ(sm0, d, q, q, vdim);
-      DeviceTensor<4> DDQ(sm1, d, d, q, vdim);
-
-      MFEM_FOREACH_THREAD(vd,z,vdim)
-      {
-         const real_t cst_val_0 = C(0,0,0,0,0);
-         const real_t cst_val_1 = C(1,0,0,0,0);
-         const real_t cst_val_2 = C(2,0,0,0,0);
-         MFEM_FOREACH_THREAD(y,y,q)
-         {
-            MFEM_FOREACH_THREAD(x,x,q)
-            {
-               for (int z = 0; z < q; ++z)
-               {
-                  const real_t J0 = J(x,y,z,0,vd,e);
-                  const real_t J1 = J(x,y,z,1,vd,e);
-                  const real_t J2 = J(x,y,z,2,vd,e);
-                  const real_t C0 = cst ? cst_val_0 : C(0,x,y,z,e);
-                  const real_t C1 = cst ? cst_val_1 : C(1,x,y,z,e);
-                  const real_t C2 = cst ? cst_val_2 : C(2,x,y,z,e);
-                  QQQ(x,y,z,vd) = W(x,y,z)*(J0*C0 + J1*C1 + J2*C2);
-               }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      // Apply Bt operator
-      MFEM_FOREACH_THREAD(vd,z,vdim)
-      {
-         const int nx = (vd == 0) ? d : d-1;
-         DeviceMatrix Btx = (vd == 0) ? Bct : Bot;
-         MFEM_FOREACH_THREAD(qy,y,q)
-         {
-            MFEM_FOREACH_THREAD(dx,x,nx)
-            {
-               real_t u[Q];
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz) { u[qz] = 0.0; }
-               MFEM_UNROLL(Q)
-               for (int qx = 0; qx < q; ++qx)
-               {
-                  MFEM_UNROLL(Q)
-                  for (int qz = 0; qz < q; ++qz)
-                  {
-                     u[qz] += QQQ(qx,qy,qz,vd) * Btx(dx,qx);
-                  }
-               }
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz) { DQQ(dx,qy,qz,vd) = u[qz]; }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD(vd,z,vdim)
-      {
-         const int nx = (vd == 0) ? d : d-1;
-         const int ny = (vd == 1) ? d : d-1;
-         DeviceMatrix Bty = (vd == 1) ? Bct : Bot;
-         MFEM_FOREACH_THREAD(dy,y,ny)
-         {
-            MFEM_FOREACH_THREAD(dx,x,nx)
-            {
-               real_t u[Q];
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz) { u[qz] = 0.0; }
-               MFEM_UNROLL(Q)
-               for (int qy = 0; qy < q; ++qy)
-               {
-                  MFEM_UNROLL(Q)
-                  for (int qz = 0; qz < q; ++qz)
-                  {
-                     u[qz] += DQQ(dx,qy,qz,vd) * Bty(dy,qy);
-                  }
-               }
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz) { DDQ(dx,dy,qz,vd) = u[qz]; }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD(vd,z,vdim)
-      {
-         const int nx = (vd == 0) ? d : d-1;
-         const int ny = (vd == 1) ? d : d-1;
-         const int nz = (vd == 2) ? d : d-1;
-         DeviceTensor<5> Yxyz(Y, nx, ny, nz, vdim, ne);
-         DeviceMatrix Btz = (vd == 2) ? Bct : Bot;
-         MFEM_FOREACH_THREAD(dy,y,ny)
-         {
-            MFEM_FOREACH_THREAD(dx,x,nx)
-            {
-               real_t u[D];
-               MFEM_UNROLL(D)
-               for (int dz = 0; dz < nz; ++dz) { u[dz] = 0.0; }
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz)
-               {
-                  MFEM_UNROLL(D)
-                  for (int dz = 0; dz < nz; ++dz)
-                  {
-                     u[dz] += DDQ(dx,dy,qz,vd) * Btz(dz,qz);
-                  }
-               }
-               MFEM_UNROLL(D)
-               for (int dz = 0; dz < nz; ++dz) { Yxyz(dx,dy,dz,vd,e) += u[dz]; }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-   });
-}
-
-/// @param ne number of elements
-/// @param markers array where entry markers[e] == 0 to skip assembly over
-/// element e element
-/// @param jac Spatial Jacobians evaluated at all quadrature points
-/// @param weights 1D quadrature weights
-/// @param testBO 1D open basis test functions
-/// @param testBC 1D closed basis test functions
-/// @param coeff coefficient values evaluated at quadrature points, possibly
-/// compressed.
-/// @param d number of 1D closed dofs
-/// @param q number of 1D quadrature points
-/// @tparam T_D1D maximum number of dofs along any direction, or 0
-/// @tparam T_Q1D maximum number of quadrature points along any direction, or 0
-template <int T_D1D = 0, int T_Q1D = 0>
-static void HcurlDLFAssemble3D(const int ne, const Array<int> &markers,
-                               const Vector &jac, const Array<real_t> &weights,
-                               const Array<real_t> &testBO,
-                               const Array<real_t> &testBC, const Vector &coeff,
-                               Vector &y, const int d, const int q)
-{
-   MFEM_VERIFY(T_D1D || d <= DeviceDofQuadLimits::Get().HCURL_MAX_D1D,
-               "Problem size too large.");
-   MFEM_VERIFY(T_Q1D || q <= DeviceDofQuadLimits::Get().HCURL_MAX_Q1D,
-               "Problem size too large.");
-   MFEM_VERIFY(y.Size() == 3 * (d - 1) * d * d * ne, "y wrong length");
-
-   constexpr int vdim = 3;
-   const auto F = coeff.Read();
-   const auto M = markers.Read();
-   const auto BO = Reshape(testBO.Read(), q, d-1);
-   const auto BC = Reshape(testBC.Read(), q, d);
-   const auto J = Reshape(jac.Read(), q, q, q, vdim, vdim, ne);
-   const auto W = Reshape(weights.Read(), q, q, q);
-   const bool cst = coeff.Size() == vdim;
-   const auto C = cst ? Reshape(F,vdim,1,1,1,1) : Reshape(F,vdim,q,q,q,ne);
-   auto Y = y.ReadWrite();
-
-   mfem::forall_3D(ne, q, q, vdim, [=] MFEM_HOST_DEVICE(int e)
-   {
-      if (M[e] == 0)
-      {
-         // ignore
-         return;
-      }
-
-      constexpr int vdim = 3;
-      constexpr int Q = T_Q1D ? T_Q1D : DofQuadLimits::HCURL_MAX_Q1D;
-      constexpr int D = T_D1D ? T_D1D : DofQuadLimits::HCURL_MAX_D1D;
-
-      MFEM_SHARED real_t sBot[Q * D];
-      MFEM_SHARED real_t sBct[Q * D];
-
-      // Bo and Bc into shared memory
-      const DeviceMatrix Bot(sBot, d - 1, q);
-      kernels::internal::LoadB<D, Q>(d - 1, q, BO, sBot);
-      const DeviceMatrix Bct(sBct, d, q);
-      kernels::internal::LoadB<D, Q>(d, q, BC, sBct);
-
-      MFEM_SHARED real_t sm0[vdim * Q * Q * Q];
-      MFEM_SHARED real_t sm1[vdim * Q * Q * Q];
-      DeviceTensor<4> QQQ(sm1, q, q, q, vdim);
-      DeviceTensor<4> DQQ(sm0, d, q, q, vdim);
-      DeviceTensor<4> DDQ(sm1, d, d, q, vdim);
-
-      const real_t cst_val_0 = C(0, 0, 0, 0, 0);
-      const real_t cst_val_1 = C(1, 0, 0, 0, 0);
-      const real_t cst_val_2 = C(2, 0, 0, 0, 0);
-
-      MFEM_FOREACH_THREAD(vd, z, vdim)
-      {
-         MFEM_FOREACH_THREAD(y, y, q)
-         {
-            MFEM_FOREACH_THREAD(x, x, q)
-            {
-               for (int z = 0; z < q; ++z)
-               {
-                  real_t curr[3];
-                  curr[0] = cst ? cst_val_0 : C(0, x, y, z, e);
-                  curr[1] = cst ? cst_val_1 : C(1, x, y, z, e);
-                  curr[2] = cst ? cst_val_2 : C(2, x, y, z, e);
-
-                  const real_t J11 = J(x, y, z, 0, 0, e);
-                  const real_t J21 = J(x, y, z, 1, 0, e);
-                  const real_t J31 = J(x, y, z, 2, 0, e);
-                  const real_t J12 = J(x, y, z, 0, 1, e);
-                  const real_t J22 = J(x, y, z, 1, 1, e);
-                  const real_t J32 = J(x, y, z, 2, 1, e);
-                  const real_t J13 = J(x, y, z, 0, 2, e);
-                  const real_t J23 = J(x, y, z, 1, 2, e);
-                  const real_t J33 = J(x, y, z, 2, 2, e);
-                  // adj(J)
-                  const real_t A11 = (J22 * J33) - (J23 * J32);
-                  const real_t A12 = (J32 * J13) - (J12 * J33);
-                  const real_t A13 = (J12 * J23) - (J22 * J13);
-                  const real_t A21 = (J31 * J23) - (J21 * J33);
-                  const real_t A22 = (J11 * J33) - (J13 * J31);
-                  const real_t A23 = (J21 * J13) - (J11 * J23);
-                  const real_t A31 = (J21 * J32) - (J31 * J22);
-                  const real_t A32 = (J31 * J12) - (J11 * J32);
-                  const real_t A33 = (J11 * J22) - (J12 * J21);
-                  const real_t A[9] = {A11, A12, A13, A21, A22,
-                                       A23, A31, A32, A33
-                                      };
-                  QQQ(x, y, z, vd) = W(x, y, z) * (A[vd * vdim] * curr[0] +
-                                                   A[vd * vdim + 1] * curr[1] +
-                                                   A[vd * vdim + 2] * curr[2]);
-               }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      // Apply Bt operator
-      MFEM_FOREACH_THREAD(vd, z, vdim)
-      {
-         const int nx = (vd == 0) ? d - 1 : d;
-         DeviceMatrix Btx = (vd == 0) ? Bot : Bct;
-         MFEM_FOREACH_THREAD(qy, y, q)
-         {
-            MFEM_FOREACH_THREAD(dx, x, nx)
-            {
-               real_t u[Q];
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz)
-               {
-                  u[qz] = 0.0;
-               }
-               MFEM_UNROLL(Q)
-               for (int qx = 0; qx < q; ++qx)
-               {
-                  MFEM_UNROLL(Q)
-                  for (int qz = 0; qz < q; ++qz)
-                  {
-                     u[qz] += QQQ(qx, qy, qz, vd) * Btx(dx, qx);
-                  }
-               }
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz)
-               {
-                  DQQ(dx, qy, qz, vd) = u[qz];
-               }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD(vd, z, vdim)
-      {
-         const int nx = (vd == 0) ? d - 1 : d;
-         const int ny = (vd == 1) ? d - 1 : d;
-         DeviceMatrix Bty = (vd == 1) ? Bot : Bct;
-         MFEM_FOREACH_THREAD(dy, y, ny)
-         {
-            MFEM_FOREACH_THREAD(dx, x, nx)
-            {
-               real_t u[Q];
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz)
-               {
-                  u[qz] = 0.0;
-               }
-               MFEM_UNROLL(Q)
-               for (int qy = 0; qy < q; ++qy)
-               {
-                  MFEM_UNROLL(Q)
-                  for (int qz = 0; qz < q; ++qz)
-                  {
-                     u[qz] += DQQ(dx, qy, qz, vd) * Bty(dy, qy);
-                  }
-               }
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz)
-               {
-                  DDQ(dx, dy, qz, vd) = u[qz];
-               }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-      MFEM_FOREACH_THREAD(vd, z, vdim)
-      {
-         const int nx = (vd == 0) ? d - 1 : d;
-         const int ny = (vd == 1) ? d - 1 : d;
-         const int nz = (vd == 2) ? d - 1 : d;
-         DeviceTensor<5> Yxyz(Y, nx, ny, nz, vdim, ne);
-         DeviceMatrix Btz = (vd == 2) ? Bot : Bct;
-         MFEM_FOREACH_THREAD(dy, y, ny)
-         {
-            MFEM_FOREACH_THREAD(dx, x, nx)
-            {
-               real_t u[D];
-               MFEM_UNROLL(D)
-               for (int dz = 0; dz < nz; ++dz)
-               {
-                  u[dz] = 0.0;
-               }
-               MFEM_UNROLL(Q)
-               for (int qz = 0; qz < q; ++qz)
-               {
-                  MFEM_UNROLL(D)
-                  for (int dz = 0; dz < nz; ++dz)
-                  {
-                     u[dz] += DDQ(dx, dy, qz, vd) * Btz(dz, qz);
-                  }
-               }
-               MFEM_UNROLL(D)
-               for (int dz = 0; dz < nz; ++dz)
-               {
-                  Yxyz(dx, dy, dz, vd, e) += u[dz];
-               }
-            }
-         }
-      }
-      MFEM_SYNC_THREAD;
-   });
-}
-
-template <FiniteElement::DerivType TestType, int DIM, int TEST_D1D, int Q1D>
-VectorFEDomainLFIntegrator::AssembleKernelType
-VectorFEDomainLFIntegrator::AssembleKernels::Kernel()
-{
-   if constexpr (TestType == FiniteElement::DIV)
-   {
-      if constexpr (DIM == 2)
-      {
-         return HdivDLFAssemble2D<TEST_D1D, Q1D>;
-      }
-      if constexpr (DIM == 3)
-      {
-         return HdivDLFAssemble3D<TEST_D1D, Q1D>;
-      }
-   }
-   if constexpr (TestType == FiniteElement::CURL)
-   {
-      if constexpr (DIM == 3)
-      {
-         return HcurlDLFAssemble3D<TEST_D1D, Q1D>;
-      }
-   }
-   MFEM_ABORT("");
-}
-
 /// \endcond DO_NOT_DOCUMENT
 
 } // namespace mfem

fem/integ/lininteg_domain_vectorfe.cpp

@@ -13,76 +13,317 @@
 #include "../../fem/kernels.hpp"
 #include "../fem.hpp"
 
-#include "lininteg_domain_kernels.hpp"
-
 namespace mfem
 {
 
-VectorFEDomainLFIntegrator::Kernels::Kernels()
+template<int T_D1D = 0, int T_Q1D = 0>
+static void HdivDLFAssemble2D(
+   const int ne, const int d, const int q, const int *markers, const real_t *bo,
+   const real_t *bc, const real_t *j, const real_t *weights,
+   const Vector &coeff, real_t *y)
 {
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 1, 1>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 2, 2>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 3, 3>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 4, 4>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 5, 5>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 6, 6>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 7, 7>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 2, 8, 8>();
+   MFEM_VERIFY(T_D1D || d <= DeviceDofQuadLimits::Get().HDIV_MAX_D1D,
+               "Problem size too large.");
+   MFEM_VERIFY(T_Q1D || q <= DeviceDofQuadLimits::Get().HDIV_MAX_Q1D,
+               "Problem size too large.");
 
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 1, 1>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 2, 2>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 3, 3>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 4, 4>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 5, 5>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 6, 6>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 7, 7>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::DIV, 3, 8, 8>();
+   static constexpr int vdim = 2;
+   const auto F = coeff.Read();
+   const auto M = Reshape(markers, ne);
+   const auto BO = Reshape(bo, q, d-1);
+   const auto BC = Reshape(bc, q, d);
+   const auto J = Reshape(j, q, q, vdim, vdim, ne);
+   const auto W = Reshape(weights, q, q);
+   const bool cst = coeff.Size() == vdim;
+   const auto C = cst ? Reshape(F,vdim,1,1,1) : Reshape(F,vdim,q,q,ne);
+   auto Y = Reshape(y, 2*(d-1)*d, ne);
 
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 1, 1>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 2, 2>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 3, 3>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 4, 4>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 5, 5>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 6, 6>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 7, 7>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 8, 8>();
+   mfem::forall_3D(ne, q, q, vdim, [=] MFEM_HOST_DEVICE (int e)
+   {
+      if (M(e) == 0) { return; } // ignore
 
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 1, 2>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 2, 3>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 3, 4>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 4, 5>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 5, 6>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 6, 7>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 7, 8>();
-   VectorFEDomainLFIntegrator::AddSpecialization<FiniteElement::CURL, 3, 8, 9>();
+      constexpr int Q = T_Q1D ? T_Q1D : DofQuadLimits::HDIV_MAX_Q1D;
+      constexpr int D = T_D1D ? T_D1D : DofQuadLimits::HDIV_MAX_D1D;
+
+      MFEM_SHARED real_t sBot[Q*D];
+      MFEM_SHARED real_t sBct[Q*D];
+      MFEM_SHARED real_t sQQ[vdim*Q*Q];
+      MFEM_SHARED real_t sQD[vdim*Q*D];
+
+      // Bo and Bc into shared memory
+      const DeviceMatrix Bot(sBot, d-1, q);
+      kernels::internal::LoadB<D,Q>(d-1, q, BO, sBot);
+      const DeviceMatrix Bct(sBct, d, q);
+      kernels::internal::LoadB<D,Q>(d, q, BC, sBct);
+
+      const DeviceCube QQ(sQQ, q, q, vdim);
+      const DeviceCube QD(sQD, q, d, vdim);
+
+      MFEM_FOREACH_THREAD(vd,z,vdim)
+      {
+         const real_t cst_val_0 = C(0,0,0,0);
+         const real_t cst_val_1 = C(1,0,0,0);
+         MFEM_FOREACH_THREAD(y,y,q)
+         {
+            MFEM_FOREACH_THREAD(x,x,q)
+            {
+               const real_t J0 = J(x,y,0,vd,e);
+               const real_t J1 = J(x,y,1,vd,e);
+               const real_t C0 = cst ? cst_val_0 : C(0,x,y,e);
+               const real_t C1 = cst ? cst_val_1 : C(1,x,y,e);
+               QQ(x,y,vd) = W(x,y)*(J0*C0 + J1*C1);
+            }
+         }
+      }
+      MFEM_SYNC_THREAD;
+      MFEM_FOREACH_THREAD(vd,z,vdim)
+      {
+         const int nx = (vd == 0) ? d : d-1;
+         DeviceMatrix Btx = (vd == 0) ? Bct : Bot;
+         MFEM_FOREACH_THREAD(qy,y,q)
+         {
+            MFEM_FOREACH_THREAD(dx,x,nx)
+            {
+               real_t qd = 0.0;
+               for (int qx = 0; qx < q; ++qx)
+               {
+                  qd += QQ(qx,qy,vd) * Btx(dx,qx);
+               }
+               QD(dx,qy,vd) = qd;
+            }
+         }
+      }
+      MFEM_SYNC_THREAD;
+      MFEM_FOREACH_THREAD(vd,z,vdim)
+      {
+         const int nx = (vd == 0) ? d : d-1;
+         const int ny = (vd == 1) ? d : d-1;
+         DeviceMatrix Bty = (vd == 1) ? Bct : Bot;
+         DeviceTensor<4> Yxy(Y, nx, ny, vdim, ne);
+         MFEM_FOREACH_THREAD(dy,y,ny)
+         {
+            MFEM_FOREACH_THREAD(dx,x,nx)
+            {
+               real_t dd = 0.0;
+               for (int qy = 0; qy < q; ++qy)
+               {
+                  dd += QD(dx,qy,vd) * Bty(dy,qy);
+               }
+               Yxy(dx,dy,vd,e) += dd;
+            }
+         }
+      }
+      MFEM_SYNC_THREAD;
+   });
 }
 
-/// \cond DO_NOT_DOCUMENT
-VectorFEDomainLFIntegrator::AssembleKernelType
-VectorFEDomainLFIntegrator::AssembleKernels::Fallback(
-   FiniteElement::DerivType TestType, int DIM, int, int)
+template<int T_D1D = 0, int T_Q1D = 0>
+static void HdivDLFAssemble3D(
+   const int ne, const int d, const int q, const int *markers, const real_t *bo,
+   const real_t *bc, const real_t *j, const real_t *weights,
+   const Vector &coeff, real_t *y)
 {
-   if (TestType == FiniteElement::DIV)
+   MFEM_VERIFY(T_D1D || d <= DeviceDofQuadLimits::Get().HDIV_MAX_D1D,
+               "Problem size too large.");
+   MFEM_VERIFY(T_Q1D || q <= DeviceDofQuadLimits::Get().HDIV_MAX_Q1D,
+               "Problem size too large.");
+
+   static constexpr int vdim = 3;
+   const auto F = coeff.Read();
+   const auto M = Reshape(markers, ne);
+   const auto BO = Reshape(bo, q, d-1);
+   const auto BC = Reshape(bc, q, d);
+   const auto J = Reshape(j, q, q, q, vdim, vdim, ne);
+   const auto W = Reshape(weights, q, q, q);
+   const bool cst = coeff.Size() == vdim;
+   const auto C = cst ? Reshape(F,vdim,1,1,1,1) : Reshape(F,vdim,q,q,q,ne);
+   auto Y = Reshape(y, 2*(d-1)*(d-1)*d, ne);
+
+   mfem::forall_3D(ne, q, q, vdim, [=] MFEM_HOST_DEVICE (int e)
    {
-      if (DIM == 2)
+      if (M(e) == 0) { return; } // ignore
+
+      constexpr int Q = T_Q1D ? T_Q1D : DofQuadLimits::HDIV_MAX_Q1D;
+      constexpr int D = T_D1D ? T_D1D : DofQuadLimits::HDIV_MAX_D1D;
+
+      MFEM_SHARED real_t sBot[Q*D];
+      MFEM_SHARED real_t sBct[Q*D];
+
+      // Bo and Bc into shared memory
+      const DeviceMatrix Bot(sBot, d-1, q);
+      kernels::internal::LoadB<D,Q>(d-1, q, BO, sBot);
+      const DeviceMatrix Bct(sBct, d, q);
+      kernels::internal::LoadB<D,Q>(d, q, BC, sBct);
+
+      MFEM_SHARED real_t sm0[vdim*Q*Q*Q];
+      MFEM_SHARED real_t sm1[vdim*Q*Q*Q];
+      DeviceTensor<4> QQQ(sm1, q, q, q, vdim);
+      DeviceTensor<4> DQQ(sm0, d, q, q, vdim);
+      DeviceTensor<4> DDQ(sm1, d, d, q, vdim);
+
+      MFEM_FOREACH_THREAD(vd,z,vdim)
       {
-         return HdivDLFAssemble2D<0, 0>;
+         const real_t cst_val_0 = C(0,0,0,0,0);
+         const real_t cst_val_1 = C(1,0,0,0,0);
+         const real_t cst_val_2 = C(2,0,0,0,0);
+         MFEM_FOREACH_THREAD(y,y,q)
+         {
+            MFEM_FOREACH_THREAD(x,x,q)
+            {
+               for (int z = 0; z < q; ++z)
+               {
+                  const real_t J0 = J(x,y,z,0,vd,e);
+                  const real_t J1 = J(x,y,z,1,vd,e);
+                  const real_t J2 = J(x,y,z,2,vd,e);
+                  const real_t C0 = cst ? cst_val_0 : C(0,x,y,z,e);
+                  const real_t C1 = cst ? cst_val_1 : C(1,x,y,z,e);
+                  const real_t C2 = cst ? cst_val_2 : C(2,x,y,z,e);
+                  QQQ(x,y,z,vd) = W(x,y,z)*(J0*C0 + J1*C1 + J2*C2);
+               }
+            }
+         }
       }
-      if (DIM == 3)
+      MFEM_SYNC_THREAD;
+      // Apply Bt operator
+      MFEM_FOREACH_THREAD(vd,z,vdim)
       {
-         return HdivDLFAssemble3D<0, 0>;
+         const int nx = (vd == 0) ? d : d-1;
+         DeviceMatrix Btx = (vd == 0) ? Bct : Bot;
+         MFEM_FOREACH_THREAD(qy,y,q)
+         {
+            MFEM_FOREACH_THREAD(dx,x,nx)
+            {
+               real_t u[Q];
+               MFEM_UNROLL(Q)
+               for (int qz = 0; qz < q; ++qz) { u[qz] = 0.0; }
+               MFEM_UNROLL(Q)
+               for (int qx = 0; qx < q; ++qx)
+               {
+                  MFEM_UNROLL(Q)
+                  for (int qz = 0; qz < q; ++qz)
+                  {
+                     u[qz] += QQQ(qx,qy,qz,vd) * Btx(dx,qx);
+                  }
+               }
+               MFEM_UNROLL(Q)
+               for (int qz = 0; qz < q; ++qz) { DQQ(dx,qy,qz,vd) = u[qz]; }
+            }
+         }
       }
-   }
-   else if (TestType == FiniteElement::CURL)
-   {
-      if (DIM == 3)
+      MFEM_SYNC_THREAD;
+      MFEM_FOREACH_THREAD(vd,z,vdim)
       {
-         return HcurlDLFAssemble3D<0, 0>;
+         const int nx = (vd == 0) ? d : d-1;
+         const int ny = (vd == 1) ? d : d-1;
+         DeviceMatrix Bty = (vd == 1) ? Bct : Bot;
+         MFEM_FOREACH_THREAD(dy,y,ny)
+         {
+            MFEM_FOREACH_THREAD(dx,x,nx)
+            {
+               real_t u[Q];
+               MFEM_UNROLL(Q)
+               for (int qz = 0; qz < q; ++qz) { u[qz] = 0.0; }
+               MFEM_UNROLL(Q)
+               for (int qy = 0; qy < q; ++qy)
+               {
+                  MFEM_UNROLL(Q)
+                  for (int qz = 0; qz < q; ++qz)
+                  {
+                     u[qz] += DQQ(dx,qy,qz,vd) * Bty(dy,qy);
+                  }
+               }
+               MFEM_UNROLL(Q)
+               for (int qz = 0; qz < q; ++qz) { DDQ(dx,dy,qz,vd) = u[qz]; }
+            }
+         }
       }
-   }
-   MFEM_ABORT("");
+      MFEM_SYNC_THREAD;
+      MFEM_FOREACH_THREAD(vd,z,vdim)
+      {
+         const int nx = (vd == 0) ? d : d-1;
+         const int ny = (vd == 1) ? d : d-1;
+         const int nz = (vd == 2) ? d : d-1;
+         DeviceTensor<5> Yxyz(Y, nx, ny, nz, vdim, ne);
+         DeviceMatrix Btz = (vd == 2) ? Bct : Bot;
+         MFEM_FOREACH_THREAD(dy,y,ny)
+         {
+            MFEM_FOREACH_THREAD(dx,x,nx)
+            {
+               real_t u[D];
+               MFEM_UNROLL(D)
+               for (int dz = 0; dz < nz; ++dz) { u[dz] = 0.0; }
+               MFEM_UNROLL(Q)
+               for (int qz = 0; qz < q; ++qz)
+               {
+                  MFEM_UNROLL(D)
+                  for (int dz = 0; dz < nz; ++dz)
+                  {
+                     u[dz] += DDQ(dx,dy,qz,vd) * Btz(dz,qz);
+                  }
+               }
+               MFEM_UNROLL(D)
+               for (int dz = 0; dz < nz; ++dz) { Yxyz(dx,dy,dz,vd,e) += u[dz]; }
+            }
+         }
+      }
+      MFEM_SYNC_THREAD;
+   });
+}
+
+static void HdivDLFAssemble(const FiniteElementSpace &fes,
+                            const IntegrationRule *ir,
+                            const Array<int> &markers,
+                            const Vector &coeff,
+                            Vector &y)
+{
+   Mesh &mesh = *fes.GetMesh();
+   const int dim = mesh.Dimension();
+   const FiniteElement *el = fes.GetTypicalFE();
+   const auto *vel = dynamic_cast<const VectorTensorFiniteElement *>(el);
+   MFEM_VERIFY(vel != nullptr, "Must be VectorTensorFiniteElement");
+   const MemoryType mt = Device::GetDeviceMemoryType();
+   const DofToQuad &maps_o = vel->GetDofToQuadOpen(*ir, DofToQuad::TENSOR);
+   const DofToQuad &maps_c = vel->GetDofToQuad(*ir, DofToQuad::TENSOR);
+   const int d = maps_c.ndof, q = maps_c.nqpt;
+   constexpr int flags = GeometricFactors::JACOBIANS;
+   const GeometricFactors *geom = mesh.GetGeometricFactors(*ir, flags, mt);
+   decltype(&HdivDLFAssemble2D<>) ker =
+      dim == 2 ? HdivDLFAssemble2D<> : HdivDLFAssemble3D<>;
+
+   if (dim==2)
+   {
+      if (d==1 && q==1) { ker=HdivDLFAssemble2D<1,1>; }
+      if (d==2 && q==2) { ker=HdivDLFAssemble2D<2,2>; }
+      if (d==3 && q==3) { ker=HdivDLFAssemble2D<3,3>; }
+      if (d==4 && q==4) { ker=HdivDLFAssemble2D<4,4>; }
+      if (d==5 && q==5) { ker=HdivDLFAssemble2D<5,5>; }
+      if (d==6 && q==6) { ker=HdivDLFAssemble2D<6,6>; }
+      if (d==7 && q==7) { ker=HdivDLFAssemble2D<7,7>; }
+      if (d==8 && q==8) { ker=HdivDLFAssemble2D<8,8>; }
+   }
+
+   if (dim==3)
+   {
+      if (d==2 && q==2) { ker=HdivDLFAssemble3D<2,2>; }
+      if (d==3 && q==3) { ker=HdivDLFAssemble3D<3,3>; }
+      if (d==4 && q==4) { ker=HdivDLFAssemble3D<4,4>; }
+      if (d==5 && q==5) { ker=HdivDLFAssemble3D<5,5>; }
+      if (d==6 && q==6) { ker=HdivDLFAssemble3D<6,6>; }
+      if (d==7 && q==7) { ker=HdivDLFAssemble3D<7,7>; }
+      if (d==8 && q==8) { ker=HdivDLFAssemble3D<8,8>; }
+   }
+
+   MFEM_VERIFY(ker, "No kernel ndof " << d << " nqpt " << q);
+
+   const int ne = mesh.GetNE();
+   const int *M = markers.Read();
+   const real_t *Bo = maps_o.B.Read();
+   const real_t *Bc = maps_c.B.Read();
+   const real_t *J = geom->J.Read();
+   const real_t *W = ir->GetWeights().Read();
+   real_t *Y = y.ReadWrite();
+   ker(ne, d, q, M, Bo, Bc, J, W, coeff, Y);
 }
-/// \endcond DO_NOT_DOCUMENT
 
 void VectorFEDomainLFIntegrator::AssembleDevice(const FiniteElementSpace &fes,
                                                 const Array<int> &markers,
@@ -96,23 +337,15 @@ void VectorFEDomainLFIntegrator::AssembleDevice(const FiniteElementSpace &fes,
    QuadratureSpace qs(*fes.GetMesh(), *ir);
    CoefficientVector coeff(QF, qs, CoefficientStorage::COMPRESSED);
 
-   const FiniteElement::DerivType fe_type =
-      static_cast<FiniteElement::DerivType>(fe.GetDerivType());
-
-   Mesh &mesh = *fes.GetMesh();
-   const int dim = mesh.Dimension();
-   const FiniteElement *el = fes.GetTypicalFE();
-   const auto *vel = dynamic_cast<const VectorTensorFiniteElement *>(el);
-   MFEM_VERIFY(vel != nullptr, "Must be VectorTensorFiniteElement");
-   const MemoryType mt = Device::GetDeviceMemoryType();
-   const DofToQuad &maps_o = vel->GetDofToQuadOpen(*ir, DofToQuad::TENSOR);
-   const DofToQuad &maps_c = vel->GetDofToQuad(*ir, DofToQuad::TENSOR);
-   const int d = maps_c.ndof, q = maps_c.nqpt;
-   constexpr int flags = GeometricFactors::JACOBIANS;
-   const GeometricFactors *geom = mesh.GetGeometricFactors(*ir, flags, mt);
-
-   AssembleKernels::Run(fe_type, dim, d, q, mesh.GetNE(), markers, geom->J,
-                        ir->GetWeights(), maps_o.B, maps_c.B, coeff, b, d, q);
+   const int fe_type = fe.GetDerivType();
+   if (fe_type == FiniteElement::DIV)
+   {
+      HdivDLFAssemble(fes, ir, markers, coeff, b);
+   }
+   else
+   {
+      MFEM_ABORT("Not implemented.");
+   }
 }
 
 } // namespace mfem

fem/kernel_dispatch.hpp

@@ -61,7 +61,7 @@ namespace mfem
 #define MFEM_REGISTER_KERNELS_1(KernelName, KernelType, Params)                \
    MFEM_REGISTER_KERNELS_(KernelName, KernelType, Params, (), Params)
 
-// Version of MFEM_REGISTER_KERNELS with optional (non-dispatch)
+// Version of MFEM_REGISTER_KERNELS without any optional (non-dispatch)
 // parameters (e.g. NBZ).
 #define MFEM_REGISTER_KERNELS_2(KernelName, KernelType, Params, OptParams)     \
    MFEM_REGISTER_KERNELS_(KernelName, KernelType, Params, OptParams,           \

fem/lininteg.cpp

@@ -471,13 +471,6 @@ void VectorBoundaryLFIntegrator::AssembleRHSElementVect(
    }
 }
 
-VectorFEDomainLFIntegrator::VectorFEDomainLFIntegrator(
-   VectorCoefficient &F, const IntegrationRule *ir)
-   : DeltaLFIntegrator(F, ir), QF(F)
-{
-   static Kernels kernels{};
-}
-
 void VectorFEDomainLFIntegrator::AssembleRHSElementVect(
    const FiniteElement &el, ElementTransformation &Tr, Vector &elvect)
 {

fem/lininteg.hpp

@@ -369,8 +369,8 @@ private:
    Vector vec;
 
 public:
-   VectorFEDomainLFIntegrator(VectorCoefficient &F,
-                              const IntegrationRule *ir = nullptr);
+   VectorFEDomainLFIntegrator(VectorCoefficient &F)
+      : DeltaLFIntegrator(F), QF(F) { }
 
    void AssembleRHSElementVect(const FiniteElement &el,
                                ElementTransformation &Tr,
@@ -387,40 +387,6 @@ public:
                        Vector &b) override;
 
    using LinearFormIntegrator::AssembleRHSElementVect;
-
-   /// @param ne number of elements
-   /// @param markers array where entry markers[e] == 0 to skip assembly over
-   /// element e element
-   /// @param jac Spatial Jacobians evaluated at all quadrature points
-   /// @param weights 1D quadrature weights
-   /// @param testBO 1D open basis test functions
-   /// @param testBC 1D closed basis test functions
-   /// @param coeff coefficient values evaluated at quadrature points, possibly
-   /// compressed.
-   /// @param d number of 1D closed dofs
-   /// @param q number of 1D quadrature points
-   using AssembleKernelType = void (*)(const int NE, const Array<int> &markers,
-                                       const Vector &jac,
-                                       const Array<real_t> &weights,
-                                       const Array<real_t> &testBO,
-                                       const Array<real_t> &testBC,
-                                       const Vector &coeff, Vector &y,
-                                       const int testd1d, const int q1d);
-
-   /// parameters: test_fetype, ndims, test_d1d, q1d
-   MFEM_REGISTER_KERNELS(AssembleKernels, AssembleKernelType,
-                         (FiniteElement::DerivType, int, int, int));
-
-   struct Kernels
-   {
-      Kernels();
-   };
-
-   template <FiniteElement::DerivType TestType, int DIM, int TEST_D1D, int Q1D>
-   static void AddSpecialization()
-   {
-      AssembleKernels::Specialization<TestType, DIM, TEST_D1D, Q1D>::Add();
-   }
 };
 
 /// $ (Q, \mathrm{curl}(v))_{\Omega} $ for Nedelec Elements

fem/lor/lor_dg_impl.hpp

@@ -258,8 +258,8 @@ void BatchedLOR_DG::Assemble2D()
                   const int w_idx = (n_idx == 0) ? iy : ix;
                   const int x_idx = (n_idx == 0) ? i_0 : j_0;
 
-                  const real_t J1 = J(ix, iy, n_idx, (int)!n_idx, iel_ho);
-                  const real_t J2 = J(ix, iy, (int)!n_idx, (int)!n_idx, iel_ho);
+                  const real_t J1 = J(ix, iy, n_idx, !n_idx, iel_ho);
+                  const real_t J2 = J(ix, iy, !n_idx, !n_idx, iel_ho);
                   const real_t Jh = (J1*J1 + J2*J2) / detJ(ix, iy, iel_ho);
 
                   V(v_idx, ix, iy, iel_ho) =

fem/qinterp/det.cpp

@@ -21,23 +21,24 @@ namespace quadrature_interpolator
 
 void InitDetKernels()
 {
+   using k = QuadratureInterpolator::DetKernels;
    // 2D
-   QuadratureInterpolator::AddDetSpecializations<2,2,2,2>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,2,3>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,2,4>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,2,6>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,3,4>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,3,6>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,4,4>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,4,6>();
-   QuadratureInterpolator::AddDetSpecializations<2,2,5,6>();
+   k::Specialization<2,2,2,2>::Add();
+   k::Specialization<2,2,2,3>::Add();
+   k::Specialization<2,2,2,4>::Add();
+   k::Specialization<2,2,2,6>::Add();
+   k::Specialization<2,2,3,4>::Add();
+   k::Specialization<2,2,3,6>::Add();
+   k::Specialization<2,2,4,4>::Add();
+   k::Specialization<2,2,4,6>::Add();
+   k::Specialization<2,2,5,6>::Add();
    // 3D
-   QuadratureInterpolator::AddDetSpecializations<3,3,2,4>();
-   QuadratureInterpolator::AddDetSpecializations<3,3,3,3>();
-   QuadratureInterpolator::AddDetSpecializations<3,3,3,5>();
-   QuadratureInterpolator::AddDetSpecializations<3,3,3,6>();
-   QuadratureInterpolator::AddDetSpecializations<3,3,4,6>();
-   QuadratureInterpolator::AddDetSpecializations<3,3,3,4>();
+   k::Specialization<3,3,2,4>::Add();
+   k::Specialization<3,3,3,3>::Add();
+   k::Specialization<3,3,3,5>::Add();
+   k::Specialization<3,3,3,6>::Add();
+   k::Specialization<3,3,4,6>::Add();
+   k::Specialization<3,3,3,4>::Add();
 }
 
 } // namespace quadrature_interpolator
@@ -46,53 +47,26 @@ void InitDetKernels()
 /// @cond Suppress_Doxygen_warnings
 
 QuadratureInterpolator::DetKernelType
-QuadratureInterpolator::DetKernels::Fallback(int DIM, int SDIM, int D1D,
-                                             int Q1D)
+QuadratureInterpolator::DetKernels::Fallback(
+   int DIM, int SDIM, int D1D, int Q1D)
 {
    if (DIM == 1)
    {
-      if (SDIM == 1)
-      {
-         return internal::quadrature_interpolator::Det1D;
-      }
-      else if (SDIM == 2)
-      {
-         return internal::quadrature_interpolator::Det1DSurface<0, 0, 2>;
-      }
-      else if (SDIM == 3)
-      {
-         return internal::quadrature_interpolator::Det1DSurface<0, 0, 3>;
-      }
-      else
-      {
-         MFEM_ABORT("");
-      }
-   }
-   else if (DIM == 2 && SDIM == 2)
-   {
-      return internal::quadrature_interpolator::Det2D<>;
-   }
-   else if (DIM == 2 && SDIM == 3)
-   {
-      return internal::quadrature_interpolator::Det2DSurface<>;
+      if (SDIM == 1) { return internal::quadrature_interpolator::Det1D; }
+      else if (SDIM == 2) { return internal::quadrature_interpolator::Det1DSurface<0,0,2>; }
+      else if (SDIM == 3) { return internal::quadrature_interpolator::Det1DSurface<0,0,3>; }
+      else { MFEM_ABORT(""); }
    }
+   else if (DIM == 2 && SDIM == 2) { return internal::quadrature_interpolator::Det2D; }
+   else if (DIM == 2 && SDIM == 3) { return internal::quadrature_interpolator::Det2DSurface; }
    else if (DIM == 3)
    {
       const int MD = DeviceDofQuadLimits::Get().MAX_DET_1D;
       const int MQ = DeviceDofQuadLimits::Get().MAX_DET_1D;
-      if (D1D <= MD && Q1D <= MQ)
-      {
-         return internal::quadrature_interpolator::Det3D<0, 0, true>;
-      }
-      else
-      {
-         return internal::quadrature_interpolator::Det3D<0, 0, false>;
-      }
-   }
-   else
-   {
-      MFEM_ABORT("");
+      if (D1D <= MD && Q1D <= MQ) { return internal::quadrature_interpolator::Det3D<0,0,true>; }
+      else { return internal::quadrature_interpolator::Det3D<0,0,false>; }
    }
+   else { MFEM_ABORT(""); }
 }
 
 /// @endcond

fem/qinterp/eval.hpp

@@ -30,18 +30,23 @@ namespace internal
 namespace quadrature_interpolator
 {
 
-template <QVectorLayout Q_LAYOUT, bool Integral>
-static void IntValues1D(const int NE, const real_t *b_, const real_t *detJ_,
-                        const real_t *x_, real_t *y_, const int vdim,
-                        const int d1d, const int q1d)
+template<QVectorLayout Q_LAYOUT>
+static void Values1D(const int NE,
+                     const real_t *b_,
+                     const real_t *x_,
+                     real_t *y_,
+                     const int vdim,
+                     const int d1d,
+                     const int q1d)
 {
-   mfem::forall(NE, [=] MFEM_HOST_DEVICE(int e)
+   const auto b = Reshape(b_, q1d, d1d);
+   const auto x = Reshape(x_, d1d, vdim, NE);
+   auto y = Q_LAYOUT == QVectorLayout::byNODES ?
+            Reshape(y_, q1d, vdim, NE):
+            Reshape(y_, vdim, q1d, NE);
+
+   mfem::forall(NE, [=] MFEM_HOST_DEVICE (int e)
    {
-      const auto b = Reshape(b_, q1d, d1d);
-      const auto x = Reshape(x_, d1d, vdim, NE);
-      const auto detJ = Reshape(detJ_, q1d, NE);
-      auto y = Q_LAYOUT == QVectorLayout::byNODES ? Reshape(y_, q1d, vdim, NE)
-               : Reshape(y_, vdim, q1d, NE);
       for (int c = 0; c < vdim; c++)
       {
          for (int q = 0; q < q1d; q++)
@@ -51,36 +56,24 @@ static void IntValues1D(const int NE, const real_t *b_, const real_t *detJ_,
             {
                u += b(q, d) * x(d, c, e);
             }
-            if constexpr (Integral)
-            {
-               u /= detJ(q, e);
-            }
-            if constexpr (Q_LAYOUT == QVectorLayout::byVDIM)
-            {
-               y(c, q, e) = u;
-            }
-            if constexpr (Q_LAYOUT == QVectorLayout::byNODES)
-            {
-               y(q, c, e) = u;
-            }
+            if (Q_LAYOUT == QVectorLayout::byVDIM)  { y(c, q, e) = u; }
+            if (Q_LAYOUT == QVectorLayout::byNODES) { y(q, c, e) = u; }
          }
       }
    });
 }
 
-template <QVectorLayout Q_LAYOUT>
-static void Values1D(const int NE, const real_t *b_, const real_t *x_,
-                     real_t *y_, const int vdim, const int d1d, const int q1d)
-{
-   IntValues1D<Q_LAYOUT, false>(NE, b_, nullptr, x_, y_, vdim, d1d, q1d);
-}
-
 // Template compute kernel for Values in 2D: tensor product version.
-template <QVectorLayout Q_LAYOUT, bool Integral, int T_VDIM = 0, int T_D1D = 0,
-          int T_Q1D = 0, int T_NBZ = 1>
-static void IntValues2D(const int NE, const real_t *b_, const real_t *detJ_,
-                        const real_t *x_, real_t *y_, const int vdim = 0,
-                        const int d1d = 0, const int q1d = 0)
+template<QVectorLayout Q_LAYOUT,
+         int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0,
+         int T_NBZ = 1>
+static void Values2D(const int NE,
+                     const real_t *b_,
+                     const real_t *x_,
+                     real_t *y_,
+                     const int vdim = 0,
+                     const int d1d = 0,
+                     const int q1d = 0)
 {
    static constexpr int NBZ = T_NBZ ? T_NBZ : 1;
 
@@ -89,14 +82,13 @@ static void IntValues2D(const int NE, const real_t *b_, const real_t *detJ_,
    const int VDIM = T_VDIM ? T_VDIM : vdim;
 
    const auto b = Reshape(b_, Q1D, D1D);
+   const auto x = Reshape(x_, D1D, D1D, VDIM, NE);
+   auto y = Q_LAYOUT == QVectorLayout::byNODES ?
+            Reshape(y_, Q1D, Q1D, VDIM, NE):
+            Reshape(y_, VDIM, Q1D, Q1D, NE);
 
-   mfem::forall_2D_batch(NE, Q1D, Q1D, NBZ, [=] MFEM_HOST_DEVICE(int e)
+   mfem::forall_2D_batch(NE, Q1D, Q1D, NBZ, [=] MFEM_HOST_DEVICE (int e)
    {
-      const auto x = Reshape(x_, D1D, D1D, VDIM, NE);
-      const auto detJ = Reshape(detJ_, Q1D, Q1D, NE);
-      auto y = Q_LAYOUT == QVectorLayout::byNODES
-               ? Reshape(y_, Q1D, Q1D, VDIM, NE)
-               : Reshape(y_, VDIM, Q1D, Q1D, NE);
       const int D1D = T_D1D ? T_D1D : d1d;
       const int Q1D = T_Q1D ? T_Q1D : q1d;
       const int VDIM = T_VDIM ? T_VDIM : vdim;
@@ -118,33 +110,16 @@ static void IntValues2D(const int NE, const real_t *b_, const real_t *detJ_,
 
       for (int c = 0; c < VDIM; c++)
       {
-         MFEM_FOREACH_THREAD(dy,y,D1D)
-         {
-            MFEM_FOREACH_THREAD(dx, x, D1D)
-            {
-               DD(dx, dy) = x(dx, dy, c, e);
-            }
-         }
-         MFEM_SYNC_THREAD;
+         kernels::internal::LoadX(e,D1D,c,x,DD);
          kernels::internal::EvalX(D1D,Q1D,B,DD,DQ);
          kernels::internal::EvalY(D1D,Q1D,B,DQ,QQ);
          MFEM_FOREACH_THREAD(qy,y,Q1D)
          {
             MFEM_FOREACH_THREAD(qx,x,Q1D)
             {
-               real_t u = QQ(qx, qy);
-               if constexpr (Integral)
-               {
-                  u /= detJ(qx, qy, e);
-               }
-               if constexpr (Q_LAYOUT == QVectorLayout::byVDIM)
-               {
-                  y(c, qx, qy, e) = u;
-               }
-               if constexpr (Q_LAYOUT == QVectorLayout::byNODES)
-               {
-                  y(qx, qy, c, e) = u;
-               }
+               real_t u = QQ(qx,qy);
+               if (Q_LAYOUT == QVectorLayout::byVDIM) { y(c,qx,qy,e) = u; }
+               if (Q_LAYOUT == QVectorLayout::byNODES) { y(qx,qy,c,e) = u; }
             }
          }
          MFEM_SYNC_THREAD;
@@ -152,37 +127,29 @@ static void IntValues2D(const int NE, const real_t *b_, const real_t *detJ_,
    });
 }
 
-// Template compute kernel for Values in 2D: tensor product version.
-template <QVectorLayout Q_LAYOUT, int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0,
-          int T_NBZ = 1>
-static void Values2D(const int NE, const real_t *b_, const real_t *x_,
-                     real_t *y_, const int vdim = 0, const int d1d = 0,
-                     const int q1d = 0)
-{
-   return IntValues2D<Q_LAYOUT, false, T_VDIM, T_D1D, T_Q1D, T_NBZ>(
-             NE, b_, nullptr, x_, y_, vdim, d1d, q1d);
-}
-
 // Template compute kernel for Values in 3D: tensor product version.
-template <QVectorLayout Q_LAYOUT, bool Integral, int T_VDIM = 0, int T_D1D = 0,
-          int T_Q1D = 0>
-static void IntValues3D(const int NE, const real_t *b_, const real_t *detJ_,
-                        const real_t *x_, real_t *y_, const int vdim = 0,
-                        const int d1d = 0, const int q1d = 0)
+template<QVectorLayout Q_LAYOUT,
+         int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0>
+static void Values3D(const int NE,
+                     const real_t *b_,
+                     const real_t *x_,
+                     real_t *y_,
+                     const int vdim = 0,
+                     const int d1d = 0,
+                     const int q1d = 0)
 {
    const int D1D = T_D1D ? T_D1D : d1d;
    const int Q1D = T_Q1D ? T_Q1D : q1d;
    const int VDIM = T_VDIM ? T_VDIM : vdim;
 
    const auto b = Reshape(b_, Q1D, D1D);
+   const auto x = Reshape(x_, D1D, D1D, D1D, VDIM, NE);
+   auto y = Q_LAYOUT == QVectorLayout:: byNODES ?
+            Reshape(y_, Q1D, Q1D, Q1D, VDIM, NE):
+            Reshape(y_, VDIM, Q1D, Q1D, Q1D, NE);
 
-   mfem::forall_3D(NE, Q1D, Q1D, Q1D, [=] MFEM_HOST_DEVICE(int e)
+   mfem::forall_3D(NE, Q1D, Q1D, Q1D, [=] MFEM_HOST_DEVICE (int e)
    {
-      const auto x = Reshape(x_, D1D, D1D, D1D, VDIM, NE);
-      const auto detJ = Reshape(detJ_, Q1D, Q1D, Q1D, NE);
-      auto y = Q_LAYOUT == QVectorLayout::byNODES
-               ? Reshape(y_, Q1D, Q1D, Q1D, VDIM, NE)
-               : Reshape(y_, VDIM, Q1D, Q1D, Q1D, NE);
       const int D1D = T_D1D ? T_D1D : d1d;
       const int Q1D = T_Q1D ? T_Q1D : q1d;
       const int VDIM = T_VDIM ? T_VDIM : vdim;
@@ -204,17 +171,7 @@ static void IntValues3D(const int NE, const real_t *b_, const real_t *detJ_,
 
       for (int c = 0; c < VDIM; c++)
       {
-         MFEM_FOREACH_THREAD(dz, z, D1D)
-         {
-            MFEM_FOREACH_THREAD(dy, y, D1D)
-            {
-               MFEM_FOREACH_THREAD(dx, x, D1D)
-               {
-                  DDD(dx, dy, dz) = x(dx, dy, dz, c, e);
-               }
-            }
-         }
-         MFEM_SYNC_THREAD;
+         kernels::internal::LoadX(e,D1D,c,x,DDD);
          kernels::internal::EvalX(D1D,Q1D,B,DDD,DDQ);
          kernels::internal::EvalY(D1D,Q1D,B,DDQ,DQQ);
          kernels::internal::EvalZ(D1D,Q1D,B,DQQ,QQQ);
@@ -224,19 +181,9 @@ static void IntValues3D(const int NE, const real_t *b_, const real_t *detJ_,
             {
                MFEM_FOREACH_THREAD(qx,x,Q1D)
                {
-                  real_t u = QQQ(qz,qy,qx);
-                  if constexpr (Integral)
-                  {
-                     u /= detJ(qx, qy, qz, e);
-                  }
-                  if constexpr (Q_LAYOUT == QVectorLayout::byVDIM)
-                  {
-                     y(c, qx, qy, qz, e) = u;
-                  }
-                  if constexpr (Q_LAYOUT == QVectorLayout::byNODES)
-                  {
-                     y(qx, qy, qz, c, e) = u;
-                  }
+                  const real_t u = QQQ(qz,qy,qx);
+                  if (Q_LAYOUT == QVectorLayout::byVDIM) { y(c,qx,qy,qz,e) = u; }
+                  if (Q_LAYOUT == QVectorLayout::byNODES) { y(qx,qy,qz,c,e) = u; }
                }
             }
          }
@@ -245,417 +192,14 @@ static void IntValues3D(const int NE, const real_t *b_, const real_t *detJ_,
    });
 }
 
-// Template compute kernel for Values in 3D: tensor product version.
-template <QVectorLayout Q_LAYOUT, int T_VDIM = 0, int T_D1D = 0, int T_Q1D = 0>
-static void Values3D(const int NE, const real_t *b_, const real_t *x_,
-                     real_t *y_, const int vdim = 0, const int d1d = 0,
-                     const int q1d = 0)
-{
-   return IntValues3D<Q_LAYOUT, false, T_VDIM, T_D1D, T_Q1D>(
-             NE, b_, nullptr, x_, y_, vdim, d1d, q1d);
-}
-
-template <bool Integral>
-void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
-               const real_t *detJ, const GeometricFactors *geom,
-               const DofToQuad &maps, const Vector &e_vec, Vector &q_val,
-               Vector &q_der, Vector &q_det, const int eval_flags);
-
-inline void Eval1D(const int NE, const int vdim, const QVectorLayout q_layout,
-                   const GeometricFactors *geom, const DofToQuad &maps,
-                   const Vector &e_vec, Vector &q_val, Vector &q_der, Vector &q_det,
-                   const int eval_flags)
-{
-   IntEval1D<false>(NE, vdim, q_layout, nullptr, geom, maps, e_vec, q_val,
-                    q_der, q_det, eval_flags);
-}
-
-// Template compute kernel for 2D quadrature interpolation:
-// * non-tensor product version,
-// * assumes 'e_vec' is using ElementDofOrdering::NATIVE,
-// * assumes 'maps.mode == FULL'.
-template <bool Integral, const int T_VDIM, const int T_ND, const int T_NQ>
-static void
-IntEval2D(const int NE, const int vdim, const QVectorLayout q_layout,
-          const real_t *detJ_, const GeometricFactors *geom,
-          const DofToQuad &maps, const Vector &e_vec, Vector &q_val,
-          Vector &q_der, Vector &q_det, const int eval_flags)
-{
-   using QI = QuadratureInterpolator;
-
-   const int nd = maps.ndof;
-   const int nq = maps.nqpt;
-   const int ND = T_ND ? T_ND : nd;
-   const int NQ = T_NQ ? T_NQ : nq;
-   const int NMAX = NQ > ND ? NQ : ND;
-   const int VDIM = T_VDIM ? T_VDIM : vdim;
-   MFEM_ASSERT(maps.mode == DofToQuad::FULL, "internal error");
-   MFEM_ASSERT(!geom || geom->mesh->SpaceDimension() == 2, "");
-   MFEM_VERIFY(ND <= QI::MAX_ND2D, "");
-   MFEM_VERIFY(NQ <= QI::MAX_NQ2D, "");
-   const auto B = Reshape(maps.B.Read(), NQ, ND);
-   const auto G = Reshape(maps.G.Read(), NQ, 2, ND);
-   const auto J = Reshape(geom ? geom->J.Read() : nullptr, NQ, 2, 2, NE);
-   const auto E_ = e_vec.Read();
-   auto val = q_layout == QVectorLayout::byNODES ?
-              Reshape(q_val.Write(), NQ, VDIM, NE):
-              Reshape(q_val.Write(), VDIM, NQ, NE);
-   auto der = q_layout == QVectorLayout::byNODES ?
-              Reshape(q_der.Write(), NQ, VDIM, 2, NE):
-              Reshape(q_der.Write(), VDIM, 2, NQ, NE);
-   auto det = Reshape(q_det.Write(), NQ, NE);
-   mfem::forall_2D(NE, NMAX, 1, [=] MFEM_HOST_DEVICE(int e)
-   {
-      const auto E = Reshape(E_, ND, VDIM, NE);
-      const auto detJ = Reshape(detJ_, NQ, NE);
-      const int ND = T_ND ? T_ND : nd;
-      const int NQ = T_NQ ? T_NQ : nq;
-      const int VDIM = T_VDIM ? T_VDIM : vdim;
-      constexpr int max_ND = T_ND ? T_ND : QI::MAX_ND2D;
-      constexpr int max_VDIM = T_VDIM ? T_VDIM : QI::MAX_VDIM2D;
-      MFEM_SHARED real_t s_E[max_VDIM*max_ND];
-      MFEM_FOREACH_THREAD(d, x, ND)
-      {
-         for (int c = 0; c < VDIM; c++)
-         {
-            s_E[c + d * VDIM] = E(d, c, e);
-         }
-      }
-      MFEM_SYNC_THREAD;
-
-      MFEM_FOREACH_THREAD(q, x, NQ)
-      {
-         if (eval_flags & (QI::VALUES | QI::PHYSICAL_VALUES))
-         {
-            real_t ed[max_VDIM];
-            for (int c = 0; c < VDIM; c++)
-            {
-               ed[c] = 0.0;
-            }
-            for (int d = 0; d < ND; ++d)
-            {
-               const real_t b = B(q,d);
-               for (int c = 0; c < VDIM; c++)
-               {
-                  ed[c] += b * s_E[c + d * VDIM];
-               }
-            }
-            for (int c = 0; c < VDIM; c++)
-            {
-               if constexpr (Integral)
-               {
-                  ed[c] /= detJ(q, e);
-               }
-               if (q_layout == QVectorLayout::byVDIM)
-               {
-                  val(c, q, e) = ed[c];
-               }
-               if (q_layout == QVectorLayout::byNODES)
-               {
-                  val(q, c, e) = ed[c];
-               }
-            }
-         }
-         if ((eval_flags & QI::DERIVATIVES) ||
-             (eval_flags & QI::PHYSICAL_DERIVATIVES) ||
-             (eval_flags & QI::DETERMINANTS))
-         {
-            // use MAX_VDIM2D to avoid "subscript out of range" warnings
-            real_t D[QI::MAX_VDIM2D*2];
-            for (int i = 0; i < 2*VDIM; i++)
-            {
-               D[i] = 0.0;
-            }
-            for (int d = 0; d < ND; ++d)
-            {
-               const real_t wx = G(q,0,d);
-               const real_t wy = G(q,1,d);
-               for (int c = 0; c < VDIM; c++)
-               {
-                  real_t s_e = s_E[c+d*VDIM];
-                  D[c+VDIM*0] += s_e * wx;
-                  D[c+VDIM*1] += s_e * wy;
-               }
-            }
-            if (eval_flags & QI::DERIVATIVES)
-            {
-               for (int c = 0; c < VDIM; c++)
-               {
-                  if (q_layout == QVectorLayout::byVDIM)
-                  {
-                     der(c,0,q,e) = D[c+VDIM*0];
-                     der(c,1,q,e) = D[c+VDIM*1];
-                  }
-                  if (q_layout == QVectorLayout::byNODES)
-                  {
-                     der(q,c,0,e) = D[c+VDIM*0];
-                     der(q,c,1,e) = D[c+VDIM*1];
-                  }
-               }
-            }
-            if (eval_flags & QI::PHYSICAL_DERIVATIVES)
-            {
-               real_t Jloc[4], Jinv[4];
-               Jloc[0] = J(q,0,0,e);
-               Jloc[1] = J(q,1,0,e);
-               Jloc[2] = J(q,0,1,e);
-               Jloc[3] = J(q,1,1,e);
-               kernels::CalcInverse<2>(Jloc, Jinv);
-               for (int c = 0; c < VDIM; c++)
-               {
-                  const real_t u = D[c+VDIM*0];
-                  const real_t v = D[c+VDIM*1];
-                  const real_t JiU = Jinv[0]*u + Jinv[1]*v;
-                  const real_t JiV = Jinv[2]*u + Jinv[3]*v;
-                  if (q_layout == QVectorLayout::byVDIM)
-                  {
-                     der(c,0,q,e) = JiU;
-                     der(c,1,q,e) = JiV;
-                  }
-                  if (q_layout == QVectorLayout::byNODES)
-                  {
-                     der(q,c,0,e) = JiU;
-                     der(q,c,1,e) = JiV;
-                  }
-               }
-            }
-            if (eval_flags & QI::DETERMINANTS)
-            {
-               if (VDIM == 2)
-               {
-                  det(q, e) = kernels::Det<2>(D);
-               }
-               else
-               {
-                  DeviceTensor<2> j(D, 3, 2);
-                  const real_t dE = j(0,0)*j(0,0) + j(1,0)*j(1,0) + j(2,0)*j(2,0);
-                  const real_t dF = j(0,0)*j(0,1) + j(1,0)*j(1,1) + j(2,0)*j(2,1);
-                  const real_t dG = j(0,1)*j(0,1) + j(1,1)*j(1,1) + j(2,1)*j(2,1);
-                  det(q,e) = std::sqrt(dE*dG - dF*dF);
-               }
-            }
-         }
-      }
-   });
-}
-
-// Template compute kernel for 2D quadrature interpolation:
-// * non-tensor product version,
-// * assumes 'e_vec' is using ElementDofOrdering::NATIVE,
-// * assumes 'maps.mode == FULL'.
-template <const int T_VDIM, const int T_ND, const int T_NQ>
-static void Eval2D(const int NE, const int vdim, const QVectorLayout q_layout,
-                   const GeometricFactors *geom, const DofToQuad &maps,
-                   const Vector &e_vec, Vector &q_val, Vector &q_der,
-                   Vector &q_det, const int eval_flags)
-{
-   IntEval2D<false, T_VDIM, T_ND, T_NQ>(NE, vdim, q_layout, nullptr, geom, maps,
-                                        e_vec, q_val, q_der, q_det, eval_flags);
-}
-
-// Template compute kernel for 3D quadrature interpolation:
-// * non-tensor product version,
-// * assumes 'e_vec' is using ElementDofOrdering::NATIVE,
-// * assumes 'maps.mode == FULL'.
-template <bool Integral, const int T_VDIM, const int T_ND, const int T_NQ>
-static void
-IntEval3D(const int NE, const int vdim, const QVectorLayout q_layout,
-          const real_t *detJ_, const GeometricFactors *geom,
-          const DofToQuad &maps, const Vector &e_vec, Vector &q_val,
-          Vector &q_der, Vector &q_det, const int eval_flags)
-{
-   using QI = QuadratureInterpolator;
-
-   const int nd = maps.ndof;
-   const int nq = maps.nqpt;
-   const int ND = T_ND ? T_ND : nd;
-   const int NQ = T_NQ ? T_NQ : nq;
-   const int NMAX = NQ > ND ? NQ : ND;
-   const int VDIM = T_VDIM ? T_VDIM : vdim;
-   MFEM_ASSERT(maps.mode == DofToQuad::FULL, "internal error");
-   MFEM_ASSERT(!geom || geom->mesh->SpaceDimension() == 3, "");
-   MFEM_VERIFY(ND <= QI::MAX_ND3D, "");
-   MFEM_VERIFY(NQ <= QI::MAX_NQ3D, "");
-   MFEM_VERIFY(VDIM == 3 || !(eval_flags & QI::DETERMINANTS), "");
-   const auto B = Reshape(maps.B.Read(), NQ, ND);
-   const auto G = Reshape(maps.G.Read(), NQ, 3, ND);
-   const auto J = Reshape(geom ? geom->J.Read() : nullptr, NQ, 3, 3, NE);
-   auto E_ = e_vec.Read();
-   auto val = q_layout == QVectorLayout::byNODES ?
-              Reshape(q_val.Write(), NQ, VDIM, NE):
-              Reshape(q_val.Write(), VDIM, NQ, NE);
-   auto der = q_layout == QVectorLayout::byNODES ?
-              Reshape(q_der.Write(), NQ, VDIM, 3, NE):
-              Reshape(q_der.Write(), VDIM, 3, NQ, NE);
-   auto det = Reshape(q_det.Write(), NQ, NE);
-   mfem::forall_2D(NE, NMAX, 1, [=] MFEM_HOST_DEVICE(int e)
-   {
-      const auto E = Reshape(E_, ND, VDIM, NE);
-      const auto detJ = Reshape(detJ_, NQ, NE);
-      const int ND = T_ND ? T_ND : nd;
-      const int NQ = T_NQ ? T_NQ : nq;
-      const int VDIM = T_VDIM ? T_VDIM : vdim;
-      constexpr int max_ND = T_ND ? T_ND : QI::MAX_ND3D;
-      constexpr int max_VDIM = T_VDIM ? T_VDIM : QI::MAX_VDIM3D;
-      MFEM_SHARED real_t s_E[max_VDIM*max_ND];
-      MFEM_FOREACH_THREAD(d, x, ND)
-      {
-         for (int c = 0; c < VDIM; c++)
-         {
-            s_E[c + d * VDIM] = E(d, c, e);
-         }
-      }
-      MFEM_SYNC_THREAD;
-
-      MFEM_FOREACH_THREAD(q, x, NQ)
-      {
-         if (eval_flags & (QI::VALUES | QI::PHYSICAL_VALUES))
-         {
-            real_t ed[max_VDIM];
-            for (int c = 0; c < VDIM; c++)
-            {
-               ed[c] = 0.0;
-            }
-            for (int d = 0; d < ND; ++d)
-            {
-               const real_t b = B(q,d);
-               for (int c = 0; c < VDIM; c++)
-               {
-                  ed[c] += b * s_E[c + d * VDIM];
-               }
-            }
-            for (int c = 0; c < VDIM; c++)
-            {
-               if constexpr (Integral)
-               {
-                  ed[c] /= detJ(q, e);
-               }
-               if (q_layout == QVectorLayout::byVDIM)
-               {
-                  val(c, q, e) = ed[c];
-               }
-               if (q_layout == QVectorLayout::byNODES)
-               {
-                  val(q, c, e) = ed[c];
-               }
-            }
-         }
-         if ((eval_flags & QI::DERIVATIVES) ||
-             (eval_flags & QI::PHYSICAL_DERIVATIVES) ||
-             (eval_flags & QI::DETERMINANTS))
-         {
-            // use MAX_VDIM3D to avoid "subscript out of range" warnings
-            real_t D[QI::MAX_VDIM3D*3];
-            for (int i = 0; i < 3*VDIM; i++)
-            {
-               D[i] = 0.0;
-            }
-            for (int d = 0; d < ND; ++d)
-            {
-               const real_t wx = G(q,0,d);
-               const real_t wy = G(q,1,d);
-               const real_t wz = G(q,2,d);
-               for (int c = 0; c < VDIM; c++)
-               {
-                  real_t s_e = s_E[c+d*VDIM];
-                  D[c+VDIM*0] += s_e * wx;
-                  D[c+VDIM*1] += s_e * wy;
-                  D[c+VDIM*2] += s_e * wz;
-               }
-            }
-            if (eval_flags & QI::DERIVATIVES)
-            {
-               for (int c = 0; c < VDIM; c++)
-               {
-                  if (q_layout == QVectorLayout::byVDIM)
-                  {
-                     der(c,0,q,e) = D[c+VDIM*0];
-                     der(c,1,q,e) = D[c+VDIM*1];
-                     der(c,2,q,e) = D[c+VDIM*2];
-                  }
-                  if (q_layout == QVectorLayout::byNODES)
-                  {
-                     der(q,c,0,e) = D[c+VDIM*0];
-                     der(q,c,1,e) = D[c+VDIM*1];
-                     der(q,c,2,e) = D[c+VDIM*2];
-                  }
-               }
-            }
-            if (eval_flags & QI::PHYSICAL_DERIVATIVES)
-            {
-               real_t Jloc[9], Jinv[9];
-               for (int col = 0; col < 3; col++)
-               {
-                  for (int row = 0; row < 3; row++)
-                  {
-                     Jloc[row+3*col] = J(q,row,col,e);
-                  }
-               }
-               kernels::CalcInverse<3>(Jloc, Jinv);
-               for (int c = 0; c < VDIM; c++)
-               {
-                  const real_t u = D[c+VDIM*0];
-                  const real_t v = D[c+VDIM*1];
-                  const real_t w = D[c+VDIM*2];
-                  const real_t JiU = Jinv[0]*u + Jinv[1]*v + Jinv[2]*w;
-                  const real_t JiV = Jinv[3]*u + Jinv[4]*v + Jinv[5]*w;
-                  const real_t JiW = Jinv[6]*u + Jinv[7]*v + Jinv[8]*w;
-                  if (q_layout == QVectorLayout::byVDIM)
-                  {
-                     der(c,0,q,e) = JiU;
-                     der(c,1,q,e) = JiV;
-                     der(c,2,q,e) = JiW;
-                  }
-                  if (q_layout == QVectorLayout::byNODES)
-                  {
-                     der(q,c,0,e) = JiU;
-                     der(q,c,1,e) = JiV;
-                     der(q,c,2,e) = JiW;
-                  }
-               }
-            }
-            if (VDIM == 3 && (eval_flags & QI::DETERMINANTS))
-            {
-               // The check (VDIM == 3) should eliminate this block when VDIM is
-               // known at compile time and (VDIM != 3).
-               det(q,e) = kernels::Det<3>(D);
-            }
-         }
-      }
-   });
-}
-
-// Template compute kernel for 3D quadrature interpolation:
-// * non-tensor product version,
-// * assumes 'e_vec' is using ElementDofOrdering::NATIVE,
-// * assumes 'maps.mode == FULL'.
-template <const int T_VDIM, const int T_ND, const int T_NQ>
-static void Eval3D(const int NE, const int vdim, const QVectorLayout q_layout,
-                   const GeometricFactors *geom, const DofToQuad &maps,
-                   const Vector &e_vec, Vector &q_val, Vector &q_der,
-                   Vector &q_det, const int eval_flags)
-{
-   IntEval3D<false, T_VDIM, T_ND, T_NQ>(NE, vdim, q_layout, nullptr, geom, maps,
-                                        e_vec, q_val, q_der, q_det, eval_flags);
-}
-
 } // namespace quadrature_interpolator
 
 } // namespace internal
 
 /// @cond Suppress_Doxygen_warnings
 
-template <int DIM, QVectorLayout Q_LAYOUT, int VDIM, int D1D, int Q1D, int NBZ>
-QuadratureInterpolator::IntTensorEvalKernelType
-QuadratureInterpolator::IntTensorEvalKernels::Kernel()
-{
-   if constexpr (DIM == 1) { return internal::quadrature_interpolator::IntValues1D<Q_LAYOUT, true>; }
-   else if constexpr (DIM == 2) { return internal::quadrature_interpolator::IntValues2D<Q_LAYOUT, true, VDIM, D1D, Q1D, NBZ>; }
-   else if constexpr (DIM == 3) { return internal::quadrature_interpolator::IntValues3D<Q_LAYOUT, true, VDIM, D1D, Q1D>; }
-   MFEM_ABORT("");
-}
-
-template <int DIM, QVectorLayout Q_LAYOUT, int VDIM, int D1D, int Q1D, int NBZ>
+template<int DIM, QVectorLayout Q_LAYOUT,
+         int VDIM, int D1D, int Q1D, int NBZ>
 QuadratureInterpolator::TensorEvalKernelType
 QuadratureInterpolator::TensorEvalKernels::Kernel()
 {
@@ -665,28 +209,6 @@ QuadratureInterpolator::TensorEvalKernels::Kernel()
    MFEM_ABORT("");
 }
 
-template <int DIM, int VDIM, int ND, int NQ>
-QuadratureInterpolator::IntEvalKernelType
-QuadratureInterpolator::IntEvalKernels::Kernel()
-{
-   using namespace internal::quadrature_interpolator;
-   if constexpr (DIM == 1) { return IntEval1D<true>; }
-   else if constexpr (DIM == 2) { return IntEval2D<true,VDIM,ND,NQ>; }
-   else if constexpr (DIM == 3) { return IntEval3D<true,VDIM,ND,NQ>; }
-   MFEM_ABORT("");
-}
-
-template <int DIM, int VDIM, int ND, int NQ>
-QuadratureInterpolator::EvalKernelType
-QuadratureInterpolator::EvalKernels::Kernel()
-{
-   using namespace internal::quadrature_interpolator;
-   if constexpr (DIM == 1) { return Eval1D; }
-   else if constexpr (DIM == 2) { return Eval2D<VDIM,ND,NQ>; }
-   else if constexpr (DIM == 3) { return Eval3D<VDIM,ND,NQ>; }
-   MFEM_ABORT("");
-}
-
 /// @endcond
 
 } // namespace mfem

fem/qinterp/eval_by_nodes.cpp

@@ -21,105 +21,63 @@ namespace quadrature_interpolator
 
 void InitEvalByNodesKernels()
 {
+   using k = QuadratureInterpolator::TensorEvalKernels;
+
    // 2D
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 1, 3, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 1, 2, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 1, 3, 2, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 1, 3, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 1, 3, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 1, 4, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 1, 4, 4, 1>();
+   k::Specialization<2,QVectorLayout::byNODES,1,3,3>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,1,2,4>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,1,3,2>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,1,3,4>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,1,3,6>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,1,4,3>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,1,4,4>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 2, 2, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 2, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 2, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 2, 5, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 2, 6, 1>();
+   k::Specialization<2,QVectorLayout::byNODES,2,2,2>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,2,3>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,2,4>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,2,5>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,2,6>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 3, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 3, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 3, 6, 1>();
+   k::Specialization<2,QVectorLayout::byNODES,2,3,3>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,3,4>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,3,6>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 4, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 4, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 4, 5, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 4, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 4, 7, 1>();
+   k::Specialization<2,QVectorLayout::byNODES,2,4,3>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,4,4>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,4,5>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,4,6>::Opt<1>::Add();
+   k::Specialization<2,QVectorLayout::byNODES,2,4,7>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byNODES, 2, 5, 6, 1>();
+   k::Specialization<2,QVectorLayout::byNODES,2,5,6>::Opt<1>::Add();
 
    // 3D
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 1, 2, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 1, 3, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 1, 3, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 1, 3, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 1, 4, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 1, 4, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 1, 4, 8, 1>();
+   k::Specialization<3,QVectorLayout::byNODES,1,2,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,1,3,3>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,1,3,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,1,3,6>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,1,4,3>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,1,4,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,1,4,8>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 2, 2, 2, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 2, 2, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 2, 3, 4, 1>();
+   k::Specialization<3,QVectorLayout::byNODES,2,2,2>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,2,2,3>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,2,3,4>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 2, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 2, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 2, 5, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 2, 6, 1>();
+   k::Specialization<3,QVectorLayout::byNODES,3,2,3>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,2,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,2,5>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,2,6>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 3, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 3, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 3, 5, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 3, 6, 1>();
+   k::Specialization<3,QVectorLayout::byNODES,3,3,3>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,3,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,3,5>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,3,6>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 4, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 4, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 4, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 4, 7, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byNODES, 3, 4, 8, 1>();
+   k::Specialization<3,QVectorLayout::byNODES,3,4,3>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,4,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,4,6>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,4,7>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byNODES,3,4,8>::Opt<1>::Add();
 }
 
 } // namespace quadrature_interpolator

fem/qinterp/eval_by_vdim.cpp

@@ -21,59 +21,36 @@ namespace quadrature_interpolator
 
 void InitEvalByVDimKernels()
 {
+   using k = QuadratureInterpolator::TensorEvalKernels;
    // 2D
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 1, 2, 4, 8>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 1, 3, 6, 4>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 1, 4, 8, 2>();
+   k::Specialization<2,QVectorLayout::byVDIM,1,2,4>::Opt<8>::Add();
+   k::Specialization<2,QVectorLayout::byVDIM,1,3,6>::Opt<4>::Add();
+   k::Specialization<2,QVectorLayout::byVDIM,1,4,8>::Opt<2>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 2, 2, 4, 8>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 2, 3, 4, 8>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 2, 3, 6, 4>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 2, 4, 6, 2>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   2, QVectorLayout::byVDIM, 2, 4, 8, 2>();
+   k::Specialization<2,QVectorLayout::byVDIM,2,2,4>::Opt<8>::Add();
+   k::Specialization<2,QVectorLayout::byVDIM,2,3,4>::Opt<8>::Add();
+   k::Specialization<2,QVectorLayout::byVDIM,2,3,6>::Opt<4>::Add();
+   k::Specialization<2,QVectorLayout::byVDIM,2,4,6>::Opt<2>::Add();
+   k::Specialization<2,QVectorLayout::byVDIM,2,4,8>::Opt<2>::Add();
    // 3D
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 1, 2, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 1, 3, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 1, 4, 8, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 2, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 3, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 4, 8, 1>();
+   k::Specialization<3,QVectorLayout::byVDIM,1,2,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,1,3,6>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,1,4,8>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,2,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,3,6>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,4,8>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 2, 2, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 3, 3, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 4, 4, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 5, 5, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 6, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 7, 7, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 8, 8, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 9, 9, 1>();
+   k::Specialization<3,QVectorLayout::byVDIM,3,2,2>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,3,3>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,4,4>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,5,5>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,6,6>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,7,7>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,8,8>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,9,9>::Opt<1>::Add();
 
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 4, 6, 1>();
-   QuadratureInterpolator::AddTensorEvalSpecializations<
-   3, QVectorLayout::byVDIM, 3, 3, 4, 1>();
+   k::Specialization<3,QVectorLayout::byVDIM,3,4,6>::Opt<1>::Add();
+   k::Specialization<3,QVectorLayout::byVDIM,3,3,4>::Opt<1>::Add();
 }
 
 } // namespace quadrature_interpolator

fem/qinterp/eval_hdiv.hpp

@@ -136,8 +136,8 @@ inline void EvalHDiv2D(const int NE,
                {
                   qq += QD(qx,dy,vd) * By(dy,qy);
                }
-               if ((FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
-                             QuadratureInterpolator::PHYSICAL_MAGNITUDES)) != 0)
+               if (FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
+                            QuadratureInterpolator::PHYSICAL_MAGNITUDES))
                {
                   QQ(qx,qy,vd) = qq;
                }
@@ -153,8 +153,8 @@ inline void EvalHDiv2D(const int NE,
          }
       }
       MFEM_SYNC_THREAD;
-      if ((FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
-                    QuadratureInterpolator::PHYSICAL_MAGNITUDES)) != 0)
+      if (FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
+                   QuadratureInterpolator::PHYSICAL_MAGNITUDES))
       {
          if (tidz == 0)
          {
@@ -178,7 +178,7 @@ inline void EvalHDiv2D(const int NE,
                   const real_t detJ = kernels::Det<DIM>(J_loc);
                   kernels::Mult(DIM, DIM, J_loc, u_ref, u_phys);
                   kernels::Set(DIM, 1, 1_r/detJ, u_phys, u_phys);
-                  if ((FLAGS & QuadratureInterpolator::PHYSICAL_VALUES) != 0)
+                  if (FLAGS & QuadratureInterpolator::PHYSICAL_VALUES)
                   {
                      MFEM_UNROLL(DIM)
                      for (int sd = 0; sd < DIM; sd++)
@@ -193,8 +193,7 @@ inline void EvalHDiv2D(const int NE,
                         }
                      }
                   }
-                  else if ((FLAGS &
-                            QuadratureInterpolator::PHYSICAL_MAGNITUDES) != 0)
+                  else if (FLAGS & QuadratureInterpolator::PHYSICAL_MAGNITUDES)
                   {
                      y(qx,qy,0,e) = kernels::Norml2(DIM, u_phys);
                   }
@@ -373,9 +372,8 @@ inline void EvalHDiv3D(const int NE,
                MFEM_UNROLL(MQ1)
                for (int qz = 0; qz < Q1D; ++qz)
                {
-                  if ((FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
-                                QuadratureInterpolator::PHYSICAL_MAGNITUDES)) !=
-                      0)
+                  if (FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
+                               QuadratureInterpolator::PHYSICAL_MAGNITUDES))
                   {
                      QQQ(qx,qy,qz,vd) = u[qz];
                   }
@@ -392,8 +390,8 @@ inline void EvalHDiv3D(const int NE,
          }
       }
       MFEM_SYNC_THREAD;
-      if ((FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
-                    QuadratureInterpolator::PHYSICAL_MAGNITUDES)) != 0)
+      if (FLAGS & (QuadratureInterpolator::PHYSICAL_VALUES |
+                   QuadratureInterpolator::PHYSICAL_MAGNITUDES))
       {
          MFEM_FOREACH_THREAD(qz,z,Q1D)
          {
@@ -417,7 +415,7 @@ inline void EvalHDiv3D(const int NE,
                   const real_t detJ = kernels::Det<DIM>(J_loc);
                   kernels::Mult(DIM, DIM, J_loc, u_ref, u_phys);
                   kernels::Set(DIM, 1, 1_r/detJ, u_phys, u_phys);
-                  if ((FLAGS & QuadratureInterpolator::PHYSICAL_VALUES) != 0)
+                  if (FLAGS & QuadratureInterpolator::PHYSICAL_VALUES)
                   {
                      MFEM_UNROLL(DIM)
                      for (int sd = 0; sd < DIM; sd++)
@@ -432,8 +430,7 @@ inline void EvalHDiv3D(const int NE,
                         }
                      }
                   }
-                  else if ((FLAGS &
-                            QuadratureInterpolator::PHYSICAL_MAGNITUDES) != 0)
+                  else if (FLAGS & QuadratureInterpolator::PHYSICAL_MAGNITUDES)
                   {
                      y(qx,qy,qz,0,e) = kernels::Norml2(DIM, u_phys);
                   }

fem/qinterp/grad_by_nodes.cpp

@@ -22,71 +22,74 @@ namespace quadrature_interpolator
 template <bool P>
 void InitGradByNodesKernels()
 {
+   using k = QuadratureInterpolator::GradKernels;
    constexpr auto L = QVectorLayout::byNODES;
    // 2D
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,1,3,3,16>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,1,3,4,16>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,1,4,3,16>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,1,4,4,16>();
+   k::Specialization<2,L,P,1,3,3>::template Opt<16>::Add();
+   k::Specialization<2,L,P,1,3,4>::template Opt<16>::Add();
+   k::Specialization<2,L,P,1,4,3>::template Opt<16>::Add();
+   k::Specialization<2,L,P,1,4,4>::template Opt<16>::Add();
 
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,2,2,16>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,2,3,8>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,2,4,4>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,2,5,4>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,2,6,2>();
+   k::Specialization<2,L,P,2,2,2>::template Opt<16>::Add();
+   k::Specialization<2,L,P,2,2,3>::template Opt<8>::Add();
+   k::Specialization<2,L,P,2,2,4>::template Opt<4>::Add();
+   k::Specialization<2,L,P,2,2,5>::template Opt<4>::Add();
+   k::Specialization<2,L,P,2,2,6>::template Opt<2>::Add();
 
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,3,3,2>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,3,4,4>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,4,3,4>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,3,6,2>();
+   k::Specialization<2,L,P,2,3,3>::template Opt<2>::Add();
+   k::Specialization<2,L,P,2,3,4>::template Opt<4>::Add();
+   k::Specialization<2,L,P,2,4,3>::template Opt<4>::Add();
+   k::Specialization<2,L,P,2,3,6>::template Opt<2>::Add();
 
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,4,4,2>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,4,5,2>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,4,6,2>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,4,7,2>();
+   k::Specialization<2,L,P,2,4,4>::template Opt<2>::Add();
+   k::Specialization<2,L,P,2,4,5>::template Opt<2>::Add();
+   k::Specialization<2,L,P,2,4,6>::template Opt<2>::Add();
+   k::Specialization<2,L,P,2,4,7>::template Opt<2>::Add();
 
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,5,6,2>();
+   k::Specialization<2,L,P,2,5,6>::template Opt<2>::Add();
    // 3D
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,2,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,3,3>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,3,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,3,6>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,4,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,4,8>();
+   k::Specialization<3,L,P,1,2,4>::Add();
+   k::Specialization<3,L,P,1,3,3>::Add();
+   k::Specialization<3,L,P,1,3,4>::Add();
+   k::Specialization<3,L,P,1,3,6>::Add();
+   k::Specialization<3,L,P,1,4,4>::Add();
+   k::Specialization<3,L,P,1,4,8>::Add();
 
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,2,3>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,2,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,2,5>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,2,6>();
+   k::Specialization<3,L,P,3,2,3>::Add();
+   k::Specialization<3,L,P,3,2,4>::Add();
+   k::Specialization<3,L,P,3,2,5>::Add();
+   k::Specialization<3,L,P,3,2,6>::Add();
 
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,3,3>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,3,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,3,5>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,3,6>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,4,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,4,6>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,4,7>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,4,8>();
+   k::Specialization<3,L,P,3,3,3>::Add();
+   k::Specialization<3,L,P,3,3,4>::Add();
+   k::Specialization<3,L,P,3,3,5>::Add();
+   k::Specialization<3,L,P,3,3,6>::Add();
+   k::Specialization<3,L,P,3,4,4>::Add();
+   k::Specialization<3,L,P,3,4,6>::Add();
+   k::Specialization<3,L,P,3,4,7>::Add();
+   k::Specialization<3,L,P,3,4,8>::Add();
+
+   using k2 = QuadratureInterpolator::CollocatedGradKernels;
 
    // 2D
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,1,2,16>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,1,3,16>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,1,4,16>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,2,2,16>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,2,3,4>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,2,4,2>();
+   k2::Specialization<2,L,P,1,2>::template Opt<16>::Add();
+   k2::Specialization<2,L,P,1,3>::template Opt<16>::Add();
+   k2::Specialization<2,L,P,1,4>::template Opt<16>::Add();
+   k2::Specialization<2,L,P,2,2>::template Opt<16>::Add();
+   k2::Specialization<2,L,P,2,3>::template Opt<4>::Add();
+   k2::Specialization<2,L,P,2,4>::template Opt<2>::Add();
 
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,1,2>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,1,3>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,1,4>();
+   k2::Specialization<3,L,P,1,2>::Add();
+   k2::Specialization<3,L,P,1,3>::Add();
+   k2::Specialization<3,L,P,1,4>::Add();
 
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,2,2>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,2,3>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,2,4>();
+   k2::Specialization<3,L,P,2,2>::Add();
+   k2::Specialization<3,L,P,2,3>::Add();
+   k2::Specialization<3,L,P,2,4>::Add();
 
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,3,2>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,3,3>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,3,4>();
+   k2::Specialization<3,L,P,3,2>::Add();
+   k2::Specialization<3,L,P,3,3>::Add();
+   k2::Specialization<3,L,P,3,4>::Add();
 }
 
 template void InitGradByNodesKernels<true>();

fem/qinterp/grad_by_vdim.cpp

@@ -22,45 +22,47 @@ namespace quadrature_interpolator
 template <bool P>
 void InitGradByVDimKernels()
 {
+   using k = QuadratureInterpolator::GradKernels;
    constexpr auto L = QVectorLayout::byVDIM;
    // 2D
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,1,3,4,8>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,1,4,6,4>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,1,5,8,2>();
+   k::Specialization<2,L,P,1,3,4>::template Opt<8>::Add();
+   k::Specialization<2,L,P,1,4,6>::template Opt<4>::Add();
+   k::Specialization<2,L,P,1,5,8>::template Opt<2>::Add();
 
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,3,3,8>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,3,4,8>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,4,6,4>();
-   QuadratureInterpolator::AddGradSpecializations<2,L,P,2,5,8,2>();
+   k::Specialization<2,L,P,2,3,3>::template Opt<8>::Add();
+   k::Specialization<2,L,P,2,3,4>::template Opt<8>::Add();
+   k::Specialization<2,L,P,2,4,6>::template Opt<4>::Add();
+   k::Specialization<2,L,P,2,5,8>::template Opt<2>::Add();
    // 3D
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,3,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,4,6>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,1,5,8>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,3,4>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,4,6>();
-   QuadratureInterpolator::AddGradSpecializations<3,L,P,3,5,8>();
+   k::Specialization<3,L,P,1,3,4>::Add();
+   k::Specialization<3,L,P,1,4,6>::Add();
+   k::Specialization<3,L,P,1,5,8>::Add();
+   k::Specialization<3,L,P,3,3,4>::Add();
+   k::Specialization<3,L,P,3,4,6>::Add();
+   k::Specialization<3,L,P,3,5,8>::Add();
 
+   using k2 = QuadratureInterpolator::CollocatedGradKernels;
    // 2D
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,1,2,16>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,1,3,16>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,1,4,16>();
+   k2::Specialization<2,L,P,1,2>::template Opt<16>::Add();
+   k2::Specialization<2,L,P,1,3>::template Opt<16>::Add();
+   k2::Specialization<2,L,P,1,4>::template Opt<16>::Add();
 
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,2,2,16>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,2,3,4>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<2,L,P,2,4,2>();
+   k2::Specialization<2,L,P,2,2>::template Opt<16>::Add();
+   k2::Specialization<2,L,P,2,3>::template Opt<4>::Add();
+   k2::Specialization<2,L,P,2,4>::template Opt<2>::Add();
 
    // 3D
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,1,2>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,1,3>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,1,4>();
+   k2::Specialization<3,L,P,1,2>::Add();
+   k2::Specialization<3,L,P,1,3>::Add();
+   k2::Specialization<3,L,P,1,4>::Add();
 
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,2,2>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,2,3>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,2,4>();
+   k2::Specialization<3,L,P,2,2>::Add();
+   k2::Specialization<3,L,P,2,3>::Add();
+   k2::Specialization<3,L,P,2,4>::Add();
 
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,3,2>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,3,3>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<3,L,P,3,4>();
+   k2::Specialization<3,L,P,3,2>::Add();
+   k2::Specialization<3,L,P,3,3>::Add();
+   k2::Specialization<3,L,P,3,4>::Add();
 }
 
 template void InitGradByVDimKernels<true>();

fem/quadinterpolator.cpp

@@ -69,9 +69,8 @@ QuadratureInterpolator::QuadratureInterpolator(const FiniteElementSpace &fes,
 
    d_buffer.UseDevice(true);
    if (fespace->GetNE() == 0) { return; }
-   MFEM_VERIFY(
-      SupportsFESpace(fes),
-      "Only elements with MapType VALUE, INTEGRAL, or H_DIV are supported!");
+   MFEM_VERIFY(SupportsFESpace(fes),
+               "Only elements with MapType VALUE and H_DIV are supported!");
 }
 
 QuadratureInterpolator::QuadratureInterpolator(const FiniteElementSpace &fes,
@@ -85,9 +84,8 @@ QuadratureInterpolator::QuadratureInterpolator(const FiniteElementSpace &fes,
 {
    d_buffer.UseDevice(true);
    if (fespace->GetNE() == 0) { return; }
-   MFEM_VERIFY(
-      SupportsFESpace(fes),
-      "Only elements with MapType VALUE, INTEGRAL, or H_DIV are supported!");
+   MFEM_VERIFY(SupportsFESpace(fes),
+               "Only elements with MapType VALUE and H_DIV are supported!");
 }
 
 bool QuadratureInterpolator::SupportsFESpace(const FiniteElementSpace &fespace)
@@ -95,9 +93,9 @@ bool QuadratureInterpolator::SupportsFESpace(const FiniteElementSpace &fespace)
    const FiniteElement *fe = fespace.GetTypicalFE();
    const Mesh &mesh = *fespace.GetMesh();
    return (fe->GetMapType() == FiniteElement::MapType::VALUE ||
-           fe->GetMapType() == FiniteElement::MapType::INTEGRAL ||
-           fe->GetMapType() == FiniteElement::MapType::H_DIV) &&
-          (!fespace.IsVariableOrder()) && (!mesh.IsMixedMesh());
+           fe->GetMapType() == FiniteElement::MapType::H_DIV)
+          && (!fespace.IsVariableOrder())
+          && (!mesh.IsMixedMesh());
 }
 
 namespace internal
@@ -110,11 +108,16 @@ namespace quadrature_interpolator
 // * non-tensor product version,
 // * assumes 'e_vec' is using ElementDofOrdering::NATIVE,
 // * assumes 'maps.mode == FULL'.
-template <bool Integral>
-void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
-               const real_t *detJ_, const GeometricFactors *geom,
-               const DofToQuad &maps, const Vector &e_vec, Vector &q_val,
-               Vector &q_der, Vector &q_det, const int eval_flags)
+static void Eval1D(const int NE,
+                   const int vdim,
+                   const QVectorLayout q_layout,
+                   const GeometricFactors *geom,
+                   const DofToQuad &maps,
+                   const Vector &e_vec,
+                   Vector &q_val,
+                   Vector &q_der,
+                   Vector &q_det,
+                   const int eval_flags)
 {
    using QI = QuadratureInterpolator;
 
@@ -123,10 +126,13 @@ void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
    MFEM_ASSERT(maps.mode == DofToQuad::FULL, "internal error");
    MFEM_ASSERT(!geom || geom->mesh->SpaceDimension() == 1, "");
    MFEM_VERIFY(vdim == 1 || !(eval_flags & QI::DETERMINANTS), "");
-   const auto B_ = maps.B.Read();
-   const auto G_ = maps.G.Read();
+   MFEM_VERIFY(bool(geom) == bool(eval_flags & QI::PHYSICAL_DERIVATIVES),
+               "'geom' must be given (non-null) only when evaluating physical"
+               " derivatives");
+   const auto B = Reshape(maps.B.Read(), nq, nd);
+   const auto G = Reshape(maps.G.Read(), nq, nd);
    const auto J = Reshape(geom ? geom->J.Read() : nullptr, nq, NE);
-   const auto E_ = e_vec.Read();
+   const auto E = Reshape(e_vec.Read(), nd, vdim, NE);
    auto val = q_layout == QVectorLayout::byNODES ?
               Reshape(q_val.Write(), nq, vdim, NE):
               Reshape(q_val.Write(), vdim, nq, NE);
@@ -134,12 +140,8 @@ void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
               Reshape(q_der.Write(), nq, vdim, NE):
               Reshape(q_der.Write(), vdim, nq, NE);
    auto det = Reshape(q_det.Write(), nq, NE);
-   mfem::forall(NE, [=] MFEM_HOST_DEVICE(int e)
+   mfem::forall(NE, [=] MFEM_HOST_DEVICE (int e)
    {
-      const auto B = Reshape(B_, nq, nd);
-      const auto G = Reshape(G_, nq, nd);
-      const auto E = Reshape(E_, nd, vdim, NE);
-      const auto detJ = Reshape(detJ_, nq, NE);
       for (int q = 0; q < nq; ++q)
       {
          if (eval_flags & (QI::VALUES | QI::PHYSICAL_VALUES))
@@ -149,20 +151,10 @@ void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
                real_t q_val = 0.0;
                for (int d = 0; d < nd; ++d)
                {
-                  q_val += B(q, d) * E(d, c, e);
-               }
-               if constexpr (Integral)
-               {
-                  q_val /= detJ(q, e);
-               }
-               if (q_layout == QVectorLayout::byVDIM)
-               {
-                  val(c, q, e) = q_val;
-               }
-               if (q_layout == QVectorLayout::byNODES)
-               {
-                  val(q, c, e) = q_val;
+                  q_val += B(q,d)*E(d,c,e);
                }
+               if (q_layout == QVectorLayout::byVDIM)  { val(c,q,e) = q_val; }
+               if (q_layout == QVectorLayout::byNODES) { val(q,c,e) = q_val; }
             }
          }
          if ((eval_flags & QI::DERIVATIVES) ||
@@ -174,7 +166,7 @@ void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
                real_t q_d = 0.0;
                for (int d = 0; d < nd; ++d)
                {
-                  q_d += G(q, d) * E(d, c, e);
+                  q_d += G(q,d)*E(d,c,e);
                }
                if (eval_flags & QI::PHYSICAL_DERIVATIVES)
                {
@@ -182,14 +174,8 @@ void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
                }
                if (eval_flags & QI::DERIVATIVES || eval_flags & QI::PHYSICAL_DERIVATIVES)
                {
-                  if (q_layout == QVectorLayout::byVDIM)
-                  {
-                     der(c, q, e) = q_d;
-                  }
-                  if (q_layout == QVectorLayout::byNODES)
-                  {
-                     der(q, c, e) = q_d;
-                  }
+                  if (q_layout == QVectorLayout::byVDIM) { der(c,q,e) = q_d; }
+                  if (q_layout == QVectorLayout::byNODES) { der(q,c,e) = q_d; }
                }
                if (vdim == 1 && (eval_flags & QI::DETERMINANTS))
                {
@@ -201,17 +187,317 @@ void IntEval1D(const int NE, const int vdim, const QVectorLayout q_layout,
    });
 }
 
-template void
-IntEval1D<true>(const int NE, const int vdim, const QVectorLayout q_layout,
-                const real_t *detJ, const GeometricFactors *geom,
-                const DofToQuad &maps, const Vector &e_vec, Vector &q_val,
-                Vector &q_der, Vector &q_det, const int eval_flags);
+// Template compute kernel for 2D quadrature interpolation:
+// * non-tensor product version,
+// * assumes 'e_vec' is using ElementDofOrdering::NATIVE,
+// * assumes 'maps.mode == FULL'.
+template<const int T_VDIM, const int T_ND, const int T_NQ>
+static void Eval2D(const int NE,
+                   const int vdim,
+                   const QVectorLayout q_layout,
+                   const GeometricFactors *geom,
+                   const DofToQuad &maps,
+                   const Vector &e_vec,
+                   Vector &q_val,
+                   Vector &q_der,
+                   Vector &q_det,
+                   const int eval_flags)
+{
+   using QI = QuadratureInterpolator;
 
-template void
-IntEval1D<false>(const int NE, const int vdim, const QVectorLayout q_layout,
-                 const real_t *detJ, const GeometricFactors *geom,
-                 const DofToQuad &maps, const Vector &e_vec, Vector &q_val,
-                 Vector &q_der, Vector &q_det, const int eval_flags);
+   const int nd = maps.ndof;
+   const int nq = maps.nqpt;
+   const int ND = T_ND ? T_ND : nd;
+   const int NQ = T_NQ ? T_NQ : nq;
+   const int NMAX = NQ > ND ? NQ : ND;
+   const int VDIM = T_VDIM ? T_VDIM : vdim;
+   MFEM_ASSERT(maps.mode == DofToQuad::FULL, "internal error");
+   MFEM_ASSERT(!geom || geom->mesh->SpaceDimension() == 2, "");
+   MFEM_VERIFY(ND <= QI::MAX_ND2D, "");
+   MFEM_VERIFY(NQ <= QI::MAX_NQ2D, "");
+   MFEM_VERIFY(bool(geom) == bool(eval_flags & QI::PHYSICAL_DERIVATIVES),
+               "'geom' must be given (non-null) only when evaluating physical"
+               " derivatives");
+   const auto B = Reshape(maps.B.Read(), NQ, ND);
+   const auto G = Reshape(maps.G.Read(), NQ, 2, ND);
+   const auto J = Reshape(geom ? geom->J.Read() : nullptr, NQ, 2, 2, NE);
+   const auto E = Reshape(e_vec.Read(), ND, VDIM, NE);
+   auto val = q_layout == QVectorLayout::byNODES ?
+              Reshape(q_val.Write(), NQ, VDIM, NE):
+              Reshape(q_val.Write(), VDIM, NQ, NE);
+   auto der = q_layout == QVectorLayout::byNODES ?
+              Reshape(q_der.Write(), NQ, VDIM, 2, NE):
+              Reshape(q_der.Write(), VDIM, 2, NQ, NE);
+   auto det = Reshape(q_det.Write(), NQ, NE);
+   mfem::forall_2D(NE, NMAX, 1, [=] MFEM_HOST_DEVICE (int e)
+   {
+      const int ND = T_ND ? T_ND : nd;
+      const int NQ = T_NQ ? T_NQ : nq;
+      const int VDIM = T_VDIM ? T_VDIM : vdim;
+      constexpr int max_ND = T_ND ? T_ND : QI::MAX_ND2D;
+      constexpr int max_VDIM = T_VDIM ? T_VDIM : QI::MAX_VDIM2D;
+      MFEM_SHARED real_t s_E[max_VDIM*max_ND];
+      MFEM_FOREACH_THREAD(d, x, ND)
+      {
+         for (int c = 0; c < VDIM; c++)
+         {
+            s_E[c+d*VDIM] = E(d,c,e);
+         }
+      }
+      MFEM_SYNC_THREAD;
+
+      MFEM_FOREACH_THREAD(q, x, NQ)
+      {
+         if (eval_flags & (QI::VALUES | QI::PHYSICAL_VALUES))
+         {
+            real_t ed[max_VDIM];
+            for (int c = 0; c < VDIM; c++) { ed[c] = 0.0; }
+            for (int d = 0; d < ND; ++d)
+            {
+               const real_t b = B(q,d);
+               for (int c = 0; c < VDIM; c++) { ed[c] += b*s_E[c+d*VDIM]; }
+            }
+            for (int c = 0; c < VDIM; c++)
+            {
+               if (q_layout == QVectorLayout::byVDIM)  { val(c,q,e) = ed[c]; }
+               if (q_layout == QVectorLayout::byNODES) { val(q,c,e) = ed[c]; }
+            }
+         }
+         if ((eval_flags & QI::DERIVATIVES) ||
+             (eval_flags & QI::PHYSICAL_DERIVATIVES) ||
+             (eval_flags & QI::DETERMINANTS))
+         {
+            // use MAX_VDIM2D to avoid "subscript out of range" warnings
+            real_t D[QI::MAX_VDIM2D*2];
+            for (int i = 0; i < 2*VDIM; i++) { D[i] = 0.0; }
+            for (int d = 0; d < ND; ++d)
+            {
+               const real_t wx = G(q,0,d);
+               const real_t wy = G(q,1,d);
+               for (int c = 0; c < VDIM; c++)
+               {
+                  real_t s_e = s_E[c+d*VDIM];
+                  D[c+VDIM*0] += s_e * wx;
+                  D[c+VDIM*1] += s_e * wy;
+               }
+            }
+            if (eval_flags & QI::DERIVATIVES)
+            {
+               for (int c = 0; c < VDIM; c++)
+               {
+                  if (q_layout == QVectorLayout::byVDIM)
+                  {
+                     der(c,0,q,e) = D[c+VDIM*0];
+                     der(c,1,q,e) = D[c+VDIM*1];
+                  }
+                  if (q_layout == QVectorLayout::byNODES)
+                  {
+                     der(q,c,0,e) = D[c+VDIM*0];
+                     der(q,c,1,e) = D[c+VDIM*1];
+                  }
+               }
+            }
+            if (eval_flags & QI::PHYSICAL_DERIVATIVES)
+            {
+               real_t Jloc[4], Jinv[4];
+               Jloc[0] = J(q,0,0,e);
+               Jloc[1] = J(q,1,0,e);
+               Jloc[2] = J(q,0,1,e);
+               Jloc[3] = J(q,1,1,e);
+               kernels::CalcInverse<2>(Jloc, Jinv);
+               for (int c = 0; c < VDIM; c++)
+               {
+                  const real_t u = D[c+VDIM*0];
+                  const real_t v = D[c+VDIM*1];
+                  const real_t JiU = Jinv[0]*u + Jinv[1]*v;
+                  const real_t JiV = Jinv[2]*u + Jinv[3]*v;
+                  if (q_layout == QVectorLayout::byVDIM)
+                  {
+                     der(c,0,q,e) = JiU;
+                     der(c,1,q,e) = JiV;
+                  }
+                  if (q_layout == QVectorLayout::byNODES)
+                  {
+                     der(q,c,0,e) = JiU;
+                     der(q,c,1,e) = JiV;
+                  }
+               }
+            }
+            if (eval_flags & QI::DETERMINANTS)
+            {
+               if (VDIM == 2) { det(q,e) = kernels::Det<2>(D); }
+               else
+               {
+                  DeviceTensor<2> j(D, 3, 2);
+                  const double E = j(0,0)*j(0,0) + j(1,0)*j(1,0) + j(2,0)*j(2,0);
+                  const double F = j(0,0)*j(0,1) + j(1,0)*j(1,1) + j(2,0)*j(2,1);
+                  const double G = j(0,1)*j(0,1) + j(1,1)*j(1,1) + j(2,1)*j(2,1);
+                  det(q,e) = std::sqrt(E*G - F*F);
+               }
+            }
+         }
+      }
+   });
+}
+
+// Template compute kernel for 3D quadrature interpolation:
+// * non-tensor product version,
+// * assumes 'e_vec' is using ElementDofOrdering::NATIVE,
+// * assumes 'maps.mode == FULL'.
+template<const int T_VDIM, const int T_ND, const int T_NQ>
+static void Eval3D(const int NE,
+                   const int vdim,
+                   const QVectorLayout q_layout,
+                   const GeometricFactors *geom,
+                   const DofToQuad &maps,
+                   const Vector &e_vec,
+                   Vector &q_val,
+                   Vector &q_der,
+                   Vector &q_det,
+                   const int eval_flags)
+{
+   using QI = QuadratureInterpolator;
+
+   const int nd = maps.ndof;
+   const int nq = maps.nqpt;
+   const int ND = T_ND ? T_ND : nd;
+   const int NQ = T_NQ ? T_NQ : nq;
+   const int NMAX = NQ > ND ? NQ : ND;
+   const int VDIM = T_VDIM ? T_VDIM : vdim;
+   MFEM_ASSERT(maps.mode == DofToQuad::FULL, "internal error");
+   MFEM_ASSERT(!geom || geom->mesh->SpaceDimension() == 3, "");
+   MFEM_VERIFY(ND <= QI::MAX_ND3D, "");
+   MFEM_VERIFY(NQ <= QI::MAX_NQ3D, "");
+   MFEM_VERIFY(VDIM == 3 || !(eval_flags & QI::DETERMINANTS), "");
+   MFEM_VERIFY(bool(geom) == bool(eval_flags & QI::PHYSICAL_DERIVATIVES),
+               "'geom' must be given (non-null) only when evaluating physical"
+               " derivatives");
+   const auto B = Reshape(maps.B.Read(), NQ, ND);
+   const auto G = Reshape(maps.G.Read(), NQ, 3, ND);
+   const auto J = Reshape(geom ? geom->J.Read() : nullptr, NQ, 3, 3, NE);
+   const auto E = Reshape(e_vec.Read(), ND, VDIM, NE);
+   auto val = q_layout == QVectorLayout::byNODES ?
+              Reshape(q_val.Write(), NQ, VDIM, NE):
+              Reshape(q_val.Write(), VDIM, NQ, NE);
+   auto der = q_layout == QVectorLayout::byNODES ?
+              Reshape(q_der.Write(), NQ, VDIM, 3, NE):
+              Reshape(q_der.Write(), VDIM, 3, NQ, NE);
+   auto det = Reshape(q_det.Write(), NQ, NE);
+   mfem::forall_2D(NE, NMAX, 1, [=] MFEM_HOST_DEVICE (int e)
+   {
+      const int ND = T_ND ? T_ND : nd;
+      const int NQ = T_NQ ? T_NQ : nq;
+      const int VDIM = T_VDIM ? T_VDIM : vdim;
+      constexpr int max_ND = T_ND ? T_ND : QI::MAX_ND3D;
+      constexpr int max_VDIM = T_VDIM ? T_VDIM : QI::MAX_VDIM3D;
+      MFEM_SHARED real_t s_E[max_VDIM*max_ND];
+      MFEM_FOREACH_THREAD(d, x, ND)
+      {
+         for (int c = 0; c < VDIM; c++)
+         {
+            s_E[c+d*VDIM] = E(d,c,e);
+         }
+      }
+      MFEM_SYNC_THREAD;
+
+      MFEM_FOREACH_THREAD(q, x, NQ)
+      {
+         if (eval_flags & (QI::VALUES | QI::PHYSICAL_VALUES))
+         {
+            real_t ed[max_VDIM];
+            for (int c = 0; c < VDIM; c++) { ed[c] = 0.0; }
+            for (int d = 0; d < ND; ++d)
+            {
+               const real_t b = B(q,d);
+               for (int c = 0; c < VDIM; c++) { ed[c] += b*s_E[c+d*VDIM]; }
+            }
+            for (int c = 0; c < VDIM; c++)
+            {
+               if (q_layout == QVectorLayout::byVDIM)  { val(c,q,e) = ed[c]; }
+               if (q_layout == QVectorLayout::byNODES) { val(q,c,e) = ed[c]; }
+            }
+         }
+         if ((eval_flags & QI::DERIVATIVES) ||
+             (eval_flags & QI::PHYSICAL_DERIVATIVES) ||
+             (eval_flags & QI::DETERMINANTS))
+         {
+            // use MAX_VDIM3D to avoid "subscript out of range" warnings
+            real_t D[QI::MAX_VDIM3D*3];
+            for (int i = 0; i < 3*VDIM; i++) { D[i] = 0.0; }
+            for (int d = 0; d < ND; ++d)
+            {
+               const real_t wx = G(q,0,d);
+               const real_t wy = G(q,1,d);
+               const real_t wz = G(q,2,d);
+               for (int c = 0; c < VDIM; c++)
+               {
+                  real_t s_e = s_E[c+d*VDIM];
+                  D[c+VDIM*0] += s_e * wx;
+                  D[c+VDIM*1] += s_e * wy;
+                  D[c+VDIM*2] += s_e * wz;
+               }
+            }
+            if (eval_flags & QI::DERIVATIVES)
+            {
+               for (int c = 0; c < VDIM; c++)
+               {
+                  if (q_layout == QVectorLayout::byVDIM)
+                  {
+                     der(c,0,q,e) = D[c+VDIM*0];
+                     der(c,1,q,e) = D[c+VDIM*1];
+                     der(c,2,q,e) = D[c+VDIM*2];
+                  }
+                  if (q_layout == QVectorLayout::byNODES)
+                  {
+                     der(q,c,0,e) = D[c+VDIM*0];
+                     der(q,c,1,e) = D[c+VDIM*1];
+                     der(q,c,2,e) = D[c+VDIM*2];
+                  }
+               }
+            }
+            if (eval_flags & QI::PHYSICAL_DERIVATIVES)
+            {
+               real_t Jloc[9], Jinv[9];
+               for (int col = 0; col < 3; col++)
+               {
+                  for (int row = 0; row < 3; row++)
+                  {
+                     Jloc[row+3*col] = J(q,row,col,e);
+                  }
+               }
+               kernels::CalcInverse<3>(Jloc, Jinv);
+               for (int c = 0; c < VDIM; c++)
+               {
+                  const real_t u = D[c+VDIM*0];
+                  const real_t v = D[c+VDIM*1];
+                  const real_t w = D[c+VDIM*2];
+                  const real_t JiU = Jinv[0]*u + Jinv[1]*v + Jinv[2]*w;
+                  const real_t JiV = Jinv[3]*u + Jinv[4]*v + Jinv[5]*w;
+                  const real_t JiW = Jinv[6]*u + Jinv[7]*v + Jinv[8]*w;
+                  if (q_layout == QVectorLayout::byVDIM)
+                  {
+                     der(c,0,q,e) = JiU;
+                     der(c,1,q,e) = JiV;
+                     der(c,2,q,e) = JiW;
+                  }
+                  if (q_layout == QVectorLayout::byNODES)
+                  {
+                     der(q,c,0,e) = JiU;
+                     der(q,c,1,e) = JiV;
+                     der(q,c,2,e) = JiW;
+                  }
+               }
+            }
+            if (VDIM == 3 && (eval_flags & QI::DETERMINANTS))
+            {
+               // The check (VDIM == 3) should eliminate this block when VDIM is
+               // known at compile time and (VDIM != 3).
+               det(q,e) = kernels::Det<3>(D);
+            }
+         }
+      }
+   });
+}
 
 } // namespace quadrature_interpolator
 
@@ -249,20 +535,10 @@ void QuadratureInterpolator::Mult(const Vector &e_vec,
    const int nd = maps.ndof;
    const int nq = maps.nqpt;
    const GeometricFactors *geom = nullptr;
+   if (eval_flags & PHYSICAL_DERIVATIVES)
    {
-      int jac_factors = 0;
-      if (eval_flags & PHYSICAL_DERIVATIVES)
-      {
-         jac_factors = GeometricFactors::JACOBIANS;
-      }
-      if (fe->GetMapType() == FiniteElement::MapType::INTEGRAL)
-      {
-         jac_factors |= GeometricFactors::DETERMINANTS;
-      }
-      if (jac_factors)
-      {
-         geom = fespace->GetMesh()->GetGeometricFactors(*ir, jac_factors);
-      }
+      const int jacobians = GeometricFactors::JACOBIANS;
+      geom = fespace->GetMesh()->GetGeometricFactors(*ir, jacobians);
    }
 
    MFEM_ASSERT(!(eval_flags & DETERMINANTS) || dim == vdim ||
@@ -276,61 +552,29 @@ void QuadratureInterpolator::Mult(const Vector &e_vec,
    {
       if (eval_flags & (VALUES | PHYSICAL_VALUES))
       {
-         if (fe->GetMapType() == FiniteElement::MapType::INTEGRAL)
-         {
-            IntTensorEvalKernels::Run(dim, q_layout, vdim, nd, nq, ne,
-                                      maps.B.Read(), geom->detJ.Read(),
-                                      e_vec.Read(), q_val.Write(), vdim, nd, nq);
-         }
-         else
-         {
-            TensorEvalKernels::Run(dim, q_layout, vdim, nd, nq, ne,
-                                   maps.B.Read(), e_vec.Read(), q_val.Write(),
-                                   vdim, nd, nq);
-         }
+         TensorEvalKernels::Run(dim, q_layout, vdim, nd, nq, ne, maps.B.Read(),
+                                e_vec.Read(), q_val.Write(), vdim, nd, nq);
       }
       if (eval_flags & (DERIVATIVES | PHYSICAL_DERIVATIVES))
       {
          const bool phys = (eval_flags & PHYSICAL_DERIVATIVES);
          const real_t *J = phys ? geom->J.Read() : nullptr;
          const int s_dim = phys ? sdim : dim;
-         if (fe->GetMapType() == FiniteElement::MapType::INTEGRAL)
-         {
-            MFEM_ABORT("");
-         }
-         else
-         {
-            GradKernels::Run(dim, q_layout, phys, vdim, nd, nq, ne,
-                             maps.B.Read(), maps.G.Read(), J, e_vec.Read(),
-                             q_der.Write(), s_dim, vdim, nd, nq);
-         }
+         GradKernels::Run(dim, q_layout, phys, vdim, nd, nq, ne,
+                          maps.B.Read(), maps.G.Read(), J, e_vec.Read(),
+                          q_der.Write(), s_dim, vdim, nd, nq);
       }
       if (eval_flags & DETERMINANTS)
       {
-         if (fe->GetMapType() == FiniteElement::MapType::INTEGRAL)
-         {
-            MFEM_ABORT("");
-         }
-         else
-         {
-            DetKernels::Run(dim, vdim, nd, nq, ne, maps.B.Read(), maps.G.Read(),
-                            e_vec.Read(), q_det.Write(), nd, nq, &d_buffer);
-         }
+         DetKernels::Run(dim, vdim, nd, nq, ne, maps.B.Read(),
+                         maps.G.Read(), e_vec.Read(), q_det.Write(), nd,
+                         nq, &d_buffer);
       }
    }
    else // use_tensor_eval == false
    {
-      if (fe->GetMapType() == FiniteElement::MapType::INTEGRAL)
-      {
-         IntEvalKernels::Run(dim, vdim, maps.ndof, maps.nqpt, ne, vdim,
-                             q_layout, geom->detJ.Read(), geom, maps, e_vec,
-                             q_val, q_der, q_det, eval_flags);
-      }
-      else
-      {
-         EvalKernels::Run(dim, vdim, maps.ndof, maps.nqpt, ne, vdim, q_layout,
-                          geom, maps, e_vec, q_val, q_der, q_det, eval_flags);
-      }
+      EvalKernels::Run(dim, vdim, maps.ndof, maps.nqpt, ne,vdim, q_layout,
+                       geom, maps, e_vec, q_val, q_der, q_det, eval_flags);
    }
 }
 
@@ -456,41 +700,22 @@ namespace
 
 using namespace internal::quadrature_interpolator;
 
-template <QVectorLayout Q_LAYOUT> auto IntFallbackTensorEvalKernel(int DIM)
+using EvalKernel = QuadratureInterpolator::EvalKernelType;
+using TensorEvalKernel = QuadratureInterpolator::TensorEvalKernelType;
+using GradKernel = QuadratureInterpolator::GradKernelType;
+using CollocatedGradKernel = QuadratureInterpolator::CollocatedGradKernelType;
+
+template <QVectorLayout Q_LAYOUT>
+TensorEvalKernel FallbackTensorEvalKernel(int DIM)
 {
-   if (DIM == 1)
-   {
-      return IntValues1D<Q_LAYOUT, true>;
-   }
-   else if (DIM == 2)
-   {
-      return IntValues2D<Q_LAYOUT, true>;
-   }
-   else if (DIM == 3)
-   {
-      return IntValues3D<Q_LAYOUT, true>;
-   }
-   MFEM_ABORT("");
+   if (DIM == 1) { return Values1D<Q_LAYOUT>; }
+   else if (DIM == 2) { return Values2D<Q_LAYOUT>; }
+   else if (DIM == 3) { return Values3D<Q_LAYOUT>; }
+   else { MFEM_ABORT(""); }
 }
 
-template <QVectorLayout Q_LAYOUT> auto FallbackTensorEvalKernel(int DIM)
-{
-   if (DIM == 1)
-   {
-      return Values1D<Q_LAYOUT>;
-   }
-   else if (DIM == 2)
-   {
-      return Values2D<Q_LAYOUT>;
-   }
-   else if (DIM == 3)
-   {
-      return Values3D<Q_LAYOUT>;
-   }
-   MFEM_ABORT("");
-}
-
-template <QVectorLayout Q_LAYOUT, bool GRAD_PHYS> auto GetGradKernel(int DIM)
+template<QVectorLayout Q_LAYOUT, bool GRAD_PHYS>
+GradKernel GetGradKernel(int DIM)
 {
    if (DIM == 1) { return Derivatives1D<Q_LAYOUT, GRAD_PHYS>; }
    else if (DIM == 2) { return Derivatives2D<Q_LAYOUT, GRAD_PHYS>; }
@@ -498,185 +723,79 @@ template <QVectorLayout Q_LAYOUT, bool GRAD_PHYS> auto GetGradKernel(int DIM)
    else { MFEM_ABORT(""); }
 }
 
-template <QVectorLayout Q_LAYOUT> auto GetGradKernel(int DIM, bool GRAD_PHYS)
+
+template<QVectorLayout Q_LAYOUT>
+GradKernel GetGradKernel(int DIM, bool GRAD_PHYS)
 {
    if (GRAD_PHYS) { return GetGradKernel<Q_LAYOUT, true>(DIM); }
    else { return GetGradKernel<Q_LAYOUT, false>(DIM); }
 }
 
 template<QVectorLayout Q_LAYOUT, bool GRAD_PHYS>
-auto GetCollocatedGradKernel(int DIM)
+CollocatedGradKernel GetCollocatedGradKernel(int DIM)
 {
-   if (DIM == 1)
-   {
-      return CollocatedDerivatives1D<Q_LAYOUT, GRAD_PHYS>;
-   }
-   else if (DIM == 2)
-   {
-      return CollocatedDerivatives2D<Q_LAYOUT, GRAD_PHYS>;
-   }
-   else if (DIM == 3)
-   {
-      return CollocatedDerivatives3D<Q_LAYOUT, GRAD_PHYS>;
-   }
-   MFEM_ABORT("");
+   if (DIM == 1) { return CollocatedDerivatives1D<Q_LAYOUT, GRAD_PHYS>; }
+   else if (DIM == 2) { return CollocatedDerivatives2D<Q_LAYOUT, GRAD_PHYS>; }
+   else if (DIM == 3) { return CollocatedDerivatives3D<Q_LAYOUT, GRAD_PHYS>; }
+   else { MFEM_ABORT(""); }
 }
 
-template <QVectorLayout Q_LAYOUT>
-auto GetCollocatedGradKernel(int DIM, bool GRAD_PHYS)
+template<QVectorLayout Q_LAYOUT>
+CollocatedGradKernel GetCollocatedGradKernel(int DIM, bool GRAD_PHYS)
 {
    if (GRAD_PHYS) { return GetCollocatedGradKernel<Q_LAYOUT, true>(DIM); }
    else { return GetCollocatedGradKernel<Q_LAYOUT, false>(DIM); }
 }
-
-auto GetCollocatedGradKernel(int DIM, bool GRAD_PHYS, QVectorLayout Q_LAYOUT)
-{
-   if (Q_LAYOUT == QVectorLayout::byNODES)
-   {
-      return GetCollocatedGradKernel<QVectorLayout::byNODES>(
-                DIM, GRAD_PHYS);
-   }
-   else
-   {
-      return GetCollocatedGradKernel<QVectorLayout::byVDIM>(
-                DIM, GRAD_PHYS);
-   }
-}
 } // namespace
 
-template <int DIM, bool Integral>
-auto GetEvalKernelVDimFallback(int VDIM)
+template <int DIM, int VDIM, int ND, int NQ>
+EvalKernel QuadratureInterpolator::EvalKernels::Kernel()
 {
-   if constexpr (Integral)
-   {
-      using EvalKernels = QuadratureInterpolator::IntEvalKernels;
-      if (VDIM == 1)
-      {
-         return EvalKernels::Kernel<DIM, 1, 0, 0>();
-      }
-      else if (VDIM == 2)
-      {
-         return EvalKernels::Kernel<DIM, 2, 0, 0>();
-      }
-      else if (VDIM == 3)
-      {
-         return EvalKernels::Kernel<DIM, 3, 0, 0>();
-      }
-   }
-   if constexpr (!Integral)
-   {
-      using EvalKernels = QuadratureInterpolator::EvalKernels;
-      if (VDIM == 1)
-      {
-         return EvalKernels::Kernel<DIM, 1, 0, 0>();
-      }
-      else if (VDIM == 2)
-      {
-         return EvalKernels::Kernel<DIM, 2, 0, 0>();
-      }
-      else if (VDIM == 3)
-      {
-         return EvalKernels::Kernel<DIM, 3, 0, 0>();
-      }
-   }
+   using namespace internal::quadrature_interpolator;
+   if constexpr (DIM == 1) { return Eval1D; }
+   else if constexpr (DIM == 2) { return Eval2D<VDIM,ND,NQ>; }
+   else if constexpr (DIM == 3) { return Eval3D<VDIM,ND,NQ>; }
    MFEM_ABORT("");
 }
 
-template auto GetEvalKernelVDimFallback<1, true>(int VDIM);
-template auto GetEvalKernelVDimFallback<1, false>(int VDIM);
-template auto GetEvalKernelVDimFallback<2, true>(int VDIM);
-template auto GetEvalKernelVDimFallback<2, false>(int VDIM);
-template auto GetEvalKernelVDimFallback<3, true>(int VDIM);
-template auto GetEvalKernelVDimFallback<3, false>(int VDIM);
-
-QuadratureInterpolator::IntEvalKernelType
-QuadratureInterpolator::IntEvalKernels::Fallback(int DIM, int VDIM, int ND,
-                                                 int NQ)
+template <int DIM>
+EvalKernel GetEvalKernelVDimFallback(int VDIM)
 {
-   if (DIM == 1)
-   {
-      return GetEvalKernelVDimFallback<1, true>(VDIM);
-   }
-   else if (DIM == 2)
-   {
-      return GetEvalKernelVDimFallback<2, true>(VDIM);
-   }
-   else if (DIM == 3)
-   {
-      return GetEvalKernelVDimFallback<3, true>(VDIM);
-   }
-   else
-   {
-      MFEM_ABORT("");
-   }
+   using EvalKernels = QuadratureInterpolator::EvalKernels;
+   if (VDIM == 1) { return EvalKernels::Kernel<DIM,1,0,0>(); }
+   else if (VDIM == 2) { return EvalKernels::Kernel<DIM,2,0,0>(); }
+   else if (VDIM == 3) { return EvalKernels::Kernel<DIM,3,0,0>(); }
+   else { MFEM_ABORT(""); }
 }
 
-QuadratureInterpolator::EvalKernelType
-QuadratureInterpolator::EvalKernels::Fallback(int DIM, int VDIM, int ND, int NQ)
+EvalKernel QuadratureInterpolator::EvalKernels::Fallback(
+   int DIM, int VDIM, int ND, int NQ)
 {
-   if (DIM == 1)
-   {
-      return GetEvalKernelVDimFallback<1, false>(VDIM);
-   }
-   else if (DIM == 2)
-   {
-      return GetEvalKernelVDimFallback<2, false>(VDIM);
-   }
-   else if (DIM == 3)
-   {
-      return GetEvalKernelVDimFallback<3, false>(VDIM);
-   }
-   else
-   {
-      MFEM_ABORT("");
-   }
+   if (DIM == 1) { return GetEvalKernelVDimFallback<1>(VDIM); }
+   else if (DIM == 2) { return GetEvalKernelVDimFallback<2>(VDIM); }
+   else if (DIM == 3) { return GetEvalKernelVDimFallback<3>(VDIM); }
+   else { MFEM_ABORT(""); }
 }
 
-QuadratureInterpolator::IntTensorEvalKernelType
-QuadratureInterpolator::IntTensorEvalKernels::Fallback(int DIM,
-                                                       QVectorLayout Q_LAYOUT,
-                                                       int, int, int)
+TensorEvalKernel QuadratureInterpolator::TensorEvalKernels::Fallback(
+   int DIM, QVectorLayout Q_LAYOUT, int, int, int)
 {
-   if (Q_LAYOUT == QVectorLayout::byNODES)
-   {
-      return IntFallbackTensorEvalKernel<QVectorLayout::byNODES>(DIM);
-   }
-   else
-   {
-      return IntFallbackTensorEvalKernel<QVectorLayout::byVDIM>(DIM);
-   }
+   if (Q_LAYOUT == QVectorLayout::byNODES) { return FallbackTensorEvalKernel<QVectorLayout::byNODES>(DIM); }
+   else { return FallbackTensorEvalKernel<QVectorLayout::byVDIM>(DIM); }
 }
 
-QuadratureInterpolator::TensorEvalKernelType
-QuadratureInterpolator::TensorEvalKernels::Fallback(int DIM,
-                                                    QVectorLayout Q_LAYOUT, int,
-                                                    int, int)
-{
-   if (Q_LAYOUT == QVectorLayout::byNODES)
-   {
-      return FallbackTensorEvalKernel<QVectorLayout::byNODES>(DIM);
-   }
-   else
-   {
-      return FallbackTensorEvalKernel<QVectorLayout::byVDIM>(DIM);
-   }
-}
-
-QuadratureInterpolator::GradKernelType
-QuadratureInterpolator::GradKernels::Fallback(int DIM, QVectorLayout Q_LAYOUT,
-                                              bool GRAD_PHYS, int, int, int)
+GradKernel QuadratureInterpolator::GradKernels::Fallback(
+   int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int, int, int)
 {
    if (Q_LAYOUT == QVectorLayout::byNODES) { return GetGradKernel<QVectorLayout::byNODES>(DIM, GRAD_PHYS); }
    else { return GetGradKernel<QVectorLayout::byVDIM>(DIM, GRAD_PHYS); }
 }
 
-QuadratureInterpolator::CollocatedGradKernelType
-QuadratureInterpolator::CollocatedGradKernels::Fallback(int DIM,
-                                                        QVectorLayout Q_LAYOUT,
-                                                        bool GRAD_PHYS, int,
-                                                        int)
+CollocatedGradKernel QuadratureInterpolator::CollocatedGradKernels::Fallback(
+   int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int, int)
 {
-   return GetCollocatedGradKernel(DIM, GRAD_PHYS, Q_LAYOUT);
+   if (Q_LAYOUT == QVectorLayout::byNODES) { return GetCollocatedGradKernel<QVectorLayout::byNODES>(DIM, GRAD_PHYS); }
+   else { return GetCollocatedGradKernel<QVectorLayout::byVDIM>(DIM, GRAD_PHYS); }
 }
 
 /// @endcond
@@ -687,97 +806,98 @@ namespace quadrature_interpolator
 {
 void InitEvalKernels()
 {
+   using k = QuadratureInterpolator::EvalKernels;
    // 2D, VDIM = 1
-   QuadratureInterpolator::AddEvalSpecializations<2,1,1,1>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,1,4>();
+   k::Specialization<2,1,1,1>::Add();
+   k::Specialization<2,1,1,4>::Add();
    // Q1
-   QuadratureInterpolator::AddEvalSpecializations<2,1,4,4>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,4,9>();
+   k::Specialization<2,1,4,4>::Add();
+   k::Specialization<2,1,4,9>::Add();
    // Q2
-   QuadratureInterpolator::AddEvalSpecializations<2,1,9,9>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,9,16>();
+   k::Specialization<2,1,9,9>::Add();
+   k::Specialization<2,1,9,16>::Add();
    // Q3
-   QuadratureInterpolator::AddEvalSpecializations<2,1,16,16>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,16,25>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,16,36>();
+   k::Specialization<2,1,16,16>::Add();
+   k::Specialization<2,1,16,25>::Add();
+   k::Specialization<2,1,16,36>::Add();
    // Q4
-   QuadratureInterpolator::AddEvalSpecializations<2,1,25,25>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,25,36>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,25,49>();
-   QuadratureInterpolator::AddEvalSpecializations<2,1,25,64>();
+   k::Specialization<2,1,25,25>::Add();
+   k::Specialization<2,1,25,36>::Add();
+   k::Specialization<2,1,25,49>::Add();
+   k::Specialization<2,1,25,64>::Add();
 
    // 3D, VDIM = 1
    // Q0
-   QuadratureInterpolator::AddEvalSpecializations<3,1,1,1>();
-   QuadratureInterpolator::AddEvalSpecializations<3,1,1,8>();
+   k::Specialization<3,1,1,1>::Add();
+   k::Specialization<3,1,1,8>::Add();
    // Q1
-   QuadratureInterpolator::AddEvalSpecializations<3,1,8,8>();
-   QuadratureInterpolator::AddEvalSpecializations<3,1,8,27>();
+   k::Specialization<3,1,8,8>::Add();
+   k::Specialization<3,1,8,27>::Add();
    // Q2
-   QuadratureInterpolator::AddEvalSpecializations<3,1,27,27>();
-   QuadratureInterpolator::AddEvalSpecializations<3,1,27,64>();
+   k::Specialization<3,1,27,27>::Add();
+   k::Specialization<3,1,27,64>::Add();
    // Q3
-   QuadratureInterpolator::AddEvalSpecializations<3,1,64,64>();
-   QuadratureInterpolator::AddEvalSpecializations<3,1,64,125>();
-   QuadratureInterpolator::AddEvalSpecializations<3,1,64,216>();
+   k::Specialization<3,1,64,64>::Add();
+   k::Specialization<3,1,64,125>::Add();
+   k::Specialization<3,1,64,216>::Add();
    // Q4
-   QuadratureInterpolator::AddEvalSpecializations<3,1,125,125>();
-   QuadratureInterpolator::AddEvalSpecializations<3,1,125,216>();
+   k::Specialization<3,1,125,125>::Add();
+   k::Specialization<3,1,125,216>::Add();
 
    // 2D, VDIM = 3
    // Q0
-   QuadratureInterpolator::AddEvalSpecializations<2,3,1,1>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,1,4>();
+   k::Specialization<2,3,1,1>::Add();
+   k::Specialization<2,3,1,4>::Add();
    // Q1
-   QuadratureInterpolator::AddEvalSpecializations<2,3,4,4>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,4,9>();
+   k::Specialization<2,3,4,4>::Add();
+   k::Specialization<2,3,4,9>::Add();
    // Q2
-   QuadratureInterpolator::AddEvalSpecializations<2,3,9,4>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,9,9>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,9,16>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,9,25>();
+   k::Specialization<2,3,9,4>::Add();
+   k::Specialization<2,3,9,9>::Add();
+   k::Specialization<2,3,9,16>::Add();
+   k::Specialization<2,3,9,25>::Add();
    // Q3
-   QuadratureInterpolator::AddEvalSpecializations<2,3,16,16>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,16,25>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,16,36>();
+   k::Specialization<2,3,16,16>::Add();
+   k::Specialization<2,3,16,25>::Add();
+   k::Specialization<2,3,16,36>::Add();
    // Q4
-   QuadratureInterpolator::AddEvalSpecializations<2,3,25,25>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,25,36>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,25,49>();
-   QuadratureInterpolator::AddEvalSpecializations<2,3,25,64>();
+   k::Specialization<2,3,25,25>::Add();
+   k::Specialization<2,3,25,36>::Add();
+   k::Specialization<2,3,25,49>::Add();
+   k::Specialization<2,3,25,64>::Add();
 
    // 2D, VDIM = 2
    // Q1
-   QuadratureInterpolator::AddEvalSpecializations<2,2,4,4>();
-   QuadratureInterpolator::AddEvalSpecializations<2,2,4,9>();
+   k::Specialization<2,2,4,4>::Add();
+   k::Specialization<2,2,4,9>::Add();
    // Q2
-   QuadratureInterpolator::AddEvalSpecializations<2,2,9,9>();
-   QuadratureInterpolator::AddEvalSpecializations<2,2,9,16>();
+   k::Specialization<2,2,9,9>::Add();
+   k::Specialization<2,2,9,16>::Add();
    // Q3
-   QuadratureInterpolator::AddEvalSpecializations<2,2,16,16>();
-   QuadratureInterpolator::AddEvalSpecializations<2,2,16,25>();
-   QuadratureInterpolator::AddEvalSpecializations<2,2,16,36>();
+   k::Specialization<2,2,16,16>::Add();
+   k::Specialization<2,2,16,25>::Add();
+   k::Specialization<2,2,16,36>::Add();
    // Q4
-   QuadratureInterpolator::AddEvalSpecializations<2,2,25,25>();
-   QuadratureInterpolator::AddEvalSpecializations<2,2,25,36>();
-   QuadratureInterpolator::AddEvalSpecializations<2,2,25,49>();
-   QuadratureInterpolator::AddEvalSpecializations<2,2,25,64>();
+   k::Specialization<2,2,25,25>::Add();
+   k::Specialization<2,2,25,36>::Add();
+   k::Specialization<2,2,25,49>::Add();
+   k::Specialization<2,2,25,64>::Add();
 
    // 3D, VDIM = 3
    // Q1
-   QuadratureInterpolator::AddEvalSpecializations<3,3,8,8>();
-   QuadratureInterpolator::AddEvalSpecializations<3,3,8,27>();
+   k::Specialization<3,3,8,8>::Add();
+   k::Specialization<3,3,8,27>::Add();
    // Q2
-   QuadratureInterpolator::AddEvalSpecializations<3,3,27,27>();
-   QuadratureInterpolator::AddEvalSpecializations<3,3,27,64>();
-   QuadratureInterpolator::AddEvalSpecializations<3,3,27,125>();
+   k::Specialization<3,3,27,27>::Add();
+   k::Specialization<3,3,27,64>::Add();
+   k::Specialization<3,3,27,125>::Add();
    // Q3
-   QuadratureInterpolator::AddEvalSpecializations<3,3,64,64>();
-   QuadratureInterpolator::AddEvalSpecializations<3,3,64,125>();
-   QuadratureInterpolator::AddEvalSpecializations<3,3,64,216>();
+   k::Specialization<3,3,64,64>::Add();
+   k::Specialization<3,3,64,125>::Add();
+   k::Specialization<3,3,64,216>::Add();
    // Q4
-   QuadratureInterpolator::AddEvalSpecializations<3,3,125,125>();
-   QuadratureInterpolator::AddEvalSpecializations<3,3,125,216>();
+   k::Specialization<3,3,125,125>::Add();
+   k::Specialization<3,3,125,216>::Add();
 }
 
 } // namespace quadrature_Interpolator

fem/quadinterpolator.hpp

@@ -159,49 +159,26 @@ public:
    /// QuadratureInterpolator.
    static bool SupportsFESpace(const FiniteElementSpace &fespace);
 
-   // value map types
-   using TensorEvalKernelType = void (*)(const int ne, const real_t *B,
-                                         const real_t *e_vec, real_t *q_val,
-                                         const int vdim, const int nd,
-                                         const int nq);
-   using GradKernelType = void (*)(const int ne, const real_t *B,
-                                   const real_t *G, const real_t *J,
-                                   const real_t *e_vec, real_t *q_der,
-                                   const int s_dim, const int v_dim,
-                                   const int nd, const int nq);
-   using CollocatedGradKernelType = void (*)(const int ne, const real_t *G,
-                                             const real_t *J,
-                                             const real_t *e_vec, real_t *q_der,
-                                             const int sdim, const int vdim,
-                                             const int d1d);
-   using DetKernelType = void (*)(const int NE, const real_t *B,
-                                  const real_t *G, const real_t *e_vec,
-                                  real_t *q_det, const int nd, const int nq,
-                                  Vector *d_buffer);
-   using EvalKernelType = void (*)(const int NE, const int vdim,
-                                   const QVectorLayout q_layout,
-                                   const GeometricFactors *geom,
-                                   const DofToQuad &maps, const Vector &e_vec,
-                                   Vector &q_val, Vector &q_der, Vector &q_det,
-                                   const int eval_flags);
-
-   // integral map types
-   using IntTensorEvalKernelType = void (*)(const int ne, const real_t *B,
-                                            const real_t *detJ,
-                                            const real_t *e_vec, real_t *q_val,
-                                            const int vdim, const int nd,
-                                            const int nq);
-   using IntEvalKernelType =
-      void (*)(const int NE, const int vdim, const QVectorLayout q_layout,
-               const real_t *detJ, const GeometricFactors *geom,
-               const DofToQuad &maps, const Vector &e_vec, Vector &q_val,
-               Vector &q_der, Vector &q_det, const int eval_flags);
-
+   using TensorEvalKernelType = void(*)(const int, const real_t *, const real_t *,
+                                        real_t *, const int, const int, const int);
+   using GradKernelType = void(*)(const int, const real_t *, const real_t *,
+                                  const real_t *, const real_t *, real_t *,
+                                  const int, const int, const int, const int);
+   using CollocatedGradKernelType = void(*)(const int, const real_t *,
+                                            const real_t *, const real_t *,
+                                            real_t *, const int, const int,
+                                            const int);
+   using DetKernelType = void(*)(const int NE, const real_t *, const real_t *,
+                                 const real_t *, real_t *, const int, const int,
+                                 Vector *);
+   using EvalKernelType = void(*)(const int, const int, const QVectorLayout,
+                                  const GeometricFactors *, const DofToQuad &,
+                                  const Vector &, Vector &, Vector &, Vector &,
+                                  const int);
    using TensorEvalHDivKernelType =
       void(*)(const int, const real_t *, const real_t *, const real_t *,
               const real_t *, real_t *, const int, const int);
 
-   // value-type mapping
    MFEM_REGISTER_KERNELS(TensorEvalKernels, TensorEvalKernelType,
                          (int, QVectorLayout, int, int, int), (int));
    MFEM_REGISTER_KERNELS(GradKernels, GradKernelType,
@@ -210,84 +187,8 @@ public:
    MFEM_REGISTER_KERNELS(EvalKernels, EvalKernelType, (int, int, int, int));
    MFEM_REGISTER_KERNELS(CollocatedGradKernels, CollocatedGradKernelType,
                          (int, QVectorLayout, bool, int, int), (int));
-
-   // integral-type mapping
-   MFEM_REGISTER_KERNELS(IntTensorEvalKernels, IntTensorEvalKernelType,
-                         (int, QVectorLayout, int, int, int), (int));
-   MFEM_REGISTER_KERNELS(IntEvalKernels, IntEvalKernelType, (int, int, int, int));
-
    MFEM_REGISTER_KERNELS(TensorEvalHDivKernels, TensorEvalHDivKernelType,
                          (int, QVectorLayout, unsigned, int, int));
-
-   /// Adds specializations for TensorEvalKernels
-   template <int DIM, QVectorLayout Q_LAYOUT, int VDIM, int D1D, int Q1D,
-             int NBZ = 0>
-   static void AddTensorEvalSpecializations()
-   {
-      if constexpr (NBZ)
-      {
-         IntTensorEvalKernels::Specialization<DIM, Q_LAYOUT, VDIM, D1D,
-                              Q1D>::template Opt<NBZ>::Add();
-         TensorEvalKernels::Specialization<DIM, Q_LAYOUT, VDIM, D1D,
-                           Q1D>::template Opt<NBZ>::Add();
-      }
-      else if constexpr (NBZ == 0)
-      {
-         IntTensorEvalKernels::Specialization<DIM, Q_LAYOUT, VDIM, D1D,
-                              Q1D>::Add();
-         TensorEvalKernels::Specialization<DIM, Q_LAYOUT, VDIM, D1D,
-                           Q1D>::Add();
-      }
-   }
-
-   /// Adds specializations for EvalKernels
-   template <int DIM, int VDIM, int ND, int NQ>
-   static void AddEvalSpecializations()
-   {
-      IntEvalKernels::Specialization<DIM, VDIM, ND, NQ>::Add();
-      EvalKernels::Specialization<DIM, VDIM, ND, NQ>::Add();
-   }
-
-   /// Adds specializations for GradKernels
-   template <int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int VDIM, int D1D,
-             int Q1D, int NBZ = 0>
-   static void AddGradSpecializations()
-   {
-      if constexpr (NBZ)
-      {
-         GradKernels::Specialization<DIM, Q_LAYOUT, GRAD_PHYS, VDIM, D1D,
-                     Q1D>::template Opt<NBZ>::Add();
-      }
-      else if constexpr (NBZ == 0)
-      {
-         GradKernels::Specialization<DIM, Q_LAYOUT, GRAD_PHYS, VDIM, D1D,
-                     Q1D>::Add();
-      }
-   }
-
-   /// Adds specializations for CollocatedGradKernels
-   template <int DIM, QVectorLayout Q_LAYOUT, bool GRAD_PHYS, int VDIM, int D1D,
-             int NBZ = 0>
-   static void AddCollocatedGradSpecializations()
-   {
-      if constexpr (NBZ)
-      {
-         CollocatedGradKernels::Specialization<DIM, Q_LAYOUT, GRAD_PHYS, VDIM,
-                               D1D>::template Opt<NBZ>::Add();
-      }
-      else if constexpr (NBZ == 0)
-      {
-         CollocatedGradKernels::Specialization<DIM, Q_LAYOUT, GRAD_PHYS, VDIM,
-                               D1D>::Add();
-      }
-   }
-
-   /// Adds specializations for DetKernels
-   template <int DIM, int SDIM, int D1D, int Q1D>
-   static void AddDetSpecializations()
-   {
-      DetKernels::Specialization<DIM, SDIM, D1D, Q1D>::Add();
-   }
 };
 
 }

fem/transfer.cpp

@@ -1030,12 +1030,42 @@ void L2ProjectionGridTransfer::L2ProjectionL2Space::EAProlongateTranspose(
    BatchedLinAlg::MultTranspose(P_dt, x, y);
 }
 
+L2ProjectionGridTransfer::L2ProjectionH1Space::H1ConsistentMassOperator::
+H1ConsistentMassOperator(const Operator &M_LH_, const Solver &M_L_solver_)
+   : Operator(M_LH_.Height(), M_LH_.Width()),
+     M_LH(M_LH_),
+     M_L_solver(M_L_solver_)
+{
+   MFEM_VERIFY(M_LH.Height() == M_L_solver.Height() &&
+               M_LH.Height() == M_L_solver.Width(),
+               "incompatible consistent mass operator dimensions");
+}
+
+void L2ProjectionGridTransfer::L2ProjectionH1Space::H1ConsistentMassOperator::
+Mult(const Vector &x, Vector &y) const
+{
+   Vector tmp(M_LH.Height());
+   M_LH.Mult(x, tmp);
+   M_L_solver.Mult(tmp, y);
+}
+
+void L2ProjectionGridTransfer::L2ProjectionH1Space::H1ConsistentMassOperator::
+MultTranspose(const Vector &x, Vector &y) const
+{
+   Vector tmp(M_LH.Height());
+   M_L_solver.Mult(x, tmp);
+   M_LH.MultTranspose(tmp, y);
+}
+
 L2ProjectionGridTransfer::L2ProjectionH1Space::L2ProjectionH1Space(
    const FiniteElementSpace& fes_ho_, const FiniteElementSpace& fes_lor_,
-   const bool use_ea_, MemoryType d_mt_)
+   const bool use_ea_, const bool use_consistent_mass_, MemoryType d_mt_)
    : L2Projection(fes_ho_, fes_lor_, d_mt_),
-     use_ea(use_ea_)
+     use_ea(use_ea_),
+     use_consistent_mass(use_consistent_mass_)
 {
+   MFEM_VERIFY(!(use_ea && use_consistent_mass),
+               "consistent mass is not supported with element assembly");
 
    // need scalar to keep dimensions matching (operators are built to apply
    // individually on each vdim)
@@ -1053,7 +1083,7 @@ L2ProjectionGridTransfer::L2ProjectionH1Space::L2ProjectionH1Space(
 
    std::unique_ptr<SparseMatrix> R_mat, M_LH_mat;
 
-   std::tie(R_mat, M_LH_mat) = ComputeSparseRAndM_LH();
+   std::tie(R_mat, M_LH_mat) = ComputeSparseRAndM_LH(!use_consistent_mass);
 
    const SparseMatrix *P_ho = fes_ho_scalar->GetConformingProlongation();
    const SparseMatrix *P_lor = fes_lor_scalar->GetConformingProlongation();
@@ -1062,40 +1092,71 @@ L2ProjectionGridTransfer::L2ProjectionH1Space::L2ProjectionH1Space(
    {
       if (P_ho && P_lor)
       {
-         R_mat.reset(RAP(*P_lor, *R_mat, *P_ho));
+         if (R_mat) { R_mat.reset(RAP(*P_lor, *R_mat, *P_ho)); }
          M_LH_mat.reset(RAP(*P_lor, *M_LH_mat, *P_ho));
       }
       else if (P_ho)
       {
-         R_mat.reset(mfem::Mult(*R_mat, *P_ho));
+         if (R_mat) { R_mat.reset(mfem::Mult(*R_mat, *P_ho)); }
          M_LH_mat.reset(mfem::Mult(*M_LH_mat, *P_ho));
       }
       else // P_lor != nullptr
       {
-         R_mat.reset(mfem::Mult(*P_lor, *R_mat));
+         if (R_mat) { R_mat.reset(mfem::Mult(*P_lor, *R_mat)); }
          M_LH_mat.reset(mfem::Mult(*P_lor, *M_LH_mat));
       }
    }
 
-   SparseMatrix *RTxM_LH_mat = TransposeMult(*R_mat, *M_LH_mat);
-   precon.reset(new DSmoother(*RTxM_LH_mat));
+   if (use_consistent_mass)
+   {
+      BilinearForm M_lor(fes_lor_scalar.get());
+      M_lor.AddDomainIntegrator(new MassIntegrator);
+      M_lor.Assemble();
+      M_lor.Finalize();
+      SparseMatrix *M_L_mat = M_lor.LoseMat();
 
-   // Set ownership
-   RTxM_LH.reset(RTxM_LH_mat);
-   R = std::move(R_mat);
-   M_LH = std::move(M_LH_mat);
+      ML_precon.reset(new DSmoother(*M_L_mat));
+      ML_pcg.SetPrintLevel(0);
+      ML_pcg.SetMaxIter(1000);
+      ML_pcg.SetRelTol(1e-13);
+      ML_pcg.SetAbsTol(1e-13);
+      ML_pcg.SetPreconditioner(*ML_precon);
+      ML_pcg.SetOperator(*M_L_mat);
+      // Start each solve from zero so repeated Operator::Mult() calls do not
+      // depend on the output vector contents supplied by the caller.
+      ML_pcg.iterative_mode = false;
 
-   SetupPCG();
+      M_L.reset(M_L_mat);
+      M_LH = std::move(M_LH_mat);
+      R.reset(new H1ConsistentMassOperator(*M_LH, ML_pcg));
+   }
+   else
+   {
+      SparseMatrix *RTxM_LH_mat = TransposeMult(*R_mat, *M_LH_mat);
+      precon.reset(new DSmoother(*RTxM_LH_mat));
+
+      // Set ownership
+      RTxM_LH.reset(RTxM_LH_mat);
+      R = std::move(R_mat);
+      M_LH = std::move(M_LH_mat);
+
+      SetupPCG();
+   }
 }
 
 #ifdef MFEM_USE_MPI
 
 L2ProjectionGridTransfer::L2ProjectionH1Space::L2ProjectionH1Space(
    const ParFiniteElementSpace& pfes_ho, const ParFiniteElementSpace& pfes_lor,
-   const bool use_ea_, MemoryType d_mt_)
+   const bool use_ea_, const bool use_consistent_mass_, MemoryType d_mt_)
    : L2Projection(pfes_ho, pfes_lor, d_mt_),
-     use_ea(use_ea_), pcg(pfes_ho.GetComm())
+     use_ea(use_ea_),
+     use_consistent_mass(use_consistent_mass_),
+     ML_pcg(pfes_ho.GetComm()),
+     pcg(pfes_ho.GetComm())
 {
+   MFEM_VERIFY(!(use_ea && use_consistent_mass),
+               "consistent mass is not supported with element assembly");
 
    // need scalar to keep dimensions matching (operators are built to apply
    // individually on each vdim)
@@ -1111,8 +1172,42 @@ L2ProjectionGridTransfer::L2ProjectionH1Space::L2ProjectionH1Space(
       return;
    }
 
-   std::tie(R, M_LH) = ComputeSparseRAndM_LH();
+   std::tie(R, M_LH) = ComputeSparseRAndM_LH(!use_consistent_mass);
 
+   HypreParMatrix M_LH_local = HypreParMatrix(pfes_ho.GetComm(),
+                                              pfes_lor_scalar->GlobalVSize(),
+                                              pfes_ho_scalar->GlobalVSize(),
+                                              pfes_lor_scalar->GetDofOffsets(),
+                                              pfes_ho_scalar->GetDofOffsets(),
+                                              static_cast<SparseMatrix*>(M_LH.get()));
+   HypreParMatrix *M_LH_mat = RAP(pfes_lor_scalar->Dof_TrueDof_Matrix(),
+                                  &M_LH_local, pfes_ho_scalar->Dof_TrueDof_Matrix());
+
+   if (use_consistent_mass)
+   {
+      ParBilinearForm M_lor(pfes_lor_scalar.get());
+      M_lor.AddDomainIntegrator(new MassIntegrator);
+      M_lor.Assemble();
+      M_lor.Finalize();
+      HypreParMatrix *M_L_mat = M_lor.ParallelAssemble();
+
+      M_L.reset(M_L_mat);
+      M_LH.reset(M_LH_mat);
+      HypreDiagScale *ML_hypre_precon = new HypreDiagScale(*M_L_mat);
+      HyprePCG *ML_hypre_pcg = new HyprePCG(*M_L_mat);
+      ML_hypre_pcg->SetPrintLevel(0);
+      ML_hypre_pcg->SetMaxIter(1000);
+      ML_hypre_pcg->SetTol(1e-13);
+      ML_hypre_pcg->SetAbsTol(1e-13);
+      ML_hypre_pcg->SetPreconditioner(*ML_hypre_precon);
+      // Start each solve from zero so repeated Operator::Mult() calls do not
+      // depend on the output vector contents supplied by the caller.
+      ML_hypre_pcg->SetZeroInitialIterate();
+      ML_precon.reset(ML_hypre_precon);
+      ML_solver.reset(ML_hypre_pcg);
+      R.reset(new H1ConsistentMassOperator(*M_LH, *ML_solver));
+      return;
+   }
 
    HypreParMatrix R_local = HypreParMatrix(pfes_ho.GetComm(),
                                            pfes_lor_scalar->GlobalVSize(),
@@ -1120,17 +1215,9 @@ L2ProjectionGridTransfer::L2ProjectionH1Space::L2ProjectionH1Space(
                                            pfes_lor_scalar->GetDofOffsets(),
                                            pfes_ho_scalar->GetDofOffsets(),
                                            static_cast<SparseMatrix*>(R.get()));
-   HypreParMatrix M_LH_local = HypreParMatrix(pfes_ho.GetComm(),
-                                              pfes_lor_scalar->GlobalVSize(),
-                                              pfes_ho_scalar->GlobalVSize(),
-                                              pfes_lor_scalar->GetDofOffsets(),
-                                              pfes_ho_scalar->GetDofOffsets(),
-                                              static_cast<SparseMatrix*>(M_LH.get()));
 
    HypreParMatrix *R_mat = RAP(pfes_lor_scalar->Dof_TrueDof_Matrix(),
                                &R_local, pfes_ho_scalar->Dof_TrueDof_Matrix());
-   HypreParMatrix *M_LH_mat = RAP(pfes_lor_scalar->Dof_TrueDof_Matrix(),
-                                  &M_LH_local, pfes_ho_scalar->Dof_TrueDof_Matrix());
 
    std::unique_ptr<HypreParMatrix> R_T(R_mat->Transpose());
    HypreParMatrix *RTxM_LH_mat = ParMult(R_T.get(), M_LH_mat, true);
@@ -1438,6 +1525,8 @@ void L2ProjectionGridTransfer::L2ProjectionH1Space::MultTranspose(
 void L2ProjectionGridTransfer::L2ProjectionH1Space::Prolongate(
    const Vector& x, Vector& y) const
 {
+   MFEM_VERIFY(!use_consistent_mass,
+               "BackwardOperator is not supported with consistent mass");
 
    Vector X(fes_lor.GetTrueVSize());
    Vector X_dim(M_LH->Height());
@@ -1469,6 +1558,9 @@ void L2ProjectionGridTransfer::L2ProjectionH1Space::Prolongate(
 void L2ProjectionGridTransfer::L2ProjectionH1Space::ProlongateTranspose(
    const Vector& x, Vector& y) const
 {
+   MFEM_VERIFY(!use_consistent_mass,
+               "BackwardOperator is not supported with consistent mass");
+
    Vector X(fes_ho.GetTrueVSize());
    Vector X_dim(pcg.Width());
    Vector Xbar(pcg.Height());
@@ -1499,17 +1591,34 @@ void L2ProjectionGridTransfer::L2ProjectionH1Space::ProlongateTranspose(
 void L2ProjectionGridTransfer::L2ProjectionH1Space::SetRelTol(real_t p_rtol_)
 {
    pcg.SetRelTol(p_rtol_);
+   ML_pcg.SetRelTol(p_rtol_);
+#ifdef MFEM_USE_MPI
+   if (ML_solver)
+   {
+      HyprePCG *hypre_pcg = dynamic_cast<HyprePCG*>(ML_solver.get());
+      if (hypre_pcg) { hypre_pcg->SetTol(p_rtol_); }
+   }
+#endif
 }
 
 void L2ProjectionGridTransfer::L2ProjectionH1Space::SetAbsTol(real_t p_atol_)
 {
    pcg.SetAbsTol(p_atol_);
+   ML_pcg.SetAbsTol(p_atol_);
+#ifdef MFEM_USE_MPI
+   if (ML_solver)
+   {
+      HyprePCG *hypre_pcg = dynamic_cast<HyprePCG*>(ML_solver.get());
+      if (hypre_pcg) { hypre_pcg->SetAbsTol(p_atol_); }
+   }
+#endif
 }
 
 std::pair<
 std::unique_ptr<SparseMatrix>,
 std::unique_ptr<SparseMatrix>>
-                            L2ProjectionGridTransfer::L2ProjectionH1Space::ComputeSparseRAndM_LH()
+                            L2ProjectionGridTransfer::L2ProjectionH1Space::ComputeSparseRAndM_LH(
+                               bool build_R)
 {
    std::pair<std::unique_ptr<SparseMatrix>,
        std::unique_ptr<SparseMatrix>> r_and_mlh;
@@ -1523,10 +1632,10 @@ std::unique_ptr<SparseMatrix>>
    // If the local mesh is empty, skip all computations
    if (nel_ho == 0)
    {
-      return std::make_pair(
-                std::unique_ptr<SparseMatrix>(new SparseMatrix),
-                std::unique_ptr<SparseMatrix>(new SparseMatrix)
-             );
+      std::unique_ptr<SparseMatrix> R_empty;
+      if (build_R) { R_empty.reset(new SparseMatrix); }
+      std::unique_ptr<SparseMatrix> M_LH_empty(new SparseMatrix);
+      return std::make_pair(std::move(R_empty), std::move(M_LH_empty));
    }
 
    const CoarseFineTransformations& cf_tr = mesh_lor->GetRefinementTransforms();
@@ -1542,69 +1651,76 @@ std::unique_ptr<SparseMatrix>>
 
    BuildHo2Lor(nel_ho, nel_lor, cf_tr);
 
-   // ML_inv contains the inverse lumped (row sum) mass matrix. Note that the
-   // method will also work with a full (consistent) mass matrix, though this is
-   // not implemented here. L refers to the low-order refined mesh
    Vector ML_inv(ndof_lor);
-   ML_inv = 0.0;
-
-   // Compute ML_inv
-   for (int iho = 0; iho < nel_ho; ++iho)
+   if (build_R)
    {
-      Array<int> lor_els;
-      ho2lor.GetRow(iho, lor_els);
-      int nref = ho2lor.RowSize(iho);
+      // ML_inv contains the inverse lumped (row sum) mass matrix. L refers to
+      // the low-order refined mesh.
+      ML_inv = 0.0;
 
-      Geometry::Type geom = mesh_ho->GetElementBaseGeometry(iho);
-      const FiniteElement& fe_lor = *fes_lor.GetFE(lor_els[0]);
-      int nedof_lor = fe_lor.GetDof();
-
-      // Instead of using a MassIntegrator, manually loop over integration
-      // points so we can row sum and store the diagonal as a Vector.
-      Vector ML_el(nedof_lor);
-      Vector shape_lor(nedof_lor);
-      Array<int> dofs_lor(nedof_lor);
-
-      for (int iref = 0; iref < nref; ++iref)
+      // Compute ML_inv
+      for (int iho = 0; iho < nel_ho; ++iho)
       {
-         int ilor = lor_els[iref];
-         ElementTransformation* el_tr = fes_lor.GetElementTransformation(ilor);
+         Array<int> lor_els;
+         ho2lor.GetRow(iho, lor_els);
+         int nref = ho2lor.RowSize(iho);
 
-         int order = 2 * fe_lor.GetOrder() + el_tr->OrderW();
-         const IntegrationRule* ir = &IntRules.Get(geom, order);
-         ML_el = 0.0;
-         for (int i = 0; i < ir->GetNPoints(); ++i)
+         Geometry::Type geom = mesh_ho->GetElementBaseGeometry(iho);
+         const FiniteElement& fe_lor = *fes_lor.GetFE(lor_els[0]);
+         int nedof_lor = fe_lor.GetDof();
+
+         // Instead of using a MassIntegrator, manually loop over integration
+         // points so we can row sum and store the diagonal as a Vector.
+         Vector ML_el(nedof_lor);
+         Vector shape_lor(nedof_lor);
+         Array<int> dofs_lor(nedof_lor);
+
+         for (int iref = 0; iref < nref; ++iref)
          {
-            const IntegrationPoint& ip_lor = ir->IntPoint(i);
-            fe_lor.CalcShape(ip_lor, shape_lor);
-            el_tr->SetIntPoint(&ip_lor);
-            ML_el += (shape_lor *= (el_tr->Weight() * ip_lor.weight));
+            int ilor = lor_els[iref];
+            ElementTransformation* el_tr = fes_lor.GetElementTransformation(ilor);
+
+            int order = 2 * fe_lor.GetOrder() + el_tr->OrderW();
+            const IntegrationRule* ir = &IntRules.Get(geom, order);
+            ML_el = 0.0;
+            for (int i = 0; i < ir->GetNPoints(); ++i)
+            {
+               const IntegrationPoint& ip_lor = ir->IntPoint(i);
+               fe_lor.CalcShape(ip_lor, shape_lor);
+               el_tr->SetIntPoint(&ip_lor);
+               ML_el += (shape_lor *= (el_tr->Weight() * ip_lor.weight));
+            }
+            fes_lor.GetElementDofs(ilor, dofs_lor);
+            ML_inv.AddElementVector(dofs_lor, ML_el);
          }
-         fes_lor.GetElementDofs(ilor, dofs_lor);
-         ML_inv.AddElementVector(dofs_lor, ML_el);
       }
+      // DOF by DOF inverse of non-zero entries
+      LumpedMassInverse(ML_inv);
    }
-   // DOF by DOF inverse of non-zero entries
-   LumpedMassInverse(ML_inv);
 
    // Compute sparsity pattern for R = M_L^(-1) M_LH and allocate
-   r_and_mlh.first = AllocR();
+   std::unique_ptr<SparseMatrix> pattern = AllocR();
+   if (build_R)
+   {
+      r_and_mlh.first = std::move(pattern);
+   }
    // Allocate M_LH (same sparsity pattern as R)
    // L refers to the low-order refined mesh (DOFs correspond to rows)
    // H refers to the higher-order mesh (DOFs correspond to columns)
-   Memory<int> I(r_and_mlh.first->Height() + 1);
-   for (int icol = 0; icol < r_and_mlh.first->Height() + 1; ++icol)
+   SparseMatrix &pattern_mat = build_R ? *r_and_mlh.first : *pattern;
+   Memory<int> I(pattern_mat.Height() + 1);
+   for (int icol = 0; icol < pattern_mat.Height() + 1; ++icol)
    {
-      I[icol] = r_and_mlh.first->GetI()[icol];
+      I[icol] = pattern_mat.GetI()[icol];
    }
-   Memory<int> J(r_and_mlh.first->NumNonZeroElems());
-   for (int jcol = 0; jcol < r_and_mlh.first->NumNonZeroElems(); ++jcol)
+   Memory<int> J(pattern_mat.NumNonZeroElems());
+   for (int jcol = 0; jcol < pattern_mat.NumNonZeroElems(); ++jcol)
    {
-      J[jcol] = r_and_mlh.first->GetJ()[jcol];
+      J[jcol] = pattern_mat.GetJ()[jcol];
    }
    r_and_mlh.second = std::unique_ptr<SparseMatrix>(
-                         new SparseMatrix(I, J, NULL, r_and_mlh.first->Height(),
-                                          r_and_mlh.first->Width(), true, true, true));
+                         new SparseMatrix(I, J, NULL, pattern_mat.Height(),
+                                          pattern_mat.Width(), true, true, true));
 
    IntegrationPointTransformation ip_tr;
    IsoparametricTransformation& emb_tr = ip_tr.Transf;
@@ -1647,15 +1763,21 @@ std::unique_ptr<SparseMatrix>>
          Array<int> dofs_lor(nedof_lor);
          fes_lor.GetElementDofs(ilor, dofs_lor);
          Vector R_row;
-         for (int i = 0; i < nedof_lor; ++i)
+         if (build_R)
          {
-            M_LH_el.GetRow(i, R_row);
-            R_el.SetRow(i, R_row.Set(ML_inv[dofs_lor[i]], R_row));
+            for (int i = 0; i < nedof_lor; ++i)
+            {
+               M_LH_el.GetRow(i, R_row);
+               R_el.SetRow(i, R_row.Set(ML_inv[dofs_lor[i]], R_row));
+            }
          }
          Array<int> dofs_ho(nedof_ho);
          fes_ho.GetElementDofs(iho, dofs_ho);
          r_and_mlh.second->AddSubMatrix(dofs_lor, dofs_ho, M_LH_el);
-         r_and_mlh.first->AddSubMatrix(dofs_lor, dofs_ho, R_el);
+         if (build_R)
+         {
+            r_and_mlh.first->AddSubMatrix(dofs_lor, dofs_ho, R_el);
+         }
 
       }
    }
@@ -2009,6 +2131,8 @@ const Operator &L2ProjectionGridTransfer::ForwardOperator()
 
 const Operator &L2ProjectionGridTransfer::BackwardOperator()
 {
+   MFEM_VERIFY(!UsesH1ConsistentMass(),
+               "BackwardOperator is not supported with consistent mass");
    if (!B)
    {
       if (!F) { BuildF(); }
@@ -2017,15 +2141,30 @@ const Operator &L2ProjectionGridTransfer::BackwardOperator()
    return *B;
 }
 
+void L2ProjectionGridTransfer::UseConsistentMass(bool use_consistent_mass_)
+{
+   MFEM_VERIFY(!F && !B,
+               "UseConsistentMass must be called before constructing operators");
+   use_consistent_mass = use_consistent_mass_;
+}
+
+bool L2ProjectionGridTransfer::UsesH1ConsistentMass() const
+{
+   return use_consistent_mass && !force_l2_space &&
+          dom_fes.FEColl()->GetContType() == FiniteElementCollection::CONTINUOUS;
+}
+
 void L2ProjectionGridTransfer::BuildF()
 {
    if (!force_l2_space &&
        dom_fes.FEColl()->GetContType() == FiniteElementCollection::CONTINUOUS)
    {
+      MFEM_VERIFY(!(use_ea && use_consistent_mass),
+                  "consistent mass is not supported with element assembly");
       if (!Parallel())
       {
          F = new L2ProjectionH1Space(dom_fes, ran_fes,
-                                     use_ea, d_mt);
+                                     use_ea, use_consistent_mass, d_mt);
       }
       else
       {
@@ -2035,7 +2174,7 @@ void L2ProjectionGridTransfer::BuildF()
          const mfem::ParFiniteElementSpace& ran_pfes =
             static_cast<mfem::ParFiniteElementSpace&>(ran_fes);
          F = new L2ProjectionH1Space(dom_pfes, ran_pfes,
-                                     use_ea, d_mt);
+                                     use_ea, use_consistent_mass, d_mt);
 #endif
       }
    }
@@ -2048,6 +2187,7 @@ void L2ProjectionGridTransfer::BuildF()
 
 bool L2ProjectionGridTransfer::SupportsBackwardsOperator() const
 {
+   if (UsesH1ConsistentMass()) { return false; }
    return ran_fes.GetTrueVSize() >= dom_fes.GetTrueVSize();
 }
 

fem/transfer.hpp

@@ -169,10 +169,12 @@ public:
     is the forward transfer matrix, and M_f is the mass matrix on the coarse
     element. For L2 spaces, M_f is the mass matrix on the union of all fine
     elements comprising the coarse element. For H1 spaces, M_f is a diagonal
-    (lumped) mass matrix computed through row-summation. Note that the backward
-    transfer operator, B, is a left inverse of the forward transfer operator, F,
-    i.e. B F = I. Both F and B are defined in physical space and, generally for
-    L2 spaces, vary between different mesh elements.
+    (lumped) mass matrix computed through row-summation, unless
+    UseConsistentMass() is enabled for the forward H1 operator. When the
+    backward transfer operator, B, is supported, it is a left inverse of the
+    forward transfer operator, F, i.e. B F = I. Both F and B are defined in
+    physical space and, generally for L2 spaces, vary between different mesh
+    elements.
 
     This class supports H1 and L2 finite element spaces. Fine meshes are a
     uniform refinement of the coarse mesh, usually created through
@@ -352,16 +354,21 @@ public:
    class L2ProjectionH1Space : public L2Projection
    {
       const bool use_ea;
+      /// Use the consistent low-order mass matrix in non-EA H1 Mult() and
+      /// MultTranspose().
+      const bool use_consistent_mass;
 
    public:
       L2ProjectionH1Space(const FiniteElementSpace &fes_ho_,
                           const FiniteElementSpace &fes_lor_,
                           const bool use_ea_,
+                          const bool use_consistent_mass_,
                           MemoryType d_mt_ = Device::GetHostMemoryType());
 #ifdef MFEM_USE_MPI
       L2ProjectionH1Space(const ParFiniteElementSpace &pfes_ho_,
                           const ParFiniteElementSpace &pfes_lor_,
                           const bool use_ea_,
+                          const bool use_consistent_mass_,
                           MemoryType d_mt_ = Device::GetHostMemoryType());
 #endif
       /// Same as above but assembles action of R through 4 parts:
@@ -417,13 +424,33 @@ public:
       void SetAbsTol(real_t p_atol_) override;
 
    protected:
+      /// Applies the H1 transfer R = M_L^{-1} M_LH and its transpose, where
+      /// M_L is the consistent low-order mass matrix.
+      class H1ConsistentMassOperator : public Operator
+      {
+      private:
+         const Operator &M_LH;
+         const Solver &M_L_solver;
+
+      public:
+         H1ConsistentMassOperator(const Operator &M_LH_,
+                                  const Solver &M_L_solver_);
+
+         void Mult(const Vector &x, Vector &y) const override;
+
+         void MultTranspose(const Vector &x, Vector &y) const override;
+      };
+
       /// Sets up the PCG solver (sets parameters, operator, and preconditioner)
       void SetupPCG();
 
-      /// @brief Computes on-rank R and M_LH matrices. If true, computes mixed mass and/or
-      /// inverse lumped mass matrix error when compared to device implementation.
+      /** @brief Computes on-rank R and M_LH matrices.
+
+          If build_R is true, the returned pair contains both R and M_LH. If
+          build_R is false, the first pointer is null and only M_LH is built. */
       std::pair<std::unique_ptr<SparseMatrix>,
-          std::unique_ptr<SparseMatrix>> ComputeSparseRAndM_LH();
+          std::unique_ptr<SparseMatrix>> ComputeSparseRAndM_LH(
+             bool build_R = true);
 
       /// @brief Recovers vector of tdofs given a vector of dofs and a finite
       /// element space
@@ -453,20 +480,30 @@ public:
       /// elements and refined LOR elements.
       std::unique_ptr<SparseMatrix> AllocR();
 
-      CGSolver pcg;
-      std::unique_ptr<Solver> precon;
+      /// Consistent low-order mass matrix used when use_consistent_mass is true.
+      std::unique_ptr<Operator> M_L;
+      // Used to compute P = (RT*M_LH)^(-1) M_LH^T
+      std::unique_ptr<Operator> M_LH;
+      // Lumped M_L inverse operator built via EA. Wrapped with restriction maps
+      // to multiply with scalar TDof LOR vectors.
+      std::unique_ptr<Operator> ML_inv_vea;
+      /// Preconditioner for applying the inverse consistent low-order mass
+      /// matrix.
+      std::unique_ptr<Solver> ML_precon;
+      /// Serial PCG solver for applying the inverse consistent low-order mass
+      /// matrix in H1 Mult() and MultTranspose().
+      CGSolver ML_pcg;
+      /// Solver used by H1ConsistentMassOperator to apply M_L^{-1}.
+      std::unique_ptr<Solver> ML_solver;
       // The restriction operator is represented as an Operator R. The
       // prolongation operator is a dense matrix computed as the inverse of (R^T
       // M_L R), and hence, is not stored.
       // If element assembly is enabled
       std::unique_ptr<Operator> R;
-      // Used to compute P = (RT*M_LH)^(-1) M_LH^T
-      std::unique_ptr<Operator> M_LH;
       // Inverted operator in P = (RT*M_LH)^(-1) M_LH^T. Used to compute P via PCG.
       std::unique_ptr<Operator> RTxM_LH;
-      // Lumped M_L inverse operator built via EA. Wrapped with restriction maps
-      // to multiply with scalar TDof LOR vectors.
-      std::unique_ptr<Operator> ML_inv_vea;
+      std::unique_ptr<Solver> precon;
+      CGSolver pcg;
       // LDof Mixed mass operator built via EA. Wrapped with restriction maps to send
       // scalar LDof HO vectors to LDof LOR vectors.
       Operator *M_LH_local_op;
@@ -478,7 +515,6 @@ public:
       Vector M_LH_ea;
       // Element Assembled lumped M_L inverse built via EA. Stores diagonal as a Ldof vector.
       Vector ML_inv_ea;
-
 #ifdef MFEM_USE_MPI
       std::unique_ptr<ParFiniteElementSpace> pfes_ho_scalar;
       std::unique_ptr<ParFiniteElementSpace> pfes_lor_scalar;
@@ -511,6 +547,9 @@ public:
    L2Projection   *F; ///< Forward, coarse-to-fine, operator
    L2Prolongation *B; ///< Backward, fine-to-coarse, operator
    bool force_l2_space;
+   /// Use the consistent low-order mass matrix for non-EA H1 Mult() and
+   /// MultTranspose().
+   bool use_consistent_mass;
 
 public:
    L2ProjectionGridTransfer(FiniteElementSpace &coarse_fes_,
@@ -518,16 +557,26 @@ public:
                             bool force_l2_space_ = false,
                             MemoryType d_mt_ = Device::GetHostMemoryType()) // move to method
       : GridTransfer(coarse_fes_, fine_fes_),
-        F(NULL), B(NULL), force_l2_space(force_l2_space_)
+        F(NULL), B(NULL), force_l2_space(force_l2_space_),
+        use_consistent_mass(false)
    { }
    virtual ~L2ProjectionGridTransfer();
 
+   /** @brief Use the consistent low-order mass matrix in H1 non-EA Mult() and
+       MultTranspose().
+
+       This option must be set before constructing the transfer operators. It
+       only affects H1 transfer, is not supported with element assembly, and
+       disables BackwardOperator(). */
+   void UseConsistentMass(bool use_consistent_mass_ = true);
+
    const Operator &ForwardOperator() override;
 
    const Operator &BackwardOperator() override;
 
    bool SupportsBackwardsOperator() const override;
 private:
+   bool UsesH1ConsistentMass() const;
    void BuildF();
 };
 

general/backends.hpp

@@ -75,16 +75,6 @@ constexpr bool mfem_use_gpu = false;
 #define MFEM_THREAD_SIZE(k) 1
 #define MFEM_FOREACH_THREAD(i,k,N) for(int i=0; i<N; i++)
 #define MFEM_FOREACH_THREAD_DIRECT(i,k,N) MFEM_FOREACH_THREAD(i,k,N)
-// Assigns a thread block shaped (SX,SY,SZ) contiguous in x.
-#define MFEM_FOREACH_THREAD_DIRECT_3D(ix, iy, iz, k, SX, SY, SZ)               \
-   for (int iz = 0; iz < SZ; ++iz)                                             \
-      for (int iy = 0; iy < SY; ++iy)                                          \
-         for (int ix = 0; ix < SX; ++ix)
-// Assigns a thread block shaped (OX,OY,OZ) to work on items (SX,SY,SZ),
-// contiguous in x. This intentionally offsets threads
-#define MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(ix, iy, iz, k, SX, SY, SZ, OX,    \
-                                             OY, OZ)                           \
-   MFEM_FOREACH_THREAD_DIRECT_3D(ix, iy, iz, k, SX, SY, SZ)
 #endif
 
 // 'double' and 'float' atomicAdd implementation for previous versions of CUDA

general/cuda.hpp

@@ -49,16 +49,6 @@ constexpr bool mfem_use_gpu = true;
 #define MFEM_THREAD_SIZE(k) blockDim.k
 #define MFEM_FOREACH_THREAD(i,k,N) for(int i=threadIdx.k; i<N; i+=blockDim.k)
 #define MFEM_FOREACH_THREAD_DIRECT(i,k,N) if(const int i=threadIdx.k; i<N)
-// Assigns a thread block shaped (SX,SY,SZ) contiguous in x.
-#define MFEM_FOREACH_THREAD_DIRECT_3D(ix, iy, iz, k, SX, SY, SZ)               \
-   if (int ix = threadIdx.k % (SX), iy = threadIdx.k / (SX), iz = iy / (SY);   \
-       (iy %= (SY)), (threadIdx.k < (SX) * (SY) * (SZ)))
-// Assigns a thread block shaped (OX,OY,OZ) to work on items (SX,SY,SZ),
-// contiguous in x. This intentionally offsets threads
-#define MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(ix, iy, iz, k, SX, SY, SZ, OX,    \
-                                             OY, OZ)                           \
-   if (int ix = threadIdx.k % (OX), iy = threadIdx.k / (OX), iz = iy / (OY);   \
-       (ix < (SX)) && ((iy %= (OY)) < (SY)) && (iz < (SZ)))
 #endif // defined(__CUDA_ARCH__)
 #endif // defined(MFEM_USE_CUDA) && defined(__CUDACC__)
 

general/error.cpp

@@ -171,14 +171,7 @@ void mfem_error(const char *msg)
 #ifdef MFEM_USE_EXCEPTIONS
    if (mfem_error_action == MFEM_ERROR_THROW)
    {
-      if (msg)
-      {
-         throw ErrorException(msg);
-      }
-      else
-      {
-         throw ErrorException("");
-      }
+      throw ErrorException(msg);
    }
 #endif
 

general/hip.hpp

@@ -51,18 +51,6 @@ constexpr bool mfem_use_gpu = true;
    for(int i=hipThreadIdx_ ##k; i<N; i+=hipBlockDim_ ##k)
 #define MFEM_FOREACH_THREAD_DIRECT(i,k,N) \
    if(const int i=hipThreadIdx_ ##k; i<N)
-// Assigns a thread block shaped (SX,SY,SZ) contiguous in x.
-#define MFEM_FOREACH_THREAD_DIRECT_3D(ix, iy, iz, k, SX, SY, SZ)               \
-   if (int ix = hipThreadIdx_##k % (SX), iy = hipThreadIdx_##k / (SX),         \
-       iz = iy / (SY);                                                         \
-       (iy %= (SY)), (hipThreadIdx_##k < (SX) * (SY) * (SZ)))
-// Assigns a thread block shaped (OX,OY,OZ) to work on items (SX,SY,SZ),
-// contiguous in x. This intentionally offsets threads
-#define MFEM_FOREACH_THREAD_DIRECT_3D_OFFSET(ix, iy, iz, k, SX, SY, SZ, OX,    \
-                                             OY, OZ)                           \
-   if (int ix = hipThreadIdx_##k % (OX), iy = hipThreadIdx_##k / (OX),         \
-       iz = iy / (OY);                                                         \
-       (ix < (SX)) && ((iy %= (OY)) < (SY)) && (iz < (SZ)))
 #endif // defined(__HIP_DEVICE_COMPILE__)
 #endif // defined(MFEM_USE_HIP) && defined(__HIP__)
 

general/optparser.cpp

@@ -148,26 +148,9 @@ void parseVector(char * str, Vector & var)
    }
 }
 
-bool parseEnumOption(const char *str, size_t &var,
-                     const std::vector<std::string> &options)
-{
-   for (size_t i = 0; i < options.size(); ++i)
-   {
-      auto &v = options[i];
-      if (v == str)
-      {
-         var = i;
-         // success
-         return true;
-      }
-   }
-   // failure
-   return false;
-}
-
 void OptionsParser::Parse()
 {
-   option_check.SetSize(options.size());
+   option_check.SetSize(options.Size());
    option_check = 0;
    for (int i = 1; i < argc; )
    {
@@ -178,9 +161,9 @@ void OptionsParser::Parse()
          return;
       }
 
-      for (size_t j = 0; true; j++)
+      for (int j = 0; true; j++)
       {
-         if (j >= options.size())
+         if (j >= options.Size())
          {
             // unrecognized option
             error_type = 2;
@@ -188,8 +171,8 @@ void OptionsParser::Parse()
             return;
          }
 
-         if (strcmp(argv[i], options[j].short_name.c_str()) == 0 ||
-             strcmp(argv[i], options[j].long_name.c_str()) == 0)
+         if (strcmp(argv[i], options[j].short_name) == 0 ||
+             strcmp(argv[i], options[j].long_name) == 0)
          {
             OptionType type = options[j].type;
 
@@ -241,11 +224,6 @@ void OptionsParser::Parse()
                case VECTOR:
                   parseVector(argv[i++], *(Vector*)(options[j].var_ptr) );
                   break;
-               case ENUM_OPTION:
-                  isValid =
-                     parseEnumOption(argv[i++], *(size_t *)(options[j].var_ptr),
-                                     options[j].options);
-                  break;
             }
 
             if (!isValid)
@@ -261,7 +239,7 @@ void OptionsParser::Parse()
    }
 
    // check for missing required options
-   for (size_t i = 0; i < options.size(); i++)
+   for (int i = 0; i < options.Size(); i++)
       if (options[i].required &&
           (option_check[i] == 0 ||
            (options[i].type == ENABLE && option_check[++i] == 0)))
@@ -345,12 +323,6 @@ void OptionsParser::WriteValue(const Option &opt, std::ostream &os)
          break;
       }
 
-      case ENUM_OPTION:
-      {
-         os << opt.options.at(*((size_t *)opt.var_ptr));
-         break;
-      }
-
       default: // provide a default to suppress warning
          break;
    }
@@ -361,7 +333,7 @@ void OptionsParser::PrintOptions(ostream &os) const
    static const char *indent = "   ";
 
    os << "Options used:\n";
-   for (size_t j = 0; j < options.size(); j++)
+   for (int j = 0; j < options.Size(); j++)
    {
       OptionType type = options[j].type;
 
@@ -383,7 +355,7 @@ void OptionsParser::PrintOptions(ostream &os) const
          os << options[j].long_name << " ";
          WriteValue(options[j], os);
       }
-      os << std::endl;
+      os << '\n';
    }
 }
 
@@ -438,13 +410,12 @@ void OptionsParser::PrintHelp(ostream &os) const
    static const char *line_sep = "";
    static const char *types[] = { " <int>", " <double>", " <string>",
                                   " <string>", "", "", " '<int>...'",
-                                  " '<double>...'",
-                                  " <string>",
+                                  " '<double>...'"
                                 };
 
    os << indent << "-h" << seprtr << "--help" << descr_sep
       << "Print this help message and exit.\n" << line_sep;
-   for (size_t j = 0; j < options.size(); j++)
+   for (int j = 0; j < options.Size(); j++)
    {
       OptionType type = options[j].type;
 
@@ -480,22 +451,9 @@ void OptionsParser::PrintHelp(ostream &os) const
       }
       os << descr_sep;
 
-      if (options[j].description.size())
+      if (options[j].description)
       {
-         os << options[j].description << std::endl;
-      }
-      if (options[j].type == ENUM_OPTION)
-      {
-         os << "\tavailable choices: ";
-         for (size_t i = 0; i < options[j].options.size(); ++i)
-         {
-            os << '"' << options[j].options[i] << '"';
-            if (i + 1 < options[j].options.size())
-            {
-               os << ", ";
-            }
-         }
-         os << std::endl;
+         os << options[j].description << '\n';
       }
       os << line_sep;
    }

general/optparser.hpp

@@ -15,9 +15,6 @@
 #include "../config/config.hpp"
 #include "array.hpp"
 
-#include <string>
-#include <vector>
-
 namespace mfem
 {
 
@@ -34,18 +31,17 @@ class Vector;
 class OptionsParser
 {
 public:
-   enum OptionType { INT, DOUBLE, STRING, STD_STRING, ENABLE, DISABLE, ARRAY, VECTOR, ENUM_OPTION };
+   enum OptionType { INT, DOUBLE, STRING, STD_STRING, ENABLE, DISABLE, ARRAY, VECTOR };
 
 private:
    struct Option
    {
       OptionType type;
       void *var_ptr;
-      std::string short_name;
-      std::string long_name;
-      std::string description;
+      const char *short_name;
+      const char *long_name;
+      const char *description;
       bool required;
-      std::vector<std::string> options;
 
       Option() = default;
 
@@ -53,19 +49,11 @@ private:
              const char *long_name_, const char *description_, bool req)
          : type(type_), var_ptr(var_ptr_), short_name(short_name_),
            long_name(long_name_), description(description_), required(req) { }
-
-      Option(size_t *var_ptr_, const char *short_name_, const char *long_name_,
-             const char *description_, std::vector<std::string> &&options_,
-             bool req)
-         : type(ENUM_OPTION), var_ptr(var_ptr_), short_name(short_name_),
-           long_name(long_name_), description(description_),
-           required(req), options(std::move(options_))
-      {}
    };
 
    int argc;
    char **argv;
-   std::vector<Option> options;
+   Array<Option> options;
    Array<int> option_check;
    // error_type can be:
    //  0 - no error
@@ -96,26 +84,26 @@ public:
                   const char *disable_long_name, const char *description,
                   bool required = false)
    {
-      options.emplace_back(ENABLE, var, enable_short_name, enable_long_name,
-                           description, required);
-      options.emplace_back(DISABLE, var, disable_short_name, disable_long_name,
-                           description, required);
+      options.Append(Option(ENABLE, var, enable_short_name, enable_long_name,
+                            description, required));
+      options.Append(Option(DISABLE, var, disable_short_name, disable_long_name,
+                            description, required));
    }
 
    /// Add an integer option and set 'var' to receive the value.
    void AddOption(int *var, const char *short_name, const char *long_name,
                   const char *description, bool required = false)
    {
-      options.emplace_back(INT, var, short_name, long_name, description,
-                           required);
+      options.Append(Option(INT, var, short_name, long_name, description,
+                            required));
    }
 
    /// Add a double option and set 'var' to receive the value.
    void AddOption(real_t *var, const char *short_name, const char *long_name,
                   const char *description, bool required = false)
    {
-      options.emplace_back(DOUBLE, var, short_name, long_name, description,
-                           required);
+      options.Append(Option(DOUBLE, var, short_name, long_name, description,
+                            required));
    }
 
    /// Add a string (char*) option and set 'var' to receive the value.
@@ -123,8 +111,8 @@ public:
                   const char *long_name, const char *description,
                   bool required = false)
    {
-      options.emplace_back(STRING, var, short_name, long_name, description,
-                           required);
+      options.Append(Option(STRING, var, short_name, long_name, description,
+                            required));
    }
 
    /// Add a string (std::string) option and set 'var' to receive the value.
@@ -132,8 +120,8 @@ public:
                   const char *long_name, const char *description,
                   bool required = false)
    {
-      options.emplace_back(STD_STRING, var, short_name, long_name, description,
-                           required);
+      options.Append(Option(STD_STRING, var, short_name, long_name, description,
+                            required));
    }
 
    /** Add an integer array (separated by spaces) option and set 'var' to
@@ -142,8 +130,8 @@ public:
                   const char *long_name, const char *description,
                   bool required = false)
    {
-      options.emplace_back(ARRAY, var, short_name, long_name, description,
-                           required);
+      options.Append(Option(ARRAY, var, short_name, long_name, description,
+                            required));
    }
 
    /** Add a vector (doubles separated by spaces) option and set 'var' to
@@ -152,20 +140,8 @@ public:
                   const char *long_name, const char *description,
                   bool required = false)
    {
-      options.emplace_back(VECTOR, var, short_name, long_name, description,
-                           required);
-   }
-
-   /**
-    * Add an option which must be one of a given list of options
-    */
-   void AddOptionChoice(size_t *index, const char *short_name,
-                        const char *long_name, const char *description,
-                        std::vector<std::string> options_,
-                        bool required = false)
-   {
-      options.emplace_back(index, short_name, long_name, description,
-                           std::move(options_), required);
+      options.Append(Option(VECTOR, var, short_name, long_name, description,
+                            required));
    }
 
    /** @brief Parse the command-line options.

miniapps/electromagnetics/CMakeLists.txt

@@ -34,11 +34,6 @@ if (MFEM_USE_MPI)
    EXTRA_HEADERS maxwell_solver.hpp ${MFEM_MINIAPPS_COMMON_HEADERS}
    LIBRARIES mfem-common)
 
- add_mfem_miniapp(maxwell-gpu
-   MAIN maxwell_gpu.cpp
-   EXTRA_HEADERS ${MFEM_MINIAPPS_COMMON_HEADERS}
-   LIBRARIES mfem-common)
-
  if (MFEM_USE_GSLIB)
   add_mfem_miniapp(lorentz
     MAIN lorentz.cpp

miniapps/electromagnetics/electromagnetics.hpp

@@ -12,8 +12,6 @@
 #ifndef MFEM_ELECTROMAGNETICS_HPP
 #define MFEM_ELECTROMAGNETICS_HPP
 
-#include <cmath>
-
 namespace mfem
 {
 

miniapps/electromagnetics/maxwell_solver.cpp

@@ -308,7 +308,7 @@ MaxwellSolver::~MaxwellSolver()
    {
       int i = mit1->first;
       delete pcg_[i];
-      // delete diagScale_[i];
+      delete diagScale_[i];
       delete A1_[i];
       delete a1_[i];
    }
@@ -377,7 +377,7 @@ MaxwellSolver::Mult(const Vector &B, Vector &dEdt) const
 void
 MaxwellSolver::ImplicitSolve(real_t dt, const Vector &B, Vector &dEdt)
 {
-   const_cast<const MaxwellSolver *>(this)->implicitSolve(dt, B, dEdt);
+   implicitSolve(dt, B, dEdt);
 }
 
 void
@@ -420,12 +420,12 @@ MaxwellSolver::setupSolver(const int idt, const real_t dt) const
       a1_[idt]->Finalize();
       A1_[idt] = a1_[idt]->ParallelAssemble();
 
-      // diagScale_[idt] = new HypreDiagScale(*A1_[idt]);
+      diagScale_[idt] = new HypreDiagScale(*A1_[idt]);
       pcg_[idt] = new HyprePCG(*A1_[idt]);
       pcg_[idt]->SetTol(1.0e-12);
       pcg_[idt]->SetMaxIter(200);
       pcg_[idt]->SetPrintLevel(0);
-      // pcg_[idt]->SetPreconditioner(*diagScale_[idt]);
+      pcg_[idt]->SetPreconditioner(*diagScale_[idt]);
    }
 }
 

tests/unit/fem/test_3d_bilininteg.cpp

@@ -5920,206 +5920,4 @@ TEST_CASE("3D Bilinear Div Div Integrators",
    }
 }
 
-TEST_CASE("3D Bilinear VectorFE Integrators PartialAssembly",
-          "[BilinearFormIntegrator]"
-          "[GPU]")
-{
-   auto order = GENERATE(1, 3);
-   CAPTURE(order);
-   int dim = 3;
-
-   FunctionCoefficient q3_coeff(q3);
-   VectorFunctionCoefficient F3_coeff(dim, F3);
-   MatrixFunctionCoefficient M3_coeff(dim, M3);
-
-   auto mesh_fname =
-      GENERATE("../../data/fichera-amr.mesh", "../../data/ball-nurbs.mesh");
-   CAPTURE(mesh_fname);
-   Mesh mesh(mesh_fname);
-   REQUIRE(mesh.Dimension() == dim);
-   REQUIRE(mesh.SpaceDimension() == dim);
-
-   // convert nurbs into piecewise-quadratic curved mesh
-   if (mesh.NURBSext)
-   {
-      mesh.UniformRefinement();
-      mesh.SetCurvature(2);
-   }
-
-   SECTION("H(curl) H(curl) Scalar Coeff")
-   {
-      ND_FECollection fec_nd(order, dim);
-      FiniteElementSpace fespace_nd(&mesh, &fec_nd);
-
-      BilinearForm bfa(&fespace_nd);
-      bfa.AddDomainIntegrator(new VectorFEMassIntegrator(q3_coeff));
-      bfa.Assemble();
-      bfa.Finalize();
-
-      BilinearForm bpa(&fespace_nd);
-      bpa.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      bpa.AddDomainIntegrator(new VectorFEMassIntegrator(q3_coeff));
-      bpa.Assemble();
-
-      GridFunction x(&fespace_nd), y_fa(&fespace_nd), y_pa(&fespace_nd);
-      x.Randomize(1234);
-      bfa.Mult(x, y_fa);
-      bpa.Mult(x, y_pa);
-      y_pa -= y_fa;
-      REQUIRE( y_pa.Normlinf() == MFEM_Approx(0_r) );
-   }
-
-   SECTION("H(curl) H(curl) Diagonal Matrix Coeff")
-   {
-      ND_FECollection fec_nd(order, dim);
-      FiniteElementSpace fespace_nd(&mesh, &fec_nd);
-
-      BilinearForm bfa(&fespace_nd);
-      bfa.AddDomainIntegrator(new VectorFEMassIntegrator(F3_coeff));
-      bfa.Assemble();
-      bfa.Finalize();
-
-      BilinearForm bpa(&fespace_nd);
-      bpa.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      bpa.AddDomainIntegrator(new VectorFEMassIntegrator(F3_coeff));
-      bpa.Assemble();
-
-      GridFunction x(&fespace_nd), y_fa(&fespace_nd), y_pa(&fespace_nd);
-      x.Randomize(1234);
-      bfa.Mult(x, y_fa);
-      bpa.Mult(x, y_pa);
-      y_pa -= y_fa;
-      REQUIRE( y_pa.Normlinf() == MFEM_Approx(0_r) );
-   }
-
-   SECTION("H(curl) H(curl) Matrix Coeff")
-   {
-      ND_FECollection fec_nd(order, dim);
-      FiniteElementSpace fespace_nd(&mesh, &fec_nd);
-
-      BilinearForm bfa(&fespace_nd);
-      bfa.AddDomainIntegrator(new VectorFEMassIntegrator(M3_coeff));
-      bfa.Assemble();
-      bfa.Finalize();
-
-      BilinearForm bpa(&fespace_nd);
-      bpa.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      bpa.AddDomainIntegrator(new VectorFEMassIntegrator(M3_coeff));
-      bpa.Assemble();
-
-      GridFunction x(&fespace_nd), y_fa(&fespace_nd), y_pa(&fespace_nd);
-      x.Randomize(1234);
-      bfa.Mult(x, y_fa);
-      bpa.Mult(x, y_pa);
-      y_pa -= y_fa;
-      REQUIRE( y_pa.Normlinf() == MFEM_Approx(0_r) );
-   }
-}
-
-TEST_CASE("3D Bilinear Weak Curl Integrators Partial Assembly",
-          "[MixedVectorWeakCurlIntegrator]"
-          "[BilinearFormIntegrator]"
-          "[GPU]")
-{
-   auto order = GENERATE(1, 3);
-   CAPTURE(order);
-   int dim = 3;
-
-   FunctionCoefficient q3_coeff(q3);
-   VectorFunctionCoefficient F3_coeff(dim, F3);
-
-   auto mesh_fname =
-      GENERATE("../../data/fichera-amr.mesh", "../../data/ball-nurbs.mesh");
-   CAPTURE(mesh_fname);
-   Mesh mesh(mesh_fname);
-   REQUIRE(mesh.Dimension() == dim);
-   REQUIRE(mesh.SpaceDimension() == dim);
-
-   // convert nurbs into piecewise-quadratic curved mesh
-   if (mesh.NURBSext)
-   {
-      mesh.UniformRefinement();
-      mesh.SetCurvature(2);
-   }
-
-   SECTION("H(div) H(curl) No Coeff")
-   {
-      ND_FECollection fec_nd(order, dim);
-      FiniteElementSpace fespace_nd(&mesh, &fec_nd);
-      RT_FECollection fec_rt(order - 1, dim);
-      FiniteElementSpace fespace_rt(&mesh, &fec_rt);
-
-      MixedBilinearForm bfa(&fespace_rt, &fespace_nd);
-      bfa.AddDomainIntegrator(new MixedVectorWeakCurlIntegrator);
-      bfa.Assemble();
-      bfa.Finalize();
-
-      MixedBilinearForm bpa(&fespace_rt, &fespace_nd);
-      bpa.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      bpa.AddDomainIntegrator(new MixedVectorWeakCurlIntegrator);
-      bpa.Assemble();
-
-      GridFunction x(&fespace_rt), y_fa(&fespace_nd), y_pa(&fespace_nd);
-      x.Randomize(1234);
-      REQUIRE(bfa.Height() == y_fa.Size());
-      REQUIRE(bfa.Width() == x.Size());
-      REQUIRE(bpa.Height() == y_fa.Size());
-      REQUIRE(bpa.Width() == x.Size());
-      bfa.Mult(x, y_fa);
-      bpa.Mult(x, y_pa);
-      y_pa -= y_fa;
-      REQUIRE( y_pa.Normlinf() == MFEM_Approx(0_r) );
-   }
-
-   SECTION("H(div) H(curl) Scalar Coeff")
-   {
-      ND_FECollection fec_nd(order, dim);
-      FiniteElementSpace fespace_nd(&mesh, &fec_nd);
-      RT_FECollection fec_rt(order - 1, dim);
-      FiniteElementSpace fespace_rt(&mesh, &fec_rt);
-
-      MixedBilinearForm bfa(&fespace_rt, &fespace_nd);
-      bfa.AddDomainIntegrator(new MixedVectorWeakCurlIntegrator(q3_coeff));
-      bfa.Assemble();
-      bfa.Finalize();
-
-      MixedBilinearForm bpa(&fespace_rt, &fespace_nd);
-      bpa.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      bpa.AddDomainIntegrator(new MixedVectorWeakCurlIntegrator(q3_coeff));
-      bpa.Assemble();
-
-      GridFunction x(&fespace_rt), y_fa(&fespace_nd), y_pa(&fespace_nd);
-      x.Randomize(1234);
-      bfa.Mult(x, y_fa);
-      bpa.Mult(x, y_pa);
-      y_pa -= y_fa;
-      REQUIRE( y_pa.Normlinf() == MFEM_Approx(0_r) );
-   }
-
-   SECTION("H(div) H(curl) Diagonal Matrix Coeff")
-   {
-      ND_FECollection fec_nd(order, dim);
-      FiniteElementSpace fespace_nd(&mesh, &fec_nd);
-      RT_FECollection fec_rt(order - 1, dim);
-      FiniteElementSpace fespace_rt(&mesh, &fec_rt);
-
-      MixedBilinearForm bfa(&fespace_rt, &fespace_nd);
-      bfa.AddDomainIntegrator(new MixedVectorWeakCurlIntegrator(F3_coeff));
-      bfa.Assemble();
-      bfa.Finalize();
-
-      MixedBilinearForm bpa(&fespace_rt, &fespace_nd);
-      bpa.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      bpa.AddDomainIntegrator(new MixedVectorWeakCurlIntegrator(F3_coeff));
-      bpa.Assemble();
-
-      GridFunction x(&fespace_rt), y_fa(&fespace_nd), y_pa(&fespace_nd);
-      x.Randomize(1234);
-      bfa.Mult(x, y_fa);
-      bpa.Mult(x, y_pa);
-      y_pa -= y_fa;
-      REQUIRE( y_pa.Normlinf() == MFEM_Approx(0_r) );
-   }
-}
-
 } // namespace bilininteg_3d

tests/unit/fem/test_col_lag_der.cpp

@@ -39,15 +39,15 @@ TEST_CASE("Collocated Derivative Kernels", "[QuadratureInterpolator]")
 {
    // Add some specializations for the kernels
    // DIM, LAYOUT, PHYS, VDIM, D1D, Q1D
-   QuadratureInterpolator::AddGradSpecializations<1, QVectorLayout::byNODES,
-                          false, 1, 2, 2>();
-   QuadratureInterpolator::AddGradSpecializations<1, QVectorLayout::byNODES,
-                          true, 1, 2, 2>();
+   QuadratureInterpolator::GradKernels::Specialization
+   <1, QVectorLayout::byNODES, false, 1, 2, 2>::Add();
+   QuadratureInterpolator::GradKernels::Specialization
+   <1, QVectorLayout::byNODES, true, 1, 2, 2>::Add();
 
-   QuadratureInterpolator::AddCollocatedGradSpecializations<
-   1, QVectorLayout::byNODES, false, 1, 2>();
-   QuadratureInterpolator::AddCollocatedGradSpecializations<
-   1, QVectorLayout::byNODES, true, 1, 2>();
+   QuadratureInterpolator::CollocatedGradKernels::Specialization
+   <1, QVectorLayout::byNODES, false, 1, 2>::Add();
+   QuadratureInterpolator::CollocatedGradKernels::Specialization
+   <1, QVectorLayout::byNODES, true, 1, 2>::Add();
 
    const auto mesh_fname = GENERATE(
                               "../../data/inline-segment.mesh",
@@ -157,9 +157,9 @@ TEST_CASE("Collocated Derivative Kernels", "[QuadratureInterpolator]")
       const int nq = maps.nqpt;
 
       Vector qp_der(nelem*vdim*nqp*(P ? sdim : dim));
-      GK::Run(dim, L, P, vdim, nd, nq, nelem, maps.B.Read(), maps.G.Read(),
-              geom->J.Read(), evec_values.Read(), qp_der.Write(), sdim, vdim,
-              nd, nq);
+      GK::Run(dim, L, P, vdim, nd, nq, nelem, maps.B.Read(),
+              maps.G.Read(), geom->J.Read(), evec_values.Read(),
+              qp_der.Write(), sdim, vdim, nd, nq);
 
       Vector col_der(nelem*vdim*nqp*(P ? sdim : dim));
       CGK::Run(dim, L, P, vdim, nd, nelem, maps.G.Read(), geom->J.Read(),

tests/unit/fem/test_lin_interp.cpp

@@ -1069,75 +1069,4 @@ TEST_CASE("Exact Sequence Properties: d(df)=0",
    }
 }
 
-TEST_CASE("Partial Assemble Linear Interpolator",
-          "[CurlInterpolator]"
-          "[GPU]")
-{
-   const int maxOrder = 3;
-   auto order = GENERATE_COPY(range(1, maxOrder + 1));
-   CAPTURE(order);
-
-   int n = 3, dim = -1;
-   real_t tol = 1e-10;
-
-   auto type = Element::HEXAHEDRON;
-   CAPTURE(type);
-
-   Mesh mesh;
-
-   {
-      dim = 3;
-      mesh = Mesh::MakeCartesian3D(n, n, n, (Element::Type)type,
-                                   2.0, 3.0, 5.0);
-   }
-
-   ND_FECollection    fec_nd(order, dim);
-   RT_FECollection    fec_rt(order - 1, dim);
-
-   FiniteElementSpace fespace_nd(&mesh, &fec_nd);
-   FiniteElementSpace fespace_rt(&mesh, &fec_rt);
-
-   // 3D
-   {
-      DiscreteLinearOperator CurlFA(&fespace_nd, &fespace_rt);
-      CurlFA.AddDomainInterpolator(new CurlInterpolator());
-      CurlFA.Assemble();
-      CurlFA.Finalize();
-      DiscreteLinearOperator CurlPA(&fespace_nd, &fespace_rt);
-      CurlPA.AddDomainInterpolator(new CurlInterpolator());
-      CurlPA.SetAssemblyLevel(AssemblyLevel::PARTIAL);
-      CurlPA.Assemble();
-
-      SECTION("Curl (3D)")
-      {
-         SparseMatrix &Curl = CurlFA.SpMat();
-         GridFunction x(&fespace_nd), y_fa(&fespace_rt), y_pa(&fespace_rt);
-         VectorFunctionCoefficient coeff(3, [](const Vector &x, Vector &y)
-         {
-            y.SetSize(3);
-            y[0] = sin(2 * M_PI * x[2] / 5) - cos(2 * M_PI * x[1] / 3);
-            y[1] = sin(2 * M_PI * x[0] / 2) - cos(2 * M_PI * x[2] / 5);
-            y[2] = sin(2 * M_PI * x[1] / 3) - cos(2 * M_PI * x[0] / 2);
-         });
-         x.ProjectCoefficient(coeff);
-         REQUIRE(x.Size() == Curl.Width());
-         REQUIRE(y_fa.Size() == Curl.Height());
-         REQUIRE(x.Size() == CurlPA.Width());
-         REQUIRE(y_pa.Size() == CurlPA.Height());
-         Curl.Mult(x, y_fa);
-         CurlPA.Mult(x, y_pa);
-         y_pa -= y_fa;
-         REQUIRE(y_pa.Normlinf() < tol);
-
-         // transpose
-         y_fa.ProjectCoefficient(coeff);
-         GridFunction x_fa(&fespace_nd), x_pa(&fespace_nd);
-         Curl.MultTranspose(y_fa, x_fa);
-         CurlPA.MultTranspose(y_fa, x_pa);
-         x_pa -= x_fa;
-         REQUIRE(x_pa.Normlinf() < tol);
-      }
-   }
-}
-
 } // namespace lin_interp

tests/unit/fem/test_linearform_ext.cpp

@@ -328,7 +328,7 @@ TEST_CASE("Linear Form Extension", "[LinearFormExtension], [GPU]")
    }
 }
 
-TEST_CASE("Vector FE Linear Form Extension", "[LinearFormExtension], [GPU]")
+TEST_CASE("H(div) Linear Form Extension", "[LinearFormExtension], [GPU]")
 {
    const bool all = launch_all_non_regression_tests;
 
@@ -341,44 +341,26 @@ TEST_CASE("Vector FE Linear Form Extension", "[LinearFormExtension], [GPU]")
    Mesh mesh(mesh_file);
    const int dim = mesh.Dimension();
 
-   {
-      const auto space_type =
-         dim == 3 ? GENERATE(FiniteElement::DIV, FiniteElement::CURL)
-         : FiniteElement::DIV;
+   CAPTURE(mesh_file, dim, p);
 
-      CAPTURE(mesh_file, dim, p, space_type);
+   RT_FECollection fec(p, dim);
+   FiniteElementSpace fes(&mesh, &fec);
 
-      std::unique_ptr<FiniteElementCollection> fec;
+   VectorFunctionCoefficient coeff(dim, fvec_dim);
 
-      switch (space_type)
-      {
-         case FiniteElement::DIV:
-            fec.reset(new RT_FECollection(p, dim));
-            break;
-         case FiniteElement::CURL:
-            fec.reset(new ND_FECollection(p, dim));
-            break;
-         default:
-            MFEM_ABORT("unsupported space type");
-      }
-      FiniteElementSpace fes(&mesh, fec.get());
+   LinearForm d1(&fes);
+   d1.AddDomainIntegrator(new VectorFEDomainLFIntegrator(coeff));
+   d1.UseFastAssembly(true);
+   d1.Assemble();
 
-      VectorFunctionCoefficient coeff(dim, fvec_dim);
+   LinearForm d2(&fes);
+   d2.AddDomainIntegrator(new VectorFEDomainLFIntegrator(coeff));
+   d2.UseFastAssembly(false);
+   d2.Assemble();
 
-      LinearForm d1(&fes);
-      d1.AddDomainIntegrator(new VectorFEDomainLFIntegrator(coeff));
-      d1.UseFastAssembly(true);
-      d1.Assemble();
-
-      LinearForm d2(&fes);
-      d2.AddDomainIntegrator(new VectorFEDomainLFIntegrator(coeff));
-      d2.UseFastAssembly(false);
-      d2.Assemble();
-
-      CAPTURE(d1.Norml2(), d2.Norml2());
-      d1 -= d2;
-      REQUIRE(d1.Norml2() == MFEM_Approx(0.0));
-   }
+   CAPTURE(d1.Norml2(), d2.Norml2());
+   d1 -= d2;
+   REQUIRE(d1.Norml2() == MFEM_Approx(0.0));
 }
 
 #ifdef MFEM_USE_MPI

tests/unit/fem/test_project_bdr.cpp

@@ -124,8 +124,8 @@ TEST_CASE("3D ProjectBdrCoefficientNormal Scalar",
 
    const double tol = 1e-6;
 
-   const int bdrs_axis[] = {2, 1, 0, 1, 0, 2};
-   const int bdrs_sign[] = {-1, -1, +1, +1, -1, +1};
+   const char bdrs_axis[] = {2, 1, 0, 1, 0, 2};
+   const char bdrs_sign[] = {-1, -1, +1, +1, -1, +1};
 
    for (int type = (int)Element::TETRAHEDRON;
         type <= (int)Element::HEXAHEDRON; type++)

tests/unit/fem/test_quadf_coef.cpp

@@ -361,57 +361,3 @@ TEST_CASE("QuadratureFunction::ProjectGridFunction",
       compare_qf_to_coeff(qf, coeff);
    }
 }
-
-TEST_CASE("QuadratureFunction::ProjectGridFunction Integral",
-          "[Coefficient][QuadratureFunction]")
-{
-   const int order = GENERATE(1, 2);
-   const auto mesh_fname =
-      GENERATE("../../data/star.mesh", "../../data/star-mixed.mesh",
-               "../../data/fichera.mesh", "../../data/fichera-mixed.mesh",
-               "../../data/inline-tri.mesh", "../../data/inline-tet.mesh",
-               "../../data/inline-wedge.mesh", "../../data/inline-pyramid.mesh",
-               "../../data/ball-nurbs.mesh");
-   CAPTURE(order, mesh_fname);
-
-   Mesh mesh(mesh_fname);
-   if (mesh.NURBSext)
-   {
-      mesh.UniformRefinement();
-      mesh.SetCurvature(2);
-   }
-   L2_FECollection fec(order, mesh.Dimension(), BasisType::GaussLegendre,
-                       FiniteElement::INTEGRAL);
-   FiniteElementSpace fes(&mesh, &fec);
-
-   GridFunction gf(&fes);
-   gf.Randomize(1);
-   GridFunctionCoefficient coeff(&gf);
-
-   auto compare_qf_to_coeff = [](QuadratureFunction &qf, Coefficient &coeff)
-   {
-      auto &qs = *qf.GetSpace();
-      for (int i = 0; i < qs.GetNE(); ++i)
-      {
-         const IntegrationRule &ir = qs.GetIntRule(i);
-         ElementTransformation &T = *qs.GetTransformation(i);
-         Vector values;
-         qf.GetValues(i, values);
-         for (int iq = 0; iq < ir.Size(); ++iq)
-         {
-            const int iq_p = qs.GetPermutedIndex(i, iq);
-            const IntegrationPoint &ip = ir[iq];
-            T.SetIntPoint(&ip);
-            REQUIRE(coeff.Eval(T, ip) == MFEM_Approx(values[iq_p]));
-         }
-      }
-   };
-
-   SECTION("QuadratureSpace")
-   {
-      QuadratureSpace qs(&mesh, order + 1);
-      QuadratureFunction qf(qs);
-      coeff.Project(qf);
-      compare_qf_to_coeff(qf, coeff);
-   }
-}

tests/unit/fem/test_quadinterpolator.cpp

@@ -14,16 +14,16 @@
 
 using namespace mfem;
 
-static bool H1testQuadratureInterpolator(const int dim, const int p,
-                                         const int qpts,
-                                         const QVectorLayout q_layout,
-                                         const int nx, const int ny,
-                                         const int nz)
+static bool testQuadratureInterpolator(const int dim,
+                                       const int p,
+                                       const int qpts,
+                                       const QVectorLayout q_layout,
+                                       const int nx, const int ny, const int nz)
 {
    // Keep for debugging purposes:
    if (verbose_tests)
    {
-      std::cout << "H1testQuadratureInterpolator(dim=" << dim
+      std::cout << "testQuadratureInterpolator(dim=" << dim
                 << ",p=" << p
                 << ",q=" << qpts
                 << ",l=" << (q_layout == QVectorLayout::byNODES ?
@@ -236,188 +236,6 @@ static bool H1testQuadratureInterpolator(const int dim, const int p,
    return true;
 }
 
-static bool L2testQuadratureInterpolator(const int dim, const int p,
-                                         const int qpts,
-                                         const QVectorLayout q_layout,
-                                         const int nx, const int ny,
-                                         const int nz)
-{
-   // Keep for debugging purposes:
-   if (verbose_tests)
-   {
-      std::cout << "L2testQuadratureInterpolator(dim=" << dim
-                << ",p=" << p
-                << ",q=" << qpts
-                << ",l=" << (q_layout == QVectorLayout::byNODES ?
-                             "by_nodes" : "by_vdim")
-                << ",nx=" << nx
-                << ",ny=" << ny
-                << ",nz=" << nz
-                << ")" << std::endl;
-   }
-
-   const int vdim = dim;
-   const int ordering = Ordering::byNODES;
-
-   Mesh mesh = dim == 1 ? Mesh::MakeCartesian1D(nx, Element::SEGMENT) :
-               dim == 2 ? Mesh::MakeCartesian2D(nx,ny, Element::QUADRILATERAL) :
-               Mesh::MakeCartesian3D(nx,nx,nz, Element::HEXAHEDRON);
-   mesh.SetCurvature(2);
-   switch (dim)
-   {
-      case 1:
-         mesh.Transform([](const Vector &x, Vector &y) { y[0] = x[0] * x[0]; });
-         break;
-      case 2:
-         mesh.Transform([](const Vector &x, Vector &y)
-         {
-            y[0] = x[0] + 0.1 * sin(2 * M_PI * x[0]);
-            y[1] = x[1] + 0.1 * cos(2 * M_PI * x[1]);
-         });
-         break;
-      case 3:
-         mesh.Transform([](const Vector &x, Vector &y)
-         {
-            y[0] = x[0] + 0.1 * sin(2 * M_PI * x[0]);
-            y[1] = x[1] + 0.1 * cos(2 * M_PI * x[1]);
-            y[2] = x[2] + 0.1 * cos(2 * M_PI * x[2]);
-         });
-   }
-
-   const L2_FECollection fec(p, dim);
-   const L2_FECollection ifec(p, dim, BasisType::GaussLegendre,
-                              FiniteElement::INTEGRAL);
-   FiniteElementSpace sfes(&mesh, &fec, 1, ordering);
-   FiniteElementSpace vfes(&mesh, &fec, vdim, ordering);
-   FiniteElementSpace isfes(&mesh, &ifec, 1, ordering);
-   FiniteElementSpace ivfes(&mesh, &ifec, vdim, ordering);
-
-   FunctionCoefficient coeff([](const Vector &x)
-   {
-      real_t res = 0;
-      for (int dim = 0; dim < x.Size(); ++dim)
-      {
-         res += cos(x[dim]);
-      }
-      return res;
-   });
-
-   VectorFunctionCoefficient vcoeff(vdim, [vdim](const Vector &x, Vector &y)
-   {
-      y.SetSize(vdim);
-      for (int v = 0; v < vdim; ++v)
-      {
-         real_t res = 0;
-         for (int dim = 0; dim < x.Size(); ++dim)
-         {
-            res += cos(x[dim] * (v + 1));
-         }
-         y[v] = res;
-      }
-   });
-
-   GridFunction ix(&isfes);
-   ix.ProjectCoefficient(coeff);
-
-   GridFunction inodes(&ivfes);
-   inodes.ProjectCoefficient(vcoeff);
-
-   const Geometry::Type GeomType = mesh.GetTypicalElementGeometry();
-   const IntegrationRule &ir = IntRules.Get(GeomType, 2*qpts-1);
-   const QuadratureInterpolator *isqi(isfes.GetQuadratureInterpolator(ir));
-   const QuadratureInterpolator *ivqi(ivfes.GetQuadratureInterpolator(ir));
-
-   const int NE(mesh.GetNE());
-   const int NQ(ir.GetNPoints());
-   const int ND(sfes.GetTypicalFE()->GetDof());
-   REQUIRE(ND == vfes.GetTypicalFE()->GetDof());
-
-   const ElementDofOrdering nat_ordering = ElementDofOrdering::NATIVE;
-   const ElementDofOrdering lex_ordering = ElementDofOrdering::LEXICOGRAPHIC;
-   const Operator *iSRN(isfes.GetElementRestriction(nat_ordering));
-   const Operator *iSRL(isfes.GetElementRestriction(lex_ordering));
-   const Operator *iVRN(ivfes.GetElementRestriction(nat_ordering));
-   const Operator *iVRL(ivfes.GetElementRestriction(lex_ordering));
-   MFEM_VERIFY(iSRN, "No element sn-restriction operator found!");
-   MFEM_VERIFY(iSRL, "No element sl-restriction operator found!");
-   MFEM_VERIFY(iVRN, "No element vn-restriction operator found!");
-   MFEM_VERIFY(iVRL, "No element vl-restriction operator found!");
-
-   const real_t rel_tol = 1e-12;
-
-   {
-      // Scalar
-      isqi->SetOutputLayout(q_layout);
-      Vector xe(1*ND*NE);
-      REQUIRE(xe.Size() == iSRN->Height());
-      REQUIRE(iSRN->Height() == iSRL->Height());
-
-      // Full results
-      Vector isq_val_f(NQ*NE);
-      // Tensor results
-      Vector isq_val_t(NQ*NE);
-      {
-         // Full
-         iSRN->Mult(ix, xe);
-         isqi->DisableTensorProducts();
-
-         isqi->Values(xe, isq_val_f);
-      }
-      {
-         // Tensor
-         iSRL->Mult(ix, xe);
-         isqi->EnableTensorProducts();
-
-         isqi->Values(xe, isq_val_t);
-      }
-      real_t norm, rel_error;
-
-      norm = isq_val_f.Normlinf();
-      isq_val_f -= isq_val_t;
-      rel_error = isq_val_f.Normlinf()/norm;
-      if (verbose_tests)
-      { std::cout << "isq_val rel. error = " << rel_error << std::endl; }
-      REQUIRE(rel_error <= rel_tol);
-   }
-
-   {
-      // Vector
-      ivqi->SetOutputLayout(q_layout);
-      Vector ne(vdim*ND*NE);
-      REQUIRE(ne.Size() == iVRN->Height());
-      REQUIRE(iVRN->Height() == iVRL->Height());
-
-      // Full results
-      Vector ivq_val_f(dim*NQ*NE);
-      // Tensor results
-      Vector ivq_val_t(dim*NQ*NE);
-      {
-         // Full
-         iVRN->Mult(inodes, ne);
-         ivqi->DisableTensorProducts();
-
-         ivqi->Values(ne, ivq_val_f);
-      }
-      {
-         // Tensor
-         iVRL->Mult(inodes, ne);
-         ivqi->EnableTensorProducts();
-
-         ivqi->Values(ne, ivq_val_t);
-      }
-      real_t norm, rel_error;
-
-      norm = ivq_val_f.Normlinf();
-      ivq_val_f -= ivq_val_t;
-      rel_error = ivq_val_f.Normlinf()/norm;
-      if (verbose_tests)
-      { std::cout << "ivq_val rel. error = " << rel_error << std::endl; }
-      REQUIRE(rel_error <= rel_tol);
-   }
-
-   return true;
-}
-
 TEST_CASE("QuadratureInterpolator", "[QuadratureInterpolator][GPU]")
 {
    SECTION("H1 tensor elements: compare tensor and non-tensor evaluations")
@@ -429,21 +247,7 @@ TEST_CASE("QuadratureInterpolator", "[QuadratureInterpolator][GPU]")
       const auto nx = 3; // number of element in x
       const auto ny = 3; // number of element in y
       const auto nz = 3; // number of element in z
-      CAPTURE(dim, p, q, l);
-      H1testQuadratureInterpolator(dim, p, q, l, nx, ny, nz);
-   }
-
-   SECTION("L2 tensor elements: compare tensor and non-tensor evaluations")
-   {
-      const auto dim = GENERATE(1,2,3); // dimension
-      const auto p = GENERATE(range(1,7)); // element order, 1 <= p < 7
-      const auto q = GENERATE_COPY(p+1,p+2); // 1D quadrature points
-      const auto l = GENERATE(QVectorLayout::byNODES, QVectorLayout::byVDIM);
-      const auto nx = 3; // number of element in x
-      const auto ny = 3; // number of element in y
-      const auto nz = 3; // number of element in z
-      CAPTURE(dim, p, q, l);
-      L2testQuadratureInterpolator(dim, p, q, l, nx, ny, nz);
+      testQuadratureInterpolator(dim, p, q, l, nx, ny, nz);
    }
 
    SECTION("H1 elements: values and physical derivatives")

tests/unit/fem/test_transfer.cpp

@@ -440,6 +440,99 @@ TEST_CASE("Variable Order True Transfer", "[Transfer][VariableOrder]")
    delete c_fec;
 }
 
+TEST_CASE("H1 L2 transfer with consistent mass", "[Transfer]")
+{
+   auto vectorspace = GENERATE(VecSpace::H1, VecSpace::VectorH1nodes,
+                               VecSpace::VectorH1vdim);
+   dimension = GENERATE(2, 3);
+
+   const int order = 2;
+   const int ne = 2;
+   const int vdim = (vectorspace == VecSpace::VectorH1nodes
+                     || vectorspace == VecSpace::VectorH1vdim) ? dimension : 1;
+   Ordering::Type ordering = (vectorspace == VecSpace::VectorH1vdim)
+                             ? Ordering::byVDIM : Ordering::byNODES;
+
+   CAPTURE(VecSpaceName(vectorspace), dimension, order);
+
+   Mesh mesh;
+   if (dimension == 2)
+   {
+      mesh = Mesh::MakeCartesian2D(ne, ne, Element::QUADRILATERAL,
+                                   1, 1.0, 1.0);
+   }
+   else
+   {
+      mesh = Mesh::MakeCartesian3D(ne, ne, ne, Element::HEXAHEDRON,
+                                   1.0, 1.0, 1.0);
+   }
+
+   Mesh fineMesh(mesh);
+   fineMesh.UniformRefinement();
+
+   H1_FECollection fec(order, dimension);
+   FiniteElementSpace c_fespace(&mesh, &fec, vdim, ordering);
+   FiniteElementSpace f_fespace(&fineMesh, &fec, vdim, ordering);
+
+   L2ProjectionGridTransfer transfer(c_fespace, f_fespace);
+   transfer.UseConsistentMass();
+   const Operator &R = transfer.ForwardOperator();
+
+   GridFunction X(&c_fespace);
+   GridFunction Y(&f_fespace);
+   GridFunction Y_ref(&f_fespace);
+   coeff_order = 1;
+
+   LinearForm rhs(&f_fespace);
+   BilinearForm mass(&f_fespace);
+   FunctionCoefficient funcCoeff(&coeff);
+   VectorFunctionCoefficient vecCoeff(dimension, &vectorcoeff);
+   if (vectorspace == VecSpace::H1)
+   {
+      X.ProjectCoefficient(funcCoeff);
+      rhs.AddDomainIntegrator(new DomainLFIntegrator(funcCoeff));
+      mass.AddDomainIntegrator(new MassIntegrator);
+   }
+   else
+   {
+      X.ProjectCoefficient(vecCoeff);
+      rhs.AddDomainIntegrator(new VectorDomainLFIntegrator(vecCoeff));
+      mass.AddDomainIntegrator(new VectorMassIntegrator);
+   }
+
+   rhs.Assemble();
+   mass.Assemble();
+   SparseMatrix M;
+   Array<int> empty;
+   mass.FormSystemMatrix(empty, M);
+
+   GSSmoother M_prec(M);
+   Y_ref = 0.0;
+   PCG(M, M_prec, rhs, Y_ref, 0, 500, 1e-24, 0.0);
+
+   Y = 0.0;
+   R.Mult(X, Y);
+   Y -= Y_ref;
+   REQUIRE(Y.Norml2() < 1e-11 * Y_ref.Norml2());
+
+   Vector x(c_fespace.GetVSize());
+   Vector y(f_fespace.GetVSize());
+   Vector Ry(f_fespace.GetVSize());
+   Vector Rtx(c_fespace.GetVSize());
+   x.Randomize(1);
+   y.Randomize(2);
+
+   R.Mult(x, Ry);
+   R.MultTranspose(y, Rtx);
+
+   const real_t ip1 = InnerProduct(Ry, y);
+   const real_t ip2 = InnerProduct(x, Rtx);
+   REQUIRE(std::abs(ip1 - ip2) <
+           1e-10 * std::max(std::abs(ip1), std::abs(ip2)));
+
+   REQUIRE_FALSE(transfer.SupportsBackwardsOperator());
+}
+
 TEST_CASE("Restriction Transpose Operator")
 {
    int order = GENERATE(1, 2);
@@ -797,6 +890,59 @@ TEST_CASE("Parallel Transfer", "[Transfer][Parallel]")
    delete pmesh;
 }
 
+TEST_CASE("Parallel H1 L2 transfer with consistent mass",
+          "[Transfer][Parallel]")
+{
+   dimension = GENERATE(2, 3);
+
+   const int order = 2;
+   const int ne = 2;
+   const int vdim = 1;
+
+   CAPTURE(dimension, order);
+
+   Mesh mesh;
+   if (dimension == 2)
+   {
+      mesh = Mesh::MakeCartesian2D(ne, ne, Element::QUADRILATERAL,
+                                   1, 1.0, 1.0);
+   }
+   else
+   {
+      mesh = Mesh::MakeCartesian3D(ne, ne, ne, Element::HEXAHEDRON,
+                                   1.0, 1.0, 1.0);
+   }
+
+   ParMesh pmesh(MPI_COMM_WORLD, mesh);
+   ParMesh pfineMesh(MPI_COMM_WORLD, mesh);
+   pfineMesh.UniformRefinement();
+
+   H1_FECollection fec(order, dimension);
+   ParFiniteElementSpace c_fespace(&pmesh, &fec, vdim);
+   ParFiniteElementSpace f_fespace(&pfineMesh, &fec, vdim);
+
+   L2ProjectionGridTransfer transfer(c_fespace, f_fespace);
+   transfer.UseConsistentMass();
+   const Operator &R = transfer.TrueForwardOperator();
+
+   Vector x(c_fespace.GetTrueVSize());
+   Vector y(f_fespace.GetTrueVSize());
+   Vector Rx(f_fespace.GetTrueVSize());
+   Vector Rty(c_fespace.GetTrueVSize());
+   x.Randomize(1);
+   y.Randomize(2);
+
+   R.Mult(x, Rx);
+   R.MultTranspose(y, Rty);
+
+   const real_t ip1 = InnerProduct(MPI_COMM_WORLD, Rx, y);
+   const real_t ip2 = InnerProduct(MPI_COMM_WORLD, x, Rty);
+   REQUIRE(std::abs(ip1 - ip2) <
+           1e-10 * std::max(std::abs(ip1), std::abs(ip2)));
+
+   REQUIRE_FALSE(transfer.SupportsBackwardsOperator());
+}
+
 TEST_CASE("Trace PRefinement Parallel TrueTransfer", "[Transfer][Parallel]")
 {
    auto simplex = GENERATE(true, false);

tests/unit/miniapps/test_tmop_pa.cpp

@@ -935,35 +935,27 @@ static void tmop_tests(int id = 0, bool all = false)
 
 #ifndef _WIN32
    {
-      QuadratureInterpolator::AddDetSpecializations<2, 2, 3, 3>();
-      QuadratureInterpolator::AddDetSpecializations<2, 2, 5, 5>();
-      QuadratureInterpolator::AddDetSpecializations<3, 3, 2, 3>();
-      QuadratureInterpolator::AddDetSpecializations<3, 3, 3, 4>();
-      QuadratureInterpolator::AddDetSpecializations<3, 3, 4, 6>();
+      using Det = QuadratureInterpolator::DetKernels;
+      Det::Specialization<2, 2, 3, 3>::Add();
+      Det::Specialization<2, 2, 5, 5>::Add();
+      Det::Specialization<3, 3, 2, 3>::Add();
+      Det::Specialization<3, 3, 3, 4>::Add();
+      Det::Specialization<3, 3, 4, 6>::Add();
 
-      QuadratureInterpolator::AddGradSpecializations<2, QVectorLayout::byNODES,
-                             false, 2, 3, 5>();
-      QuadratureInterpolator::AddGradSpecializations<2, QVectorLayout::byNODES,
-                             false, 2, 5, 5>();
-      QuadratureInterpolator::AddGradSpecializations<2, QVectorLayout::byNODES,
-                             false, 2, 6, 6>();
-      QuadratureInterpolator::AddGradSpecializations<3, QVectorLayout::byNODES,
-                             false, 3, 4, 5>();
+      using Grad = QuadratureInterpolator::GradKernels;
+      Grad::Specialization<2, QVectorLayout::byNODES, false, 2, 3, 5>::Add();
+      Grad::Specialization<2, QVectorLayout::byNODES, false, 2, 5, 5>::Add();
+      Grad::Specialization<2, QVectorLayout::byNODES, false, 2, 6, 6>::Add();
+      Grad::Specialization<3, QVectorLayout::byNODES, false, 3, 4, 5>::Add();
 
-      QuadratureInterpolator::AddTensorEvalSpecializations<
-      2, QVectorLayout::byVDIM, 2, 2, 2, 4>();
-      QuadratureInterpolator::AddTensorEvalSpecializations<
-      2, QVectorLayout::byVDIM, 2, 3, 3, 4>();
-      QuadratureInterpolator::AddTensorEvalSpecializations<
-      2, QVectorLayout::byVDIM, 2, 4, 4, 2>();
-      QuadratureInterpolator::AddTensorEvalSpecializations<
-      2, QVectorLayout::byVDIM, 2, 5, 5, 2>();
-      QuadratureInterpolator::AddTensorEvalSpecializations<
-      3, QVectorLayout::byVDIM, 3, 2, 3, 2>();
-      QuadratureInterpolator::AddTensorEvalSpecializations<
-      3, QVectorLayout::byVDIM, 3, 3, 4, 1>();
-      QuadratureInterpolator::AddTensorEvalSpecializations<
-      3, QVectorLayout::byVDIM, 3, 4, 6, 1>();
+      using TensorEval = QuadratureInterpolator::TensorEvalKernels;
+      TensorEval::Specialization<2, QVectorLayout::byVDIM, 2, 2, 2>::Opt<4>::Add();
+      TensorEval::Specialization<2, QVectorLayout::byVDIM, 2, 3, 3>::Opt<4>::Add();
+      TensorEval::Specialization<2, QVectorLayout::byVDIM, 2, 4, 4>::Opt<2>::Add();
+      TensorEval::Specialization<2, QVectorLayout::byVDIM, 2, 5, 5>::Opt<2>::Add();
+      TensorEval::Specialization<3, QVectorLayout::byVDIM, 3, 2, 3>::Opt<2>::Add();
+      TensorEval::Specialization<3, QVectorLayout::byVDIM, 3, 3, 4>::Opt<1>::Add();
+      TensorEval::Specialization<3, QVectorLayout::byVDIM, 3, 4, 6>::Opt<1>::Add();
 
       using MassDiagonal = MassIntegrator::DiagonalPAKernels;
       MassDiagonal::Specialization<2, 2, 3>::Add();