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

Commit

Permalink
Fix init message for FMI
Browse files Browse the repository at this point in the history
  • Loading branch information
ptaeuber authored and OpenModelica-Hudson committed Nov 6, 2017
1 parent bb335c6 commit 27d4fab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
long i;
MODEL_DATA *mData = data->modelData;
int solveWithGlobalHomotopy = data->callback->useHomotopy == 0 || (data->callback->useHomotopy != 2 && init_lambda_steps < 2) ? 0 : 1;
data->simulationInfo->homotopyUsed = 0;

#if !defined(OMC_NDELAY_EXPRESSIONS) || OMC_NDELAY_EXPRESSIONS>0
/* initial sample and delay before initial the system */
Expand Down Expand Up @@ -309,9 +308,6 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
/* check for over-determined systems */
retVal = data->callback->functionRemovedInitialEquations(data, threadData);

if (!retVal)
infoStreamPrint(LOG_SUCCESS, 0, "The initialization finished successfully %s homotopy method.", data->simulationInfo->homotopyUsed ? "with" : "without");

TRACE_POP
return retVal;
}
Expand Down Expand Up @@ -568,6 +564,8 @@ int initialization(DATA *data, threadData_t *threadData, const char* pInitMethod
int retVal = -1;
int i;

data->simulationInfo->homotopyUsed = 0;

infoStreamPrint(LOG_INIT, 0, "### START INITIALIZATION ###");

setAllParamsToStart(data);
Expand Down
2 changes: 2 additions & 0 deletions SimulationRuntime/c/simulation/solver/solver_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@ int initializeModel(DATA* data, threadData_t *threadData, const char* init_initM
simInfo->stopTime = simInfo->startTime;
retValue = -1;
}
if (!retValue)
infoStreamPrint(LOG_SUCCESS, 0, "The initialization finished successfully %s homotopy method.", data->simulationInfo->homotopyUsed ? "with" : "without");

success = 1;
#if !defined(OMC_EMCC)
Expand Down

0 comments on commit 27d4fab

Please sign in to comment.