Introduce the new Cactus variable type CCTK_INT1.

Extend routines to handle the new type.


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

3 files changed, 44 insertions, 22 deletions

diff --git a/src/include/cctk_Constants.h b/src/include/cctk_Constants.h
index 7e18c548..99c44d35 100644
--- a/src/include/cctk_Constants.h
+++ b/src/include/cctk_Constants.h
@@ -11,35 +11,36 @@
 #ifndef _CCTK_CONSTANTS_H_
 #define _CCTK_CONSTANTS_H_
 
-#define CCTK_VARIABLE_VOID        0
-#define CCTK_VARIABLE_BYTE        1
-#define CCTK_VARIABLE_INT         2
-#define CCTK_VARIABLE_INT2        3
-#define CCTK_VARIABLE_INT4        4
-#define CCTK_VARIABLE_INT8        5
-#define CCTK_VARIABLE_REAL        6
-#define CCTK_VARIABLE_REAL4       7
-#define CCTK_VARIABLE_REAL8       8
-#define CCTK_VARIABLE_REAL16      9
-#define CCTK_VARIABLE_COMPLEX    10
-#define CCTK_VARIABLE_COMPLEX8   11
-#define CCTK_VARIABLE_COMPLEX16  12
-#define CCTK_VARIABLE_COMPLEX32  13
-#define CCTK_VARIABLE_STRING     14
-#define CCTK_VARIABLE_POINTER	 15
-#define CCTK_VARIABLE_FPOINTER   16
+#define CCTK_VARIABLE_VOID       100
+#define CCTK_VARIABLE_BYTE       101
+#define CCTK_VARIABLE_INT        102
+#define CCTK_VARIABLE_INT1       103
+#define CCTK_VARIABLE_INT2       104
+#define CCTK_VARIABLE_INT4       105
+#define CCTK_VARIABLE_INT8       106
+#define CCTK_VARIABLE_REAL       107
+#define CCTK_VARIABLE_REAL4      108
+#define CCTK_VARIABLE_REAL8      109
+#define CCTK_VARIABLE_REAL16     110
+#define CCTK_VARIABLE_COMPLEX    111
+#define CCTK_VARIABLE_COMPLEX8   112
+#define CCTK_VARIABLE_COMPLEX16  113
+#define CCTK_VARIABLE_COMPLEX32  114
+#define CCTK_VARIABLE_STRING     115
+#define CCTK_VARIABLE_POINTER	 116
+#define CCTK_VARIABLE_FPOINTER   117
 
 /* DEPRECATED IN BETA 12 */
-#define CCTK_VARIABLE_FN_POINTER   16
+#define CCTK_VARIABLE_FN_POINTER CCTK_VARIABLE_FPOINTER
 
 /* DEPRECATED IN BETA 10 */
-#define CCTK_VARIABLE_CHAR       1
+#define CCTK_VARIABLE_CHAR       CCTK_VARIABLE_BYTE
 
 
 /* steerable status of parameters */
-#define CCTK_STEERABLE_NEVER   0
-#define CCTK_STEERABLE_ALWAYS  1
-#define CCTK_STEERABLE_RECOVER 2
+#define CCTK_STEERABLE_NEVER   200
+#define CCTK_STEERABLE_ALWAYS  201
+#define CCTK_STEERABLE_RECOVER 202
 
 /* number of staggerings */
 #define CCTK_NSTAGGER      3
diff --git a/src/include/cctk_Types.h b/src/include/cctk_Types.h
index b6e2cabe..12f3976e 100644
--- a/src/include/cctk_Types.h
+++ b/src/include/cctk_Types.h
@@ -75,6 +75,7 @@ typedef unsigned char CCTK_BYTE;
 #define CCTK_INT8 INTEGER*8
 #define CCTK_INT4 INTEGER*4
 #define CCTK_INT2 INTEGER*2
+#define CCTK_INT1 INTEGER*1
 
 #define CCTK_COMPLEX32  COMPLEX*32
 #define CCTK_COMPLEX16  COMPLEX*16
@@ -116,6 +117,10 @@ typedef unsigned char CCTK_BYTE;
 #define CCTK_INT CCTK_INT2
 #endif
 
+#ifdef CCTK_INTEGER_PRECISION_1
+#define CCTK_INT CCTK_INT1
+#endif
+
 /* Complex precision */
 #ifdef CCTK_REAL_PRECISION_16
 #define CCTK_COMPLEX CCTK_COMPLEX32
diff --git a/src/include/util_Table.h b/src/include/util_Table.h
index 6209c3e8..6148a8a4 100644
--- a/src/include/util_Table.h
+++ b/src/include/util_Table.h
@@ -183,6 +183,9 @@ int Util_TableSetChar(int handle, CCTK_CHAR value, const char *key);
 
 /* integers */
 int Util_TableSetInt(int handle, CCTK_INT value, const char *key);
+#ifdef CCTK_INTEGER_PRECISION_1
+int Util_TableSetInt1(int handle, CCTK_INT1 value, const char *key);
+#endif
 #ifdef CCTK_INTEGER_PRECISION_2
 int Util_TableSetInt2(int handle, CCTK_INT2 value, const char *key);
 #endif
@@ -244,6 +247,11 @@ int Util_TableSetCharArray(int handle,
 int Util_TableSetIntArray(int handle,
                           int N_elements, const CCTK_INT array[],
                           const char *key);
+#ifdef CCTK_INTEGER_PRECISION_1
+int Util_TableSetInt1Array(int handle,
+                           int N_elements, const CCTK_INT1 array[],
+                           const char *key);
+#endif
 #ifdef CCTK_INTEGER_PRECISION_2
 int Util_TableSetInt2Array(int handle,
                            int N_elements, const CCTK_INT2 array[],
@@ -320,6 +328,9 @@ int Util_TableGetChar(int handle, CCTK_CHAR *value, const char *key);
 
 /* integers */
 int Util_TableGetInt(int handle, CCTK_INT *value, const char *key);
+#ifdef CCTK_INTEGER_PRECISION_1
+int Util_TableGetInt1(int handle, CCTK_INT1 *value, const char *key);
+#endif
 #ifdef CCTK_INTEGER_PRECISION_2
 int Util_TableGetInt2(int handle, CCTK_INT2 *value, const char *key);
 #endif
@@ -381,6 +392,11 @@ int Util_TableGetCharArray(int handle,
 int Util_TableGetIntArray(int handle,
                           int N_elements, CCTK_INT array[],
                           const char *key);
+#ifdef CCTK_INTEGER_PRECISION_1
+int Util_TableGetInt1Array(int handle,
+                           int N_elements, CCTK_INT1 array[],
+                           const char *key);
+#endif
 #ifdef CCTK_INTEGER_PRECISION_2
 int Util_TableGetInt2Array(int handle,
                            int N_elements, CCTK_INT2 array[],