Routine name changes

git-svn-id: http://svn.cactuscode.org/flesh/trunk@781 17b73243-c579-4c4c-a9d2-2d5706c11dac

7 files changed, 50 insertions, 40 deletions

diff --git a/src/main/ActiveThorns.c b/src/main/ActiveThorns.c
index da012c09..3103c526 100644
--- a/src/main/ActiveThorns.c
+++ b/src/main/ActiveThorns.c
@@ -19,7 +19,7 @@ static char *rcsid = "$Header$";
 
 
 /* Local routine */
-static int CCTKi_RegisterImp(const char *name, const char *thorn);
+static int CCTK_RegisterImp(const char *name, const char *thorn);
 
 /* Structures used to store data */
 struct THORN
@@ -92,7 +92,7 @@ int CCTKi_RegisterThorn(const char *name, const char *imp)
 	{
 
 	  /* Register the implementation */
-	  CCTKi_RegisterImp(imp, name);
+	  CCTK_RegisterImp(imp, name);
 
 	  retval = 0;
 	}
@@ -133,7 +133,7 @@ int CCTKi_RegisterThorn(const char *name, const char *imp)
    @endhistory 
 
 @@*/
-static int CCTKi_RegisterImp(const char *name, const char *thorn)
+static int CCTK_RegisterImp(const char *name, const char *thorn)
 {
   int retval;
   t_sktree *node;
diff --git a/src/main/Banner.c b/src/main/Banner.c
index 12912476..0909f6d3 100644
--- a/src/main/Banner.c
+++ b/src/main/Banner.c
@@ -18,7 +18,7 @@ static char *rcsis = "$Header$";
 static int number_banners = 0;
 static const char **banner_strings;
 
-void CCTKi_PrintBanners(void);
+void CCTK_PrintBanners(void);
 
 
  /*@@
@@ -66,7 +66,7 @@ void CCTK_RegisterBanner(const char *string)
 
 
  /*@@
-   @routine    CCTKi_PrintBanners
+   @routine    CCTK_PrintBanners
    @date       July 16 00:11:26 1999
    @author     Gabrielle Allen
    @desc 
@@ -80,7 +80,7 @@ void CCTK_RegisterBanner(const char *string)
    @endvar 
 @@*/
 
-void CCTKi_PrintBanners(void)
+void CCTK_PrintBanners(void)
 {
 
   DECLARE_CCTK_PARAMETERS
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 0a70da4e..eca02301 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -48,7 +48,7 @@ int CactusDefaultInitialise(tFleshConfig *config)
   cGH *GH;
   int convergence_level;
 
-  CCTKi_PrintBanners();
+  CCTK_PrintBanners();
 
   CactusResetTimer(config->timer[INITIALISATION]);
   CactusResetTimer(config->timer[EVOLUTION]);
diff --git a/src/main/CommandLine.c b/src/main/CommandLine.c
index 6a73ca51..80418cdc 100644
--- a/src/main/CommandLine.c
+++ b/src/main/CommandLine.c
@@ -114,7 +114,7 @@ void CCTKi_CommandLineWarningLevel(const char *optarg)
 
   warninglevel = atoi(optarg);
 
-  CCTKi_SetWarnLevel(warninglevel);
+  CCTK_SetWarnLevel(warninglevel);
 
 }
 
@@ -138,7 +138,7 @@ void CCTKi_CommandLineErrorLevel(const char *optarg)
 
   errorlevel = atoi(optarg);
 
-  CCTKi_SetErrorLevel(errorlevel);
+  CCTK_SetErrorLevel(errorlevel);
 
 }
 
diff --git a/src/main/Coord.c b/src/main/Coord.c
index b7e10b60..82e2a66a 100644
--- a/src/main/Coord.c
+++ b/src/main/Coord.c
@@ -189,6 +189,16 @@ int CCTK_RegisterCoord(const char *coordname,
 }
 
 
+int CCTK_RegisterCoordRange(cGH *GH, CCTK_REAL min, CCTK_REAL max, 
+			    const char *coordname)
+{
+  int retval;
+  
+  return retval;
+
+}
+
+
 int CCTK_CoordIndex(const char *name)
 {
   int handle;
diff --git a/src/main/Groups.c b/src/main/Groups.c
index 5c48fe32..73eac32b 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -42,7 +42,7 @@ static int maxdim = 0;
 int _cctk_one = 1;
 
 
-cGroupDefinition *CCTKi_SetupGroup(const char *implementation, const char *group_name, int n_variables);
+cGroupDefinition *CCTK_SetupGroup(const char *implementation, const char *group_name, int n_variables);
 
 
 
@@ -122,7 +122,7 @@ int CCTK_GroupIndex(const char *fullgroupname)
 
 
  /*@@
-   @routine    CCTKi_CreateGroup
+   @routine    CCTK_CreateGroup
    @date       Thu Jan 14 15:25:54 1999
    @author     Tom Goodale
    @desc 
@@ -135,7 +135,7 @@ int CCTK_GroupIndex(const char *fullgroupname)
    @endhistory 
 
 @@*/
-int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
+int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
 		     const char *gtype,
 		     const char *vtype,
 		     const char *gscope,
@@ -156,26 +156,26 @@ int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
   retval = 0;
 
   /* Allocate storage for the group */
-  groupscope = CCTKi_GroupScopeNumber(gscope);
+  groupscope = CCTK_GroupScopeNumber(gscope);
   if (groupscope == GROUP_PUBLIC || groupscope == GROUP_PROTECTED)
   {
-    group = CCTKi_SetupGroup(imp, gname, n_variables);
+    group = CCTK_SetupGroup(imp, gname, n_variables);
   }
   else if (groupscope == GROUP_PRIVATE)
   {
-    group = CCTKi_SetupGroup(thorn, gname, n_variables);
+    group = CCTK_SetupGroup(thorn, gname, n_variables);
   }
   else
   {
-    CCTK_WARN(1,"Unrecognised group scope in CCTKi_CreateGroup");
+    CCTK_WARN(1,"Unrecognised group scope in CCTK_CreateGroup");
   }
 
   /* Allocate storage for the group and setup some stuff. */
   if(group)
   {
     group->dim = dimension;
-    group->gtype = CCTKi_GroupTypeNumber(gtype);
-    group->vtype = CCTKi_VarTypeNumber(vtype);
+    group->gtype = CCTK_GroupTypeNumber(gtype);
+    group->vtype = CCTK_VarTypeNumber(vtype);
     group->gscope = groupscope;
 
     group->n_timelevels = ntimelevels;
@@ -217,7 +217,7 @@ int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
 
   if(retval)
   {
-    fprintf(stderr, "Error %d in CCTKi_CreateGroup\n", retval);
+    fprintf(stderr, "Error %d in CCTK_CreateGroup\n", retval);
   }
 
 #ifdef DEBUG_GROUPS
@@ -233,7 +233,7 @@ int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
 }
 
  /*@@
-   @routine    CCTKi_SetupGroup
+   @routine    CCTK_SetupGroup
    @date       Thu Jan 14 16:38:40 1999
    @author     Tom Goodale
    @desc 
@@ -246,7 +246,7 @@ int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
    @endhistory 
 
 @@*/
-cGroupDefinition *CCTKi_SetupGroup(const char *implementation, 
+cGroupDefinition *CCTK_SetupGroup(const char *implementation, 
 				  const char *name, 
 				  int n_variables)
 {
@@ -697,7 +697,7 @@ char *CCTK_FullName(int var)
 
 
  /*@@
-   @routine    CCTKi_GroupTypeNumber
+   @routine    CCTK_GroupTypeNumber
    @date       Mon Feb  8 14:44:45 1999
    @author     Tom Goodale
    @desc 
@@ -711,7 +711,7 @@ char *CCTK_FullName(int var)
 
 @@*/
 
-int CCTKi_GroupTypeNumber(const char *type)
+int CCTK_GroupTypeNumber(const char *type)
 {
   int retval=-1;
 
@@ -733,16 +733,16 @@ int CCTKi_GroupTypeNumber(const char *type)
   return retval;
 }
 
-void  FMODIFIER FORTRAN_NAME(CCTKi_GroupTypeNumber)(int *number,ONE_FORTSTRING_ARG)
+void  FMODIFIER FORTRAN_NAME(CCTK_GroupTypeNumber)(int *number,ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(type)
-  *number = CCTKi_GroupTypeNumber(type);
+  *number = CCTK_GroupTypeNumber(type);
   free(type);
 }
 
 
  /*@@
-   @routine    CCTKi_VarTypeNumber
+   @routine    CCTK_VarTypeNumber
    @date       Mon Feb  8 14:44:45 1999
    @author     Tom Goodale
    @desc 
@@ -755,7 +755,7 @@ void  FMODIFIER FORTRAN_NAME(CCTKi_GroupTypeNumber)(int *number,ONE_FORTSTRING_A
    @endhistory 
 
 @@*/
-int CCTKi_VarTypeNumber(const char *type)
+int CCTK_VarTypeNumber(const char *type)
 {
   int retval=-1;
 
@@ -782,16 +782,16 @@ int CCTKi_VarTypeNumber(const char *type)
   return retval;
 }
 
-void  FMODIFIER FORTRAN_NAME(CCTKi_VarTypeNumber)(int *number,ONE_FORTSTRING_ARG)
+void  FMODIFIER FORTRAN_NAME(CCTK_VarTypeNumber)(int *number,ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(type)
-  *number = CCTKi_VarTypeNumber(type);
+  *number = CCTK_VarTypeNumber(type);
   free(type);
 }
 
 
  /*@@
-   @routine    CCTKi_GroupScopeNumber
+   @routine    CCTK_GroupScopeNumber
    @date       Tuesday June 22 1999
    @author     Gabrielle Allen
    @desc 
@@ -804,7 +804,7 @@ void  FMODIFIER FORTRAN_NAME(CCTKi_VarTypeNumber)(int *number,ONE_FORTSTRING_ARG
    @endhistory 
 
 @@*/
-int CCTKi_GroupScopeNumber(const char *type)
+int CCTK_GroupScopeNumber(const char *type)
 {
   int retval=-1;
 
@@ -826,10 +826,10 @@ int CCTKi_GroupScopeNumber(const char *type)
   return retval;
 }
 
-void  FMODIFIER FORTRAN_NAME(CCTKi_GroupScopeNumber)(int *number,ONE_FORTSTRING_ARG)
+void  FMODIFIER FORTRAN_NAME(CCTK_GroupScopeNumber)(int *number,ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(type)
-  *number = CCTKi_GroupScopeNumber(type);
+  *number = CCTK_GroupScopeNumber(type);
   free(type);
 }
 
@@ -1053,7 +1053,7 @@ void  FMODIFIER FORTRAN_NAME(CCTK_NumVarsInGroup)(int *num,ONE_FORTSTRING_ARG)
 
 
  /*@@
-   @routine    CCTKi_GroupTypeFromVarI
+   @routine    CCTK_GroupTypeFromVarI
    @date       
    @author     
    @desc 
diff --git a/src/main/WarnLevel.c b/src/main/WarnLevel.c
index 16d52f96..ea905ddf 100644
--- a/src/main/WarnLevel.c
+++ b/src/main/WarnLevel.c
@@ -38,7 +38,7 @@ static int warning_level = 1;
 static int error_level    = 0;
 
  /*@@
-   @routine    CCTKi_SetWarnLevel
+   @routine    CCTK_SetWarnLevel
    @date       Wed Feb 17 00:42:16 1999
    @author     Tom Goodale
    @desc 
@@ -51,7 +51,7 @@ static int error_level    = 0;
    @endhistory 
 
 @@*/
-int CCTKi_SetWarnLevel(int level)
+int CCTK_SetWarnLevel(int level)
 {
   int retval;
   int old_level;
@@ -213,7 +213,7 @@ int FMODIFIER FORTRAN_NAME(CCTK_Info)(TWO_FORTSTRINGS_ARGS)
 
 
  /*@@
-   @routine    CCTKi_SetErrorLevel
+   @routine    CCTK_SetErrorLevel
    @date       Wed Feb 17 00:48:02 1999
    @author     Tom Goodale
    @desc 
@@ -226,7 +226,7 @@ int FMODIFIER FORTRAN_NAME(CCTK_Info)(TWO_FORTSTRINGS_ARGS)
    @endhistory 
 
 @@*/
-int CCTKi_SetErrorLevel(int level)
+int CCTK_SetErrorLevel(int level)
 {
   int retval;
   int old_level;
@@ -309,7 +309,7 @@ void CCTKi_FinaliseParamWarn(void)
 }
 
  /*@@
-   @routine    CCTKi_NotYetImplemented
+   @routine    CCTK_NotYetImplemented
    @date       July 1999
    @author     Gabrielle Allen
    @desc 
@@ -323,7 +323,7 @@ void CCTKi_FinaliseParamWarn(void)
 
 @@*/
 
-void CCTKi_NotYetImplemented(void)
+void CCTK_NotYetImplemented(void)
 {
 
 printf("\n\n This planned feature is not yet implemented in the code.\n If you need this feature please contact the Cactus maintainers.\n");