Changeset eff3237 in OpenModelica

Timestamp:

2020-10-21T15:14:35+02:00 (3 years ago)

Author:

Adrian Pop <adrian.pop@…>

Children:

ca0708d0

Parents:

22914a1b

git-author:

AnHeuermann <andreas.heuermann@…> (10/08/20 12:44:36)

git-committer:

Adrian Pop <adrian.pop@…> (10/21/20 15:14:35)

Message:

Catch error in initalization and close message and file

• Related ticket: #5805

File:

• OMCompiler/SimulationRuntime/c/simulation/solver/initialization/initialization.c (modified) (3 diffs)

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

@@ -276 +276 @@
     char buffer[4096];
     double lambda;
+    int success = 0;
 
     infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "Global homotopy with equidistant step size started.");
@@ -295 +296 @@
 
     infoStreamPrint(LOG_INIT_HOMOTOPY, 1, "homotopy process\n---------------------------");
+    /* try */
+#ifndef OMC_EMCC
+  MMC_TRY_INTERNAL(simulationJumpBuffer)
+#endif
     for(step=0; step<init_lambda_steps; ++step)
     {
@@ -326 +331 @@
 #endif
     }
+    success = 1;
+    /* catch */
+#ifndef OMC_EMCC
+  MMC_CATCH_INTERNAL(simulationJumpBuffer)
+#endif
+    /* Error handling in case an assert was thrown */
+    if (!success)
+    {
+      messageClose(LOG_INIT_HOMOTOPY);
+#if !defined(OMC_NO_FILESYSTEM)
+      if(ACTIVE_STREAM(LOG_INIT_HOMOTOPY))
+        fclose(pFile);
+#endif
+      errorStreamPrint(LOG_ASSERT, 0, "Failed to solve the initialization problem with global homotopy with equidistant step size.");
+      throwStreamPrint(threadData, "Unable to solve initialization problem.");
+    }
+
     data->simulationInfo->homotopySteps += init_lambda_steps;
     messageClose(LOG_INIT_HOMOTOPY);