Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts: src/RIGID/fix_rigid_small.cpp
2014-01-16 20:53:36 -05:00
parent c9fb35679a fee9812c99
commit a6ca3cab54
101 changed files with 361 additions and 350 deletions
--- a/src/USER-MISC/fix_imd.cpp
+++ b/src/USER-MISC/fix_imd.cpp
@ -826,7 +826,7 @@ void FixIMD::post_force(int vflag)

  int *tag = atom->tag;
  double **x = atom->x;
-  tagint *image = atom->image;
+  imageint *image = atom->image;
  int nlocal = atom->nlocal;
  int *mask  = atom->mask;
  struct commdata *buf;