#3043

- Send the correct step size to simulation executable. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23887 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 20, 2014 · a5215c2 · a5215c2
1 parent 372bad0
commit a5215c2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -605,7 +605,7 @@ void SimulationDialog::initializeFields(bool isReSimulate, SimulationOptions sim
     // build only
     mpBuildOnlyCheckBox->setChecked(simulationOptions.getBuildOnly());
     // Output Interval
-    mpNumberofIntervalsSpinBox->setDisabled(true);
+    mpNumberofIntervalsSpinBox->setValue(simulationOptions.getNumberofIntervals());
     // Output Format
     mpOutputFormatComboBox->setDisabled(true);
     // Output filename
@@ -735,6 +735,9 @@ SimulationOptions SimulationDialog::createSimulationOptions()
   simulationOptions.setLaunchTransformationalDebugger(mpLaunchTransformationalDebuggerCheckBox->isChecked());
   simulationOptions.setLaunchAlgorithmicDebugger(mpLaunchAlgorithmicDebuggerCheckBox->isChecked());
   simulationOptions.setNumberofIntervals(mpNumberofIntervalsSpinBox->value());
+  qreal startTime = mpStartTimeTextBox->text().toDouble();
+  qreal stopTime = mpStopTimeTextBox->text().toDouble();
+  simulationOptions.setStepSize((stopTime - startTime)/mpNumberofIntervalsSpinBox->value());
   simulationOptions.setOutputFormat(mpOutputFormatComboBox->currentText());
   simulationOptions.setFileNamePrefix(mpFileNameTextBox->text());
   simulationOptions.setVariableFilter(mpVariableFilterTextBox->text());
@@ -776,12 +779,14 @@ SimulationOptions SimulationDialog::createSimulationOptions()
   simulationOptions.setAdditionalSimulationFlags(mpAdditionalSimulationFlagsTextBox->text());
   // setup simulation flags
   QStringList simulationFlags;
-  simulationFlags.append(QString("-override=%1=%2,%3=%4,%5=%6,%7=%8,%9=%10,%11=%12").arg("startTime").arg(simulationOptions.getStartTime())
-                          .arg("stopTime").arg(simulationOptions.getStopTime())
-                          .arg("tolerance").arg(simulationOptions.getTolerance())
-                          .arg("solver").arg(simulationOptions.getMethod())
-                          .arg("outputFormat").arg(simulationOptions.getOutputFormat())
-                          .arg("variableFilter").arg(simulationOptions.getVariableFilter()));
+  simulationFlags.append(QString("-override=%1=%2,%3=%4,%5=%6,%7=%8,%9=%10,%11=%12,%13=%14")
+                         .arg("startTime").arg(simulationOptions.getStartTime())
+                         .arg("stopTime").arg(simulationOptions.getStopTime())
+                         .arg("stepSize").arg(simulationOptions.getStepSize())
+                         .arg("tolerance").arg(simulationOptions.getTolerance())
+                         .arg("solver").arg(simulationOptions.getMethod())
+                         .arg("outputFormat").arg(simulationOptions.getOutputFormat())
+                         .arg("variableFilter").arg(simulationOptions.getVariableFilter()));
   // dassl options
   if (mpDasslOptionsGroupBox->isEnabled()) {
     // dassl jacobian

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationOptions.h b/OMEdit/OMEditGUI/Simulation/SimulationOptions.h
@@ -63,6 +63,7 @@ class SimulationOptions
     setLaunchTransformationalDebugger(false);
     setLaunchAlgorithmicDebugger(false);
     setNumberofIntervals(500);
+    setStepSize(0.002);
     setOutputFormat("mat");
     setFileNamePrefix("");
     setVariableFilter("");
@@ -140,6 +141,9 @@ class SimulationOptions
   void setLaunchAlgorithmicDebugger(bool launchAlgorithmicDebugger) {mLaunchAlgorithmicDebugger = launchAlgorithmicDebugger;}
   bool getLaunchAlgorithmicDebugger() {return mLaunchAlgorithmicDebugger;}
   void setNumberofIntervals(int numberofIntervals) {mNumberofIntervals = numberofIntervals;}
+  int getNumberofIntervals() {return mNumberofIntervals;}
+  void setStepSize(qreal stepSize) {mStepSize = stepSize;}
+  qreal getStepSize() {return mStepSize;}
   void setOutputFormat(QString outputFormat) {mOutputFormat = outputFormat;}
   QString getOutputFormat() {return mOutputFormat;}
   void setFileNamePrefix(QString fileNamePrefix) {mFileNamePrefix = fileNamePrefix;}
@@ -247,6 +251,7 @@ class SimulationOptions
   bool mLaunchTransformationalDebugger;
   bool mLaunchAlgorithmicDebugger;
   int mNumberofIntervals;
+  qreal mStepSize;
   QString mOutputFormat;
   QString mFileNamePrefix;
   QString mVariableFilter;