biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge release-5-0 into master
[alexxy/gromacs.git]
/
src
/
gromacs
/
mdlib
/
nbnxn_kernels
/
nbnxn_kernel_file_generator
/
nbnxn_kernel_simd_template.c.pre
diff --git
a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
index 9432b2f3119546932bf371d2805ec4e9343740e6..5e410cdecc4525f96fa7ab74c4a50c848b203861 100644
(file)
--- a/
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
+++ b/
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
@@
-139,6
+139,7
@@
void
nbnxn_pairlist_t **nbl;
int coulkt, vdwkt = 0;
int nb;
nbnxn_pairlist_t **nbl;
int coulkt, vdwkt = 0;
int nb;
+ int nthreads gmx_unused;
nnbl = nbl_list->nnbl;
nbl = nbl_list->nbl;
nnbl = nbl_list->nnbl;
nbl = nbl_list->nbl;
@@
-210,7
+211,8
@@
void
gmx_incons("Unsupported VdW interaction type");
}}
gmx_incons("Unsupported VdW interaction type");
}}
-#pragma omp parallel for schedule(static) num_threads(gmx_omp_nthreads_get(emntNonbonded))
+ nthreads = gmx_omp_nthreads_get(emntNonbonded);
+#pragma omp parallel for schedule(static) num_threads(nthreads)
for (nb = 0; nb < nnbl; nb++)
{{
nbnxn_atomdata_output_t *out;
for (nb = 0; nb < nnbl; nb++)
{{
nbnxn_atomdata_output_t *out;