portability fixes

Author: thelfer

include/MGIS/Function/UniformEvaluator.hxx

@@ -93,17 +93,19 @@ namespace mgis::function {
   template <SpaceConcept SpaceType, std::size_t N>
   UniformEvaluator(const SpaceType&, const real (&)[N])
       ->UniformEvaluator<SpaceType, N>
-  requires(N > 1);
+      /* requires(N > 1) */;  // most compilers (nvhpc, clang, intel) don't
+                              // support require clause on class template
+                              // deduction guide in 2025
 
   template <SpaceConcept SpaceType, std::size_t N>
   UniformEvaluator(const SpaceType&, std::array<real, N>)
       ->UniformEvaluator<SpaceType, N>
-  requires(N > 1);
+      /* requires(N > 1) */;
 
   template <SpaceConcept SpaceType, std::size_t N>
   UniformEvaluator(const SpaceType&, std::span<real, N>)
       ->UniformEvaluator<SpaceType, N>
-  requires(N > 1);
+      /* requires(N > 1) */;
 
   template <SpaceConcept Space, std::size_t N>
   constexpr bool check(AbstractErrorHandler&,

tests/UniformEvaluatorsTest.cxx

@@ -20,13 +20,15 @@
 #include "TFEL/Tests/TestManager.hxx"
 #include "MGIS/Function/BasicLinearSpace.hxx"
 #include "MGIS/Function/UniformEvaluator.hxx"
+#include "MGIS/Function/Tensors.hxx"
 
 struct UniformEvaluatorsTest final : public tfel::tests::TestCase {
   UniformEvaluatorsTest()
       : tfel::tests::TestCase("MGIS/Function", "UniformEvaluatorsTests") {
   }  // end of UniformEvaluatorsTest
   tfel::tests::TestResult execute() override {
     this->test1();
+    this->test2();
     return this->result;
   }
 
@@ -47,6 +49,23 @@ struct UniformEvaluatorsTest final : public tfel::tests::TestCase {
     TFEL_TESTS_STATIC_ASSERT(local_abs(e2(1)[1] + 2) < eps);
     TFEL_TESTS_STATIC_ASSERT(local_abs(e2(1)[2] - 6) < eps);
   }
+  void test2() {
+    using namespace mgis;
+    using namespace mgis::function;
+    auto local_abs = [](const mgis::real r) constexpr {
+      return r > 0 ? r : -r;
+    };
+    constexpr auto eps = real{1e-14};
+    constexpr auto space = BasicLinearSpace{3};
+    constexpr real values[6] = {1, 1, 1, 0, 0, 0};
+    constexpr auto id = UniformEvaluator(space, values) | as_stensor<3>;
+    TFEL_TESTS_STATIC_ASSERT(local_abs(id(1)[0] - 1) < eps);
+    TFEL_TESTS_STATIC_ASSERT(local_abs(id(1)[1] - 1) < eps);
+    TFEL_TESTS_STATIC_ASSERT(local_abs(id(1)[2] - 1) < eps);
+    TFEL_TESTS_STATIC_ASSERT(local_abs(id(1)[3]) < eps);
+    TFEL_TESTS_STATIC_ASSERT(local_abs(id(1)[4]) < eps);
+    TFEL_TESTS_STATIC_ASSERT(local_abs(id(1)[5]) < eps);
+  }
 };
 
 TFEL_TESTS_GENERATE_PROXY(UniformEvaluatorsTest, "UniformEvaluatorsTest");