hydro_iact.h 32.6 KB
Newer Older
1
2
/*******************************************************************************
 * This file is part of SWIFT.
3
 * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
4
 *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
5
 *
6
7
8
9
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published
 * by the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
10
 *
11
12
13
14
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
15
 *
16
17
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 *
19
 ******************************************************************************/
20
21
#ifndef SWIFT_GADGET2_HYDRO_IACT_H
#define SWIFT_GADGET2_HYDRO_IACT_H
22
23

/**
24
 * @file Gadget2/hydro_iact.h
25
26
 * @brief SPH interaction functions following the Gadget-2 version of SPH.
 *
27
 * The interactions computed here are the ones presented in the Gadget-2 paper
28
29
 * Springel, V., MNRAS, Volume 364, Issue 4, pp. 1105-1134.
 * We use the same numerical coefficients as the Gadget-2 code. When used with
30
31
32
 * the Spline-3 kernel, the results should be equivalent to the ones obtained
 * with Gadget-2 up to the rounding errors and interactions missed by the
 * Gadget-2 tree-code neighbours search.
33
34
 */

35
#include "cache.h"
James Willis's avatar
James Willis committed
36
#include "minmax.h"
37

38
39
40
/**
 * @brief Density loop
 */
41
42
43
__attribute__((always_inline)) INLINE static void runner_iact_density(
    float r2, float *dx, float hi, float hj, struct part *pi, struct part *pj) {

44
45
  float wi, wi_dx;
  float wj, wj_dx;
46
  float dv[3], curlvr[3];
47

48
  /* Get the masses. */
49
  const float mi = pi->mass;
50
51
52
53
54
55
56
57
58
59
60
61
62
  const float mj = pj->mass;

  /* Get r and r inverse. */
  const float r = sqrtf(r2);
  const float r_inv = 1.0f / r;

  /* Compute the kernel function for pi */
  const float hi_inv = 1.f / hi;
  const float ui = r * hi_inv;
  kernel_deval(ui, &wi, &wi_dx);

  /* Compute contribution to the density */
  pi->rho += mj * wi;
63
  pi->density.rho_dh -= mj * (hydro_dimension * wi + ui * wi_dx);
64

65
66
  /* Compute contribution to the number of neighbours */
  pi->density.wcount += wi;
67
  pi->density.wcount_dh -= (hydro_dimension * wi + ui * wi_dx);
68
69
70
71
72
73
74
75

  /* Compute the kernel function for pj */
  const float hj_inv = 1.f / hj;
  const float uj = r * hj_inv;
  kernel_deval(uj, &wj, &wj_dx);

  /* Compute contribution to the density */
  pj->rho += mi * wj;
76
  pj->density.rho_dh -= mi * (hydro_dimension * wj + uj * wj_dx);
77

78
79
  /* Compute contribution to the number of neighbours */
  pj->density.wcount += wj;
80
  pj->density.wcount_dh -= (hydro_dimension * wj + uj * wj_dx);
81

82
83
  const float faci = mj * wi_dx * r_inv;
  const float facj = mi * wj_dx * r_inv;
84

85
86
87
88
  /* Compute dv dot r */
  dv[0] = pi->v[0] - pj->v[0];
  dv[1] = pi->v[1] - pj->v[1];
  dv[2] = pi->v[2] - pj->v[2];
89
90
  const float dvdr = dv[0] * dx[0] + dv[1] * dx[1] + dv[2] * dx[2];

91
92
  pi->density.div_v -= faci * dvdr;
  pj->density.div_v -= facj * dvdr;
93
94
95
96
97
98

  /* Compute dv cross r */
  curlvr[0] = dv[1] * dx[2] - dv[2] * dx[1];
  curlvr[1] = dv[2] * dx[0] - dv[0] * dx[2];
  curlvr[2] = dv[0] * dx[1] - dv[1] * dx[0];

99
100
101
  pi->density.rot_v[0] += faci * curlvr[0];
  pi->density.rot_v[1] += faci * curlvr[1];
  pi->density.rot_v[2] += faci * curlvr[2];
102

103
104
105
  pj->density.rot_v[0] += facj * curlvr[0];
  pj->density.rot_v[1] += facj * curlvr[1];
  pj->density.rot_v[2] += facj * curlvr[2];
106
107
}

108
109
110
/**
 * @brief Density loop (non-symmetric version)
 */
111
112
113
114
115
116
117
__attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
    float r2, float *dx, float hi, float hj, struct part *pi, struct part *pj) {

  float wi, wi_dx;
  float dv[3], curlvr[3];

  /* Get the masses. */
118
  const float mj = pj->mass;
119
120

  /* Get r and r inverse. */
121
  const float r = sqrtf(r2);
122
  const float r_inv = 1.0f / r;
123

124
  /* Compute the kernel function */
125
126
127
  const float hi_inv = 1.0f / hi;
  const float ui = r * hi_inv;
  kernel_deval(ui, &wi, &wi_dx);
128
129
130

  /* Compute contribution to the density */
  pi->rho += mj * wi;
131
  pi->density.rho_dh -= mj * (hydro_dimension * wi + ui * wi_dx);
132
133
134

  /* Compute contribution to the number of neighbours */
  pi->density.wcount += wi;
135
  pi->density.wcount_dh -= (hydro_dimension * wi + ui * wi_dx);
136

137
  const float fac = mj * wi_dx * r_inv;
138

139
140
141
142
143
  /* Compute dv dot r */
  dv[0] = pi->v[0] - pj->v[0];
  dv[1] = pi->v[1] - pj->v[1];
  dv[2] = pi->v[2] - pj->v[2];
  const float dvdr = dv[0] * dx[0] + dv[1] * dx[1] + dv[2] * dx[2];
144
  pi->density.div_v -= fac * dvdr;
145

146
147
148
149
150
  /* Compute dv cross r */
  curlvr[0] = dv[1] * dx[2] - dv[2] * dx[1];
  curlvr[1] = dv[2] * dx[0] - dv[0] * dx[2];
  curlvr[2] = dv[0] * dx[1] - dv[1] * dx[0];

151
152
153
  pi->density.rot_v[0] += fac * curlvr[0];
  pi->density.rot_v[1] += fac * curlvr[1];
  pi->density.rot_v[2] += fac * curlvr[2];
154
155
}

156
#ifdef WITH_VECTORIZATION
157
158
159
160
161

/**
 * @brief Density interaction computed using 1 vector
 * (non-symmetric vectorized version).
 */
162
__attribute__((always_inline)) INLINE static void
Matthieu Schaller's avatar
Matthieu Schaller committed
163
164
165
166
167
168
169
runner_iact_nonsym_1_vec_density(vector *r2, vector *dx, vector *dy, vector *dz,
                                 vector hi_inv, vector vix, vector viy,
                                 vector viz, float *Vjx, float *Vjy, float *Vjz,
                                 float *Mj, vector *rhoSum, vector *rho_dhSum,
                                 vector *wcountSum, vector *wcount_dhSum,
                                 vector *div_vSum, vector *curlvxSum,
                                 vector *curlvySum, vector *curlvzSum,
170
                                 mask_t mask) {
171

172
  vector r, ri, ui, wi, wi_dx;
173
174
175
176
177
  vector mj;
  vector dvx, dvy, dvz;
  vector vjx, vjy, vjz;
  vector dvdr;
  vector curlvrx, curlvry, curlvrz;
James Willis's avatar
James Willis committed
178

179
  /* Fill the vectors. */
180
181
182
183
  mj.v = vec_load(Mj);
  vjx.v = vec_load(Vjx);
  vjy.v = vec_load(Vjy);
  vjz.v = vec_load(Vjz);
184
185
186
187
188

  /* Get the radius and inverse radius. */
  ri = vec_reciprocal_sqrt(*r2);
  r.v = vec_mul(r2->v, ri.v);

189
  ui.v = vec_mul(r.v, hi_inv.v);
190
191

  /* Calculate the kernel for two particles. */
192
  kernel_deval_1_vec(&ui, &wi, &wi_dx);
193
194
195
196
197
198
199
200
201
202

  /* Compute dv. */
  dvx.v = vec_sub(vix.v, vjx.v);
  dvy.v = vec_sub(viy.v, vjy.v);
  dvz.v = vec_sub(viz.v, vjz.v);

  /* Compute dv dot r */
  dvdr.v = vec_fma(dvx.v, dx->v, vec_fma(dvy.v, dy->v, vec_mul(dvz.v, dz->v)));
  dvdr.v = vec_mul(dvdr.v, ri.v);

203
204
205
206
207
208
209
210
211
212
213
  /* Compute dv cross r */
  curlvrx.v =
      vec_fma(dvy.v, dz->v, vec_mul(vec_set1(-1.0f), vec_mul(dvz.v, dy->v)));
  curlvry.v =
      vec_fma(dvz.v, dx->v, vec_mul(vec_set1(-1.0f), vec_mul(dvx.v, dz->v)));
  curlvrz.v =
      vec_fma(dvx.v, dy->v, vec_mul(vec_set1(-1.0f), vec_mul(dvy.v, dx->v)));
  curlvrx.v = vec_mul(curlvrx.v, ri.v);
  curlvry.v = vec_mul(curlvry.v, ri.v);
  curlvrz.v = vec_mul(curlvrz.v, ri.v);

214
215
  vector wcount_dh_update;
  wcount_dh_update.v =
James Willis's avatar
James Willis committed
216
      vec_fma(vec_set1(hydro_dimension), wi.v, vec_mul(ui.v, wi_dx.v));
217

218
  /* Mask updates to intermediate vector sums for particle pi. */
219
  rhoSum->v = vec_mask_add(rhoSum->v, vec_mul(mj.v, wi.v), mask);
220
221
  rho_dhSum->v =
      vec_mask_sub(rho_dhSum->v, vec_mul(mj.v, wcount_dh_update.v), mask);
222
  wcountSum->v = vec_mask_add(wcountSum->v, wi.v, mask);
223
  wcount_dhSum->v = vec_mask_sub(wcount_dhSum->v, wcount_dh_update.v, mask);
James Willis's avatar
James Willis committed
224
225
226
227
228
229
230
231
  div_vSum->v =
      vec_mask_sub(div_vSum->v, vec_mul(mj.v, vec_mul(dvdr.v, wi_dx.v)), mask);
  curlvxSum->v = vec_mask_add(curlvxSum->v,
                              vec_mul(mj.v, vec_mul(curlvrx.v, wi_dx.v)), mask);
  curlvySum->v = vec_mask_add(curlvySum->v,
                              vec_mul(mj.v, vec_mul(curlvry.v, wi_dx.v)), mask);
  curlvzSum->v = vec_mask_add(curlvzSum->v,
                              vec_mul(mj.v, vec_mul(curlvrz.v, wi_dx.v)), mask);
232
233
}

234
/**
James Willis's avatar
James Willis committed
235
236
 * @brief Density interaction computed using 2 interleaved vectors
 * (non-symmetric vectorized version).
237
238
 */
__attribute__((always_inline)) INLINE static void
James Willis's avatar
James Willis committed
239
240
241
242
243
244
245
246
runner_iact_nonsym_2_vec_density(float *R2, float *Dx, float *Dy, float *Dz,
                                 vector hi_inv, vector vix, vector viy,
                                 vector viz, float *Vjx, float *Vjy, float *Vjz,
                                 float *Mj, vector *rhoSum, vector *rho_dhSum,
                                 vector *wcountSum, vector *wcount_dhSum,
                                 vector *div_vSum, vector *curlvxSum,
                                 vector *curlvySum, vector *curlvzSum,
                                 mask_t mask, mask_t mask2, short mask_cond) {
247

248
  vector r, ri, r2, ui, wi, wi_dx;
249
250
251
252
253
  vector mj;
  vector dx, dy, dz, dvx, dvy, dvz;
  vector vjx, vjy, vjz;
  vector dvdr;
  vector curlvrx, curlvry, curlvrz;
254
  vector r_2, ri2, r2_2, ui2, wi2, wi_dx2;
255
256
257
258
259
260
  vector mj2;
  vector dx2, dy2, dz2, dvx2, dvy2, dvz2;
  vector vjx2, vjy2, vjz2;
  vector dvdr2;
  vector curlvrx2, curlvry2, curlvrz2;

James Willis's avatar
James Willis committed
261
  /* Fill the vectors. */
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
  mj.v = vec_load(Mj);
  mj2.v = vec_load(&Mj[VEC_SIZE]);
  vjx.v = vec_load(Vjx);
  vjx2.v = vec_load(&Vjx[VEC_SIZE]);
  vjy.v = vec_load(Vjy);
  vjy2.v = vec_load(&Vjy[VEC_SIZE]);
  vjz.v = vec_load(Vjz);
  vjz2.v = vec_load(&Vjz[VEC_SIZE]);
  dx.v = vec_load(Dx);
  dx2.v = vec_load(&Dx[VEC_SIZE]);
  dy.v = vec_load(Dy);
  dy2.v = vec_load(&Dy[VEC_SIZE]);
  dz.v = vec_load(Dz);
  dz2.v = vec_load(&Dz[VEC_SIZE]);

  /* Get the radius and inverse radius. */
  r2.v = vec_load(R2);
  r2_2.v = vec_load(&R2[VEC_SIZE]);
280
281
  ri = vec_reciprocal_sqrt(r2);
  ri2 = vec_reciprocal_sqrt(r2_2);
282
283
284
  r.v = vec_mul(r2.v, ri.v);
  r_2.v = vec_mul(r2_2.v, ri2.v);

285
286
  ui.v = vec_mul(r.v, hi_inv.v);
  ui2.v = vec_mul(r_2.v, hi_inv.v);
287

James Willis's avatar
James Willis committed
288
  /* Calculate the kernel for two particles. */
289
  kernel_deval_2_vec(&ui, &wi, &wi_dx, &ui2, &wi2, &wi_dx2);
290
291
292
293
294
295
296
297
298
299
300

  /* Compute dv. */
  dvx.v = vec_sub(vix.v, vjx.v);
  dvx2.v = vec_sub(vix.v, vjx2.v);
  dvy.v = vec_sub(viy.v, vjy.v);
  dvy2.v = vec_sub(viy.v, vjy2.v);
  dvz.v = vec_sub(viz.v, vjz.v);
  dvz2.v = vec_sub(viz.v, vjz2.v);

  /* Compute dv dot r */
  dvdr.v = vec_fma(dvx.v, dx.v, vec_fma(dvy.v, dy.v, vec_mul(dvz.v, dz.v)));
James Willis's avatar
James Willis committed
301
302
  dvdr2.v =
      vec_fma(dvx2.v, dx2.v, vec_fma(dvy2.v, dy2.v, vec_mul(dvz2.v, dz2.v)));
303
304
305
306
  dvdr.v = vec_mul(dvdr.v, ri.v);
  dvdr2.v = vec_mul(dvdr2.v, ri2.v);

  /* Compute dv cross r */
James Willis's avatar
James Willis committed
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
  curlvrx.v =
      vec_fma(dvy.v, dz.v, vec_mul(vec_set1(-1.0f), vec_mul(dvz.v, dy.v)));
  curlvrx2.v =
      vec_fma(dvy2.v, dz2.v, vec_mul(vec_set1(-1.0f), vec_mul(dvz2.v, dy2.v)));
  curlvry.v =
      vec_fma(dvz.v, dx.v, vec_mul(vec_set1(-1.0f), vec_mul(dvx.v, dz.v)));
  curlvry2.v =
      vec_fma(dvz2.v, dx2.v, vec_mul(vec_set1(-1.0f), vec_mul(dvx2.v, dz2.v)));
  curlvrz.v =
      vec_fma(dvx.v, dy.v, vec_mul(vec_set1(-1.0f), vec_mul(dvy.v, dx.v)));
  curlvrz2.v =
      vec_fma(dvx2.v, dy2.v, vec_mul(vec_set1(-1.0f), vec_mul(dvy2.v, dx2.v)));
  curlvrx.v = vec_mul(curlvrx.v, ri.v);
  curlvrx2.v = vec_mul(curlvrx2.v, ri2.v);
  curlvry.v = vec_mul(curlvry.v, ri.v);
  curlvry2.v = vec_mul(curlvry2.v, ri2.v);
  curlvrz.v = vec_mul(curlvrz.v, ri.v);
  curlvrz2.v = vec_mul(curlvrz2.v, ri2.v);

326
327
  vector wcount_dh_update, wcount_dh_update2;
  wcount_dh_update.v =
James Willis's avatar
James Willis committed
328
      vec_fma(vec_set1(hydro_dimension), wi.v, vec_mul(ui.v, wi_dx.v));
329
  wcount_dh_update2.v =
James Willis's avatar
James Willis committed
330
      vec_fma(vec_set1(hydro_dimension), wi2.v, vec_mul(ui2.v, wi_dx2.v));
331

James Willis's avatar
James Willis committed
332
  /* Mask updates to intermediate vector sums for particle pi. */
333
  /* Mask only when needed. */
James Willis's avatar
James Willis committed
334
  if (mask_cond) {
335
336
    rhoSum->v = vec_mask_add(rhoSum->v, vec_mul(mj.v, wi.v), mask);
    rhoSum->v = vec_mask_add(rhoSum->v, vec_mul(mj2.v, wi2.v), mask2);
James Willis's avatar
James Willis committed
337
    rho_dhSum->v =
338
        vec_mask_sub(rho_dhSum->v, vec_mul(mj.v, wcount_dh_update.v), mask);
James Willis's avatar
James Willis committed
339
    rho_dhSum->v =
340
        vec_mask_sub(rho_dhSum->v, vec_mul(mj2.v, wcount_dh_update2.v), mask2);
341
342
    wcountSum->v = vec_mask_add(wcountSum->v, wi.v, mask);
    wcountSum->v = vec_mask_add(wcountSum->v, wi2.v, mask2);
343
344
    wcount_dhSum->v = vec_mask_sub(wcount_dhSum->v, wcount_dh_update.v, mask);
    wcount_dhSum->v = vec_mask_sub(wcount_dhSum->v, wcount_dh_update2.v, mask2);
James Willis's avatar
James Willis committed
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
    div_vSum->v = vec_mask_sub(div_vSum->v,
                               vec_mul(mj.v, vec_mul(dvdr.v, wi_dx.v)), mask);
    div_vSum->v = vec_mask_sub(
        div_vSum->v, vec_mul(mj2.v, vec_mul(dvdr2.v, wi_dx2.v)), mask2);
    curlvxSum->v = vec_mask_add(
        curlvxSum->v, vec_mul(mj.v, vec_mul(curlvrx.v, wi_dx.v)), mask);
    curlvxSum->v = vec_mask_add(
        curlvxSum->v, vec_mul(mj2.v, vec_mul(curlvrx2.v, wi_dx2.v)), mask2);
    curlvySum->v = vec_mask_add(
        curlvySum->v, vec_mul(mj.v, vec_mul(curlvry.v, wi_dx.v)), mask);
    curlvySum->v = vec_mask_add(
        curlvySum->v, vec_mul(mj2.v, vec_mul(curlvry2.v, wi_dx2.v)), mask2);
    curlvzSum->v = vec_mask_add(
        curlvzSum->v, vec_mul(mj.v, vec_mul(curlvrz.v, wi_dx.v)), mask);
    curlvzSum->v = vec_mask_add(
        curlvzSum->v, vec_mul(mj2.v, vec_mul(curlvrz2.v, wi_dx2.v)), mask2);
  } else {
362
363
    rhoSum->v = vec_add(rhoSum->v, vec_mul(mj.v, wi.v));
    rhoSum->v = vec_add(rhoSum->v, vec_mul(mj2.v, wi2.v));
364
365
    rho_dhSum->v = vec_sub(rho_dhSum->v, vec_mul(mj.v, wcount_dh_update.v));
    rho_dhSum->v = vec_sub(rho_dhSum->v, vec_mul(mj2.v, wcount_dh_update2.v));
366
367
    wcountSum->v = vec_add(wcountSum->v, wi.v);
    wcountSum->v = vec_add(wcountSum->v, wi2.v);
368
369
    wcount_dhSum->v = vec_sub(wcount_dhSum->v, wcount_dh_update.v);
    wcount_dhSum->v = vec_sub(wcount_dhSum->v, wcount_dh_update2.v);
370
    div_vSum->v = vec_sub(div_vSum->v, vec_mul(mj.v, vec_mul(dvdr.v, wi_dx.v)));
James Willis's avatar
James Willis committed
371
372
373
374
375
376
377
378
379
380
381
382
383
384
    div_vSum->v =
        vec_sub(div_vSum->v, vec_mul(mj2.v, vec_mul(dvdr2.v, wi_dx2.v)));
    curlvxSum->v =
        vec_add(curlvxSum->v, vec_mul(mj.v, vec_mul(curlvrx.v, wi_dx.v)));
    curlvxSum->v =
        vec_add(curlvxSum->v, vec_mul(mj2.v, vec_mul(curlvrx2.v, wi_dx2.v)));
    curlvySum->v =
        vec_add(curlvySum->v, vec_mul(mj.v, vec_mul(curlvry.v, wi_dx.v)));
    curlvySum->v =
        vec_add(curlvySum->v, vec_mul(mj2.v, vec_mul(curlvry2.v, wi_dx2.v)));
    curlvzSum->v =
        vec_add(curlvzSum->v, vec_mul(mj.v, vec_mul(curlvrz.v, wi_dx.v)));
    curlvzSum->v =
        vec_add(curlvzSum->v, vec_mul(mj2.v, vec_mul(curlvrz2.v, wi_dx2.v)));
385
  }
386
}
James Willis's avatar
James Willis committed
387
#endif
388

389
390
391
/**
 * @brief Force loop
 */
392
393
394
__attribute__((always_inline)) INLINE static void runner_iact_force(
    float r2, float *dx, float hi, float hj, struct part *pi, struct part *pj) {

395
396
397
  float wi, wj, wi_dx, wj_dx;

  const float fac_mu = 1.f; /* Will change with cosmological integration */
398

399
400
401
402
  const float r = sqrtf(r2);
  const float r_inv = 1.0f / r;

  /* Get some values in local variables. */
403
  const float mi = pi->mass;
404
405
406
407
408
409
  const float mj = pj->mass;
  const float rhoi = pi->rho;
  const float rhoj = pj->rho;

  /* Get the kernel for hi. */
  const float hi_inv = 1.0f / hi;
410
  const float hid_inv = pow_dimension_plus_one(hi_inv); /* 1/h^(d+1) */
411
412
  const float ui = r * hi_inv;
  kernel_deval(ui, &wi, &wi_dx);
413
  const float wi_dr = hid_inv * wi_dx;
414
415
416

  /* Get the kernel for hj. */
  const float hj_inv = 1.0f / hj;
417
  const float hjd_inv = pow_dimension_plus_one(hj_inv); /* 1/h^(d+1) */
418
419
  const float xj = r * hj_inv;
  kernel_deval(xj, &wj, &wj_dx);
420
  const float wj_dr = hjd_inv * wj_dx;
421

422
423
424
425
426
  /* Compute h-gradient terms */
  const float f_i = pi->force.f;
  const float f_j = pj->force.f;

  /* Compute pressure terms */
427
428
  const float P_over_rho2_i = pi->force.P_over_rho2;
  const float P_over_rho2_j = pj->force.P_over_rho2;
429
430

  /* Compute sound speeds */
431
432
  const float ci = pi->force.soundspeed;
  const float cj = pj->force.soundspeed;
433

434
  /* Compute dv dot r. */
435
436
437
  const float dvdr = (pi->v[0] - pj->v[0]) * dx[0] +
                     (pi->v[1] - pj->v[1]) * dx[1] +
                     (pi->v[2] - pj->v[2]) * dx[2];
438

439
  /* Balsara term */
440
441
  const float balsara_i = pi->force.balsara;
  const float balsara_j = pj->force.balsara;
Matthieu Schaller's avatar
Matthieu Schaller committed
442

443
  /* Are the particles moving towards each others ? */
444
  const float omega_ij = (dvdr < 0.f) ? dvdr : 0.f;
445
446
447
448
449
450
451
452
453
  const float mu_ij = fac_mu * r_inv * omega_ij; /* This is 0 or negative */

  /* Signal velocity */
  const float v_sig = ci + cj - 3.f * mu_ij;

  /* Now construct the full viscosity term */
  const float rho_ij = 0.5f * (rhoi + rhoj);
  const float visc = -0.25f * const_viscosity_alpha * v_sig * mu_ij *
                     (balsara_i + balsara_j) / rho_ij;
454
455

  /* Now, convolve with the kernel */
456
  const float visc_term = 0.5f * visc * (wi_dr + wj_dr) * r_inv;
457
  const float sph_term =
458
      (f_i * P_over_rho2_i * wi_dr + f_j * P_over_rho2_j * wj_dr) * r_inv;
459
460
461
462
463

  /* Eventually got the acceleration */
  const float acc = visc_term + sph_term;

  /* Use the force Luke ! */
464
465
466
  pi->a_hydro[0] -= mj * acc * dx[0];
  pi->a_hydro[1] -= mj * acc * dx[1];
  pi->a_hydro[2] -= mj * acc * dx[2];
467

468
469
470
  pj->a_hydro[0] += mi * acc * dx[0];
  pj->a_hydro[1] += mi * acc * dx[1];
  pj->a_hydro[2] += mi * acc * dx[2];
471

472
  /* Get the time derivative for h. */
473
474
  pi->force.h_dt -= mj * dvdr * r_inv / rhoj * wi_dr;
  pj->force.h_dt -= mi * dvdr * r_inv / rhoi * wj_dr;
475

476
  /* Update the signal velocity. */
477
478
  pi->force.v_sig = (pi->force.v_sig > v_sig) ? pi->force.v_sig : v_sig;
  pj->force.v_sig = (pj->force.v_sig > v_sig) ? pj->force.v_sig : v_sig;
479

480
  /* Change in entropy */
481
482
  pi->entropy_dt += mj * visc_term * dvdr;
  pj->entropy_dt += mi * visc_term * dvdr;
483
}
484
485
486
487

/**
 * @brief Force loop (non-symmetric version)
 */
488
489
490
__attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
    float r2, float *dx, float hi, float hj, struct part *pi, struct part *pj) {

491
492
493
  float wi, wj, wi_dx, wj_dx;

  const float fac_mu = 1.f; /* Will change with cosmological integration */
494

495
496
497
498
  const float r = sqrtf(r2);
  const float r_inv = 1.0f / r;

  /* Get some values in local variables. */
499
  // const float mi = pi->mass;
500
501
502
503
504
505
  const float mj = pj->mass;
  const float rhoi = pi->rho;
  const float rhoj = pj->rho;

  /* Get the kernel for hi. */
  const float hi_inv = 1.0f / hi;
506
  const float hid_inv = pow_dimension_plus_one(hi_inv); /* 1/h^(d+1) */
507
508
  const float ui = r * hi_inv;
  kernel_deval(ui, &wi, &wi_dx);
509
  const float wi_dr = hid_inv * wi_dx;
510
511
512

  /* Get the kernel for hj. */
  const float hj_inv = 1.0f / hj;
513
  const float hjd_inv = pow_dimension_plus_one(hj_inv); /* 1/h^(d+1) */
514
515
  const float xj = r * hj_inv;
  kernel_deval(xj, &wj, &wj_dx);
516
  const float wj_dr = hjd_inv * wj_dx;
517

518
519
520
521
522
  /* Compute h-gradient terms */
  const float f_i = pi->force.f;
  const float f_j = pj->force.f;

  /* Compute pressure terms */
523
524
  const float P_over_rho2_i = pi->force.P_over_rho2;
  const float P_over_rho2_j = pj->force.P_over_rho2;
525
526

  /* Compute sound speeds */
527
528
  const float ci = pi->force.soundspeed;
  const float cj = pj->force.soundspeed;
529

530
  /* Compute dv dot r. */
531
532
533
  const float dvdr = (pi->v[0] - pj->v[0]) * dx[0] +
                     (pi->v[1] - pj->v[1]) * dx[1] +
                     (pi->v[2] - pj->v[2]) * dx[2];
534

535
  /* Balsara term */
536
537
  const float balsara_i = pi->force.balsara;
  const float balsara_j = pj->force.balsara;
538
539

  /* Are the particles moving towards each others ? */
540
  const float omega_ij = (dvdr < 0.f) ? dvdr : 0.f;
541
542
543
544
545
546
547
548
549
  const float mu_ij = fac_mu * r_inv * omega_ij; /* This is 0 or negative */

  /* Signal velocity */
  const float v_sig = ci + cj - 3.f * mu_ij;

  /* Now construct the full viscosity term */
  const float rho_ij = 0.5f * (rhoi + rhoj);
  const float visc = -0.25f * const_viscosity_alpha * v_sig * mu_ij *
                     (balsara_i + balsara_j) / rho_ij;
550
551

  /* Now, convolve with the kernel */
552
  const float visc_term = 0.5f * visc * (wi_dr + wj_dr) * r_inv;
553
  const float sph_term =
554
      (f_i * P_over_rho2_i * wi_dr + f_j * P_over_rho2_j * wj_dr) * r_inv;
555
556
557

  /* Eventually got the acceleration */
  const float acc = visc_term + sph_term;
558

559
  /* Use the force Luke ! */
560
561
562
  pi->a_hydro[0] -= mj * acc * dx[0];
  pi->a_hydro[1] -= mj * acc * dx[1];
  pi->a_hydro[2] -= mj * acc * dx[2];
563

564
  /* Get the time derivative for h. */
565
  pi->force.h_dt -= mj * dvdr * r_inv / rhoj * wi_dr;
566

567
  /* Update the signal velocity. */
568
  pi->force.v_sig = (pi->force.v_sig > v_sig) ? pi->force.v_sig : v_sig;
569

570
  /* Change in entropy */
571
  pi->entropy_dt += mj * visc_term * dvdr;
572
}
573

574
#ifdef WITH_VECTORIZATION
James Willis's avatar
James Willis committed
575
576
static const vector const_viscosity_alpha_fac =
    FILL_VEC(-0.25f * const_viscosity_alpha);
577

James Willis's avatar
James Willis committed
578
579
580
581
/**
 * @brief Force interaction computed using 1 vector
 * (non-symmetric vectorized version).
 */
James Willis's avatar
James Willis committed
582
583
__attribute__((always_inline)) INLINE static void
runner_iact_nonsym_1_vec_force(
584
    vector *r2, vector *dx, vector *dy, vector *dz, vector vix, vector viy,
James Willis's avatar
James Willis committed
585
586
587
    vector viz, vector pirho, vector grad_hi, vector piPOrho2, vector balsara_i,
    vector ci, float *Vjx, float *Vjy, float *Vjz, float *Pjrho, float *Grad_hj,
    float *PjPOrho2, float *Balsara_j, float *Cj, float *Mj, vector hi_inv,
588
    vector hj_inv, vector *a_hydro_xSum, vector *a_hydro_ySum,
James Willis's avatar
James Willis committed
589
590
    vector *a_hydro_zSum, vector *h_dtSum, vector *v_sigSum,
    vector *entropy_dtSum, mask_t mask) {
591
592
593

#ifdef WITH_VECTORIZATION

594
  vector r, ri;
595
  vector vjx, vjy, vjz, dvx, dvy, dvz;
596
  vector pjrho, grad_hj, pjPOrho2, balsara_j, cj, mj;
597
598
  vector xi, xj;
  vector hid_inv, hjd_inv;
599
  vector wi_dx, wj_dx, wi_dr, wj_dr, dvdr;
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
  vector piax, piay, piaz;
  vector pih_dt;
  vector v_sig;
  vector omega_ij, mu_ij, fac_mu, balsara;
  vector rho_ij, visc, visc_term, sph_term, acc, entropy_dt;

  /* Fill vectors. */
  vjx.v = vec_load(Vjx);
  vjy.v = vec_load(Vjy);
  vjz.v = vec_load(Vjz);
  mj.v = vec_load(Mj);

  pjrho.v = vec_load(Pjrho);
  grad_hj.v = vec_load(Grad_hj);
  pjPOrho2.v = vec_load(PjPOrho2);
  balsara_j.v = vec_load(Balsara_j);
  cj.v = vec_load(Cj);

  fac_mu.v = vec_set1(1.f); /* Will change with cosmological integration */

James Willis's avatar
James Willis committed
620
  /* Load stuff. */
621
  balsara.v = vec_add(balsara_i.v, balsara_j.v);
622
623

  /* Get the radius and inverse radius. */
624
  ri = vec_reciprocal_sqrt(*r2);
625
  r.v = vec_mul(r2->v, ri.v);
626
627

  /* Get the kernel for hi. */
628
  hid_inv = pow_dimension_plus_one_vec(hi_inv);
629
  xi.v = vec_mul(r.v, hi_inv.v);
630
  kernel_eval_dWdx_force_vec(&xi, &wi_dx);
631
  wi_dr.v = vec_mul(hid_inv.v, wi_dx.v);
632
633
634

  /* Get the kernel for hj. */
  hjd_inv = pow_dimension_plus_one_vec(hj_inv);
635
  xj.v = vec_mul(r.v, hj_inv.v);
James Willis's avatar
James Willis committed
636

637
  /* Calculate the kernel. */
James Willis's avatar
James Willis committed
638
  kernel_eval_dWdx_force_vec(&xj, &wj_dx);
James Willis's avatar
James Willis committed
639

640
641
642
643
644
645
  wj_dr.v = vec_mul(hjd_inv.v, wj_dx.v);

  /* Compute dv. */
  dvx.v = vec_sub(vix.v, vjx.v);
  dvy.v = vec_sub(viy.v, vjy.v);
  dvz.v = vec_sub(viz.v, vjz.v);
646
647

  /* Compute dv dot r. */
648
  dvdr.v = vec_fma(dvx.v, dx->v, vec_fma(dvy.v, dy->v, vec_mul(dvz.v, dz->v)));
649
650
651

  /* Compute the relative velocity. (This is 0 if the particles move away from
   * each other and negative otherwise) */
652
  omega_ij.v = vec_fmin(dvdr.v, vec_setzero());
James Willis's avatar
James Willis committed
653
654
  mu_ij.v =
      vec_mul(fac_mu.v, vec_mul(ri.v, omega_ij.v)); /* This is 0 or negative */
655
656

  /* Compute signal velocity */
657
  v_sig.v = vec_fnma(vec_set1(3.f), mu_ij.v, vec_add(ci.v, cj.v));
658
659

  /* Now construct the full viscosity term */
660
  rho_ij.v = vec_mul(vec_set1(0.5f), vec_add(pirho.v, pjrho.v));
James Willis's avatar
James Willis committed
661
662
663
  visc.v = vec_div(vec_mul(const_viscosity_alpha_fac.v,
                           vec_mul(v_sig.v, vec_mul(mu_ij.v, balsara.v))),
                   rho_ij.v);
664
665

  /* Now, convolve with the kernel */
James Willis's avatar
James Willis committed
666
667
668
  visc_term.v =
      vec_mul(vec_set1(0.5f),
              vec_mul(visc.v, vec_mul(vec_add(wi_dr.v, wj_dr.v), ri.v)));
James Willis's avatar
James Willis committed
669

670
  sph_term.v =
James Willis's avatar
James Willis committed
671
672
673
      vec_mul(vec_fma(vec_mul(grad_hi.v, piPOrho2.v), wi_dr.v,
                      vec_mul(grad_hj.v, vec_mul(pjPOrho2.v, wj_dr.v))),
              ri.v);
James Willis's avatar
James Willis committed
674

675
  /* Eventually get the acceleration */
676
  acc.v = vec_add(visc_term.v, sph_term.v);
677
678

  /* Use the force, Luke! */
679
680
681
  piax.v = vec_mul(mj.v, vec_mul(dx->v, acc.v));
  piay.v = vec_mul(mj.v, vec_mul(dy->v, acc.v));
  piaz.v = vec_mul(mj.v, vec_mul(dz->v, acc.v));
682
683

  /* Get the time derivative for h. */
James Willis's avatar
James Willis committed
684
685
  pih_dt.v =
      vec_div(vec_mul(mj.v, vec_mul(dvdr.v, vec_mul(ri.v, wi_dr.v))), pjrho.v);
686
687

  /* Change in entropy */
688
  entropy_dt.v = vec_mul(mj.v, vec_mul(visc_term.v, dvdr.v));
689

690
  /* Store the forces back on the particles. */
691
692
693
694
  a_hydro_xSum->v = vec_mask_sub(a_hydro_xSum->v, piax.v, mask);
  a_hydro_ySum->v = vec_mask_sub(a_hydro_ySum->v, piay.v, mask);
  a_hydro_zSum->v = vec_mask_sub(a_hydro_zSum->v, piaz.v, mask);
  h_dtSum->v = vec_mask_sub(h_dtSum->v, pih_dt.v, mask);
695
  v_sigSum->v = vec_fmax(v_sigSum->v, vec_and_mask(v_sig.v, mask));
696
  entropy_dtSum->v = vec_mask_add(entropy_dtSum->v, entropy_dt.v, mask);
697
698
699
700
701
702
703
704
705
706

#else

  error(
      "The Gadget2 serial version of runner_iact_nonsym_force was called when "
      "the vectorised version should have been used.");

#endif
}

James Willis's avatar
James Willis committed
707
708
709
710
/**
 * @brief Force interaction computed using 2 interleaved vectors
 * (non-symmetric vectorized version).
 */
James Willis's avatar
James Willis committed
711
712
__attribute__((always_inline)) INLINE static void
runner_iact_nonsym_2_vec_force(
713
    float *R2, float *Dx, float *Dy, float *Dz, vector vix, vector viy,
James Willis's avatar
James Willis committed
714
715
716
717
718
719
    vector viz, vector pirho, vector grad_hi, vector piPOrho2, vector balsara_i,
    vector ci, float *Vjx, float *Vjy, float *Vjz, float *Pjrho, float *Grad_hj,
    float *PjPOrho2, float *Balsara_j, float *Cj, float *Mj, vector hi_inv,
    float *Hj_inv, vector *a_hydro_xSum, vector *a_hydro_ySum,
    vector *a_hydro_zSum, vector *h_dtSum, vector *v_sigSum,
    vector *entropy_dtSum, mask_t mask, mask_t mask_2, short mask_cond) {
720
721
722
723

#ifdef WITH_VECTORIZATION

  vector r, r2, ri;
724
  vector dx, dy, dz, dvx, dvy, dvz;
725
726
  vector vjx, vjy, vjz;
  vector pjrho, grad_hj, pjPOrho2, balsara_j, cj, mj, hj_inv;
727
  vector ui, uj;
728
  vector hid_inv, hjd_inv;
729
  vector wi_dx, wj_dx, wi_dr, wj_dr, dvdr;
730
731
732
733
734
735
736
  vector piax, piay, piaz;
  vector pih_dt;
  vector v_sig;
  vector omega_ij, mu_ij, fac_mu, balsara;
  vector rho_ij, visc, visc_term, sph_term, acc, entropy_dt;

  vector r_2, r2_2, ri_2;
737
  vector dx_2, dy_2, dz_2, dvx_2, dvy_2, dvz_2;
738
739
  vector vjx_2, vjy_2, vjz_2;
  vector pjrho_2, grad_hj_2, pjPOrho2_2, balsara_j_2, cj_2, mj_2, hj_inv_2;
740
  vector ui_2, uj_2;
741
  vector hjd_inv_2;
742
  vector wi_dx_2, wj_dx_2, wi_dr_2, wj_dr_2, dvdr_2;
743
744
745
746
747
748
749
  vector piax_2, piay_2, piaz_2;
  vector pih_dt_2;
  vector v_sig_2;
  vector omega_ij_2, mu_ij_2, balsara_2;
  vector rho_ij_2, visc_2, visc_term_2, sph_term_2, acc_2, entropy_dt_2;

  /* Fill vectors. */
750
751
  mj.v = vec_load(Mj);
  mj_2.v = vec_load(&Mj[VEC_SIZE]);
752
  vjx.v = vec_load(Vjx);
753
  vjx_2.v = vec_load(&Vjx[VEC_SIZE]);
754
  vjy.v = vec_load(Vjy);
755
  vjy_2.v = vec_load(&Vjy[VEC_SIZE]);
756
  vjz.v = vec_load(Vjz);
757
758
  vjz_2.v = vec_load(&Vjz[VEC_SIZE]);
  dx.v = vec_load(Dx);
759
  dx_2.v = vec_load(&Dx[VEC_SIZE]);
760
  dy.v = vec_load(Dy);
761
  dy_2.v = vec_load(&Dy[VEC_SIZE]);
762
  dz.v = vec_load(Dz);
763
  dz_2.v = vec_load(&Dz[VEC_SIZE]);
James Willis's avatar
James Willis committed
764

765
766
767
768
769
770
771
  /* Get the radius and inverse radius. */
  r2.v = vec_load(R2);
  r2_2.v = vec_load(&R2[VEC_SIZE]);
  ri = vec_reciprocal_sqrt(r2);
  ri_2 = vec_reciprocal_sqrt(r2_2);
  r.v = vec_mul(r2.v, ri.v);
  r_2.v = vec_mul(r2_2.v, ri_2.v);
772

773
774
  /* Get remaining properties. */
  pjrho.v = vec_load(Pjrho);
775
  pjrho_2.v = vec_load(&Pjrho[VEC_SIZE]);
776
  grad_hj.v = vec_load(Grad_hj);
777
  grad_hj_2.v = vec_load(&Grad_hj[VEC_SIZE]);
778
  pjPOrho2.v = vec_load(PjPOrho2);
779
  pjPOrho2_2.v = vec_load(&PjPOrho2[VEC_SIZE]);
780
  balsara_j.v = vec_load(Balsara_j);
781
  balsara_j_2.v = vec_load(&Balsara_j[VEC_SIZE]);
782
  cj.v = vec_load(Cj);
783
  cj_2.v = vec_load(&Cj[VEC_SIZE]);
784
  hj_inv.v = vec_load(Hj_inv);
785
786
  hj_inv_2.v = vec_load(&Hj_inv[VEC_SIZE]);

787
  fac_mu.v = vec_set1(1.f); /* Will change with cosmological integration */
788

789
790
791
  /* Find the balsara switch. */
  balsara.v = vec_add(balsara_i.v, balsara_j.v);
  balsara_2.v = vec_add(balsara_i.v, balsara_j_2.v);
792
793

  /* Get the kernel for hi. */
794
  hid_inv = pow_dimension_plus_one_vec(hi_inv);
795
796
797
798
799
800
  ui.v = vec_mul(r.v, hi_inv.v);
  ui_2.v = vec_mul(r_2.v, hi_inv.v);
  kernel_eval_dWdx_force_vec(&ui, &wi_dx);
  kernel_eval_dWdx_force_vec(&ui_2, &wi_dx_2);
  wi_dr.v = vec_mul(hid_inv.v, wi_dx.v);
  wi_dr_2.v = vec_mul(hid_inv.v, wi_dx_2.v);
801
802
803
804

  /* Get the kernel for hj. */
  hjd_inv = pow_dimension_plus_one_vec(hj_inv);
  hjd_inv_2 = pow_dimension_plus_one_vec(hj_inv_2);
805
806
  uj.v = vec_mul(r.v, hj_inv.v);
  uj_2.v = vec_mul(r_2.v, hj_inv_2.v);
James Willis's avatar
James Willis committed
807

808
  /* Calculate the kernel for two particles. */
809
810
  kernel_eval_dWdx_force_vec(&uj, &wj_dx);
  kernel_eval_dWdx_force_vec(&uj_2, &wj_dx_2);
James Willis's avatar
James Willis committed
811

812
813
  wj_dr.v = vec_mul(hjd_inv.v, wj_dx.v);
  wj_dr_2.v = vec_mul(hjd_inv_2.v, wj_dx_2.v);
814

815
816
817
818
819
820
821
  /* Compute dv. */
  dvx.v = vec_sub(vix.v, vjx.v);
  dvx_2.v = vec_sub(vix.v, vjx_2.v);
  dvy.v = vec_sub(viy.v, vjy.v);
  dvy_2.v = vec_sub(viy.v, vjy_2.v);
  dvz.v = vec_sub(viz.v, vjz.v);
  dvz_2.v = vec_sub(viz.v, vjz_2.v);
822
823

  /* Compute dv dot r. */
824
  dvdr.v = vec_fma(dvx.v, dx.v, vec_fma(dvy.v, dy.v, vec_mul(dvz.v, dz.v)));
James Willis's avatar
James Willis committed
825
826
  dvdr_2.v = vec_fma(dvx_2.v, dx_2.v,
                     vec_fma(dvy_2.v, dy_2.v, vec_mul(dvz_2.v, dz_2.v)));
827
828
829
830
831

  /* Compute the relative velocity. (This is 0 if the particles move away from
   * each other and negative otherwise) */
  omega_ij.v = vec_fmin(dvdr.v, vec_setzero());
  omega_ij_2.v = vec_fmin(dvdr_2.v, vec_setzero());
James Willis's avatar
James Willis committed
832
833
834
835
  mu_ij.v =
      vec_mul(fac_mu.v, vec_mul(ri.v, omega_ij.v)); /* This is 0 or negative */
  mu_ij_2.v = vec_mul(
      fac_mu.v, vec_mul(ri_2.v, omega_ij_2.v)); /* This is 0 or negative */
836
837

  /* Compute signal velocity */
838
839
  v_sig.v = vec_fnma(vec_set1(3.f), mu_ij.v, vec_add(ci.v, cj.v));
  v_sig_2.v = vec_fnma(vec_set1(3.f), mu_ij_2.v, vec_add(ci.v, cj_2.v));
840
841

  /* Now construct the full viscosity term */
842
843
844
  rho_ij.v = vec_mul(vec_set1(0.5f), vec_add(pirho.v, pjrho.v));
  rho_ij_2.v = vec_mul(vec_set1(0.5f), vec_add(pirho.v, pjrho_2.v));

James Willis's avatar
James Willis committed
845
846
847
848
849
850
851
  visc.v = vec_div(vec_mul(const_viscosity_alpha_fac.v,
                           vec_mul(v_sig.v, vec_mul(mu_ij.v, balsara.v))),
                   rho_ij.v);
  visc_2.v =
      vec_div(vec_mul(const_viscosity_alpha_fac.v,
                      vec_mul(v_sig_2.v, vec_mul(mu_ij_2.v, balsara_2.v))),
              rho_ij_2.v);
852
853

  /* Now, convolve with the kernel */
James Willis's avatar
James Willis committed
854
855
856
857
858
859
860
  visc_term.v =
      vec_mul(vec_set1(0.5f),
              vec_mul(visc.v, vec_mul(vec_add(wi_dr.v, wj_dr.v), ri.v)));
  visc_term_2.v = vec_mul(
      vec_set1(0.5f),
      vec_mul(visc_2.v, vec_mul(vec_add(wi_dr_2.v, wj_dr_2.v), ri_2.v)));

861
862
863
  vector grad_hi_mul_piPOrho2;
  grad_hi_mul_piPOrho2.v = vec_mul(grad_hi.v, piPOrho2.v);

864
  sph_term.v =
James Willis's avatar
James Willis committed
865
866
867
868
869
870
871
      vec_mul(vec_fma(grad_hi_mul_piPOrho2.v, wi_dr.v,
                      vec_mul(grad_hj.v, vec_mul(pjPOrho2.v, wj_dr.v))),
              ri.v);
  sph_term_2.v =
      vec_mul(vec_fma(grad_hi_mul_piPOrho2.v, wi_dr_2.v,
                      vec_mul(grad_hj_2.v, vec_mul(pjPOrho2_2.v, wj_dr_2.v))),
              ri_2.v);
872
873

  /* Eventually get the acceleration */
874
875
  acc.v = vec_add(visc_term.v, sph_term.v);
  acc_2.v = vec_add(visc_term_2.v, sph_term_2.v);
876
877

  /* Use the force, Luke! */
878
879
880
881
882
883
  piax.v = vec_mul(mj.v, vec_mul(dx.v, acc.v));
  piax_2.v = vec_mul(mj_2.v, vec_mul(dx_2.v, acc_2.v));
  piay.v = vec_mul(mj.v, vec_mul(dy.v, acc.v));
  piay_2.v = vec_mul(mj_2.v, vec_mul(dy_2.v, acc_2.v));
  piaz.v = vec_mul(mj.v, vec_mul(dz.v, acc.v));
  piaz_2.v = vec_mul(mj_2.v, vec_mul(dz_2.v, acc_2.v));
884
885

  /* Get the time derivative for h. */
James Willis's avatar
James Willis committed
886
887
888
889
890
  pih_dt.v =
      vec_div(vec_mul(mj.v, vec_mul(dvdr.v, vec_mul(ri.v, wi_dr.v))), pjrho.v);
  pih_dt_2.v =
      vec_div(vec_mul(mj_2.v, vec_mul(dvdr_2.v, vec_mul(ri_2.v, wi_dr_2.v))),
              pjrho_2.v);
891
892

  /* Change in entropy */
893
894
  entropy_dt.v = vec_mul(mj.v, vec_mul(visc_term.v, dvdr.v));
  entropy_dt_2.v = vec_mul(mj_2.v, vec_mul(visc_term_2.v, dvdr_2.v));
895
896

  /* Store the forces back on the particles. */
James Willis's avatar
James Willis committed
897
  if (mask_cond) {
898
899
900
901
902
903
904
905
    a_hydro_xSum->v = vec_mask_sub(a_hydro_xSum->v, piax.v, mask);
    a_hydro_xSum->v = vec_mask_sub(a_hydro_xSum->v, piax_2.v, mask_2);
    a_hydro_ySum->v = vec_mask_sub(a_hydro_ySum->v, piay.v, mask);
    a_hydro_ySum->v = vec_mask_sub(a_hydro_ySum->v, piay_2.v, mask_2);
    a_hydro_zSum->v = vec_mask_sub(a_hydro_zSum->v, piaz.v, mask);
    a_hydro_zSum->v = vec_mask_sub(a_hydro_zSum->v, piaz_2.v, mask_2);
    h_dtSum->v = vec_mask_sub(h_dtSum->v, pih_dt.v, mask);
    h_dtSum->v = vec_mask_sub(h_dtSum->v, pih_dt_2.v, mask_2);
906
907
    v_sigSum->v = vec_fmax(v_sigSum->v, vec_and_mask(v_sig.v, mask));
    v_sigSum->v = vec_fmax(v_sigSum->v, vec_and_mask(v_sig_2.v, mask_2));
908
909
    entropy_dtSum->v = vec_mask_add(entropy_dtSum->v, entropy_dt.v, mask);
    entropy_dtSum->v = vec_mask_add(entropy_dtSum->v, entropy_dt_2.v, mask_2);
James Willis's avatar
James Willis committed