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@5466 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-01-04 20:14:05 +00:00
parent 3333f6a924
commit d3eb3d7887
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/read_data.cpp
View File

@ -339,7 +339,7 @@ void ReadData::header(int flag)
if (strstr(line,"atoms")) sscanf(line,"%lu",&atom->natoms); if (strstr(line,"atoms")) sscanf(line,"%lu",&atom->natoms);
else if (strstr(line,"bonds")) sscanf(line,"%lu",&atom->nbonds); else if (strstr(line,"bonds")) sscanf(line,"%lu",&atom->nbonds);
else if (strstr(line,"angles")) sscanf(line,"%lu",&atom->nangles); else if (strstr(line,"angles")) sscanf(line,"%lu",&atom->nangles);
else if (strstr(line,"dihedrals")) sscanf(line,"lu",&atom->ndihedrals); else if (strstr(line,"dihedrals")) sscanf(line,"%lu",&atom->ndihedrals);
else if (strstr(line,"impropers")) sscanf(line,"%lu",&atom->nimpropers); else if (strstr(line,"impropers")) sscanf(line,"%lu",&atom->nimpropers);
else if (strstr(line,"atom types")) sscanf(line,"%d",&atom->ntypes); else if (strstr(line,"atom types")) sscanf(line,"%d",&atom->ntypes);
@ -680,7 +680,7 @@ void ReadData::impropers()
bigint nimpropers = atom->nimpropers; bigint nimpropers = atom->nimpropers;
while (nread < nimpropers) { while (nread < nimpropers) {
nchunk = MIN(nread,CHUNK); nchunk = MIN(nimpropers-nread,CHUNK);
if (me == 0) { if (me == 0) {
char *eof; char *eof;
m = 0; m = 0;

16
src/replicate.cpp
View File

@ -378,20 +378,20 @@ void Replicate::command(int narg, char **arg)
if (me == 0) { if (me == 0) {
if (atom->nbonds) { if (atom->nbonds) {
if (screen) fprintf(screen," %d bonds\n",atom->nbonds); if (screen) fprintf(screen," %lu bonds\n",atom->nbonds);
if (logfile) fprintf(logfile," %d bonds\n",atom->nbonds); if (logfile) fprintf(logfile," %lu bonds\n",atom->nbonds);
} }
if (atom->nangles) { if (atom->nangles) {
if (screen) fprintf(screen," %d angles\n",atom->nangles); if (screen) fprintf(screen," %lu angles\n",atom->nangles);
if (logfile) fprintf(logfile," %d angles\n",atom->nangles); if (logfile) fprintf(logfile," %lu angles\n",atom->nangles);
} }
if (atom->ndihedrals) { if (atom->ndihedrals) {
if (screen) fprintf(screen," %d dihedrals\n",atom->ndihedrals); if (screen) fprintf(screen," %lu dihedrals\n",atom->ndihedrals);
if (logfile) fprintf(logfile," %d dihedrals\n",atom->ndihedrals); if (logfile) fprintf(logfile," %lu dihedrals\n",atom->ndihedrals);
} }
if (atom->nimpropers) { if (atom->nimpropers) {
if (screen) fprintf(screen," %d impropers\n",atom->nimpropers); if (screen) fprintf(screen," %lu impropers\n",atom->nimpropers);
if (logfile) fprintf(logfile," %d impropers\n",atom->nimpropers); if (logfile) fprintf(logfile," %lu impropers\n",atom->nimpropers);
} }
} }