ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Resolved Conflicts:
	src/RIGID/fix_rigid_small.cpp
This commit is contained in:
Axel Kohlmeyer
2014-01-16 20:53:36 -05:00
parent c9fb35679a fee9812c99
commit a6ca3cab54
101 changed files with 361 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/USER-MISC/fix_ti_spring.cpp
View File

@ -64,7 +64,7 @@ FixTISpring::FixTISpring(LAMMPS *lmp, int narg, char **arg) :
double **x = atom->x;
int *mask = atom->mask;
tagint *image = atom->image;
imageint *image = atom->image;
int nlocal = atom->nlocal;
for (int i = 0; i < nlocal; i++) {
@ -157,7 +157,7 @@ void FixTISpring::post_force(int vflag)
double **x = atom->x;
double **f = atom->f;
int *mask = atom->mask;
tagint *image = atom->image;
imageint *image = atom->image;
int nlocal = atom->nlocal;
double dx, dy, dz;