Added aliased versions for the CoordBase functions.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CoordBase/trunk@13 0337457d-221f-4ee6-a5f0-14255d5370d8

3 files changed, 103 insertions, 33 deletions

diff --git a/interface.ccl b/interface.ccl
index 6029816..f213cc8 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -3,8 +3,57 @@
 
 implements: CoordBase 
 
+# Old header file - should use aliased functions
+
 include header: CoordBase.h in CoordBase.h
 
+# Exported functions
+
+CCTK_INT FUNCTION Coord_SystemRegister  \
+  (CCTK_POINTER_TO_CONST IN GH,         \
+   CCTK_INT IN dim,                     \
+   CCTK_STRING IN systemname)
+PROVIDES FUNCTION Coord_SystemRegister  \
+  WITH CoordBase_SystemRegister         \
+  LANGUAGE C
+
+CCTK_INT FUNCTION Coord_SystemHandle  \
+  (CCTK_POINTER_TO_CONST IN GH,       \ 
+   CCTK_STRING IN systemname)
+PROVIDES FUNCTION Coord_SystemHandle  \
+  WITH CoordBase_SystemHandle         \
+  LANGUAGE C
+
+CCTK_INT FUNCTION Coord_CoordRegister  \
+  (CCTK_POINTER_TO_CONST IN GH,        \
+   CCTK_INT IN systemhandle,           \
+   CCTK_INT IN direction,              \
+   CCTK_STRING IN coordname)
+PROVIDES FUNCTION Coord_CoordRegister  \
+  WITH CoordBase_CoordRegister         \
+  LANGUAGE C
+
+CCTK_INT FUNCTION Coord_CoordHandle    \
+  (CCTK_POINTER_TO_CONST IN GH,        \
+   CCTK_STRING IN coordname,           \
+   CCTK_STRING IN systemname)
+PROVIDES FUNCTION Coord_CoordHandle    \
+  WITH CoordBase_CoordHandle           \
+  LANGUAGE C
+
+CCTK_INT FUNCTION Coord_GroupSystem    \
+  (CCTK_POINTER_TO_CONST IN GH,        \
+   CCTK_STRING IN groupname)
+PROVIDES FUNCTION Coord_GroupSystem    \
+  WITH CoordBase_GroupSystem           \
+  LANGUAGE C
+
+CCTK_INT FUNCTION Coord_SetDefaultSystem   \
+  (CCTK_POINTER_TO_CONST IN GH,            \
+   CCTK_STRING IN systemname)
+PROVIDES FUNCTION Coord_SetDefaultSystem   \
+  WITH CoordBase_SetDefaultSystem          \
+  LANGUAGE C
 
 
 # The location of the boundary points
@@ -67,7 +116,7 @@ PROVIDES FUNCTION ConvertFromInteriorBoundary \
    LANGUAGE C
 
 CCTK_INT FUNCTION ConvertFromExteriorBoundary \
-  (CCTK_INT INT size, \
+  (CCTK_INT IN size, \
    CCTK_REAL OUT ARRAY physical_min, \
    CCTK_REAL OUT ARRAY physical_max, \
    CCTK_REAL OUT ARRAY interior_min, \
@@ -78,3 +127,4 @@ CCTK_INT FUNCTION ConvertFromExteriorBoundary \
 PROVIDES FUNCTION ConvertFromExteriorBoundary \
    WITH CoordBase_ConvertFromExteriorBoundary \
    LANGUAGE C
+
diff --git a/src/CoordBase.c b/src/CoordBase.c
index dbbdc7f..403ba56 100644
--- a/src/CoordBase.c
+++ b/src/CoordBase.c
@@ -16,7 +16,11 @@
 #include "util_Table.h"
 #include "util_Hash.h"
 #include "util_String.h"
+
+#define COORD_IN_COORDBASE 1
 #include "CoordBase.h"
+#undef COORD_IN_COORDBASE
+
 #include "coordbaseGH.h"
 
 static const char *rcsid = "$Header$";
@@ -39,7 +43,7 @@ static int longest_systemname=0;
  ********************************************************************/
 
  /*@@
-   @routine    Coord_SystemRegister
+   @routine    CoordBase_SystemRegister
    @date       24 July 2003
    @author     Gabrielle Allen and David Rideout
    @desc
@@ -77,7 +81,7 @@ static int longest_systemname=0;
    @endreturndesc
 @@*/
 
-CCTK_INT Coord_SystemRegister(CCTK_POINTER_TO_CONST GH, CCTK_INT dim,
+CCTK_INT CoordBase_SystemRegister(CCTK_POINTER_TO_CONST GH, CCTK_INT dim,
                          CCTK_STRING systemname)
 {
   int retval;
@@ -161,7 +165,7 @@ CCTK_INT Coord_SystemRegister(CCTK_POINTER_TO_CONST GH, CCTK_INT dim,
 
 
  /*@@
-   @routine    Coord_SystemHandle
+   @routine    CoordBase_SystemHandle
    @date       24 July 2003
    @author     Gabrielle Allen and David Rideout
    @desc
@@ -190,7 +194,7 @@ CCTK_INT Coord_SystemRegister(CCTK_POINTER_TO_CONST GH, CCTK_INT dim,
    @endreturndesc
 @@*/
 
-CCTK_INT Coord_SystemHandle(CCTK_POINTER_TO_CONST GH, CCTK_STRING systemname)
+CCTK_INT CoordBase_SystemHandle(CCTK_POINTER_TO_CONST GH, CCTK_STRING systemname)
 {
   int *handle_ptr, retval;
   const coordbaseGH *GHex;
@@ -215,7 +219,7 @@ CCTK_INT Coord_SystemHandle(CCTK_POINTER_TO_CONST GH, CCTK_STRING systemname)
 }
 
  /*@@
-   @routine    Coord_CoordRegister
+   @routine    CoordBase_CoordRegister
    @date       24 July 2003
    @author     Gabrielle Allen and David Rideout
    @desc
@@ -263,7 +267,7 @@ CCTK_INT Coord_SystemHandle(CCTK_POINTER_TO_CONST GH, CCTK_STRING systemname)
    @endreturndesc
 @@*/
 
-CCTK_INT Coord_CoordRegister(CCTK_POINTER_TO_CONST GH,
+CCTK_INT CoordBase_CoordRegister(CCTK_POINTER_TO_CONST GH,
                         CCTK_INT systemhandle,
                         CCTK_INT direction,
                         CCTK_STRING coordname)
@@ -386,7 +390,7 @@ CCTK_INT Coord_CoordRegister(CCTK_POINTER_TO_CONST GH,
 
 
  /*@@
-   @routine    Coord_CoordHandle
+   @routine    CoordBase_CoordHandle
    @date       25 July 2003
    @author     Gabrielle Allen and David Rideout
    @desc
@@ -425,7 +429,7 @@ CCTK_INT Coord_CoordRegister(CCTK_POINTER_TO_CONST GH,
    @endreturndesc
 @@*/
 
-CCTK_INT Coord_CoordHandle(CCTK_POINTER_TO_CONST GH,
+CCTK_INT CoordBase_CoordHandle(CCTK_POINTER_TO_CONST GH,
                       CCTK_STRING coordname,
                       CCTK_STRING systemname)
 {
@@ -500,7 +504,7 @@ CCTK_INT Coord_CoordHandle(CCTK_POINTER_TO_CONST GH,
 }
 
  /*@@
-   @routine    Coord_GroupSystem
+   @routine    CoordBase_GroupSystem
    @date       28 July 2003
    @author     David Rideout
    @desc
@@ -508,7 +512,7 @@ CCTK_INT Coord_CoordHandle(CCTK_POINTER_TO_CONST GH,
                grid variables
    @enddesc
    @calls      CCTK_GroupTagsTable, CCTK_VWarn, Util_TableGetString,
-               Coord_SystemHandle, CCTK_GHExtension, CCTK_GroupIndex,
+               CoordBase_SystemHandle, CCTK_GHExtension, CCTK_GroupIndex,
                CCTK_GroupDimI
 
    @var        GH
@@ -533,7 +537,7 @@ CCTK_INT Coord_CoordHandle(CCTK_POINTER_TO_CONST GH,
    @endreturndesc
 @@*/
 
-CCTK_INT Coord_GroupSystem(CCTK_POINTER_TO_CONST GH,
+CCTK_INT CoordBase_GroupSystem(CCTK_POINTER_TO_CONST GH,
                       CCTK_STRING groupname)
 {
   int system_handle;
@@ -560,7 +564,7 @@ CCTK_INT Coord_GroupSystem(CCTK_POINTER_TO_CONST GH,
     if (Util_TableGetString(group_tags_table, longest_systemname,
                             system_name, "COORDSYSTEM") >= 0)
     {
-      system_handle = Coord_SystemHandle(GH, system_name);
+      system_handle = CoordBase_SystemHandle(GH, system_name);
       if (system_handle < 0)
       {
         CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING, "Coordinate system "
@@ -593,14 +597,14 @@ CCTK_INT Coord_GroupSystem(CCTK_POINTER_TO_CONST GH,
 }
 
  /*@@
-   @routine    Coord_SetDefaultSystem
+   @routine    CoordBase_SetDefaultSystem
    @date       28 July 2003
    @author     David Rideout
    @desc
                Set this coordinate system to be the default for grid functions
                of the same dimension
    @enddesc
-   @calls      CCTK_GHExtension, Coord_SystemHandle, CCTK_VWarn,
+   @calls      CCTK_GHExtension, CoordBase_SystemHandle, CCTK_VWarn,
                Util_TableGetInt
 
    @var        GH
@@ -627,7 +631,7 @@ CCTK_INT Coord_GroupSystem(CCTK_POINTER_TO_CONST GH,
    @endreturndesc
 @@*/
 
-CCTK_INT Coord_SetDefaultSystem(CCTK_POINTER_TO_CONST GH,
+CCTK_INT CoordBase_SetDefaultSystem(CCTK_POINTER_TO_CONST GH,
                            CCTK_STRING systemname)
 {
   int system_handle;
@@ -642,7 +646,7 @@ CCTK_INT Coord_SetDefaultSystem(CCTK_POINTER_TO_CONST GH,
   GHex = CCTK_GHExtension(GH,"CoordBase");
 
   /* Get coordinate system handle */
-  system_handle = Coord_SystemHandle(GH, systemname);
+  system_handle = CoordBase_SystemHandle(GH, systemname);
   if (system_handle<0)
   {
     CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING, "Invalid system name "
diff --git a/src/CoordBase.h b/src/CoordBase.h
index 007d628..b67b07c 100644
--- a/src/CoordBase.h
+++ b/src/CoordBase.h
@@ -11,32 +11,48 @@
 #ifndef _COORDBASE_H_
 #define _COORDBASE_H_
 
+#ifndef COORD_IN_COORDBASE
+
+/* Since some people may still be including this header file 
+ * rather than using the function aliasing, we need to 
+ * allow them access to the internal functions.
+ */
+
+#define Coord_SystemRegister CoordBase_SystemRegister
+#define Coord_SystemHandle CoordBase_SystemHandle
+#define Coord_CoordRegister CoordBase_CoordRegister
+#define Coord_CoordHandle CoordBase_CoordHandle
+#define Coord_GroupSystem CoordBase_GroupSystem
+#define Coord_SetDefaultSystem CoordBase_SetDefaultSystem
+
+#endif /* COORD_IN_COORDBASE */
+
 #ifdef __cplusplus 
 extern "C" 
 {
 #endif
 
-CCTK_INT Coord_SystemRegister(CCTK_POINTER_TO_CONST GH,
-                              CCTK_INT dim,
-                              CCTK_STRING systemname);
+CCTK_INT CoordBase_SystemRegister(CCTK_POINTER_TO_CONST GH,
+                                  CCTK_INT dim,
+                                  CCTK_STRING systemname);
 
-CCTK_INT Coord_SystemHandle(CCTK_POINTER_TO_CONST GH,
-                            CCTK_STRING systemname);
+CCTK_INT CoordBase_SystemHandle(CCTK_POINTER_TO_CONST GH,
+                                CCTK_STRING systemname);
 
-CCTK_INT Coord_CoordRegister(CCTK_POINTER_TO_CONST GH,
-                             CCTK_INT systemhandle,
-                             CCTK_INT direction,
-                             CCTK_STRING coordname);
+CCTK_INT CoordBase_CoordRegister(CCTK_POINTER_TO_CONST GH,
+                                 CCTK_INT systemhandle,
+                                 CCTK_INT direction,
+                                 CCTK_STRING coordname);
 
-CCTK_INT Coord_CoordHandle(CCTK_POINTER_TO_CONST GH,
-                           CCTK_STRING coordname,
-                           CCTK_STRING systemname);
+CCTK_INT CoordBase_CoordHandle(CCTK_POINTER_TO_CONST GH,
+                               CCTK_STRING coordname,
+                               CCTK_STRING systemname);
 
-CCTK_INT Coord_GroupSystem(CCTK_POINTER_TO_CONST GH,
-                           CCTK_STRING groupname);
+CCTK_INT CoordBase_GroupSystem(CCTK_POINTER_TO_CONST GH,
+                               CCTK_STRING groupname);
 
-CCTK_INT Coord_SetDefaultSystem(CCTK_POINTER_TO_CONST GH,
-                                CCTK_STRING systemname);
+CCTK_INT CoordBase_SetDefaultSystem(CCTK_POINTER_TO_CONST GH,
+                                    CCTK_STRING systemname);
 
 #ifdef __cplusplus 
 }