From dce9dd11942d40d6cb55e3377d0617f54ea7dc10 Mon Sep 17 00:00:00 2001 From: James Willis <james.s.willis@durham.ac.uk> Date: Thu, 17 Aug 2017 09:49:11 +0100 Subject: [PATCH] Removed unused cache functions. --- src/cache.h | 128 ---------------------------------------------------- 1 file changed, 128 deletions(-) diff --git a/src/cache.h b/src/cache.h index 49ed478f91..04b893bbe9 100644 --- a/src/cache.h +++ b/src/cache.h @@ -189,134 +189,6 @@ loc[2] = ci->loc[2]; #endif } -/** - * @brief Populate cache by reading in the particles from two cells in unsorted - * order. - * - * @param ci The i #cell. - * @param cj The j #cell. - * @param ci_cache The cache for cell ci. - * @param cj_cache The cache for cell cj. - * @param shift The amount to shift the particle positions to account for BCs - */ -__attribute__((always_inline)) INLINE void cache_read_two_cells( - const struct cell *const ci, const struct cell *const cj, - struct cache *const ci_cache, struct cache *const cj_cache, - const double *const shift) { - - /* Shift the particles positions to a local frame (ci frame) so single - * precision can be - * used instead of double precision. Also shift the cell ci, particles - * positions due to BCs but leave cell cj. */ - for (int i = 0; i < ci->count; i++) { - ci_cache->x[i] = ci->parts[i].x[0] - ci->loc[0] - shift[0]; - ci_cache->y[i] = ci->parts[i].x[1] - ci->loc[1] - shift[1]; - ci_cache->z[i] = ci->parts[i].x[2] - ci->loc[2] - shift[2]; - ci_cache->h[i] = ci->parts[i].h; - - ci_cache->m[i] = ci->parts[i].mass; - ci_cache->vx[i] = ci->parts[i].v[0]; - ci_cache->vy[i] = ci->parts[i].v[1]; - ci_cache->vz[i] = ci->parts[i].v[2]; - } - - for (int i = 0; i < cj->count; i++) { - cj_cache->x[i] = cj->parts[i].x[0] - ci->loc[0]; - cj_cache->y[i] = cj->parts[i].x[1] - ci->loc[1]; - cj_cache->z[i] = cj->parts[i].x[2] - ci->loc[2]; - cj_cache->h[i] = cj->parts[i].h; - - cj_cache->m[i] = cj->parts[i].mass; - cj_cache->vx[i] = cj->parts[i].v[0]; - cj_cache->vy[i] = cj->parts[i].v[1]; - cj_cache->vz[i] = cj->parts[i].v[2]; - } -} - -__attribute__((always_inline)) INLINE void cache_read_cell_sorted( - const struct cell *const ci, struct cache *const ci_cache, - const struct entry *restrict sort_i, double *const loc, - double *const shift) { - - int idx; -/* Shift the particles positions to a local frame (ci frame) so single precision - * can be - * used instead of double precision. Also shift the cell ci, particles positions - * due to BCs but leave cell cj. */ -#if defined(WITH_VECTORIZATION) && defined(__ICC) -#pragma simd -#endif - for (int i = 0; i < ci->count; i++) { - idx = sort_i[i].i; - - ci_cache->x[i] = ci->parts[idx].x[0] - loc[0] - shift[0]; - ci_cache->y[i] = ci->parts[idx].x[1] - loc[1] - shift[1]; - ci_cache->z[i] = ci->parts[idx].x[2] - loc[2] - shift[2]; - ci_cache->h[i] = ci->parts[idx].h; - - ci_cache->m[i] = ci->parts[idx].mass; - ci_cache->vx[i] = ci->parts[idx].v[0]; - ci_cache->vy[i] = ci->parts[idx].v[1]; - ci_cache->vz[i] = ci->parts[idx].v[2]; - } -} - -/** - * @brief Populate cache by reading in the particles from two cells in sorted - * order. - * - * @param ci The i #cell. - * @param cj The j #cell. - * @param ci_cache The #cache for cell ci. - * @param cj_cache The #cache for cell cj. - * @param sort_i The array of sorted particle indices for cell ci. - * @param sort_j The array of sorted particle indices for cell ci. - * @param shift The amount to shift the particle positions to account for BCs - */ -__attribute__((always_inline)) INLINE void cache_read_two_cells_sorted( - const struct cell *const ci, const struct cell *const cj, - struct cache *const ci_cache, struct cache *const cj_cache, - const struct entry *restrict sort_i, const struct entry *restrict sort_j, - const double *const shift) { - - int idx; -/* Shift the particles positions to a local frame (ci frame) so single precision - * can be - * used instead of double precision. Also shift the cell ci, particles positions - * due to BCs but leave cell cj. */ -#if defined(WITH_VECTORIZATION) && defined(__ICC) -#pragma simd -#endif - for (int i = 0; i < ci->count; i++) { - idx = sort_i[i].i; - ci_cache->x[i] = ci->parts[idx].x[0] - ci->loc[0] - shift[0]; - ci_cache->y[i] = ci->parts[idx].x[1] - ci->loc[1] - shift[1]; - ci_cache->z[i] = ci->parts[idx].x[2] - ci->loc[2] - shift[2]; - ci_cache->h[i] = ci->parts[idx].h; - - ci_cache->m[i] = ci->parts[idx].mass; - ci_cache->vx[i] = ci->parts[idx].v[0]; - ci_cache->vy[i] = ci->parts[idx].v[1]; - ci_cache->vz[i] = ci->parts[idx].v[2]; - } - -#if defined(WITH_VECTORIZATION) && defined(__ICC) -#pragma simd -#endif - for (int i = 0; i < cj->count; i++) { - idx = sort_j[i].i; - cj_cache->x[i] = cj->parts[idx].x[0] - ci->loc[0]; - cj_cache->y[i] = cj->parts[idx].x[1] - ci->loc[1]; - cj_cache->z[i] = cj->parts[idx].x[2] - ci->loc[2]; - cj_cache->h[i] = cj->parts[idx].h; - - cj_cache->m[i] = cj->parts[idx].mass; - cj_cache->vx[i] = cj->parts[idx].v[0]; - cj_cache->vy[i] = cj->parts[idx].v[1]; - cj_cache->vz[i] = cj->parts[idx].v[2]; - } -} - /** * @brief Populate caches by only reading particles that are within range of * each other within the adjoining cell.Also read the particles into the cache -- GitLab