Updating headers, removing constants to the new cctk_constants.h

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

4 files changed, 40 insertions, 13 deletions

diff --git a/src/include/CommOverloadables.h b/src/include/CommOverloadables.h
index 8a34d6dc..56f199ab 100644
--- a/src/include/CommOverloadables.h
+++ b/src/include/CommOverloadables.h
@@ -9,6 +9,8 @@
    @version $Header$
  @@*/
 
+#include "cctk_Flesh.h"
+
 #ifdef ARGUMENTS
 #undef ARGUMENTS
 #endif
@@ -42,13 +44,13 @@ OVERLOADABLE(Abort)
 #undef ARGUMENTS
 #define ARGUMENTS tFleshConfig *config, int convergence_level
 #undef RETURN_TYPE 
-#define RETURN_TYPE cGH *
+#define RETURN_TYPE cGH * 
 OVERLOADABLE(SetupGH)
 
 #undef ARGUMENTS
 #define ARGUMENTS cGH *GH, int dir, int group, const char *groupname
 #undef RETURN_TYPE 
-#define RETURN_TYPE int *
+#define RETURN_TYPE int * 
 OVERLOADABLE(ArrayGroupSizeB)
 
 #undef ARGUMENTS
diff --git a/src/include/cctk.h b/src/include/cctk.h
index ae3d3039..80aa5612 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -23,6 +23,10 @@
 
 #include "definethisthorn.h"
 
+/* Include the constants */
+
+#include "cctk_constants.h"
+
 /* Define some stuff */
 
 #ifdef FCODE
@@ -68,11 +72,15 @@
 #include "cctk_Flesh.h"
 #include "cctk_IO.h"
 #include "cctk_Comm.h"
+#include "cctk_GHExtensions.h"
 
+#include "cctk_ActiveThorns.h"
 #include "cctk_Banner.h"
 #include "cctk_Coord.h"
 #include "cctk_Groups.h"
 #include "cctk_GroupsOnGH.h"
+#include "cctk_GHExtensions.h"
+#include "cctk_Misc.h"
 #include "cctk_WarnLevel.h"
 
 #define CCTK_GFINDEX3D(GH,i,j,k) ((i) + GH->cctk_lsh[0]*((j)+GH->cctk_lsh[1]*(k)))
@@ -135,7 +143,6 @@
 
 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)
 
 #define CCTK_PASS_CTOC cctkGH
@@ -143,20 +150,19 @@ extern int _cctk_one;
 #define CCTK_DELTA_SPACE(x) cctk_delta_space[x]/cctk_levfac[x]
 #define CCTK_DELTA_TIME cctk_delta_time
 
-#endif /*CCODE*/
+#define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,__FILE__,CCTK_THORNSTRING,b)
 
-#define CCTK_VARIABLE_CHAR    1
-#define CCTK_VARIABLE_INT     2
-#define CCTK_VARIABLE_REAL    3
-#define CCTK_VARIABLE_COMPLEX 4
+#endif /*CCODE*/
 
+#define CCTK_INFO(a) CCTK_Info(CCTK_THORNSTRING,a)
+#define CCTK_PARAMWARN(a) CCTK_ParamWarn(CCTK_THORNSTRING,a)
 
-/*#define CCTK_MAKESTRING(x) CCTK_REALSTRING(x)
+/*
+#define CCTK_MAKESTRING(x) CCTK_REALSTRING(x)
 #define CCTK_REALSTRING(x) #x
 #define CCTK_WARN(a,b) CCTK_Warn(a,CCTK_MAKESTRING(CCTK_THORN),b,__LINE__,__FILE__)
 */
-#define CCTK_INFO(a) CCTK_Info(CCTK_THORNSTRING,a)
-#define CCTK_PARAMWARN(a) CCTK_ParamWarn(CCTK_THORNSTRING,a)
+
 
 #endif
 
diff --git a/src/include/cctk_ActiveThorns.h b/src/include/cctk_ActiveThorns.h
index 542cb63c..128efbe7 100644
--- a/src/include/cctk_ActiveThorns.h
+++ b/src/include/cctk_ActiveThorns.h
@@ -12,8 +12,7 @@
 #define __ACTIVETHORNS_H_
 
 #include <stdio.h>
-#include "SKBinTree.h"
-
+#include "SKBinTree.h"   
 
 #ifdef __cplusplus 
 extern "C" {
diff --git a/src/include/cctk_constants.h b/src/include/cctk_constants.h
new file mode 100644
index 00000000..09f23936
--- /dev/null
+++ b/src/include/cctk_constants.h
@@ -0,0 +1,20 @@
+ /*@@
+   @header    cctk_constants.h
+   @date      Fri Oct 15 21:29:23 CEST 1999
+   @author    Gabrielle Allen
+   @desc 
+   Constants used by Cactus
+   @enddesc
+   @version $Id$
+ @@*/
+
+#ifndef _CCTK_CONSTANTS_H_
+#define _CCTK_CONSTANTS_H_
+
+#define CCTK_VARIABLE_CHAR    1
+#define CCTK_VARIABLE_INT     2
+#define CCTK_VARIABLE_REAL    3
+#define CCTK_VARIABLE_COMPLEX 4
+
+#endif
+