Changing "integer" to CCTK_INT. Apparently the inconsistent use of both

in different places was causing trouble on the t3e.


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

8 files changed, 31 insertions, 34 deletions

diff --git a/src/AHFinder_exp.F b/src/AHFinder_exp.F
index d93abb5..f35a983 100644
--- a/src/AHFinder_exp.F
+++ b/src/AHFinder_exp.F
@@ -33,9 +33,9 @@
       DECLARE_CCTK_FARGUMENTS
       DECLARE_CCTK_PARAMETERS
 
-      integer i,j,k
-      integer CCTK_Equals
-      integer istat
+      CCTK_INT i,j,k
+      CCTK_INT CCTK_Equals
+      CCTK_INT istat
 
       CCTK_REAL det,idet
       CCTK_REAL gdxx,gdyy,gdzz,gdxy,gdxz,gdyz
diff --git a/src/AHFinder_find3.F b/src/AHFinder_find3.F
index dfcc8a8..3629a7d 100644
--- a/src/AHFinder_find3.F
+++ b/src/AHFinder_find3.F
@@ -23,7 +23,7 @@
       DECLARE_CCTK_FARGUMENTS
       DECLARE_CCTK_PARAMETERS
 
-      integer mtype
+      CCTK_INT mtype
 
       CCTK_REAL one
 
diff --git a/src/AHFinder_flow.F b/src/AHFinder_flow.F
index ef4e598..d57fa02 100644
--- a/src/AHFinder_flow.F
+++ b/src/AHFinder_flow.F
@@ -27,8 +27,8 @@
 
       logical status,new
 
-      integer itmax
-      integer i,j,l,m
+      CCTK_INT itmax
+      CCTK_INT i,j,l,m
 
       CCTK_REAL rmx,ahftol
       CCTK_REAL A,B
@@ -592,7 +592,7 @@
 
 
 
-      real*8 function spher(theta,phi)
+      CCTK_REAL function spher(theta,phi)
 
 !     Function to reconstruct a function pointwise
 !     from the expansion coefficients {c0,cc,cs}.
@@ -601,12 +601,12 @@
 
       implicit none
 
-      integer l,m
+      CCTK_INT l,m
 
-      real*8 LEGEN
-      real*8 theta,phi
-      real*8 F,cost,cosa,sina
-      real*8 aux
+      CCTK_REAL LEGEN
+      CCTK_REAL theta,phi
+      CCTK_REAL F,cost,cosa,sina
+      CCTK_REAL aux
 
 
 !     ******************************
diff --git a/src/AHFinder_gau.F b/src/AHFinder_gau.F
index 31087b6..2d3051c 100644
--- a/src/AHFinder_gau.F
+++ b/src/AHFinder_gau.F
@@ -29,15 +29,16 @@
       logical firstgau
       logical firstcal(4)
 
-      integer gxx_index,gyy_index,gzz_index,gxy_index,gxz_index,gyz_index
-      integer ahfgauss_index
-      integer handle,x_index,y_index,z_index
-      INTEGER istat
+      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 istat
 
       CCTK_INT i,j,k,l,m,n,p
       CCTK_INT npoints
       CCTK_INT error1,error2,ierror
       CCTK_INT getoutpfx
+      CCTK_INT sum_handle
 
       CCTK_REAL LEGEN
       CCTK_REAL theta,phi,xp,yp,zp,rp
@@ -64,10 +65,6 @@
 
       character*200 gaussf
 
-!     Reduction related things.
-
-      integer sum_handle
-
 !     Declarations for macros.
 
 #include "CactusEinstein/Einstein/src/Einstein.h"
diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F
index b485149..82ff1bf 100644
--- a/src/AHFinder_int.F
+++ b/src/AHFinder_int.F
@@ -25,12 +25,12 @@
       DECLARE_CCTK_PARAMETERS
       DECLARE_CCTK_FUNCTIONS
 
-      integer i,j,l,m
-      integer npt,npp
-      integer l_ntheta,l_nphi,theta0,phi0
-      integer npoints
-      integer ierror,auxi
-      integer handle
+      CCTK_INT i,j,l,m
+      CCTK_INT npt,npp
+      CCTK_INT l_ntheta,l_nphi,theta0,phi0
+      CCTK_INT npoints
+      CCTK_INT ierror,auxi
+      CCTK_INT handle
 
       CCTK_REAL LEGEN
       CCTK_REAL theta,phi,xp,yp,zp,rp
diff --git a/src/AHFinder_leg.F b/src/AHFinder_leg.F
index 2215539..4cafb24 100644
--- a/src/AHFinder_leg.F
+++ b/src/AHFinder_leg.F
@@ -25,9 +25,9 @@
 
       implicit none
 
-      integer L,M
-      integer LOLD1,LOLD2,MOLD1,MOLD2
-      integer I,LL
+      CCTK_INT L,M
+      CCTK_INT LOLD1,LOLD2,MOLD1,MOLD2
+      CCTK_INT I,LL
 
       CCTK_REAL X,Y
       CCTK_REAL PMM,PLL,PMMP1,SOMX2,FACT
diff --git a/src/AHFinder_min.F b/src/AHFinder_min.F
index 6afd610..534272c 100644
--- a/src/AHFinder_min.F
+++ b/src/AHFinder_min.F
@@ -22,9 +22,9 @@
 
       logical status,found
 
-      integer i,NN
-      integer l,m
-      CCTK_INT ITER,ITMAX
+      CCTK_INT i,NN
+      CCTK_INT l,m
+      CCTK_INT iter,itmax
 
       CCTK_REAL FTOL,FRET
       CCTK_REAL zero,half,one
diff --git a/src/AHFinder_pow.F b/src/AHFinder_pow.F
index a4e5ed7..ea8d2aa 100644
--- a/src/AHFinder_pow.F
+++ b/src/AHFinder_pow.F
@@ -230,7 +230,7 @@
       logical error
 
       CCTK_INT i,j,N
-      integer l,m
+      CCTK_INT l,m
 
       CCTK_REAL XA,XB,XX,FA,FB,FX
       CCTK_REAL FRET,PARABOLA,XMIN,TOL
@@ -681,7 +681,7 @@
 
       logical flag
 
-      integer i,l,m,N
+      CCTK_INT i,l,m,N
       CCTK_INT iter
       CCTK_INT getoutpfx