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
/
simd_4xn
/
nbnxn_kernel_simd_4xn.c
diff --git
a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
index d17ba1e7bdbb1c328aa810bf3e268ed1c98d62fb..3531299efd5feeda4bf72de911292bee47805745 100644
(file)
--- a/
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
+++ b/
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
@@
-273,6
+273,7
@@
nbnxn_kernel_simd_4xn(nbnxn_pairlist_set_t gmx_unused *nbl_list,
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;
@@
-344,7
+345,8
@@
nbnxn_kernel_simd_4xn(nbnxn_pairlist_set_t gmx_unused *nbl_list,
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;