diff options
Diffstat (limited to 'src/CoordBase.c')
| -rw-r--r-- | src/CoordBase.c | 36 |
1 files changed, 20 insertions, 16 deletions
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 " |