Guard against divisions by zero

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18729 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 22, 2014 · 29bbd28 · 29bbd28
1 parent a16f990
commit 29bbd28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -2861,7 +2861,7 @@ function getSimulationOptions
   output Real startTime;
   output Real stopTime;
   output Real tolerance;
-  output Real numberOfIntervals;
+  output Integer numberOfIntervals;
   output Real interval;
 external "builtin";
 annotation(Documentation(info="<html>

diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -2344,7 +2344,7 @@ algorithm
         tolerance = ValuesUtil.valueReal(Util.makeValueOrDefault(Ceval.cevalSimple,toleranceExp,Values.REAL(tolerance)));
         Values.INTEGER(numberOfIntervals) = Util.makeValueOrDefault(Ceval.cevalSimple,intervalExp,Values.INTEGER(numberOfIntervals)); // number of intervals
         interval = Util.if_(numberOfIntervals == 0, interval, realDiv(realSub(stopTime,startTime),intReal(intMax(numberOfIntervals,1))));
-        numberOfIntervals = Util.if_(numberOfIntervals == 0, realInt(realCeil(realDiv(realSub(stopTime,startTime),interval))), numberOfIntervals);
+        numberOfIntervals = Util.if_(numberOfIntervals == 0, Util.if_(realGt(interval,0.0),realInt(realCeil(realDiv(realSub(stopTime,startTime),realMax(interval,1e-300 /* TODO: Use real if-expressions to skip these things */)))),0), numberOfIntervals);
       then
         (cache,Values.TUPLE({Values.REAL(startTime),Values.REAL(stopTime),Values.REAL(tolerance),Values.INTEGER(numberOfIntervals),Values.REAL(interval)}),st);