jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whitespace fixes

This commit is contained in:
Axel Kohlmeyer 2020-06-30 16:32:41 -04:00
parent edfb4076ff
commit ad38b5d306
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fix_adapt.cpp
View File

@ -140,12 +140,12 @@ nadapt(0), id_fix_diam(NULL), id_fix_chg(NULL), adapt(NULL)
} else error->all(FLERR,"Illegal fix adapt command"); } else error->all(FLERR,"Illegal fix adapt command");
nadapt++; nadapt++;
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg],"atom") == 0) { } else if (strcmp(arg[iarg],"atom") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal fix adapt command"); if (iarg+3 > narg) error->all(FLERR,"Illegal fix adapt command");
adapt[nadapt].which = ATOM; adapt[nadapt].which = ATOM;
if (strcmp(arg[iarg+1],"diameter") == 0 || if (strcmp(arg[iarg+1],"diameter") == 0 ||
strcmp(arg[iarg+1],"diameter/disc") == 0) { strcmp(arg[iarg+1],"diameter/disc") == 0) {
adapt[nadapt].aparam = DIAMETER; adapt[nadapt].aparam = DIAMETER;
diamflag = 1; diamflag = 1;
discflag = 0; discflag = 0;
@ -195,10 +195,10 @@ nadapt(0), id_fix_diam(NULL), id_fix_chg(NULL), adapt(NULL)
// if scaleflag set with diameter or charge adaptation, // if scaleflag set with diameter or charge adaptation,
// then previous step scale factors are written to restart file // then previous step scale factors are written to restart file
// initialize them here in case one is used and other is never defined // initialize them here in case one is used and other is never defined
if (scaleflag && (diamflag || chgflag)) restart_global = 1; if (scaleflag && (diamflag || chgflag)) restart_global = 1;
previous_diam_scale = previous_chg_scale = 1.0; previous_diam_scale = previous_chg_scale = 1.0;
// allocate pair style arrays // allocate pair style arrays
int n = atom->ntypes; int n = atom->ntypes;
@ -452,7 +452,7 @@ void FixAdapt::init()
} }
} }
} }
if (restart_reset) restart_reset = 0; if (restart_reset) restart_reset = 0;
// make copy of original pair/bond array values // make copy of original pair/bond array values
@ -608,7 +608,7 @@ void FixAdapt::change_settings()
else radius[i] = 0.5*value; else radius[i] = 0.5*value;
} }
} }
if (scaleflag) previous_diam_scale = value; if (scaleflag) previous_diam_scale = value;
// reset charge to new value, for both owned and ghost atoms // reset charge to new value, for both owned and ghost atoms
@ -621,15 +621,15 @@ void FixAdapt::change_settings()
int nlocal = atom->nlocal; int nlocal = atom->nlocal;
int nall = nlocal + atom->nghost; int nall = nlocal + atom->nghost;
if (scaleflag) scale = value / previous_chg_scale; if (scaleflag) scale = value / previous_chg_scale;
for (i = 0; i < nall; i++) { for (i = 0; i < nall; i++) {
if (mask[i] & groupbit) { if (mask[i] & groupbit) {
if (scaleflag) q[i] *= scale; if (scaleflag) q[i] *= scale;
else q[i] = value; else q[i] = value;
} }
} }
if (scaleflag) previous_chg_scale = value; if (scaleflag) previous_chg_scale = value;
} }
} }
@ -745,7 +745,7 @@ void FixAdapt::set_arrays(int i)
void FixAdapt::write_restart(FILE *fp) void FixAdapt::write_restart(FILE *fp)
{ {
int size = 2*sizeof(double); int size = 2*sizeof(double);
fwrite(&size,sizeof(int),1,fp); fwrite(&size,sizeof(int),1,fp);
fwrite(&previous_diam_scale,sizeof(double),1,fp); fwrite(&previous_diam_scale,sizeof(double),1,fp);
fwrite(&previous_chg_scale,sizeof(double),1,fp); fwrite(&previous_chg_scale,sizeof(double),1,fp);
@ -758,7 +758,7 @@ void FixAdapt::write_restart(FILE *fp)
void FixAdapt::restart(char *buf) void FixAdapt::restart(char *buf)
{ {
double *dbuf = (double *) buf; double *dbuf = (double *) buf;
previous_diam_scale = dbuf[0]; previous_diam_scale = dbuf[0];
previous_chg_scale = dbuf[1]; previous_chg_scale = dbuf[1];
} }