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

1 files changed, 7 insertions, 3 deletions

diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc
index d18de8ce0..a849f100b 100644
--- a/Carpet/CarpetReduce/src/reduce.cc
+++ b/Carpet/CarpetReduce/src/reduce.cc
@@ -1464,9 +1464,13 @@ namespace CarpetReduce {
                       int const vi = invars[n];
                       int const gi = CCTK_GroupIndexFromVarI (vi);
                       int const vi0 = CCTK_FirstVarIndexI (gi);
-                      myinarrays.AT(tl).AT(n)
-                        = ((*arrdata.AT(gi).AT(Carpet::map).data.AT(vi-vi0))
-                           (tl, reflevel, local_component, mglevel)->storage());
+                       ggf const *const ff =
+                         arrdata.AT(gi).AT(Carpet::map).data.AT(vi-vi0);
+                       void const *const ptr =
+                         ff->
+                         data_pointer(tl, reflevel, local_component, mglevel)->
+                         storage();
+                       myinarrays.AT(tl).AT(n) = ptr;
 #endif
                       assert (myinarrays.AT(tl).AT(n));
                     }