fixed empty dyn. optimization

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24004 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 11, 2015 · e97f447 · e97f447
1 parent 15b286c
commit e97f447
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/SimulationRuntime/c/optimization/DataManagement/InitialGuess.c b/SimulationRuntime/c/optimization/DataManagement/InitialGuess.c
@@ -328,6 +328,11 @@ static inline void smallIntSolverStep(DATA* data, SOLVER_INFO* solverInfo, const
 
     rotateRingBuffer(data->simulationData, 1, (void**) data->localData);
     do{
+      if(data->modelData.nStates < 1){
+        solverInfo->currentTime = tstop;
+        data->localData[0]->timeValue = tstop; 
+        break;
+      }
       solverInfo->currentStepSize = a*(tstop - solverInfo->currentTime);
       err = dassl_step(data, solverInfo);
       a *= 0.5;

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -111,7 +111,12 @@ int solver_main_step(DATA* data, SOLVER_INFO* solverInfo)
 
 #ifdef WITH_IPOPT
   case S_OPTIMIZATION:
-    retVal = ipopt_step(data, solverInfo);
+    if((int)(data->modelData.nStates + data->modelData.nInputVars) > 0){
+      retVal = ipopt_step(data, solverInfo);
+    }else{
+      solverInfo->solverMethod = S_EULER;
+      retVal = euler_ex_step(data, solverInfo);
+    }
     TRACE_POP
     return retVal;
 #endif