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
/
minimize.c
diff --git
a/src/gromacs/mdlib/minimize.c
b/src/gromacs/mdlib/minimize.c
index 234bcbdd8fc68df3abae1445a5c266ba73d8a294..5255d544d146f0fa3cea26efe922ef5f8665a302 100644
(file)
--- a/
src/gromacs/mdlib/minimize.c
+++ b/
src/gromacs/mdlib/minimize.c
@@
-550,6
+550,7
@@
static void do_em_step(t_commrec *cr, t_inputrec *ir, t_mdatoms *md,
int start, end;
rvec *x1, *x2;
real dvdl_constr;
int start, end;
rvec *x1, *x2;
real dvdl_constr;
+ int nthreads gmx_unused;
s1 = &ems1->s;
s2 = &ems2->s;
s1 = &ems1->s;
s2 = &ems2->s;
@@
-587,7
+588,8
@@
static void do_em_step(t_commrec *cr, t_inputrec *ir, t_mdatoms *md,
x1 = s1->x;
x2 = s2->x;
x1 = s1->x;
x2 = s2->x;
-#pragma omp parallel num_threads(gmx_omp_nthreads_get(emntUpdate))
+ nthreads = gmx_omp_nthreads_get(emntUpdate);
+#pragma omp parallel num_threads(nthreads)
{
int gf, i, m;
{
int gf, i, m;