aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Reisswig <reisswig@tapir.caltech.edu>2012-06-02 02:22:18 -0700
committerChristian Reisswig <reisswig@tapir.caltech.edu>2012-06-02 02:22:18 -0700
commit7c6f6e9257d66a52d9ae8489a014ce2ea496238f (patch)
treea0aa3e69fd2bae4d07cfa6f20da3b834ac75ef6b
parentd2c2d6f80f3cf75dc19000743e899dc95036e14f (diff)
CarpetInterp: Don't use CCTK_ActiveTimeLevels to get number of active timelevels. Use groupdata.AT(gi).activetimelevels.AT(m).AT(rl) instead.
This rempoves a problem in CarpetInterp's error check.
-rw-r--r--Carpet/CarpetInterp/src/interp.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc
index e9674bbc1..a58c7d9d5 100644
--- a/Carpet/CarpetInterp/src/interp.cc
+++ b/Carpet/CarpetInterp/src/interp.cc
@@ -1696,7 +1696,8 @@ namespace CarpetInterp {
assert (my_tl < num_tl.AT(n));
// Are there enough time levels?
- int const active_tl = CCTK_ActiveTimeLevelsVI (cctkGH, vi);
+ int const gi = CCTK_GroupIndexFromVarI (vi);
+ int const active_tl = groupdata.AT(gi).activetimelevels.AT(m).AT(rl);
if (active_tl <= my_tl) {
char * const fullname = CCTK_FullName(vi);
CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
@@ -1705,7 +1706,6 @@ namespace CarpetInterp {
free (fullname);
}
- int const gi = CCTK_GroupIndexFromVarI (vi);
int const vi0 = CCTK_FirstVarIndexI (gi);
ggf const *const ff = arrdata.AT(gi).AT(m).data.AT(vi-vi0);
void const *const ptr =