- fix typo

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20045 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 8, 2014 · 1e5cdab · 1e5cdab
1 parent 1aaf77d
commit 1e5cdab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/SimulationRuntime/c/simulation/solver/model_help.c b/SimulationRuntime/c/simulation/solver/model_help.c
@@ -1027,7 +1027,7 @@ void deInitializeDataStruc(DATA *data)
 
 void setZCtol(double relativeTol)
 {
-  /* lochel: keep tolZS > 0 */
+  /* lochel: force tolZC > 0 */
   tolZC = max(TOL_HYSTERESIS_ZEROCROSSINGS*relativeTol, TOL_HYSTERESIS_ZEROCROSSINGS*MINIMAL_STEP_SIZE);
   infoStreamPrint(LOG_EVENTS_V, 0, "Set tolerance for zero-crossing hysteresis to: %e", tolZC);
 }

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -158,11 +158,7 @@ int initializeSolverData(DATA* data, SOLVER_INFO* solverInfo)
   solverInfo->sampleEvents = 0;
 
   /* set tolerance for ZeroCrossings */
-  if (simInfo->stepSize < simInfo->tolerance){
-    setZCtol(simInfo->stepSize);
-  } else{
-    setZCtol(simInfo->tolerance);
-  }
+  setZCtol(min(simInfo->stepSize, simInfo->tolerance));
 
   if(solverInfo->solverMethod == 2)
   {