diff options
Diffstat (limited to 'Carpet/Carpet/src')
-rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 14 | ||||
-rw-r--r-- | Carpet/Carpet/src/SetupGH.cc | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 3027290de..4da7afb73 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -91,13 +91,17 @@ namespace Carpet { } assert ((int)regsss.at(0).size() <= maxreflevels); for (int ml=0; ml<(int)regsss.size(); ++ml) { + int num_regions = 0; for (int rl=0; rl<(int)regsss.at(0).size(); ++rl) { // No empty levels - assert (regsss.at(ml).at(rl).size() > 0); + // (but allow some empty maps) + // assert (regsss.at(ml).at(rl).size() > 0); + num_regions += regsss.at(ml).at(rl).size(); for (int c=0; c<(int)regsss.at(ml).at(rl).size(); ++c) { // Check sizes - // Do allow processors with zero grid points -// assert (all(regsss.at(rl).at(c).at(ml).extent.lower() <= regsss.at(rl).at(c).at(ml).extent.upper())); + // (but allow processors with zero grid points) + // assert (all(regsss.at(rl).at(c).at(ml).extent.lower() <= + // regsss.at(rl).at(c).at(ml).extent.upper())); // Check strides const ivect str = (maxspacereflevelfact / spacereffacts.at(rl) * ipow(mgfact, ml)); @@ -107,6 +111,8 @@ namespace Carpet { assert (all(regsss.at(ml).at(rl).at(c).extent.upper() % str == 0)); } } + // No empty levels + assert (num_regions > 0); } } @@ -782,7 +788,7 @@ namespace Carpet { } for (int c=0; c<hh->components(rl); ++c) { ++ num_comps; - dh::dboxes const & b = dd->boxes.AT(m).AT(rl).AT(c); + dh::dboxes const & b = dd->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(); diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index 109c3bcab..5e34fcd30 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -1221,6 +1221,8 @@ namespace Carpet { } else if (domain_from_coordbase) { + assert (not CCTK_IsFunctionAliased ("MultiPatch_GetDomainSpecification")); + // Ensure that CartGrid3D::type = "coordbase" ensure_CartGrid3D_type (); @@ -1235,6 +1237,8 @@ namespace Carpet { } else { // Legacy code + assert (not CCTK_IsFunctionAliased ("MultiPatch_GetDomainSpecification")); + if (max_refinement_levels > 1) { // Ensure that CartGrid3D::avoid_origin = no ensure_CartGrid3D_avoid_origin (); |