- remove function call

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19051 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 11, 2014 · 25b970a · 25b970a
1 parent 6d7ab38
commit 25b970a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/SimulationRuntime/c/optimization/constraints/evalfDiffG.c b/SimulationRuntime/c/optimization/constraints/evalfDiffG.c
@@ -105,7 +105,7 @@ Bool evalfDiffG(Index n, double * x, Bool new_x, Index m, Index njac, Index *iRo
 
     for(i = 0, id = iData->nv; i<1; ++i)
     {
-      diff_functionODE0(x, iData->t0 , iData);
+      diff_functionODE(x, iData->t0 , iData, iData->J0);
       for(l=0; l<iData->deg; ++l, id += iData->nv)
       {
         diff_functionODE(x+id , iData->time[i*iData->deg + l] , iData, iData->J);

diff --git a/SimulationRuntime/c/optimization/constraints/evalfG.c b/SimulationRuntime/c/optimization/constraints/evalfG.c
@@ -45,8 +45,6 @@
 
 #ifdef WITH_IPOPT
 
-int diff_functionODE_debug(double* v, double t, IPOPT_DATA_ *iData);
-
 /*!
  *  eval s.t.
  *  author: Vitalij Ruge
@@ -233,16 +231,6 @@ int diff_functionODE(double* v, double t, IPOPT_DATA_ *iData, double **J)
   return 0;
 }
 
-/*!
- *  eval a part from the derivate of s.t.
- *  author: Vitalij Ruge
- **/
-int diff_functionODE0(double* v, double t, IPOPT_DATA_ *iData)
-{
-  diff_functionODE(v, t, iData, iData->J0);
-  return 0;
-}
-
 /*
  *  function calculates a symbolic colored jacobian matrix by
  *  author: Willi Braun
@@ -259,7 +247,6 @@ int diff_symColoredODE(double *v, double t, IPOPT_DATA_ *iData, double **J)
   x = v;
   u = x + iData->nx;
 
-
   nx = data->simulationInfo.analyticJacobians[index].sizeCols;
   cC =  (int*)data->simulationInfo.analyticJacobians[index].sparsePattern.colorCols;
   lindex = (int*)data->simulationInfo.analyticJacobians[index].sparsePattern.leadindex;

diff --git a/SimulationRuntime/c/optimization/localFunction.h b/SimulationRuntime/c/optimization/localFunction.h
@@ -68,7 +68,6 @@ Bool ipopt_h(int n, double *x, Bool new_x, double obj_factor, int m, double *lam
 
 /*JAC*/
 int diff_functionODE(double *v, double t, IPOPT_DATA_ *iData, double **J);
-int diff_functionODE0(double *v, double t, IPOPT_DATA_ *iData);
 int diff_symColoredODE(double *v, double t, IPOPT_DATA_ *iData, double **J);
 int diff_symColoredObject(IPOPT_DATA_ *iData, double *gradF, int this_it);