Removed unused variables in optimization

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19888 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 31, 2014 · 016bd45 · 016bd45
1 parent 8db0752
commit 016bd45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/SimulationRuntime/c/optimization/initialOptimizer/allocate_optimizer_vars.c b/SimulationRuntime/c/optimization/initialOptimizer/allocate_optimizer_vars.c
@@ -82,8 +82,6 @@ int allocateIpoptData(IPOPT_DATA_ *iData)
   iData->mult_g = (double*)malloc(ng*sizeof(double));
   iData->mult_x_L = (double*)malloc(dim->NV*sizeof(double));
   iData->mult_x_U = (double*)malloc(dim->NV*sizeof(double));
-  iData->lhs = (double*)malloc((int)dim->nJ*sizeof(double));
-  iData->rhs = (double*)malloc((int)dim->nJ*sizeof(double));
 
   for(i =0; i< dim->deg + 1; ++i)
     mbase->dotx[i] = (double*)malloc(dim->nx*sizeof(double));
@@ -246,8 +244,6 @@ static int freeIpoptData(IPOPT_DATA_ *iData)
   free(dtime->time);
   free(iData->w);
   free(dtime->dt);
-  free(iData->lhs);
-  free(iData->rhs);
   free(iData->sv);
   free(iData->sh);
   free(iData->start_u);

diff --git a/SimulationRuntime/c/optimization/ipoptODEstruct.h b/SimulationRuntime/c/optimization/ipoptODEstruct.h
@@ -199,12 +199,8 @@ typedef struct IPOPT_DATA_
 
   /* ODE */
   double * x0;
-
-
   double * start_u;
 
-  double *lhs;
-  double *rhs;
   double *sh;
   double *sv;
   double *v;
@@ -213,19 +209,16 @@ typedef struct IPOPT_DATA_
 
   int endN;
 
-  int * iRow;
-  int * iCol;
-
   double *mult_g;
   double *mult_x_L;
   double *mult_x_U;
 
   int current_var;
   int current_time;
-  double pmayer;
-  double plagrange;
+
   short mayer_index;
   short lagrange_index;
+
   DATA * data;
 
   char ** input_name;