diff options
Diffstat (limited to 'src/GetHyperslab.c')
| -rw-r--r-- | src/GetHyperslab.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/GetHyperslab.c b/src/GetHyperslab.c index 5af25b6..2ad33d1 100644 --- a/src/GetHyperslab.c +++ b/src/GetHyperslab.c @@ -57,33 +57,32 @@ static void SortIntoUnchunkedHyperslab (const hslab_mapping_t *mapping, #endif -CCTK_INT Hyperslab_Get (const cGH *GH, - CCTK_INT mapping_handle, - CCTK_INT proc, - CCTK_INT vindex, - CCTK_INT timelevel, - CCTK_INT hdatatype, - void *hdata) +CCTK_INT PUGHSlab_Get (const cGH *GH, + CCTK_INT mapping_handle, + CCTK_INT proc, + CCTK_INT vindex, + CCTK_INT timelevel, + CCTK_INT hdatatype, + void *hdata) { CCTK_INT retval; - retval = Hyperslab_GetList (GH, mapping_handle, 1, &proc, &vindex, - &timelevel, - hdatatype<0?NULL:&hdatatype, &hdata, NULL); + retval = PUGHSlab_GetList (GH, mapping_handle, 1, &proc, &vindex, &timelevel, + hdatatype >= 0 ? &hdatatype : NULL, &hdata, NULL); return (retval == 1 ? 0 : -1); } -CCTK_INT Hyperslab_GetList (const cGH *GH, - CCTK_INT mapping_handle, - CCTK_INT num_arrays, - const CCTK_INT *procs /* num_arrays */, - const CCTK_INT *vindices /* num_arrays */, - const CCTK_INT *timelevels /* num_arrays */, - const CCTK_INT *hdatatypes /* num_arrays */, - void *const *hdata /* num_arrays */, - CCTK_INT *retvals /* num_arrays */) +CCTK_INT PUGHSlab_GetList (const cGH *GH, + CCTK_INT mapping_handle, + CCTK_INT num_arrays, + const CCTK_INT *procs /* num_arrays */, + const CCTK_INT *vindices /* num_arrays */, + const CCTK_INT *timelevels /* num_arrays */, + const CCTK_INT *hdatatypes /* num_arrays */, + void *const *hdata /* num_arrays */, + CCTK_INT *retvals /* num_arrays */) { int i, timelevel, hdatatype, hdata_size, retval; CCTK_INT result, *result_ptr; @@ -243,8 +242,7 @@ CCTK_INT Hyperslab_GetList (const cGH *GH, of a domain-decomposed Cactus array variable. This routine delivers the local hyperslab data - to be collected into a global hyperslab - by Hyperslab_GetHyperslab(). + to be collected into a global hyperslab by PUGHlab_GetHyperslab(). IO methods can call this routine as well to collect the local hyperslab data and output it in parallel. @enddesc @@ -360,6 +358,8 @@ static int GetLocalHyperslab (const cGH *GH, t_hslabConversionFn conversion_fn; + vdata = NULL; + /* do some plausibility checks */ errormsg = NULL; if (! GH || ! mapping || (mapping->totals > 0 && ! hdata)) |