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

14 files changed, 37 insertions, 69 deletions

diff --git a/README b/README
index a6b13a9..e260669 100644
--- a/README
+++ b/README
@@ -1,9 +1,7 @@
-Cactus Code Thorn BrillData
+Cactus Code Thorn IDBrillData
 Authors    : Carsten Gundlach, Miguel Alcubierre
 Managed by : C.G. <gundlach@aei-potsdam.mpg.de>
              M.A. <miguel@aei-potsdam.mpg.de>
 --------------------------------------------------------------------------
 
 Initializes Brill wave data.
-
-
diff --git a/doc/documentation.tex b/doc/documentation.tex
index 59a7721..f820382 100644
--- a/doc/documentation.tex
+++ b/doc/documentation.tex
@@ -22,17 +22,17 @@ ds^2 = \Psi^4 \left[ e^{2q} \left( d\rho^2 + dz^2 \right)
 \label{eqn:brillmetric}
 \end{equation}
 where $q$ is a free function subject to certain regularity and
-fall-off conditions and $Psi$ is a conformal factor to be solved for.
+fall-off conditions and $\Psi$ is a conformal factor to be solved for.
 
 The thorn considers several different forms of the function $q$
 depending on certain parameters that will be described below.
 Substituting the metric above into the Hamiltonian constraint results
-in an elliptic equation for the conformal factor $Psi$ that can be
+in an elliptic equation for the conformal factor $\Psi$ that can be
 solved numerically once the function $q$ has been specified. The
 initial data is also assumed to be time-symmetric, so the momentum
 constraints are trivially satisfied.
 
-The thorn is activated by choosing the standard Cactus parameter
+The thorn is activated by choosing the CactusEinstein/ADMBase parameter
 ``initial\_data'' in one of the following two ways:
 
 \begin{itemize}
@@ -110,17 +110,10 @@ q \rightarrow q \left[ 1 + d \frac{\rho^m}{1 + e \rho^m}
   
 \item brill\_srho (REAL):  $\sigma_\rho$ in above
   expressions (default 1.0).
-  
-\item savepsi (KEYWORD): Save conformal factor for output?
-  [``yes'',''no''] Normally, the conformal factor is calculated in the
-  grid function ``psi'', but this is set back to 1 at the end once the
-  physical metric has been constructed.  Setting this parameter to
-  ``yes'' copies the conformal factor to the grid function
-  ``brillpsi0'' before resetting it to 1 (default ``no'').
-
+ 
 \end{itemize}
 
-The elliptic solver is controlled by additional the parameters:
+The elliptic solver is controlled by the additional parameters:
 
 \begin{itemize}
   
diff --git a/interface.ccl b/interface.ccl
index 213a530..01f50b5 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -1,8 +1,8 @@
-# Interface definition for thorn BrillData
+# Interface definition for thorn IDBrillData
 # $Header$
 
 implements: IDBrillData
-inherits: grid einstein ellbase
+inherits: grid ADMBase StaticConformal ellbase
 
 # Grid functions for linear elliptic equation.
 
diff --git a/par/brilldata.par b/par/brilldata.par
index 3ba8bbb..1c55e65 100644
--- a/par/brilldata.par
+++ b/par/brilldata.par
@@ -6,7 +6,7 @@
 #
 ##############################################################################
 
-ActiveThorns = "time boundary iobasic ellbase ellsor idbrilldata pugh pughreduce pughslab einstein cartgrid3d ioutil ioascii"
+ActiveThorns = "time boundary iobasic ellbase ellsor idbrilldata pugh pughreduce pughslab ADMBase staticconformal cartgrid3d ioutil ioascii"
 
 # General
 
@@ -22,7 +22,8 @@ cactus::cctk_itlast 				= 0
 
 # Brill wave initial data
 
-Einstein::initial_data 				= "brilldata"
+ADMBase::initial_data 				= "brilldata"
+ADMBase::metric_type				= "static conformal"
 
 # Brill wave parameters
 
@@ -41,6 +42,6 @@ idbrilldata::sor_maxit				= 1000
 IO::out_every = 1
 IO::outdir = "brilldata"
 
-IOASCII::out1D_vars = "einstein::gxx einstein::gyy einstein::gzz einstein::gxy einstein::gxz einstein::gyz idbrilldata::brillpsi"
+IOASCII::out1D_vars = "ADMBase::gxx ADMBase::gyy ADMBase::gzz ADMBase::gxy ADMBase::gxz ADMBase::gyz idbrilldata::brillpsi"
 
-IOBasic::outScalar_vars = "einstein::gxx einstein::gyy einstein::gzz einstein::gxy einstein::gxz einstein::gyz idbrilldata::brillpsi"
+IOBasic::outScalar_vars = "ADMBase::gxx ADMBase::gyy ADMBase::gzz ADMBase::gxy ADMBase::gxz ADMBase::gyz idbrilldata::brillpsi"
diff --git a/param.ccl b/param.ccl
index b2a9892..7f5277e 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,17 +1,14 @@
 # Parameter definitions for thorn IDBrillData
 # $Header$
 
-
-shares:einstein
+shares: ADMBase
 
 EXTENDS KEYWORD initial_data 
 {
    "brilldata"   :: "Brill wave initial data"
 } ""
 
-EXTENDS BOOLEAN use_conformal 
-{
-}
+USES KEYWORD metric_type
 
 
 private:
@@ -142,10 +139,3 @@ INT sor_maxit "Maximum number of iterations"
 {
 0:* :: "Positive"
 } 100
-
-
-
-
-
-
-
diff --git a/schedule.ccl b/schedule.ccl
index 2971539..1e807d3 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -7,15 +7,18 @@ if (CCTK_Equals(initial_data,"brilldata"))
   STORAGE: brillconf
   STORAGE: brillelliptic
 
+  schedule IDBrillData_ParamChecker at CCTK_PARAMCHECK
+  {
+    LANG: C
+  } "Check that the metric_type is recognised"
+
   schedule BrilData_InitSymBound at CCTK_BASEGRID
   {
     LANG: C
   } "Set up symmetries for brillpsi"
 
-  schedule brilldata at CCTK_INITIAL
+  schedule brilldata in ADMBase_InitialData
   {
     LANG: Fortran
   } "Construct Brill wave initial data"
 }
-
-
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
-
diff --git a/test/test_brilldata_1.par b/test/test_brilldata_1.par
index f41e807..043a2d0 100644
--- a/test/test_brilldata_1.par
+++ b/test/test_brilldata_1.par
@@ -1,7 +1,7 @@
 
 !DESC "Brill wave initial data (Holz type), amplitude 5, BAM, robin boundaries"
 
-ActiveThorns = "bam_elliptic einstein ellbase ellsor boundary pugh pughslab pughreduce cartgrid3d idbrilldata ioascii iobasic ioutil time"
+ActiveThorns = "bam_elliptic admbase staticconformal ellbase ellsor boundary pugh pughslab pughreduce cartgrid3d idbrilldata ioascii iobasic ioutil time"
 
 # General
 
@@ -17,7 +17,8 @@ cactus::cctk_itlast 				= 0
 
 # Brill wave initial data
 
-Einstein::initial_data 				= "brilldata"
+ADMBase::initial_data 				= "brilldata"
+ADMBase::metric_type				= "static conformal"
 
 # Brill wave parameters
 
@@ -39,7 +40,7 @@ IOBasic::outInfo_every = 1
 IOBasic::outInfo_vars  = "idbrilldata::brillpsi"
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars = "einstein::gxx einstein::gyy einstein::gzz einstein::gxy idbrilldata::brillpsi"
+IOBasic::outScalar_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy idbrilldata::brillpsi"
 
 IOASCII::out1D_every = 1
-IOASCII::out1D_vars = "einstein::gxx einstein::gyy einstein::gzz einstein::gxy idbrilldata::brillpsi"
+IOASCII::out1D_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy idbrilldata::brillpsi"