Cleaning up.

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

3 files changed, 23 insertions, 22 deletions

diff --git a/src/brilldata.F b/src/brilldata.F
index 24a745e..253ab15 100644
--- a/src/brilldata.F
+++ b/src/brilldata.F
@@ -1,12 +1,11 @@
+
 #include "cctk.h" 
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
-      subroutine brilldata(CCTK_FARGUMENTS)
+#include "CactusEinstein/Einstein/src/Einstein.h"
 
-c     Author: Carsten Gundlach.
-c
-c     Driver routine for calculating Brill wave initial data.
+      subroutine brilldata(CCTK_FARGUMENTS)
 
       implicit none
 
@@ -14,12 +13,11 @@ c     Driver routine for calculating Brill wave initial data.
       DECLARE_CCTK_PARAMETERS
       DECLARE_CCTK_FUNCTIONS
 
-c     Declare arrays for the linear elliptic solver call:
-
-      integer   Mlin_index,Nsrc_index,field_index,ierr
-      integer   metpsi_index(7)
+      integer Mlin_index,Nsrc_index,field_index,ierr
+      integer metpsi_index(7)
+      integer ierr
 
-      CCTK_REAL AbsTol(3), RelTol(3)
+      CCTK_REAL AbsTol(3),RelTol(3)
 
 c     Set up background metric and coefficients for linear solve.
 
@@ -41,8 +39,8 @@ c     conformal factor.  First some preliminaries.
       call CCTK_VarIndex(metpsi_index(7),"einstein::psi")
 
       call CCTK_VarIndex(field_index,"IDBrillData::brillpsi")
-      call CCTK_VarIndex(Mlin_index,"IDBrillData::Mlinear")
-      call CCTK_VarIndex(Nsrc_index,"IDBrillData::Nsource")
+      call CCTK_VarIndex(Mlin_index, "IDBrillData::Mlinear")
+      call CCTK_VarIndex(Nsrc_index, "IDBrillData::Nsource")
 
       AbsTol(1)= brill_thresh
       AbsTol(2)= -1
@@ -83,9 +81,10 @@ c     Elliptic solver.
      .   field_index,Mlin_index,Nsrc_index,AbsTol,RelTol,"bam")
       end if
 
-c     Synchronize conformal factor.
+c     Synchronization and symmetry boundaries.
 
-      call CCTK_SyncGroup(cctkGH,"einstein::confac")
+      call CCTK_SyncGroup(cctkGH,"IDBrillData::brillconf")
+      call CartSymGN(ierr,cctkGH,"IDBrillData::brillconf")
 
 c     Reconstruct physical metric.
 
diff --git a/src/finishbrilldata.F b/src/finishbrilldata.F
index 4cd4f18..ee49b57 100644
--- a/src/finishbrilldata.F
+++ b/src/finishbrilldata.F
@@ -1,14 +1,11 @@
+
 #include "cctk.h" 
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
-#include "../../../CactusEinstein/Einstein/src/Einstein.h"
 
-      subroutine finishbrilldata(CCTK_FARGUMENTS)
+#include "CactusEinstein/Einstein/src/Einstein.h"
 
-C     Author: Carsten Gundlach.
-C
-C     Set up 3-metric, extrinsic curvature and BM variables
-C     once the conformal factor has been found.
+      subroutine finishbrilldata(CCTK_FARGUMENTS)
 
       implicit none
 
@@ -66,7 +63,7 @@ C
 C              e^2q (drho^2 + dz^2) + rho^2 dphi^2 =
 C              e^2q (dx^2 + dy^2 + dz^2) + (1-e^2q) (xdy-ydx)^2/rho^2
 C
-C               The individual coefficients can be read off as
+C              The individual coefficients can be read off as
 
                if (rho1 .gt. rhofudge) then
 
@@ -77,8 +74,8 @@ C               The individual coefficients can be read off as
 
                else
 
-C              This fudge assumes that q = O(rho^2) near the axis. Which
-C              it should be, or the data will be singular.
+C                 This fudge assumes that q = O(rho^2) near the axis. Which
+C                 it should be, or the data will be singular.
 
                   gzz(i,j,k) = psi4 
                   gxx(i,j,k) = psi4 
diff --git a/src/setupbrilldata2D.F b/src/setupbrilldata2D.F
index 9b00de9..5643cf0 100644
--- a/src/setupbrilldata2D.F
+++ b/src/setupbrilldata2D.F
@@ -58,9 +58,14 @@ C     [Delta(g) + Mlinear] psi = Nsource.
 
       psi = one
 
+      psix = zero
+      psiy = zero
+      psiz = zero
+
       gxx = one
       gyy = one
       gzz = one
+
       gxy = zero
       gxz = zero
       gyz = zero