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

remove trailing whitespace

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-03-16 12:37:27 -04:00
parent ee862d8bf5
commit 59dbb49cf9
204 changed files with 1543 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/set.cpp
View File

@ -525,7 +525,7 @@ void Set::command(int narg, char **arg)
if (comm->me == 0) {
if (screen) {
if (strcmp(arg[origarg],"cc") == 0)
if (strcmp(arg[origarg],"cc") == 0)
fprintf(screen," %d settings made for %s index %s\n",
allcount,arg[origarg],arg[origarg+1]);
else
@ -533,7 +533,7 @@ void Set::command(int narg, char **arg)
allcount,arg[origarg]);
}
if (logfile) {
if (strcmp(arg[origarg],"cc") == 0)
if (strcmp(arg[origarg],"cc") == 0)
fprintf(logfile," %d settings made for %s index %s\n",
allcount,arg[origarg],arg[origarg+1]);
else
@ -724,7 +724,7 @@ void Set::set(int keyword)
else if (keyword == EDPD_CV) atom->edpd_cv[i] = dvalue;
else if (keyword == CC) atom->cc[i][cc_index-1] = dvalue;
else if (keyword == SMD_MASS_DENSITY) {
else if (keyword == SMD_MASS_DENSITY) {
// set mass from volume and supplied mass density
atom->rmass[i] = atom->vfrac[i] * dvalue;
}
@ -780,18 +780,18 @@ void Set::set(int keyword)
else if (keyword == DENSITY) {
if (dvalue <= 0.0) error->one(FLERR,"Invalid density in set command");
if (atom->radius_flag && atom->radius[i] > 0.0)
if (discflag)
if (discflag)
atom->rmass[i] = MY_PI*atom->radius[i]*atom->radius[i] * dvalue;
else
atom->rmass[i] = 4.0*MY_PI/3.0 *
else
atom->rmass[i] = 4.0*MY_PI/3.0 *
atom->radius[i]*atom->radius[i]*atom->radius[i] * dvalue;
else if (atom->ellipsoid_flag && atom->ellipsoid[i] >= 0) {
double *shape = avec_ellipsoid->bonus[atom->ellipsoid[i]].shape;
// enable 2d ellipse (versus 3d ellipsoid) when time integration
// options (fix nve/asphere, fix nh/asphere) are also implemented
// if (discflag)
// if (discflag)
// atom->rmass[i] = MY_PI*shape[0]*shape[1] * dvalue;
// else
// else
atom->rmass[i] = 4.0*MY_PI/3.0 * shape[0]*shape[1]*shape[2] * dvalue;
} else if (atom->line_flag && atom->line[i] >= 0) {
double length = avec_line->bonus[atom->line[i]].length;
@ -823,7 +823,7 @@ void Set::set(int keyword)
// set quaternion orientation of ellipsoid or tri or body particle
// enforce quat rotation vector in z dir for 2d systems
else if (keyword == QUAT) {
double *quat;
if (avec_ellipsoid && atom->ellipsoid[i] >= 0)
@ -837,7 +837,7 @@ void Set::set(int keyword)
if (domain->dimension == 2 && (xvalue != 0.0 || yvalue != 0.0))
error->one(FLERR,"Cannot set quaternion with xy components "
"for 2d system");
double theta2 = MY_PI2 * wvalue/180.0;
double sintheta2 = sin(theta2);
quat[0] = cos(theta2);