Conversion to CactusEinstein2.

Some minor documentation fixes/updates.


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

7 files changed, 11 insertions, 29 deletions

diff --git a/src/brilldata.F b/src/brilldata.F
index bf02a00..596da0d 100644
--- a/src/brilldata.F
+++ b/src/brilldata.F
@@ -12,7 +12,6 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
-#include "CactusEinstein/Einstein/src/Einstein.h"
 #include "CactusElliptic/EllBase/src/EllBase.h"
 
       subroutine brilldata(CCTK_ARGUMENTS)
@@ -31,13 +30,13 @@
 
 c     Get indices for metric.
 
-      call CCTK_VarIndex(metpsi_index(1), "einstein::gxx")
-      call CCTK_VarIndex(metpsi_index(2), "einstein::gxy")
-      call CCTK_VarIndex(metpsi_index(3), "einstein::gxz")
-      call CCTK_VarIndex(metpsi_index(4), "einstein::gyy")
-      call CCTK_VarIndex(metpsi_index(5), "einstein::gyz")
-      call CCTK_VarIndex(metpsi_index(6), "einstein::gzz")
-      call CCTK_VarIndex(metpsi_index(7), "einstein::psi")
+      call CCTK_VarIndex(metpsi_index(1), "admbase::gxx")
+      call CCTK_VarIndex(metpsi_index(2), "admbase::gxy")
+      call CCTK_VarIndex(metpsi_index(3), "admbase::gxz")
+      call CCTK_VarIndex(metpsi_index(4), "admbase::gyy")
+      call CCTK_VarIndex(metpsi_index(5), "admbase::gyz")
+      call CCTK_VarIndex(metpsi_index(6), "admbase::gzz")
+      call CCTK_VarIndex(metpsi_index(7), "staticconformal::psi")
 
 c     Get indices for grid functions.
 
@@ -117,4 +116,3 @@ c     Reconstruct physical metric.
 
       return
       end
-
diff --git a/src/brillq.F b/src/brillq.F
index ad366c2..bbd9220 100644
--- a/src/brillq.F
+++ b/src/brillq.F
@@ -141,6 +141,3 @@ c     If desired, multiply with a phi dependent factor.
 
       return
       end
-
-
-
diff --git a/src/finishbrilldata.F b/src/finishbrilldata.F
index 84de87e..1505d90 100644
--- a/src/finishbrilldata.F
+++ b/src/finishbrilldata.F
@@ -12,8 +12,6 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
-#include "CactusEinstein/Einstein/src/Einstein.h"
-
       subroutine finishbrilldata(CCTK_ARGUMENTS)
 
       implicit none
@@ -113,5 +111,3 @@ c     Vanishing extrinsic curvature completes the Cauchy data.
 
       return
       end
-
-
diff --git a/src/make.code.defn b/src/make.code.defn
index 06f1ddb..725c1de 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -2,7 +2,4 @@
 # Sub-makefile for thorn IDBrillData
 
 SRCS = brilldata.F setupbrilldata2D.F setupbrilldata3D.F \
-       brillq.F phif.F finishbrilldata.F Startup.c
-
-
-
+       brillq.F phif.F finishbrilldata.F Startup.c ParamCheck.c
diff --git a/src/phif.F b/src/phif.F
index 3d9bf79..6ef94c8 100644
--- a/src/phif.F
+++ b/src/phif.F
@@ -50,4 +50,3 @@ c     Use signs of {x,y} to move to correct quadrant.
 
       return
       end
-
diff --git a/src/setupbrilldata2D.F b/src/setupbrilldata2D.F
index c91086b..98ffe80 100644
--- a/src/setupbrilldata2D.F
+++ b/src/setupbrilldata2D.F
@@ -12,8 +12,6 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
-#include "CactusEinstein/Einstein/src/Einstein.h"
-
       subroutine setupbrilldata2D(CCTK_ARGUMENTS)
 
 c     Set up axisymmetric Brill data for elliptic solve. The elliptic
diff --git a/src/setupbrilldata3D.F b/src/setupbrilldata3D.F
index f4550d5..d9377c0 100644
--- a/src/setupbrilldata3D.F
+++ b/src/setupbrilldata3D.F
@@ -12,8 +12,6 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
-#include "CactusEinstein/Einstein/src/Einstein.h"
-
       subroutine setupbrilldata3D(CCTK_ARGUMENTS)
 
 c     Set up 3D Brill data for elliptic solve.  The elliptic
@@ -82,9 +80,9 @@ c     Initialize psi.
 
 c     Set up conformal metric.
 
-      if (use_conformal == 1) then
+      if (CCTK_EQUALS(metric_type,"static conformal")) then
       
-         conformal_state = CONFORMAL_METRIC
+         conformal_state = 3
          do k=1,nz
             do j=1,ny
                do i=1,nx
@@ -104,7 +102,7 @@ c     Set up conformal metric.
 
       else
 
-         conformal_state = NOCONFORMAL_METRIC
+         conformal_state = 0
 
       end if
          
@@ -225,4 +223,3 @@ c     Synchronization and boundaries.
 
       return
       end
-