Fix build with icpc and icpx

thelfer · Nov 13, 2023 · 714873e · 714873e
1 parent 020bb6b
commit 714873e
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 15 deletions.
diff --git a/bindings/python/mfront/DSLFactory.cxx b/bindings/python/mfront/DSLFactory.cxx
@@ -21,6 +21,6 @@ void declareDSLFactory() {
       .def("getDSLFactory", DSLFactory::getDSLFactory,
            return_value_policy<reference_existing_object>())
       .staticmethod("getDSLFactory")
-      .def("createNewParser", &DSLFactory::createNewParser)
+      .def("createNewParser", &DSLFactory::createNewDSL)
       .def("createNewDSL", &DSLFactory::createNewDSL);
 }
diff --git a/include/TFEL/ContractViolation.hxx b/include/TFEL/ContractViolation.hxx
@@ -24,8 +24,8 @@ namespace tfel {
    * \param[in] msg: message
    */
 #ifndef TFEL_NO_REPORT_CONTRACT_VIOLATION
-  [[noreturn]] TFEL_HOST TFELEXCEPTION_VISIBILITY_EXPORT void reportContractViolation(
-      const char* const msg);
+  [[noreturn]] TFEL_HOST TFELEXCEPTION_VISIBILITY_EXPORT void
+  reportContractViolation(const char* const msg);
 #else  /* TFEL_NO_REPORT_CONTRACT_VIOLATION */
   TFEL_HOST_DEVICE constexpr void reportContractViolation(const char* const) {
   }  // end of reportContractViolation

diff --git a/include/TFEL/Math/ST2toST2/ST2toST2ST2toST2ProductExpr.hxx b/include/TFEL/Math/ST2toST2/ST2toST2ST2toST2ProductExpr.hxx
@@ -50,7 +50,12 @@ namespace tfel::math {
      */
     template <typename ST2toST2Type, typename ST2toST2Type2>
     TFEL_HOST_DEVICE constexpr Expr(const ST2toST2Type& a,
-                                    const ST2toST2Type2& b) {
+                                    const ST2toST2Type2& b)
+        : array_holder<StensorDimeToSize<
+                           getSpaceDimension<ST2toST2ResultType>()>::value *
+                           StensorDimeToSize<
+                               getSpaceDimension<ST2toST2ResultType>()>::value,
+                       numeric_type<ST2toST2ResultType>>() {
       static_assert(implementsST2toST2Concept<ST2toST2Type>());
       static_assert(implementsST2toST2Concept<ST2toST2Type2>());
       static_assert(getSpaceDimension<ST2toST2Type>() == 1u);
@@ -106,7 +111,12 @@ namespace tfel::math {
      */
     template <typename ST2toST2Type, typename ST2toST2Type2>
     TFEL_HOST_DEVICE constexpr Expr(const ST2toST2Type& a,
-                                    const ST2toST2Type2& b) {
+                                    const ST2toST2Type2& b)
+        : array_holder<StensorDimeToSize<
+                           getSpaceDimension<ST2toST2ResultType>()>::value *
+                           StensorDimeToSize<
+                               getSpaceDimension<ST2toST2ResultType>()>::value,
+                       numeric_type<ST2toST2ResultType>>() {
       static_assert(implementsST2toST2Concept<ST2toST2Type>());
       static_assert(implementsST2toST2Concept<ST2toST2Type2>());
       static_assert(getSpaceDimension<ST2toST2Type>() == 2u);

diff --git a/mfront/tests/unit-tests/ComputeStiffnessTensorTest.cxx b/mfront/tests/unit-tests/ComputeStiffnessTensorTest.cxx
@@ -86,7 +86,7 @@ struct ComputeStiffnessTensorTest final : public tfel::tests::TestCase {
     const auto h = tfel::material::ModellingHypothesis::UNDEFINEDHYPOTHESIS;
     auto& f = mfront::DSLFactory::getDSLFactory();
     auto dsl = std::dynamic_pointer_cast<mfront::AbstractBehaviourDSL>(
-        f.createNewParser("Implicit"));
+        f.createNewDSL("Implicit"));
     dsl->analyseString("@ComputeStiffnessTensor {150e9,0.3};");
     const auto& bd = dsl->getBehaviourDescription().getBehaviourData(h);
     TFEL_TESTS_ASSERT(bd.getParameters().size() == 2u);
@@ -103,7 +103,7 @@ struct ComputeStiffnessTensorTest final : public tfel::tests::TestCase {
     const auto h = tfel::material::ModellingHypothesis::UNDEFINEDHYPOTHESIS;
     auto& f = mfront::DSLFactory::getDSLFactory();
     auto dsl = std::dynamic_pointer_cast<mfront::AbstractBehaviourDSL>(
-        f.createNewParser("Implicit"));
+        f.createNewDSL("Implicit"));
     dsl->analyseString(
         "@OrthotropicBehaviour;"
         "@ComputeStiffnessTensor {150e9,150e9,150e9,"
@@ -129,7 +129,7 @@ struct ComputeStiffnessTensorTest final : public tfel::tests::TestCase {
   }
   void check(const std::string& n, const std::string& s) {
     auto& f = mfront::DSLFactory::getDSLFactory();
-    auto dsl = f.createNewParser(n);
+    auto dsl = f.createNewDSL(n);
     try {
       dsl->analyseString(s);
     } catch (std::runtime_error& e) {

diff --git a/mfront/tests/unit-tests/DSLTest.cxx b/mfront/tests/unit-tests/DSLTest.cxx
@@ -188,7 +188,7 @@ struct DSLTest final : public tfel::tests::TestCase {
  private:
   void check(const std::string& n, const std::string& s) {
     auto& f = mfront::DSLFactory::getDSLFactory();
-    auto dsl = f.createNewParser(n);
+    auto dsl = f.createNewDSL(n);
     try {
       dsl->analyseString(s);
     } catch (std::runtime_error& e) {

diff --git a/mfront/tests/unit-tests/OrthotropicAxesConventionTest.cxx b/mfront/tests/unit-tests/OrthotropicAxesConventionTest.cxx
@@ -52,7 +52,7 @@ struct OrthotropicAxesConventionTest final : public tfel::tests::TestCase {
  private:
   void check(const std::string& s) {
     auto& f = mfront::DSLFactory::getDSLFactory();
-    auto dsl = f.createNewParser("Implicit");
+    auto dsl = f.createNewDSL("Implicit");
     try {
       dsl->analyseString(s);
     } catch (std::runtime_error& e) {

diff --git a/mfront/tests/unit-tests/StandardElasticityBrickTest.cxx b/mfront/tests/unit-tests/StandardElasticityBrickTest.cxx
@@ -129,7 +129,7 @@ struct StandardElasticityBrickTest final : public tfel::tests::TestCase {
  private:
   void check(const std::string& s) {
     auto& f = mfront::DSLFactory::getDSLFactory();
-    auto dsl = f.createNewParser("Implicit");
+    auto dsl = f.createNewDSL("Implicit");
     try {
       dsl->analyseString("@DSL \"StandardElasticity\";\n" + s);
     } catch (std::runtime_error& e) {

diff --git a/mfront/tests/unit-tests/StandardElastoViscoPlasticityBrickTest.cxx b/mfront/tests/unit-tests/StandardElastoViscoPlasticityBrickTest.cxx
@@ -149,7 +149,7 @@ struct StandardElastoViscoPlasticityBrickTest final
  private:
   void check(const std::string& s) {
     auto& f = mfront::DSLFactory::getDSLFactory();
-    auto dsl = f.createNewParser("Implicit");
+    auto dsl = f.createNewDSL("Implicit");
     try {
       dsl->analyseString(s);
     } catch (std::runtime_error& e) {

diff --git a/mfront/tests/unit-tests/SwellingTest.cxx.in b/mfront/tests/unit-tests/SwellingTest.cxx.in
@@ -83,7 +83,7 @@ struct SwellingTest final
  private:
   void check(const std::string& s){
     auto& f = mfront::DSLFactory::getDSLFactory();
-    auto dsl = f.createNewParser("DefaultDSL");
+    auto dsl = f.createNewDSL("DefaultDSL");
     try{
       dsl->analyseString(s);
     }

diff --git a/mtest/src/GenericSolver.cxx b/mtest/src/GenericSolver.cxx
@@ -47,7 +47,10 @@ namespace mtest {
     using namespace tfel::math;
     using namespace tfel::material;
     // compute material properties and state variables
-    s.prepare(scs, t, dt);
+    const auto ri = s.prepare(scs, t, dt);
+    if (!ri.first) {
+      return ri;
+    }
     // packaging step
     if (scs.period == 1) {
       if (!s.doPackagingStep(scs)) {
@@ -80,7 +83,10 @@ namespace mtest {
     using size_type = matrix<real>::size_type;
     auto& u1 = scs.u1;
     // compute material properties and state variables
-    s.prepare(scs, t, dt);
+    const auto ri = s.prepare(scs, t, dt);
+    if (!ri.first) {
+      return ri;
+    }
     // initializing the acceleration algorithm
     if (o.aa != nullptr) {
       o.aa->preExecuteTasks();