Use the new API for NewHyperslab_GetLocalHyperslab().

You also need to update CactusPUGH/PUGHSlab before recompiling.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5Util/trunk@38 7842ec3a-9562-4be5-9c5b-06ba18f2b668

1 files changed, 17 insertions, 16 deletions

diff --git a/src/DumpVar.c b/src/DumpVar.c
index 2e4a610..9f31438 100644
--- a/src/DumpVar.c
+++ b/src/DumpVar.c
@@ -540,10 +540,10 @@ static int IOHDF5Util_getDumpData (cGH *GH,
                                    int *free_outme, 
                                    CCTK_INT *geom)
 {
-  int i;
+  int i, retval;
   int cctk_output_type;
   ioGH *ioUtilGH;
-  int *hsizes,*hsizes_global,*hsizes_offset; /* geometry information */
+  int *hsizes, *hsizes_global, *hsizes_offset; /* geometry information */
   char *fullname;
   
 
@@ -596,31 +596,32 @@ static int IOHDF5Util_getDumpData (cGH *GH,
   }     
 #endif
 
-  if (NewHyperslab_GetLocalHyperslab (GH, vindex, timelevel, request->sdim,
+  retval = NewHyperslab_GetLocalHyperslab (GH, vindex, timelevel, request->sdim,
                                       cctk_output_type, NULL, request->origin,
                                       request->direction, request->length,
-                                      request->downsample, outme,
-                                      hsizes, hsizes_global, hsizes_offset) < 0)
+                                      request->downsample, outme, free_outme,
+                                      hsizes, hsizes_global, hsizes_offset);
+  if (retval == 0)
+  {
+    for (i = 0; i < request->sdim; i++)
+    {
+      geom[i + 0*request->sdim] = hsizes_offset[i];
+      geom[i + 1*request->sdim] = hsizes[i];        
+      geom[i + 2*request->sdim] = hsizes_global[i];
+      request->actlen[i]  = hsizes_global[i];
+    }
+  }
+  else
   {
     fullname = CCTK_FullName (vindex);
     CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
                 "Failed to extract hyperslab for variable '%s'", fullname);
     free (fullname);
-    *free_outme = 0;
-    return (-1);
-  }
-
-  for (i = 0; i < request->sdim; i++)
-  {
-    geom[i + 0*request->sdim] = hsizes_offset[i];
-    geom[i + 1*request->sdim] = hsizes[i];        
-    geom[i + 2*request->sdim] = hsizes_global[i];
-    request->actlen[i]  = hsizes_global[i];
   }
 
   free (hsizes);
 
-  return (0);
+  return (retval);
 }