- revert revision 24937, because windows build fails

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

Author: Marcus Walther

SimulationRuntime/cpp/Include/Core/Math/Functions.h

@@ -2,6 +2,7 @@
 
 #include <math.h>                        ///< mathematical expressions
 #include <stdlib.h>
+#include "ILapack.h"        ///< For the use of DGESV, etc.
 #include <limits>
 #include <string>
 #include <exception>
@@ -148,6 +149,86 @@ inline double Phorner(double &x, int degree_P, double* P)
     return h*x + P[degree_P];
 }
 
+/// Solution of a (determined) linear homogeneous or inhomogeneous system of equation with quadratic coefficient matrix A
+inline int solveLGS(long int* dim, double* A, double* b)
+{
+    if(dim > 0)
+    {
+        long int
+            dimRHS = 1,                            // number of right hand sides (dimension of b)
+            irtrn = 0;                            // return value
+
+        long int* p = new long int[(int)*dim];        // Pivot elements
+
+        // Solution is written to b
+        /*dgesv_*/dgesv_(dim,&dimRHS,A,dim,p,b,dim,&irtrn);
+
+        delete [] p;
+
+        return ((int)irtrn);
+    }
+    else
+        return 0;
+}
+
+/// Solution of a (determined) linear homogeneous or inhomogeneous system of equation with quadratic almost singular coefficient matrix A
+inline int solveLGSPrecond(long int* dim, double* A, double* b)
+{
+    if(dim > 0)
+    {
+        double
+            dRcond            = 0.0,            // Conditionnumber
+            dForwErr        = 0.0,            // Upper limit for error of largest element in solution vector (=\frac{(\hat{x}_j - x_j)}{x_j})
+            dBackErr        = 0.0;            // Lower limit for error of largest element in solution vector (=\frac{(\hat{x}_j - x_j)}{x_j})
+
+        char
+            jobFactorize        = 'E',        // Jac is equilibrated if necessary, then copied to JacScal and factored
+            jobTranspose        = 'N',        // A * X = B (No transpose)
+            jobEquilibriate        = 'B';        // Both row and column equilibration, Jac isreplaced by diag(R)*Jac*diag(C).
+
+        double
+            *p,                                // Pivot elements
+            *AScaled,                        // Factored form of the equilibrated matrix A
+            *R,                                // Row scale factors for A
+            *C,                                // Column scale factors for A
+            *X,
+            *work;                            // work array
+
+        long int
+            dimRHS = 1,                        // number of right hand sides (dimension of b)
+            irtrn = 0,                        // return value
+            *iwork;                            // work array
+
+        p        = new double[(int)*dim];
+        R        = new double[(int)*dim];
+        C        = new double[(int)*dim];
+        X        = new double[(int)*dim];
+        work    = new double[4*(int)*dim];
+        iwork    = new long int[(int)*dim];
+        AScaled    = new double[(int)*dim*(int)*dim];
+
+        // Scale row and columns of A, so that condition number is reduced
+        // solve linear system by LU-decomposion and Forw.-Backw.-Subst.
+        // _f is overwirtten with diag(R)*_f
+        DGESVX(&jobFactorize,&jobTranspose,dim,&dimRHS,A,dim,AScaled,dim,p,
+            &jobEquilibriate,R,C,b,dim,X,dim,&dRcond,&dForwErr,&dBackErr,
+            work,iwork,&irtrn);
+
+        delete [] p;
+        delete [] R;
+        delete [] C;
+        delete [] X;
+        delete [] work;
+        delete [] iwork;
+        delete [] AScaled;
+
+        return irtrn;
+
+    }
+    else
+        return 0;
+}
+
 template<class T >
 inline bool in_range(T i,T start,T stop)
 {

SimulationRuntime/cpp/Include/Solver/CVode/CVode.h

@@ -8,8 +8,8 @@
 #include <cvode/cvode.h>
 #include <nvector/nvector_serial.h>
 #include <sundials/sundials_direct.h>
-//#include <cvode/cvode_dense.h>
-#include <cvode/cvode_lapack.h>
+#include <cvode/cvode_dense.h>
+#include <cvode/cvode_spgmr.h>
 
 #ifdef RUNTIME_PROFILING
 #include <Core/Utils/extension/measure_time.hpp>

SimulationRuntime/cpp/Solver/CVode/CVode.cpp

@@ -254,7 +254,7 @@ void Cvode::initialize()
       throw ModelicaSimulationError(SOLVER,/*_idid,_tCurrent,*/"Cvode::initialize()");
 
     // Initialize linear solver
-  _idid = CVLapackDense(_cvodeMem, _dimSys);
+  _idid = CVDense(_cvodeMem, _dimSys);
     if (_idid < 0)
       throw ModelicaSimulationError(SOLVER,"Cvode::initialize()");
 

SimulationRuntime/cpp/Solver/Euler/Euler.cpp

@@ -3,7 +3,6 @@
 #include <SimCoreFactory/OMCFactory/OMCFactory.h>
 #include <Solver/Euler/Euler.h>
 #include <Solver/Euler/EulerSettings.h>
-#include <Core/Math/ILapack.h>
 
 
 

SimulationRuntime/cpp/Solver/Kinsol/Kinsol.cpp

@@ -1,7 +1,6 @@
 #include <Core/Modelica.h>
 #include <Solver/Kinsol/Kinsol.h>
 #include <Solver/Kinsol/KinsolSettings.h>
-#include <Core/Math/ILapack.h>
 
 #if defined(__TRICORE__)
 #include <include/kinsol/kinsol.h>

SimulationRuntime/cpp/Solver/UmfPack/UmfPack.cpp

@@ -1,5 +1,4 @@
 #include <Solver/UmfPack/UmfPack.h>
-#include <Core/Math/ILapack.h>
 
 UmfPack::UmfPack(IAlgLoop* algLoop, ILinSolverSettings* settings) : _iterationStatus(CONTINUE), _umfpackSettings(settings), _algLoop(algLoop), _jacs(NULL), _rhs(NULL), _firstuse(true), _jacd(NULL)
 {