Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23917 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Dec 30, 2014
1 parent 61d1ead commit b79fe71
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
52 changes: 26 additions & 26 deletions SimulationRuntime/cpp/Core/SimController/SimManager.cpp
Expand Up @@ -553,7 +553,7 @@ void SimManager::runSingleProcess()
{
double startTime, endTime, *zeroVal_0, *zeroVal_new;
int dimZeroF;

std::vector<std::pair<double, int> > tStopsSub;

_H = _tEnd;
Expand Down Expand Up @@ -618,31 +618,31 @@ void SimManager::runSingleProcess()
_solverTask = ISolver::SOLVERCALL(_solverTask | ISolver::RECALL);
}
startTime = endTime;
if (_dimtimeevent)
{
// Find all time events at the current time
while(abs(iter->first - endTime) <1e4*UROUND)
{
_timeeventcounter[iter->second]++;
iter++;
}
// set the iterator back to the current end time
iter--;
// Then handle time events
_timeevent_system->handleTimeEvent(_timeeventcounter);
_event_system->getZeroFunc(zeroVal_new);
for (int i = 0; i < _dimZeroFunc; i++)
_events[i] = bool(zeroVal_new[i]);
_mixed_system->handleSystemEvents(_events);
//reset time-events
_timeevent_system->handleTimeEvent(_timeeventcounter);
}

user_stop = (_solver->getSolverStatus() & ISolver::USER_STOP);
if (user_stop)
break;
if (_dimtimeevent)
{
// Find all time events at the current time
while(abs(iter->first - endTime) <1e4*UROUND)
{
_timeeventcounter[iter->second]++;
iter++;
}
// set the iterator back to the current end time
iter--;

// Then handle time events
_timeevent_system->handleTimeEvent(_timeeventcounter);

_event_system->getZeroFunc(zeroVal_new);
for (int i = 0; i < _dimZeroFunc; i++)
_events[i] = bool(zeroVal_new[i]);
_mixed_system->handleSystemEvents(_events);
//reset time-events
_timeevent_system->handleTimeEvent(_timeeventcounter);
}

user_stop = (_solver->getSolverStatus() & ISolver::USER_STOP);
if (user_stop)
break;
} // end for time events
if (abs(_tEnd - endTime) > _config->getSimControllerSettings()->dTendTol && !user_stop)
{
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/cpp/Solver/CVode/CVode.cpp
Expand Up @@ -342,7 +342,7 @@ void Cvode::solve(const SOLVERCALL action)
writeToFile(0, _tCurrent, _h);
if (writeOutput)
writeCVodeOutput(_tCurrent, _h, _locStps);
_continuous_system->getContinuousStates(_z);
_continuous_system->getContinuousStates(_z);
}

// Solver soll fortfahren
Expand Down

0 comments on commit b79fe71

Please sign in to comment.