From daf498bbaf2272364a6d525466bd9488c8e8253f Mon Sep 17 00:00:00 2001 From: Willi Braun Date: Thu, 1 Mar 2018 17:55:37 +0100 Subject: [PATCH] enable when test for new DAEmode --- simulation/modelica/daemode/testDAEp5.mos | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/simulation/modelica/daemode/testDAEp5.mos b/simulation/modelica/daemode/testDAEp5.mos index 0cbae7f92..2e052b55c 100644 --- a/simulation/modelica/daemode/testDAEp5.mos +++ b/simulation/modelica/daemode/testDAEp5.mos @@ -5,7 +5,7 @@ loadFile("./testDAEPackage.mo"); getErrorString(); -/* + setCommandLineOptions("+daeMode=new"); simulate(testDAE.p5, simflags="-daeMode", method="ida"); getErrorString(); @@ -17,7 +17,7 @@ val(z,0.0); val(x,1.0); val(y,1.0); val(z,1.0); -*/ + setCommandLineOptions("+daeMode=dynamic"); simulate(testDAE.p5, simflags="-daeMode", method="ida"); getErrorString(); @@ -43,7 +43,6 @@ val(y,1.0); val(z,1.0); - // Result: // true // "" @@ -60,6 +59,22 @@ val(z,1.0); // 0.0 // 1.0 // -3.0 +// 0.2519655434850686 +// 0.7318499548700694 +// -3.0 +// true +// record SimulationResult +// resultFile = "testDAE.p5_res.mat", +// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'ida', fileNamePrefix = 'testDAE.p5', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-daeMode'", +// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method. +// LOG_SUCCESS | info | The simulation finished successfully. +// " +// end SimulationResult; +// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization"). +// " +// 0.0 +// 1.0 +// -3.0 // 0.2519640877410129 // 0.7318508809081514 // -3.0