- fixed bug for ModelicaTest.Fluid.TestPipesAndValves.LumpedPipeIniti…

…alization, where endless assert were called git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17684 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 14, 2013 · af948b4 · af948b4
1 parent ceafebe
commit af948b4
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -361,6 +361,14 @@ int initializeModel(DATA* data, const char* init_initMethod,
       retValue = -1;
     }
     restore_memory_state(mem_state);
+
+    storePreValues(data);
+    storeOldValues(data);
+    function_storeDelayed(data);
+    function_updateRelations(data, 1);
+    storeRelations(data);
+    updateHysteresis(data);
+    saveZeroCrossings(data);
   }
   /* catch */
   else
@@ -376,13 +384,6 @@ int initializeModel(DATA* data, const char* init_initMethod,
   if(ACTIVE_STREAM(LOG_DEBUG))
     printParameters(data, LOG_DEBUG);
 
-  storePreValues(data);
-  storeOldValues(data);
-  function_storeDelayed(data);
-  function_updateRelations(data, 1);
-  storeRelations(data);
-  updateHysteresis(data);
-  saveZeroCrossings(data);
 
   /* Initialization complete */
   if(measure_time_flag)