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 branch release-2016
[alexxy/gromacs.git]
/
src
/
gromacs
/
gmxana
/
gmx_disre.cpp
diff --git
a/src/gromacs/gmxana/gmx_disre.cpp
b/src/gromacs/gmxana/gmx_disre.cpp
index 9b8dd632e273d90e2eddea4e901950da34f015e5..58413e45eaf951785c97162559a9eb03c351ca92 100644
(file)
--- a/
src/gromacs/gmxana/gmx_disre.cpp
+++ b/
src/gromacs/gmxana/gmx_disre.cpp
@@
-204,7
+204,7
@@
static void check_viol(FILE *log,
while (((i+n) < disres->nr) &&
(forceparams[forceatoms[i+n]].disres.label == label));
- calc_disres_R_6(
n, &forceatoms[i], forceparams
,
+ calc_disres_R_6(
NULL, n, &forceatoms[i]
,
(const rvec*)x, pbc, fcd, NULL);
if (fcd->disres.Rt_6[0] <= 0)