From 487280c1b638d05f4bbc2bc41c81d1fdb424cd4d Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 25 Feb 2012 11:01:40 -0500 Subject: CarpetLib: Change API to obtain pointer to grid function data Change the API to obtain a pointer to grid function data: - Use a function "typed_data_pointer" instead of overloading the () operator (because this looks nicer) - Don't use a virtual function (because this isn't needed) - Update all uses --- Carpet/CarpetInterp/src/interp.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Carpet/CarpetInterp') diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc index 2a7a62fdb..864dd85d7 100644 --- a/Carpet/CarpetInterp/src/interp.cc +++ b/Carpet/CarpetInterp/src/interp.cc @@ -1706,9 +1706,10 @@ namespace CarpetInterp { int const gi = CCTK_GroupIndexFromVarI (vi); int const vi0 = CCTK_FirstVarIndexI (gi); - input_arrays[n] = - (*arrdata.AT(gi).AT(m).data.AT(vi-vi0))(my_tl, rl, lc, mglevel)-> - storage(); + ggf const *const ff = arrdata.AT(gi).AT(m).data.AT(vi-vi0); + void const *const ptr = + ff->data_pointer(my_tl, rl, lc, mglevel)->storage(); + input_arrays[n] = ptr; } } // for input arrays -- cgit v1.2.3