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:
	doc/Manual.txt
	src/RIGID/fix_shake.cpp
	src/variable.cpp
	src/write_data.cpp
This commit is contained in:
Axel Kohlmeyer
2014-01-26 21:35:32 -05:00
parent e126d82aaa 806a382bd0
commit 39b1597778
171 changed files with 3661 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/variable.cpp
View File

@ -3554,7 +3554,7 @@ void Variable::atom_vector(char *word, Tree **tree,
error->one(FLERR,"Variable uses atom property that isn't allocated");
if (sizeof(tagint) == sizeof(smallint)) {
newtree->type = INTARRAY;
newtree->iarray = (int *)atom->molecule;
newtree->iarray = (int *) atom->molecule;
} else {
newtree->type = BIGINTARRAY;
newtree->barray = (bigint *) atom->molecule;