ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset number of threads to 1 when using no accelerator or opt

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-10-03 16:13:59 -04:00
parent 75050b8920
commit 6a43ca8410
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lammps-gui/lammpsgui.cpp
View File

@ -508,6 +508,8 @@ void LammpsGui::update_variables()
for (const auto &line : doc) { for (const auto &line : doc) {
if (line.isEmpty()) continue;
// first find variable definitions. // first find variable definitions.
// index variables are special since they can be overridden from the command line // index variables are special since they can be overridden from the command line
auto index = indexvar.match(line); auto index = indexvar.match(line);

13
tools/lammps-gui/preferences.cpp
View File

@ -40,8 +40,8 @@
#include <QSpacerItem> #include <QSpacerItem>
#include <QSpinBox> #include <QSpinBox>
#include <QTabWidget> #include <QTabWidget>
#include <QVBoxLayout>
#include <QThread> #include <QThread>
#include <QVBoxLayout>
#if defined(_OPENMP) #if defined(_OPENMP)
#include <omp.h> #include <omp.h>
@ -110,10 +110,15 @@ void Preferences::accept()
} }
} }
// store number of threads // store number of threads, reset to 1 for "None" and "Opt" settings
QLineEdit *field = tabWidget->findChild<QLineEdit *>("nthreads"); QLineEdit *field = tabWidget->findChild<QLineEdit *>("nthreads");
if (field) if (field) {
if (field->hasAcceptableInput()) settings->setValue("nthreads", field->text()); int accel = settings->value("accelerator", AcceleratorTab::None).toInt();
if ((accel == AcceleratorTab::None) || (accel == AcceleratorTab::Opt))
settings->setValue("nthreads", 1);
else if (field->hasAcceptableInput())
settings->setValue("nthreads", field->text());
}
// store image width, height, zoom, and rendering settings // store image width, height, zoom, and rendering settings