OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5504 from GitPaean/avoiding_unnecessary_exception

Browse Source 
avoiding exception from std::stoi("")
This commit is contained in:
Kai Bao 2024-08-07 10:36:45 +02:00 committed by GitHub
commit 2cb471356e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
opm/simulators/flow/Main.hpp
View File

@ -711,22 +711,32 @@ private:
#ifdef _OPENMP #ifdef _OPENMP
// This function is called before the parallel OpenMP stuff gets initialized. // This function is called before the parallel OpenMP stuff gets initialized.
// That initialization happends after the deck is read and we want this message. // That initialization happens after the deck is read and we want this message.
// Hence we duplicate the code of setupParallelism to get the number of threads. // Hence we duplicate the code of setupParallelism to get the number of threads.
static bool first_time = true; static bool first_time = true;
const int default_threads = 2; const int default_threads = 2;
const int requested_threads = Parameters::get<TypeTag, Parameters::ThreadsPerProcess>(); const int requested_threads = Parameters::get<TypeTag, Parameters::ThreadsPerProcess>();
threads = requested_threads > 0 ? requested_threads : default_threads;
const char* env_var = getenv("OMP_NUM_THREADS"); const char* env_var = getenv("OMP_NUM_THREADS");
int omp_num_threads = -1; int omp_num_threads = -1;
try { try {
omp_num_threads = std::stoi(env_var ? env_var : ""); if (env_var) {
if (first_time && requested_threads > 0 && FlowGenericVanguard::comm().rank()==0) { omp_num_threads = std::stoi(env_var);
std::cout << "Warning: Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument." << std::endl;
} }
} catch (const std::invalid_argument& e) { } catch (const std::invalid_argument&) {
omp_num_threads = requested_threads > 0 ? requested_threads : default_threads; // Do nothing if an invalid_argument exception is caught
} }
threads = omp_num_threads;
// Set threads to omp_num_threads if it was successfully parsed and is positive
if (omp_num_threads > 0) {
if (first_time && FlowGenericVanguard::comm().rank() == 0 && requested_threads > 0) {
std::cout << "Warning: Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument."
<< std::endl;
}
threads = omp_num_threads;
}
first_time = false; first_time = false;
#else #else
threads = 1; threads = 1;