summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/IO/IOMethods.c10
-rw-r--r--src/comm/CactusComm.c12
-rw-r--r--src/comm/CactusDefaultComm.c20
-rw-r--r--src/comm/OverloadComm.c16
-rw-r--r--src/comm/Reduction.c12
-rw-r--r--src/include/Comm.h4
-rw-r--r--src/include/CommOverloadables.h8
-rw-r--r--src/include/GHExtensions.h2
-rw-r--r--src/include/Groups.h46
-rw-r--r--src/include/GroupsOnGH.h6
-rw-r--r--src/include/OverloadMacros.h5
-rw-r--r--src/include/Reduction.h2
-rw-r--r--src/include/StoreVariableData.h10
-rw-r--r--src/include/flesh.h10
-rw-r--r--src/main/CactusDefaultShutdown.c2
-rw-r--r--src/main/Coord.c4
-rw-r--r--src/main/GHExtensions.c4
-rw-r--r--src/main/Groups.c182
-rw-r--r--src/main/GroupsOnGH.c22
-rw-r--r--src/main/rfrInterface.c8
20 files changed, 194 insertions, 191 deletions
diff --git a/src/IO/IOMethods.c b/src/IO/IOMethods.c
index fcd1d938..9f2b2770 100644
--- a/src/IO/IOMethods.c
+++ b/src/IO/IOMethods.c
@@ -726,8 +726,8 @@ int CCTK_rfrTriggerSaysGo(cGH *GH, int variable)
time to output the trigger
@enddesc
@calls CCTK_GetHandledData
- CCTK_GetFullName
- CCTK_GetVarName
+ CCTK_FullName
+ CCTK_VarName
IOMethod->TimeToOutput
IOMethod->OutputVarAs
@history
@@ -767,8 +767,8 @@ int CCTK_rfrTriggerAction(void *GH, int variable)
int nmethods;
struct IOMethod *method;
- fullvarname = CCTK_GetFullName(variable);
- varname = CCTK_GetVarName(variable);
+ fullvarname = CCTK_FullName(variable);
+ varname = CCTK_VarName(variable);
/* Count the number of methods used */
nmethods = 0;
@@ -792,7 +792,7 @@ int CCTK_rfrTriggerAction(void *GH, int variable)
{
/* There are no methods left */
- /* This was assigned by CCTK_GetFullName */
+ /* This was assigned by CCTK_FullName */
free(fullvarname);
return nmethods;
diff --git a/src/comm/CactusComm.c b/src/comm/CactusComm.c
index e26915b4..d498bdd7 100644
--- a/src/comm/CactusComm.c
+++ b/src/comm/CactusComm.c
@@ -7,22 +7,22 @@
#include "Comm.h"
#include "GHExtensions.h"
-int *CCTK_ArrayGroupSize_ByIndex(cGH *GH, int index, int dir)
+int *CCTK_ArrayGroupSizeI(cGH *GH, int index, int dir)
{
- return CCTK_ArrayGroupSize_ByBoth(GH,index,NULL,dir);
+ return CCTK_ArrayGroupSizeB(GH,index,NULL,dir);
}
int *CCTK_ArrayGroupSize(cGH *GH, const char *groupname, int dir)
{
- return CCTK_ArrayGroupSize_ByBoth(GH,-1,groupname,dir);
+ return CCTK_ArrayGroupSizeB(GH,-1,groupname,dir);
}
-int CCTK_QueryGroupStorage_ByIndex(cGH *GH, int index)
+int CCTK_QueryGroupStorageI(cGH *GH, int index)
{
- return CCTK_QueryGroupStorage_ByBoth(GH,index , NULL);
+ return CCTK_QueryGroupStorageB(GH,index , NULL);
}
int CCTK_QueryGroupStorage(cGH *GH, const char *groupname)
{
- return CCTK_QueryGroupStorage_ByBoth(GH, -1, groupname);
+ return CCTK_QueryGroupStorageB(GH, -1, groupname);
}
diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index 781d4a49..a9d569f9 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -81,7 +81,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
if(thisGH)
{
- thisGH->cctk_dim = CCTK_GetMaxDim();
+ thisGH->cctk_dim = CCTK_MaxDim();
/* Need this to be at least one otherwise the memory allocation will fail. */
if(thisGH->cctk_dim == 0) thisGH->cctk_dim = 1;
@@ -102,7 +102,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
thisGH->cctk_delta_time = 1;
thisGH->cctk_convlevel = 1;
- n_variables = CCTK_GetNumVars();
+ n_variables = CCTK_NumVars();
/* Allocate memory for the variable data pointers.
* Note we want at least one to prevent memory allocattion from failing !
@@ -113,7 +113,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
{
for(variable = 0; variable < n_variables; variable++)
{
- ntimelevels = CCTK_GetNumTimeLevels_ByIndex(variable);
+ ntimelevels = CCTK_NumTimeLevelsFromVarI(variable);
thisGH->data[variable] = (void **)malloc(ntimelevels*sizeof(void *));
if(thisGH->data[variable])
@@ -135,7 +135,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
/* Allocate memory for the group data pointers.
* Note we want at least one to prevent memory allocattion from failing !
*/
- n_groups = CCTK_GetNumGroups();
+ n_groups = CCTK_NumGroups();
thisGH->GroupData = (cGHGroupData *)malloc((n_groups ? n_groups:1)*sizeof(cGHGroupData));
}
@@ -166,11 +166,11 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
}
/*@@
- @routine CactusDefaultGetMyProc
+ @routine CactusDefaultMyProc
@date Tue Jan 23 1999
@author Gabrielle Allen
@desc
- Default cactus GetMyProc routine.
+ Default cactus MyProc routine.
@enddesc
@calls
@calledby
@@ -180,7 +180,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
@@*/
-int CactusDefaultGetMyProc(cGH *GH)
+int CactusDefaultMyProc(cGH *GH)
{
int myproc;
@@ -197,11 +197,11 @@ int CactusDefaultGetMyProc(cGH *GH)
}
/*@@
- @routine CactusDefaultGetnProcs
+ @routine CactusDefaultnProcs
@date Tue Jan 23 1999
@author Gabrielle Allen
@desc
- Default cactus GetnProcs routine.
+ Default cactus nProcs routine.
@enddesc
@calls
@calledby
@@ -211,7 +211,7 @@ int CactusDefaultGetMyProc(cGH *GH)
@@*/
-int CactusDefaultGetnProcs(cGH *GH)
+int CactusDefaultnProcs(cGH *GH)
{
int nprocs;
diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c
index 97a19679..cf4bed3b 100644
--- a/src/comm/OverloadComm.c
+++ b/src/comm/OverloadComm.c
@@ -23,15 +23,15 @@ static char *rcsid="$Header$";
/* Deal seperately with the SetupGH routine */
#define CCTK_DummySetupGH CactusDefaultSetupGH
-#define CCTK_DummyGetMyProc CactusDefaultGetMyProc
-#define CCTK_DummyGetnProcs CactusDefaultGetnProcs
+#define CCTK_DummyMyProc CactusDefaultMyProc
+#define CCTK_DummynProcs CactusDefaultnProcs
#include "CommOverloadables.h"
/* Reset the #define to prevent complications. */
#undef CCTK_DummySetupGH
-#undef CCTK_DummyGetMyProc
-#undef CCTK_DummyGetnProcs
+#undef CCTK_DummyMyProc
+#undef CCTK_DummynProcs
#undef OVERLOADABLE
@@ -66,15 +66,15 @@ int SetupCommFunctions(void)
/* Deal seperately with the SetupGH routine */
#define CCTK_DummySetupGH CactusDefaultSetupGH
-#define CCTK_DummyGetMyProc CactusDefaultGetMyProc
-#define CCTK_DummyGetnProcs CactusDefaultGetnProcs
+#define CCTK_DummyMyProc CactusDefaultMyProc
+#define CCTK_DummynProcs CactusDefaultnProcs
#include "CommOverloadables.h"
/* Reset the #define to prevent complications. */
#undef CCTK_DummySetupGH
-#undef CCTK_DummyGetMyProc
-#undef CCTK_DummyGetnProcs
+#undef CCTK_DummyMyProc
+#undef CCTK_DummynProcs
#undef OVERLOADABLE
diff --git a/src/comm/Reduction.c b/src/comm/Reduction.c
index e5324023..9fe386bd 100644
--- a/src/comm/Reduction.c
+++ b/src/comm/Reduction.c
@@ -88,7 +88,7 @@ int CCTK_RegisterReductionOperator(void (*function)(REGISTER_ARGLIST),
/*@@
- @routine CCTK_GetReductionHandle
+ @routine CCTK_ReductionHandle
@date April 28 1999
@author Gabrielle Allen
@desc
@@ -102,7 +102,7 @@ int CCTK_RegisterReductionOperator(void (*function)(REGISTER_ARGLIST),
@endvar
@@*/
-int CCTK_GetReductionHandle(const char *reduction)
+int CCTK_ReductionHandle(const char *reduction)
{
int handle;
@@ -112,8 +112,8 @@ int CCTK_GetReductionHandle(const char *reduction)
#ifdef DEBUG_REDUCTION
CCTK_PRINTSEPARATOR
- printf("In CCTK_GetReductionHandle\n");
- printf("--------------------------\n");
+ printf("In CCTK_ReductionHandle\n");
+ printf("-----------------------\n");
printf(" Got handle %d for %s\n",handle,reduction);
CCTK_PRINTSEPARATOR
#endif
@@ -125,10 +125,10 @@ int CCTK_GetReductionHandle(const char *reduction)
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetReductionHandle)(int *handle, ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_ReductionHandle)(int *handle, ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(reduction)
- *handle = CCTK_GetReductionHandle(reduction);
+ *handle = CCTK_ReductionHandle(reduction);
free(reduction);
}
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);
diff --git a/src/main/CactusDefaultShutdown.c b/src/main/CactusDefaultShutdown.c
index b3f8d92d..edb386e1 100644
--- a/src/main/CactusDefaultShutdown.c
+++ b/src/main/CactusDefaultShutdown.c
@@ -57,7 +57,7 @@ int CactusDefaultShutdown(tFleshConfig *config)
{
int myproc;
- myproc = CCTK_GetMyProc(config->GH[0]);
+ myproc = CCTK_MyProc(config->GH[0]);
#ifdef MPI
if(MPI_Active)
diff --git a/src/main/Coord.c b/src/main/Coord.c
index d332d096..59121ab0 100644
--- a/src/main/Coord.c
+++ b/src/main/Coord.c
@@ -128,7 +128,7 @@ int CCTK_RegisterCoord_ByIndex(const char *name, int index, int dir)
Register a GF as a coordinate with a name and
a direction.
@enddesc
- @calls CCTK_RegisterCoord_ByIndex, CCTK_GetVarIndex
+ @calls CCTK_RegisterCoord_ByIndex, CCTK_VarIndex
@var name
@vdesc Name coordinate is registered as
@@ -169,7 +169,7 @@ int CCTK_RegisterCoord(const char *coordname,
int retval;
int index;
- index = CCTK_GetVarIndex(gfname);
+ index = CCTK_VarIndex(gfname);
if (index >= 0)
{
diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c
index 8b6a360d..7331169b 100644
--- a/src/main/GHExtensions.c
+++ b/src/main/GHExtensions.c
@@ -433,7 +433,7 @@ static int CheckAllExtensionsSetup(void)
************************************************************************/
/*@@
- @routine CCTK_GetGHExtensionHandle
+ @routine CCTK_GHExtensionHandle
@date Tue Feb 9 18:23:41 1999
@author Tom Goodale
@desc
@@ -446,7 +446,7 @@ static int CheckAllExtensionsSetup(void)
@endhistory
@@*/
-int CCTK_GetGHExtensionHandle(const char *name)
+int CCTK_GHExtensionHandle(const char *name)
{
return CCTK_GetHandle(GHExtensions, name, NULL);
}
diff --git a/src/main/Groups.c b/src/main/Groups.c
index 5fbc5f47..1f22aa22 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -47,7 +47,7 @@ cGroupDefinition *CCTK_SetupGroup(const char *implementation, const char *group_
/*@@
- @routine CCTK_GetGroupIndex
+ @routine CCTK_GroupIndex
@date Fri Jan 29 08:43:48 1999
@author Tom Goodale
@desc
@@ -61,7 +61,7 @@ cGroupDefinition *CCTK_SetupGroup(const char *implementation, const char *group_
@@*/
-int CCTK_GetGroupIndex(const char *fullgroupname)
+int CCTK_GroupIndex(const char *fullgroupname)
{
int group_num;
int retval=-1;
@@ -156,7 +156,7 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
retval = 0;
/* Allocate storage for the group */
- groupscope = CCTK_GScopeNumber(gscope);
+ groupscope = CCTK_GroupScopeNumber(gscope);
if (groupscope == GROUP_PUBLIC || groupscope == GROUP_PROTECTED)
{
group = CCTK_SetupGroup(imp, gname, n_variables);
@@ -174,8 +174,8 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
if(group)
{
group->dim = dimension;
- group->gtype = CCTK_GTypeNumber(gtype);
- group->vtype = CCTK_VTypeNumber(vtype);
+ group->gtype = CCTK_GroupTypeNumber(gtype);
+ group->vtype = CCTK_VarTypeNumber(vtype);
group->gscope = groupscope;
group->n_timelevels = ntimelevels;
@@ -222,10 +222,10 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
#ifdef DEBUG_GROUPS
printf("Created group %s\n",gname);
- printf(" CCTK_GetGroupIndex(%s) = %d\n",groupname,
- CCTK_GetGroupIndex(groupname));
- printf(" CCTK_GetGroupName(%d) = %s\n",CCTK_GetGroupIndex(name),
- CCTK_GetGroupName(CCTK_GetGroupIndex(groupname)));
+ printf(" CCTK_GroupIndex(%s) = %d\n",groupname,
+ CCTK_GroupIndex(groupname));
+ printf(" CCTK_GroupName(%d) = %s\n",CCTK_GroupIndex(name),
+ CCTK_GroupName(CCTK_GroupIndex(groupname)));
#endif
return retval;
@@ -263,7 +263,7 @@ cGroupDefinition *CCTK_SetupGroup(const char *implementation,
sprintf(fullname1,"%s::%s",implementation,name);
fullname2 = (const char *)fullname1;
- if((group_num = CCTK_GetGroupIndex(fullname1)) == -1)
+ if((group_num = CCTK_GroupIndex(fullname1)) == -1)
{
/* Resize the array of groups */
if(temp = ((cGroupDefinition *)realloc(groups, (n_groups+1)*sizeof(cGroupDefinition))))
@@ -347,7 +347,7 @@ cGroupDefinition *CCTK_SetupGroup(const char *implementation,
/*@@
- @routine CCTK_GetVarIndex
+ @routine CCTK_VarIndex
@date Mon Feb 8 12:03:22 1999
@author Tom Goodale
@desc
@@ -361,7 +361,7 @@ cGroupDefinition *CCTK_SetupGroup(const char *implementation,
@@*/
-int CCTK_GetVarIndex(const char *variable_name)
+int CCTK_VarIndex(const char *variable_name)
{
int retval;
int gnum;
@@ -402,7 +402,7 @@ int CCTK_GetVarIndex(const char *variable_name)
else if (ierr == 1)
{
message = (char *)malloc( (100+strlen(variable_name))*sizeof(char) );
- sprintf(message,"Full name %s in wrong format in CCTK_GetVarNum",
+ sprintf(message,"Full name %s in wrong format in CCTK_VarNum",
variable_name);
CCTK_WARN(2,message);
if (message) free(message);
@@ -419,7 +419,7 @@ int CCTK_GetVarIndex(const char *variable_name)
}
#ifdef DEBUG_GROUPS
- printf(" In GetVarIndex\n"," ------------\n");
+ printf(" In VarIndex\n"," ------------\n");
printf(" impname -%s-\n",impname);
printf(" group_name -%s-\n",group_name);
printf(" varname -%s-\n",varname);
@@ -433,16 +433,16 @@ int CCTK_GetVarIndex(const char *variable_name)
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetVarIndex)(int *index,ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_VarIndex)(int *index,ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(name)
- *index = CCTK_GetVarIndex(name);
+ *index = CCTK_VarIndex(name);
free(name);
}
/*@@
- @routine CCTK_GetMaxDim
+ @routine CCTK_MaxDim
@date Mon Feb 8 12:04:01 1999
@author Tom Goodale
@desc
@@ -455,19 +455,19 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetVarIndex)(int *index,ONE_FORTSTRING_ARG)
@endhistory
@@*/
-int CCTK_GetMaxDim(void)
+int CCTK_MaxDim(void)
{
return maxdim;
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetMaxDim)(int *dim)
+void FMODIFIER FORTRAN_NAME(CCTK_MaxDim)(int *dim)
{
- *dim = CCTK_GetMaxDim();
+ *dim = CCTK_MaxDim();
}
/*@@
- @routine CCTK_GetNumVars
+ @routine CCTK_NumVars
@date Mon Feb 8 12:04:50 1999
@author Tom Goodale
@desc
@@ -480,19 +480,19 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetMaxDim)(int *dim)
@endhistory
@@*/
-int CCTK_GetNumVars(void)
+int CCTK_NumVars(void)
{
return total_variables;
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetNumVars)(int *total_variables)
+void FMODIFIER FORTRAN_NAME(CCTK_NumVars)(int *total_variables)
{
- *total_variables = CCTK_GetNumVars();
+ *total_variables = CCTK_NumVars();
}
/*@@
- @routine CCTK_GetNumGroups
+ @routine CCTK_NumGroups
@date Mon Feb 8 12:04:50 1999
@author Tom Goodale
@desc
@@ -505,19 +505,19 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetNumVars)(int *total_variables)
@endhistory
@@*/
-int CCTK_GetNumGroups(void)
+int CCTK_NumGroups(void)
{
return n_groups;
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetNumGroups)(int *n_groups)
+void FMODIFIER FORTRAN_NAME(CCTK_NumGroups)(int *n_groups)
{
- *n_groups = CCTK_GetNumGroups();
+ *n_groups = CCTK_NumGroups();
}
/*@@
- @routine CCTK_GetGroupNameFromVar_ByIndex
+ @routine CCTK_GroupNameFromVarI
@date Mon Feb 22
@author Gabrielle Allen
@desc
@@ -531,7 +531,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetNumGroups)(int *n_groups)
@@*/
-char *CCTK_GetGroupNameFromVar_ByIndex(int var)
+char *CCTK_GroupNameFromVarI(int var)
{
char *retval;
int group_num;
@@ -555,7 +555,7 @@ char *CCTK_GetGroupNameFromVar_ByIndex(int var)
/*@@
- @routine CCTK_GetGroupIndexFromVar_ByIndex
+ @routine CCTK_GroupIndexFromVarI
@date Mon Feb 22
@author Gabrielle Allen
@desc
@@ -569,7 +569,7 @@ char *CCTK_GetGroupNameFromVar_ByIndex(int var)
@@*/
-int CCTK_GetGroupIndexFromVar_ByIndex(int var)
+int CCTK_GroupIndexFromVarI(int var)
{
int retval;
@@ -586,15 +586,15 @@ int CCTK_GetGroupIndexFromVar_ByIndex(int var)
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetGroupIndexFromVar_ByI)(int *gindex,int *var)
+void FMODIFIER FORTRAN_NAME(CCTK_GroupIndexFromVarI)(int *gindex,int *var)
{
- *gindex = CCTK_GetGroupIndexFromVar_ByIndex(*var);
+ *gindex = CCTK_GroupIndexFromVarI(*var);
}
/*@@
- @routine CCTK_GetGroupIndexFromVar
+ @routine CCTK_GroupIndexFromVar
@date Mon Feb 22
@author Gabrielle Allen
@desc
@@ -608,21 +608,21 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetGroupIndexFromVar_ByI)(int *gindex,int *var
@@*/
-int CCTK_GetGroupIndexFromVar(const char *var)
+int CCTK_GroupIndexFromVar(const char *var)
{
- return CCTK_GetGroupIndexFromVar_ByIndex(CCTK_GetVarIndex(var));
+ return CCTK_GroupIndexFromVarI(CCTK_VarIndex(var));
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetGroupIndexFromVar)(int *index,ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_GroupIndexFromVar)(int *index,ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(var)
- *index = CCTK_GetGroupIndexFromVar(var);
+ *index = CCTK_GroupIndexFromVar(var);
free(var);
}
/*@@
- @routine CCTK_GetImplementationFromVar
+ @routine CCTK_ImpFromVarI
@date Mon Feb 22
@author Gabrielle Allen
@desc
@@ -635,7 +635,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetGroupIndexFromVar)(int *index,ONE_FORTSTRIN
@endhistory
@@*/
-char *CCTK_GetImplementationFromVar(int var)
+char *CCTK_ImpFromVarI(int var)
{
char *retval;
int group_num;
@@ -655,7 +655,7 @@ char *CCTK_GetImplementationFromVar(int var)
/*@@
- @routine CCTK_GetFullName(i)
+ @routine CCTK_FullName
@date Mon Feb 22
@author Gabrielle Allen
@desc
@@ -670,14 +670,14 @@ char *CCTK_GetImplementationFromVar(int var)
@@*/
-char *CCTK_GetFullName(int var)
+char *CCTK_FullName(int var)
{
char *impname;
char *varname;
int group_num;
char *fullname=NULL;
- varname = CCTK_GetVarName(var);
+ varname = CCTK_VarName(var);
if (varname)
{
group_num = group_of_variable[var];
@@ -697,7 +697,7 @@ char *CCTK_GetFullName(int var)
/*@@
- @routine CCTK_GTypeNumber
+ @routine CCTK_GroupTypeNumber
@date Mon Feb 8 14:44:45 1999
@author Tom Goodale
@desc
@@ -711,7 +711,7 @@ char *CCTK_GetFullName(int var)
@@*/
-int CCTK_GTypeNumber(const char *type)
+int CCTK_GroupTypeNumber(const char *type)
{
int retval=-1;
@@ -733,16 +733,16 @@ int CCTK_GTypeNumber(const char *type)
return retval;
}
-void FMODIFIER FORTRAN_NAME(CCTK_GTypeNumber)(int *number,ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_GroupTypeNumber)(int *number,ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(type)
- *number = CCTK_GTypeNumber(type);
+ *number = CCTK_GroupTypeNumber(type);
free(type);
}
/*@@
- @routine CCTK_VTypeNumber
+ @routine CCTK_VarTypeNumber
@date Mon Feb 8 14:44:45 1999
@author Tom Goodale
@desc
@@ -755,7 +755,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GTypeNumber)(int *number,ONE_FORTSTRING_ARG)
@endhistory
@@*/
-int CCTK_VTypeNumber(const char *type)
+int CCTK_VarTypeNumber(const char *type)
{
int retval=-1;
@@ -782,16 +782,16 @@ int CCTK_VTypeNumber(const char *type)
return retval;
}
-void FMODIFIER FORTRAN_NAME(CCTK_VTypeNumber)(int *number,ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_VarTypeNumber)(int *number,ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(type)
- *number = CCTK_VTypeNumber(type);
+ *number = CCTK_VarTypeNumber(type);
free(type);
}
/*@@
- @routine CCTK_GScopeNumber
+ @routine CCTK_GroupScopeNumber
@date Tuesday June 22 1999
@author Gabrielle Allen
@desc
@@ -804,7 +804,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_VTypeNumber)(int *number,ONE_FORTSTRING_ARG)
@endhistory
@@*/
-int CCTK_GScopeNumber(const char *type)
+int CCTK_GroupScopeNumber(const char *type)
{
int retval=-1;
@@ -826,16 +826,16 @@ int CCTK_GScopeNumber(const char *type)
return retval;
}
-void FMODIFIER FORTRAN_NAME(CCTK_GScopeNumber)(int *number,ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_GroupScopeNumber)(int *number,ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(type)
- *number = CCTK_GScopeNumber(type);
+ *number = CCTK_GroupScopeNumber(type);
free(type);
}
/*@@
- @routine CCTK_GetGroupData
+ @routine CCTK_GroupData
@date Mon Feb 8 15:56:01 1999
@author Tom Goodale
@desc
@@ -848,7 +848,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GScopeNumber)(int *number,ONE_FORTSTRING_ARG)
@endhistory
@@*/
-int CCTK_GetGroupData(int group,
+int CCTK_GroupData(int group,
int *gtype,
int *vtype,
int *dim,
@@ -877,7 +877,7 @@ int CCTK_GetGroupData(int group,
/*@@
- @routine CCTK_GetVarName
+ @routine CCTK_VarName
@date Tue Feb 9 15:34:56 1999
@author Tom Goodale
@desc
@@ -891,7 +891,7 @@ int CCTK_GetGroupData(int group,
@@*/
-char *CCTK_GetVarName(int varnum)
+char *CCTK_VarName(int varnum)
{
char *name;
int group;
@@ -932,7 +932,7 @@ int CCTK_DecomposeName(const char *fullname, char **implementation, char **name)
/*@@
- @routine CCTK_GetGroupName
+ @routine CCTK_GroupName
@date Tue Apr 9 15:39:14 1999
@author Gabrielle Allen
@desc
@@ -946,7 +946,7 @@ int CCTK_DecomposeName(const char *fullname, char **implementation, char **name)
@@*/
-char *CCTK_GetGroupName(int group)
+char *CCTK_GroupName(int group)
{
char *name;
@@ -973,7 +973,7 @@ char *CCTK_GetGroupName(int group)
/*@@
- @routine CCTK_GetFirstVarIndex_ByIndex
+ @routine CCTK_FirstVarIndexI
@date
@author Gabrielle Allen
@desc
@@ -987,7 +987,7 @@ char *CCTK_GetGroupName(int group)
@@*/
-int CCTK_GetFirstVarIndex_ByIndex(int group)
+int CCTK_FirstVarIndexI(int group)
{
if (0 <= group && group<n_groups)
{
@@ -999,19 +999,19 @@ int CCTK_GetFirstVarIndex_ByIndex(int group)
}
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetFirstVarIndex_ByIndex)(int *first, int *group)
+void FMODIFIER FORTRAN_NAME(CCTK_FirstVarIndexI)(int *first, int *group)
{
- *first = CCTK_GetFirstVarIndex_ByIndex(*group);
+ *first = CCTK_FirstVarIndexI(*group);
}
-int CCTK_GetFirstVarIndex(const char *groupname)
+int CCTK_FirstVarIndex(const char *groupname)
{
- return CCTK_GetFirstVarIndex_ByIndex(CCTK_GetGroupIndex(groupname));
+ return CCTK_FirstVarIndexI(CCTK_GroupIndex(groupname));
}
-int CCTK_GetNumVarsInGroup_ByIndex(int group)
+int CCTK_NumVarsInGroupI(int group)
{
if (0 <= group && group<n_groups)
{
@@ -1025,7 +1025,7 @@ int CCTK_GetNumVarsInGroup_ByIndex(int group)
/*@@
- @routine CCTK_GetNumVarsInGroup
+ @routine CCTK_NumVarsInGroup
@date
@author Gabrielle Allen
@desc
@@ -1039,21 +1039,21 @@ int CCTK_GetNumVarsInGroup_ByIndex(int group)
@@*/
-int CCTK_GetNumVarsInGroup(const char *groupname)
+int CCTK_NumVarsInGroup(const char *groupname)
{
- return CCTK_GetNumVarsInGroup_ByIndex(CCTK_GetGroupIndex(groupname));
+ return CCTK_NumVarsInGroupI(CCTK_GroupIndex(groupname));
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetNumVarsInGroup)(int *num,ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_NumVarsInGroup)(int *num,ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(groupname)
- *num = CCTK_GetNumVarsInGroup(groupname);
+ *num = CCTK_NumVarsInGroup(groupname);
free(groupname);
}
/*@@
- @routine CCTK_GetVarGType
+ @routine CCTK_GroupTypeFromVarI
@date
@author
@desc
@@ -1067,7 +1067,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetNumVarsInGroup)(int *num,ONE_FORTSTRING_ARG
@@*/
-int CCTK_GetVarGType(int var)
+int CCTK_GroupTypeFromVarI(int var)
{
int gtype;
int group;
@@ -1088,7 +1088,7 @@ int CCTK_GetVarGType(int var)
/*@@
- @routine CCTK_GetVarVType
+ @routine CCTK_VarTypeI
@date
@author
@desc
@@ -1102,7 +1102,7 @@ int CCTK_GetVarGType(int var)
@@*/
-int CCTK_GetVarVType(int var)
+int CCTK_VarTypeI(int var)
{
int vtype;
int group;
@@ -1121,14 +1121,14 @@ int CCTK_GetVarVType(int var)
return vtype;
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetVarVType)(int *type,int *var)
+void FMODIFIER FORTRAN_NAME(CCTK_VarTypeI)(int *type,int *var)
{
- *type = CCTK_GetVarVType(*var);
+ *type = CCTK_VarTypeI(*var);
}
/*@@
- @routine CCTK_GetNumTimeLevels_ByIndex
+ @routine CCTK_NumTimeLevelsI
@date
@author
@desc
@@ -1142,7 +1142,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetVarVType)(int *type,int *var)
@@*/
-int CCTK_GetNumTimeLevels_ByIndex(int var)
+int CCTK_NumTimeLevelsFromVarI(int var)
{
int ntimelevels;
int group;
@@ -1160,14 +1160,14 @@ int CCTK_GetNumTimeLevels_ByIndex(int var)
return ntimelevels;
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetNumTimeLevels_ByIndex)(int *num,int *var)
+void FMODIFIER FORTRAN_NAME(CCTK_NumTimeLevelsFromVarI)(int *num,int *var)
{
- *num = CCTK_GetNumTimeLevels_ByIndex(*var);
+ *num = CCTK_NumTimeLevelsFromVarI(*var);
}
/*@@
- @routine CCTK_GetNumTimeLevels
+ @routine CCTK_NumTimeLevelsFromVar
@date
@author
@desc
@@ -1181,15 +1181,15 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetNumTimeLevels_ByIndex)(int *num,int *var)
@@*/
-int CCTK_GetNumTimeLevels(const char *var)
+int CCTK_NumTimeLevelsFromVar(const char *var)
{
- return CCTK_GetNumTimeLevels_ByIndex(CCTK_GetVarIndex(var));
+ return CCTK_NumTimeLevelsFromVarI(CCTK_VarIndex(var));
}
-void FMODIFIER FORTRAN_NAME(CCTK_GetNumTimeLevels)(int *num,ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_NumTimeLevelsFromVar)(int *num,ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(var)
- *num = CCTK_GetNumTimeLevels(var);
+ *num = CCTK_NumTimeLevelsFromVar(var);
free(var);
}
@@ -1212,7 +1212,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GetNumTimeLevels)(int *num,ONE_FORTSTRING_ARG)
void CCTK_PrintGroup(int group)
{
- fprintf(stdout,"Group %d is %s\n",group,CCTK_GetGroupName(group));
+ fprintf(stdout,"Group %d is %s\n",group,CCTK_GroupName(group));
}
void FMODIFIER FORTRAN_NAME(CCTK_PrintGroup)(int *group)
@@ -1239,7 +1239,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_PrintGroup)(int *group)
void CCTK_PrintVar(int var)
{
- fprintf(stdout,"Variable %d is %s\n",var,CCTK_GetVarName(var));
+ fprintf(stdout,"Variable %d is %s\n",var,CCTK_VarName(var));
}
void FMODIFIER FORTRAN_NAME(CCTK_PrintVar)(int *var)
diff --git a/src/main/GroupsOnGH.c b/src/main/GroupsOnGH.c
index d3b1d597..ac0d1401 100644
--- a/src/main/GroupsOnGH.c
+++ b/src/main/GroupsOnGH.c
@@ -24,7 +24,7 @@ static char *rcsid = "$Header$";
/*@@
- @routine CCTK_GetVarDataPtr_ByName
+ @routine CCTK_VarDataPtr
@date Tue 6th April 1999
@author Gabrielle Allen
@desc
@@ -64,22 +64,22 @@ static char *rcsid = "$Header$";
@@*/
-void *CCTK_GetVarDataPtr_ByName(cGH *GH, int timelevel, char *fullvarname)
+void *CCTK_VarDataPtr(cGH *GH, int timelevel, char *fullvarname)
{
int index;
void *retval=NULL;
- index = CCTK_GetVarIndex(fullvarname);
+ index = CCTK_VarIndex(fullvarname);
if (index >= 0)
{
retval = GH->data[index][timelevel];
}
else
- CCTK_WARN(1,"Invalid index in CCTK_GetVarDataPtr_ByName");
+ CCTK_WARN(1,"Invalid index in CCTK_VarDataPtr");
#ifdef DEBUG_GROUPS
CCTK_PRINTSEPARATOR
- printf("In CCTK_GetVarDataPtr_ByName\n----------------------------\n");
+ printf("In CCTK_VarDataPtr\n----------------------------\n");
printf(" Data pointer for %s (%d) is %x\n",fullvarname,index,retval);
CCTK_PRINTSEPARATOR
#endif
@@ -89,7 +89,7 @@ void *CCTK_GetVarDataPtr_ByName(cGH *GH, int timelevel, char *fullvarname)
}
/*@@
- @routine CCTK_GetVarDataPtr_ByIndex
+ @routine CCTK_VarDataPtrI
@date Tue 6th April 1999
@author Gabrielle Allen
@desc
@@ -129,13 +129,13 @@ void *CCTK_GetVarDataPtr_ByName(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)
{
return GH->data[varindex][timelevel];
}
/*@@
- @routine CCTK_GetVarDataPtr
+ @routine CCTK_VarDataPtrB
@date Tue 6th April 1999
@author Gabrielle Allen
@desc
@@ -181,15 +181,15 @@ void *CCTK_GetVarDataPtr_ByIndex(cGH *GH, int timelevel, int varindex)
@version $Header$
@@*/
-void *CCTK_GetVarDataPtr(cGH *GH, int timelevel, int varindex, char *fullvarname)
+void *CCTK_VarDataPtrB(cGH *GH, int timelevel, int varindex, char *fullvarname)
{
if (fullvarname)
{
- return CCTK_GetVarDataPtr_ByName(GH, timelevel, fullvarname);
+ return CCTK_VarDataPtr(GH, timelevel, fullvarname);
}
else
{
- return CCTK_GetVarDataPtr_ByIndex(GH, timelevel, varindex);
+ return CCTK_VarDataPtrI(GH, timelevel, varindex);
}
}
diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c
index cccb8bf2..64e48c7d 100644
--- a/src/main/rfrInterface.c
+++ b/src/main/rfrInterface.c
@@ -157,7 +157,7 @@ int CCTK_rfrStorageOn(void *GH, int group)
int retcode;
char *group_name;
- group_name = CCTK_GetGroupName(group);
+ group_name = CCTK_GroupName(group);
if(group_name)
{
@@ -194,7 +194,7 @@ int CCTK_rfrStorageOff(void *GH, int group)
int retcode;
char *group_name;
- group_name = CCTK_GetGroupName(group);
+ group_name = CCTK_GroupName(group);
if(group_name)
{
#ifdef RFRDEBUG
@@ -231,7 +231,7 @@ int CCTK_rfrCommunicationOn(void *GH, int group)
int retcode;
char *group_name;
- group_name = CCTK_GetGroupName(group);
+ group_name = CCTK_GroupName(group);
if(group_name)
{
#ifdef RFRDEBUG
@@ -268,7 +268,7 @@ int CCTK_rfrCommunicationOff(void *GH, int group)
int retcode;
char *group_name;
- group_name = CCTK_GetGroupName(group);
+ group_name = CCTK_GroupName(group);
if(group_name)
{
#ifdef RFRDEBUG