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

whitespace cleanup

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-10-02 15:03:48 -04:00
parent d898afaafb
commit 8d384b9149
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dump.cpp
View File

@ -238,7 +238,7 @@ void Dump::init()
int gcmcflag = 0; int gcmcflag = 0;
for (int i = 0; i < modify->nfix; i++) for (int i = 0; i < modify->nfix; i++)
if ((strcmp(modify->fix[i]->style,"gcmc") == 0)) if ((strcmp(modify->fix[i]->style,"gcmc") == 0))
gcmcflag = 1; gcmcflag = 1;
if (sortcol == 0 && atom->tag_consecutive() && !gcmcflag) { if (sortcol == 0 && atom->tag_consecutive() && !gcmcflag) {
tagint *tag = atom->tag; tagint *tag = atom->tag;
@ -898,7 +898,7 @@ void Dump::modify_params(int narg, char **arg)
} else if (strcmp(arg[iarg],"fileper") == 0) { } else if (strcmp(arg[iarg],"fileper") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal dump_modify command"); if (iarg+2 > narg) error->all(FLERR,"Illegal dump_modify command");
if (!multiproc) if (!multiproc)
error->all(FLERR,"Cannot use dump_modify fileper " error->all(FLERR,"Cannot use dump_modify fileper "
"without % in dump file name"); "without % in dump file name");
int nper = force->inumeric(FLERR,arg[iarg+1]); int nper = force->inumeric(FLERR,arg[iarg+1]);
if (nper <= 0) error->all(FLERR,"Illegal dump_modify command"); if (nper <= 0) error->all(FLERR,"Illegal dump_modify command");
@ -973,7 +973,7 @@ void Dump::modify_params(int narg, char **arg)
} else if (strcmp(arg[iarg],"nfile") == 0) { } else if (strcmp(arg[iarg],"nfile") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal dump_modify command"); if (iarg+2 > narg) error->all(FLERR,"Illegal dump_modify command");
if (!multiproc) if (!multiproc)
error->all(FLERR,"Cannot use dump_modify nfile " error->all(FLERR,"Cannot use dump_modify nfile "
"without % in dump file name"); "without % in dump file name");
int nfile = force->inumeric(FLERR,arg[iarg+1]); int nfile = force->inumeric(FLERR,arg[iarg+1]);
if (nfile <= 0) error->all(FLERR,"Illegal dump_modify command"); if (nfile <= 0) error->all(FLERR,"Illegal dump_modify command");

56
src/modify.cpp
View File

@ -863,9 +863,9 @@ void Modify::add_fix(int narg, char **arg, int trysuffix)
fix[ifix]->restart(state_restart_global[i]); fix[ifix]->restart(state_restart_global[i]);
used_restart_global[i] = 1; used_restart_global[i] = 1;
if (comm->me == 0) { if (comm->me == 0) {
if (screen) if (screen)
fprintf(screen,"Resetting global fix info from restart file:\n"); fprintf(screen,"Resetting global fix info from restart file:\n");
if (logfile) if (logfile)
fprintf(logfile,"Resetting global fix info from restart file:\n"); fprintf(logfile,"Resetting global fix info from restart file:\n");
if (screen) fprintf(screen," fix style: %s, fix ID: %s\n", if (screen) fprintf(screen," fix style: %s, fix ID: %s\n",
fix[ifix]->style,fix[ifix]->id); fix[ifix]->style,fix[ifix]->id);
@ -885,9 +885,9 @@ void Modify::add_fix(int narg, char **arg, int trysuffix)
fix[ifix]->unpack_restart(j,index_restart_peratom[i]); fix[ifix]->unpack_restart(j,index_restart_peratom[i]);
fix[ifix]->restart_reset = 1; fix[ifix]->restart_reset = 1;
if (comm->me == 0) { if (comm->me == 0) {
if (screen) if (screen)
fprintf(screen,"Resetting peratom fix info from restart file:\n"); fprintf(screen,"Resetting peratom fix info from restart file:\n");
if (logfile) if (logfile)
fprintf(logfile,"Resetting peratom fix info from restart file:\n"); fprintf(logfile,"Resetting peratom fix info from restart file:\n");
if (screen) fprintf(screen," fix style: %s, fix ID: %s\n", if (screen) fprintf(screen," fix style: %s, fix ID: %s\n",
fix[ifix]->style,fix[ifix]->id); fix[ifix]->style,fix[ifix]->id);
@ -1409,24 +1409,24 @@ void Modify::restart_deallocate(int flag)
if (flag && comm->me == 0) { if (flag && comm->me == 0) {
int i; int i;
for (i = 0; i < nfix_restart_global; i++) for (i = 0; i < nfix_restart_global; i++)
if (used_restart_global[i] == 0) break; if (used_restart_global[i] == 0) break;
if (i == nfix_restart_global) { if (i == nfix_restart_global) {
if (screen) if (screen)
fprintf(screen,"All restart file global fix info " fprintf(screen,"All restart file global fix info "
"was re-assigned\n"); "was re-assigned\n");
if (logfile) if (logfile)
fprintf(logfile,"All restart file global fix info " fprintf(logfile,"All restart file global fix info "
"was re-assigned\n"); "was re-assigned\n");
} else { } else {
if (screen) fprintf(screen,"Unused restart file global fix info:\n"); if (screen) fprintf(screen,"Unused restart file global fix info:\n");
if (logfile) fprintf(logfile,"Unused restart file global fix info:\n"); if (logfile) fprintf(logfile,"Unused restart file global fix info:\n");
for (i = 0; i < nfix_restart_global; i++) { for (i = 0; i < nfix_restart_global; i++) {
if (used_restart_global[i]) continue; if (used_restart_global[i]) continue;
if (screen) fprintf(screen," fix style: %s, fix ID: %s\n", if (screen) fprintf(screen," fix style: %s, fix ID: %s\n",
style_restart_global[i],id_restart_global[i]); style_restart_global[i],id_restart_global[i]);
if (logfile) fprintf(logfile," fix style: %s, fix ID: %s\n", if (logfile) fprintf(logfile," fix style: %s, fix ID: %s\n",
style_restart_global[i],id_restart_global[i]); style_restart_global[i],id_restart_global[i]);
} }
} }
} }
@ -1445,24 +1445,24 @@ void Modify::restart_deallocate(int flag)
if (flag && comm->me == 0) { if (flag && comm->me == 0) {
int i; int i;
for (i = 0; i < nfix_restart_peratom; i++) for (i = 0; i < nfix_restart_peratom; i++)
if (used_restart_peratom[i] == 0) break; if (used_restart_peratom[i] == 0) break;
if (i == nfix_restart_peratom) { if (i == nfix_restart_peratom) {
if (screen) if (screen)
fprintf(screen,"All restart file peratom fix info " fprintf(screen,"All restart file peratom fix info "
"was re-assigned\n"); "was re-assigned\n");
if (logfile) if (logfile)
fprintf(logfile,"All restart file peratom fix info " fprintf(logfile,"All restart file peratom fix info "
"was re-assigned\n"); "was re-assigned\n");
} else { } else {
if (screen) fprintf(screen,"Unused restart file peratom fix info:\n"); if (screen) fprintf(screen,"Unused restart file peratom fix info:\n");
if (logfile) fprintf(logfile,"Unused restart file peratom fix info:\n"); if (logfile) fprintf(logfile,"Unused restart file peratom fix info:\n");
for (i = 0; i < nfix_restart_peratom; i++) { for (i = 0; i < nfix_restart_peratom; i++) {
if (used_restart_peratom[i]) continue; if (used_restart_peratom[i]) continue;
if (screen) fprintf(screen," fix style: %s, fix ID: %s\n", if (screen) fprintf(screen," fix style: %s, fix ID: %s\n",
style_restart_peratom[i],id_restart_peratom[i]); style_restart_peratom[i],id_restart_peratom[i]);
if (logfile) fprintf(logfile," fix style: %s, fix ID: %s\n", if (logfile) fprintf(logfile," fix style: %s, fix ID: %s\n",
style_restart_peratom[i],id_restart_peratom[i]); style_restart_peratom[i],id_restart_peratom[i]);
} }
} }
} }