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

66
src/fix_nve_sphere.cpp
View File

@ -46,7 +46,7 @@ FixNVESphere::FixNVESphere(LAMMPS *lmp, int narg, char **arg) :
extra = NONE;
dlm = NODLM;
inertia = 0.4;
inertia = 0.4;
int iarg = 3;
while (iarg < narg) {
@ -58,11 +58,11 @@ FixNVESphere::FixNVESphere(LAMMPS *lmp, int narg, char **arg) :
dlm = DLM;
} else error->all(FLERR,"Illegal fix nve/sphere command");
iarg += 2;
}
}
else if (strcmp(arg[iarg],"disc")==0) {
inertia = 0.5;
if (domain->dimension != 2)
error->all(FLERR,"Fix nve/sphere disc requires 2d simulation");
error->all(FLERR,"Fix nve/sphere disc requires 2d simulation");
iarg++;
}
else error->all(FLERR,"Illegal fix nve/sphere command");
@ -138,9 +138,9 @@ void FixNVESphere::initial_integrate(int vflag)
omega[i][2] += dtirotate * torque[i][2];
}
}
// update mu for dipoles
if (extra == DIPOLE) {
double **mu = atom->mu;
if (dlm == NODLM) {
@ -166,11 +166,11 @@ void FixNVESphere::initial_integrate(int vflag)
for (int i = 0; i < nlocal; i++) {
if (mask[i] & groupbit && mu[i][3] > 0.0) {
// Construct Q from dipole:
// Q is the rotation matrix from space frame to body frame
// i.e. v_b = Q.v_s
// define mu to lie along the z axis in the body frame
// take the unit dipole to avoid getting a scaling matrix
@ -178,7 +178,7 @@ void FixNVESphere::initial_integrate(int vflag)
a[0] = mu[i][0]*inv_len_mu;
a[1] = mu[i][1]*inv_len_mu;
a[2] = mu[i][2]*inv_len_mu;
// v = a x [0 0 1] - cross product of mu in space and body frames
// s = |v|
// c = a.[0 0 1] = a[2]
@ -187,12 +187,12 @@ void FixNVESphere::initial_integrate(int vflag)
// -v[1] v[0] 0 ]
// then
// Q = I + vx + vx^2 * (1-c)/s^2
s2 = a[0]*a[0] + a[1]*a[1];
if (s2 != 0.0){ // i.e. the vectors are not parallel
scale = (1.0 - a[2])/s2;
Q[0][0] = 1.0 - scale*a[0]*a[0];
Q[0][0] = 1.0 - scale*a[0]*a[0];
Q[0][1] = -scale*a[0]*a[1];
Q[0][2] = -a[0];
Q[1][0] = -scale*a[0]*a[1];
@ -206,64 +206,64 @@ void FixNVESphere::initial_integrate(int vflag)
Q[1][0] = 0.0; Q[1][1] = 1.0/a[2]; Q[1][2] = 0.0;
Q[2][0] = 0.0; Q[2][1] = 0.0; Q[2][2] = 1.0/a[2];
}
// Local copy of this particle's angular velocity (in space frame)
w[0] = omega[i][0]; w[1] = omega[i][1]; w[2] = omega[i][2];
// Transform omega into body frame: w_temp= Q.w
matvec(Q,w,w_temp);
// Construct rotation R1
BuildRxMatrix(R, dtf/force->ftm2v*w_temp[0]);
// Apply R1 to w: w = R.w_temp
matvec(R,w_temp,w);
// Apply R1 to Q: Q_temp = R^T.Q
transpose_times3(R,Q,Q_temp);
// Construct rotation R2
BuildRyMatrix(R, dtf/force->ftm2v*w[1]);
// Apply R2 to w: w_temp = R.w
matvec(R,w,w_temp);
// Apply R2 to Q: Q = R^T.Q_temp
transpose_times3(R,Q_temp,Q);
// Construct rotation R3
BuildRzMatrix(R, 2.0*dtf/force->ftm2v*w_temp[2]);
// Apply R3 to w: w = R.w_temp
matvec(R,w_temp,w);
// Apply R3 to Q: Q_temp = R^T.Q
transpose_times3(R,Q,Q_temp);
// Construct rotation R4
BuildRyMatrix(R, dtf/force->ftm2v*w[1]);
// Apply R4 to w: w_temp = R.w
matvec(R,w,w_temp);
// Apply R4 to Q: Q = R^T.Q_temp
transpose_times3(R,Q_temp,Q);
// Construct rotation R5
BuildRxMatrix(R, dtf/force->ftm2v*w_temp[0]);
// Apply R5 to w: w = R.w_temp
matvec(R,w_temp,w);
// Apply R5 to Q: Q_temp = R^T.Q
transpose_times3(R,Q,Q_temp);
// Transform w back into space frame w_temp = Q^T.w
transpose_matvec(Q_temp,w,w_temp);
omega[i][0] = w_temp[0];
omega[i][0] = w_temp[0];
omega[i][1] = w_temp[1];
omega[i][2] = w_temp[2];
// Set dipole according to updated Q: mu = Q^T.[0 0 1] * |mu|
mu[i][0] = Q_temp[2][0] * mu[i][3];
mu[i][1] = Q_temp[2][1] * mu[i][3];
@ -309,8 +309,8 @@ void FixNVESphere::final_integrate()
omega[i][0] += dtirotate * torque[i][0];
omega[i][1] += dtirotate * torque[i][1];
omega[i][2] += dtirotate * torque[i][2];
rke += (omega[i][0]*omega[i][0] + omega[i][1]*omega[i][1] +
rke += (omega[i][0]*omega[i][0] + omega[i][1]*omega[i][1] +
omega[i][2]*omega[i][2])*radius[i]*radius[i]*rmass[i];
}
}