Changed the use of the function CCTK_GroupData to return a pointer

to a structure containing information about the group, rather than
returning the information as separate arguments in the call. This makes
it easier for us to add any new information needed (e.g. staggering).

The new use is

cGroup *CCTK_GroupData(int group_index)

where cGroup is the structure

typedef struct
{
  int grouptype;
  int variabletype;
  int staggertype;
  int dim;
  int numvariables;
  int numtimelevels;
} cGroup

The old function is now deprecated and has been renamed to

CCTK_OldGroupData


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

1 files changed, 44 insertions, 53 deletions

diff --git a/src/include/cctk_Groups.h b/src/include/cctk_Groups.h
index 0f0c0f3b..d8564260 100644
--- a/src/include/cctk_Groups.h
+++ b/src/include/cctk_Groups.h
@@ -11,65 +11,56 @@
 #ifndef _CCTK_GROUPS_H_
 #define _CCTK_GROUPS_H_
 
+typedef struct
+{
+  int grouptype;
+  int variabletype;
+  int staggertype;
+  int dim;
+  int numvariables;
+  int numtimelevels;
+} cGroup;
+
 /* Prototypes */
 
 #ifdef __cplusplus 
 extern "C" {
 #endif
 
-int CCTK_GroupIndex(const char *groupname);
-
-int CCTK_VarIndex(const char *variablename);
-
-char *CCTK_GroupNameFromVarI(int var);
-
-int CCTK_GroupIndexFromVar(const char *var);
-
-int CCTK_GroupIndexFromVarI(int var);
-
-char *CCTK_FullName(int var);
-
-char *CCTK_ImpFromVarI(int var);
-
-int CCTK_MaxDim(void);
-
-int CCTK_NumVars(void);
-
-int CCTK_NumGroups(void);
-
-int CCTK_GroupTypeNumber(const char *type);
-
-int CCTK_VarTypeNumber(const char *type);
-
-char *CCTK_VarTypeName(int vartype);
-
-int CCTK_GroupScopeNumber(const char *type);
-
-int CCTK_GroupData(int group, 
-                      int *gtype, 
-                      int *vtype, 
-                      int *dim, 
-                      int *n_variables,
-                      int *n_timelevels);
-
-char *CCTK_VarName(int varnum);
-
-int CCTK_DecomposeName(const char *fullname, char **implementation, char **name);
-
-char *CCTK_GroupName(int varnum);
-
-int CCTK_GroupTypeFromVarI(int var);
-
-int CCTK_VarTypeI(int var);
-
-int CCTK_NumTimeLevelsFromVar(const char *var);
-int CCTK_NumTimeLevelsFromVarI(int var);
-
-int CCTK_FirstVarIndex(const char *group);
-int CCTK_FirstVarIndexI(int group);
-
-int CCTK_NumVarsInGroup(const char *group);
-int CCTK_NumVarsInGroupI(int group);
+int     CCTK_DecomposeName(const char *fullname, 
+			      char **implementation, 
+			      char **name);
+
+int     CCTK_FirstVarIndex(const char *group);
+int     CCTK_FirstVarIndexI(int group);
+char   *CCTK_FullName(int var);
+
+cGroup *CCTK_GroupData(int group);
+int     CCTK_GroupIndex(const char *groupname);
+int     CCTK_GroupIndexFromVar(const char *var);
+int     CCTK_GroupIndexFromVarI(int var);
+char   *CCTK_GroupName(int varnum);
+char   *CCTK_GroupNameFromVarI(int var);
+int     CCTK_GroupScopeNumber(const char *type);
+int     CCTK_GroupTypeFromVarI(int var);
+int     CCTK_GroupTypeNumber(const char *type);
+
+char   *CCTK_ImpFromVarI(int var);
+
+int     CCTK_MaxDim(void);
+
+int     CCTK_NumGroups(void);
+int     CCTK_NumTimeLevelsFromVar(const char *var);
+int     CCTK_NumTimeLevelsFromVarI(int var);
+int     CCTK_NumVars(void);
+int     CCTK_NumVarsInGroup(const char *group);
+int     CCTK_NumVarsInGroupI(int group);
+
+int     CCTK_VarIndex(const char *variablename);
+char   *CCTK_VarName(int varnum);
+int     CCTK_VarTypeI(int var);
+int     CCTK_VarTypeNumber(const char *type);
+char   *CCTK_VarTypeName(int vartype);
 
 #ifdef __cplusplus 
 }