Merge branch 'master' into parallel_idx

f978182b · Martin Reinecke · e3a83e97 · 9bb8e1c1 · f978182b
Commit f978182b authored Oct 31, 2019 by Martin Reinecke
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gridder_cxx.h gridder_cxx.h +1 -1

No files found.
--- a/gridder_cxx.h
+++ b/gridder_cxx.h
@@ -1372,7 +1372,7 @@ template<typename Serv> class WgridHelper
      if (verbosity>0) cout << "nplanes: " << nplanes << endl;

      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)
 {
      vector<size_t> mytcnt(nplanes,0);