This patch switches checking from #ifdef cctk_* to #ifdef have_cctk*, otherwise it contains minor changes here and there, code cleanup and such. Please confirm testglobal and testlocal reduce

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGHReduce/trunk@75 d60812e6-3970-4df4-986e-c251b06effeb

1 files changed, 63 insertions, 63 deletions

diff --git a/src/ReduceGA.c b/src/ReduceGA.c
index df00aa7..c1aeabb 100644
--- a/src/ReduceGA.c
+++ b/src/ReduceGA.c
@@ -164,13 +164,13 @@ static int ReduceGridArrays (const cGH *GH,
   
   /* temporary complex variables*/
   CCTK_COMPLEX cmplx_tmp;
-  #ifdef CCTK_COMPLEX8
+  #ifdef HAVE_CCTK_COMPLEX8
   CCTK_COMPLEX8 cmplx_tmp8;
   #endif
-  #ifdef CCTK_COMPLEX16
+  #ifdef HAVE_CCTK_COMPLEX16
   CCTK_COMPLEX16 cmplx_tmp16;
   #endif
-  #ifdef CCTK_COMPLEX32
+  #ifdef HAVE_CCTK_COMPLEX32
   CCTK_COMPLEX32 cmplx_tmp32;
   #endif
   
@@ -393,7 +393,7 @@ static int ReduceGridArrays (const cGH *GH,
                           PUGH_MPI_INT, MPI_SUM, dest_proc, pughGH->PUGH_COMM_WORLD));
         }
       break;
-      #ifdef CCTK_INT1
+      #ifdef HAVE_CCTK_INT1
       case CCTK_VARIABLE_INT1:
         local_outvals = malloc (1 * sizeof (CCTK_INT1));
 
@@ -426,7 +426,7 @@ static int ReduceGridArrays (const cGH *GH,
         }
       break;
       #endif                                                              
-      #ifdef CCTK_INT2
+      #ifdef HAVE_CCTK_INT2
       case CCTK_VARIABLE_INT2:
         local_outvals = malloc (1 * sizeof (CCTK_INT2));
 
@@ -459,7 +459,7 @@ static int ReduceGridArrays (const cGH *GH,
         }
       break;
       #endif
-      #ifdef CCTK_INT4
+      #ifdef HAVE_CCTK_INT4
       case CCTK_VARIABLE_INT4:
         local_outvals = malloc (1 * sizeof (CCTK_INT4));
 
@@ -492,7 +492,7 @@ static int ReduceGridArrays (const cGH *GH,
         }
       break;
       #endif
-      #ifdef CCTK_INT8
+      #ifdef HAVE_CCTK_INT8
       case CCTK_VARIABLE_INT8:
         local_outvals = malloc (1 * sizeof (CCTK_INT8));
 
@@ -557,7 +557,7 @@ static int ReduceGridArrays (const cGH *GH,
                           PUGH_MPI_REAL, MPI_SUM, dest_proc, pughGH->PUGH_COMM_WORLD));
         }
       break;
-      #ifdef CCTK_REAL4
+      #ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         local_outvals = malloc (1 * sizeof (CCTK_REAL4));
 
@@ -590,7 +590,7 @@ static int ReduceGridArrays (const cGH *GH,
         }
       break;
       #endif
-      #ifdef CCTK_REAL8
+      #ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         local_outvals = malloc (1 * sizeof (CCTK_REAL8));
 
@@ -623,7 +623,7 @@ static int ReduceGridArrays (const cGH *GH,
         }
       break;
       #endif
-      #ifdef CCTK_REAL16
+      #ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         local_outvals = malloc (1 * sizeof (CCTK_REAL16));
 
@@ -687,7 +687,7 @@ static int ReduceGridArrays (const cGH *GH,
                           pughGH->PUGH_mpi_complex, MPI_SUM, dest_proc, pughGH->PUGH_COMM_WORLD));
         }
       break;
-      #ifdef CCTK_COMPLEX8
+      #ifdef HAVE_CCTK_COMPLEX8
       case CCTK_VARIABLE_COMPLEX8:
         local_outvals = malloc (1 * sizeof (CCTK_COMPLEX8));
 
@@ -720,7 +720,7 @@ static int ReduceGridArrays (const cGH *GH,
         }
       break;
       #endif
-      #ifdef CCTK_COMPLEX16
+      #ifdef HAVE_CCTK_COMPLEX16
       case CCTK_VARIABLE_COMPLEX16:
         local_outvals = malloc (1 * sizeof (CCTK_COMPLEX16));
 
@@ -753,7 +753,7 @@ static int ReduceGridArrays (const cGH *GH,
         }
       break;
       #endif
-      #ifdef CCTK_COMPLEX32
+      #ifdef HAVE_CCTK_COMPLEX32
       case CCTK_VARIABLE_COMPLEX32:
         local_outvals = malloc (1 * sizeof (CCTK_COMPLEX32));
 
@@ -810,22 +810,22 @@ static int ReduceGridArrays (const cGH *GH,
             case CCTK_VARIABLE_INT:
               *( (CCTK_INT *) output_values[i]) = *( (CCTK_INT *) output_values[i]) / weight_sum; 
             break;
-            #ifdef CCTK_INT1
+            #ifdef HAVE_CCTK_INT1
             case CCTK_VARIABLE_INT1:
               *( (CCTK_INT1 *) output_values[i]) = *( (CCTK_INT1 *) output_values[i]) / weight_sum; 
             break;
             #endif                                                              
-            #ifdef CCTK_INT2
+            #ifdef HAVE_CCTK_INT2
             case CCTK_VARIABLE_INT2:
               *( (CCTK_INT2 *) output_values[i]) = *( (CCTK_INT2 *) output_values[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_INT4
+            #ifdef HAVE_CCTK_INT4
             case CCTK_VARIABLE_INT4:
               *( (CCTK_INT4 *) output_values[i]) = *( (CCTK_INT4 *) output_values[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_INT8
+            #ifdef HAVE_CCTK_INT8
             case CCTK_VARIABLE_INT8:
               *( (CCTK_INT8 *) output_values[i]) = *( (CCTK_INT8 *) output_values[i]) / weight_sum; 
             break;                                                                
@@ -833,17 +833,17 @@ static int ReduceGridArrays (const cGH *GH,
             case CCTK_VARIABLE_REAL:
               *( (CCTK_REAL *) output_values[i]) = *( (CCTK_REAL *) output_values[i]) / weight_sum; 
             break;
-            #ifdef CCTK_REAL4
+            #ifdef HAVE_CCTK_REAL4
             case CCTK_VARIABLE_REAL4:
               *( (CCTK_REAL4 *) output_values[i]) = *( (CCTK_REAL4 *) output_values[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_REAL8
+            #ifdef HAVE_CCTK_REAL8
             case CCTK_VARIABLE_REAL8:
               *( (CCTK_REAL8 *) output_values[i]) = *( (CCTK_REAL8 *) output_values[i]) / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_REAL16
+            #ifdef HAVE_CCTK_REAL16
             case CCTK_VARIABLE_REAL16:
               *( (CCTK_REAL16 *) output_values[i]) = *( (CCTK_REAL16 *) output_values[i]) / weight_sum; 
             break;
@@ -852,19 +852,19 @@ static int ReduceGridArrays (const cGH *GH,
               (*( (CCTK_COMPLEX *) output_values[i])).Re = (*( (CCTK_COMPLEX *) output_values[i])).Re / weight_sum; 
               (*( (CCTK_COMPLEX *) output_values[i])).Im = (*( (CCTK_COMPLEX *) output_values[i])).Im / weight_sum; 
             break;
-            #ifdef CCTK_COMPLEX8
+            #ifdef HAVE_CCTK_COMPLEX8
             case CCTK_VARIABLE_COMPLEX8:
               (*( (CCTK_COMPLEX8 *) output_values[i])).Re = (*( (CCTK_COMPLEX8 *) output_values[i])).Re / weight_sum; 
               (*( (CCTK_COMPLEX8 *) output_values[i])).Im = (*( (CCTK_COMPLEX8 *) output_values[i])).Im / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_COMPLEX16
+            #ifdef HAVE_CCTK_COMPLEX16
             case CCTK_VARIABLE_COMPLEX16:
             (*( (CCTK_COMPLEX16 *) output_values[i])).Re = (*( (CCTK_COMPLEX16 *) output_values[i])).Re / weight_sum; 
             (*( (CCTK_COMPLEX16 *) output_values[i])).Im = (*( (CCTK_COMPLEX16 *) output_values[i])).Im / weight_sum; 
             break;
             #endif
-            #ifdef CCTK_COMPLEX32
+            #ifdef HAVE_CCTK_COMPLEX32
             case CCTK_VARIABLE_COMPLEX32:
               (*( (CCTK_COMPLEX32 *) output_values[i])).Re = (*( (CCTK_COMPLEX32 *) output_values[i])).Re / weight_sum; 
               (*( (CCTK_COMPLEX32 *) output_values[i])).Im = (*( (CCTK_COMPLEX32 *) output_values[i])).Im / weight_sum; 
@@ -892,22 +892,22 @@ static int ReduceGridArrays (const cGH *GH,
           case CCTK_VARIABLE_INT:
             *( (CCTK_INT *) output_values[i]) = *( (CCTK_INT *) output_values[i]) / num_points; 
           break;
-          #ifdef CCTK_INT1
+          #ifdef HAVE_CCTK_INT1
           case CCTK_VARIABLE_INT1:
             *( (CCTK_INT1 *) output_values[i]) = *( (CCTK_INT1 *) output_values[i]) / num_points; 
           break;
           #endif                                                              
-          #ifdef CCTK_INT2
+          #ifdef HAVE_CCTK_INT2
           case CCTK_VARIABLE_INT2:
             *( (CCTK_INT2 *) output_values[i]) = *( (CCTK_INT2 *) output_values[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_INT4
+          #ifdef HAVE_CCTK_INT4
           case CCTK_VARIABLE_INT4:
             *( (CCTK_INT4 *) output_values[i]) = *( (CCTK_INT4 *) output_values[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_INT8
+          #ifdef HAVE_CCTK_INT8
           case CCTK_VARIABLE_INT8:
             *( (CCTK_INT8 *) output_values[i]) = *( (CCTK_INT8 *) output_values[i]) / num_points; 
           break;                                                                
@@ -915,17 +915,17 @@ static int ReduceGridArrays (const cGH *GH,
           case CCTK_VARIABLE_REAL:
             *( (CCTK_REAL *) output_values[i]) = *( (CCTK_REAL *) output_values[i]) / num_points; 
           break;
-          #ifdef CCTK_REAL4
+          #ifdef HAVE_CCTK_REAL4
           case CCTK_VARIABLE_REAL4:
             *( (CCTK_REAL4 *) output_values[i]) = *( (CCTK_REAL4 *) output_values[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_REAL8
+          #ifdef HAVE_CCTK_REAL8
           case CCTK_VARIABLE_REAL8:
             *( (CCTK_REAL8 *) output_values[i]) = *( (CCTK_REAL8 *) output_values[i]) / num_points; 
           break;
           #endif
-          #ifdef CCTK_REAL16
+          #ifdef HAVE_CCTK_REAL16
           case CCTK_VARIABLE_REAL16:
             *( (CCTK_REAL16 *) output_values[i]) = *( (CCTK_REAL16 *) output_values[i]) / num_points; 
           break;
@@ -934,19 +934,19 @@ static int ReduceGridArrays (const cGH *GH,
             (*( (CCTK_COMPLEX *) output_values[i])).Re = (*( (CCTK_COMPLEX *) output_values[i])).Re / num_points; 
             (*( (CCTK_COMPLEX *) output_values[i])).Im = (*( (CCTK_COMPLEX *) output_values[i])).Im / num_points; 
           break;
-          #ifdef CCTK_COMPLEX8
+          #ifdef HAVE_CCTK_COMPLEX8
           case CCTK_VARIABLE_COMPLEX8:
             (*( (CCTK_COMPLEX8 *) output_values[i])).Re = (*( (CCTK_COMPLEX8 *) output_values[i])).Re / num_points; 
             (*( (CCTK_COMPLEX8 *) output_values[i])).Im = (*( (CCTK_COMPLEX8 *) output_values[i])).Im / num_points; 
           break;
           #endif
-          #ifdef CCTK_COMPLEX16
+          #ifdef HAVE_CCTK_COMPLEX16
           case CCTK_VARIABLE_COMPLEX16:
           (*( (CCTK_COMPLEX16 *) output_values[i])).Re = (*( (CCTK_COMPLEX16 *) output_values[i])).Re / num_points; 
           (*( (CCTK_COMPLEX16 *) output_values[i])).Im = (*( (CCTK_COMPLEX16 *) output_values[i])).Im / num_points; 
           break;
           #endif
-          #ifdef CCTK_COMPLEX32
+          #ifdef HAVE_CCTK_COMPLEX32
           case CCTK_VARIABLE_COMPLEX32:
             (*( (CCTK_COMPLEX32 *) output_values[i])).Re = (*( (CCTK_COMPLEX32 *) output_values[i])).Re / num_points; 
             (*( (CCTK_COMPLEX32 *) output_values[i])).Im = (*( (CCTK_COMPLEX32 *) output_values[i])).Im / num_points; 
@@ -970,22 +970,22 @@ static int ReduceGridArrays (const cGH *GH,
         case CCTK_VARIABLE_INT:
           *( (CCTK_INT *) output_values[i]) = sqrt( *( (CCTK_INT *) output_values[i])); 
         break;
-        #ifdef CCTK_INT1
+        #ifdef HAVE_CCTK_INT1
         case CCTK_VARIABLE_INT1:
           *( (CCTK_INT1 *) output_values[i]) = sqrt(*( (CCTK_INT1 *) output_values[i])); 
         break;
         #endif                                                              
-        #ifdef CCTK_INT2
+        #ifdef HAVE_CCTK_INT2
         case CCTK_VARIABLE_INT2:
           *( (CCTK_INT2 *) output_values[i]) = sqrt(*( (CCTK_INT2 *) output_values[i])); 
         break;
         #endif
-        #ifdef CCTK_INT4
+        #ifdef HAVE_CCTK_INT4
         case CCTK_VARIABLE_INT4:
           *( (CCTK_INT4 *) output_values[i]) = sqrt( *( (CCTK_INT4 *) output_values[i])); 
         break;
         #endif
-        #ifdef CCTK_INT8
+        #ifdef HAVE_CCTK_INT8
         case CCTK_VARIABLE_INT8:
           *( (CCTK_INT8 *) output_values[i]) = sqrt(*( (CCTK_INT8 *) output_values[i])); 
         break;                                                                
@@ -993,17 +993,17 @@ static int ReduceGridArrays (const cGH *GH,
         case CCTK_VARIABLE_REAL:
           *( (CCTK_REAL *) output_values[i]) = sqrt(*( (CCTK_REAL *) output_values[i])); 
         break;
-        #ifdef CCTK_REAL4
+        #ifdef HAVE_CCTK_REAL4
         case CCTK_VARIABLE_REAL4:
           *( (CCTK_REAL4 *) output_values[i]) = sqrt(*( (CCTK_REAL4 *) output_values[i])); 
         break;
         #endif
-        #ifdef CCTK_REAL8
+        #ifdef HAVE_CCTK_REAL8
         case CCTK_VARIABLE_REAL8:
           *( (CCTK_REAL8 *) output_values[i]) = sqrt(*( (CCTK_REAL8 *) output_values[i])); 
         break;
         #endif
-        #ifdef CCTK_REAL16
+        #ifdef HAVE_CCTK_REAL16
         case CCTK_VARIABLE_REAL16:
           *( (CCTK_REAL16 *) output_values[i]) = sqrt(*( (CCTK_REAL16 *) output_values[i])); 
         break;
@@ -1015,7 +1015,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX *) output_values[i])).Re = cmplx_tmp.Re;
           (*( (CCTK_COMPLEX *) output_values[i])).Im = cmplx_tmp.Im;
         break;
-        #ifdef CCTK_COMPLEX8
+        #ifdef HAVE_CCTK_COMPLEX8
         case CCTK_VARIABLE_COMPLEX8:
           cmplx_tmp8.Re = (*( (CCTK_COMPLEX8 *) output_values[i])).Re;
           cmplx_tmp8.Im = (*( (CCTK_COMPLEX8 *) output_values[i])).Im;
@@ -1024,7 +1024,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX8 *) output_values[i])).Im = cmplx_tmp8.Im;
         break;
         #endif
-        #ifdef CCTK_COMPLEX16
+        #ifdef HAVE_CCTK_COMPLEX16
         case CCTK_VARIABLE_COMPLEX16:
           cmplx_tmp16.Re = (*( (CCTK_COMPLEX16 *) output_values[i])).Re;
           cmplx_tmp16.Im = (*( (CCTK_COMPLEX16 *) output_values[i])).Im;
@@ -1033,7 +1033,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX16 *) output_values[i])).Im = cmplx_tmp16.Im;
         break;
         #endif
-        #ifdef CCTK_COMPLEX32
+        #ifdef HAVE_CCTK_COMPLEX32
         case CCTK_VARIABLE_COMPLEX32:
           cmplx_tmp32.Re = (*( (CCTK_COMPLEX32 *) output_values[i])).Re;
           cmplx_tmp32.Im = (*( (CCTK_COMPLEX32 *) output_values[i])).Im;
@@ -1059,22 +1059,22 @@ static int ReduceGridArrays (const cGH *GH,
         case CCTK_VARIABLE_INT:
           *( (CCTK_INT *) output_values[i]) = pow(*( (CCTK_INT *) output_values[i]), 1.0/3.0); 
         break;
-        #ifdef CCTK_INT1
+        #ifdef HAVE_CCTK_INT1
         case CCTK_VARIABLE_INT1:
           *( (CCTK_INT1 *) output_values[i]) = pow(*( (CCTK_INT1 *) output_values[i]), 1.0/3.0); 
         break;
         #endif                                                              
-        #ifdef CCTK_INT2
+        #ifdef HAVE_CCTK_INT2
         case CCTK_VARIABLE_INT2:
           *( (CCTK_INT2 *) output_values[i]) = pow(*( (CCTK_INT2 *) output_values[i]), 1.0/3.0); 
         break;
         #endif
-        #ifdef CCTK_INT4
+        #ifdef HAVE_CCTK_INT4
         case CCTK_VARIABLE_INT4:
           *( (CCTK_INT4 *) output_values[i]) = pow( *( (CCTK_INT4 *) output_values[i]), 1.0/3.0); 
         break;
         #endif
-        #ifdef CCTK_INT8
+        #ifdef HAVE_CCTK_INT8
         case CCTK_VARIABLE_INT8:
           *( (CCTK_INT8 *) output_values[i]) = pow(*( (CCTK_INT8 *) output_values[i]), 1.0/3.0); 
         break;                                                                
@@ -1082,17 +1082,17 @@ static int ReduceGridArrays (const cGH *GH,
         case CCTK_VARIABLE_REAL:
           *( (CCTK_REAL *) output_values[i]) = pow(*( (CCTK_REAL *) output_values[i]), 1.0/3.0); 
         break;
-        #ifdef CCTK_REAL4
+        #ifdef HAVE_CCTK_REAL4
         case CCTK_VARIABLE_REAL4:
           *( (CCTK_REAL4 *) output_values[i]) = pow(*( (CCTK_REAL4 *) output_values[i]), 1.0/3.0); 
         break;
         #endif
-        #ifdef CCTK_REAL8
+        #ifdef HAVE_CCTK_REAL8
         case CCTK_VARIABLE_REAL8:
           *( (CCTK_REAL8 *) output_values[i]) = pow(*( (CCTK_REAL8 *) output_values[i]), 1.0/3.0); 
         break;
         #endif
-        #ifdef CCTK_REAL16
+        #ifdef HAVE_CCTK_REAL16
         case CCTK_VARIABLE_REAL16:
           *( (CCTK_REAL16 *) output_values[i]) = pow(*( (CCTK_REAL16 *) output_values[i]), 1.0/3.0); 
         break;
@@ -1104,7 +1104,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX *) output_values[i])).Re = cmplx_tmp.Re;
           (*( (CCTK_COMPLEX *) output_values[i])).Im = cmplx_tmp.Im;
         break;
-        #ifdef CCTK_COMPLEX8
+        #ifdef HAVE_CCTK_COMPLEX8
         case CCTK_VARIABLE_COMPLEX8:
           cmplx_tmp8.Re = (*( (CCTK_COMPLEX8 *) output_values[i])).Re;
           cmplx_tmp8.Im = (*( (CCTK_COMPLEX8 *) output_values[i])).Im;
@@ -1113,7 +1113,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX8 *) output_values[i])).Im = cmplx_tmp8.Im;
         break;
         #endif
-        #ifdef CCTK_COMPLEX16
+        #ifdef HAVE_CCTK_COMPLEX16
         case CCTK_VARIABLE_COMPLEX16:
           cmplx_tmp16.Re = (*( (CCTK_COMPLEX16 *) output_values[i])).Re;
           cmplx_tmp16.Im = (*( (CCTK_COMPLEX16 *) output_values[i])).Im;
@@ -1122,7 +1122,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX16 *) output_values[i])).Im = cmplx_tmp16.Im;
         break;
         #endif
-        #ifdef CCTK_COMPLEX32
+        #ifdef HAVE_CCTK_COMPLEX32
         case CCTK_VARIABLE_COMPLEX32:
           cmplx_tmp32.Re = (*( (CCTK_COMPLEX32 *) output_values[i])).Re;
           cmplx_tmp32.Im = (*( (CCTK_COMPLEX32 *) output_values[i])).Im;
@@ -1148,22 +1148,22 @@ static int ReduceGridArrays (const cGH *GH,
         case CCTK_VARIABLE_INT:
           *( (CCTK_INT *) output_values[i]) = pow(*( (CCTK_INT *) output_values[i]), 1.0/4.0); 
         break;
-        #ifdef CCTK_INT1
+        #ifdef HAVE_CCTK_INT1
         case CCTK_VARIABLE_INT1:
           *( (CCTK_INT1 *) output_values[i]) = pow(*( (CCTK_INT1 *) output_values[i]), 1.0/4.0); 
         break;
         #endif                                                              
-        #ifdef CCTK_INT2
+        #ifdef HAVE_CCTK_INT2
         case CCTK_VARIABLE_INT2:
           *( (CCTK_INT2 *) output_values[i]) = pow(*( (CCTK_INT2 *) output_values[i]), 1.0/4.0); 
         break;
         #endif
-        #ifdef CCTK_INT4
+        #ifdef HAVE_CCTK_INT4
         case CCTK_VARIABLE_INT4:
           *( (CCTK_INT4 *) output_values[i]) = pow( *( (CCTK_INT4 *) output_values[i]), 1.0/4.0); 
         break;
         #endif
-        #ifdef CCTK_INT8
+        #ifdef HAVE_CCTK_INT8
         case CCTK_VARIABLE_INT8:
           *( (CCTK_INT8 *) output_values[i]) = pow(*( (CCTK_INT8 *) output_values[i]), 1.0/4.0); 
         break;                                                                
@@ -1171,17 +1171,17 @@ static int ReduceGridArrays (const cGH *GH,
         case CCTK_VARIABLE_REAL:
           *( (CCTK_REAL *) output_values[i]) = pow(*( (CCTK_REAL *) output_values[i]), 1.0/4.0); 
         break;
-        #ifdef CCTK_REAL4
+        #ifdef HAVE_CCTK_REAL4
         case CCTK_VARIABLE_REAL4:
           *( (CCTK_REAL4 *) output_values[i]) = pow(*( (CCTK_REAL4 *) output_values[i]), 1.0/4.0); 
         break;
         #endif
-        #ifdef CCTK_REAL8
+        #ifdef HAVE_CCTK_REAL8
         case CCTK_VARIABLE_REAL8:
           *( (CCTK_REAL8 *) output_values[i]) = pow(*( (CCTK_REAL8 *) output_values[i]), 1.0/4.0); 
         break;
         #endif
-        #ifdef CCTK_REAL16
+        #ifdef HAVE_CCTK_REAL16
         case CCTK_VARIABLE_REAL16:
           *( (CCTK_REAL16 *) output_values[i]) = pow(*( (CCTK_REAL16 *) output_values[i]), 1.0/4.0); 
         break;
@@ -1193,7 +1193,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX *) output_values[i])).Re = cmplx_tmp.Re;
           (*( (CCTK_COMPLEX *) output_values[i])).Im = cmplx_tmp.Im;
         break;
-        #ifdef CCTK_COMPLEX8
+        #ifdef HAVE_CCTK_COMPLEX8
         case CCTK_VARIABLE_COMPLEX8:
           cmplx_tmp8.Re = (*( (CCTK_COMPLEX8 *) output_values[i])).Re;
           cmplx_tmp8.Im = (*( (CCTK_COMPLEX8 *) output_values[i])).Im;
@@ -1202,7 +1202,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX8 *) output_values[i])).Im = cmplx_tmp8.Im;
         break;
         #endif
-        #ifdef CCTK_COMPLEX16
+        #ifdef HAVE_CCTK_COMPLEX16
         case CCTK_VARIABLE_COMPLEX16:
           cmplx_tmp16.Re = (*( (CCTK_COMPLEX16 *) output_values[i])).Re;
           cmplx_tmp16.Im = (*( (CCTK_COMPLEX16 *) output_values[i])).Im;
@@ -1211,7 +1211,7 @@ static int ReduceGridArrays (const cGH *GH,
           (*( (CCTK_COMPLEX16 *) output_values[i])).Im = cmplx_tmp16.Im;
         break;
         #endif
-        #ifdef CCTK_COMPLEX32
+        #ifdef HAVE_CCTK_COMPLEX32
         case CCTK_VARIABLE_COMPLEX32:
           cmplx_tmp32.Re = (*( (CCTK_COMPLEX32 *) output_values[i])).Re;
           cmplx_tmp32.Im = (*( (CCTK_COMPLEX32 *) output_values[i])).Im;