Double -> CCTK_REAL

REAL -> CCTK_REAL

POINTER -> CCTK_POINTER

VARIABLE_REAL -> CCTK_VARIABLE_REAL (etc)

GH->iteration is now an int (not an unsigned long int)


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

2 files changed, 5 insertions, 3 deletions

diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index cca3d432..edc2f8bb 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -91,9 +91,9 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
     thisGH->lower_bound = (int *)malloc(thisGH->dim*sizeof(int));
     thisGH->upper_bound = (int *)malloc(thisGH->dim*sizeof(int));
     thisGH->bbox        = (int *)malloc(2*thisGH->dim*sizeof(int));
-    thisGH->delta_space = (Double *)malloc(thisGH->dim*sizeof(Double));
+    thisGH->delta_space = (CCTK_REAL *)malloc(thisGH->dim*sizeof(CCTK_REAL));
     /* FIXME : Next line goes when coords are done properly */
-    thisGH->origin_space = (Double *)malloc(thisGH->dim*sizeof(Double));
+    thisGH->origin_space = (CCTK_REAL *)malloc(thisGH->dim*sizeof(CCTK_REAL));
 
     thisGH->delta_time = 1;
     thisGH->levfac = 1;
diff --git a/src/comm/Reduction.c b/src/comm/Reduction.c
index 7bd2f219..bf2ab770 100644
--- a/src/comm/Reduction.c
+++ b/src/comm/Reduction.c
@@ -11,6 +11,7 @@
 /*#define DEBUG_REDUCTION*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
 #include <stdarg.h>
@@ -143,9 +144,10 @@ int CCTK_Reduce(cGH *GH, int retvartype, int retvarnum, void *retval,
 
 
   /* Call the function providing the reduction, if it exists */
+  /* FIX ME : Generalise (GAB) */
   if (function)
   {
-    function(GH,-1,VARIABLE_REAL,retvarnum,retval,invarnum,index_array);
+    function(GH,-1,CCTK_VARIABLE_REAL,retvarnum,retval,invarnum,index_array);
   }
   else
     CCTK_Warn(1,"CCTK","Reduction operation is not registered and cannot be called");