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
2016-10-24 17:13:21 -04:00
parent 7b89e47a38
commit 512c413b7e
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/region.cpp
View File

@ -486,7 +486,7 @@ void Region::set_velocity()
else v[0] = v[1] = v[2] = 0.0;
prev[0] = dx;
prev[1] = dy;
prev[2] = dz;
prev[2] = dz;
}
if (rotateflag) {
@ -546,13 +546,13 @@ void Region::velocity_contact(double *vwall, double *x, int ic)
void Region::length_restart_string(int &n)
{
n += sizeof(int) + strlen(id)+1 +
n += sizeof(int) + strlen(id)+1 +
sizeof(int) + strlen(style)+1 + sizeof(int) +
size_restart*sizeof(double);
}
/* ----------------------------------------------------------------------
region writes its current style, id, number of sub-regions
region writes its current style, id, number of sub-regions
and position/angle
needed by fix/wall/gran/region to compute velocity by differencing scheme
------------------------------------------------------------------------- */
@ -564,10 +564,10 @@ void Region::write_restart(FILE *fp)
fwrite(&sizeid, sizeof(int), 1, fp);
fwrite(id, 1, sizeid, fp);
fwrite(&sizestyle, sizeof(int), 1, fp);
fwrite(style, 1, sizestyle, fp);
fwrite(style, 1, sizestyle, fp);
fwrite(&nregion,sizeof(int),1,fp);
fwrite(prev, sizeof(double), size_restart, fp);
fwrite(prev, sizeof(double), size_restart, fp);
}
/* ----------------------------------------------------------------------

2
src/region.h
View File

@ -60,7 +60,7 @@ class Region : protected Pointers {
double omega[3]; // angular velocity
double rprev; // speed of time-dependent radius, if applicable
double xcenter[3]; // translated/rotated center of cylinder/sphere (only used if varshape)
double prev[5]; // stores displacement (X3), angle and if
double prev[5]; // stores displacement (X3), angle and if
// necessary, region variable size (e.g. radius)
// at previous time step
int vel_timestep; // store timestep at which set_velocity was called

10
src/region_block.cpp
View File

@ -344,7 +344,7 @@ int RegBlock::surface_exterior(double *x, double cutoff)
store closest point in xc,yc,zc
--------------------------------------------------------------------------*/
double RegBlock::find_closest_point(int i, double *x,
double RegBlock::find_closest_point(int i, double *x,
double &xc, double &yc, double &zc)
{
double dot,d2,d2min;
@ -372,7 +372,7 @@ double RegBlock::find_closest_point(int i, double *x,
} else {
point_on_line_segment(corners[i][0],corners[i][1],x,p);
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
(p[2]-x[2])*(p[2]-x[2]);
if (d2 < d2min) {
d2min = d2;
@ -382,7 +382,7 @@ double RegBlock::find_closest_point(int i, double *x,
}
point_on_line_segment(corners[i][1],corners[i][2],x,p);
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
(p[2]-x[2])*(p[2]-x[2]);
if (d2 < d2min) {
d2min = d2;
@ -392,7 +392,7 @@ double RegBlock::find_closest_point(int i, double *x,
}
point_on_line_segment(corners[i][2],corners[i][3],x,p);
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
(p[2]-x[2])*(p[2]-x[2]);
if (d2 < d2min) {
d2min = d2;
@ -402,7 +402,7 @@ double RegBlock::find_closest_point(int i, double *x,
}
point_on_line_segment(corners[i][3],corners[i][4],x,p);
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
d2 = (p[0]-x[0])*(p[0]-x[0]) + (p[1]-x[1])*(p[1]-x[1]) +
(p[2]-x[2])*(p[2]-x[2]);
if (d2 < d2min) {
d2min = d2;

2
src/region_cone.cpp
View File

@ -416,7 +416,7 @@ int RegCone::surface_exterior(double *x, double cutoff)
// x is far enough from cone that there is no contact
// x is interior to cone
if (r >= maxradius+cutoff || x[0] <= lo-cutoff || x[0] >= hi+cutoff)
if (r >= maxradius+cutoff || x[0] <= lo-cutoff || x[0] >= hi+cutoff)
return 0;
if (r < currentradius && x[0] > lo && x[0] < hi) return 0;

16
src/region_cylinder.cpp
View File

@ -36,7 +36,7 @@ RegCylinder::RegCylinder(LAMMPS *lmp, int narg, char **arg) :
// check open face settings
if (openflag && (open_faces[2] || open_faces[3] ||
if (openflag && (open_faces[2] || open_faces[3] ||
open_faces[4] || open_faces[5]))
error->all(FLERR,"Invalid region cylinder open setting");
@ -691,16 +691,16 @@ void RegCylinder::variable_check()
/* ----------------------------------------------------------------------
Set values needed to calculate velocity due to shape changes.
Set values needed to calculate velocity due to shape changes.
These values do not depend on the contact, so this function is
called once per timestep by fix/wall/gran/region.
------------------------------------------------------------------------- */
void RegCylinder::set_velocity_shape()
{
if (axis == 'x'){
xcenter[0] = 0;
xcenter[0] = 0;
xcenter[1] = c1;
xcenter[2] = c2;
}
@ -715,15 +715,15 @@ void RegCylinder::set_velocity_shape()
xcenter[2] = 0;
}
forward_transform(xcenter[0], xcenter[1], xcenter[2]);
if (update->ntimestep > 0) rprev = prev[4];
if (update->ntimestep > 0) rprev = prev[4];
else rprev = radius;
prev[4] = radius;
prev[4] = radius;
}
/* ----------------------------------------------------------------------
add velocity due to shape change to wall velocity
add velocity due to shape change to wall velocity
------------------------------------------------------------------------- */
void RegCylinder::velocity_contact_shape(double *vwall, double *xc)
@ -746,7 +746,7 @@ void RegCylinder::velocity_contact_shape(double *vwall, double *xc)
}
vwall[0] += delx/update->dt;
vwall[1] += dely/update->dt;
vwall[2] += delz/update->dt;
vwall[2] += delz/update->dt;
//printf ("R is %g, prev %g, velocity of wall at %g %g %g is %g %g %g\n",radius,rprev,xc[0],xc[1],xc[2],vwall[0],vwall[1],vwall[2]);
}

10
src/region_intersect.cpp
View File

@ -43,7 +43,7 @@ RegIntersect::RegIntersect(LAMMPS *lmp, int narg, char **arg) :
idsub[nregion] = new char[m];
strcpy(idsub[nregion],arg[iarg+3]);
iregion = domain->find_region(idsub[nregion]);
if (iregion == -1)
if (iregion == -1)
error->all(FLERR,"Region intersect region ID does not exist");
list[nregion++] = iregion;
}
@ -124,7 +124,7 @@ void RegIntersect::init()
int iregion;
for (int ilist = 0; ilist < nregion; ilist++) {
iregion = domain->find_region(idsub[ilist]);
if (iregion == -1)
if (iregion == -1)
error->all(FLERR,"Region union region ID does not exist");
list[ilist] = iregion;
}
@ -290,7 +290,7 @@ void RegIntersect::set_velocity()
void RegIntersect::length_restart_string(int& n)
{
n += sizeof(int) + strlen(id)+1 +
n += sizeof(int) + strlen(id)+1 +
sizeof(int) + strlen(style)+1 + sizeof(int);
for (int ilist = 0; ilist < nregion; ilist++)
domain->regions[list[ilist]]->length_restart_string(n);
@ -308,7 +308,7 @@ void RegIntersect::write_restart(FILE *fp)
fwrite(&sizeid, sizeof(int), 1, fp);
fwrite(id, 1, sizeid, fp);
fwrite(&sizestyle, sizeof(int), 1, fp);
fwrite(style, 1, sizestyle, fp);
fwrite(style, 1, sizestyle, fp);
fwrite(&nregion,sizeof(int),1,fp);
for (int ilist = 0; ilist < nregion; ilist++){
@ -340,7 +340,7 @@ int RegIntersect::restart(char *buf, int& n)
for (int ilist = 0; ilist < nregion; ilist++)
if (!domain->regions[list[ilist]]->restart(buf, n)) return 0;
return 1;
return 1;
}
/* ----------------------------------------------------------------------

14
src/region_sphere.cpp
View File

@ -188,10 +188,10 @@ void RegSphere::variable_check()
/* ----------------------------------------------------------------------
Set values needed to calculate velocity due to shape changes.
Set values needed to calculate velocity due to shape changes.
These values do not depend on the contact, so this function is
called once per timestep by fix/wall/gran/region.
------------------------------------------------------------------------- */
void RegSphere::set_velocity_shape()
@ -200,27 +200,27 @@ void RegSphere::set_velocity_shape()
xcenter[1] = yc;
xcenter[2] = zc;
forward_transform(xcenter[0], xcenter[1], xcenter[2]);
if (update->ntimestep > 0) rprev = prev[4];
if (update->ntimestep > 0) rprev = prev[4];
else rprev = radius;
prev[4] = radius;
prev[4] = radius;
}
/* ----------------------------------------------------------------------
add velocity due to shape change to wall velocity
add velocity due to shape change to wall velocity
------------------------------------------------------------------------- */
void RegSphere::velocity_contact_shape(double *vwall, double *xc)
{
double delx, dely, delz; // Displacement of contact point in x,y,z
delx = (xc[0] - xcenter[0])*(1 - rprev/radius);
dely = (xc[1] - xcenter[1])*(1 - rprev/radius);
delz = (xc[2] - xcenter[2])*(1 - rprev/radius);
vwall[0] += delx/update->dt;
vwall[1] += dely/update->dt;
vwall[2] += delz/update->dt;
vwall[2] += delz/update->dt;
}

12
src/region_union.cpp
View File

@ -44,7 +44,7 @@ RegUnion::RegUnion(LAMMPS *lmp, int narg, char **arg) : Region(lmp, narg, arg)
idsub[nregion] = new char[m];
strcpy(idsub[nregion],arg[iarg+3]);
iregion = domain->find_region(idsub[nregion]);
if (iregion == -1)
if (iregion == -1)
error->all(FLERR,"Region union region ID does not exist");
list[nregion++] = iregion;
}
@ -118,7 +118,7 @@ void RegUnion::init()
int iregion;
for (int ilist = 0; ilist < nregion; ilist++) {
iregion = domain->find_region(idsub[ilist]);
if (iregion == -1)
if (iregion == -1)
error->all(FLERR,"Region union region ID does not exist");
list[ilist] = iregion;
}
@ -171,7 +171,7 @@ int RegUnion::surface_interior(double *x, double cutoff)
for (jlist = 0; jlist < nregion; jlist++) {
if (jlist == ilist) continue;
jregion = list[jlist];
if (regions[jregion]->match(xs,ys,zs) &&
if (regions[jregion]->match(xs,ys,zs) &&
!regions[jregion]->openflag) break;
}
if (jlist == nregion) {
@ -284,7 +284,7 @@ void RegUnion::set_velocity()
void RegUnion::length_restart_string(int& n)
{
n += sizeof(int) + strlen(id)+1 +
n += sizeof(int) + strlen(id)+1 +
sizeof(int) + strlen(style)+1 + sizeof(int);
for (int ilist = 0; ilist < nregion; ilist++)
domain->regions[list[ilist]]->length_restart_string(n);
@ -302,10 +302,10 @@ void RegUnion::write_restart(FILE *fp)
fwrite(&sizeid, sizeof(int), 1, fp);
fwrite(id, 1, sizeid, fp);
fwrite(&sizestyle, sizeof(int), 1, fp);
fwrite(style, 1, sizestyle, fp);
fwrite(style, 1, sizestyle, fp);
fwrite(&nregion,sizeof(int),1,fp);
for (int ilist = 0; ilist < nregion; ilist++)
domain->regions[list[ilist]]->write_restart(fp);
domain->regions[list[ilist]]->write_restart(fp);
}
/* ----------------------------------------------------------------------