Skip to content

Commit

Permalink
[Janitor mode] Fix tabs
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19153 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Feb 18, 2014
1 parent 412b266 commit 2130687
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions SimulationRuntime/c/simulation/simulation_runtime.cpp
Expand Up @@ -876,8 +876,8 @@ int _main_SimulationRuntime(int argc, char**argv, DATA *data)

if(!setjmp(data->simulationInfo.errorHandler.globalJumpBuffer))
{
/* set static globalJumpBuf */
memcpy(data->simulationInfo.errorHandler.globalJumpBuffer, globalJumpBuf, sizeof(jmp_buf));
/* set static globalJumpBuf */
memcpy(data->simulationInfo.errorHandler.globalJumpBuffer, globalJumpBuf, sizeof(jmp_buf));

if(initRuntimeAndSimulation(argc, argv, data)) //initRuntimeAndSimulation returns 1 if an error occurs
return 1;
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/simulation/solver/dassl.c
Expand Up @@ -373,7 +373,7 @@ int dasrt_step(DATA* data, SOLVER_INFO* solverInfo)
warningStreamPrint(LOG_STDOUT, 0, "can't continue. time = %f", sData->timeValue);
return retVal;
} else if(dasslData->idid == 4) {
data->simulationInfo.errorHandler.currentErrorStage = ERROR_EVENTSEARCH;
data->simulationInfo.errorHandler.currentErrorStage = ERROR_EVENTSEARCH;
}

} while(dasslData->idid == 1 ||
Expand Down
Expand Up @@ -521,7 +521,7 @@
*/
int ipopt_initialization(INIT_DATA *initData, int useScaling)
{
DATA *data = initData->simData;
DATA *data = initData->simData;
throwStreamPrint(&(data->simulationInfo.errorHandler.globalJumpBuffer), "no ipopt support activated");
return 0;
}
Expand Down
Expand Up @@ -233,7 +233,7 @@
#else
int kinsol_initialization(INIT_DATA *initData)
{
DATA *data = initData->simData;
DATA *data = initData->simData;
throwStreamPrint(data->simulationInfo.errorHandler.globalJumpBuffer, "no sundials/kinsol support activated");
}
#endif
2 changes: 1 addition & 1 deletion SimulationRuntime/c/simulation/solver/perform_simulation.c
Expand Up @@ -175,7 +175,7 @@ int prefixedName_performSimulation(DATA* data, SOLVER_INFO* solverInfo)
eventType = checkEvents(data, solverInfo->eventLst, &(solverInfo->currentTime), solverInfo);
if(eventType > 0) /* event */
{
simInfo->errorHandler.currentErrorStage = ERROR_EVENTSEARCH;
simInfo->errorHandler.currentErrorStage = ERROR_EVENTSEARCH;
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 */
Expand Down

0 comments on commit 2130687

Please sign in to comment.