Changeset 15469

Timestamp:

2013-03-04T17:36:00+01:00 (11 years ago)

Author:

adeas31

Message:

• simulations flags.

Location:

branches/OMEdit/OMEditGUI

Files:

• GUI/Dialogs/SimulationDialog.cpp (modified) (10 diffs)
• GUI/Dialogs/SimulationDialog.h (modified) (2 diffs)
• GUI/MainWindow.cpp (modified) (1 diff)
• Util/Helper.cpp (modified) (1 diff)
• Util/Helper.h (modified) (1 diff)

branches/OMEdit/OMEditGUI/GUI/Dialogs/SimulationDialog.cpp

@@ -49 +49 @@
   : QDialog(pParent, Qt::WindowTitleHint)
 {
-  setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::simulation));
+  setWindowIcon(QIcon(":/Resources/icons/simulate.png"));
   setModal(true);
   mpMainWindow = pParent;
+  resize(550, 550);
   setUpForm();
   mpProgressDialog = new ProgressDialog(this);
@@ -62 +63 @@
 {
   // simulation widget heading
-  mpSimulationHeading = new Label(Helper::simulate);
+  mpSimulationHeading = new Label;
   mpSimulationHeading->setFont(QFont(Helper::systemFontInfo.family(), Helper::headingFontSize));
   // Horizontal separator
@@ -144 +145 @@
   // Simulation Flags Tab
   mpSimulationFlagsTab = new QWidget;
+  // Simulation Flags Tab scroll area
+  mpSimulationFlagsTabScrollArea = new QScrollArea;
+  mpSimulationFlagsTabScrollArea->setFrameShape(QFrame::NoFrame);
+  mpSimulationFlagsTabScrollArea->setBackgroundRole(QPalette::Base);
+  mpSimulationFlagsTabScrollArea->setWidgetResizable(true);
+  mpSimulationFlagsTabScrollArea->setWidget(mpSimulationFlagsTab);
   // Model Setup File
   mpModelSetupFileLabel = new Label(tr("Model Setup File (Optional):"));
+  mpModelSetupFileLabel->setToolTip(tr("Specifies a new setup XML file to the generated simulation code."));
   mpModelSetupFileTextBox = new QLineEdit;
   mpModelSetupFileBrowseButton = new QPushButton(Helper::browse);
@@ -151 +159 @@
   // Initialization Methods
   mpInitializationMethodLabel = new Label(tr("Initialization Method (Optional):"));
+  mpInitializationMethodLabel->setToolTip(tr("Specifies the initialization method."));
   mpInitializationMethodComboBox = new QComboBox;
   mpInitializationMethodComboBox->addItems(Helper::ModelicaInitializationMethods.toLower().split(","));
   // Optimization Methods
   mpOptimizationMethodLabel = new Label(tr("Optimization Method (Optional):"));
+  mpOptimizationMethodLabel->setToolTip(tr("Specifies the initialization optimization method."));
   mpOptimizationMethodComboBox = new QComboBox;
   mpOptimizationMethodComboBox->addItems(Helper::ModelicaOptimizationMethods.toLower().split(","));
   // Equation System Initialization File
   mpEquationSystemInitializationFileLabel = new Label(tr("Equation System Initialization File (Optional):"));
+  mpEquationSystemInitializationFileLabel->setToolTip(tr("Specifies an external file for the initialization of the model."));
   mpEquationSystemInitializationFileTextBox = new QLineEdit;
   mpEquationSystemInitializationFileBrowseButton = new QPushButton(Helper::browse);
@@ -164 +175 @@
   // Equation System time
   mpEquationSystemInitializationTimeLabel = new Label(tr("Equation System Initialization Time (Optional):"));
+  mpEquationSystemInitializationTimeLabel->setToolTip(tr("Specifies a time for the initialization of the model."));
   mpEquationSystemInitializationTimeTextBox = new QLineEdit;
+  // clock
+  mpClockLabel = new Label(tr("Clock (Optional):"));
+  mpClockComboBox = new QComboBox;
+  mpClockComboBox->addItems(Helper::clockOptions.split(","));
+  // Linear Solvers
+  mpLinearSolverLabel = new Label(tr("Linear Solver (Optional):"));
+  mpLinearSolverComboBox = new QComboBox;
+  mpLinearSolverComboBox->addItems(Helper::linearSolvers.split(","));
+  // Non Linear Solvers
+  mpNonLinearSolverLabel = new Label(tr("Non Linear Solver (Optional):"));
+  mpNonLinearSolverComboBox = new QComboBox;
+  mpNonLinearSolverComboBox->addItems(Helper::nonLinearSolvers.split(","));
+  // time where the linearization of the model should be performed
+  mpLinearizationTimeLabel = new Label(tr("Linearization Time (Optional):"));
+  mpLinearizationTimeTextBox = new QLineEdit;
+  // output variables
+  mpOutputVariablesLabel = new Label(tr("Output Variables (Optional):"));
+  mpOutputVariablesLabel->setToolTip(tr("Comma separated list of variables. Output the variables at the end of the simulation to the standard output."));
+  mpOutputVariablesTextBox = new QLineEdit;
   // Logging
   mpLogDasslSolverCheckBox = new QCheckBox(tr("DASSL Solver Information"));
@@ -204 +235 @@
   // layout for logging group
   QGridLayout *pLoggingGroupLayout = new QGridLayout;
-  pLoggingGroupLayout->addWidget(mpLogDasslSolverCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogDebugCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogDynamicStateSelectionCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogJacobianDynamicStateSelectionCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogEventsCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogVerboseEventsCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogInitializationCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogJacobianCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogNonLinearSystemsCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogVerboseNonLinearSystemsCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogJacobianNonLinearSystemsCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogResidualsInitializationCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogSimulationCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogSolverCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogFinalSolutionOfInitializationCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogStatsCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogUtilCheckBox);
-  pLoggingGroupLayout->addWidget(mpLogZeroCrossingsCheckBox);
+  pLoggingGroupLayout->addWidget(mpLogDasslSolverCheckBox, 0, 0);
+  pLoggingGroupLayout->addWidget(mpLogDebugCheckBox, 0, 1);
+  pLoggingGroupLayout->addWidget(mpLogDynamicStateSelectionCheckBox, 1, 0);
+  pLoggingGroupLayout->addWidget(mpLogJacobianDynamicStateSelectionCheckBox, 1, 1);
+  pLoggingGroupLayout->addWidget(mpLogEventsCheckBox, 2, 0);
+  pLoggingGroupLayout->addWidget(mpLogVerboseEventsCheckBox, 2, 1);
+  pLoggingGroupLayout->addWidget(mpLogInitializationCheckBox, 3, 0);
+  pLoggingGroupLayout->addWidget(mpLogJacobianCheckBox, 3, 1);
+  pLoggingGroupLayout->addWidget(mpLogNonLinearSystemsCheckBox, 4, 0);
+  pLoggingGroupLayout->addWidget(mpLogVerboseNonLinearSystemsCheckBox, 4, 1);
+  pLoggingGroupLayout->addWidget(mpLogJacobianNonLinearSystemsCheckBox, 5, 0);
+  pLoggingGroupLayout->addWidget(mpLogResidualsInitializationCheckBox, 5, 1);
+  pLoggingGroupLayout->addWidget(mpLogSimulationCheckBox, 6, 0);
+  pLoggingGroupLayout->addWidget(mpLogSolverCheckBox, 6, 1);
+  pLoggingGroupLayout->addWidget(mpLogFinalSolutionOfInitializationCheckBox, 7, 0);
+  pLoggingGroupLayout->addWidget(mpLogStatsCheckBox, 7, 1);
+  pLoggingGroupLayout->addWidget(mpLogUtilCheckBox, 8, 0);
+  pLoggingGroupLayout->addWidget(mpLogZeroCrossingsCheckBox, 8, 1);
   mpLoggingGroupBox = new QGroupBox(tr("Logging (Optional)"));
   mpLoggingGroupBox->setLayout(pLoggingGroupLayout);
-  mpLoggingScrollArea = new QScrollArea;
-  mpLoggingScrollArea->setFrameShape(QFrame::NoFrame);
-  mpLoggingScrollArea->setBackgroundRole(QPalette::Base);
-  mpLoggingScrollArea->setWidgetResizable(true);
-  mpLoggingScrollArea->setWidget(mpLoggingGroupBox);
   // measure simulation time checkbox
   mpProfilingCheckBox = new QCheckBox(tr("Profiling (~5-25% overhead)"));
   // cpu-time checkbox
-  mpCPUTimeCheckBox = new QCheckBox(tr("CPU time"));
+  mpCPUTimeCheckBox = new QCheckBox(tr("CPU Time"));
   // set Output Tab Layout
   QGridLayout *pSimulationFlagsTabLayout = new QGridLayout;
@@ -248 +274 @@
   pSimulationFlagsTabLayout->addWidget(mpEquationSystemInitializationTimeLabel, 4, 0);
   pSimulationFlagsTabLayout->addWidget(mpEquationSystemInitializationTimeTextBox, 4, 1, 1, 2);
-  pSimulationFlagsTabLayout->addWidget(mpLoggingScrollArea, 5, 0, 1, 3);
-  pSimulationFlagsTabLayout->addWidget(mpProfilingCheckBox, 6, 0);
-  pSimulationFlagsTabLayout->addWidget(mpCPUTimeCheckBox, 7, 0);
+  pSimulationFlagsTabLayout->addWidget(mpClockLabel, 5, 0);
+  pSimulationFlagsTabLayout->addWidget(mpClockComboBox, 5, 1, 1, 2);
+  pSimulationFlagsTabLayout->addWidget(mpLinearSolverLabel, 6, 0);
+  pSimulationFlagsTabLayout->addWidget(mpLinearSolverComboBox, 6, 1, 1, 2);
+  pSimulationFlagsTabLayout->addWidget(mpNonLinearSolverLabel, 7, 0);
+  pSimulationFlagsTabLayout->addWidget(mpNonLinearSolverComboBox, 7, 1, 1, 2);
+  pSimulationFlagsTabLayout->addWidget(mpLinearizationTimeLabel, 8, 0);
+  pSimulationFlagsTabLayout->addWidget(mpLinearizationTimeTextBox, 8, 1, 1, 2);
+  pSimulationFlagsTabLayout->addWidget(mpOutputVariablesLabel, 9, 0);
+  pSimulationFlagsTabLayout->addWidget(mpOutputVariablesTextBox, 9, 1, 1, 2);
+  pSimulationFlagsTabLayout->addWidget(mpProfilingCheckBox, 10, 0);
+  pSimulationFlagsTabLayout->addWidget(mpCPUTimeCheckBox, 11, 0);
+  pSimulationFlagsTabLayout->addWidget(mpLoggingGroupBox, 12, 0, 1, 3);
   mpSimulationFlagsTab->setLayout(pSimulationFlagsTabLayout);
   // add Output Tab to Simulation TabWidget
-  mpSimulationTabWidget->addTab(mpSimulationFlagsTab, tr("Simulation Flags"));
+  mpSimulationTabWidget->addTab(mpSimulationFlagsTabScrollArea, tr("Simulation Flags"));
   // Add the validators
-  QDoubleValidator *doubleValidator = new QDoubleValidator(this);
-  doubleValidator->setBottom(0);
-  mpStartTimeTextBox->setValidator(doubleValidator);
-  mpStopTimeTextBox->setValidator(doubleValidator);
-  mpToleranceTextBox->setValidator(doubleValidator);
-  QIntValidator *intValidator = new QIntValidator(this);
-  intValidator->setBottom(1);
-  mpNumberofIntervalsTextBox->setValidator(intValidator);
+  QDoubleValidator *pDoubleValidator = new QDoubleValidator(this);
+  pDoubleValidator->setBottom(0);
+  mpStartTimeTextBox->setValidator(pDoubleValidator);
+  mpStopTimeTextBox->setValidator(pDoubleValidator);
+  mpToleranceTextBox->setValidator(pDoubleValidator);
+  QIntValidator *pIntValidator = new QIntValidator(this);
+  pIntValidator->setBottom(1);
+  mpNumberofIntervalsTextBox->setValidator(pIntValidator);
   // Create the buttons
   mpSimulateButton = new QPushButton(Helper::simulate);
@@ -294 +330 @@
   if (mIsInteractive)
   {
-    setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::interactiveSimulation));
-    mpSimulationHeading->setText(Helper::interactiveSimulation);
+    setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::interactiveSimulation)
+                   .append(" - ").append(mpLibraryTreeNode->getNameStructure()));
+    mpSimulationHeading->setText(QString(Helper::interactiveSimulation).append(" - ").append(mpLibraryTreeNode->getNameStructure()));
     mpSimulationIntervalGroupBox->setDisabled(true);
     return;
@@ -301 +338 @@
   else
   {
-    setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::simulation));
-    mpSimulationHeading->setText(Helper::simulation);
+    setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::simulation)
+                   .append(" - ").append(mpLibraryTreeNode->getNameStructure()));
+    mpSimulationHeading->setText(QString(Helper::simulation).append(" - ").append(mpLibraryTreeNode->getNameStructure()));
     mpSimulationIntervalGroupBox->setDisabled(false);
   }
@@ -425 +463 @@
     {
       simulationFlags.append(QString("-iit=").append(mpEquationSystemInitializationTimeTextBox->text()));
+    }
+    // clock
+    if (!mpClockComboBox->currentText().isEmpty())
+    {
+      simulationFlags.append(QString("-clock=").append(mpClockComboBox->currentText()));
+    }
+    // linear solver
+    if (!mpLinearSolverComboBox->currentText().isEmpty())
+    {
+      simulationFlags.append(QString("-ls=").append(mpLinearSolverComboBox->currentText()));
+    }
+    // non linear solver
+    if (!mpNonLinearSolverComboBox->currentText().isEmpty())
+    {
+      simulationFlags.append(QString("-nls=").append(mpNonLinearSolverComboBox->currentText()));
+    }
+    // time where the linearization of the model should be performed
+    if (!mpLinearizationTimeTextBox->text().isEmpty())
+    {
+      simulationFlags.append(QString("-l=").append(mpLinearizationTimeTextBox->text()));
+    }
+    // output variables
+    if (!mpOutputVariablesTextBox->text().isEmpty())
+    {
+      simulationFlags.append(QString("-output=").append(mpOutputVariablesTextBox->text()));
     }
     // setup Logging flags

branches/OMEdit/OMEditGUI/GUI/Dialogs/SimulationDialog.h

@@ -87 +87 @@
   // Simulation Flags Tab
   QWidget *mpSimulationFlagsTab;
+  QScrollArea *mpSimulationFlagsTabScrollArea;
   Label *mpModelSetupFileLabel;
   QLineEdit *mpModelSetupFileTextBox;
@@ -99 +100 @@
   Label *mpEquationSystemInitializationTimeLabel;
   QLineEdit *mpEquationSystemInitializationTimeTextBox;
-  QScrollArea *mpLoggingScrollArea;
+  Label *mpClockLabel;
+  QComboBox *mpClockComboBox;
+  Label *mpLinearSolverLabel;
+  QComboBox *mpLinearSolverComboBox;
+  Label *mpNonLinearSolverLabel;
+  QComboBox *mpNonLinearSolverComboBox;
+  Label *mpLinearizationTimeLabel;
+  QLineEdit *mpLinearizationTimeTextBox;
+  Label *mpOutputVariablesLabel;
+  QLineEdit *mpOutputVariablesTextBox;
   QGroupBox *mpLoggingGroupBox;
   QCheckBox *mpLogDasslSolverCheckBox;

branches/OMEdit/OMEditGUI/GUI/MainWindow.cpp

@@ -1368 +1368 @@
   mpSimulationAction = new QAction(QIcon(":/Resources/icons/simulate.png"), Helper::simulate, this);
   mpSimulationAction->setStatusTip(Helper::simulateTip);
+  mpSimulationAction->setShortcut(QKeySequence("Ctrl+r"));
   mpSimulationAction->setEnabled(false);
   connect(mpSimulationAction, SIGNAL(triggered()), SLOT(openSimulationDialog()));

branches/OMEdit/OMEditGUI/Util/Helper.cpp

@@ -75 +75 @@
 QString Helper::ModelicaOptimizationMethods = ",nelder_mead_ex,nelder_mead_ex2,simplex,newuoa";
 QString Helper::ModelicaSimulationOutputFormats = "mat,plt,csv,empty";
+QString Helper::clockOptions = ",RT,CPU";
+QString Helper::linearSolvers = ",lapack";
+QString Helper::nonLinearSolvers = ",hybrid,kinsol,newton";
 QString Helper::fontSizes = "6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72";
 QString Helper::notificationLevel = ".OpenModelica.Scripting.ErrorLevel.notification";

branches/OMEdit/OMEditGUI/Util/Helper.h

@@ -84 +84 @@
   static int headingFontSize;
   static QString ModelicaSimulationMethods;
-  static QString ModelicaSimulationOutputFormats;
   static QString ModelicaInitializationMethods;
   static QString ModelicaOptimizationMethods;
+  static QString ModelicaSimulationOutputFormats;
+  static QString clockOptions;
+  static QString linearSolvers;
+  static QString nonLinearSolvers;
   static QString fontSizes;
   static QString notificationLevel;