From f319c3712bd2aaa846a8b6f732641f105ab12a9e Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Wed, 11 Jan 2012 16:02:03 -0500 Subject: CarpetSlab: Update to new gdata::copy_from API --- Carpet/CarpetSlab/src/GetHyperslab.cc | 7 +++++-- Carpet/CarpetSlab/src/slab.cc | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Carpet/CarpetSlab/src/GetHyperslab.cc b/Carpet/CarpetSlab/src/GetHyperslab.cc index 9b1e08f77..27daeec1c 100644 --- a/Carpet/CarpetSlab/src/GetHyperslab.cc +++ b/Carpet/CarpetSlab/src/GetHyperslab.cc @@ -196,7 +196,8 @@ namespace CarpetSlab { // Copy data int const proc = myhh->processor(reflevel, component); - alldata->copy_from (state, mydata, *ext_iter, collect_proc, proc); + alldata->copy_from + (state, mydata, *ext_iter, *ext_iter, NULL, collect_proc, proc); } @@ -219,7 +220,9 @@ namespace CarpetSlab { for (comm_state state; not state.done(); state.step()) { for (int proc=0; proccopy_from (state, alldata, alldata->extent(), proc, collect_proc); + tmpdata.at(proc)->copy_from + (state, alldata, alldata->extent(), alldata->extent(), NULL, + proc, collect_proc); } } } diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc index d9d587a98..9a7ac6c4a 100644 --- a/Carpet/CarpetSlab/src/slab.cc +++ b/Carpet/CarpetSlab/src/slab.cc @@ -229,7 +229,8 @@ namespace CarpetSlab { // Copy data int const proc = myhh->processor(reflevel, component); - alldata->copy_from (state, mydata, *ext_iter, collect_proc, proc); + alldata->copy_from + (state, mydata, *ext_iter, *ext_iter, NULL, collect_proc, proc); } @@ -252,7 +253,9 @@ namespace CarpetSlab { for (comm_state state; not state.done(); state.step()) { for (int proc=0; proccopy_from (state, alldata, alldata->extent(), proc, collect_proc); + tmpdata.at(proc)->copy_from + (state, alldata, alldata->extent(), alldata->extent(), NULL, + proc, collect_proc); } } } -- cgit v1.2.3