it passes testsuite on t3e

Thanks thomas.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/DistortedBHIVP/trunk@10 971fb155-194f-0410-9daf-e2eca44e59f5

4 files changed, 16 insertions, 10 deletions

diff --git a/param.ccl b/param.ccl
index 5e581ea..5caf46b 100644
--- a/param.ccl
+++ b/param.ccl
@@ -46,17 +46,17 @@ INT n "sin^n theta in brill wave"
   *:* :: "No restriction"
 } 2
 
-INT ne "Eta resolution for solve"
+INT neta "Eta resolution for solve"
 {
   *:* :: "No restriction"
 } 202
 
-INT nq "Theta resolution for solve"
+INT ntheta "Theta resolution for solve"
 {
   *:* :: "No restriction"
 } 54
 
-INT np "Eta resolution for solve"
+INT nphi "Eta resolution for solve"
 {
   *:* :: "No restriction"
 } 5
diff --git a/src/DistortedBHIVP.F b/src/DistortedBHIVP.F
index f12aad9..1e80ea5 100644
--- a/src/DistortedBHIVP.F
+++ b/src/DistortedBHIVP.F
@@ -62,6 +62,7 @@ c     Perhaps this and others should go into cctk.h
       real*8 rmax,adm
       real*8,parameter :: dbh_eps = 1.0d-9
       real*8 pi
+      integer :: ne, nq, np
       integer :: nx,ny,nz
       integer i,j,k,ier,nquads,nocts,order
       integer npoints,handle,ierror
@@ -69,7 +70,12 @@ c     Perhaps this and others should go into cctk.h
       conformal_state = CONFORMAL_METRIC     
       
       pi = 4.0d0*atan(1.0d0)
-      
+
+c     DON'T use integer*4
+      ne = neta
+      nq = ntheta
+      np = nphi
+
 c     Set up the grid spacings
       nx = cctk_lsh(1)
       ny = cctk_lsh(2)
diff --git a/src/Stab3d.F b/src/Stab3d.F
index b66d17d..dd8292e 100644
--- a/src/Stab3d.F
+++ b/src/Stab3d.F
@@ -6,7 +6,7 @@ c been made.
 c
       implicit none
 c
-      integer*4,intent(in) :: im,jm,km
+      integer,intent(in) :: im,jm,km
       real*8,intent(inout) :: cc(im,jm,km),cn(im,jm,km),cs(im,jm,km),
      $     ce(im,jm,km),cw(im,jm,km),ct(im,jm,km),cb(im,jm,km)
       real*8,intent(out) :: eps
@@ -86,7 +86,7 @@ c been made.
 c
       implicit none
 c
-      integer*4,intent(in) :: im,jm,km
+      integer,intent(in) :: im,jm,km
       integer,intent(in) :: ncyc
       real*8,intent(out) :: cc(im*jm*km),cn(im*jm*km)
       real*8,intent(out) :: cs(im*jm*km),ce(im*jm*km)
@@ -254,7 +254,7 @@ c Be careful that the cs are zero on their outer boundary!!
 c
       implicit none
 c
-      integer*4,intent(in) :: im,jm,km
+      integer,intent(in) :: im,jm,km
       real*8,intent(out) :: cc(im*jm*km),cn(im*jm*km)
       real*8,intent(out) :: cs(im*jm*km),ce(im*jm*km)
       real*8,intent(out) :: cw(im*jm*km),ct(im*jm*km)
diff --git a/test/test_dbh.par b/test/test_dbh.par
index 5e7c431..aa3e5e5 100755
--- a/test/test_dbh.par
+++ b/test/test_dbh.par
@@ -34,9 +34,9 @@ distortedbhivp::c        = 0.5
 distortedbhivp::sigma    = 1.0
 distortedbhivp::etamax   = 6.0
 distortedbhivp::n        = 4
-distortedbhivp::ne       = 102
-distortedbhivp::nq       = 27
-distortedbhivp::np       = 27
+distortedbhivp::neta     = 102
+distortedbhivp::ntheta   = 27
+distortedbhivp::nphi     = 5
 interp::order            = 1