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

remove redundant code

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-01-14 14:55:13 -05:00
parent 2213eb8d3f
commit dcb1ddb282
1 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/fix_move.cpp
View File

@ -778,21 +778,16 @@ void FixMove::initial_integrate(int /*vflag*/)
} else if (vxvarstr) { } else if (vxvarstr) {
if (vxvarstyle == EQUAL) v[i][0] = vx; if (vxvarstyle == EQUAL) v[i][0] = vx;
else v[i][0] = velocity[i][0]; else v[i][0] = velocity[i][0];
if (rmass) {
x[i][0] += dtv * v[i][0]; x[i][0] += dtv * v[i][0];
} else {
x[i][0] += dtv * v[i][0];
}
} else { } else {
if (rmass) { if (rmass) {
dtfm = dtf / rmass[i]; dtfm = dtf / rmass[i];
v[i][0] += dtfm * f[i][0]; v[i][0] += dtfm * f[i][0];
x[i][0] += dtv * v[i][0];
} else { } else {
dtfm = dtf / mass[type[i]]; dtfm = dtf / mass[type[i]];
v[i][0] += dtfm * f[i][0]; v[i][0] += dtfm * f[i][0];
x[i][0] += dtv * v[i][0];
} }
x[i][0] += dtv * v[i][0];
} }
if (yvarstr && vyvarstr) { if (yvarstr && vyvarstr) {
@ -806,21 +801,16 @@ void FixMove::initial_integrate(int /*vflag*/)
} else if (vyvarstr) { } else if (vyvarstr) {
if (vyvarstyle == EQUAL) v[i][1] = vy; if (vyvarstyle == EQUAL) v[i][1] = vy;
else v[i][1] = velocity[i][1]; else v[i][1] = velocity[i][1];
if (rmass) {
x[i][1] += dtv * v[i][1]; x[i][1] += dtv * v[i][1];
} else {
x[i][1] += dtv * v[i][1];
}
} else { } else {
if (rmass) { if (rmass) {
dtfm = dtf / rmass[i]; dtfm = dtf / rmass[i];
v[i][1] += dtfm * f[i][1]; v[i][1] += dtfm * f[i][1];
x[i][1] += dtv * v[i][1];
} else { } else {
dtfm = dtf / mass[type[i]]; dtfm = dtf / mass[type[i]];
v[i][1] += dtfm * f[i][1]; v[i][1] += dtfm * f[i][1];
x[i][1] += dtv * v[i][1];
} }
x[i][1] += dtv * v[i][1];
} }
if (zvarstr && vzvarstr) { if (zvarstr && vzvarstr) {
@ -834,21 +824,16 @@ void FixMove::initial_integrate(int /*vflag*/)
} else if (vzvarstr) { } else if (vzvarstr) {
if (vzvarstyle == EQUAL) v[i][2] = vz; if (vzvarstyle == EQUAL) v[i][2] = vz;
else v[i][2] = velocity[i][2]; else v[i][2] = velocity[i][2];
if (rmass) {
x[i][2] += dtv * v[i][2]; x[i][2] += dtv * v[i][2];
} else {
x[i][2] += dtv * v[i][2];
}
} else { } else {
if (rmass) { if (rmass) {
dtfm = dtf / rmass[i]; dtfm = dtf / rmass[i];
v[i][2] += dtfm * f[i][2]; v[i][2] += dtfm * f[i][2];
x[i][2] += dtv * v[i][2];
} else { } else {
dtfm = dtf / mass[type[i]]; dtfm = dtf / mass[type[i]];
v[i][2] += dtfm * f[i][2]; v[i][2] += dtfm * f[i][2];
x[i][2] += dtv * v[i][2];
} }
x[i][2] += dtv * v[i][2];
} }
domain->remap_near(x[i],xold); domain->remap_near(x[i],xold);