New names for many of the Group functions which are used by infrastructure

thorns and the flesh. The names should be more consistent now. You might
want to hold of from this update for a little while until all the thorn
changes are in.


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

9 files changed, 48 insertions, 45 deletions

diff --git a/src/include/Comm.h b/src/include/Comm.h
index ebcf2b19..b459b606 100644
--- a/src/include/Comm.h
+++ b/src/include/Comm.h
@@ -31,9 +31,9 @@ extern "C" {
 #undef OVERLOADABLE
 
 int CCTK_QueryGroupStorage(cGH *,const char *);
-int CCTK_QueryGroupStorage_ByIndex(cGH *,int);
+int CCTK_QueryGroupStorageI(cGH *,int);
 int *CCTK_ArrayGroupSize(cGH *,const char *,int);
-int *CCTK_ArrayGroupSize_ByIndex(cGH *,int,int);
+int *CCTK_ArrayGroupSizeI(cGH *,int,int);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/CommOverloadables.h b/src/include/CommOverloadables.h
index 08383f92..3669c082 100644
--- a/src/include/CommOverloadables.h
+++ b/src/include/CommOverloadables.h
@@ -30,8 +30,8 @@ OVERLOADABLE(DisableGroupComm)
 #undef ARGUMENTS
 #define ARGUMENTS cGH *GH
 OVERLOADABLE(Barrier)
-OVERLOADABLE(GetMyProc)
-OVERLOADABLE(GetnProcs)
+OVERLOADABLE(MyProc)
+OVERLOADABLE(nProcs)
 
 #undef ARGUMENTS
 
@@ -62,13 +62,13 @@ OVERLOADABLE(SetupGH)
 #define ARGUMENTS cGH *GH, int group, const char *groupname, int dir
 #undef RETURN_TYPE 
 #define RETURN_TYPE int *
-OVERLOADABLE(ArrayGroupSize_ByBoth)
+OVERLOADABLE(ArrayGroupSizeB)
 
 #undef ARGUMENTS
 #define ARGUMENTS cGH *GH, int group, const char *groupname
 #undef RETURN_TYPE
 #define RETURN_TYPE int
-OVERLOADABLE(QueryGroupStorage_ByBoth)
+OVERLOADABLE(QueryGroupStorageB)
 
 #undef ARGUMENTS
 #undef RETURN_TYPE
diff --git a/src/include/GHExtensions.h b/src/include/GHExtensions.h
index c94458fe..645c8558 100644
--- a/src/include/GHExtensions.h
+++ b/src/include/GHExtensions.h
@@ -32,7 +32,7 @@ int CCTK_InitGHExtensions(cGH *GH);
 
 int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
 
-int CCTK_GetGHExtensionHandle(const char *name);
+int CCTK_GHExtensionHandle(const char *name);
 
 
 #ifdef __cplusplus
diff --git a/src/include/Groups.h b/src/include/Groups.h
index a76e55e4..8cd9ef5d 100644
--- a/src/include/Groups.h
+++ b/src/include/Groups.h
@@ -26,55 +26,55 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
 		     int n_variables,
 		     ...);
 
-int CCTK_GetGroupIndex(const char *groupname);
+int CCTK_GroupIndex(const char *groupname);
 
-int CCTK_GetVarIndex(const char *variablename);
+int CCTK_VarIndex(const char *variablename);
 
-char *CCTK_GetGroupNameFromVar_ByIndex(int var);
+char *CCTK_GroupNameFromVarI(int var);
 
-int CCTK_GetGroupIndexFromVar_ByIndex(int var);
+int CCTK_GroupIndexFromVarI(int var);
 
-char *CCTK_GetFullName(int var);
+char *CCTK_FullName(int var);
 
-char *CCTK_GetImplementationFromVar(int var);
+char *CCTK_ImpFromVarI(int var);
 
-int CCTK_GetMaxDim(void);
+int CCTK_MaxDim(void);
 
-int CCTK_GetNumVars(void);
+int CCTK_NumVars(void);
 
-int CCTK_GetNumGroups(void);
+int CCTK_NumGroups(void);
 
-int CCTK_GTypeNumber(const char *type);
+int CCTK_GroupTypeNumber(const char *type);
 
-int CCTK_VTypeNumber(const char *type);
+int CCTK_VarTypeNumber(const char *type);
 
-int CCTK_GScopeNumber(const char *type);
+int CCTK_GroupScopeNumber(const char *type);
 
-int CCTK_GetGroupData(int group, 
+int CCTK_GroupData(int group, 
 		      int *gtype, 
 		      int *vtype, 
 		      int *dim, 
 		      int *n_variables,
 		      int *n_timelevels);
 
-char *CCTK_GetVarName(int varnum);
+char *CCTK_VarName(int varnum);
 
 int CCTK_DecomposeName(const char *fullname, char **implementation, char **name);
 
-char *CCTK_GetGroupName(int varnum);
+char *CCTK_GroupName(int varnum);
 
-int CCTK_GetVarGType(int var);
+int CCTK_GroupTypeFromVar(int var);
 
-int CCTK_GetVarVType(int var);
+int CCTK_VarType(int var);
 
-int CCTK_GetNumTimeLevels(const char *var);
-int CCTK_GetNumTimeLevels_ByIndex(int var);
+int CCTK_NumTimeLevelsFromVar(const char *var);
+int CCTK_NumTimeLevelsFromVarI(int var);
 
-int CCTK_GetFirstVarIndex(const char *group);
-int CCTK_GetFirstVarIndex_ByIndex(int group);
+int CCTK_FirstVarIndex(const char *group);
+int CCTK_FirstVarIndexI(int group);
 
-int CCTK_GetNumVarsInGroup(const char *group);
-int CCTK_GetNumVarsInGroup_ByIndex(int group);
+int CCTK_NumVarsInGroup(const char *group);
+int CCTK_NumVarsInGroupI(int group);
 
 #ifdef __cplusplus 
 }
diff --git a/src/include/GroupsOnGH.h b/src/include/GroupsOnGH.h
index 5fef7185..9c2c9288 100644
--- a/src/include/GroupsOnGH.h
+++ b/src/include/GroupsOnGH.h
@@ -17,11 +17,11 @@
 extern "C" {
 #endif
 
-void *CCTK_GetVarDataPtr_ByName(cGH *GH, int timelevel, char *fullvarname);
+void *CCTK_VarDataPtr(cGH *GH, int timelevel, char *fullvarname);
 
-void *CCTK_GetVarDataPtr_ByIndex(cGH *GH, int timelevel, int varindex);
+void *CCTK_VarDataPtrI(cGH *GH, int timelevel, int varindex);
 
-void *CCTK_GetVarDataPtr(cGH *GH, int timelevel, int varindex, char *fullvarname);
+void *CCTK_VarDataPtrB(cGH *GH, int timelevel, int varindex, char *fullvarname);
 
 #ifdef __cplusplus 
 }
diff --git a/src/include/OverloadMacros.h b/src/include/OverloadMacros.h
index dd149197..dd09bd2c 100644
--- a/src/include/OverloadMacros.h
+++ b/src/include/OverloadMacros.h
@@ -37,9 +37,12 @@ int CCTK_Overload##name(RETURN_TYPE (*func)(ARGUMENTS))           \
   }                                                               \
   else                                                            \
   {                                                               \
-     fprintf(stderr,                                              \
+     char *message = malloc( (200+strlen(#name))*sizeof(char) );  \
+     sprintf(message,                                             \
 	     "Warning: Attempted to overload function %s twice\n",\
              #name);                                              \
+     CCTK_Warn(1,__LINE__,__FILE__,"Cactus",message);             \
+     free(message);                                               \
      return_code = 0;                                             \
   }                                                               \
                                                                   \
diff --git a/src/include/Reduction.h b/src/include/Reduction.h
index fc1c7af9..bf4ffda9 100644
--- a/src/include/Reduction.h
+++ b/src/include/Reduction.h
@@ -34,7 +34,7 @@ int CCTK_Reduce(cGH *GH,
 		void *out_vals,
 		int num_in_fields, ...);
 
-int CCTK_GetReductionHandle(const char *reduction);
+int CCTK_ReductionHandle(const char *reduction);
 
 int CCTK_RegisterReductionOperator(void (*function)(REGISTER_ARGLIST),
 				   const char *name);
diff --git a/src/include/StoreVariableData.h b/src/include/StoreVariableData.h
index 9529d770..b0bfc5da 100644
--- a/src/include/StoreVariableData.h
+++ b/src/include/StoreVariableData.h
@@ -12,18 +12,18 @@ cGroupDefinition *CCTK_SetupGroup(const char *implementation,
 				  const char *name, 
 				  int n_variables);
 
-int CCTK_GetGroupNumber(const char *implementation,
+int CCTK_GroupNumber(const char *implementation,
 			const char *name);
 
 
-int CCTK_GetVariableNumber(const char *implementation,
+int CCTK_VarNumber(const char *implementation,
 			   const char *group_name,
 			   const char *variable_name);
 
-int CCTK_GetMaxDim(void);
+int CCTK_MaxDim(void);
 
-int CCTK_GetNVariables(void);
+int CCTK_NumVars(void);
 
-int CCTK_GetNGroups(void);
+int CCTK_NumGroups(void);
 
 
diff --git a/src/include/flesh.h b/src/include/flesh.h
index 589c9b2b..8f99beec 100644
--- a/src/include/flesh.h
+++ b/src/include/flesh.h
@@ -94,15 +94,15 @@ int CallStartupFunctions(tFleshConfig *ConfigData);
 
 int CCTK_AddGH(tFleshConfig *config, int convergence_level, cGH *GH);
 
-int CCTK_GetMaxDim(void);
+int CCTK_MaxDim(void);
 
-int CCTK_GetNVariables(void);
+int CCTK_NumVars(void);
 
-int CCTK_GetNGroups(void);
+int CCTK_NumGroups(void);
 
-int CCTK_VTypeNumber(const char *type);
+int CCTK_VarTypeNumber(const char *type);
 
-int CCTK_GTypeNumber(const char *type);
+int CCTK_GroupTypeNumber(const char *type);
 
 int CCTK_BindingsImplementationsInitialise(void);