Changes made by Ryoji.

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

4 files changed, 20 insertions, 17 deletions

diff --git a/src/AHFinder_dat.F b/src/AHFinder_dat.F
index ce90e28..da24e65 100644
--- a/src/AHFinder_dat.F
+++ b/src/AHFinder_dat.F
@@ -30,7 +30,7 @@
 
       integer lmax,stepx,stepy,stepz
       integer ntheta,nphi
-      integer nfile
+      CCTK_INT nfile
       integer interror1,interror2,interror3
       integer mfind,ahf_ncall
       integer nx,ny,nz
diff --git a/src/AHFinder_gau.F b/src/AHFinder_gau.F
index 7ba23b1..fa0747b 100644
--- a/src/AHFinder_gau.F
+++ b/src/AHFinder_gau.F
@@ -29,12 +29,13 @@
       logical firstgau
       logical firstcal(4)
 
-      CCTK_INT gxx_index,gyy_index,gzz_index,gxy_index,gxz_index,gyz_index
-      CCTK_INT ahfgauss_index
-      CCTK_INT handle,x_index,y_index,z_index
-      CCTK_INT sum_handle
-
-      integer i,j,k,l,m,n,p
+      integer gxx_index,gyy_index,gzz_index,gxy_index,gxz_index,gyz_index
+      integer ahfgauss_index
+      integer x_index,y_index,z_index
+      
+      integer handle,sum_handle
+      integer j,k,l,m,n,p
+      CCTK_INT i
       integer npoints
       integer error1,error2,ierror
 
diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F
index 3a00d5c..7ddd37e 100644
--- a/src/AHFinder_int.F
+++ b/src/AHFinder_int.F
@@ -30,8 +30,10 @@
       integer l_ntheta,l_nphi,theta0,phi0
       integer npoints
       integer ierror
+      integer handle
+      integer auxi      
 
-      CCTK_INT handle,auxi
+      CCTK_INT aux_int
 
       CCTK_REAL LEGEN
       CCTK_REAL theta,phi,xp,yp,zp,rp
@@ -54,7 +56,8 @@
 
 !     Reduction related things.
 
-      CCTK_INT reduction_handle,red_tmp
+      integer reduction_handle
+      CCTK_INT red_tmp
 
 !     Variables to be saved for next call.
 
@@ -593,7 +596,7 @@
      .   CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL)
 
 !     Check if we are either inside mask, or to close for comfort.
-
+      
       if (.not.CCTK_EQUALS(ahf_mask,'off')) then
 
          interror3 = 0
@@ -761,7 +764,6 @@
      .                 + da(i+1,j  )*exp(i+1,j  )
      .                 + da(i  ,j+1)*exp(i  ,j+1)
      .                 + da(i+1,j+1)*exp(i+1,j+1))
-
                intexp2 = intexp2 + quarter
      .                 *(da(i  ,j  )*exp(i  ,j  )**2
      .                 + da(i+1,j  )*exp(i+1,j  )**2
@@ -956,12 +958,12 @@
 !     negative expansion elements on surface
 
       call CCTK_ReduceLocalScalar(ierror,cctkGH,-1,reduction_handle,
-     .     inside_min_neg_count,auxi,CCTK_VARIABLE_INT) 
-      inside_min_neg_count=auxi
+     .     inside_min_neg_count,aux_int,CCTK_VARIABLE_INT) 
+      inside_min_neg_count=aux_int
 
       call CCTK_ReduceLocalScalar(ierror,cctkGH,-1,reduction_handle,
-     .     inside_min_count,auxi,CCTK_VARIABLE_INT) 
-      inside_min_count=auxi
+     .     inside_min_count,aux_int,CCTK_VARIABLE_INT) 
+      inside_min_count=aux_int
 
 !     Spectral components for flow.
 
diff --git a/src/SetSym.F b/src/SetSym.F
index 8b72363..bd95a81 100644
--- a/src/SetSym.F
+++ b/src/SetSym.F
@@ -33,9 +33,9 @@
       DECLARE_CCTK_FARGUMENTS 
       DECLARE_CCTK_PARAMETERS
 
-      CCTK_INT sym(3)
+      integer sym(3)
       CCTK_INT CCTK_Equals
-      CCTK_INT, PARAMETER :: one = 1
+      integer, PARAMETER :: one = 1
       INTEGER :: ierr
 
 c     +,+,+