Some cleaning up. Gerd: Sorry, but c0(0) was initialized inside AHfinder_flow,

so there must be another problem.

Miguel


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

1 files changed, 18 insertions, 19 deletions

diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F
index 172e0d9..e2811a6 100644
--- a/src/AHFinder_int.F
+++ b/src/AHFinder_int.F
@@ -31,7 +31,6 @@ c#endif
       integer handle,x_index,y_index,z_index
       CCTK_REAL maxval(3),minval(3)
 
-
       integer i,j
       integer l,m
       integer npt,npp
@@ -169,12 +168,11 @@ c     Get the reduction handel for the sum operation
       call CCTK_MyProc(myproc)
       call CCTK_nProcs(nprocs)
 
+
 !     *********************************
 !     ***   INITIALIZE PARAMETERS   ***
 !     *********************************
 
-
-
       if (firstint) then
 
          firstint = .false.
@@ -222,7 +220,6 @@ c     Get the reduction handel for the sum operation
 
 !        For cartoon this is trivial.
 
-
          if (cartoon) then
 
             npt = nprocs
@@ -547,12 +544,14 @@ c     Get the reduction handel for the sum operation
       end if
 
 !     Reduce the errors across processors.
+
       call CCTK_ReduceLocalScalar(ierror, cctkGH, -1, reduction_handle, 
      $     interror1, i, CCTK_VARIABLE_INT) 
       if (ierror.ne.0) then
          call CCTK_WARN(1,"Reduction of norm failed!");
       endif
       interror1 = i
+
       call CCTK_ReduceLocalScalar(ierror, cctkGH, -1, reduction_handle, 
      $     interror2, i, CCTK_VARIABLE_INT) 
       if (ierror.ne.0) then
@@ -560,7 +559,6 @@ c     Get the reduction handel for the sum operation
       endif
       interror2 = i
 
-
 c#ifdef MPI
 c
 c      call mpi_allreduce(interror1,i,1,MPI_INTEGER,
@@ -592,7 +590,6 @@ c#endif
 
       npoints = (l_ntheta+1)*(l_nphi+1)
 
-
 ! new interp
       call CCTK_GetInterpHandle (handle, "simple")
       call CCTK_VarIndex (gxx_index, "einstein::gxx")
@@ -605,17 +602,16 @@ c#endif
       call CCTK_VarIndex (gradn_index, "ahfinder::ahfgradn")
 
       call CCTK_InterpGF (ierror, cctkGH, handle, npoints, 3, 8, 8,
-     $     xa, ya, za, 
-     $     CCTK_VARIABLE_REAL, CCTK_VARIABLE_REAL,
-     $     CCTK_VARIABLE_REAL,
-     $     gxx_index,gyy_index,gzz_index,
-     $     gxy_index,gxz_index,gyz_index,
-     $     exp_index,gradn_index,
-     $     txx,tyy,tzz,txy,txz,tyz,exp,gradn,
-     $     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,
-     $     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,
-     $     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL )
-
+     .     xa, ya, za, 
+     .     CCTK_VARIABLE_REAL, CCTK_VARIABLE_REAL,
+     .     CCTK_VARIABLE_REAL,
+     .     gxx_index,gyy_index,gzz_index,
+     .     gxy_index,gxz_index,gyz_index,
+     .     exp_index,gradn_index,
+     .     txx,tyy,tzz,txy,txz,tyz,exp,gradn,
+     .     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,
+     .     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,
+     .     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL )
 
 !     Find 2D array for area element.
 
@@ -857,7 +853,8 @@ c#endif
                      gupij(2,3) = idet*(txy(i,j)*txz(i,j)-txx(i,j)*tyz(i,j))
                      gupij(3,2) = gupij(2,3)
 
-                     call AHFinder_calcsigma(CCTK_FARGUMENTS,xw,yw,zw,gupij,sigma)
+                     call AHFinder_calcsigma(CCTK_FARGUMENTS,
+     .               xw,yw,zw,gupij,sigma)
 
                   end if
 
@@ -925,6 +922,7 @@ c#endif
 !     Reduce the integrals across processors.
 
 !     Area and expansion.
+
       call CCTK_ReduceLocalScalar(ierror, cctkGH, -1, reduction_handle, 
      $     intarea, aux, CCTK_VARIABLE_REAL) 
       intarea=aux
@@ -938,7 +936,8 @@ c#endif
      $     intexpdel2, aux, CCTK_VARIABLE_REAL) 
       intexpdel2=aux
 
-!     negative expansion elements on surfac
+!     negative expansion elements on surface
+
       call CCTK_ReduceLocalScalar(ierror, cctkGH, -1, reduction_handle, 
      $     inside_min_neg_count, aux, CCTK_VARIABLE_REAL) 
       inside_min_neg_count=aux