diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-10-24 00:11:59 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-10-24 00:11:59 -0400 |
| commit | 911d93503f33de2596f8aeb3f2f9dc73afdba318 (patch) | |
| tree | b6777c80f80497a6e988520382a4a9fdc7d00ac8 /Carpet | |
| parent | 8e24710d68ff073a78e80e3819cd1f2c2753e154 (diff) | |
Carpet, CarpetRegrid2: When comparing refined regions treat non-existing levels as empty
Diffstat (limited to 'Carpet')
| -rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 1 | ||||
| -rw-r--r-- | Carpet/CarpetRegrid2/src/regrid.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 23f4676f7..6e1a519cd 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -2038,6 +2038,7 @@ namespace Carpet { vector<vector<vector<region_t> > > const & regsss, vector<vector<vector<vector<region_t> > > > & regssss) { + regssss.resize(maps); for (int m = 0; m < maps; ++m) { MakeMultigridBoxes (cctkGH, m, regsss.AT(m), regssss.AT(m)); } // for m diff --git a/Carpet/CarpetRegrid2/src/regrid.cc b/Carpet/CarpetRegrid2/src/regrid.cc index 9b52a2d53..427d8b09b 100644 --- a/Carpet/CarpetRegrid2/src/regrid.cc +++ b/Carpet/CarpetRegrid2/src/regrid.cc @@ -845,6 +845,7 @@ namespace CarpetRegrid2 { bool level_did_change = false; for (int m = 0; m < maps; ++ m) { level_did_change = level_did_change or + int(old_superregsss.at(m).size()) <= rl or superregsss.at(m).at(rl) != old_superregsss.at(m).at(rl); } any_level_did_change = any_level_did_change or level_did_change; @@ -874,7 +875,7 @@ namespace CarpetRegrid2 { regsss.at(m).at(rl).swap(old_regssss.at(m).at(ml).at(rl)); } - }// if level did change + } // if level did change } // for rl // Make multigrid aware |