Homogenise parameters, changed documentation

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDBrillData/trunk@82 a678b1cf-93e1-4b43-a69d-d43939e66649

4 files changed, 30 insertions, 49 deletions

diff --git a/src/brilldata.F b/src/brilldata.F
index 3c91b97..e38afaa 100644
--- a/src/brilldata.F
+++ b/src/brilldata.F
@@ -75,7 +75,7 @@ c     Set up background metric and coefficients for linear solve.
 
 c     Tolerances for elliptic solve.
 
-      AbsTol(1)= brill_thresh
+      AbsTol(1)= thresh
       AbsTol(2)= -1.0D0
       AbsTol(3)= -1.0D0
  
@@ -94,14 +94,14 @@ c     Elliptic solver
 c     Just in case some solvers do not use the standard interface
       conformal_state = 0
 
-      if (CCTK_EQUALS(brill_solver,"sor")) then
+      if (CCTK_EQUALS(solver,"sor")) then
          call Ell_SetIntKey(ierr,sor_maxit,"Ell::SORmaxit")
          call Ell_LinMetricSolver(ierr,cctkGH, 
      .   metric_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"sor")
-      else if (CCTK_EQUALS(brill_solver,"petsc")) then
+      else if (CCTK_EQUALS(solver,"petsc")) then
          call Ell_LinMetricSolver(ierr,cctkGH, 
      .   metric_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"petsc")
-      else if (CCTK_EQUALS(brill_solver,"bam")) then
+      else if (CCTK_EQUALS(solver,"bam")) then
          call Ell_LinMetricSolver(ierr,cctkGH, 
      .   metric_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"bam")
       end if
diff --git a/src/finishbrilldata.F b/src/finishbrilldata.F
index 467c28d..bd13c79 100644
--- a/src/finishbrilldata.F
+++ b/src/finishbrilldata.F
@@ -21,10 +21,9 @@
       DECLARE_CCTK_FUNCTIONS
 
       integer i,j,k
-      integer nx,ny,nz
 
       CCTK_REAL x1,y1,z1,rho1,rho2
-      CCTK_REAL phi,psi4,e2q,rhofudge
+      CCTK_REAL phi,psi4,e2q
       CCTK_REAL zero,one
 
       CCTK_REAL brillq,phif
@@ -34,22 +33,12 @@ c     Numbers.
       zero = 0.0D0
       one  = 1.0D0
 
-c     Set up grid size.
-
-      nx = cctk_lsh(1)
-      ny = cctk_lsh(2)
-      nz = cctk_lsh(3)
-
-c     Parameters.
-
-      rhofudge = brill_rhofudge
-      
 c     Replace flat metric left over from elliptic solve by
 c     Brill metric calculated from q and Psi.
 
-      do k=1,nz
-         do j=1,ny
-            do i=1,nx
+      do k=1,cctk_lsh(3)
+         do j=1,cctk_lsh(2)
+            do i=1,cctk_lsh(1)
 
                x1 = x(i,j,k)
                y1 = y(i,j,k)
@@ -84,13 +73,23 @@ c              The individual coefficients can be read off as
 c                 This fudge assumes that q = O(rho^2) near the axis. Which
 c                 it should be, or the data will be singular.
 
-                  gxx(i,j,k) = 0.0d0
-                  gyy(i,j,k) = 0.0d0
-                  gzz(i,j,k) = 0.0d0
-                  gxy(i,j,k) = 0.0d0
+                  gxx(i,j,k) = zero
+                  gyy(i,j,k) = zero
+                  gzz(i,j,k) = zero
+                  gxy(i,j,k) = zero
 
                end if
 
+               gxz(i,j,k) = zero
+               gyz(i,j,k) = zero
+
+               kxx(i,j,k) = zero
+               kyy(i,j,k) = zero
+               kzz(i,j,k) = zero
+               kxy(i,j,k) = zero
+               kxz(i,j,k) = zero
+               kyz(i,j,k) = zero
+
             end do
          end do
       end do
@@ -99,9 +98,9 @@ c                 it should be, or the data will be singular.
 
          conformal_state = 1
 
-         do k=1,nz
-            do j=1,ny
-               do i=1,nx
+         do k=1,cctk_lsh(3)
+            do j=1,cctk_lsh(2)
+               do i=1,cctk_lsh(1)
 
                   psi(i,j,k) = brillpsi(i,j,k)
                   
@@ -113,9 +112,9 @@ c                 it should be, or the data will be singular.
 
          conformal_state = 0
 
-         do k=1,nz
-            do j=1,ny
-               do i=1,nx
+         do k=1,cctk_lsh(3)
+            do j=1,cctk_lsh(2)
+               do i=1,cctk_lsh(1)
 
                   psi4  = brillpsi(i,j,k)**4
 
@@ -130,19 +129,5 @@ c                 it should be, or the data will be singular.
 
       end if
 
-c     In any case,
-
-      gxz = zero
-      gyz = zero
-
-c     Vanishing extrinsic curvature completes the Cauchy data.
-
-      kxx = zero
-      kyy = zero
-      kzz = zero
-      kxy = zero
-      kxz = zero
-      kyz = zero
-
       return
       end
diff --git a/src/setupbrilldata2D.F b/src/setupbrilldata2D.F
index f2e5f13..185bef5 100644
--- a/src/setupbrilldata2D.F
+++ b/src/setupbrilldata2D.F
@@ -103,7 +103,7 @@ c              will not be regular on the axis.
 c     Synchronization and boundaries.
 
 c      call CCTK_SyncGroup(ierr,cctkGH,'idbrilldata::brillelliptic')
-      call CartSymGN(ierr,cctkGH,'idbrilldata::brillelliptic')
+c      call CartSymGN(ierr,cctkGH,'idbrilldata::brillelliptic')
 
       return
       end
diff --git a/src/setupbrilldata3D.F b/src/setupbrilldata3D.F
index 97cf28b..b77d886 100644
--- a/src/setupbrilldata3D.F
+++ b/src/setupbrilldata3D.F
@@ -47,7 +47,7 @@ c      c        \         z      rho                    phi          phi    /
 
       CCTK_REAL x1,y1,z1,rho1,rho2
       CCTK_REAL phi,phif,e2q
-      CCTK_REAL brillq,rhofudge,eps
+      CCTK_REAL brillq,eps
       CCTK_REAL zero,one,two,three
 
 c     Define numbers
@@ -57,10 +57,6 @@ c     Define numbers
       two   = 2.0D0
       three = 3.0D0
 
-c     Parameters.
-
-      rhofudge = brill_rhofudge
-
 c     Epsilon for finite differencing.
 
       eps = cctk_delta_space(1)