diff options
| author | Frank Löffler <knarf@cct.lsu.edu> | 2013-02-07 08:54:45 -0600 |
|---|---|---|
| committer | Frank Löffler <knarf@cct.lsu.edu> | 2013-02-07 08:54:45 -0600 |
| commit | 55f4ce83ad9d774ace73941d167c4efda1bf0ebb (patch) | |
| tree | 7afa98bb7684c4339d0ce15bb4fd0252e1ddfd0e /Carpet/CarpetRegrid2/src | |
| parent | be0c452f2d840b16e7a4a0fb76479b713a82b604 (diff) | |
| parent | 0d0fb2bf45da70140d161190e74d0c7603480b24 (diff) | |
Merge branch 'master' of carpetcode.org:carpet
Diffstat (limited to 'Carpet/CarpetRegrid2/src')
| -rw-r--r-- | Carpet/CarpetRegrid2/src/initialise.cc | 2 | ||||
| -rw-r--r-- | Carpet/CarpetRegrid2/src/property.cc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Carpet/CarpetRegrid2/src/initialise.cc b/Carpet/CarpetRegrid2/src/initialise.cc index 12c69410e..4c57e9d83 100644 --- a/Carpet/CarpetRegrid2/src/initialise.cc +++ b/Carpet/CarpetRegrid2/src/initialise.cc @@ -69,7 +69,7 @@ namespace CarpetRegrid2 { #undef INIT_CENTRE - if (verbose) { + if (verbose or veryverbose) { for (int n = 0; n < num_centres; ++ n) { CCTK_VInfo (CCTK_THORNSTRING, "Initialising position of centre %d to [%g,%g,%g]", diff --git a/Carpet/CarpetRegrid2/src/property.cc b/Carpet/CarpetRegrid2/src/property.cc index 340b4f22b..cbe1ad682 100644 --- a/Carpet/CarpetRegrid2/src/property.cc +++ b/Carpet/CarpetRegrid2/src/property.cc @@ -202,9 +202,12 @@ namespace CarpetRegrid2 { CCTK_REAL const combined_size = static_cast <CCTK_REAL> (combined.size()); - // Would a single bbox be efficient enough? + // Is the current setup "simple enough"? (It is "simple enough" if + // either it already consists of a single box, or if using a + // single bbox would be too inefficient.) // TODO: Check this also for pairs of regions - return min_fraction * combined_size <= regions_size; + return (regions.at(rl).setsize() == 1 or + min_fraction * combined_size > regions_size); } void combine_regions:: |