- move some post-initialization procedures

- change stream for a assertion notification git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19254 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 22, 2014 · 49f46e5 · 49f46e5
1 parent b958f61
commit 49f46e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/SimulationRuntime/c/simulation/solver/initialization/initialization.c b/SimulationRuntime/c/simulation/solver/initialization/initialization.c
@@ -1081,7 +1081,7 @@ int initialization(DATA *data, const char* pInitMethod, const char* pOptiMethod,
   infoStreamPrint(LOG_INIT, 0, "### END INITIALIZATION ###");
 
   data->simulationInfo.initial = 0;
-
+  
   /* initialization is done */
   initSample(data, data->simulationInfo.startTime, data->simulationInfo.stopTime);
 
@@ -1094,6 +1094,14 @@ int initialization(DATA *data, const char* pInitMethod, const char* pOptiMethod,
   saveZeroCrossings(data);
   storePreValues(data);                 /* save pre-values */
   overwriteOldSimulationData(data);     /* if there are non-linear equations */
+
+  storePreValues(data);
+  storeOldValues(data);
+  data->callback->function_storeDelayed(data);
+  data->callback->function_updateRelations(data, 1);
+  storeRelations(data);
+  updateHysteresis(data);
+  saveZeroCrossings(data);
 
   return retVal;
 }
diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -363,18 +363,11 @@ int initializeModel(DATA* data, const char* init_initMethod,
       retValue = -1;
     }
 
-    storePreValues(data);
-    storeOldValues(data);
-    data->callback->function_storeDelayed(data);
-    data->callback->function_updateRelations(data, 1);
-    storeRelations(data);
-    updateHysteresis(data);
-    saveZeroCrossings(data);
     success = 1;
     MMC_CATCH_INTERNAL(simulationJumpBuffer)
     if (!success) {
       retValue =  -1;
-      infoStreamPrint(LOG_STDOUT, 0, "model terminate | Simulation terminated by an assertion at initialization");
+      infoStreamPrint(LOG_ASSERT, 0, "simulation terminated by an assertion at initialization");
     }
   }