Actually set the tolerance set in the parameters

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17911 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 28, 2013 · 5680cdd · 5680cdd
1 parent 60168c0
commit 5680cdd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Compiler/runtime/SimulationResultsCmpTubes.c b/Compiler/runtime/SimulationResultsCmpTubes.c
@@ -642,11 +642,9 @@ static unsigned int cmpDataTubes(int isResultCmp, char* varname, DataField *time
   /* assertMonotonic(ref); */
   /* assertMonotonic(actual); */
   privates *priv = calculateTubes(ref.time,ref.values,ref.size,rangeDelta);
-  // ref = addTargetEventTimes(ref.time, actual.time, ref.values, ref.size, actual.size, xabstol);
   ref = mergeTimelines(ref,actual,xabstol);
   /* assertMonotonic(ref); */
   size_t n = ref.size;
-  // calibrateValuesConsiderEventsResult calibrated = calibrateValuesConsiderEvents(ref->time,time->data,data->data,&n,time->n);
   double *calibrated_values = calibrateValues(ref.time,actual.time,actual.values,&n,actual.size,xabstol);
   double maxPlusTol = priv->max + fabs(priv->max) * reltol;
   double minMinusTol = priv->min - fabs(priv->min) * reltol;

diff --git a/Examples/BuildModelRecursive.mos b/Examples/BuildModelRecursive.mos
@@ -147,7 +147,7 @@ if simRes then
   prefix := \"files/"+s+".diff\";
   if referenceExists then
     OpenModelica.Scripting.Internal.Time.timerTick(OpenModelica.Scripting.Internal.Time.RT_CLOCK_USER_RESERVED);
-    (referenceOK,diffVars) := diffSimulationResults(\""+s+"_res.mat\",reference,prefix,relTol=reference_reltol,rangeDelta=reference_rangeDelta);
+    (referenceOK,diffVars) := diffSimulationResults(\""+s+"_res.mat\",reference,prefix,relTol=reference_reltol,relTolDiffMinMax=reference_reltolDiffMinMax,rangeDelta=reference_rangeDelta);
     if referenceOK then
       system(\"touch "+s+".verifysuccess\");
     end if;