aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetIOHDF5
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2012-01-11 16:01:36 -0500
committerBarry Wardell <barry.wardell@gmail.com>2012-09-11 18:15:42 +0100
commitd1ada7810b6a640cd282be703d4974a33eadfadd (patch)
tree0003f3b4349099359d5b600c25f0e0af6fa2b199 /Carpet/CarpetIOHDF5
parent7744c7cb71f8ffc9fff8269fef33662845f118ad (diff)
CarpetIOHDF5: Update to new gdata::copy_from API
Diffstat (limited to 'Carpet/CarpetIOHDF5')
-rw-r--r--Carpet/CarpetIOHDF5/src/Output.cc5
-rw-r--r--Carpet/CarpetIOHDF5/src/OutputSlice.cc3
2 files changed, 5 insertions, 3 deletions
diff --git a/Carpet/CarpetIOHDF5/src/Output.cc b/Carpet/CarpetIOHDF5/src/Output.cc
index 1b5bf8eec..d77324860 100644
--- a/Carpet/CarpetIOHDF5/src/Output.cc
+++ b/Carpet/CarpetIOHDF5/src/Output.cc
@@ -203,7 +203,8 @@ int WriteVarUnchunked (const cGH* const cctkGH,
processor_component->allocate (overlap, 0);
for (comm_state state; not state.done(); state.step()) {
int const p = hh->processor(refinementlevel,component);
- processor_component->copy_from (state, data, overlap, 0, p);
+ processor_component->copy_from
+ (state, data, overlap, overlap, NULL, 0, p);
}
// Write data
@@ -380,7 +381,7 @@ int WriteVarChunkedSequential (const cGH* const cctkGH,
processor_component->allocate (bbox, 0);
for (comm_state state; not state.done(); state.step()) {
int const p = hh->processor(refinementlevel,component);
- processor_component->copy_from (state, data, bbox, 0, p);
+ processor_component->copy_from (state, data, bbox, bbox, NULL, 0, p);
}
// Write data on I/O processor 0
diff --git a/Carpet/CarpetIOHDF5/src/OutputSlice.cc b/Carpet/CarpetIOHDF5/src/OutputSlice.cc
index c4ad294ad..f0d570ced 100644
--- a/Carpet/CarpetIOHDF5/src/OutputSlice.cc
+++ b/Carpet/CarpetIOHDF5/src/OutputSlice.cc
@@ -648,7 +648,8 @@ namespace CarpetIOHDF5 {
for (comm_state state; not state.done(); state.step()) {
for (size_t n=0; n<datas.size(); ++n) {
tmpdatas.at(n)->copy_from
- (state, datas.at(n), data_ext, ioproc, proc);
+ (state, datas.at(n), data_ext, data_ext, NULL,
+ ioproc, proc);
}
}