do not distribute zero step size (#185)

adrpo · web-flow · commit 81dd0753babc · 2024-11-28T11:53:48.000+01:00
* do not distribute zero step size

* fix whitespace
diff --git a/testmodel.py b/testmodel.py
@@ -514,7 +514,10 @@ def sendExpressionOldOrNew(cmd):
       fmisimulator = "%s simulate " % fmisimulator
       cmd = "%s --start-time %g --stop-time %g --timeout %g --relative-tolerance %g --interface-type ModelExchange --solver CVode --output-interval %g %s.fmu" % (("--output-file %s" % resFile),startTime,stopTime,conf["ulimitExe"],tolerance,stepSize,conf["fileName"].replace(".","_"))
     else: # OMSimulator
-      cmd = "%s --tempDir=%s --startTime=%g --stopTime=%g --stepSize=%g --timeout=%g --tolerance=%g %s.fmu" % (("-r=%s" % resFile) if outputFormat != "empty" else "",fmitmpdir,startTime,stopTime,stepSize,conf["ulimitExe"],tolerance,conf["fileName"].replace(".","_"))
+      stepSizeStr = ""
+      if stepSize != 0.0:
+        stepSizeStr = " --stepSize=%g" % stepSize
+      cmd = "%s --tempDir=%s --startTime=%g --stopTime=%g%s --timeout=%g --tolerance=%g %s.fmu" % (("-r=%s" % resFile) if outputFormat != "empty" else "",fmitmpdir,startTime,stopTime,stepSizeStr,conf["ulimitExe"],tolerance,conf["fileName"].replace(".","_"))
     with open(simFile,"w") as fp:
       fp.write("%s %s\n" % (fmisimulator, cmd))
     res = checkOutputTimeout("(rm -f %s.pipe ; mkfifo %s.pipe ; head -c 1048576 < %s.pipe >> %s & %s %s > %s.pipe 2>&1)" % (conf["fileName"],conf["fileName"],conf["fileName"],simFile,fmisimulator,cmd,conf["fileName"]), 1.05*conf["ulimitExe"], conf)
