diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-02-25 11:01:40 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2012-09-11 18:23:06 +0100 |
| commit | 487280c1b638d05f4bbc2bc41c81d1fdb424cd4d (patch) | |
| tree | d4ea7557f7cd42f74ce6f7a92b906e6401c69c97 /Carpet/CarpetSlab | |
| parent | ae44c5e6d86a65cce382e313e2a10b214e9645da (diff) | |
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
Diffstat (limited to 'Carpet/CarpetSlab')
| -rw-r--r-- | Carpet/CarpetSlab/src/GetHyperslab.cc | 4 | ||||
| -rw-r--r-- | Carpet/CarpetSlab/src/slab.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Carpet/CarpetSlab/src/GetHyperslab.cc b/Carpet/CarpetSlab/src/GetHyperslab.cc index 27daeec1c..cd8cb6917 100644 --- a/Carpet/CarpetSlab/src/GetHyperslab.cc +++ b/Carpet/CarpetSlab/src/GetHyperslab.cc @@ -142,7 +142,7 @@ namespace CarpetSlab { // Get sample data const gdata* mydata; - mydata = (*myff)(tl, rl, 0, 0); + mydata = myff->data_pointer(tl, rl, 0, 0); // Stride of data in memory const vect<int,dim> str = mydata->extent().stride(); @@ -183,7 +183,7 @@ namespace CarpetSlab { BEGIN_LOCAL_COMPONENT_LOOP (cgh, gp.grouptype) { // Get data object - mydata = (*myff)(tl, rl, component, mglevel); + mydata = myff->data_pointer(tl, rl, component, mglevel); // Calculate overlapping extents bboxset<int,dim> const myextents = diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc index 9a7ac6c4a..1825602c3 100644 --- a/Carpet/CarpetSlab/src/slab.cc +++ b/Carpet/CarpetSlab/src/slab.cc @@ -175,7 +175,7 @@ namespace CarpetSlab { // Get sample data const gdata* mydata; - mydata = (*myff)(tl, rl, 0, 0); + mydata = myff->data_pointer(tl, rl, 0, 0); // Stride of data in memory const vect<int,dim> str = mydata->extent().stride(); @@ -216,7 +216,7 @@ namespace CarpetSlab { BEGIN_COMPONENT_LOOP (cgh, gp.grouptype) { // Get data object - mydata = (*myff)(tl, rl, component, mglevel); + mydata = myff->data_pointer(tl, rl, component, mglevel); // Calculate overlapping extents const bboxset<int,dim> myextents = |