diff --git a/lib/Threads.h b/lib/Threads.h index 7cb0f3fe..dbc35033 100644 --- a/lib/Threads.h +++ b/lib/Threads.h @@ -38,11 +38,11 @@ Author: paboyle #ifdef GRID_OMP #include #ifdef GRID_NUMA -#define PARALLEL_FOR_LOOP _Pragma("omp parallel for schedule(static)") -#define PARALLEL_FOR_LOOP_INTERN _Pragma("omp for schedule(static)") -#else -#define PARALLEL_FOR_LOOP _Pragma("omp parallel for schedule(runtime)") -#define PARALLEL_FOR_LOOP_INTERN _Pragma("omp for schedule(runtime)") + #define PARALLEL_FOR_LOOP _Pragma("omp parallel for schedule(static)") + #define PARALLEL_FOR_LOOP_INTERN _Pragma("omp for schedule(static)") + #else + #define PARALLEL_FOR_LOOP _Pragma("omp parallel for schedule(runtime)") + #define PARALLEL_FOR_LOOP_INTERN _Pragma("omp for schedule(runtime)") #endif #define PARALLEL_NESTED_LOOP2 _Pragma("omp parallel for collapse(2)") #define PARALLEL_REGION _Pragma("omp parallel") @@ -52,6 +52,7 @@ Author: paboyle #define PARALLEL_FOR_LOOP_INTERN #define PARALLEL_NESTED_LOOP2 #define PARALLEL_REGION +#define PARALLEL_FOR_LOOP_STATIC #endif namespace Grid { diff --git a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h b/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h index 233eb8f5..c3027483 100644 --- a/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h +++ b/lib/algorithms/iterative/ImplicitlyRestartedLanczos.h @@ -59,7 +59,7 @@ public: int Nstop; // Number of evecs checked for convergence int Nk; // Number of converged sought - int Np; // Np -- Number of spare vecs in kryloc space + int Np; // Np -- Number of spare vecs in krylov space int Nm; // Nm -- total number of vectors RealD eresid;