From 4a7b1ae4631669c7efd0cf8ecd835367cc672859 Mon Sep 17 00:00:00 2001 From: arun3688 Date: Sat, 10 Feb 2024 01:50:35 +0100 Subject: [PATCH] update OMSimulator (#11976) --- OMSimulator | 2 +- ...echanics.MultiBody.Examples.Elementary.Pendulum.mos | 6 +++--- testsuite/omsimulator/cmakeFMU.mos | 6 +++--- .../fmi/CoSimulation/2.0/FmuExportFlags.mos | 4 ++-- .../fmi/CoSimulation/2.0/simpleStiffFMU.mos | 2 +- testsuite/openmodelica/omsi/omsic/problem2.mos | 6 +++--- testsuite/openmodelica/omsi/omsic/simpleLoop.mos | 6 +++--- .../openmodelica/omsi/omsic/simulateSimpleOMSU.mos | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/OMSimulator b/OMSimulator index 614c663834e..f7c50c96cc2 160000 --- a/OMSimulator +++ b/OMSimulator @@ -1 +1 @@ -Subproject commit 614c663834e5b3b10b515100da304b8ff5cc85a7 +Subproject commit f7c50c96cc21dd851b7b3d906195672fbb79e23a diff --git a/testsuite/omsimulator/Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.mos b/testsuite/omsimulator/Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.mos index 2052e6950e7..fe6195b4bfc 100644 --- a/testsuite/omsimulator/Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.mos +++ b/testsuite/omsimulator/Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.mos @@ -14,12 +14,12 @@ readFile("Pendulum_systemCall.log"); // "Modelica.Mechanics.MultiBody.Examples.Elementary.Pendulum.fmu" // "" // 0 -// "info: maximum step size for 'model.root': 0.001000 +// "info: maximum step size for 'model.root': 0.010000 // info: Result file: model_res.mat (bufferSize=10) // info: Parameter model.root.fmu.world.label1 will not be stored in the result file, because the signal type is not supported // info: Parameter model.root.fmu.world.label2 will not be stored in the result file, because the signal type is not supported // info: Final Statistics for 'model.root': -// NumSteps = 1004 NumRhsEvals = 1009 NumLinSolvSetups = 55 -// NumNonlinSolvIters = 1008 NumNonlinSolvConvFails = 0 NumErrTestFails = 1 +// NumSteps = 523 NumRhsEvals = 533 NumLinSolvSetups = 36 +// NumNonlinSolvIters = 532 NumNonlinSolvConvFails = 0 NumErrTestFails = 1 // " // endResult diff --git a/testsuite/omsimulator/cmakeFMU.mos b/testsuite/omsimulator/cmakeFMU.mos index 585413e236c..284f9c37f39 100644 --- a/testsuite/omsimulator/cmakeFMU.mos +++ b/testsuite/omsimulator/cmakeFMU.mos @@ -18,10 +18,10 @@ readFile("DualMassOscillator_System1_systemCall.log"); // "DualMassOscillator.System1.fmu" // "" // 0 -// "info: maximum step size for 'model.root': 0.001000 +// "info: maximum step size for 'model.root': 0.002000 // info: Result file: model_res.mat (bufferSize=10) // info: Final Statistics for 'model.root': -// NumSteps = 1001 NumRhsEvals = 1002 NumLinSolvSetups = 51 -// NumNonlinSolvIters = 1001 NumNonlinSolvConvFails = 0 NumErrTestFails = 0 +// NumSteps = 501 NumRhsEvals = 502 NumLinSolvSetups = 26 +// NumNonlinSolvIters = 501 NumNonlinSolvConvFails = 0 NumErrTestFails = 0 // " // endResult diff --git a/testsuite/openmodelica/fmi/CoSimulation/2.0/FmuExportFlags.mos b/testsuite/openmodelica/fmi/CoSimulation/2.0/FmuExportFlags.mos index 6e5af15e4b0..9de3f17848c 100644 --- a/testsuite/openmodelica/fmi/CoSimulation/2.0/FmuExportFlags.mos +++ b/testsuite/openmodelica/fmi/CoSimulation/2.0/FmuExportFlags.mos @@ -161,8 +161,8 @@ val(v, 1.0, "BouncingBallFMI20_res.mat"); getErrorString(); // "" // 0.0 // "" -// 0.2323155070000016 +// 0.23877146800000526 // "" -// -2.255319000000001 +// -2.238641999999977 // "" // endResult diff --git a/testsuite/openmodelica/fmi/CoSimulation/2.0/simpleStiffFMU.mos b/testsuite/openmodelica/fmi/CoSimulation/2.0/simpleStiffFMU.mos index 0e3261a9be8..a4e043c21a7 100644 --- a/testsuite/openmodelica/fmi/CoSimulation/2.0/simpleStiffFMU.mos +++ b/testsuite/openmodelica/fmi/CoSimulation/2.0/simpleStiffFMU.mos @@ -26,7 +26,7 @@ system("unzip -cqq stiffProblem.fmu resources/stiffProblem_flags.json > stiffPro readFile("stiffProblem_flags_dynamic.json"); getErrorString(); // Simulate with OMSimulator -system(getInstallationDirectoryPath() + "/bin/OMSimulator stiffProblem.fmu --mode=cs --tolerance=1e-6 --stopTime=250.0 --resultFile=\"stiffProblem_Dynamic_res.mat\" --suppressPath=true --tempDir=\"stiffProblem-dynamic-tmp\"", "stiffProblem_cs_systemCall.log"); getErrorString(); +system(getInstallationDirectoryPath() + "/bin/OMSimulator stiffProblem.fmu --mode=cs --tolerance=1e-6 --stopTime=250.0 --stepSize=0.01 --resultFile=\"stiffProblem_Dynamic_res.mat\" --suppressPath=true --tempDir=\"stiffProblem-dynamic-tmp\"", "stiffProblem_cs_systemCall.log"); getErrorString(); readFile("stiffProblem_cs_systemCall.log"); getErrorString(); // Check results diff --git a/testsuite/openmodelica/omsi/omsic/problem2.mos b/testsuite/openmodelica/omsi/omsic/problem2.mos index db036dbf6b4..96c78cfaad1 100644 --- a/testsuite/openmodelica/omsi/omsic/problem2.mos +++ b/testsuite/openmodelica/omsi/omsic/problem2.mos @@ -61,11 +61,11 @@ compareSimulationResults("problem2_OMS_res.mat", // "" // 0 // "" -// "info: maximum step size for 'model.root': 0.001000 +// "info: maximum step size for 'model.root': 0.002000 // info: Result file: problem2_OMS_res.mat (bufferSize=1) // info: Final Statistics for 'model.root': -// NumSteps = 1004 NumRhsEvals = 1009 NumLinSolvSetups = 54 -// NumNonlinSolvIters = 1008 NumNonlinSolvConvFails = 0 NumErrTestFails = 1 +// NumSteps = 505 NumRhsEvals = 510 NumLinSolvSetups = 30 +// NumNonlinSolvIters = 509 NumNonlinSolvConvFails = 0 NumErrTestFails = 1 // " // {"Files Equal!"} // endResult diff --git a/testsuite/openmodelica/omsi/omsic/simpleLoop.mos b/testsuite/openmodelica/omsi/omsic/simpleLoop.mos index 2cda73a70ad..aeac4c119fd 100644 --- a/testsuite/openmodelica/omsi/omsic/simpleLoop.mos +++ b/testsuite/openmodelica/omsi/omsic/simpleLoop.mos @@ -59,11 +59,11 @@ compareSimulationResults("simpleLoop_OMS_res.mat", // "" // 0 // "" -// "info: maximum step size for 'model.root': 0.001000 +// "info: maximum step size for 'model.root': 0.002000 // info: Result file: simpleLoop_OMS_res.mat (bufferSize=1) // info: Final Statistics for 'model.root': -// NumSteps = 1017 NumRhsEvals = 1054 NumLinSolvSetups = 71 -// NumNonlinSolvIters = 1053 NumNonlinSolvConvFails = 0 NumErrTestFails = 10 +// NumSteps = 527 NumRhsEvals = 586 NumLinSolvSetups = 57 +// NumNonlinSolvIters = 585 NumNonlinSolvConvFails = 0 NumErrTestFails = 16 // " // {"Files Equal!"} // endResult diff --git a/testsuite/openmodelica/omsi/omsic/simulateSimpleOMSU.mos b/testsuite/openmodelica/omsi/omsic/simulateSimpleOMSU.mos index 36eca1c337d..b6bc783e837 100644 --- a/testsuite/openmodelica/omsi/omsic/simulateSimpleOMSU.mos +++ b/testsuite/openmodelica/omsi/omsic/simulateSimpleOMSU.mos @@ -34,12 +34,12 @@ val(der(x), {0.0,1.0}, "helloWorldOMSU_res.mat"); // " // 0 // "" -// "info: maximum step size for 'model.root': 0.001000 +// "info: maximum step size for 'model.root': 0.002000 // info: Result file: helloWorldOMSU_res.mat (bufferSize=1) // info: Final Statistics for 'model.root': -// NumSteps = 1001 NumRhsEvals = 1002 NumLinSolvSetups = 51 -// NumNonlinSolvIters = 1001 NumNonlinSolvConvFails = 0 NumErrTestFails = 0 +// NumSteps = 505 NumRhsEvals = 510 NumLinSolvSetups = 30 +// NumNonlinSolvIters = 509 NumNonlinSolvConvFails = 0 NumErrTestFails = 1 // " -// {1.0,7.403868772384289} -// {2.0,14.80773754476858} +// {1.0,7.389140833856468} +// {2.0,14.778281667712935} // endResult