Constants for rfr should be here, and not in the rfr files

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

2 files changed, 70 insertions, 3 deletions

diff --git a/src/include/cctk.h b/src/include/cctk.h
index fe63cffa..bd371aea 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -32,14 +32,19 @@
 #define DECLARE_CCTK_C2F 
 #define PASS_CCTK_C2F(xGH) &((xGH)->dim),\
                            (xGH)->local_shape, (xGH)->lower_bound, (xGH)->upper_bound, (xGH)->bbox,\
-                           &((xGH)->levfac),
+                           &((xGH)->levfac),\
                            (xGH)
 #define CCTK_C2F_PROTO     int *,\
                            int *,int *, int *, int *,\
                            int *,\
                            cGH *
 
-#define CCTK_STORAGE_SIZE(xGH, group, dim) (CCTK_QueryGroupStorage(xGH,group) ?\
-                           &(CCTK_ArrayGroupSize(xGH, group, dim) : &(_cctk_one))
+#define CCTK_STORAGESIZE(xGH, group, dim) (CCTK_QueryGroupStorage(xGH,group) ?\
+                           (CCTK_ArrayGroupSize(xGH, group, dim)) : &(_cctk_one))
+
+
+extern int _cctk_one;
 
 #endif /*CCODE*/
+
+#endif
diff --git a/src/include/rfr_constants.h b/src/include/rfr_constants.h
new file mode 100644
index 00000000..009b2949
--- /dev/null
+++ b/src/include/rfr_constants.h
@@ -0,0 +1,62 @@
+ /*@@
+   @file      rfr_constants.h
+   @date      
+   @author   
+   @desc 
+   
+   @enddesc 
+ @@*/
+
+/* $Id$ */
+
+/* Be careful changing ordering. Look at tree in rfrInitialize before you do! */
+#define CACTUS_BASEGRID  1
+
+#define CACTUS_RECOVER   5
+
+/* Be sure to keep the INITIAL*, POSTSTEP*, etc... contiguous */
+#define CACTUS_INITIAL0  10
+#define CACTUS_INITIAL   11
+#define CACTUS_INITIAL2  12
+#define CACTUS_INITIAL3  13
+#define CACTUS_INITIAL4  14
+#define CACTUS_INITIAL5  15
+#define CACTUS_INITIAL6  16
+#define CACTUS_INITIAL7  17
+#define CACTUS_INITIAL8  18
+#define CACTUS_INITIAL9  19
+
+#define CACTUS_CPINITIAL 25
+
+#define CACTUS_PRESTEP   30
+#define CACTUS_PRESTEP2  31
+#define CACTUS_PRESTEP3  33
+#define CACTUS_PRESTEP4  34
+#define CACTUS_PRESTEP5  35
+
+
+#define CACTUS_POSTSTEP   40
+#define CACTUS_POSTSTEP2  41
+#define CACTUS_POSTSTEP3  42
+#define CACTUS_POSTSTEP4  43
+#define CACTUS_POSTSTEP5  44
+#define CACTUS_POSTSTEP6  45
+#define CACTUS_POSTSTEP7  46
+#define CACTUS_POSTSTEP8  47
+#define CACTUS_POSTSTEP9  48
+#define CACTUS_POSTSTEP10 49
+
+
+
+#define CACTUS_EVOL       60
+
+#define CACTUS_BOUND      70
+
+#define CACTUS_CHECKPOINT 75 
+
+#define CACTUS_ANALYSIS   80
+
+#define CACTUS_TERMINATE  90
+
+#define CACTUS_CONVERGENCE 100
+