Changeset df48ecd5 in OpenModelica

Timestamp:

2023-03-17T19:04:24+01:00 (14 months ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master

Children:

4101671, eb7ee9f

Parents:

dc27243d

git-author:

bernhardbachmann <bernhardbachmann@…> (03/17/23 19:04:24)

git-committer:

GitHub <noreply@…> (03/17/23 19:04:24)

Message:

Clean-up event handling (#10416)

Location:

OMCompiler/SimulationRuntime/c/simulation/solver

Files:

• gbode_events.c (modified) (1 diff)
• gbode_main.c (modified) (1 diff)
• gbode_main.h (modified) (1 diff)
• gbode_nls.c (modified) (1 diff)

OMCompiler/SimulationRuntime/c/simulation/solver/gbode_events.c

@@ -76 +76 @@
   {
     c = 0.5 * (*a + *b);
-
-    if (gbData->eventSearch == 0) {
-      /*calculates states at time c using interpolation */
-      if (isInnerIntegration) {
-        gbfData = gbData->gbfData;
-        gb_interpolation(gbfData->interpolation,
-                    gbfData->timeLeft,  gbfData->yLeft,  gbfData->kLeft,
-                    gbfData->timeRight, gbfData->yRight, gbfData->kRight,
-                    c, gbfData->y1,
-                    gbData->nStates, NULL,  gbData->nStates, gbfData->tableau, gbfData->x, gbfData->k);
-        y = gbfData->y1;
-      } else {
-        gb_interpolation(gbData->interpolation,
-                    gbData->timeLeft,  gbData->yLeft,  gbData->kLeft,
-                    gbData->timeRight, gbData->yRight, gbData->kRight,
-                    c, gbData->y1,
-                    gbData->nStates, NULL,  gbData->nStates, gbData->tableau, gbData->x, gbData->k);
-        y = gbData->y1;
-      }
+    data->localData[0]->timeValue = c;
+
+    /*calculates states at time c using interpolation */
+    if (isInnerIntegration) {
+      gbfData = gbData->gbfData;
+      gb_interpolation(gbfData->interpolation,
+                  gbfData->timeLeft,  gbfData->yLeft,  gbfData->kLeft,
+                  gbfData->timeRight, gbfData->yRight, gbfData->kRight,
+                  c, data->localData[0]->realVars,
+                  gbData->nStates, NULL,  gbData->nStates, gbfData->tableau, gbfData->x, gbfData->k);
     } else {
-      /*calculates states at time c using integration */
-      if (isInnerIntegration) {
-        gbData->gbfData->time = gbData->gbfData->timeLeft;
-        memcpy(gbData->gbfData->yOld, gbData->gbfData->yLeft, gbData->nStates * sizeof(double));
-
-        gbData->gbfData->stepSize = c - gbData->gbfData->time;
-        gb_step_info = gbData->gbfData->step_fun(data, threadData, solverInfo);
-        y = gbData->gbfData->y;
-      } else {
-        gbData->time = gbData->timeLeft;
-        memcpy(gbData->yOld, gbData->yLeft, gbData->nStates * sizeof(double));
-
-        gbData->stepSize = c - gbData->time;
-        gb_step_info = gbData->step_fun(data, threadData, solverInfo);
-        y = gbData->y;
-      }
-
-      // error handling: try half of the step size!
-      if (gb_step_info != 0)
-      {
-        errorStreamPrint(LOG_STDOUT, 0, "gbode_event: Failed to calculate event time = %5g.", c);
-        exit(1);
-      }
-    }
-
-    data->localData[0]->timeValue = c;
-    for(i=0; i < data->modelData->nStates; i++)
-    {
-      data->localData[0]->realVars[i] = y[i];
+      gb_interpolation(gbData->interpolation,
+                  gbData->timeLeft,  gbData->yLeft,  gbData->kLeft,
+                  gbData->timeRight, gbData->yRight, gbData->kRight,
+                  c, data->localData[0]->realVars,
+                  gbData->nStates, NULL,  gbData->nStates, gbData->tableau, gbData->x, gbData->k);
     }
 

OMCompiler/SimulationRuntime/c/simulation/solver/gbode_main.c

@@ -533 +533 @@
   gbData->err_threshold = 0.1;
   gbData->err_int = 0;            // needed, if GB_INTERPOL_HERMITE_ERRCTRL or GB_DENSE_OUTPUT_ERRCTRL is used
-  gbData->eventSearch = 0;        // use interpolation for event time search
-
 
   if (gbData->multi_rate) {

OMCompiler/SimulationRuntime/c/simulation/solver/gbode_main.h

@@ -165 +165 @@
   int *slowStatesIdx;                               /* Indices of slow states */
   int *sortedStatesIdx;                             /* Indices of all states sorted for highest error */
-  unsigned int eventSearch;                         /* Defines the mode of event handling (0 => interpolation, 1 => integration) */
   modelica_boolean isFirstStep;                     /* True during first Runge-Kutta integrator step, false otherwise */
   unsigned int nlSystemSize;                        /* Size of non-linear system to solve in a RK step. */

OMCompiler/SimulationRuntime/c/simulation/solver/gbode_nls.c

@@ -491 +491 @@
     /* Retry solution process with updated Jacobian */
     if (!solved) {
-      infoStreamPrint(LOG_STDOUT, 0, "GBODE: Solution of NLS failed, Try with updated Jacobian.");
+      infoStreamPrint(LOG_STDOUT, 0, "GBODE: Solution of NLS failed, Try with updated Jacobian at time %g.", gbData->time);
       set_kinsol_parameters(kin_mem, nlsData->size * 4, SUNFALSE, 10, 100*DBL_EPSILON);
       solved = solveNLS(data, threadData, nlsData);