Merge pull request #3044 from GitPaean/correcting_threading_output

correcting the output of the number of threads
This commit is contained in:
Markus Blatt 2021-02-04 14:31:03 +01:00 committed by GitHub
commit 009feaa35d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -307,6 +307,11 @@ namespace Opm
threads = omp_get_max_threads(); threads = omp_get_max_threads();
else else
threads = std::min(2, omp_get_max_threads()); threads = std::min(2, omp_get_max_threads());
const int input_threads = EWOMS_GET_PARAM(TypeTag, int, ThreadsPerProcess);
if (input_threads > 0)
threads = std::min(input_threads, omp_get_max_threads());
#endif #endif
#if HAVE_MPI #if HAVE_MPI