From 12479cbfcee90713cae38c413d313fb338fb14b0 Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <gonnet@google.com>
Date: Thu, 10 Mar 2016 22:41:20 +0100
Subject: [PATCH] allocate space for incomming gparts.
---
src/engine.c | 29 ++++++++++++++++++-----------
src/part.h | 1 +
src/space.h | 2 ++
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 62ff3c7ffd..58f4e4d2c4 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -545,33 +545,40 @@ void engine_exchange_cells(struct engine *e) {
/* Count the number of particles we need to import and re-allocate
the buffer if needed. */
- int count_in = 0;
+ int count_parts_in = 0, count_gparts_in = 0;
for (int k = 0; k < nr_proxies; k++)
- for (int j = 0; j < e->proxies[k].nr_cells_in; j++)
- count_in += e->proxies[k].cells_in[j]->count;
- if (count_in > s->size_parts_foreign) {
+ for (int j = 0; j < e->proxies[k].nr_cells_in; j++) {
+ count_parts_in += e->proxies[k].cells_in[j]->count;
+ count_gparts_in += e->proxies[k].cells_in[j]->gcount;
+ }
+ if (count_parts_in > s->size_parts_foreign) {
if (s->parts_foreign != NULL) free(s->parts_foreign);
- s->size_parts_foreign = 1.1 * count_in;
+ s->size_parts_foreign = 1.1 * count_parts_in;
if (posix_memalign((void **)&s->parts_foreign, part_align,
sizeof(struct part) * s->size_parts_foreign) != 0)
error("Failed to allocate foreign part data.");
}
+ if (count_gparts_in > s->size_gparts_foreign) {
+ if (s->gparts_foreign != NULL) free(s->gparts_foreign);
+ s->size_gparts_foreign = 1.1 * count_gparts_in;
+ if (posix_memalign((void **)&s->gparts_foreign, gpart_align,
+ sizeof(struct gpart) * s->size_gparts_foreign) != 0)
+ error("Failed to allocate foreign gpart data.");
+ }
/* Unpack the cells and link to the particle data. */
struct part *parts = s->parts_foreign;
- // struct gpart *gparts = s->gparts_foreign;
+ struct gpart *gparts = s->gparts_foreign;
for (int k = 0; k < nr_proxies; k++) {
for (int j = 0; j < e->proxies[k].nr_cells_in; j++) {
cell_link_parts(e->proxies[k].cells_in[j], parts);
- // cell_link_gparts(e->proxies[k].cells_in[j], gparts);
+ cell_link_gparts(e->proxies[k].cells_in[j], gparts);
parts = &parts[e->proxies[k].cells_in[j]->count];
+ gparts = &gparts[e->proxies[k].cells_in[j]->gcount];
}
}
s->nr_parts_foreign = parts - s->parts_foreign;
-
- /* Is the parts buffer large enough? */
- if (s->nr_parts_foreign > s->size_parts_foreign)
- error("Foreign parts buffer too small.");
+ s->nr_gparts_foreign = gparts - s->gparts_foreign;
/* Free the pcell buffer. */
free(pcells);
diff --git a/src/part.h b/src/part.h
index 168e80b68b..f1e7a28d33 100644
--- a/src/part.h
+++ b/src/part.h
@@ -36,6 +36,7 @@
/* Some constants. */
#define part_align 64
#define xpart_align 32
+#define gpart_align 32
/* Import the right particle definition */
#if defined(MINIMAL_SPH)
diff --git a/src/space.h b/src/space.h
index f6fb475dbb..1b510a81b5 100644
--- a/src/space.h
+++ b/src/space.h
@@ -106,6 +106,8 @@ struct space {
/* Buffers for parts that we will receive from foreign cells. */
struct part *parts_foreign;
size_t nr_parts_foreign, size_parts_foreign;
+ struct gpart *gparts_foreign;
+ size_t nr_gparts_foreign, size_gparts_foreign;
};
/* Interval stack necessary for parallel particle sorting. */
--
GitLab