5 files changed, 11 insertions, 8 deletions
diff --git a/src/include/Comm.h b/src/include/Comm.h
index b459b606..824138ad 100644
--- a/src/include/Comm.h
+++ b/src/include/Comm.h
@@ -32,7 +32,7 @@ extern "C" {
 
 int CCTK_QueryGroupStorage(cGH *,const char *);
 int CCTK_QueryGroupStorageI(cGH *,int);
-int *CCTK_ArrayGroupSize(cGH *,const char *,int);
+int *CCTK_ArrayGroupSize(cGH *,int, const char *);
 int *CCTK_ArrayGroupSizeI(cGH *,int,int);
 
 #ifdef __cplusplus
diff --git a/src/include/CommOverloadables.h b/src/include/CommOverloadables.h
index 25910e44..8a34d6dc 100644
--- a/src/include/CommOverloadables.h
+++ b/src/include/CommOverloadables.h
@@ -46,7 +46,7 @@ OVERLOADABLE(Abort)
 OVERLOADABLE(SetupGH)
 
 #undef ARGUMENTS
-#define ARGUMENTS cGH *GH, int group, const char *groupname, int dir
+#define ARGUMENTS cGH *GH, int dir, int group, const char *groupname
 #undef RETURN_TYPE 
 #define RETURN_TYPE int *
 OVERLOADABLE(ArrayGroupSizeB)
diff --git a/src/include/Misc.h b/src/include/Misc.h
index c02bf86b..1f2d8d7b 100644
--- a/src/include/Misc.h
+++ b/src/include/Misc.h
@@ -21,7 +21,7 @@ int CCTK_Equals(const char *string1, const char *string2);
 
 char *Util_NullTerminateString(const char *, unsigned int);
 
-int CCTK_InList(const char *string1, int n_elements, ...);
+int Util_InList(const char *string1, int n_elements, ...);
 
 int Util_IntInRange(int inval, const char *range);
 int Util_DoubleInRange(double inval, const char *range);
diff --git a/src/include/cctk.h b/src/include/cctk.h
index 77053b56..73f86b5d 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -31,7 +31,6 @@
 #define CCTK_PRINTSEPARATOR\
   print *,"----------------------------------------------------------------"
 
-
 #define _CCTK_FARGUMENTS  cctk_dim, cctk_gsh, cctk_lsh, cctk_lbnd, cctk_ubnd, cctk_from, cctk_to, cctk_bbox, cctk_delta_time, cctk_time, cctk_delta_space, cctk_origin_space, cctk_levfac, cctk_convlevel, cctk_nghostzones, cctk_iteration, cctkGH
 #define _DECLARE_CCTK_FARGUMENTS INTEGER cctk_dim&&\
                            INTEGER cctk_gsh(cctk_dim),cctk_lsh(cctk_dim)&&\
@@ -48,7 +47,7 @@
                            CCTK_POINTER cctkGH&&\
 
 #define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,b)
-
+#define CCTK_EQUALS(a,b) (CCTK_Equals(a,b).eq.1)
 
 #endif /*FCODE*/
 
@@ -56,6 +55,9 @@
 
 #include "cGH.h"
 
+#define CCTK_GFINDEX3D(GH,i,j,k) ((i) + GH->cctk_lsh[0]*((j)+GH->cctk_lsh[1]*(k)))
+
+
 #define CCTK_PRINTSEPARATOR \
   printf("----------------------------------------------------------------\n");
 
@@ -104,14 +106,15 @@
                             int *,\
                             cGH *
 
-#define CCTK_STORAGESIZE(xGH, group, cctk_dim) \
+#define CCTK_STORAGESIZE(xGH, cctk_dim, group) \
                   (CCTK_QueryGroupStorage(xGH,group) ?\
-                  (CCTK_ArrayGroupSize(xGH, group, cctk_dim)) : &(_cctk_one))
+                  (CCTK_ArrayGroupSize(xGH, cctk_dim, group)) : &(_cctk_one))
 
 
 extern int _cctk_one;
 
 #define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,__FILE__,CCTK_THORNSTRING,b)
+#define CCTK_EQUALS(a,b) (CCTK_Equals(a,b)==1)
 
 
 #endif /*CCODE*/
diff --git a/src/include/flesh.h b/src/include/flesh.h
index 107b71f5..dc36e3b3 100644
--- a/src/include/flesh.h
+++ b/src/include/flesh.h
@@ -80,7 +80,7 @@ extern "C" {
 
 int InitialiseCactus(int *, char ***, tFleshConfig *);
 
-int CCTK_SetParameter(const char *parameter, const char *value);
+int CCTKi_SetParameter(const char *parameter, const char *value);
 
 int ShutdownCactus(tFleshConfig *);