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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15259 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2016-07-02 21:03:48 +00:00
parent 71f3c4556f
commit 547dd3edc8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/read_data.cpp
View File

@ -924,15 +924,13 @@ void ReadData::header(int firstpass)
// search line for header keyword and set corresponding variable // search line for header keyword and set corresponding variable
// customize for new header lines // customize for new header lines
// check for triangles before angles so "triangles" not matched as "angles"
if (strstr(line,"atoms")) { if (strstr(line,"atoms")) {
sscanf(line,BIGINT_FORMAT,&natoms); sscanf(line,BIGINT_FORMAT,&natoms);
if (addflag == NONE) atom->natoms = natoms; if (addflag == NONE) atom->natoms = natoms;
else if (firstpass) atom->natoms += natoms; else if (firstpass) atom->natoms += natoms;
// check for these first
// otherwise "triangles" will be matched as "angles"
} else if (strstr(line,"ellipsoids")) { } else if (strstr(line,"ellipsoids")) {
if (!avec_ellipsoid) if (!avec_ellipsoid)
error->all(FLERR,"No ellipsoids allowed with this atom style"); error->all(FLERR,"No ellipsoids allowed with this atom style");