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

This commit is contained in:
Axel Kohlmeyer
2016-07-02 06:27:41 -04:00
41 changed files with 1427 additions and 1018 deletions

View File

@ -283,6 +283,7 @@ void ReadData::command(int narg, char **arg)
}
// set up pointer to hold original styles while we replace them with "zero"
Pair *saved_pair = NULL;
Bond *saved_bond = NULL;
Angle *saved_angle = NULL;