Commit f978182b authored by Martin Reinecke's avatar Martin Reinecke

Merge branch 'master' into parallel_idx

parents e3a83e97 9bb8e1c1
...@@ -1372,7 +1372,7 @@ template<typename Serv> class WgridHelper ...@@ -1372,7 +1372,7 @@ template<typename Serv> class WgridHelper
if (verbosity>0) cout << "nplanes: " << nplanes << endl; if (verbosity>0) cout << "nplanes: " << nplanes << endl;
minplane.resize(nplanes); minplane.resize(nplanes);
vector<size_t> tcnt(my_max_threads()*nplanes,0); vector<size_t> tcnt(max<int>(nthreads, my_max_threads())*nplanes,0);
#pragma omp parallel num_threads(nthreads) #pragma omp parallel num_threads(nthreads)
{ {
vector<size_t> mytcnt(nplanes,0); vector<size_t> mytcnt(nplanes,0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment