From: Peter Munch Date: Tue, 11 May 2021 05:56:31 +0000 (+0200) Subject: Add and use internal::FEPointEvaluation::is_fast_path_supported X-Git-Tag: v9.3.0-rc1~95^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07fff1974aec7069fb8d9c1c28d60b92db5c5861;p=dealii.git Add and use internal::FEPointEvaluation::is_fast_path_supported --- diff --git a/include/deal.II/fe/fe_point_evaluation.h b/include/deal.II/fe/fe_point_evaluation.h index 53d87bad3d..2ee5b1165f 100644 --- a/include/deal.II/fe/fe_point_evaluation.h +++ b/include/deal.II/fe/fe_point_evaluation.h @@ -344,6 +344,10 @@ namespace internal return value; } }; + + template + bool + is_fast_path_supported(const FiniteElement &fe); } // namespace FEPointEvaluation } // namespace internal @@ -558,7 +562,7 @@ FEPointEvaluation::FEPointEvaluation( , fe(&fe) { if (mapping_q_generic != nullptr && - internal::MatrixFreeFunctions::ShapeInfo::is_supported(fe)) + internal::FEPointEvaluation::is_fast_path_supported(fe)) { internal::MatrixFreeFunctions::ShapeInfo shape_info; unsigned int base_element_number = 0; diff --git a/source/fe/CMakeLists.txt b/source/fe/CMakeLists.txt index 7cbd87bb87..9a75812e3b 100644 --- a/source/fe/CMakeLists.txt +++ b/source/fe/CMakeLists.txt @@ -34,6 +34,7 @@ SET(_unity_include_src fe_nedelec.cc fe_nedelec_sz.cc fe_nothing.cc + fe_point_evaluation.cc fe_poly.cc fe_poly_tensor.cc fe_pyramid_p.cc @@ -107,6 +108,7 @@ SET(_inst fe_nedelec.inst.in fe_nedelec_sz.inst.in fe_nothing.inst.in + fe_point_evaluation.inst.in fe_poly.inst.in fe_poly_tensor.inst.in fe_pyramid_p.inst.in diff --git a/source/fe/fe_point_evaluation.cc b/source/fe/fe_point_evaluation.cc new file mode 100644 index 0000000000..b566432131 --- /dev/null +++ b/source/fe/fe_point_evaluation.cc @@ -0,0 +1,101 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2021 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE.md at +// the top level directory of deal.II. +// +// --------------------------------------------------------------------- + +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include + +DEAL_II_NAMESPACE_OPEN + + +namespace internal +{ + namespace FEPointEvaluation + { + /** + * Similar to internal::MatrixFreeFunctions::ShapeInfo but not supporting + * non-tensor product elements and FE_DGQHermite + */ + template + bool + is_fast_path_supported(const FiniteElement &fe) + { + // check if supported + const bool flag = [&]() { + if (dim != spacedim) + return false; + + for (unsigned int base = 0; base < fe.n_base_elements(); ++base) + { + const FiniteElement *fe_ptr = + &(fe.base_element(base)); + if (fe_ptr->n_components() != 1) + return false; + + // then check if the base element is supported or not + if (dynamic_cast *>(fe_ptr) != nullptr) + { + const FE_Poly *fe_poly_ptr = + dynamic_cast *>(fe_ptr); + + if (dynamic_cast *>( + &fe_poly_ptr->get_poly_space()) == nullptr && + dynamic_cast> *>( + &fe_poly_ptr->get_poly_space()) == nullptr && + dynamic_cast *>(fe_ptr) == + nullptr && + dynamic_cast *>(fe_ptr) == + nullptr && + dynamic_cast *>( + fe_ptr) == nullptr) + return false; + } + else + return false; + } + + // if we arrived here, all base elements were supported so we can + // support the present element + return true; + }(); + + // make sure that if supported also ShapeInfo is supporting it + if (flag) + Assert(internal::MatrixFreeFunctions::ShapeInfo::is_supported( + fe), + ExcInternalError()); + + return flag; + } + } // namespace FEPointEvaluation +} // namespace internal + + +// explicit instantiations +#include "fe_point_evaluation.inst" + + +DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_point_evaluation.inst.in b/source/fe/fe_point_evaluation.inst.in new file mode 100644 index 0000000000..4f6f7d8095 --- /dev/null +++ b/source/fe/fe_point_evaluation.inst.in @@ -0,0 +1,24 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2021 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE.md at +// the top level directory of deal.II. +// +// --------------------------------------------------------------------- + + + +for (deal_II_dimension, deal_II_space_dimension : DIMENSIONS) + { +#if deal_II_dimension <= deal_II_space_dimension + template bool internal::FEPointEvaluation::is_fast_path_supported( + const FiniteElement &fe); +#endif + }