Skip to content

Commit

Permalink
Merge pull request #46 from molmod/MM3CAP_fix
Browse files Browse the repository at this point in the history
MM3CAP_fix
  • Loading branch information
lvduyfhu authored Oct 15, 2018
2 parents efd8d52 + f333bb8 commit 2b04118
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions yaff/pes/grid.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <stdio.h>
#endif

#include <math.h>

#include "grid.h"


Expand Down
4 changes: 2 additions & 2 deletions yaff/pes/pair_pot.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ double pair_fn_mm3cap(void *pair_data, long center_index, long other_index, doub
else {
exponent = 1.84e5*exp(-12.0*xmax);
xmax *= xmax;
xmax *= 1/2.25*xmax*xmax;
if (g != NULL) {
xmax *= 1/2.25*xmax*xmax;
if (g != NULL) {
*g =epsilon/d*(-12.0/sigma*exponent+6.0/d/xmax);
}
return epsilon*(5799.303156-12182.86986*x);
Expand Down

0 comments on commit 2b04118

Please sign in to comment.