Skip to content

Commit 3f3f787

Browse files
committed
This conditional has become redundant
The " if (jdat->mass[j] > _TINY_){ " conditional has become redundant since commit 1d0386d, i.e. since particles are only added as j-particles if they have mass.
1 parent 3a2a913 commit 3f3f787

1 file changed

Lines changed: 22 additions & 25 deletions

File tree

src/amuse_ph4/src/idata.cc

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -204,33 +204,30 @@ void idata::get_partial_acc_and_jerk()
204204
ldnn[i] = _INFINITY_;
205205
for (int k = 0; k < 3; k++) lacc[i][k] = ljerk[i][k] = 0;
206206
for (int j = j_start; j < j_end; j++) {
207-
// Skip particles with zero mass.
208-
if (jdat->mass[j] > _TINY_){
209-
r2 = xv = 0;
210-
for (int k = 0; k < 3; k++) {
211-
dx[k] = jdat->pred_pos[j][k] - ipos[i][k];
212-
dv[k] = jdat->pred_vel[j][k] - ivel[i][k];
213-
r2 += dx[k]*dx[k];
214-
xv += dx[k]*dv[k];
215-
}
216-
r2i = 1/(r2+eps2+_TINY_);
217-
ri = sqrt(r2i);
218-
mri = jdat->mass[j]*ri;
219-
mr3i = mri*r2i;
220-
a3 = -3*xv*r2i;
221-
// PRC(jdat->mpi_rank); PRC(ri); PRL(mri);
222-
if (r2 > _TINY_) {
223-
lpot[i] -= mri;
224-
if (r2 < ldnn[i]) {
225-
ldnn[i] = r2;
226-
lnn[i] = j;
227-
}
228-
}
229-
for (int k = 0; k < 3; k++) {
230-
lacc[i][k] += mr3i*dx[k];
231-
ljerk[i][k] += mr3i*(dv[k]+a3*dx[k]);
207+
r2 = xv = 0;
208+
for (int k = 0; k < 3; k++) {
209+
dx[k] = jdat->pred_pos[j][k] - ipos[i][k];
210+
dv[k] = jdat->pred_vel[j][k] - ivel[i][k];
211+
r2 += dx[k]*dx[k];
212+
xv += dx[k]*dv[k];
213+
}
214+
r2i = 1/(r2+eps2+_TINY_);
215+
ri = sqrt(r2i);
216+
mri = jdat->mass[j]*ri;
217+
mr3i = mri*r2i;
218+
a3 = -3*xv*r2i;
219+
// PRC(jdat->mpi_rank); PRC(ri); PRL(mri);
220+
if (r2 > _TINY_) {
221+
lpot[i] -= mri;
222+
if (r2 < ldnn[i]) {
223+
ldnn[i] = r2;
224+
lnn[i] = j;
232225
}
233226
}
227+
for (int k = 0; k < 3; k++) {
228+
lacc[i][k] += mr3i*dx[k];
229+
ljerk[i][k] += mr3i*(dv[k]+a3*dx[k]);
230+
}
234231
}
235232
ldnn[i] = sqrt(ldnn[i]);
236233
}

0 commit comments

Comments
 (0)