aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Haas <rhaas@tapir.caltech.edu>2013-09-27 16:48:47 -0700
committerRoland Haas <rhaas@tapir.caltech.edu>2013-09-27 19:18:59 -0700
commit1f8decfd8b7c80b55cf2c7ccd19889971cdb3528 (patch)
tree75afb655bc80bf617a78f58ef753a04d6a056a21
parentcbae83ccbe1076d089918e87eae606a79a30311f (diff)
CarpetSlab: pass size of allocated chunk to memory object
-rw-r--r--Carpet/CarpetSlab/src/slab.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc
index 1825602c3..7408d417d 100644
--- a/Carpet/CarpetSlab/src/slab.cc
+++ b/Carpet/CarpetSlab/src/slab.cc
@@ -204,8 +204,9 @@ namespace CarpetSlab {
// Create collector data object
void* myhdata = rank==collect_proc ? hdata : 0;
+ size_t const mymemsize = totalsize * typesize;
gdata* const alldata = mydata->make_typed (-1, error_centered, op_sync);
- alldata->allocate (hextent, collect_proc, myhdata);
+ alldata->allocate (hextent, collect_proc, myhdata, mymemsize);
// Done with the temporary stuff
mydata = 0;