minor modifications, fixed a mistake

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@385 89daf98e-ef62-4674-b946-b8ff9de2216c

2 files changed, 19 insertions, 20 deletions

diff --git a/src/AHFinder_gau.F b/src/AHFinder_gau.F
index d4d03ed..1a27d21 100644
--- a/src/AHFinder_gau.F
+++ b/src/AHFinder_gau.F
@@ -86,11 +86,11 @@ c      CCTK_REAL i2dx,i2dy,i2dz,idxx,idyy,idzz,idxy,idxz,idyz
       character(len=200) :: gaussf
 
 !     Reduction variables
-      CCTK_INT , dimension(1) :: input_array_dim
       CCTK_POINTER_TO_CONST, dimension(3) :: input_array
       CCTK_POINTER, dimension(1) :: reduction_value
       CCTK_POINTER, dimension(3) :: reduction_value3
-      CCTK_INT, dimension(3) ::input_array_type
+      CCTK_INT, dimension(1) ::input_array_type
+      CCTK_INT, dimension(3) ::input_array_type3
       
 !     Declarations for macros.
 
@@ -655,30 +655,29 @@ c#include "CactusEinstein/ADMMacros/src/macro/ADM_Spacing_declare.h"
 !     know about this since all will participate on the interpolation
 !     below).
 
-      input_array_dim(1) = zero
+      input_array_type(1) = CCTK_VARIABLE_INT
       reduction_value(1)= CCTK_PointerTo(rerror)
       input_array(1)    = CCTK_PointerTo(error1)
+      
       call CCTK_ReduceArraysGlobally(ierror, cctkGH, -1,sum_handle, -1,
-     .   1, input_array,0, input_array_dim, CCTK_VARIABLE_INT, 1,
-     .   CCTK_VARIABLE_INT, reduction_value)
+     .   1, input_array,0, 0, input_array_type, 1,
+     .   input_array_type, reduction_value)
       
       if (ierror.ne.0) then
          call CCTK_WARN(1,"Reduction failed!")
       end if
       error1 = rerror
 
-      input_array(1)    = CCTK_PointerTo(error1)
+      input_array(1)    = CCTK_PointerTo(error2)
       call CCTK_ReduceArraysGlobally(ierror, cctkGH, -1,sum_handle, -1,
-     .   1, input_array,0, input_array_dim, CCTK_VARIABLE_INT, 1,
-     .   CCTK_VARIABLE_INT, reduction_value)
+     .   1, input_array,0, 0, input_array_type, 1,
+     .   input_array_type, reduction_value)
 
       if (ierror.ne.0) then
          call CCTK_WARN(1,"Reduction failed!")
       end if
       error2 = rerror
-
-      input_array_dim = 0
-      
+     
       input_array(1) = CCTK_PointerTo(ahf_centroid(1))
       input_array(2) = CCTK_PointerTo(ahf_centroid(2))
       input_array(3) = CCTK_PointerTo(ahf_centroid(3))
@@ -687,13 +686,13 @@ c#include "CactusEinstein/ADMMacros/src/macro/ADM_Spacing_declare.h"
       reduction_value3(2) = CCTK_PointerTo(rahf_centroid(2))
       reduction_value3(3) = CCTK_PointerTo(rahf_centroid(3))
       
-      input_array_type(1) = CCTK_VARIABLE_REAL
-      input_array_type(2) = CCTK_VARIABLE_REAL
-      input_array_type(3) = CCTK_VARIABLE_REAL
+      input_array_type3(1) = CCTK_VARIABLE_REAL
+      input_array_type3(2) = CCTK_VARIABLE_REAL
+      input_array_type3(3) = CCTK_VARIABLE_REAL
       
       call CCTK_ReduceArraysGlobally(ierror, cctkGH, -1,sum_handle, -1,
-     .   3, input_array,0, input_array_dim, input_array_type, 3,
-     .   input_array_type, reduction_value)
+     .   3, input_array,0, 0, input_array_type3, 3,
+     .   input_array_type3, reduction_value)
 
       if (ierror.ne.0) then
          call CCTK_WARN(1,"Reduction failed!")
diff --git a/src/AHFinder_mask.F b/src/AHFinder_mask.F
index a781ca5..266695f 100644
--- a/src/AHFinder_mask.F
+++ b/src/AHFinder_mask.F
@@ -39,7 +39,7 @@
       CCTK_REAL xa,ya,za
 
 !     Reduction variables
-      CCTK_INT, dimension(1) :: input_array_dim
+      CCTK_INT, dimension(1) :: input_array_type
       CCTK_POINTER_TO_CONST, dimension(1) :: input_array
       CCTK_POINTER, dimension(1) :: reduction_value
 
@@ -125,12 +125,12 @@
           call CCTK_WARN(1,"Cannot get handle for minimum reduction ! Forgot to activate an implementation providing reduction operators ??")
         end if
 
-        input_array_dim(1)    = zero
+        input_array_type(1)    = CCTK_VARIABLE_INT
         input_array(1)     = CCTK_PointerTo(rhor)
         reduction_value(1) = CCTK_PointerTo(rhortemp)
         call CCTK_ReduceArraysGlobally(ierr, cctkGH, -1,reduce_handle, -1,
-     .     1, input_array,0, input_array_dim, CCTK_VARIABLE_INT, 1,
-     .     CCTK_VARIABLE_INT, reduction_value)
+     .     1, input_array,0, input_array_dim, input_array_type, 1,
+     .     input_array_type, reduction_value)
      
         rhor = rhortemp