-vxworks includes

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22566 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 2, 2014 · 1f1710e · 1f1710e
1 parent 0a00782
commit 1f1710e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/SimulationRuntime/cpp/Solver/Newton/Newton.cpp b/SimulationRuntime/cpp/Solver/Newton/Newton.cpp
@@ -12,6 +12,7 @@ Newton::Newton(IAlgLoop* algLoop, INonLinSolverSettings* settings)
 , _yHelp            (NULL)
 , _f                (NULL)
 , _fHelp            (NULL)
+,_iHelp				(NULL)
 , _jac                (NULL)
 , _dimSys            (0)
 , _firstCall        (true)
@@ -25,6 +26,7 @@ Newton::~Newton()
     if(_yHelp)    delete []    _yHelp;
     if(_f)        delete []    _f;
     if(_fHelp)    delete []    _fHelp;
+	if(_iHelp)    delete []    _iHelp;
     if(_jac)    delete []    _jac;
 }
 
@@ -53,12 +55,14 @@ void Newton::initialize()
             if(_f)        delete []    _f;
             if(_yHelp)    delete []    _yHelp;
             if(_fHelp)    delete []    _fHelp;
+			if(_iHelp)    delete []    _iHelp;
             if(_jac)    delete []    _jac;
 
             _y            = new double[_dimSys];
             _f            = new double[_dimSys];
             _yHelp        = new double[_dimSys];
             _fHelp        = new double[_dimSys];
+			_iHelp 		  = new long int[_dimSys];
             _jac        = new double[_dimSys*_dimSys];
 
             _algLoop->getReal(_y);
@@ -129,7 +133,7 @@ void Newton::solve()
                 {
                     //calcFunction(_yHelp,_fHelp);
                     _algLoop->getSystemMatrix(_jac);
-                    dgesv_(&_dimSys,&dimRHS,_jac,&_dimSys,_fHelp,_f,&_dimSys,&irtrn);
+                    dgesv_(&_dimSys,&dimRHS,_jac,&_dimSys,_iHelp,_f,&_dimSys,&irtrn);
                     memcpy(_y,_f,_dimSys*sizeof(double));
                     _algLoop->setReal(_y);
                     _iterationStatus = DONE;
@@ -141,7 +145,7 @@ void Newton::solve()
                     calcJacobian();
                 }
                 // Solve linear System
-                dgesv_(&_dimSys,&dimRHS,_jac,&_dimSys,_fHelp,_f,&_dimSys,&irtrn);
+                dgesv_(&_dimSys,&dimRHS,_jac,&_dimSys,_iHelp,_f,&_dimSys,&irtrn);
 
                 if(irtrn!=0)
                 {

diff --git a/SimulationRuntime/cpp/Solver/Newton/Newton.h b/SimulationRuntime/cpp/Solver/Newton/Newton.h
@@ -89,4 +89,6 @@ class Newton : public IAlgLoopSolver
         *_yHelp,                    ///< Temp        - Auxillary variables
         *_fHelp,                    ///< Temp        - Auxillary variables
         *_jac;                        ///< Temp        - Jacobian
+
+	long int *_iHelp;
 };