- better time grid for optimization

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18820 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 28, 2014 · f6f2ec0 · f6f2ec0
1 parent 0673e6c
commit f6f2ec0
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c b/SimulationRuntime/c/optimization/initialOptimizer/allocate_ipopt.c
@@ -270,7 +270,6 @@ int freeIpoptData(IPOPT_DATA_ *iData)
   }
   }
 
-
   free(iData);
   iData = NULL;
   return 0;
@@ -413,19 +412,21 @@ int loadDAEmodel(DATA *data, IPOPT_DATA_ *iData)
   }
 
   iData->time[0] = iData->t0;
+  if(iData->deg == 3){
   for(i = 0,k=0,id=0; i<iData->nsi; ++i,id += iData->deg)
   {
-    if(i>0)
+    if(i)
     {
       iData->time[++k] = iData->time[id] + iData->c1*iData->dt[i];
       iData->time[++k] = iData->time[id] + iData->c2*iData->dt[i];
-      iData->time[++k] = iData->time[id] + iData->c3*iData->dt[i];
+      iData->time[++k] = (i+1)*iData->dt[i];
     }else{
       iData->time[++k] = iData->time[id] + iData->e1*iData->dt[i];
       iData->time[++k] = iData->time[id] + iData->e2*iData->dt[i];
-      iData->time[++k] = iData->time[id] + iData->e3*iData->dt[i];
+      iData->time[++k] = (i+1)*iData->dt[i];
     }
   }
+  }
   iData->time[k] = iData->tf;
 
   if(ACTIVE_STREAM(LOG_IPOPT))