- Added functionality to dump zero crossings during runtime

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23201 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: lochel

SimulationRuntime/c/simulation/solver/events.c

@@ -263,24 +263,29 @@ void handleEvents(DATA* data, LIST* eventLst, double *eventTime, SOLVER_INFO* so
     data->simulationInfo.chatteringInfo.lastSteps[data->simulationInfo.chatteringInfo.currentIndex]=1;
     data->simulationInfo.chatteringInfo.lastTimes[data->simulationInfo.chatteringInfo.currentIndex]=time;
 
-    if (!data->simulationInfo.chatteringInfo.messageEmitted && data->simulationInfo.chatteringInfo.lastStepsNumStateEvents == data->simulationInfo.chatteringInfo.numEventLimit) {
+    if (!data->simulationInfo.chatteringInfo.messageEmitted && data->simulationInfo.chatteringInfo.lastStepsNumStateEvents == data->simulationInfo.chatteringInfo.numEventLimit)
+    {
       int numEventLimit = data->simulationInfo.chatteringInfo.numEventLimit;
       int currentIndex = data->simulationInfo.chatteringInfo.currentIndex;
       double t0 = data->simulationInfo.chatteringInfo.lastTimes[(currentIndex+1) % numEventLimit];
-      if (time - t0 < data->simulationInfo.stepSize) {
+      if (time - t0 < data->simulationInfo.stepSize)
+      {
         long ix = *((long*) listNodeData(listFirstNode(eventLst)));
         int *eq_indexes;
         const char *exp_str = data->callback->zeroCrossingDescription(ix,&eq_indexes);
         infoStreamPrintWithEquationIndexes(LOG_STDOUT, 0, eq_indexes, "Chattering detected around time %.12g..%.12g (%d state events in a row with a total time delta less than the step size %.12g). This can be a performance bottleneck. Use -lv LOG_EVENTS for more information. The zero-crossing was: %s", t0, time, numEventLimit, data->simulationInfo.stepSize, exp_str);
         data->simulationInfo.chatteringInfo.messageEmitted = 1;
-        if (omc_flag[FLAG_ABORT_SLOW]) {
+        if (omc_flag[FLAG_ABORT_SLOW])
+        {
           throwStreamPrintWithEquationIndexes(data->threadData, eq_indexes, "Aborting simulation due to chattering being detected and the simulation flags requesting we do not continue further.");
         }
       }
     }
 
     listClear(eventLst);
-  } else {
+  }
+  else
+  {
     data->simulationInfo.chatteringInfo.lastSteps[data->simulationInfo.chatteringInfo.currentIndex]=0;
     /* Setting time does not matter */
   }
@@ -346,7 +351,8 @@ void findRoot(DATA* data, LIST *eventList, double *eventTime)
   assert(states_right);
   assert(states_left);
 
-  for(it=listFirstNode(eventList); it; it=listNextNode(it)) {
+  for(it=listFirstNode(eventList); it; it=listNextNode(it))
+  {
     infoStreamPrint(LOG_ZEROCROSSINGS, 0, "search for current event. Events in list: %ld", *((long*)listNodeData(it)));
   }
 
@@ -360,7 +366,8 @@ void findRoot(DATA* data, LIST *eventList, double *eventTime)
   if(listLen(tmpEventList) == 0)
   {
     double value = fabs(data->simulationInfo.zeroCrossings[*((long*) listFirstData(eventList))]);
-    for(it = listFirstNode(eventList); it; it = listNextNode(it)) {
+    for(it = listFirstNode(eventList); it; it = listNextNode(it))
+    {
       double fvalue = fabs(data->simulationInfo.zeroCrossings[*((long*) listNodeData(it))]);
       if(value > fvalue)
       {

SimulationRuntime/c/simulation/solver/initialization/initialization.c

@@ -1139,6 +1139,9 @@ int initialization(DATA *data, const char* pInitMethod, const char* pOptiMethod,
   initSample(data, data->simulationInfo.startTime, data->simulationInfo.stopTime);
   data->callback->function_storeDelayed(data);
   data->callback->function_updateRelations(data, 1);
+  
+  printRelations(data, LOG_EVENTS);
+  printZeroCrossings(data, LOG_EVENTS);
 
   /* valid system for the first time! */
   TRACE_POP

SimulationRuntime/c/simulation/solver/model_help.c

@@ -85,7 +85,7 @@ void updateDiscreteSystem(DATA *data)
 
   relationChanged = checkRelations(data);
   discreteChanged = data->callback->checkForDiscreteChanges(data);
-  while(!initial() && (discreteChanged || data->simulationInfo.needToIterate || relationChanged))
+  while(!data->simulationInfo.initial && (discreteChanged || data->simulationInfo.needToIterate || relationChanged))
   {
     if(data->simulationInfo.needToIterate)
       debugStreamPrint(LOG_EVENTS_V, 0, "reinit() call. Iteration needed!");
@@ -381,7 +381,38 @@ void printRelations(DATA *data, int stream)
 
   infoStreamPrint(stream, 1, "status of relations at time=%.12g", data->localData[0]->timeValue);
   for(i=0; i<data->modelData.nRelations; i++)
-    infoStreamPrint(stream, 0, "[%ld] %s = %c | pre(%s) = %c", i, data->callback->relationDescription(i), data->simulationInfo.relations[i] ? 'T' : 'F', data->callback->relationDescription(i), data->simulationInfo.relationsPre[i] ? 'T' : 'F');
+    infoStreamPrint(stream, 0, "[%ld] %s = %c | pre(%s) = %c", i+1, data->callback->relationDescription(i), data->simulationInfo.relations[i] ? 'T' : 'F', data->callback->relationDescription(i), data->simulationInfo.relationsPre[i] ? 'T' : 'F');
+  messageClose(stream);
+
+  TRACE_POP
+}
+
+/*! \fn printZeroCrossings
+ *
+ *  print all zero crossings
+ *
+ *  \param [in]  [data]
+ *  \param [in]  [stream]
+ */
+void printZeroCrossings(DATA *data, int stream)
+{
+  long i;
+
+  TRACE_PUSH
+
+  if (!ACTIVE_STREAM(stream))
+  {
+    TRACE_POP
+    return;
+  }
+
+  infoStreamPrint(stream, 1, "status of zero crossings at time=%.12g", data->localData[0]->timeValue);
+  for(i=0; i<data->modelData.nZeroCrossings; i++)
+  {
+    int *eq_indexes;
+    const char *exp_str = data->callback->zeroCrossingDescription(i,&eq_indexes);
+    infoStreamPrintWithEquationIndexes(stream, 0, eq_indexes, "[%ld] %s = %g | pre(%s) = %g", i+1, exp_str, data->simulationInfo.zeroCrossings[i], exp_str, data->simulationInfo.zeroCrossingsPre[i]);
+  }
   messageClose(stream);
 
   TRACE_POP
@@ -949,7 +980,8 @@ void deInitializeDataStruc(DATA *data)
   TRACE_PUSH
 
   /* prepair RingBuffer */
-  for(i=0; i<SIZERINGBUFFER; i++){
+  for(i=0; i<SIZERINGBUFFER; i++)
+  {
     SIMULATION_DATA* tmpSimData = (SIMULATION_DATA*) data->localData[i];
     /* free buffer for all variable values */
     free(tmpSimData->realVars);

SimulationRuntime/c/simulation/solver/model_help.h

@@ -97,6 +97,7 @@ void copyStartValuestoInitValues(DATA *data);
 
 void printAllVars(DATA *data, int ringSegment, int stream);
 void printRelations(DATA *data, int stream);
+void printZeroCrossings(DATA *data, int stream);
 void printParameters(DATA *data, int stream);
 
 void overwriteOldSimulationData(DATA *data);

SimulationRuntime/c/simulation/solver/perform_simulation.c

@@ -207,7 +207,7 @@ int prefixedName_performSimulation(DATA* data, SOLVER_INFO* solverInfo)
       if(eventType > 0) /* event */
       {
         threadData->currentErrorStage = ERROR_EVENTSEARCH;
-        infoStreamPrint(LOG_EVENTS, 1, "%s event at time %.12g", eventType == 1 ? "time" : "state", solverInfo->currentTime);
+        infoStreamPrint(LOG_EVENTS, 1, "%s event at time=%.12g", eventType == 1 ? "time" : "state", solverInfo->currentTime);
         /* prevent emit if noEventEmit flag is used */
         if (!(omc_flag[FLAG_NOEVENTEMIT])) /* output left limit */
           sim_result.emit(&sim_result,data);

SimulationRuntime/c/util/omc_error.c

@@ -379,7 +379,6 @@ void debugStreamPrintWithEquationIndexes(int stream, int indentNext, const int *
     messageFunction(LOG_TYPE_DEBUG, stream, indentNext, logBuffer, 0, indexes);
   }
 }
-
 #endif
 
 static inline jmp_buf* getBestJumpBuffer(threadData_t *threadData)