Merge pull request #178 from thelfer/177-mgis-function-rework-the-assign-algorithm-to-use-a-view

177 mgis function rework the assign algorithm to use a view

Author: thelfer

cmake/modules/clang.cmake

@@ -84,6 +84,7 @@ if(enable-parallel-stl-algorithms)
  if(UNIX AND NOT APPLE)
    if(NOT enable-libcxx)
      find_package(TBB REQUIRED)
+     list(APPEND MGIS_REQUIRED_ADDITIONAL_PACKAGES "TBB")
      list(APPEND MGIS_ADDITIONAL_LIBRARIES "TBB::tbb")
    endif(NOT enable-libcxx)
  endif(UNIX AND NOT APPLE)

cmake/modules/compiler.cmake

@@ -11,6 +11,7 @@
 #  MGIS_CMAKE_REQUIRED_INCLUDES = list of include directories
 #  MGIS_CMAKE_REQUIRED_LIBRARIES = list of libraries to link
 #  MGIS_ADDITIONAL_LINK_FLAGS = additional flags for the MFrontGenericInterface library
+#  MGIS_REQUIRED_ADDITIONAL_PACKAGES = additional required packages for the MFrontGenericInterface library
 #
 # This macro is a copy of CheckCXXSourceCompiles.cmake
 # Copyright 2005-2009 Kitware, Inc.
@@ -128,6 +129,7 @@ set(OPTIMISATION_FLAGS "")
 set(COMPILER_WARNINGS  "")
 set(MGIS_ADDITIONAL_LIBRARIES "")
 set(MGIS_ADDITIONAL_LINK_FLAGS "")
+set(MGIS_REQUIRED_ADDITIONAL_PACKAGES "")
 
 option(enable-gpu-offloading "enable offloading on GPUS. Support of offloading depends on compiler support" OFF)
 option(enable-fast-math "enable -ffast-math compiler flag" OFF)

cmake/modules/gcc.cmake

@@ -112,6 +112,7 @@ set(COMPILER_C_WARNINGS "-Wall -W -pedantic")
 
 if(enable-parallel-stl-algorithms)
   find_package(TBB REQUIRED)
+  list(APPEND MGIS_REQUIRED_ADDITIONAL_PACKAGES "TBB")
   list(APPEND MGIS_ADDITIONAL_LIBRARIES "TBB::tbb")
 endif(enable-parallel-stl-algorithms)
 

include/MGIS/Function/Algorithms.hxx

@@ -57,13 +57,11 @@ namespace mgis::function {
                                       FunctionType&,
                                       const ExecutionPolicy,
                                       const EvaluatorType)  //
-      requires(((LinearElementSpaceConcept<std::decay_t<
-                     decltype(getSpace(std::declval<EvaluatorType>()))>>) ||
-                (LinearQuadratureSpaceConcept<std::decay_t<
-                     decltype(getSpace(std::declval<EvaluatorType>()))>>)) &&
-               internals::same_decay_type<
-                   decltype(getSpace(std::declval<FunctionType>())),
-                   decltype(getSpace(std::declval<EvaluatorType>()))>);
+      requires(
+          ((LinearElementSpaceConcept<evaluator_space<EvaluatorType>>) ||
+           (LinearQuadratureSpaceConcept<evaluator_space<EvaluatorType>>)) &&
+          std::same_as<function_space<FunctionType>,
+                       evaluator_space<EvaluatorType>>);
   /*!
    * \brief assign the evaluator to a function
    * \param[in] ctx: execution context
@@ -80,10 +78,7 @@ namespace mgis::function {
       const ExecutionPolicy,
       const EvaluatorType,
       const OperatorType,
-      const real) requires(LinearElementSpaceConcept<std::
-                                                         decay_t<decltype(getSpace(
-                                                             std::declval<
-                                                                 EvaluatorType>()))>>);
+      const real) requires(LinearElementSpaceConcept<evaluator_space<EvaluatorType>>);
 #endif /* MGIS_HAS_STL_PARALLEL_ALGORITHMS */
 
   /*!
@@ -96,13 +91,11 @@ namespace mgis::function {
   [[nodiscard]] constexpr bool assign(AbstractErrorHandler&,
                                       FunctionType&,
                                       const EvaluatorType)  //
-      requires(((LinearElementSpaceConcept<std::decay_t<
-                     decltype(getSpace(std::declval<EvaluatorType>()))>>) ||
-                (LinearQuadratureSpaceConcept<std::decay_t<
-                     decltype(getSpace(std::declval<EvaluatorType>()))>>)) &&
-               internals::same_decay_type<
-                   decltype(getSpace(std::declval<FunctionType>())),
-                   decltype(getSpace(std::declval<EvaluatorType>()))>);
+      requires(
+          ((LinearElementSpaceConcept<evaluator_space<EvaluatorType>>) ||
+           (LinearQuadratureSpaceConcept<evaluator_space<EvaluatorType>>)) &&
+          std::same_as<function_space<FunctionType>,
+                       evaluator_space<EvaluatorType>>);
   /*!
    * \brief assign the evaluator to a function
    * \param[in] ctx: execution context
@@ -115,10 +108,7 @@ namespace mgis::function {
       AbstractErrorHandler&,
       const EvaluatorType,
       const OperatorType,
-      const real) requires(LinearElementSpaceConcept<std::
-                                                         decay_t<decltype(getSpace(
-                                                             std::declval<
-                                                                 EvaluatorType>()))>>);
+      const real) requires(LinearElementSpaceConcept<evaluator_space<EvaluatorType>>);
 
 #endif /* MSC_VER */