fixes for METIS scheduler and UMFPACK solver

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23822 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Michael Kloeppel

Compiler/runtime/config.unix.h.in

@@ -52,7 +52,7 @@
 #define CONFIG_SYSTEMLIBS mmc_mk_cons(mmc_mk_scon("-lomcruntime"),mmc_mk_cons(mmc_mk_scon("-lexpat"),mmc_mk_cons(mmc_mk_scon("-lsqlite3"),mmc_mk_cons(mmc_mk_scon(CONFIG_LPSOLVE55),mmc_mk_cons(mmc_mk_scon(CONFIG_CORBALIBS),mmc_mk_nil())))))
 
 #define USE_GRAPH @USE_GRAPH@
-#if usegraph
+#if USE_GRAPH
 #define USE_PATOH @USE_PATOH@
 #define USE_METIS @USE_METIS@
 #endif

SimulationRuntime/cpp/Solver/UmfPack/UmfPack.cpp

@@ -38,13 +38,14 @@ void UmfPack::solve()
         long int dimRHS  = 1;          // Dimension of right hand side of linear system (=b)
         long int dimSys = _algLoop->getDimReal();
         long int irtrn  = 0;          // Retrun-flag of Fortran code        _algLoop->getReal(_y);
-        double * _helpArray = new double[_algLoop->getDimReal()];
+        long int * _helpArray = new long int[_algLoop->getDimReal()];
         _algLoop->evaluate();
         _algLoop->getRHS(_rhs);
         _algLoop->getSystemMatrix(_jacd);
         dgesv_(&dimSys,&dimRHS,_jacd,&dimSys,_helpArray,_rhs,&dimSys,&irtrn);
         memcpy(_x,_rhs,dimSys*sizeof(double));
         _algLoop->setReal(_x);
+        delete [] _helpArray;
   } else {
        _algLoop->evaluate();
       _algLoop->getRHS(_rhs);

configure.in

@@ -28,8 +28,7 @@ AC_SUBST(IDLPYTHONCMD)
 AC_SUBST(USE_GRAPH)
 AC_SUBST(USE_METIS)
 AC_SUBST(USE_PATOH)
-AC_SUBST(METISHOME)
-AC_SUBST(PATOHHOME)
+AC_SUBST(GRAPHLIB)
 AC_SUBST(GENERATED_AUTOCONF_FILES)
 AC_SUBST(RT_LDFLAGS)
 AC_SUBST(RT_LDFLAGS_SIM)
@@ -818,7 +817,7 @@ AC_ARG_WITH(METIS, [  --with-METIS=DIR                 Compile with Metis graph
   USE_METIS=1
   USE_GRAPH=1
   AC_MSG_RESULT([Enabling METIS... METISHOME="$withval"]);
-  METISHOME="$withval";
+  GRAPHLIB="-L$withval -lmetis";
   USE_PATOH=0
 ], [
     USE_GRAPH=0
@@ -838,7 +837,7 @@ AC_ARG_WITH(PATOH, [  --with-PATOH=DIR                 Compile with PATOH hyperg
     USE_METIS=0
     USE_GRAPH=1
     AC_MSG_RESULT([Enabling PATOH... PATOHHOME="$withval"]);
-  PATOHHOME="$withval";
+    GRAPHLIB="-L$withval -lpatoh";
 ], [
     if test "$USE_METIS" = 0; then
         USE_GRAPH=0