Merge pull request #44 from CEED/misc-fixes

Compatibility with MFEM v4.6
CEED · Oct 3, 2023 · 0a5ed24 · 0a5ed24
2 parents 57d4408 + 60f58f5
commit 0a5ed24
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/remhos_lo.cpp b/remhos_lo.cpp
@@ -18,6 +18,11 @@
 #include "remhos_tools.hpp"
 #include "remhos_ho.hpp"
 
+#if MFEM_VERSION >= 40600
+#define MAX_D1D DofQuadLimits::MAX_D1D
+#define MAX_Q1D DofQuadLimits::MAX_Q1D
+#endif
+
 using namespace std;
 
 namespace mfem
@@ -307,7 +312,7 @@ void MassBasedAvg::MassesAndVolumesAtPosition(const ParGridFunction &u,
 const DofToQuad *get_maps(ParFiniteElementSpace &pfes, Assembly &asmbly)
 {
    const FiniteElement *el_trace =
-      pfes.GetTraceElement(0, pfes.GetParMesh()->GetFaceBaseGeometry(0));
+      pfes.GetTraceElement(0, pfes.GetParMesh()->GetFaceGeometry(0));
    return &el_trace->GetDofToQuad(*asmbly.lom.irF, DofToQuad::TENSOR);
 }
 
@@ -610,7 +615,7 @@ void PAResidualDistribution::ApplyFaceTerms2D(const Vector &x, Vector &y,
 
    const IntegrationRule *ir = assembly.lom.irF;
    const FiniteElement &el_trace =
-      *pfes.GetTraceElement(0, pfes.GetMesh()->GetFaceBaseGeometry(0));
+      *pfes.GetTraceElement(0, pfes.GetMesh()->GetFaceGeometry(0));
    const DofToQuad *maps = &el_trace.GetDofToQuad(*ir, DofToQuad::TENSOR);
 
    auto B = mfem::Reshape(maps->B.Read(), quad1D, dofs1D);
@@ -751,7 +756,7 @@ void PAResidualDistribution::ApplyFaceTerms3D(const Vector &x, Vector &y,
 
    const IntegrationRule *ir = assembly.lom.irF;
    const FiniteElement &el_trace =
-      *pfes.GetTraceElement(0, pfes.GetMesh()->GetFaceBaseGeometry(0));
+      *pfes.GetTraceElement(0, pfes.GetMesh()->GetFaceGeometry(0));
    const DofToQuad *maps = &el_trace.GetDofToQuad(*ir, DofToQuad::TENSOR);
 
    auto B = mfem::Reshape(maps->B.Read(), quad1D, dofs1D);