Skip to content

Commit

Permalink
diffSimulationResults changed back to two outputs
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund committed May 18, 2015
1 parent 77b04d0 commit 6a8642c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Expand Up @@ -52,6 +52,6 @@ getErrorString();
// Warning: The initial conditions are not fully specified. Use +d=initialization for more information.
// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
// "
// (true,{},{})
// (true,{})
// ""
// endResult
2 changes: 1 addition & 1 deletion simulation/libraries/common/ModelTesting.mos
Expand Up @@ -190,7 +190,7 @@ elseif (modelTestingType == OpenModelicaModelTesting.Kind.VerifiedSimulation) or
end if;
elseif diffAlgorithm == OpenModelicaModelTesting.DiffAlgorithm.diffSimulationResults then
print(if debug then "Trying diffSimulationResults.\n" else "");
(res,ignore,failVars) := OpenModelica.Scripting.diffSimulationResults(resultFile,referenceFile,csvFile+"diff.",relTol,vars=compareVars);
(res,failVars) := OpenModelica.Scripting.diffSimulationResults(resultFile,referenceFile,csvFile+"diff.",relTol,vars=compareVars);
print(if debug then "diffSimulationResults returns "+String(res)+".\n" else "");
else
print("Unknown diff algorithm!\n");
Expand Down
4 changes: 2 additions & 2 deletions simulation/modelica/built_in_functions/Compare.mos
Expand Up @@ -33,7 +33,7 @@ OpenModelica.Scripting.compareSimulationResults("Compare.Modell1_res.mat", "Comp
// messages = ""
// end SimulationResult;
// ""
// (true,{},{})
// (true,{})
// "Error: Could not read variable a in file Compare.Modell2_res.mat.
// Warning: Get data of variable a from file Compare.Modell2_res.mat failed!
// "
Expand All @@ -42,7 +42,7 @@ OpenModelica.Scripting.compareSimulationResults("Compare.Modell1_res.mat", "Comp
// Warning: Get data of variable a from file Compare.Modell2_res.mat failed!
// Warning: Files not Equal
// "
// (true,{},{})
// (true,{})
// ""
// {"Files Equal!"}
// ""
Expand Down

0 comments on commit 6a8642c

Please sign in to comment.