Skip to content

Commit

Permalink
Remove workaround --ignoreInitialUnknowns
Browse files Browse the repository at this point in the history
  • Loading branch information
lochel committed Dec 22, 2019
1 parent 92c3b53 commit 5d1759c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
8 changes: 4 additions & 4 deletions testsuite/omsimulator/DualMassOscillator_cs.mos
Expand Up @@ -43,7 +43,7 @@ oms_terminate(\"DualMassOscillator\")
oms_delete(\"DualMassOscillator\")
"); getErrorString();

system(getInstallationDirectoryPath() + "/bin/OMSimulator --ignoreInitialUnknowns=true DualMassOscillator_cs.lua", "DualMassOscillator_cs_systemCall.log");
system(getInstallationDirectoryPath() + "/bin/OMSimulator DualMassOscillator_cs.lua", "DualMassOscillator_cs_systemCall.log");
readFile("DualMassOscillator_cs_systemCall.log");

simulate(DualMassOscillator.CoupledSystem, stopTime=0.1, simflags="-override=system2.s2_start=2.5"); getErrorString();
Expand All @@ -68,7 +68,7 @@ val(system2.s2, {0.0,0.1});
// info: system1.s1: 1.0
// info: system2.s2: 2.5
// info: Simulation
// info: system1.s1: 0.87154409411156
// info: system1.s1: 0.87154409411158
// info: system2.s2: 1.9937955391923
// "
// record SimulationResult
Expand All @@ -79,6 +79,6 @@ val(system2.s2, {0.0,0.1});
// "
// end SimulationResult;
// ""
// {1.0,0.9112752847863262}
// {2.5,1.955638599930151}
// {1.0,0.9112766780030248}
// {2.5,1.955637128659751}
// endResult
9 changes: 3 additions & 6 deletions testsuite/omsimulator/DualMassOscillator_me.mos
Expand Up @@ -43,7 +43,7 @@ oms_terminate(\"DualMassOscillator\")
oms_delete(\"DualMassOscillator\")
"); getErrorString();

system(getInstallationDirectoryPath() + "/bin/OMSimulator --ignoreInitialUnknowns=true DualMassOscillator_me.lua", "DualMassOscillator_me_systemCall.log");
system(getInstallationDirectoryPath() + "/bin/OMSimulator DualMassOscillator_me.lua", "DualMassOscillator_me_systemCall.log");
readFile("DualMassOscillator_me_systemCall.log");


Expand All @@ -64,8 +64,7 @@ val(system2.s2, {0.0,0.1});
// true
// ""
// 0
// "warning: Alg. loop (size 4)
// info: maximum step size for 'DualMassOscillator.root': 0.100000
// "info: maximum step size for 'DualMassOscillator.root': 0.100000
// info: No result file will be created
// info: Initialization
// info: system1.s1: 1.0
Expand All @@ -76,12 +75,10 @@ val(system2.s2, {0.0,0.1});
// info: Final Statistics for 'DualMassOscillator.root':
// NumSteps = 1301 NumRhsEvals = 1545 NumLinSolvSetups = 138
// NumNonlinSolvIters = 1544 NumNonlinSolvConvFails = 0 NumErrTestFails = 49
// info: 1 warnings
// info: 0 errors
// "
// record SimulationResult
// resultFile = "DualMassOscillator.CoupledSystem_res.mat",
// simulationOptions = "startTime = 0.0, stopTime = 0.1, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'DualMassOscillator.CoupledSystem', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-override=system2.s2_start=2.5'",
// simulationOptions = "startTime = 0.0, stopTime = 0.1, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'DualMassOscillator.CoupledSystem', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-override=system2.s2_start=2.5'",
// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method.
// LOG_SUCCESS | info | The simulation finished successfully.
// "
Expand Down

0 comments on commit 5d1759c

Please sign in to comment.