Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
add try-catch execption if initialSolverData fails
Browse files Browse the repository at this point in the history
  • Loading branch information
Willi Braun authored and OpenModelica-Hudson committed Nov 24, 2016
1 parent 0c85d9a commit 712e12e
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions SimulationRuntime/c/simulation/solver/solver_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,9 @@ int initializeModel(DATA* data, threadData_t *threadData, const char* init_initM
/* try */
{
int success = 0;
#if !defined(OMC_EMCC)
MMC_TRY_INTERNAL(simulationJumpBuffer)
#endif
if(initialization(data, threadData, init_initMethod, init_file, init_time, lambda_steps))
{
warningStreamPrint(LOG_STDOUT, 0, "Error in initialization. Storing results and exiting.\nUse -lv=LOG_INIT -w for more information.");
Expand All @@ -489,7 +491,10 @@ int initializeModel(DATA* data, threadData_t *threadData, const char* init_initM
}

success = 1;
#if !defined(OMC_EMCC)
MMC_CATCH_INTERNAL(simulationJumpBuffer)
#endif

if (!success)
{
retValue = -1;
Expand Down Expand Up @@ -705,6 +710,10 @@ int solver_main(DATA* data, threadData_t *threadData, const char* init_initMetho
retVal = initializeModel(data, threadData, init_initMethod, init_file, init_time, lambda_steps);
omc_alloc_interface.collect_a_little();

#if !defined(OMC_EMCC)
MMC_TRY_INTERNAL(simulationJumpBuffer)
#endif

if(0 == retVal) {
retVal = initializeSolverData(data, threadData, &solverInfo);
initSolverInfo = 1;
Expand Down Expand Up @@ -778,6 +787,11 @@ int solver_main(DATA* data, threadData_t *threadData, const char* init_initMetho
embedded_server_deinit(data->embeddedServerState);
embedded_server_unload_functions(dllHandle);
#endif

#if !defined(OMC_EMCC)
MMC_CATCH_INTERNAL(simulationJumpBuffer)
#endif

/* free external input data */
externalInputFree(data);

Expand Down

0 comments on commit 712e12e

Please sign in to comment.