diff --git a/fem/fespace.hpp b/fem/fespace.hpp index 8d35ad8664..702acf841f 100644 --- a/fem/fespace.hpp +++ b/fem/fespace.hpp @@ -1502,19 +1502,19 @@ public: return dynamic_cast(fec) != NULL; } - /// @brief Return true if the mesh contains only one topology, the elements are - /// all triangles or tetrahedrons, and the elements are ragged tensor elements - /// i.e. Bernstein/positive basis. - bool UsesRaggedTensorBasis() const - { - bool mixed = this->GetMesh()->IsMixedMesh(); - bool simplex = (this->GetTypicalFE()->GetGeomType() == Geometry::TRIANGLE) || - (this->GetTypicalFE()->GetGeomType() == Geometry::TETRAHEDRON); - bool positive = - dynamic_cast(this->GetTypicalFE()) || - dynamic_cast(this->GetTypicalFE()); - return !mixed && simplex && positive; - } + /// @brief Return true if the mesh contains only one topology, the elements are + /// all triangles or tetrahedrons, and the elements are ragged tensor elements + /// i.e. Bernstein/positive basis. + bool UsesRaggedTensorBasis() const + { + bool mixed = this->GetMesh()->IsMixedMesh(); + bool simplex = (this->GetTypicalFE()->GetGeomType() == Geometry::TRIANGLE) || + (this->GetTypicalFE()->GetGeomType() == Geometry::TETRAHEDRON); + bool positive = + dynamic_cast(this->GetTypicalFE()) || + dynamic_cast(this->GetTypicalFE()); + return !mixed && simplex && positive; + } /** In variable-order spaces on nonconforming (NC) meshes, this function controls whether strict conformity is enforced in cases where coarse diff --git a/fem/integ/bilininteg_mass_kernels.hpp b/fem/integ/bilininteg_mass_kernels.hpp index dc7d1a9e41..5b96ae7cb1 100644 --- a/fem/integ/bilininteg_mass_kernels.hpp +++ b/fem/integ/bilininteg_mass_kernels.hpp @@ -1793,8 +1793,10 @@ inline void PAMassApplyTriangle(const int NE, const int d1d = 0, const int q1d = 0) { - MFEM_VERIFY(T_D1D ? T_D1D : d1d <= DeviceDofQuadLimits::Get().MAX_D1D_SIMPLEX, ""); - MFEM_VERIFY(T_Q1D ? T_Q1D : q1d <= DeviceDofQuadLimits::Get().MAX_Q1D_SIMPLEX, ""); + MFEM_VERIFY(T_D1D ? T_D1D : d1d <= DeviceDofQuadLimits::Get().MAX_D1D_SIMPLEX, + ""); + MFEM_VERIFY(T_Q1D ? T_Q1D : q1d <= DeviceDofQuadLimits::Get().MAX_Q1D_SIMPLEX, + ""); const int BASIS_DIM = d1d * (d1d + 1) / 2; const auto lex_map = lex_map_.Read(); @@ -1933,8 +1935,10 @@ inline void PAMassApplyTetrahedron(const int NE, const int d1d = 0, const int q1d = 0) { - MFEM_VERIFY(T_D1D ? T_D1D : d1d <= DeviceDofQuadLimits::Get().MAX_D1D_SIMPLEX, ""); - MFEM_VERIFY(T_Q1D ? T_Q1D : q1d <= DeviceDofQuadLimits::Get().MAX_Q1D_SIMPLEX, ""); + MFEM_VERIFY(T_D1D ? T_D1D : d1d <= DeviceDofQuadLimits::Get().MAX_D1D_SIMPLEX, + ""); + MFEM_VERIFY(T_Q1D ? T_Q1D : q1d <= DeviceDofQuadLimits::Get().MAX_Q1D_SIMPLEX, + ""); const int BASIS_DIM = d1d * (d1d + 1) * (d1d + 2) / 6; const int BASIS_DIM2D = d1d * (d1d + 1) / 2;