1 files changed, 46 insertions, 40 deletions
diff --git a/src/include/cctk_Groups.h b/src/include/cctk_Groups.h
index 915717ad..35642065 100644
--- a/src/include/cctk_Groups.h
+++ b/src/include/cctk_Groups.h
@@ -27,46 +27,44 @@ typedef struct
 extern "C" {
 #endif
 
-void CCTK_DumpGroupInfo(void); 
-
-int     CCTK_StaggeredGrids(void); 
-int     CCTK_StaggerCodeName(const char *stype); 
-int     CCTK_DirStaggerCodeVal(int dir, int staggercode); 
-int     CCTK_DirStaggerCodeName(int dir, const char *stype); 
-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);
-
-int     CCTK_GroupData(int group, cGroup *gp);
-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);
+#include "cctk_Types.h"
+
+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);
+
+int        CCTK_GroupData(int group, cGroup *gp);
+CCTK_INT **CCTK_GroupGhostsizesI(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);
+CCTK_INT **CCTK_GroupSizesI(int group);
+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 
 }
@@ -83,4 +81,12 @@ char   *CCTK_VarTypeName(int vartype);
 #define GROUP_PROTECTED 2
 #define GROUP_PUBLIC    3
 
+#define CCTK_SCALAR 1
+#define CCTK_GF     2
+#define CCTK_ARRAY  3
+
+#define CCTK_PRIVATE   1
+#define CCTK_PROTECTED 2
+#define CCTK_PUBLIC    3
+
 #endif