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.

darcs-hash:20040122123107-1d9bf-95166b54dcc264e30c13bacbf58c094a25b34dc8.gz

3 files changed, 120 insertions, 120 deletions

diff --git a/Carpet/CarpetSlab/interface.ccl b/Carpet/CarpetSlab/interface.ccl
index 29a7298be..9b60e9ba8 100644
--- a/Carpet/CarpetSlab/interface.ccl
+++ b/Carpet/CarpetSlab/interface.ccl
@@ -1,5 +1,5 @@
 # Interface definition for thorn CarpetSlab
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.7 2003/11/05 16:18:39 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.8 2004/01/22 13:31:07 tradke Exp $
 
 implements: Hyperslab
 
@@ -40,44 +40,44 @@ CCTK_INT FUNCTION \
                      CCTK_INT ARRAY OUT retvals)
 
 #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)
 
@@ -89,9 +89,9 @@ PROVIDES FUNCTION Hyperslab_GetList \
   WITH CarpetSlab_GetList LANGUAGE C
 PROVIDES FUNCTION Hyperslab_Get \
   WITH CarpetSlab_Fill LANGUAGE C
-PROVIDES FUNCTION Hyperslab_DefineGlobalMappingByIndex \
-  WITH CarpetSlab_DefineGlobalMappingByIndex LANGUAGE C
-#PROVIDES FUNCTION Hyperslab_DefineLocalMappingByIndex \
-#  WITH CarpetSlab_DefineLocalMappingByIndex LANGUAGE C
+PROVIDES FUNCTION Hyperslab_GlobalMappingByIndex \
+  WITH CarpetSlab_GlobalMappingByIndex LANGUAGE C
+#PROVIDES FUNCTION Hyperslab_LocalMappingByIndex \
+#  WITH CarpetSlab_LocalMappingByIndex LANGUAGE C
 PROVIDES FUNCTION Hyperslab_FreeMapping \
   WITH CarpetSlab_FreeMapping LANGUAGE C
diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc
index d72499b79..d15f9d48d 100644
--- a/Carpet/CarpetSlab/src/slab.cc
+++ b/Carpet/CarpetSlab/src/slab.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.13 2003/11/05 16:18:39 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.14 2004/01/22 13:31:07 tradke Exp $
 
 #include <assert.h>
 #include <stdlib.h>
@@ -23,7 +23,7 @@
 #include "slab.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.13 2003/11/05 16:18:39 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.14 2004/01/22 13:31:07 tradke Exp $";
   CCTK_FILEVERSION(Carpet_CarpetSlab_slab_cc);
 }
 
@@ -564,24 +564,24 @@ namespace CarpetSlab {
   
   
   
-  CCTK_INT CarpetSlab_DefineLocalMappingByIndex (cGH const * const cctkGH,
-                                                 CCTK_INT const vindex,
-                                                 CCTK_INT const hdim,
-                                                 CCTK_INT const * const direction,
-                                                 CCTK_INT const * const origin,
-                                                 CCTK_INT const * const extent,
-                                                 CCTK_INT const * const downsample,
-                                                 CCTK_INT const table_handle,
-                                                 CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
-                                                                                   CCTK_INT const src_stride,
-                                                                                   CCTK_INT const dst_stride,
-                                                                                   CCTK_INT const src_type,
-                                                                                   CCTK_INT const dst_type,
-                                                                                   void const * const from,
-                                                                                   void * const to),
-                                                 CCTK_INT * const hsize_local,
-                                                 CCTK_INT * const hsize_global,
-                                                 CCTK_INT * const hoffset_global)
+  CCTK_INT CarpetSlab_LocalMappingByIndex (cGH const * const cctkGH,
+                                           CCTK_INT const vindex,
+                                           CCTK_INT const hdim,
+                                           CCTK_INT const * const direction,
+                                           CCTK_INT const * const origin,
+                                           CCTK_INT const * const extent,
+                                           CCTK_INT const * const downsample,
+                                           CCTK_INT const table_handle,
+                                           CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
+                                                                             CCTK_INT const src_stride,
+                                                                             CCTK_INT const dst_stride,
+                                                                             CCTK_INT const src_type,
+                                                                             CCTK_INT const dst_type,
+                                                                             void const * const from,
+                                                                             void * const to),
+                                           CCTK_INT * const hsize_local,
+                                           CCTK_INT * const hsize_global,
+                                           CCTK_INT * const hoffset_global)
   {
     CCTK_WARN (0, "not implemented");
     return 0;
@@ -589,22 +589,22 @@ namespace CarpetSlab {
   
   
   
-  CCTK_INT CarpetSlab_DefineGlobalMappingByIndex (cGH const * const cctkGH,
-                                                  CCTK_INT const vindex,
-                                                  CCTK_INT const hdim,
-                                                  CCTK_INT const * const direction,
-                                                  CCTK_INT const * const origin,
-                                                  CCTK_INT const * const extent,
-                                                  CCTK_INT const * const downsample,
-                                                  CCTK_INT const table_handle,
-                                                  CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
-                                                                                    CCTK_INT const src_stride,
-                                                                                    CCTK_INT const dst_stride,
-                                                                                    CCTK_INT const src_type,
-                                                                                    CCTK_INT const dst_type,
-                                                                                    void const * const from,
-                                                                                    void * const to),
-                                                  CCTK_INT * const hsize)
+  CCTK_INT CarpetSlab_GlobalMappingByIndex (cGH const * const cctkGH,
+                                            CCTK_INT const vindex,
+                                            CCTK_INT const hdim,
+                                            CCTK_INT const * const direction,
+                                            CCTK_INT const * const origin,
+                                            CCTK_INT const * const extent,
+                                            CCTK_INT const * const downsample,
+                                            CCTK_INT const table_handle,
+                                            CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
+                                                                              CCTK_INT const src_stride,
+                                                                              CCTK_INT const dst_stride,
+                                                                              CCTK_INT const src_type,
+                                                                              CCTK_INT const dst_type,
+                                                                              void const * const from,
+                                                                              void * const to),
+                                            CCTK_INT * const hsize)
   {
     // Check arguments
     assert (cctkGH);
diff --git a/Carpet/CarpetSlab/src/slab.h b/Carpet/CarpetSlab/src/slab.h
index e57205aa0..221ecf009 100644
--- a/Carpet/CarpetSlab/src/slab.h
+++ b/Carpet/CarpetSlab/src/slab.h
@@ -1,4 +1,4 @@
-/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.h,v 1.2 2003/11/05 16:18:39 schnetter Exp $ */
+/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.h,v 1.3 2004/01/22 13:31:07 tradke Exp $ */
 
 #ifndef CARPETSLAB_H
 #define CARPETSLAB_H
@@ -9,7 +9,7 @@
 namespace CarpetSlab {
   extern "C" {
 #endif
-    
+
     CCTK_INT CarpetSlab_Get (cGH const * const cctkGH,
                              CCTK_INT const mapping_handle,
                              CCTK_INT const proc,
@@ -17,7 +17,7 @@ namespace CarpetSlab {
                              CCTK_INT const timelevel,
                              CCTK_INT const hdatatype,
                              void * const hdata);
-    
+
     CCTK_INT CarpetSlab_GetList (cGH const * const cctkGH,
                                  CCTK_INT const mapping_handle,
                                  CCTK_INT const num_arrays,
@@ -27,47 +27,47 @@ namespace CarpetSlab {
                                  CCTK_INT const * const hdatatypes,
                                  void * const * const hdata,
                                  CCTK_INT * const retvals);
-    
-    CCTK_INT CarpetSlab_DefineLocalMappingByIndex (cGH const * const cctkGH,
-                                                   CCTK_INT const vindex,
-                                                   CCTK_INT const hdim,
-                                                   CCTK_INT const * const direction,
-                                                   CCTK_INT const * const origin,
-                                                   CCTK_INT const * const extent,
-                                                   CCTK_INT const * const downsample,
-                                                   CCTK_INT const table_handle,
-                                                   CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
-                                                                                     CCTK_INT const src_stride,
-                                                                                     CCTK_INT const dst_stride,
-                                                                                     CCTK_INT const src_type,
-                                                                                     CCTK_INT const dst_type,
-                                                                                     void const * const from,
-                                                                                     void * const to),
-                                                   CCTK_INT * const hsize_local,
-                                                   CCTK_INT * const hsize_global,
-                                                   CCTK_INT * const hoffset_global);
 
-    CCTK_INT CarpetSlab_DefineGlobalMappingByIndex (cGH const * const cctkGH,
-                                                    CCTK_INT const vindex,
-                                                    CCTK_INT const hdim,
-                                                    CCTK_INT const * const direction,
-                                                    CCTK_INT const * const origin,
-                                                    CCTK_INT const * const extent,
-                                                    CCTK_INT const * const downsample,
-                                                    CCTK_INT const table_handle,
-                                                    CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
-                                                                                      CCTK_INT const src_stride,
-                                                                                      CCTK_INT const dst_stride,
-                                                                                      CCTK_INT const src_type,
-                                                                                      CCTK_INT const dst_type,
-                                                                                      void const * const from,
-                                                                                      void * const to),
-                                                    CCTK_INT * const hsize);
-    
+    CCTK_INT CarpetSlab_LocalMappingByIndex (cGH const * const cctkGH,
+                                             CCTK_INT const vindex,
+                                             CCTK_INT const hdim,
+                                             CCTK_INT const * const direction,
+                                             CCTK_INT const * const origin,
+                                             CCTK_INT const * const extent,
+                                             CCTK_INT const * const downsample,
+                                             CCTK_INT const table_handle,
+                                             CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
+                                                                               CCTK_INT const src_stride,
+                                                                               CCTK_INT const dst_stride,
+                                                                               CCTK_INT const src_type,
+                                                                               CCTK_INT const dst_type,
+                                                                               void const * const from,
+                                                                               void * const to),
+                                             CCTK_INT * const hsize_local,
+                                             CCTK_INT * const hsize_global,
+                                             CCTK_INT * const hoffset_global);
+
+    CCTK_INT CarpetSlab_GlobalMappingByIndex (cGH const * const cctkGH,
+                                              CCTK_INT const vindex,
+                                              CCTK_INT const hdim,
+                                              CCTK_INT const * const direction,
+                                              CCTK_INT const * const origin,
+                                              CCTK_INT const * const extent,
+                                              CCTK_INT const * const downsample,
+                                              CCTK_INT const table_handle,
+                                              CCTK_INT (* const conversion_fn) (CCTK_INT const nelems,
+                                                                                CCTK_INT const src_stride,
+                                                                                CCTK_INT const dst_stride,
+                                                                                CCTK_INT const src_type,
+                                                                                CCTK_INT const dst_type,
+                                                                                void const * const from,
+                                                                                void * const to),
+                                              CCTK_INT * const hsize);
+
     CCTK_INT CarpetSlab_FreeMapping (CCTK_INT const mapping_handle);
-    
-    
-    
+
+
+
     /* Old interface -- don't use */
     int Hyperslab_GetHyperslab (cGH* const GH,
 				const int target_proc,
@@ -80,7 +80,7 @@ namespace CarpetSlab {
 				const int downsample [/*hdim*/],
 				void** const hdata,
 				int hsize [/*hdim*/]);
-    
+
 #ifdef __cplusplus
   } /* extern "C" */
 } /* namespace CarpetSlab */