- revert r20006

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20025 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 7, 2014 · c6c2b6f · c6c2b6f
1 parent 0560a88
commit c6c2b6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/SimulationRuntime/cpp/Solver/Hybrj/Hybrj.cpp b/SimulationRuntime/cpp/Solver/Hybrj/Hybrj.cpp
@@ -189,8 +189,7 @@ void Hybrj::solve()
         int iter = 0;
         int iter_retry = 0;
         int iter_retry2 = 0;
-        int info;
-        int dummySysNumber;
+        int info;
         _iterationStatus = CONTINUE;
         bool isConsistent = true;
         double local_tol = 1e-12;
@@ -201,7 +200,7 @@ void Hybrj::solve()
                 std::transform (_x, _x+_dimSys, _x_scale,_x, std::divides<double>());
             __minpack_func__(hybrj)((minpack_funcder_nn)fcn, &_dimSys, _x, _f, _jac, &_ldfjac, &_xtol, &_maxfev, _diag, 
                 &_mode, &_factor, &_nprint, &info, &_nfev, &_njev, _r, &_lr, _qtf, 
-                _wa1, _wa2, _wa3, _wa4, _data, &dummySysNumber);
+                _wa1, _wa2, _wa3, _wa4,_data);
             //check if  the conditions of the system has changed 
             if(isConsistent)
             {
@@ -423,7 +422,7 @@ void Hybrj::calcJacobian(double *fjac)
 
 }
 
-void Hybrj::fcn(const int *n, const double *x, double *fvec, double *fjac, const int *ldfjac, int *iflag, void* userdata, const int *sysNumber)
+void Hybrj::fcn(const int *n, const double *x, double *fvec, double *fjac, const int *ldfjac, int *iflag, void* userdata)
 {
     if(*iflag == 1)
     {

diff --git a/SimulationRuntime/cpp/Solver/Hybrj/Hybrj.h b/SimulationRuntime/cpp/Solver/Hybrj/Hybrj.h
@@ -35,7 +35,7 @@ class Hybrj : public IAlgLoopSolver
     void extrapolateVars();
     /// Encapsulation of determination of Jacobian
     void calcJacobian(double* jac); 
-    static void fcn(const int *n, const double *x, double *fvec, double *fjac, const int *ldfjac, int *iflag, void* userdata, const int* sysNumber);
+    static void fcn(const int *n, const double *x, double *fvec, double *fjac, const int *ldfjac, int *iflag,void* userdata);
 
     // Member variables
     //---------------------------------------------------------------