Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

This commit is contained in:
Axel Kohlmeyer
2016-06-24 19:00:07 -04:00
288 changed files with 11839 additions and 4851 deletions

View File

@ -968,7 +968,13 @@ void ReadData::header(int firstpass)
} else if (strstr(line,"atom types")) {
sscanf(line,"%d",&ntypes);
if (addflag == NONE) atom->ntypes = ntypes + extra_atom_types;
} else if (strstr(line,"bond types")) {
} else if (strstr(line,"mol_H types")){
// Number of molecule types in Coarse-grain regions, USER-HADRESS Package
sscanf(line,"%d",&atom->nmoltypesH);
}
else if (strstr(line,"bond types")) {
sscanf(line,"%d",&nbondtypes);
if (addflag == NONE) atom->nbondtypes = nbondtypes + extra_bond_types;
} else if (strstr(line,"angle types")) {