Added item data for domain average wind speed units to fix bug setting meters per second

Author: masonwillman

src/gui/domainAverageInput.cpp

@@ -39,6 +39,15 @@ DomainAverageInput::DomainAverageInput(Ui::MainWindow* ui, QObject* parent)
 
     ui->domainAverageTable->setTabKeyNavigation(false);
 
+    ui->inputWindHeightUnitsComboBox->setItemData(0, "ft");
+    ui->inputWindHeightUnitsComboBox->setItemData(1, "m");
+
+    ui->tableSpeedUnits->setItemData(0, "mph");
+    ui->tableSpeedUnits->setItemData(1, "mps");
+    ui->tableSpeedUnits->setItemData(2, "kph");
+    ui->tableSpeedUnits->setItemData(3, "kts");
+
+
     spinBoxLineEditWasBlank = false;
 
     connect(ui->inputWindHeightComboBox, &QComboBox::currentIndexChanged, this, &DomainAverageInput::windHeightComboBoxCurrentIndexChanged);

src/gui/mainWindow.cpp

@@ -513,7 +513,7 @@ void MainWindow::solveButtonClicked()
         }
 
         bool momentumFlag = ui->momentumSolverCheckBox->isChecked();
-        QString speedUnits =  ui->tableSpeedUnits->currentText();
+        QString speedUnits =  ui->tableSpeedUnits->itemData(ui->tableSpeedUnits->currentIndex()).toString();
         QString airTempUnits =  ui->tableTempUnits->currentText().remove("°");
         QString cloudCoverUnits = "percent";
         if(ninjaErr == NINJA_SUCCESS)

src/gui/outputs.cpp

@@ -9,8 +9,6 @@ Outputs::Outputs(Ui::MainWindow *ui,
     ui->outputDirectoryLineEdit->setText(downloadsPath);
     ui->outputDirectoryButton->setIcon(QIcon(":/folder.png"));
 
-    ui->inputWindHeightUnitsComboBox->setItemData(0, "ft");
-    ui->inputWindHeightUnitsComboBox->setItemData(1, "m");
     ui->outputWindHeightUnitsComboBox->setItemData(0, "ft");
     ui->outputWindHeightUnitsComboBox->setItemData(1, "m");
     ui->meshResolutionUnitsComboBox->setItemData(0, "m");

src/ninja/windninja.cpp

@@ -114,7 +114,7 @@ WINDNINJADLL_EXPORT NinjaArmyH* NinjaInitializeArmy()
  * \param numNinjas The number of runs to create.
  * \param momentumFlag Flag specifying if the mass and momentum solver should be used.
  * \param speedList List of wind speeds to simulate.
- * \param speedUnits String indicating wind speed units ("mph", "mps", "kph", "knots").
+ * \param speedUnits String indicating wind speed units ("mph", "mps", "kph", "kts").
  * \param directionList List of wind directions to simulate in degrees.
  * \param yearList List of years to simulate (only needed if diurnal or stability is going to be used), can be NULL.
  * \param monthList List of months to simulate (only needed if diurnal or stability is going to be used), can be NULL.
@@ -159,7 +159,7 @@ WINDNINJADLL_EXPORT NinjaErr NinjaMakeDomainAverageArmyThermalParameterization
  * \param numNinjas The number of runs to create.
  * \param momentumFlag Flag specifying if the mass and momentum solver should be used.
  * \param speedList List of wind speeds to simulate.
- * \param speedUnits String indicating wind speed units ("mph", "mps", "kph", "knots").
+ * \param speedUnits String indicating wind speed units ("mph", "mps", "kph", "kts").
  * \param directionList List of wind directions to simulate in degrees.
  *
  * \return NINJA_SUCCESS on success, non-zero otherwise.