diff options
| author | Christian D. Ott <cott@tapir.caltech.edu> | 2010-08-26 08:02:47 -0700 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:24:05 +0000 |
| commit | f92907de9df683161edbc78b1382e4953fd74055 (patch) | |
| tree | a9c3e7f28caeb00216ecf77d80102923d3083d02 /Carpet/CarpetRegrid2 | |
| parent | 47960036143eb61a4b52196bb704f62825ac7ccc (diff) | |
* fix issue in regrid.cc that lead to NANs in old_radius_{x,y,z}
Diffstat (limited to 'Carpet/CarpetRegrid2')
| -rw-r--r-- | Carpet/CarpetRegrid2/src/regrid.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Carpet/CarpetRegrid2/src/regrid.cc b/Carpet/CarpetRegrid2/src/regrid.cc index cfb0539f6..ccb8321b5 100644 --- a/Carpet/CarpetRegrid2/src/regrid.cc +++ b/Carpet/CarpetRegrid2/src/regrid.cc @@ -1441,9 +1441,15 @@ namespace CarpetRegrid2 { old_position_y[n] = position_y[n]; old_position_z[n] = position_z[n]; - old_radius_x[n] = radius_x[n] < 0 ? radius[n] : radius_x[n]; - old_radius_y[n] = radius_y[n] < 0 ? radius[n] : radius_y[n]; - old_radius_z[n] = radius_z[n] < 0 ? radius[n] : radius_z[n]; + int lsh[2]; + getvectorindex2 (cctkGH, "CarpetRegrid2::radii", lsh); + + for (int rl = 1; rl < num_levels[n]; ++ rl) { + int const ind = index2 (lsh, rl, n); + old_radius_x[ind] = radius_x[ind] < 0 ? radius[ind] : radius_x[ind]; + old_radius_y[ind] = radius_y[ind] < 0 ? radius[ind] : radius_y[ind]; + old_radius_z[ind] = radius_z[ind] < 0 ? radius[ind] : radius_z[ind]; + } } } // if do_recompose |