Skip to content

scale step sizes relative to reference step #1568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arun3688 wants to merge 3 commits into
base: maintenance/v2.1
Choose a base branch
from
Open

scale step sizes relative to reference step #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8349796
scale step sizes relative to reference step
arun3688 Mar 6, 2026
ce1c8f7
fix comments
arun3688 Mar 6, 2026
81bd2a2
expected output
arun3688 Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/OMSimulatorLib/Flags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ oms::Flags::FlagValues::FlagValues() :
dumpAlgLoops(false),
emitEvents(true),
ignoreInitialUnknowns(false),
initialStepSize(1e-6),
initialStepSize(1e-3),
inputExtrapolation(false),
intervals(100),
masterAlgorithm(oms_solver_wc_ma),
Expand Down
21 changes: 15 additions & 6 deletions src/OMSimulatorLib/OMSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,14 +1224,23 @@ oms_status_enu_t SimulateSingleFMU(const filesystem::path& path)
status = oms_setTolerance(modelName.c_str(), defaultExperiment.tolerance, defaultExperiment.tolerance);
if(oms_status_ok != status) return logError("oms_setTolerance failed");

// set the initial, minimum and maximum stepSize
double initialStepSize = oms::Flags::InitialStepSize().value;
double minimumStepSize = oms::Flags::MinimumStepSize().value;

double refStepSize;
// priority order commandLine > defaultExperiment > default
if (oms::Flags::MaximumStepSize().given)
status = oms_setVariableStepSize(modelName.c_str(), initialStepSize, minimumStepSize, oms::Flags::MaximumStepSize().value);
refStepSize = oms::Flags::MaximumStepSize().value;
else if (defaultExperiment.stepSize > 0.0)
refStepSize = defaultExperiment.stepSize;
else
status = oms_setVariableStepSize(modelName.c_str(), initialStepSize, minimumStepSize, defaultExperiment.stepSize);
refStepSize = 1e-3; // default value of maximum step size

/*
*scale the initial, minimum stepSize with reference step size, if maximumStepSize is smaller than default value of maximum step size (1e-3) or if user has provided maximum step size via command line argument, then initial and minimum step size will also be scaled down accordingly.
*This is to avoid the case where initial or minimum step size is larger than maximum step size which can lead to simulation failure.
*/
double initialStepSize = oms::Flags::InitialStepSize().value * refStepSize;
double minimumStepSize = oms::Flags::MinimumStepSize().value * refStepSize;

status = oms_setVariableStepSize(modelName.c_str(), initialStepSize, minimumStepSize, refStepSize);
if(oms_status_ok != status) return logError("oms_setVariableStepSize failed");

if (oms::Flags::Intervals().given)
Expand Down
4 changes: 2 additions & 2 deletions testsuite/api/addExternalResources1.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ print(src)
-- relativeTolerance="0.0001"
-- minimumStepSize="1e-12"
-- maximumStepSize="0.001"
-- initialStepSize="1e-06" />
-- initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -383,7 +383,7 @@ print(src)
-- relativeTolerance="0.0001"
-- minimumStepSize="1e-12"
-- maximumStepSize="0.001"
-- initialStepSize="1e-06" />
-- initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/api/addExternalResources3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
## relativeTolerance="0.0001"
## minimumStepSize="1e-12"
## maximumStepSize="0.001"
## initialStepSize="1e-06" />
## initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down Expand Up @@ -387,7 +387,7 @@
## relativeTolerance="0.0001"
## minimumStepSize="1e-12"
## maximumStepSize="0.001"
## initialStepSize="1e-06" />
## initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down
8 changes: 4 additions & 4 deletions testsuite/api/buses.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ printStatus(status, 0)
-- </oms:Bus>
-- </oms:Buses>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -161,7 +161,7 @@ printStatus(status, 0)
-- </oms:Bus>
-- </oms:Buses>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -214,7 +214,7 @@ printStatus(status, 0)
-- </oms:Bus>
-- </oms:Buses>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -244,7 +244,7 @@ printStatus(status, 0)
-- </oms:Bus>
-- </oms:Buses>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down
8 changes: 4 additions & 4 deletions testsuite/api/buses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def printStatus(status, expected):
## </oms:Bus>
## </oms:Buses>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down Expand Up @@ -161,7 +161,7 @@ def printStatus(status, expected):
## </oms:Bus>
## </oms:Buses>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down Expand Up @@ -214,7 +214,7 @@ def printStatus(status, expected):
## </oms:Bus>
## </oms:Buses>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down Expand Up @@ -244,7 +244,7 @@ def printStatus(status, expected):
## </oms:Bus>
## </oms:Buses>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down
8 changes: 4 additions & 4 deletions testsuite/api/connections.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ printStatus(status, 0)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand All @@ -133,7 +133,7 @@ printStatus(status, 0)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -174,7 +174,7 @@ printStatus(status, 0)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand All @@ -196,7 +196,7 @@ printStatus(status, 0)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down
8 changes: 4 additions & 4 deletions testsuite/api/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def printStatus(status, expected):
## <ssc:Annotation type="org.openmodelica">
## <oms:Annotations>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand All @@ -134,7 +134,7 @@ def printStatus(status, expected):
## <ssc:Annotation type="org.openmodelica">
## <oms:Annotations>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down Expand Up @@ -175,7 +175,7 @@ def printStatus(status, expected):
## <ssc:Annotation type="org.openmodelica">
## <oms:Annotations>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand All @@ -197,7 +197,7 @@ def printStatus(status, expected):
## <ssc:Annotation type="org.openmodelica">
## <oms:Annotations>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/api/deleteReferencesInSSD1.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ oms_delete("deleteResources")
-- relativeTolerance="0.0001"
-- minimumStepSize="1e-12"
-- maximumStepSize="0.001"
-- initialStepSize="1e-06" />
-- initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -361,7 +361,7 @@ oms_delete("deleteResources")
-- relativeTolerance="0.0001"
-- minimumStepSize="1e-12"
-- maximumStepSize="0.001"
-- initialStepSize="1e-06" />
-- initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/api/deleteResourcesInSSP1.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ oms_delete("deleteResources")
-- relativeTolerance="0.0001"
-- minimumStepSize="1e-12"
-- maximumStepSize="0.001"
-- initialStepSize="1e-06" />
-- initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -358,7 +358,7 @@ oms_delete("deleteResources")
-- relativeTolerance="0.0001"
-- minimumStepSize="1e-12"
-- maximumStepSize="0.001"
-- initialStepSize="1e-06" />
-- initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down
6 changes: 3 additions & 3 deletions testsuite/api/test01.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ printStatus(status, 3)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down Expand Up @@ -131,7 +131,7 @@ printStatus(status, 3)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand All @@ -155,7 +155,7 @@ printStatus(status, 3)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down
6 changes: 3 additions & 3 deletions testsuite/api/test01.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def printStatus(status, expected):
## <ssc:Annotation type="org.openmodelica">
## <oms:Annotations>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down Expand Up @@ -131,7 +131,7 @@ def printStatus(status, expected):
## <ssc:Annotation type="org.openmodelica">
## <oms:Annotations>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand All @@ -155,7 +155,7 @@ def printStatus(status, expected):
## <ssc:Annotation type="org.openmodelica">
## <oms:Annotations>
## <oms:SimulationInformation>
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
## <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
## </oms:SimulationInformation>
## </oms:Annotations>
## </ssc:Annotation>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/api/test_omsExport.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ printStatus(status, 0)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand All @@ -97,7 +97,7 @@ printStatus(status, 0)
-- <ssc:Annotation type="org.openmodelica">
-- <oms:Annotations>
-- <oms:SimulationInformation>
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-06" />
-- <oms:VariableStepSolver description="cvode" absoluteTolerance="0.0001" relativeTolerance="0.0001" minimumStepSize="1e-12" maximumStepSize="0.001" initialStepSize="1e-03" />
-- </oms:SimulationInformation>
-- </oms:Annotations>
-- </ssc:Annotation>
Expand Down
Loading