UMAT fixes for Intel LLVM builds

LLNL · Jul 14, 2024 · 96914a9 · 96914a9
1 parent 2d49b6f
commit 96914a9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/mechanics_umat.cpp b/src/mechanics_umat.cpp
@@ -532,7 +532,7 @@ void AbaqusUmatModel::ModelSetup(const int nqpts, const int nelems, const int sp
 
 
          // call c++ wrapper of umat routine
-         umat(&stress[0], &statev[0], &ddsdde[0], &sse, &spd, &scd, &rpl,
+         umat_call(&stress[0], &statev[0], &ddsdde[0], &sse, &spd, &scd, &rpl,
               ddsdt, drplde, &drpldt, &stran[0], &dstran[0], time,
               &deltaTime, &tempk, &dtemp, &predef, &dpred, &cmname,
               &ndi, &nshr, &ntens, &nstatv, &props[0], &nprops, &coords[0],

diff --git a/src/umat_tests/umat.cxx b/src/umat_tests/umat.cxx
@@ -11,7 +11,7 @@
 
 #ifdef WIN32
 #define UMAT_API __declspec(dllexport)
-#elif defined(__clang__)
+#elif defined(__clang__)  || defined(__INTEL_LLVM_COMPILER)
 #define UMAT_API extern "C"
 #define UMAT umat
 #else

diff --git a/src/umat_tests/userumat.cxx b/src/umat_tests/userumat.cxx
@@ -14,15 +14,15 @@ extern "C" {
 
 #ifdef WIN32
 #define UMAT_API __declspec(dllexport)
-#elif defined(__clang__)
+#elif defined(__clang__) || defined(__INTEL_LLVM_COMPILER)
 #define UMAT_API
 #define UMAT umat
 #else
 #define UMAT_API
 #define UMAT umat_
 #endif
 
-     // A fortran function defined in umat.f                                                                    
+   // A fortran function defined in umat.f
    void UMAT(real8 *stress, real8 *statev, real8 *ddsdde,
                  real8 *sse, real8 *spd, real8 *scd, real8 *rpl,
                  real8 *ddsdt, real8 *drplde, real8 *drpldt,
@@ -36,7 +36,7 @@ extern "C" {
 
   // The C entry point function for my umat
    UMAT_API void
-   umat(real8 *stress, real8 *statev, real8 *ddsdde,
+   umat_call(real8 *stress, real8 *statev, real8 *ddsdde,
              real8 *sse, real8 *spd, real8 *scd, real8 *rpl,
              real8 *ddsdt, real8 *drplde, real8 *drpldt,
              real8 *stran, real8 *dstran, real8 *time,

diff --git a/src/umat_tests/userumat.h b/src/umat_tests/userumat.h
@@ -41,7 +41,7 @@ extern "C" {
                  int *layer, int *kspt, int *kstep, int *kinc);
    // The C entry point function for my umat
    UMAT_API void
-   umat(real8 *stress, real8 *statev, real8 *ddsdde,
+   umat_call(real8 *stress, real8 *statev, real8 *ddsdde,
                     real8 *sse, real8 *spd, real8 *scd, real8 *rpl,
                     real8 *ddsdt, real8 *drplde, real8 *drpldt,
                     real8 *stran, real8 *dstran, real8 *time,

diff --git a/src/userumat.h b/src/userumat.h
@@ -16,6 +16,9 @@
 extern "C" {
 #ifdef WIN32
 #define UMAT_API __declspec(dllexport)
+#elif defined(__clang__) || defined(__INTEL_LLVM_COMPILER)
+#define UMAT_API
+#define UMAT_FUNC umat
 #else
 #define UMAT_API
 #define UMAT_FUNC umat_ 
@@ -35,7 +38,7 @@ extern "C" {
 
    // The C entry point function for my umat
    UMAT_API void
-   umat(real8 *stress, real8 *statev, real8 *ddsdde,
+   umat_call(real8 *stress, real8 *statev, real8 *ddsdde,
         real8 *sse, real8 *spd, real8 *scd, real8 *rpl,
         real8 *ddsdt, real8 *drplde, real8 *drpldt,
         real8 *stran, real8 *dstran, real8 *time,