diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-04-27 10:08:28 -0500 |
---|---|---|
committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 16:45:44 +0000 |
commit | ab37bf965aec96cfe3ec08e9e80c3f315c466814 (patch) | |
tree | b2a5bd3c330aac722982237a2064b66e890837ce | |
parent | b8122d9f7178636244252914888ec665180002f6 (diff) |
Carpet: Update to new dh classes
-rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 10 | ||||
-rw-r--r-- | Carpet/Carpet/src/modes.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 61f961cd5..5ff48751c 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -556,8 +556,8 @@ namespace Carpet { for (int c=0; c<hh.components(rl); ++c) { const rvect origin = domainspecs.AT(m).exterior_min; const rvect delta = (domainspecs.AT(m).exterior_max - domainspecs.AT(m).exterior_min) / rvect (domainspecs.AT(m).npoints - 1); - const ivect lower = dd.boxes.AT(ml).AT(rl).AT(c).exterior.lower(); - const ivect upper = dd.boxes.AT(ml).AT(rl).AT(c).exterior.upper(); + const ivect lower = dd.light_boxes.AT(ml).AT(rl).AT(c).exterior.lower(); + const ivect upper = dd.light_boxes.AT(ml).AT(rl).AT(c).exterior.upper(); const int convfact = ipow(mgfact, ml); const ivect levfact = spacereffacts.AT(rl); cout << " [" << ml << "][" << rl << "][" << m << "][" << c << "]" @@ -960,7 +960,7 @@ namespace Carpet { gh const * const hh = arrdata.AT(g).AT(0).hh; dh const * const dd = arrdata.AT(g).AT(0).dd; for (int c=0; c<hh->components(0); ++c) { - dh::dboxes const & b = dd->boxes.AT(0).AT(0).AT(c); + dh::light_dboxes const & b = dd->light_boxes.AT(0).AT(0).AT(c); num_active_array_points += num_tl * num_vars * b.active_size; num_total_array_points += num_tl * num_vars * b.exterior_size; size_total_array_points += num_tl * size_vars * b.exterior_size; @@ -997,7 +997,7 @@ namespace Carpet { } for (int c=0; c<hh->components(rl); ++c) { ++ num_comps; - dh::dboxes const & b = dd->boxes.AT(ml).AT(rl).AT(c); + dh::light_dboxes const & b = dd->light_boxes.AT(ml).AT(rl).AT(c); num_active_mem_points += num_gfs * b.active_size; num_owned_mem_points += num_gfs * b.owned_size; num_total_mem_points += num_gfs * b.exterior_size; @@ -1028,7 +1028,7 @@ namespace Carpet { for (int ml=0; ml<mglevels; ++ml) { for (int c=0; c<hh->components(rl); ++c) { int const p = hh->processor(rl,c); - dh::dboxes const & b = dd->boxes.AT(ml).AT(rl).AT(c); + dh::light_dboxes const & b = dd->light_boxes.AT(ml).AT(rl).AT(c); num_active_per_proc.AT(p) += num_gfs * b.active_size; } } diff --git a/Carpet/Carpet/src/modes.cc b/Carpet/Carpet/src/modes.cc index 038815393..f426b73f6 100644 --- a/Carpet/Carpet/src/modes.cc +++ b/Carpet/Carpet/src/modes.cc @@ -113,7 +113,7 @@ namespace Carpet { const int c = dist::rank(); const ibbox& baseext = arrdata.AT(group).AT(m).hh->baseextents.AT(ml).AT(rl); - const ibbox& ext = arrdata.AT(group).AT(m).dd->boxes.AT(ml).AT(rl).AT(c).exterior; + const ibbox& ext = arrdata.AT(group).AT(m).dd->light_boxes.AT(ml).AT(rl).AT(c).exterior; const b2vect& obnds = arrdata.AT(group).AT(m).hh->outer_boundaries(rl,c); cGroupDynamicData & info = groupdata.AT(group).info; @@ -545,7 +545,7 @@ namespace Carpet { // Set cGH fields const ibbox& baseext = vhh.AT(map)->baseextents.AT(mglevel).AT(reflevel); - const ibbox& ext = vdd.AT(map)->boxes.AT(mglevel).AT(reflevel).AT(component).exterior; + const ibbox& ext = vdd.AT(map)->light_boxes.AT(mglevel).AT(reflevel).AT(component).exterior; const b2vect& obnds = vhh.AT(map)->outer_boundaries(reflevel,component); ivect_ref(cctkGH->cctk_lbnd) = |