diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2007-04-19 02:10:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2007-04-19 02:10:00 +0000 |
| commit | a6fc658d2fb418048c20074129f46b08be6fc9b9 (patch) | |
| tree | 6cab0cf6b2280b2df8d5c31110329af7511772e9 /Carpet | |
| parent | a643256b9c79e1bed7a0a54bb3d327b87a24d205 (diff) | |
CarpetIOASCII: Update to recent changes
darcs-hash:20070419021010-dae7b-a46a4a9f113fc5063004e9d4a4e23b8915b9343b.gz
Diffstat (limited to 'Carpet')
| -rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc index 0d93762bb..4959894f3 100644 --- a/Carpet/CarpetIOASCII/src/ioascii.cc +++ b/Carpet/CarpetIOASCII/src/ioascii.cc @@ -849,7 +849,7 @@ namespace CarpetIOASCII { // grid spacing of Carpet's integer indexing coord_delta[d] = cctkGH->cctk_delta_space[d] / - vhh.at(Carpet::map)->baseextent.stride()[d]; + vhh.at(Carpet::map)->baseextents.at(0).at(0).stride()[d]; } } else { for (int d=0; d<dim; ++d) { @@ -864,8 +864,12 @@ namespace CarpetIOASCII { ivect offset1; if (grouptype == CCTK_GF) { +#if 0 // dh::dbases const ibbox& baseext = vdd.at(Carpet::map)->bases.at(mglevel).at(reflevel).exterior; +#endif + const ibbox& baseext + = vhh.at(Carpet::map)->baseextents.at(mglevel).at(reflevel); offset1 = baseext.lower() + offset * ext.stride(); } else { offset1 = offset * ext.stride(); @@ -1302,7 +1306,7 @@ namespace CarpetIOASCII { const bbox<int,3> ext(lo,up,str); gh const & hh = *vhh.at(Carpet::map); - ibbox const & base = hh.bases().at(mglevel).at(reflevel); + ibbox const & base = hh.baseextents.at(mglevel).at(reflevel); assert (base.stride()[0] == base.stride()[1] and base.stride()[0] == base.stride()[2]); @@ -1366,7 +1370,8 @@ namespace CarpetIOASCII { vector<const gdata*> tmps (gfdatas.size()); for (size_t n=0; n<gfdatas.size(); ++n) { - gdata * const tmp = gfdatas.at(n)->make_typed(vi); + gdata * const tmp = + gfdatas.at(n)->make_typed (vi, error_centered, op_sync); tmp->allocate(gfdatas.at(n)->extent(), 0); for (comm_state state; not state.done(); state.step()) { tmp->copy_from (state, gfdatas.at(n), gfdatas.at(n)->extent()); |