Renamed some aliased hyperslab functions to comply with the maximum length

for names of Fortran routines (31 characters):

 Hyperslab_DefineGlobalMappingByPhys  -> Hyperslab_GlobalMappingByPhys
 Hyperslab_DefineGlobalMappingByIndex -> Hyperslab_GlobalMappingByIndex
 Hyperslab_DefineLocalMappingByPhys   -> Hyperslab_LocalMappingByPhys
 Hyperslab_DefineLocalMappingByIndex  -> Hyperslab_LocalMappingByIndex

Also renamed the providing functions accordingly.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@302 ebee0441-1374-4afa-a3b5-247f3ba15b9a

3 files changed, 55 insertions, 57 deletions

diff --git a/interface.ccl b/interface.ccl
index 1515d8b..6d30dc9 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -14,48 +14,48 @@ CCTK_INT FUNCTION \
                  CCTK_POINTER OUT hdata)
 
 CCTK_INT FUNCTION \
-  Hyperslab_DefineLocalMappingByIndex (CCTK_POINTER_TO_CONST IN cctkGH, \
-                                       CCTK_INT IN vindex, \
-                                       CCTK_INT IN hdim, \
-                                       CCTK_INT ARRAY IN direction, \
-                                       CCTK_INT ARRAY IN origin, \
-                                       CCTK_INT ARRAY IN extent, \
-                                       CCTK_INT ARRAY IN downsample, \
-                                       CCTK_INT IN table_handle, \
-                                       CCTK_INT CCTK_FPOINTER IN \
-                                         conversion_fn (CCTK_INT IN nelems, \
-                                                        CCTK_INT IN src_stride, \
-                                                        CCTK_INT IN dst_stride, \
-                                                        CCTK_INT IN src_type, \
-                                                        CCTK_INT IN dst_type, \
-                                                        CCTK_POINTER_TO_CONST IN from, \
-                                                        CCTK_POINTER IN to), \
-                                       CCTK_INT ARRAY OUT hsize_local, \
-                                       CCTK_INT ARRAY OUT hsize_global, \
-                                       CCTK_INT ARRAY OUT hoffset_global)
+  Hyperslab_LocalMappingByIndex (CCTK_POINTER_TO_CONST IN cctkGH, \
+                                 CCTK_INT IN vindex, \
+                                 CCTK_INT IN hdim, \
+                                 CCTK_INT ARRAY IN direction, \
+                                 CCTK_INT ARRAY IN origin, \
+                                 CCTK_INT ARRAY IN extent, \
+                                 CCTK_INT ARRAY IN downsample, \
+                                 CCTK_INT IN table_handle, \
+                                 CCTK_INT CCTK_FPOINTER IN \
+                                   conversion_fn (CCTK_INT IN nelems, \
+                                                  CCTK_INT IN src_stride, \
+                                                  CCTK_INT IN dst_stride, \
+                                                  CCTK_INT IN src_type, \
+                                                  CCTK_INT IN dst_type, \
+                                                  CCTK_POINTER_TO_CONST IN from, \
+                                                  CCTK_POINTER IN to), \
+                                 CCTK_INT ARRAY OUT hsize_local, \
+                                 CCTK_INT ARRAY OUT hsize_global, \
+                                 CCTK_INT ARRAY OUT hoffset_global)
 
 CCTK_INT FUNCTION \
-  Hyperslab_DefineGlobalMappingByIndex (CCTK_POINTER_TO_CONST IN cctkGH, \
-                                        CCTK_INT IN vindex, \
-                                        CCTK_INT IN hdim, \
-                                        CCTK_INT ARRAY IN direction, \
-                                        CCTK_INT ARRAY IN origin, \
-                                        CCTK_INT ARRAY IN extent, \
-                                        CCTK_INT ARRAY IN downsample, \
-                                        CCTK_INT IN table_handle, \
-                                        CCTK_INT CCTK_FPOINTER IN \
-                                          conversion_fn (CCTK_INT IN nelems, \
-                                                         CCTK_INT IN src_stride, \
-                                                         CCTK_INT IN dst_stride, \
-                                                         CCTK_INT IN src_type, \
-                                                         CCTK_INT IN dst_type, \
-                                                         CCTK_POINTER_TO_CONST IN from, \
-                                                         CCTK_POINTER IN to), \
-                                        CCTK_INT ARRAY OUT hsize)
+  Hyperslab_GlobalMappingByIndex (CCTK_POINTER_TO_CONST IN cctkGH, \
+                                  CCTK_INT IN vindex, \
+                                  CCTK_INT IN hdim, \
+                                  CCTK_INT ARRAY IN direction, \
+                                  CCTK_INT ARRAY IN origin, \
+                                  CCTK_INT ARRAY IN extent, \
+                                  CCTK_INT ARRAY IN downsample, \
+                                  CCTK_INT IN table_handle, \
+                                  CCTK_INT CCTK_FPOINTER IN \
+                                    conversion_fn (CCTK_INT IN nelems, \
+                                                   CCTK_INT IN src_stride, \
+                                                   CCTK_INT IN dst_stride, \
+                                                   CCTK_INT IN src_type, \
+                                                   CCTK_INT IN dst_type, \
+                                                   CCTK_POINTER_TO_CONST IN from, \
+                                                   CCTK_POINTER IN to), \
+                                  CCTK_INT ARRAY OUT hsize)
 
 CCTK_INT FUNCTION Hyperslab_FreeMapping (CCTK_INT IN mapping_handle)
 
 USES FUNCTION Hyperslab_Get
-USES FUNCTION Hyperslab_DefineLocalMappingByIndex
-USES FUNCTION Hyperslab_DefineGlobalMappingByIndex
+USES FUNCTION Hyperslab_LocalMappingByIndex
+USES FUNCTION Hyperslab_GlobalMappingByIndex
 USES FUNCTION Hyperslab_FreeMapping
diff --git a/src/DumpVar.c b/src/DumpVar.c
index 2ce2995..87d87b5 100644
--- a/src/DumpVar.c
+++ b/src/DumpVar.c
@@ -293,7 +293,7 @@ static int WriteGS (const cGH *GH, const ioRequest *request, IOFile file)
                Dumps a grid array variable into a IEEEIO file.
    @enddesc
 
-   @calls      Hyperslab_DefineLocalMappingByIndex
+   @calls      Hyperslab_LocalMappingByIndex
                Hyperslab_FreeMapping
                Hyperslab_Get
                WriteData
@@ -348,16 +348,16 @@ static int WriteGA (const cGH *GH, const ioRequest *request, IOFile file)
       CCTK_WARN (1, "Failed to hyperslab parameter create table from string");
     }
   }
-  mapping = Hyperslab_DefineLocalMappingByIndex (GH, request->vindex,
-                                                 request->hdim,
-                                                 request->direction,
-                                                 request->origin,
-                                                 request->extent,
-                                                 request->downsample,
-                                                 table, NULL,
-                                                 request->hsize_chunk,
-                                                 request->hsize,
-                                                 request->hoffset);
+  mapping = Hyperslab_LocalMappingByIndex (GH, request->vindex,
+                                           request->hdim,
+                                           request->direction,
+                                           request->origin,
+                                           request->extent,
+                                           request->downsample,
+                                           table, NULL,
+                                           request->hsize_chunk,
+                                           request->hsize,
+                                           request->hoffset);
   if (table >= 0)
   {
     Util_TableDestroy (table);
diff --git a/src/Write2D.c b/src/Write2D.c
index 8c393d1..8da9182 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -261,14 +261,12 @@ int IOFlexIO_Write2D (const cGH *GH, int vindex, const char *alias)
     memset (direction, 0, sizeof (direction));
     direction[dir_i] = direction[3 + dir_j] = 1;
 
-    mapping = Hyperslab_DefineGlobalMappingByIndex (GH, vindex, 2,
-                                                    direction,
-                                                    origin,
-                                                    extent,
-                                                    NULL, /* downsample */
-                                                    -1,   /* table handle */
-                                                    NULL  /* conversion fn */,
-                                                    hsize);
+    mapping = Hyperslab_GlobalMappingByIndex (GH, vindex, 2,
+                                              direction, origin, extent,
+                                              NULL, /* downsample */
+                                              -1,   /* table handle */
+                                              NULL  /* conversion fn */,
+                                              hsize);
     if (mapping < 0)
     {
       CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,