kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[FEM] safer Elmer executable path handling

Browse Source 
- the code already assured that the number of used CPU cores for Elmer can only be > 1 if a valid path to the '_mpi' executable is specified. However, we can have the case that Elmer was uninstalled, then the path validity checker returns an empty path and then the check for the number of cores but handle this case. THis PR does exactly this.
- also fix typos and improve error message
- also add missing save guard for hardware check
This commit is contained in:
Uwe
2022-11-05 01:55:16 +01:00
parent 2c6a2422eb
commit 75146bdd7b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Fem/Gui/DlgSettingsFemElmerImp.cpp
View File

@@ -107,8 +107,10 @@ void DlgSettingsFemElmerImp::onfileNameChanged(QString FileName)
void DlgSettingsFemElmerImp::onfileNameChangedMT(QString FileName)
{
// reset in case it was prevoisly set to 1
ui->sb_elmer_num_cores->setMaximum(processor_count);
// reset in case it was previously set to 1
// (hardware check might fail and then returns 0)
if (processor_count > 0)
ui->sb_elmer_num_cores->setMaximum(processor_count);
if (ui->sb_elmer_num_cores->value() == 1)
return;
@@ -116,9 +118,9 @@ void DlgSettingsFemElmerImp::onfileNameChangedMT(QString FileName)
auto strName = FileName.toStdString();
#if defined(FC_OS_WIN32)
// name ends with "_mpi.exe"
if (strName.substr(strName.length() - 8) != "_mpi.exe") {
QMessageBox::warning(this, tr("Not suitable for mulithreading"),
tr("You use more than one CPU core.\n"
if (strName.empty() || strName.substr(strName.length() - 8) != "_mpi.exe") {
QMessageBox::warning(this, tr("FEM Elmer: Not suitable for multithreading"),
tr("Wrong Elmer setting: You use more than one CPU core.\n"
"Therefore an executable with the suffix '_mpi.exe' is required."));
ui->sb_elmer_num_cores->setValue(1);
ui->sb_elmer_num_cores->setMaximum(1);
@@ -126,9 +128,9 @@ void DlgSettingsFemElmerImp::onfileNameChangedMT(QString FileName)
}
#elif defined(FC_OS_LINUX) || defined(FC_OS_CYGWIN) || defined(FC_OS_MACOSX) || defined(FC_OS_BSD)
// name ends with "_mpi"
if (strName.substr(strName.length() - 4) != "_mpi") {
QMessageBox::warning(this, tr("Not suitable for mulithreading"),
tr("You use more than one CPU core.\n"
if (strName.empty() || strName.substr(strName.length() - 4) != "_mpi") {
QMessageBox::warning(this, tr("FEM Elmer: Not suitable for multithreading"),
tr("Wrong Elmer setting: You use more than one CPU core.\n"
"Therefore an executable with the suffix '_mpi' is required."));
ui->sb_elmer_num_cores->setValue(1);
ui->sb_elmer_num_cores->setMaximum(1);