Changing some routine names.

Internal functions are CCTKi_

Utility functions are Util_


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

10 files changed, 73 insertions, 73 deletions

diff --git a/src/include/ActiveThorns.h b/src/include/ActiveThorns.h
index 9794f612..69e54e66 100644
--- a/src/include/ActiveThorns.h
+++ b/src/include/ActiveThorns.h
@@ -15,12 +15,12 @@
 extern "C" {
 #endif
 
-int CCTK_RegisterThorn(const char *name, const char *imp);
-int CCTK_ActivateThorn(const char *name);
+int CCTKi_RegisterThorn(const char *name, const char *imp);
+int CCTKi_ActivateThorn(const char *name);
 int CCTK_IsThornActive(const char *name);
 int CCTK_IsImplementationActive(const char *name);
-int CCTK_ListThorns(FILE *file, const char *format, int active);
-int CCTK_ListImplementations(FILE *file, const char *format, int active);
+int CCTKi_ListThorns(FILE *file, const char *format, int active);
+int CCTKi_ListImplementations(FILE *file, const char *format, int active);
 
 #ifdef __cplusplus 
 }
diff --git a/src/include/CCTK_Bindings.h b/src/include/CCTK_Bindings.h
index c182d3eb..6c9c4eac 100644
--- a/src/include/CCTK_Bindings.h
+++ b/src/include/CCTK_Bindings.h
@@ -15,13 +15,13 @@
 extern "C" {
 #endif
 
-int CCTK_BindingsParametersInitialise(void);
-int CCTK_BindingsVariablesInitialise(void);
-int CCTK_BindingsScheduleInitialise(void);
+int CCTKi_BindingsParametersInitialise(void);
+int CCTKi_BindingsVariablesInitialise(void);
+int CCTKi_BindingsScheduleInitialise(void);
 
-int CCTK_BindingsScheduleRegister(const char *type, void *data);
+int CCTKi_BindingsScheduleRegister(const char *type, void *data);
 
-int CCTK_BindingsParameterHelp(const char *identifier, const char *format, FILE *file);
+int CCTKi_BindingsParameterHelp(const char *identifier, const char *format, FILE *file);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/CactusrfrInterface.h b/src/include/CactusrfrInterface.h
index 2a9dbd25..0bd77ae6 100644
--- a/src/include/CactusrfrInterface.h
+++ b/src/include/CactusrfrInterface.h
@@ -14,21 +14,21 @@
 extern "C" {
 #endif
 
-int CCTK_rfrStorageOn(void *GH, int group);
+int CCTKi_rfrStorageOn(void *GH, int group);
 
-int CCTK_rfrStorageOff(void *GH, int group);
+int CCTKi_rfrStorageOff(void *GH, int group);
 
-int CCTK_rfrCommunicationOn(void *GH, int group);
+int CCTKi_rfrCommunicationOn(void *GH, int group);
 
-int CCTK_rfrCommunicationOff(void *GH, int group);
+int CCTKi_rfrCommunicationOff(void *GH, int group);
 
-int CCTK_rfrTriggerable(int variable);
+int CCTKi_rfrTriggerable(int variable);
 
-int CCTK_rfrTriggerSaysGo(void *GH, int variable);
+int CCTKi_rfrTriggerSaysGo(void *GH, int variable);
 
-int CCTK_rfrTriggerAction(void *GH, int group);
+int CCTKi_rfrTriggerAction(void *GH, int group);
 
-int CCTK_rfrCallFunc(void *GH, int language, void *function);
+int CCTKi_rfrCallFunc(void *GH, int language, void *function);
 
 
 #ifdef __cplusplus
diff --git a/src/include/CommandLine.h b/src/include/CommandLine.h
index 72286863..8c873d90 100644
--- a/src/include/CommandLine.h
+++ b/src/include/CommandLine.h
@@ -14,18 +14,18 @@
 extern "C" {
 #endif
 
-void CCTK_CommandLineTestThornCompiled(const char *optarg);
-void CCTK_CommandLineDescribeAllParameters(void);
-void CCTK_CommandLineDescribeParameter(const char *optarg);
-void CCTK_CommandLineTestParameters(const char *optarg);
-void CCTK_CommandLineWarningLevel(const char *optarg);
-void CCTK_CommandLineErrorLevel(const char *optarg);
-void CCTK_CommandLineRedirectStdout(void);
-void CCTK_CommandLineListThorns(void);
-void CCTK_CommandLineVersion(void);
-void CCTK_CommandLineHelp(void);
-void CCTK_CommandLineUsage(void);
-void CCTK_CommandLineFinished(void);
+void CCTKi_CommandLineTestThornCompiled(const char *optarg);
+void CCTKi_CommandLineDescribeAllParameters(void);
+void CCTKi_CommandLineDescribeParameter(const char *optarg);
+void CCTKi_CommandLineTestParameters(const char *optarg);
+void CCTKi_CommandLineWarningLevel(const char *optarg);
+void CCTKi_CommandLineErrorLevel(const char *optarg);
+void CCTKi_CommandLineRedirectStdout(void);
+void CCTKi_CommandLineListThorns(void);
+void CCTKi_CommandLineVersion(void);
+void CCTKi_CommandLineHelp(void);
+void CCTKi_CommandLineUsage(void);
+void CCTKi_CommandLineFinished(void);
 
 #ifdef __cplusplus 
 }
diff --git a/src/include/Dummies.h b/src/include/Dummies.h
index 76b06dde..b0801260 100644
--- a/src/include/Dummies.h
+++ b/src/include/Dummies.h
@@ -15,21 +15,21 @@
 extern "C" {
 #endif
 
-int CCTK_DummyStorageOn(void *GH, int group);
+int CCTKi_DummyStorageOn(void *GH, int group);
 
-int CCTK_DummyStorageOff(void *GH, int group);
+int CCTKi_DummyStorageOff(void *GH, int group);
 
-int CCTK_DummyCommunicationOn(void *GH, int group);
+int CCTKi_DummyCommunicationOn(void *GH, int group);
 
-int CCTK_DummyCommunicationOff(void *GH, int group);
+int CCTKi_DummyCommunicationOff(void *GH, int group);
 
-int CCTK_DummyTriggerable(int variable);
+int CCTKi_DummyTriggerable(int variable);
 
-int CCTK_DummyTriggerSaysGo(void *GH, int variable);
+int CCTKi_DummyTriggerSaysGo(void *GH, int variable);
 
-int CCTK_DummyTriggerAction(void *GH, int group);
+int CCTKi_DummyTriggerAction(void *GH, int group);
 
-int CCTK_DummyCallFunc(void *GH, int language, void *function);
+int CCTKi_DummyCallFunc(void *GH, int language, void *function);
 
 
 #ifdef __cplusplus
diff --git a/src/include/FortranString.h b/src/include/FortranString.h
index 6d413e4e..d2bcd9d6 100644
--- a/src/include/FortranString.h
+++ b/src/include/FortranString.h
@@ -28,19 +28,19 @@
     _fcd fcd_arg1, _fcd fcd_arg2, _fcd fcd_arg3
 #define ONE_FORTSTRING_CREATE(argn)\
        int len = _fcdlen(fcdarg); \
-       char *argn    = CCTK_NullTerminateString(_fcdtocp(fcdarg),len);;
+       char *argn    = Util_NullTerminateString(_fcdtocp(fcdarg),len);;
 #define TWO_FORTSTRINGS_CREATE(argn,argw)\
        int  nl    = _fcdlen(fcd_n);\
        int  wl    = _fcdlen(fcd_w);\
-       char *argn = CCTK_NullTerminateString(_fcdtocp(fcd_n),nl);\
-       char *argw = CCTK_NullTerminateString(_fcdtocp(fcd_w),wl);
+       char *argn = Util_NullTerminateString(_fcdtocp(fcd_n),nl);\
+       char *argw = Util_NullTerminateString(_fcdtocp(fcd_w),wl);
 #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
        int  narg1    = _fcdlen(fcd_arg1);\
        int  narg2    = _fcdlen(fcd_arg2);\
        int  narg3    = _fcdlen(fcd_arg3);\
-       char *arg1 = CCTK_NullTerminateString(_fcdtocp(fcd_arg1),narg1);\
-       char *arg2 = CCTK_NullTerminateString(_fcdtocp(fcd_arg2),narg2);\
-       char *arg3 = CCTK_NullTerminateString(_fcdtocp(fcd_arg3),narg3);
+       char *arg1 = Util_NullTerminateString(_fcdtocp(fcd_arg1),narg1);\
+       char *arg2 = Util_NullTerminateString(_fcdtocp(fcd_arg2),narg2);\
+       char *arg3 = Util_NullTerminateString(_fcdtocp(fcd_arg3),narg3);
 
 #elif defined WIN32
 
@@ -56,14 +56,14 @@
    unsigned int CCTK_len2,\
    unsigned int CCTK_len3
 #define ONE_FORTSTRING_CREATE(argn)\
-        char *argn = CCTK_NullTerminateString(n,nl);
+        char *argn = Util_NullTerminateString(n,nl);
 #define TWO_FORTSTRINGS_CREATE(argn,argw)\
-    char *argn = CCTK_NullTerminateString(n,nl);\
-    char *argw = CCTK_NullTerminateString(w,wl);
+    char *argn = Util_NullTerminateString(n,nl);\
+    char *argw = Util_NullTerminateString(w,wl);
 #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\
-   char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);\
-   char *arg3 = CCTK_NullTerminateString(CCTK_str3,CCTK_len3);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\
+   char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);\
+   char *arg3 = Util_NullTerminateString(CCTK_str3,CCTK_len3);
 
 #else
 
@@ -83,14 +83,14 @@
    unsigned int CCTK_len2,\
    unsigned int CCTK_len3
 #define ONE_FORTSTRING_CREATE(arg1)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);
 #define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\
-   char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\
+   char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);
 #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\
-   char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);\
-   char *arg3 = CCTK_NullTerminateString(CCTK_str3,CCTK_len3);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\
+   char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);\
+   char *arg3 = Util_NullTerminateString(CCTK_str3,CCTK_len3);
 
 #endif
 
diff --git a/src/include/GHExtensions.h b/src/include/GHExtensions.h
index 645c8558..04c57d15 100644
--- a/src/include/GHExtensions.h
+++ b/src/include/GHExtensions.h
@@ -24,13 +24,13 @@ int CCTK_RegisterGHExtensionInitGH(int handle, int (*func)(cGH *));
 
 int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int));
 
-int CCTK_SetupGHExtensions(tFleshConfig *config, 
+int CCTKi_SetupGHExtensions(tFleshConfig *config, 
 			   int convergence_level, 
 			   cGH *GH);
 
-int CCTK_InitGHExtensions(cGH *GH);
+int CCTKi_InitGHExtensions(cGH *GH);
 
-int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
+int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
 
 int CCTK_GHExtensionHandle(const char *name);
 
diff --git a/src/include/Misc.h b/src/include/Misc.h
index 35dc47d8..127c815b 100644
--- a/src/include/Misc.h
+++ b/src/include/Misc.h
@@ -19,14 +19,14 @@ int CCTK_SplitString(char **before, char **after, const char *string, const char
 
 int CCTK_Equals(const char *string1, const char *string2);
 
-char *CCTK_NullTerminateString(const char *, unsigned int);
+char *Util_NullTerminateString(const char *, unsigned int);
 
 int CCTK_InList(const char *string1, int n_elements, ...);
 
-int CCTK_IntInRange(int inval, const char *range);
-int CCTK_DoubleInRange(double inval, const char *range);
-int CCTK_IntInRangeList(int inval, int n_elements, ...);
-int CCTK_DoubleInRangeList(double inval, int n_elements, ...);
+int Util_IntInRange(int inval, const char *range);
+int Util_DoubleInRange(double inval, const char *range);
+int Util_IntInRangeList(int inval, int n_elements, ...);
+int Util_DoubleInRangeList(double inval, int n_elements, ...);
 
 int CCTK_SetDoubleInRangeList(CCTK_REAL *data, const char *value, 
 			      int n_elements, ...);
diff --git a/src/include/flesh.h b/src/include/flesh.h
index 8f99beec..107b71f5 100644
--- a/src/include/flesh.h
+++ b/src/include/flesh.h
@@ -92,7 +92,7 @@ int ProcessParameterDatabase(tFleshConfig *ConfigData);
 
 int CallStartupFunctions(tFleshConfig *ConfigData);
 
-int CCTK_AddGH(tFleshConfig *config, int convergence_level, cGH *GH);
+int CCTKi_AddGH(tFleshConfig *config, int convergence_level, cGH *GH);
 
 int CCTK_MaxDim(void);
 
@@ -104,7 +104,7 @@ int CCTK_VarTypeNumber(const char *type);
 
 int CCTK_GroupTypeNumber(const char *type);
 
-int CCTK_BindingsImplementationsInitialise(void);
+int CCTKi_BindingsImplementationsInitialise(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/rfrInterface.h b/src/include/rfrInterface.h
index 11eaba91..19d62e26 100644
--- a/src/include/rfrInterface.h
+++ b/src/include/rfrInterface.h
@@ -16,14 +16,14 @@
 extern "C" {
 #endif
 
-int CCTK_rfrTraverse(cGH *GH, int rfrpoint);
-int CCTK_rfrPrintTree(cGH *GH,void *rfr_top);
-int CCTK_rfrStorageOn(void *GH, int group);
-int CCTK_rfrStorageOff(void *GH, int group);
-int CCTK_rfrCommunicationOn(void *GH, int group);
-int CCTK_rfrCommunicationOff(void *GH, int group);
-int CCTK_rfrTriggerable(int entrypoint);
-int CCTK_rfrCallFunc(void *GH, int language, void *function);
+int CCTKi_rfrTraverse(cGH *GH, int rfrpoint);
+int CCTKi_rfrPrintTree(cGH *GH,void *rfr_top);
+int CCTKi_rfrStorageOn(void *GH, int group);
+int CCTKi_rfrStorageOff(void *GH, int group);
+int CCTKi_rfrCommunicationOn(void *GH, int group);
+int CCTKi_rfrCommunicationOff(void *GH, int group);
+int CCTKi_rfrTriggerable(int entrypoint);
+int CCTKi_rfrCallFunc(void *GH, int language, void *function);
 
 #ifdef __cplusplus
 }