staggering constants

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

2 files changed, 55 insertions, 5 deletions

diff --git a/src/include/cctk.h b/src/include/cctk.h
index 45584ea7..98743218 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -39,7 +39,7 @@
 #define _DECLARE_CCTK_FARGUMENTS INTEGER cctk_dim&&\
                            INTEGER cctk_gsh(cctk_dim),cctk_lsh(cctk_dim)&&\
                            INTEGER cctk_lbnd(cctk_dim),cctk_ubnd(cctk_dim)&&\
-                           INTEGER cctk_lssh(3*cctk_dim)&&\
+                           INTEGER cctk_lssh(CCTK_NSTAGGER*cctk_dim)&&\
                            INTEGER cctk_from(cctk_dim),cctk_to(cctk_dim)&&\
                            INTEGER cctk_bbox(2*cctk_dim)&&\
                            CCTK_REAL cctk_delta_time, cctk_time&&\
@@ -63,8 +63,8 @@
 
 #define CCTK_DELTA_SPACE(x) cctk_delta_space(x)/cctk_levfac(x)
 #define CCTK_DELTA_TIME cctk_delta_time
-#define CCTK_LSSH(stag,dim) cctk_lssh(stag*3+dim)
-#define CCTK_LSSH_IDX(stag,dim) (stag*3+dim)
+#define CCTK_LSSH(stag,dim) cctk_lssh(stag*CCTK_NSTAGGER+dim)
+#define CCTK_LSSH_IDX(stag,dim) (stag*CCTK_NSTAGGER+dim)
 
 #define DECLARE_CCTK_FUNCTIONS integer CCTK_Equals, CCTK_MyProc, CCTK_nProcs
 
@@ -189,8 +189,8 @@ extern int _cctk_one;
 
 #define CCTK_DELTA_SPACE(x) cctk_delta_space[x]/cctk_levfac[x]
 #define CCTK_DELTA_TIME cctk_delta_time
-#define CCTK_LSSH(stag,dim) cctk_lssh[stag*3+dim]
-#define CCTK_LSSH_IDX(stag,dim) (stag*3+dim)
+#define CCTK_LSSH(stag,dim) cctk_lssh[stag*CCTK_NSTAGGER+dim]
+#define CCTK_LSSH_IDX(stag,dim) (stag*CCTK_NSTAGGER+dim)
 
 #define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,__FILE__,CCTK_THORNSTRING,b)
 
diff --git a/src/include/cctk_constants.h b/src/include/cctk_constants.h
index 5b5cb362..fd6208e4 100644
--- a/src/include/cctk_constants.h
+++ b/src/include/cctk_constants.h
@@ -23,5 +23,55 @@
 #define CCTK_VARIABLE_COMPLEX 10
 #define CCTK_VARIABLE_STRING  11
 
+
+/* stagger flags: yes/no, number of staggerings: 3 */
+#define CCTK_NO_STAGGER    0
+#define CCTK_STAGGER       0
+#define CCTK_NSTAGGER      3
+
+/* stagger code in one direction */
+#define CCTK_STAG_M        0
+#define CCTK_STAG_C        1
+#define CCTK_STAG_P        2
+
+/* stagger code of three directions */
+#define CCTK_STAG_MMM 0
+#define CCTK_STAG_CMM 1
+#define CCTK_STAG_PMM 2
+
+#define CCTK_STAG_MCM 3
+#define CCTK_STAG_CCM 4
+#define CCTK_STAG_PCM 5
+
+#define CCTK_STAG_MPM 6
+#define CCTK_STAG_CPM 7
+#define CCTK_STAG_PPM 8
+
+#define CCTK_STAG_MMC 9
+#define CCTK_STAG_CMC 11
+#define CCTK_STAG_PMC 12
+
+#define CCTK_STAG_MCC 13
+#define CCTK_STAG_CCC 14
+#define CCTK_STAG_PCC 15
+
+#define CCTK_STAG_MPC 16
+#define CCTK_STAG_CPC 17
+#define CCTK_STAG_PPC 18
+
+#define CCTK_STAG_MMP 19
+#define CCTK_STAG_CMP 20
+#define CCTK_STAG_PMP 21
+
+#define CCTK_STAG_MCP 22
+#define CCTK_STAG_CCP 23
+#define CCTK_STAG_PCP 24
+
+#define CCTK_STAG_MPP 25
+#define CCTK_STAG_CPP 26
+#define CCTK_STAG_PPP 27
+
+
+
 #endif