Merge pull request OpenSees#1744 from mhscott/umfpack-dlong

#ifdef for UMFPACK dlong

Author: mhscott

CMakeLists.txt

@@ -600,6 +600,11 @@ target_link_libraries(G3
 
 add_library(OpenSeesLIB  EXCLUDE_FROM_ALL)
 
+#
+# For UMFPACK long int DLONG version -- Gustavo, Michael
+#
+target_compile_definitions(OpenSeesLIB PUBLIC _UMFPACK_DLONG)
+
 target_link_libraries(OpenSeesLIB
     ${OPS_Extension_List}
     OPS_Actor

SRC/system_of_eqn/linearSOE/umfGEN/UmfpackGenLinSolver.cpp

@@ -75,7 +75,9 @@ UmfpackGenLinSolver::~UmfpackGenLinSolver()
 {
     if (Symbolic != 0) {
         if (useLongIndices) {
+#ifdef _UMFPACK_DLONG
             umfpack_dl_free_symbolic(&Symbolic);
+#endif
         } else {
             umfpack_di_free_symbolic(&Symbolic);
         }
@@ -119,6 +121,7 @@ UmfpackGenLinSolver::solve(void)
     void* Numeric = 0;
 
     if (useLongIndices) {
+#ifdef _UMFPACK_DLONG
         // numeric analysis
         SuiteSparse_long *Ap = Ap64.data();
         SuiteSparse_long *Ai = Ai64.data();
@@ -148,6 +151,7 @@ UmfpackGenLinSolver::solve(void)
                    << " -- Umfpackgenlinsolver::solve\n";
             return -1;
         }
+#endif
     } else {
         // numeric analysis
         int *Ap = theSOE->Ap.data();
@@ -195,6 +199,7 @@ UmfpackGenLinSolver::setSize()
     }
 
     if (useLongIndices) {
+#ifdef _UMFPACK_DLONG
         // set default control parameters
         umfpack_dl_defaults(Control);
         Control[UMFPACK_PIVOT_TOLERANCE] = 1.0;
@@ -221,6 +226,7 @@ UmfpackGenLinSolver::setSize()
             Symbolic = 0;
             return -1;
         }
+#endif
     } else {
         // set default control parameters
         umfpack_di_defaults(Control);