aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorallen <allen@a678b1cf-93e1-4b43-a69d-d43939e66649>2002-05-17 15:36:33 +0000
committerallen <allen@a678b1cf-93e1-4b43-a69d-d43939e66649>2002-05-17 15:36:33 +0000
commit8ab40af4cb476c6e5060989fa15619a92657ec7b (patch)
tree2d1ab29bbf554a56b50d5ae0f9aa859e18d6aa93
parent8b4534e2a895baa38abfa539b6e34a498e6fe741 (diff)
Tidying so that the conformal solver isn't used to solve for the conformal
factor, in fact the conformal factor is now only set at the end of the thorn. Now if the conformal metric is used, psi will be set to the conformal factor which was actually solved for. This means that right now that you can't use IDBrillData with conformal derivatives, although it would presumably be easy enough to numerically calculate them, or to return 1 and 0's instead just for this case. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDBrillData/trunk@76 a678b1cf-93e1-4b43-a69d-d43939e66649
-rw-r--r--src/ParamCheck.c16
-rw-r--r--src/brilldata.F33
-rw-r--r--src/finishbrilldata.F55
-rw-r--r--src/setupbrilldata2D.F2
-rw-r--r--src/setupbrilldata3D.F32
-rw-r--r--test/test_brilldata_1.par5
-rw-r--r--test/test_brilldata_2.par49
-rw-r--r--test/test_brilldata_2/brillpsi.dl38
-rw-r--r--test/test_brilldata_2/brillpsi.xl38
-rw-r--r--test/test_brilldata_2/brillpsi.yl38
-rw-r--r--test/test_brilldata_2/brillpsi.zl38
-rw-r--r--test/test_brilldata_2/brillpsi_max.tl2
-rw-r--r--test/test_brilldata_2/brillpsi_min.tl2
-rw-r--r--test/test_brilldata_2/brillpsi_nm1.tl2
-rw-r--r--test/test_brilldata_2/brillpsi_nm2.tl2
-rw-r--r--test/test_brilldata_2/gxx.dl38
-rw-r--r--test/test_brilldata_2/gxx.xl38
-rw-r--r--test/test_brilldata_2/gxx.yl38
-rw-r--r--test/test_brilldata_2/gxx.zl38
-rw-r--r--test/test_brilldata_2/gxx_max.tl2
-rw-r--r--test/test_brilldata_2/gxx_min.tl2
-rw-r--r--test/test_brilldata_2/gxx_nm1.tl2
-rw-r--r--test/test_brilldata_2/gxx_nm2.tl2
-rw-r--r--test/test_brilldata_2/gxy.dl38
-rw-r--r--test/test_brilldata_2/gxy.xl38
-rw-r--r--test/test_brilldata_2/gxy.yl38
-rw-r--r--test/test_brilldata_2/gxy.zl38
-rw-r--r--test/test_brilldata_2/gxy_max.tl2
-rw-r--r--test/test_brilldata_2/gxy_min.tl2
-rw-r--r--test/test_brilldata_2/gxy_nm1.tl2
-rw-r--r--test/test_brilldata_2/gxy_nm2.tl2
-rw-r--r--test/test_brilldata_2/gyy.dl38
-rw-r--r--test/test_brilldata_2/gyy.xl38
-rw-r--r--test/test_brilldata_2/gyy.yl38
-rw-r--r--test/test_brilldata_2/gyy.zl38
-rw-r--r--test/test_brilldata_2/gyy_max.tl2
-rw-r--r--test/test_brilldata_2/gyy_min.tl2
-rw-r--r--test/test_brilldata_2/gyy_nm1.tl2
-rw-r--r--test/test_brilldata_2/gyy_nm2.tl2
-rw-r--r--test/test_brilldata_2/gzz.dl38
-rw-r--r--test/test_brilldata_2/gzz.xl38
-rw-r--r--test/test_brilldata_2/gzz.yl38
-rw-r--r--test/test_brilldata_2/gzz.zl38
-rw-r--r--test/test_brilldata_2/gzz_max.tl2
-rw-r--r--test/test_brilldata_2/gzz_min.tl2
-rw-r--r--test/test_brilldata_2/gzz_nm1.tl2
-rw-r--r--test/test_brilldata_2/gzz_nm2.tl2
-rw-r--r--test/test_brilldata_2/psi.dl38
-rw-r--r--test/test_brilldata_2/psi.xl38
-rw-r--r--test/test_brilldata_2/psi.yl38
-rw-r--r--test/test_brilldata_2/psi.zl38
-rw-r--r--test/test_brilldata_2/psi_max.tl2
-rw-r--r--test/test_brilldata_2/psi_min.tl2
-rw-r--r--test/test_brilldata_2/psi_nm1.tl2
-rw-r--r--test/test_brilldata_2/psi_nm2.tl2
-rw-r--r--test/test_brilldata_2/test_brilldata_2.par49
56 files changed, 1133 insertions, 68 deletions
diff --git a/src/ParamCheck.c b/src/ParamCheck.c
index 50a7188..fe55173 100644
--- a/src/ParamCheck.c
+++ b/src/ParamCheck.c
@@ -49,18 +49,26 @@ void IDBrillData_ParamChecker(CCTK_ARGUMENTS)
DECLARE_CCTK_PARAMETERS
/* Do we know how to deal with this type of metric ? */
- if( ! CCTK_EQUALS(metric_type, "physical") &&
- ! CCTK_EQUALS(metric_type, "static conformal"))
+ if( ! CCTK_Equals(metric_type, "physical") &&
+ ! CCTK_Equals(metric_type, "static conformal"))
{
CCTK_PARAMWARN("Unknown ADMBase::metric_type - known types are \"physical\" and \"static conformal\"");
}
+ if (CCTK_Equals(metric_type, "static conformal"))
+ {
+ if (!CCTK_Equals(conformal_storage,"factor"))
+ {
+ CCTK_PARAMWARN("BrillData only sets the conformal factor (this could easily be changed ... please ask)");
+ }
+ }
+
CCTK_INFO("Setting up Brill data");
- if (CCTK_EQUALS(metric_type, "static conformal"))
+ if (CCTK_Equals(metric_type, "static conformal"))
{
CCTK_VInfo(CCTK_THORNSTRING," ... using trivial conformal %s",conformal_storage);
}
- else if (CCTK_EQUALS(metric_type, "physical"))
+ else if (CCTK_Equals(metric_type, "physical"))
{
CCTK_INFO(" ... using physical metric");
}
diff --git a/src/brilldata.F b/src/brilldata.F
index 596da0d..7dc01e0 100644
--- a/src/brilldata.F
+++ b/src/brilldata.F
@@ -23,26 +23,25 @@
DECLARE_CCTK_FUNCTIONS
integer ipsi,iMcoeff,iNcoeff
- integer metpsi_index(7)
+ integer metric_index(6)
integer ierr
CCTK_REAL AbsTol(3),RelTol(3)
c Get indices for metric.
- 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")
+ call CCTK_VarIndex(metric_index(1), "admbase::gxx")
+ call CCTK_VarIndex(metric_index(2), "admbase::gxy")
+ call CCTK_VarIndex(metric_index(3), "admbase::gxz")
+ call CCTK_VarIndex(metric_index(4), "admbase::gyy")
+ call CCTK_VarIndex(metric_index(5), "admbase::gyz")
+ call CCTK_VarIndex(metric_index(6), "admbase::gzz")
c Get indices for grid functions.
call CCTK_VarIndex(ipsi,"idbrilldata::brillpsi")
if (ipsi.lt.0) then
- call CCTK_WARN(0,"Grid variable index for iphi not found")
+ call CCTK_WARN(0,"Grid variable index for ipsi not found")
end if
call CCTK_VarIndex(iMcoeff,"idbrilldata::brillMlinear")
@@ -83,14 +82,14 @@ c Elliptic solver.
if (CCTK_EQUALS(brill_solver,"sor")) then
call Ell_SetIntKey(ierr,sor_maxit,"Ell::SORmaxit");
- call Ell_LinConfMetricSolver(ierr,cctkGH,
- . metpsi_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"sor")
+ call Ell_LinMetricSolver(ierr,cctkGH,
+ . metric_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"sor")
else if (CCTK_EQUALS(brill_solver,"petsc")) then
- call Ell_LinConfMetricSolver(ierr,cctkGH,
- . metpsi_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"petsc")
+ call Ell_LinMetricSolver(ierr,cctkGH,
+ . metric_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"petsc")
else if (CCTK_EQUALS(brill_solver,"bam")) then
- call Ell_LinConfMetricSolver(ierr,cctkGH,
- . metpsi_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"bam")
+ call Ell_LinMetricSolver(ierr,cctkGH,
+ . metric_index,ipsi,iMcoeff,iNcoeff,AbsTol,RelTol,"bam")
end if
c Check for errors.
@@ -110,9 +109,9 @@ c Synchronization and symmetry boundaries.
call CCTK_SyncGroup(ierr,cctkGH,"idbrilldata::brillconf")
call CartSymGN(ierr,cctkGH,"idbrilldata::brillconf")
-c Reconstruct physical metric.
+c Construct final metric.
- call finishbrilldata(CCTK_ARGUMENTS)
+ call IDBrillData_Finish(CCTK_ARGUMENTS)
return
end
diff --git a/src/finishbrilldata.F b/src/finishbrilldata.F
index 1505d90..9af9fbf 100644
--- a/src/finishbrilldata.F
+++ b/src/finishbrilldata.F
@@ -12,12 +12,13 @@
#include "cctk_Parameters.h"
#include "cctk_Arguments.h"
- subroutine finishbrilldata(CCTK_ARGUMENTS)
+ subroutine IDBrillData_Finish(CCTK_ARGUMENTS)
implicit none
DECLARE_CCTK_ARGUMENTS
DECLARE_CCTK_PARAMETERS
+ DECLARE_CCTK_FUNCTIONS
integer i,j,k
integer nx,ny,nz
@@ -59,7 +60,6 @@ c Brill metric calculated from q and Psi.
phi = phif(x1,y1)
- psi4 = brillpsi(i,j,k)**4
e2q = dexp(2.d0*brillq(rho1,z1,phi))
c Fudge division by rho^2 on axis. (Physically, y^/rho^2,
@@ -74,20 +74,20 @@ c The individual coefficients can be read off as
if (rho1.gt.rhofudge) then
- gxx(i,j,k) = psi4*(e2q + (one - e2q)*y1**2/rho2)
- gyy(i,j,k) = psi4*(e2q + (one - e2q)*x1**2/rho2)
- gzz(i,j,k) = psi4*e2q
- gxy(i,j,k) = - psi4*(one - e2q)*x1*y1/rho2
+ gxx(i,j,k) = (e2q + (one - e2q)*y1**2/rho2)
+ gyy(i,j,k) = (e2q + (one - e2q)*x1**2/rho2)
+ gzz(i,j,k) = e2q
+ gxy(i,j,k) = - (one - e2q)*x1*y1/rho2
else
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) = psi4
- gyy(i,j,k) = psi4
- gzz(i,j,k) = psi4
- gxy(i,j,k) = zero
+ gxx(i,j,k) = 0.0d0
+ gyy(i,j,k) = 0.0d0
+ gzz(i,j,k) = 0.0d0
+ gxy(i,j,k) = 0.0d0
end if
@@ -95,6 +95,41 @@ c it should be, or the data will be singular.
end do
end do
+ if (CCTK_EQUALS(metric_type,"static conformal")) then
+
+ conformal_state = 1
+
+ do k=1,nz
+ do j=1,ny
+ do i=1,nx
+
+ psi(i,j,k) = brillpsi(i,j,k)
+
+ end do
+ end do
+ end do
+
+ else
+
+ conformal_state = 0
+
+ do k=1,nz
+ do j=1,ny
+ do i=1,nx
+
+ psi4 = brillpsi(i,j,k)**4
+
+ gxx(i,j,k) = psi4*gxx(i,j,k)
+ gyy(i,j,k) = psi4*gyy(i,j,k)
+ gzz(i,j,k) = psi4*gzz(i,j,k)
+ gxy(i,j,k) = psi4*gxy(i,j,k)
+
+ end do
+ end do
+ end do
+
+ end if
+
c In any case,
gxz = zero
diff --git a/src/setupbrilldata2D.F b/src/setupbrilldata2D.F
index 98ffe80..f84e825 100644
--- a/src/setupbrilldata2D.F
+++ b/src/setupbrilldata2D.F
@@ -66,8 +66,6 @@ c Initialize psi.
c Initialize metric.
- psi = one
-
gxx = one
gyy = one
gzz = one
diff --git a/src/setupbrilldata3D.F b/src/setupbrilldata3D.F
index 9daa65f..ecd0fd3 100644
--- a/src/setupbrilldata3D.F
+++ b/src/setupbrilldata3D.F
@@ -78,38 +78,6 @@ c Initialize psi.
brillpsi = one
-c Set up conformal metric.
-
- if (CCTK_EQUALS(metric_type,"static conformal")) then
-
- conformal_state = 1
- do k=1,nz
- do j=1,ny
- do i=1,nx
- psi(i,j,k) = one
- if (CCTK_EQUALS(conformal_storage,"factor+derivs") .or.
- & CCTK_EQUALS(conformal_storage,"factor+derivs+2nd derivs")) then
- psix(i,j,k) = zero
- psiy(i,j,k) = zero
- psiz(i,j,k) = zero
- conformal_state = 2
- end if
- if (CCTK_EQUALS(conformal_storage,"factor+derivs+2nd derivs")) then
- psixx(i,j,k) = zero
- psiyy(i,j,k) = zero
- psizz(i,j,k) = zero
- psixy(i,j,k) = zero
- psixz(i,j,k) = zero
- psiyz(i,j,k) = zero
- conformal_state = 3
- end if
- end do
- end do
- end do
-
- end if
-
-
do k=1,nz
do j=1,ny
do i=1,nx
diff --git a/test/test_brilldata_1.par b/test/test_brilldata_1.par
index 553527d..c565b59 100644
--- a/test/test_brilldata_1.par
+++ b/test/test_brilldata_1.par
@@ -1,5 +1,5 @@
-!DESC "Brill wave initial data (Holz type), amplitude 5, BAM, robin boundaries"
+!DESC "Brill wave initial data (Physical, BAM)"
ActiveThorns = "bam_elliptic admbase staticconformal ellbase ellsor boundary pugh pughslab pughreduce cartgrid3d idbrilldata ioascii iobasic ioutil time"
@@ -18,7 +18,7 @@ cactus::cctk_itlast = 0
# Brill wave initial data
ADMBase::initial_data = "brilldata"
-ADMBase::metric_type = "static conformal"
+ADMBase::metric_type = "physical"
# Brill wave parameters
@@ -45,5 +45,4 @@ IOBasic::outScalar_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy i
IOASCII::out1D_every = 1
IOASCII::out1D_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy idbrilldata::brillpsi"
-# do not use the new scheme for names of output files
IO::new_filename_scheme = "no" \ No newline at end of file
diff --git a/test/test_brilldata_2.par b/test/test_brilldata_2.par
new file mode 100644
index 0000000..858a256
--- /dev/null
+++ b/test/test_brilldata_2.par
@@ -0,0 +1,49 @@
+
+!DESC "Brill wave initial data (Conformal, BAM)"
+
+ActiveThorns = "bam_elliptic admbase staticconformal ellbase ellsor boundary pugh pughslab pughreduce cartgrid3d idbrilldata ioascii iobasic ioutil time"
+
+# General
+
+driver::global_nx = 35
+driver::global_ny = 35
+driver::global_nz = 35
+
+grid::type = "byspacing"
+grid::dxyz = 0.2
+grid::domain = "octant"
+
+cactus::cctk_itlast = 0
+
+# Brill wave initial data
+
+ADMBase::initial_data = "brilldata"
+ADMBase::metric_type = "static conformal"
+StaticConformal::conformal_storage = "factor"
+
+# Brill wave parameters
+
+idbrilldata::brill_q = 2
+idbrilldata::brill_a = 5.0
+
+# Elliptic solver.
+
+idbrilldata::brill_solver = "bam"
+
+bam_elliptic::bam_bound = "bamrobin"
+
+# Output.
+
+IO::out_dir = "test_brilldata_2"
+IO::out_fileinfo = "none"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "idbrilldata::brillpsi"
+
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy idbrilldata::brillpsi staticconformal::psi"
+
+IOASCII::out1D_every = 1
+IOASCII::out1D_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy idbrilldata::brillpsi staticconformal::psi"
+
+IO::new_filename_scheme = "no" \ No newline at end of file
diff --git a/test/test_brilldata_2/brillpsi.dl b/test/test_brilldata_2/brillpsi.dl
new file mode 100644
index 0000000..9d22ce9
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi.dl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1732050807569 0.8424511602389
+0.1732050807569 0.8424511602389
+0.5196152422707 0.7884002381889
+0.8660254037844 0.7776154959563
+1.2124355652982 0.8569034464483
+1.5588457268120 0.9817888383989
+1.9052558883258 1.0794772967612
+2.2516660498395 1.1216946951383
+2.5980762113533 1.1263382026242
+2.9444863728671 1.1172008403213
+3.2908965343809 1.1060594651778
+3.6373066958946 1.0961751112861
+3.9837168574084 1.0878635665356
+4.3301270189222 1.0808593226131
+4.6765371804360 1.0748872993806
+5.0229473419497 1.0697364327597
+5.3693575034635 1.0652483341475
+5.7157676649773 1.0613029780955
+6.0621778264911 1.0578074012000
+6.4085879880048 1.0546889329371
+6.7549981495186 1.0518895308808
+7.1014083110324 1.0493627010511
+7.4478184725462 1.0470703542437
+7.7942286340599 1.0449813947695
+8.1406387955737 1.0430697927442
+8.4870489570875 1.0413139811414
+8.8334591186013 1.0396955622088
+9.1798692801150 1.0381991161345
+9.5262794416288 1.0368112592178
+9.8726896031426 1.0355206795063
+10.2190997646564 1.0343173851096
+10.5655099261702 1.0331928977474
+10.9119200876839 1.0321395216693
+11.2583302491977 1.0311507542655
+11.6047404107115 1.0302203439976
diff --git a/test/test_brilldata_2/brillpsi.xl b/test/test_brilldata_2/brillpsi.xl
new file mode 100644
index 0000000..ef8b7f7
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi.xl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 0.8424511602389
+0.1000000000000 0.8424511602389
+0.3000000000000 0.8004084802524
+0.5000000000000 0.7435741171639
+0.7000000000000 0.7052469820599
+0.9000000000000 0.7064501848273
+1.1000000000000 0.7515169692841
+1.3000000000000 0.8308375126034
+1.5000000000000 0.9254975033598
+1.7000000000000 1.0143354499801
+1.9000000000000 1.0820650095304
+2.1000000000000 1.1236485638690
+2.3000000000000 1.1426511884489
+2.5000000000000 1.1463936950697
+2.7000000000000 1.1418434985459
+2.9000000000000 1.1338328930500
+3.1000000000000 1.1250403665415
+3.3000000000000 1.1166672816853
+3.5000000000000 1.1091113058128
+3.7000000000000 1.1024143246226
+3.9000000000000 1.0964922677660
+4.1000000000000 1.0912360491535
+4.3000000000000 1.0865439412833
+4.5000000000000 1.0823313497027
+4.7000000000000 1.0785283091367
+4.9000000000000 1.0750784974666
+5.1000000000000 1.0719349623870
+5.3000000000000 1.0690597311723
+5.5000000000000 1.0664204758174
+5.7000000000000 1.0639908390060
+5.9000000000000 1.0617479228104
+6.1000000000000 1.0596731603526
+6.3000000000000 1.0577501207457
+6.5000000000000 1.0559656075210
+6.7000000000000 1.0543077129020
diff --git a/test/test_brilldata_2/brillpsi.yl b/test/test_brilldata_2/brillpsi.yl
new file mode 100644
index 0000000..ef8b7f7
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi.yl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 0.8424511602389
+0.1000000000000 0.8424511602389
+0.3000000000000 0.8004084802524
+0.5000000000000 0.7435741171639
+0.7000000000000 0.7052469820599
+0.9000000000000 0.7064501848273
+1.1000000000000 0.7515169692841
+1.3000000000000 0.8308375126034
+1.5000000000000 0.9254975033598
+1.7000000000000 1.0143354499801
+1.9000000000000 1.0820650095304
+2.1000000000000 1.1236485638690
+2.3000000000000 1.1426511884489
+2.5000000000000 1.1463936950697
+2.7000000000000 1.1418434985459
+2.9000000000000 1.1338328930500
+3.1000000000000 1.1250403665415
+3.3000000000000 1.1166672816853
+3.5000000000000 1.1091113058128
+3.7000000000000 1.1024143246226
+3.9000000000000 1.0964922677660
+4.1000000000000 1.0912360491535
+4.3000000000000 1.0865439412833
+4.5000000000000 1.0823313497027
+4.7000000000000 1.0785283091367
+4.9000000000000 1.0750784974666
+5.1000000000000 1.0719349623870
+5.3000000000000 1.0690597311723
+5.5000000000000 1.0664204758174
+5.7000000000000 1.0639908390060
+5.9000000000000 1.0617479228104
+6.1000000000000 1.0596731603526
+6.3000000000000 1.0577501207457
+6.5000000000000 1.0559656075210
+6.7000000000000 1.0543077129020
diff --git a/test/test_brilldata_2/brillpsi.zl b/test/test_brilldata_2/brillpsi.zl
new file mode 100644
index 0000000..46c2aef
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi.zl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 0.8424511602389
+0.1000000000000 0.8424511602389
+0.3000000000000 0.8572595419842
+0.5000000000000 0.8844132260448
+0.7000000000000 0.9196114286664
+0.9000000000000 0.9577863430000
+1.1000000000000 0.9942792889631
+1.3000000000000 1.0257386723337
+1.5000000000000 1.0504811395275
+1.7000000000000 1.0683188417351
+1.9000000000000 1.0800624700039
+2.1000000000000 1.0869756443890
+2.3000000000000 1.0903578617256
+2.5000000000000 1.0913186527034
+2.7000000000000 1.0907021618302
+2.9000000000000 1.0891058231430
+3.1000000000000 1.0869307692712
+3.3000000000000 1.0844393047606
+3.5000000000000 1.0817983664639
+3.7000000000000 1.0791140170093
+3.9000000000000 1.0764513908447
+4.1000000000000 1.0738506867928
+4.3000000000000 1.0713345492164
+4.5000000000000 1.0689157479161
+4.7000000000000 1.0665991855288
+4.9000000000000 1.0643860285416
+5.1000000000000 1.0622736859247
+5.3000000000000 1.0602585767413
+5.5000000000000 1.0583351409869
+5.7000000000000 1.0564978461314
+5.9000000000000 1.0547399290080
+6.1000000000000 1.0530551547700
+6.3000000000000 1.0514362873869
+6.5000000000000 1.0498766325860
+6.7000000000000 1.0483684084012
diff --git a/test/test_brilldata_2/brillpsi_max.tl b/test/test_brilldata_2/brillpsi_max.tl
new file mode 100644
index 0000000..0460930
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi_max.tl
@@ -0,0 +1,2 @@
+"brillpsi v time
+0.0000000000000 1.1470367498635
diff --git a/test/test_brilldata_2/brillpsi_min.tl b/test/test_brilldata_2/brillpsi_min.tl
new file mode 100644
index 0000000..981d07c
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi_min.tl
@@ -0,0 +1,2 @@
+"brillpsi v time
+0.0000000000000 0.7008444806476
diff --git a/test/test_brilldata_2/brillpsi_nm1.tl b/test/test_brilldata_2/brillpsi_nm1.tl
new file mode 100644
index 0000000..969b006
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi_nm1.tl
@@ -0,0 +1,2 @@
+"brillpsi v time
+0.0000000000000 1.0570696312872
diff --git a/test/test_brilldata_2/brillpsi_nm2.tl b/test/test_brilldata_2/brillpsi_nm2.tl
new file mode 100644
index 0000000..602d72d
--- /dev/null
+++ b/test/test_brilldata_2/brillpsi_nm2.tl
@@ -0,0 +1,2 @@
+"brillpsi v time
+0.0000000000000 1.0574981148729
diff --git a/test/test_brilldata_2/gxx.dl b/test/test_brilldata_2/gxx.dl
new file mode 100644
index 0000000..42b566e
--- /dev/null
+++ b/test/test_brilldata_2/gxx.dl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1732050807569 1.1071022359507
+0.1732050807569 1.1071022359507
+0.5196152422707 2.4757259674066
+0.8660254037844 5.8051899811768
+1.2124355652982 5.2594045899286
+1.5588457268120 2.5814182394982
+1.9052558883258 1.4498459001963
+2.2516660498395 1.1182877099361
+2.5980762113533 1.0270511914804
+2.9444863728671 1.0049856407165
+3.2908965343809 1.0007151684905
+3.6373066958946 1.0000792058010
+3.9837168574084 1.0000067796174
+4.3301270189222 1.0000004496335
+4.6765371804360 1.0000000231583
+5.0229473419497 1.0000000009280
+5.3693575034635 1.0000000000290
+5.7157676649773 1.0000000000007
+6.0621778264911 1.0000000000000
+6.4085879880048 1.0000000000000
+6.7549981495186 1.0000000000000
+7.1014083110324 1.0000000000000
+7.4478184725462 1.0000000000000
+7.7942286340599 1.0000000000000
+8.1406387955737 1.0000000000000
+8.4870489570875 1.0000000000000
+8.8334591186013 1.0000000000000
+9.1798692801150 1.0000000000000
+9.5262794416288 1.0000000000000
+9.8726896031426 1.0000000000000
+10.2190997646564 1.0000000000000
+10.5655099261702 1.0000000000000
+10.9119200876839 1.0000000000000
+11.2583302491977 1.0000000000000
+11.6047404107115 1.0000000000000
diff --git a/test/test_brilldata_2/gxx.xl b/test/test_brilldata_2/gxx.xl
new file mode 100644
index 0000000..8c77d20
--- /dev/null
+++ b/test/test_brilldata_2/gxx.xl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.1071022359507
+0.1000000000000 1.1071022359507
+0.3000000000000 2.3044402452423
+0.5000000000000 7.0360527144867
+0.7000000000000 19.7526610996171
+0.9000000000000 35.2928239620217
+1.1000000000000 35.0919778848716
+1.3000000000000 21.5223537296190
+1.5000000000000 10.2866908719009
+1.7000000000000 4.8406767690345
+1.9000000000000 2.6069470552581
+2.1000000000000 1.6916320355181
+2.3000000000000 1.2988603806330
+2.5000000000000 1.1255536499391
+2.7000000000000 1.0499666139433
+2.9000000000000 1.0185220708121
+3.1000000000000 1.0063363806616
+3.3000000000000 1.0019920842220
+3.5000000000000 1.0005747350323
+3.7000000000000 1.0001521455173
+3.9000000000000 1.0000369685390
+4.1000000000000 1.0000082488494
+4.3000000000000 1.0000016910109
+4.5000000000000 1.0000003186221
+4.7000000000000 1.0000000552007
+4.9000000000000 1.0000000087962
+5.1000000000000 1.0000000012896
+5.3000000000000 1.0000000001740
+5.5000000000000 1.0000000000216
+5.7000000000000 1.0000000000025
+5.9000000000000 1.0000000000003
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gxx.yl b/test/test_brilldata_2/gxx.yl
new file mode 100644
index 0000000..653dd87
--- /dev/null
+++ b/test/test_brilldata_2/gxx.yl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.1071022359507
+0.1000000000000 1.1071022359507
+0.3000000000000 1.1449378050269
+0.5000000000000 1.2414421085795
+0.7000000000000 1.3827073693799
+0.9000000000000 1.4233681970620
+1.1000000000000 1.2817518833460
+1.3000000000000 1.1214340457374
+1.5000000000000 1.0412741816529
+1.7000000000000 1.0132895389932
+1.9000000000000 1.0044513768844
+2.1000000000000 1.0015683266112
+2.3000000000000 1.0005649534606
+2.5000000000000 1.0002008858399
+2.7000000000000 1.0000685413086
+2.9000000000000 1.0000220238654
+3.1000000000000 1.0000065935283
+3.3000000000000 1.0000018292784
+3.5000000000000 1.0000004691715
+3.7000000000000 1.0000001111362
+3.9000000000000 1.0000000243054
+4.1000000000000 1.0000000049071
+4.3000000000000 1.0000000009146
+4.5000000000000 1.0000000001573
+4.7000000000000 1.0000000000250
+4.9000000000000 1.0000000000037
+5.1000000000000 1.0000000000005
+5.3000000000000 1.0000000000001
+5.5000000000000 1.0000000000000
+5.7000000000000 1.0000000000000
+5.9000000000000 1.0000000000000
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gxx.zl b/test/test_brilldata_2/gxx.zl
new file mode 100644
index 0000000..3a5bbd0
--- /dev/null
+++ b/test/test_brilldata_2/gxx.zl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.1071022359507
+0.1000000000000 1.1071022359507
+0.3000000000000 1.0981101447179
+0.5000000000000 1.0824736784972
+0.7000000000000 1.0638043049139
+0.9000000000000 1.0455628181672
+1.1000000000000 1.0301005014561
+1.3000000000000 1.0184176839145
+1.5000000000000 1.0104386910156
+1.7000000000000 1.0054773571075
+1.9000000000000 1.0026586619669
+2.1000000000000 1.0011928696461
+2.3000000000000 1.0004944369786
+2.5000000000000 1.0001892586681
+2.7000000000000 1.0000668861786
+2.9000000000000 1.0000218226253
+3.1000000000000 1.0000065727482
+3.3000000000000 1.0000018274605
+3.5000000000000 1.0000004690368
+3.7000000000000 1.0000001111278
+3.9000000000000 1.0000000243050
+4.1000000000000 1.0000000049071
+4.3000000000000 1.0000000009146
+4.5000000000000 1.0000000001573
+4.7000000000000 1.0000000000250
+4.9000000000000 1.0000000000037
+5.1000000000000 1.0000000000005
+5.3000000000000 1.0000000000001
+5.5000000000000 1.0000000000000
+5.7000000000000 1.0000000000000
+5.9000000000000 1.0000000000000
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gxx_max.tl b/test/test_brilldata_2/gxx_max.tl
new file mode 100644
index 0000000..2ffe647
--- /dev/null
+++ b/test/test_brilldata_2/gxx_max.tl
@@ -0,0 +1,2 @@
+"gxx v time
+0.0000000000000 35.2928239620217
diff --git a/test/test_brilldata_2/gxx_min.tl b/test/test_brilldata_2/gxx_min.tl
new file mode 100644
index 0000000..f44ba12
--- /dev/null
+++ b/test/test_brilldata_2/gxx_min.tl
@@ -0,0 +1,2 @@
+"gxx v time
+0.0000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gxx_nm1.tl b/test/test_brilldata_2/gxx_nm1.tl
new file mode 100644
index 0000000..9f04a6e
--- /dev/null
+++ b/test/test_brilldata_2/gxx_nm1.tl
@@ -0,0 +1,2 @@
+"gxx v time
+0.0000000000000 1.0614652560986
diff --git a/test/test_brilldata_2/gxx_nm2.tl b/test/test_brilldata_2/gxx_nm2.tl
new file mode 100644
index 0000000..4b29da8
--- /dev/null
+++ b/test/test_brilldata_2/gxx_nm2.tl
@@ -0,0 +1,2 @@
+"gxx v time
+0.0000000000000 1.4189585792454
diff --git a/test/test_brilldata_2/gxy.dl b/test/test_brilldata_2/gxy.dl
new file mode 100644
index 0000000..aea63a8
--- /dev/null
+++ b/test/test_brilldata_2/gxy.dl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1732050807569 0.1071022359507
+0.1732050807569 0.1071022359507
+0.5196152422707 1.4757259674066
+0.8660254037844 4.8051899811768
+1.2124355652982 4.2594045899286
+1.5588457268120 1.5814182394982
+1.9052558883258 0.4498459001963
+2.2516660498395 0.1182877099361
+2.5980762113533 0.0270511914804
+2.9444863728671 0.0049856407165
+3.2908965343809 0.0007151684905
+3.6373066958946 0.0000792058010
+3.9837168574084 0.0000067796174
+4.3301270189222 0.0000004496335
+4.6765371804360 0.0000000231583
+5.0229473419497 0.0000000009280
+5.3693575034635 0.0000000000290
+5.7157676649773 0.0000000000007
+6.0621778264911 0.0000000000000
+6.4085879880048 0.0000000000000
+6.7549981495186 -0.0000000000000
+7.1014083110324 -0.0000000000000
+7.4478184725462 -0.0000000000000
+7.7942286340599 -0.0000000000000
+8.1406387955737 -0.0000000000000
+8.4870489570875 -0.0000000000000
+8.8334591186013 -0.0000000000000
+9.1798692801150 -0.0000000000000
+9.5262794416288 -0.0000000000000
+9.8726896031426 -0.0000000000000
+10.2190997646564 -0.0000000000000
+10.5655099261702 -0.0000000000000
+10.9119200876839 -0.0000000000000
+11.2583302491977 -0.0000000000000
+11.6047404107115 -0.0000000000000
diff --git a/test/test_brilldata_2/gxy.xl b/test/test_brilldata_2/gxy.xl
new file mode 100644
index 0000000..f628521
--- /dev/null
+++ b/test/test_brilldata_2/gxy.xl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 -0.1071022359507
+0.1000000000000 0.1071022359507
+0.3000000000000 0.4348134150808
+0.5000000000000 1.2072105428973
+0.7000000000000 2.6789515856596
+0.9000000000000 3.8103137735580
+1.1000000000000 3.0992707168065
+1.3000000000000 1.5786425945861
+1.5000000000000 0.6191127247934
+1.7000000000000 0.2259221628844
+1.9000000000000 0.0845761608031
+2.1000000000000 0.0329348588342
+2.3000000000000 0.0129939295927
+2.5000000000000 0.0050221459976
+2.7000000000000 0.0018506153312
+2.9000000000000 0.0006386920970
+3.1000000000000 0.0002043993762
+3.3000000000000 0.0000603661885
+3.5000000000000 0.0000164210009
+3.7000000000000 0.0000041120410
+3.9000000000000 0.0000009479113
+4.1000000000000 0.0000002011914
+4.3000000000000 0.0000000393258
+4.5000000000000 0.0000000070805
+4.7000000000000 0.0000000011745
+4.9000000000000 0.0000000001795
+5.1000000000000 0.0000000000253
+5.3000000000000 0.0000000000033
+5.5000000000000 0.0000000000004
+5.7000000000000 0.0000000000000
+5.9000000000000 0.0000000000000
+6.1000000000000 0.0000000000000
+6.3000000000000 0.0000000000000
+6.5000000000000 0.0000000000000
+6.7000000000000 -0.0000000000000
diff --git a/test/test_brilldata_2/gxy.yl b/test/test_brilldata_2/gxy.yl
new file mode 100644
index 0000000..f628521
--- /dev/null
+++ b/test/test_brilldata_2/gxy.yl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 -0.1071022359507
+0.1000000000000 0.1071022359507
+0.3000000000000 0.4348134150808
+0.5000000000000 1.2072105428973
+0.7000000000000 2.6789515856596
+0.9000000000000 3.8103137735580
+1.1000000000000 3.0992707168065
+1.3000000000000 1.5786425945861
+1.5000000000000 0.6191127247934
+1.7000000000000 0.2259221628844
+1.9000000000000 0.0845761608031
+2.1000000000000 0.0329348588342
+2.3000000000000 0.0129939295927
+2.5000000000000 0.0050221459976
+2.7000000000000 0.0018506153312
+2.9000000000000 0.0006386920970
+3.1000000000000 0.0002043993762
+3.3000000000000 0.0000603661885
+3.5000000000000 0.0000164210009
+3.7000000000000 0.0000041120410
+3.9000000000000 0.0000009479113
+4.1000000000000 0.0000002011914
+4.3000000000000 0.0000000393258
+4.5000000000000 0.0000000070805
+4.7000000000000 0.0000000011745
+4.9000000000000 0.0000000001795
+5.1000000000000 0.0000000000253
+5.3000000000000 0.0000000000033
+5.5000000000000 0.0000000000004
+5.7000000000000 0.0000000000000
+5.9000000000000 0.0000000000000
+6.1000000000000 0.0000000000000
+6.3000000000000 0.0000000000000
+6.5000000000000 0.0000000000000
+6.7000000000000 -0.0000000000000
diff --git a/test/test_brilldata_2/gxy.zl b/test/test_brilldata_2/gxy.zl
new file mode 100644
index 0000000..aae4482
--- /dev/null
+++ b/test/test_brilldata_2/gxy.zl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 0.1071022359507
+0.1000000000000 0.1071022359507
+0.3000000000000 0.0981101447179
+0.5000000000000 0.0824736784972
+0.7000000000000 0.0638043049139
+0.9000000000000 0.0455628181672
+1.1000000000000 0.0301005014561
+1.3000000000000 0.0184176839145
+1.5000000000000 0.0104386910156
+1.7000000000000 0.0054773571075
+1.9000000000000 0.0026586619669
+2.1000000000000 0.0011928696461
+2.3000000000000 0.0004944369786
+2.5000000000000 0.0001892586681
+2.7000000000000 0.0000668861786
+2.9000000000000 0.0000218226253
+3.1000000000000 0.0000065727482
+3.3000000000000 0.0000018274605
+3.5000000000000 0.0000004690368
+3.7000000000000 0.0000001111278
+3.9000000000000 0.0000000243050
+4.1000000000000 0.0000000049071
+4.3000000000000 0.0000000009146
+4.5000000000000 0.0000000001573
+4.7000000000000 0.0000000000250
+4.9000000000000 0.0000000000037
+5.1000000000000 0.0000000000005
+5.3000000000000 0.0000000000001
+5.5000000000000 0.0000000000000
+5.7000000000000 0.0000000000000
+5.9000000000000 0.0000000000000
+6.1000000000000 -0.0000000000000
+6.3000000000000 -0.0000000000000
+6.5000000000000 -0.0000000000000
+6.7000000000000 -0.0000000000000
diff --git a/test/test_brilldata_2/gxy_max.tl b/test/test_brilldata_2/gxy_max.tl
new file mode 100644
index 0000000..2483fa7
--- /dev/null
+++ b/test/test_brilldata_2/gxy_max.tl
@@ -0,0 +1,2 @@
+"gxy v time
+0.0000000000000 18.5735849599860
diff --git a/test/test_brilldata_2/gxy_min.tl b/test/test_brilldata_2/gxy_min.tl
new file mode 100644
index 0000000..f1ae053
--- /dev/null
+++ b/test/test_brilldata_2/gxy_min.tl
@@ -0,0 +1,2 @@
+"gxy v time
+0.0000000000000 -3.8103137735580
diff --git a/test/test_brilldata_2/gxy_nm1.tl b/test/test_brilldata_2/gxy_nm1.tl
new file mode 100644
index 0000000..a74b9c3
--- /dev/null
+++ b/test/test_brilldata_2/gxy_nm1.tl
@@ -0,0 +1,2 @@
+"gxy v time
+0.0000000000000 0.0342575537141
diff --git a/test/test_brilldata_2/gxy_nm2.tl b/test/test_brilldata_2/gxy_nm2.tl
new file mode 100644
index 0000000..ace9c77
--- /dev/null
+++ b/test/test_brilldata_2/gxy_nm2.tl
@@ -0,0 +1,2 @@
+"gxy v time
+0.0000000000000 0.4781180615068
diff --git a/test/test_brilldata_2/gyy.dl b/test/test_brilldata_2/gyy.dl
new file mode 100644
index 0000000..42b566e
--- /dev/null
+++ b/test/test_brilldata_2/gyy.dl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1732050807569 1.1071022359507
+0.1732050807569 1.1071022359507
+0.5196152422707 2.4757259674066
+0.8660254037844 5.8051899811768
+1.2124355652982 5.2594045899286
+1.5588457268120 2.5814182394982
+1.9052558883258 1.4498459001963
+2.2516660498395 1.1182877099361
+2.5980762113533 1.0270511914804
+2.9444863728671 1.0049856407165
+3.2908965343809 1.0007151684905
+3.6373066958946 1.0000792058010
+3.9837168574084 1.0000067796174
+4.3301270189222 1.0000004496335
+4.6765371804360 1.0000000231583
+5.0229473419497 1.0000000009280
+5.3693575034635 1.0000000000290
+5.7157676649773 1.0000000000007
+6.0621778264911 1.0000000000000
+6.4085879880048 1.0000000000000
+6.7549981495186 1.0000000000000
+7.1014083110324 1.0000000000000
+7.4478184725462 1.0000000000000
+7.7942286340599 1.0000000000000
+8.1406387955737 1.0000000000000
+8.4870489570875 1.0000000000000
+8.8334591186013 1.0000000000000
+9.1798692801150 1.0000000000000
+9.5262794416288 1.0000000000000
+9.8726896031426 1.0000000000000
+10.2190997646564 1.0000000000000
+10.5655099261702 1.0000000000000
+10.9119200876839 1.0000000000000
+11.2583302491977 1.0000000000000
+11.6047404107115 1.0000000000000
diff --git a/test/test_brilldata_2/gyy.xl b/test/test_brilldata_2/gyy.xl
new file mode 100644
index 0000000..653dd87
--- /dev/null
+++ b/test/test_brilldata_2/gyy.xl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.1071022359507
+0.1000000000000 1.1071022359507
+0.3000000000000 1.1449378050269
+0.5000000000000 1.2414421085795
+0.7000000000000 1.3827073693799
+0.9000000000000 1.4233681970620
+1.1000000000000 1.2817518833460
+1.3000000000000 1.1214340457374
+1.5000000000000 1.0412741816529
+1.7000000000000 1.0132895389932
+1.9000000000000 1.0044513768844
+2.1000000000000 1.0015683266112
+2.3000000000000 1.0005649534606
+2.5000000000000 1.0002008858399
+2.7000000000000 1.0000685413086
+2.9000000000000 1.0000220238654
+3.1000000000000 1.0000065935283
+3.3000000000000 1.0000018292784
+3.5000000000000 1.0000004691715
+3.7000000000000 1.0000001111362
+3.9000000000000 1.0000000243054
+4.1000000000000 1.0000000049071
+4.3000000000000 1.0000000009146
+4.5000000000000 1.0000000001573
+4.7000000000000 1.0000000000250
+4.9000000000000 1.0000000000037
+5.1000000000000 1.0000000000005
+5.3000000000000 1.0000000000001
+5.5000000000000 1.0000000000000
+5.7000000000000 1.0000000000000
+5.9000000000000 1.0000000000000
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gyy.yl b/test/test_brilldata_2/gyy.yl
new file mode 100644
index 0000000..8c77d20
--- /dev/null
+++ b/test/test_brilldata_2/gyy.yl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.1071022359507
+0.1000000000000 1.1071022359507
+0.3000000000000 2.3044402452423
+0.5000000000000 7.0360527144867
+0.7000000000000 19.7526610996171
+0.9000000000000 35.2928239620217
+1.1000000000000 35.0919778848716
+1.3000000000000 21.5223537296190
+1.5000000000000 10.2866908719009
+1.7000000000000 4.8406767690345
+1.9000000000000 2.6069470552581
+2.1000000000000 1.6916320355181
+2.3000000000000 1.2988603806330
+2.5000000000000 1.1255536499391
+2.7000000000000 1.0499666139433
+2.9000000000000 1.0185220708121
+3.1000000000000 1.0063363806616
+3.3000000000000 1.0019920842220
+3.5000000000000 1.0005747350323
+3.7000000000000 1.0001521455173
+3.9000000000000 1.0000369685390
+4.1000000000000 1.0000082488494
+4.3000000000000 1.0000016910109
+4.5000000000000 1.0000003186221
+4.7000000000000 1.0000000552007
+4.9000000000000 1.0000000087962
+5.1000000000000 1.0000000012896
+5.3000000000000 1.0000000001740
+5.5000000000000 1.0000000000216
+5.7000000000000 1.0000000000025
+5.9000000000000 1.0000000000003
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gyy.zl b/test/test_brilldata_2/gyy.zl
new file mode 100644
index 0000000..3a5bbd0
--- /dev/null
+++ b/test/test_brilldata_2/gyy.zl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.1071022359507
+0.1000000000000 1.1071022359507
+0.3000000000000 1.0981101447179
+0.5000000000000 1.0824736784972
+0.7000000000000 1.0638043049139
+0.9000000000000 1.0455628181672
+1.1000000000000 1.0301005014561
+1.3000000000000 1.0184176839145
+1.5000000000000 1.0104386910156
+1.7000000000000 1.0054773571075
+1.9000000000000 1.0026586619669
+2.1000000000000 1.0011928696461
+2.3000000000000 1.0004944369786
+2.5000000000000 1.0001892586681
+2.7000000000000 1.0000668861786
+2.9000000000000 1.0000218226253
+3.1000000000000 1.0000065727482
+3.3000000000000 1.0000018274605
+3.5000000000000 1.0000004690368
+3.7000000000000 1.0000001111278
+3.9000000000000 1.0000000243050
+4.1000000000000 1.0000000049071
+4.3000000000000 1.0000000009146
+4.5000000000000 1.0000000001573
+4.7000000000000 1.0000000000250
+4.9000000000000 1.0000000000037
+5.1000000000000 1.0000000000005
+5.3000000000000 1.0000000000001
+5.5000000000000 1.0000000000000
+5.7000000000000 1.0000000000000
+5.9000000000000 1.0000000000000
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gyy_max.tl b/test/test_brilldata_2/gyy_max.tl
new file mode 100644
index 0000000..286ff8c
--- /dev/null
+++ b/test/test_brilldata_2/gyy_max.tl
@@ -0,0 +1,2 @@
+"gyy v time
+0.0000000000000 35.2928239620217
diff --git a/test/test_brilldata_2/gyy_min.tl b/test/test_brilldata_2/gyy_min.tl
new file mode 100644
index 0000000..58a99ed
--- /dev/null
+++ b/test/test_brilldata_2/gyy_min.tl
@@ -0,0 +1,2 @@
+"gyy v time
+0.0000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gyy_nm1.tl b/test/test_brilldata_2/gyy_nm1.tl
new file mode 100644
index 0000000..f5f3970
--- /dev/null
+++ b/test/test_brilldata_2/gyy_nm1.tl
@@ -0,0 +1,2 @@
+"gyy v time
+0.0000000000000 1.0614652560986
diff --git a/test/test_brilldata_2/gyy_nm2.tl b/test/test_brilldata_2/gyy_nm2.tl
new file mode 100644
index 0000000..3379db3
--- /dev/null
+++ b/test/test_brilldata_2/gyy_nm2.tl
@@ -0,0 +1,2 @@
+"gyy v time
+0.0000000000000 1.4189585792454
diff --git a/test/test_brilldata_2/gzz.dl b/test/test_brilldata_2/gzz.dl
new file mode 100644
index 0000000..b165c8f
--- /dev/null
+++ b/test/test_brilldata_2/gzz.dl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1732050807569 1.2142044719014
+0.1732050807569 1.2142044719014
+0.5196152422707 3.9514519348131
+0.8660254037844 10.6103799623535
+1.2124355652982 9.5188091798572
+1.5588457268120 4.1628364789963
+1.9052558883258 1.8996918003927
+2.2516660498395 1.2365754198722
+2.5980762113533 1.0541023829608
+2.9444863728671 1.0099712814330
+3.2908965343809 1.0014303369809
+3.6373066958946 1.0001584116020
+3.9837168574084 1.0000135592349
+4.3301270189222 1.0000008992670
+4.6765371804360 1.0000000463167
+5.0229473419497 1.0000000018560
+5.3693575034635 1.0000000000579
+5.7157676649773 1.0000000000014
+6.0621778264911 1.0000000000000
+6.4085879880048 1.0000000000000
+6.7549981495186 1.0000000000000
+7.1014083110324 1.0000000000000
+7.4478184725462 1.0000000000000
+7.7942286340599 1.0000000000000
+8.1406387955737 1.0000000000000
+8.4870489570875 1.0000000000000
+8.8334591186013 1.0000000000000
+9.1798692801150 1.0000000000000
+9.5262794416288 1.0000000000000
+9.8726896031426 1.0000000000000
+10.2190997646564 1.0000000000000
+10.5655099261702 1.0000000000000
+10.9119200876839 1.0000000000000
+11.2583302491977 1.0000000000000
+11.6047404107115 1.0000000000000
diff --git a/test/test_brilldata_2/gzz.xl b/test/test_brilldata_2/gzz.xl
new file mode 100644
index 0000000..02bc2ea
--- /dev/null
+++ b/test/test_brilldata_2/gzz.xl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.2142044719014
+0.1000000000000 1.2142044719014
+0.3000000000000 2.4493780502693
+0.5000000000000 7.2774948230662
+0.7000000000000 20.1353684689970
+0.9000000000000 35.7161921590837
+1.1000000000000 35.3737297682176
+1.3000000000000 21.6437877753564
+1.5000000000000 10.3279650535538
+1.7000000000000 4.8539663080277
+1.9000000000000 2.6113984321425
+2.1000000000000 1.6932003621292
+2.3000000000000 1.2994253340936
+2.5000000000000 1.1257545357790
+2.7000000000000 1.0500351552519
+2.9000000000000 1.0185440946775
+3.1000000000000 1.0063429741898
+3.3000000000000 1.0019939135004
+3.5000000000000 1.0005752042037
+3.7000000000000 1.0001522566536
+3.9000000000000 1.0000369928444
+4.1000000000000 1.0000082537565
+4.3000000000000 1.0000016919255
+4.5000000000000 1.0000003187795
+4.7000000000000 1.0000000552257
+4.9000000000000 1.0000000087999
+5.1000000000000 1.0000000012901
+5.3000000000000 1.0000000001741
+5.5000000000000 1.0000000000216
+5.7000000000000 1.0000000000025
+5.9000000000000 1.0000000000003
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gzz.yl b/test/test_brilldata_2/gzz.yl
new file mode 100644
index 0000000..02bc2ea
--- /dev/null
+++ b/test/test_brilldata_2/gzz.yl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.2142044719014
+0.1000000000000 1.2142044719014
+0.3000000000000 2.4493780502693
+0.5000000000000 7.2774948230662
+0.7000000000000 20.1353684689970
+0.9000000000000 35.7161921590837
+1.1000000000000 35.3737297682176
+1.3000000000000 21.6437877753564
+1.5000000000000 10.3279650535538
+1.7000000000000 4.8539663080277
+1.9000000000000 2.6113984321425
+2.1000000000000 1.6932003621292
+2.3000000000000 1.2994253340936
+2.5000000000000 1.1257545357790
+2.7000000000000 1.0500351552519
+2.9000000000000 1.0185440946775
+3.1000000000000 1.0063429741898
+3.3000000000000 1.0019939135004
+3.5000000000000 1.0005752042037
+3.7000000000000 1.0001522566536
+3.9000000000000 1.0000369928444
+4.1000000000000 1.0000082537565
+4.3000000000000 1.0000016919255
+4.5000000000000 1.0000003187795
+4.7000000000000 1.0000000552257
+4.9000000000000 1.0000000087999
+5.1000000000000 1.0000000012901
+5.3000000000000 1.0000000001741
+5.5000000000000 1.0000000000216
+5.7000000000000 1.0000000000025
+5.9000000000000 1.0000000000003
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gzz.zl b/test/test_brilldata_2/gzz.zl
new file mode 100644
index 0000000..ec556b0
--- /dev/null
+++ b/test/test_brilldata_2/gzz.zl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 1.2142044719014
+0.1000000000000 1.2142044719014
+0.3000000000000 1.1962202894358
+0.5000000000000 1.1649473569943
+0.7000000000000 1.1276086098279
+0.9000000000000 1.0911256363344
+1.1000000000000 1.0602010029121
+1.3000000000000 1.0368353678290
+1.5000000000000 1.0208773820312
+1.7000000000000 1.0109547142151
+1.9000000000000 1.0053173239338
+2.1000000000000 1.0023857392923
+2.3000000000000 1.0009888739573
+2.5000000000000 1.0003785173363
+2.7000000000000 1.0001337723571
+2.9000000000000 1.0000436452505
+3.1000000000000 1.0000131454964
+3.3000000000000 1.0000036549210
+3.5000000000000 1.0000009380736
+3.7000000000000 1.0000002222556
+3.9000000000000 1.0000000486099
+4.1000000000000 1.0000000098142
+4.3000000000000 1.0000000018291
+4.5000000000000 1.0000000003147
+4.7000000000000 1.0000000000500
+4.9000000000000 1.0000000000073
+5.1000000000000 1.0000000000010
+5.3000000000000 1.0000000000001
+5.5000000000000 1.0000000000000
+5.7000000000000 1.0000000000000
+5.9000000000000 1.0000000000000
+6.1000000000000 1.0000000000000
+6.3000000000000 1.0000000000000
+6.5000000000000 1.0000000000000
+6.7000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gzz_max.tl b/test/test_brilldata_2/gzz_max.tl
new file mode 100644
index 0000000..bd44d5a
--- /dev/null
+++ b/test/test_brilldata_2/gzz_max.tl
@@ -0,0 +1,2 @@
+"gzz v time
+0.0000000000000 38.1471699199720
diff --git a/test/test_brilldata_2/gzz_min.tl b/test/test_brilldata_2/gzz_min.tl
new file mode 100644
index 0000000..6eb569b
--- /dev/null
+++ b/test/test_brilldata_2/gzz_min.tl
@@ -0,0 +1,2 @@
+"gzz v time
+0.0000000000000 1.0000000000000
diff --git a/test/test_brilldata_2/gzz_nm1.tl b/test/test_brilldata_2/gzz_nm1.tl
new file mode 100644
index 0000000..94ba7d6
--- /dev/null
+++ b/test/test_brilldata_2/gzz_nm1.tl
@@ -0,0 +1,2 @@
+"gzz v time
+0.0000000000000 1.1229305121972
diff --git a/test/test_brilldata_2/gzz_nm2.tl b/test/test_brilldata_2/gzz_nm2.tl
new file mode 100644
index 0000000..86dda01
--- /dev/null
+++ b/test/test_brilldata_2/gzz_nm2.tl
@@ -0,0 +1,2 @@
+"gzz v time
+0.0000000000000 1.8665692220504
diff --git a/test/test_brilldata_2/psi.dl b/test/test_brilldata_2/psi.dl
new file mode 100644
index 0000000..9d22ce9
--- /dev/null
+++ b/test/test_brilldata_2/psi.dl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1732050807569 0.8424511602389
+0.1732050807569 0.8424511602389
+0.5196152422707 0.7884002381889
+0.8660254037844 0.7776154959563
+1.2124355652982 0.8569034464483
+1.5588457268120 0.9817888383989
+1.9052558883258 1.0794772967612
+2.2516660498395 1.1216946951383
+2.5980762113533 1.1263382026242
+2.9444863728671 1.1172008403213
+3.2908965343809 1.1060594651778
+3.6373066958946 1.0961751112861
+3.9837168574084 1.0878635665356
+4.3301270189222 1.0808593226131
+4.6765371804360 1.0748872993806
+5.0229473419497 1.0697364327597
+5.3693575034635 1.0652483341475
+5.7157676649773 1.0613029780955
+6.0621778264911 1.0578074012000
+6.4085879880048 1.0546889329371
+6.7549981495186 1.0518895308808
+7.1014083110324 1.0493627010511
+7.4478184725462 1.0470703542437
+7.7942286340599 1.0449813947695
+8.1406387955737 1.0430697927442
+8.4870489570875 1.0413139811414
+8.8334591186013 1.0396955622088
+9.1798692801150 1.0381991161345
+9.5262794416288 1.0368112592178
+9.8726896031426 1.0355206795063
+10.2190997646564 1.0343173851096
+10.5655099261702 1.0331928977474
+10.9119200876839 1.0321395216693
+11.2583302491977 1.0311507542655
+11.6047404107115 1.0302203439976
diff --git a/test/test_brilldata_2/psi.xl b/test/test_brilldata_2/psi.xl
new file mode 100644
index 0000000..ef8b7f7
--- /dev/null
+++ b/test/test_brilldata_2/psi.xl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 0.8424511602389
+0.1000000000000 0.8424511602389
+0.3000000000000 0.8004084802524
+0.5000000000000 0.7435741171639
+0.7000000000000 0.7052469820599
+0.9000000000000 0.7064501848273
+1.1000000000000 0.7515169692841
+1.3000000000000 0.8308375126034
+1.5000000000000 0.9254975033598
+1.7000000000000 1.0143354499801
+1.9000000000000 1.0820650095304
+2.1000000000000 1.1236485638690
+2.3000000000000 1.1426511884489
+2.5000000000000 1.1463936950697
+2.7000000000000 1.1418434985459
+2.9000000000000 1.1338328930500
+3.1000000000000 1.1250403665415
+3.3000000000000 1.1166672816853
+3.5000000000000 1.1091113058128
+3.7000000000000 1.1024143246226
+3.9000000000000 1.0964922677660
+4.1000000000000 1.0912360491535
+4.3000000000000 1.0865439412833
+4.5000000000000 1.0823313497027
+4.7000000000000 1.0785283091367
+4.9000000000000 1.0750784974666
+5.1000000000000 1.0719349623870
+5.3000000000000 1.0690597311723
+5.5000000000000 1.0664204758174
+5.7000000000000 1.0639908390060
+5.9000000000000 1.0617479228104
+6.1000000000000 1.0596731603526
+6.3000000000000 1.0577501207457
+6.5000000000000 1.0559656075210
+6.7000000000000 1.0543077129020
diff --git a/test/test_brilldata_2/psi.yl b/test/test_brilldata_2/psi.yl
new file mode 100644
index 0000000..ef8b7f7
--- /dev/null
+++ b/test/test_brilldata_2/psi.yl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 0.8424511602389
+0.1000000000000 0.8424511602389
+0.3000000000000 0.8004084802524
+0.5000000000000 0.7435741171639
+0.7000000000000 0.7052469820599
+0.9000000000000 0.7064501848273
+1.1000000000000 0.7515169692841
+1.3000000000000 0.8308375126034
+1.5000000000000 0.9254975033598
+1.7000000000000 1.0143354499801
+1.9000000000000 1.0820650095304
+2.1000000000000 1.1236485638690
+2.3000000000000 1.1426511884489
+2.5000000000000 1.1463936950697
+2.7000000000000 1.1418434985459
+2.9000000000000 1.1338328930500
+3.1000000000000 1.1250403665415
+3.3000000000000 1.1166672816853
+3.5000000000000 1.1091113058128
+3.7000000000000 1.1024143246226
+3.9000000000000 1.0964922677660
+4.1000000000000 1.0912360491535
+4.3000000000000 1.0865439412833
+4.5000000000000 1.0823313497027
+4.7000000000000 1.0785283091367
+4.9000000000000 1.0750784974666
+5.1000000000000 1.0719349623870
+5.3000000000000 1.0690597311723
+5.5000000000000 1.0664204758174
+5.7000000000000 1.0639908390060
+5.9000000000000 1.0617479228104
+6.1000000000000 1.0596731603526
+6.3000000000000 1.0577501207457
+6.5000000000000 1.0559656075210
+6.7000000000000 1.0543077129020
diff --git a/test/test_brilldata_2/psi.zl b/test/test_brilldata_2/psi.zl
new file mode 100644
index 0000000..46c2aef
--- /dev/null
+++ b/test/test_brilldata_2/psi.zl
@@ -0,0 +1,38 @@
+
+
+"Time = 0.0000000000000
+-0.1000000000000 0.8424511602389
+0.1000000000000 0.8424511602389
+0.3000000000000 0.8572595419842
+0.5000000000000 0.8844132260448
+0.7000000000000 0.9196114286664
+0.9000000000000 0.9577863430000
+1.1000000000000 0.9942792889631
+1.3000000000000 1.0257386723337
+1.5000000000000 1.0504811395275
+1.7000000000000 1.0683188417351
+1.9000000000000 1.0800624700039
+2.1000000000000 1.0869756443890
+2.3000000000000 1.0903578617256
+2.5000000000000 1.0913186527034
+2.7000000000000 1.0907021618302
+2.9000000000000 1.0891058231430
+3.1000000000000 1.0869307692712
+3.3000000000000 1.0844393047606
+3.5000000000000 1.0817983664639
+3.7000000000000 1.0791140170093
+3.9000000000000 1.0764513908447
+4.1000000000000 1.0738506867928
+4.3000000000000 1.0713345492164
+4.5000000000000 1.0689157479161
+4.7000000000000 1.0665991855288
+4.9000000000000 1.0643860285416
+5.1000000000000 1.0622736859247
+5.3000000000000 1.0602585767413
+5.5000000000000 1.0583351409869
+5.7000000000000 1.0564978461314
+5.9000000000000 1.0547399290080
+6.1000000000000 1.0530551547700
+6.3000000000000 1.0514362873869
+6.5000000000000 1.0498766325860
+6.7000000000000 1.0483684084012
diff --git a/test/test_brilldata_2/psi_max.tl b/test/test_brilldata_2/psi_max.tl
new file mode 100644
index 0000000..66ab83d
--- /dev/null
+++ b/test/test_brilldata_2/psi_max.tl
@@ -0,0 +1,2 @@
+"psi v time
+0.0000000000000 1.1470367498635
diff --git a/test/test_brilldata_2/psi_min.tl b/test/test_brilldata_2/psi_min.tl
new file mode 100644
index 0000000..1a43b32
--- /dev/null
+++ b/test/test_brilldata_2/psi_min.tl
@@ -0,0 +1,2 @@
+"psi v time
+0.0000000000000 0.7008444806476
diff --git a/test/test_brilldata_2/psi_nm1.tl b/test/test_brilldata_2/psi_nm1.tl
new file mode 100644
index 0000000..8758796
--- /dev/null
+++ b/test/test_brilldata_2/psi_nm1.tl
@@ -0,0 +1,2 @@
+"psi v time
+0.0000000000000 1.0570696312872
diff --git a/test/test_brilldata_2/psi_nm2.tl b/test/test_brilldata_2/psi_nm2.tl
new file mode 100644
index 0000000..08c158b
--- /dev/null
+++ b/test/test_brilldata_2/psi_nm2.tl
@@ -0,0 +1,2 @@
+"psi v time
+0.0000000000000 1.0574981148729
diff --git a/test/test_brilldata_2/test_brilldata_2.par b/test/test_brilldata_2/test_brilldata_2.par
new file mode 100644
index 0000000..858a256
--- /dev/null
+++ b/test/test_brilldata_2/test_brilldata_2.par
@@ -0,0 +1,49 @@
+
+!DESC "Brill wave initial data (Conformal, BAM)"
+
+ActiveThorns = "bam_elliptic admbase staticconformal ellbase ellsor boundary pugh pughslab pughreduce cartgrid3d idbrilldata ioascii iobasic ioutil time"
+
+# General
+
+driver::global_nx = 35
+driver::global_ny = 35
+driver::global_nz = 35
+
+grid::type = "byspacing"
+grid::dxyz = 0.2
+grid::domain = "octant"
+
+cactus::cctk_itlast = 0
+
+# Brill wave initial data
+
+ADMBase::initial_data = "brilldata"
+ADMBase::metric_type = "static conformal"
+StaticConformal::conformal_storage = "factor"
+
+# Brill wave parameters
+
+idbrilldata::brill_q = 2
+idbrilldata::brill_a = 5.0
+
+# Elliptic solver.
+
+idbrilldata::brill_solver = "bam"
+
+bam_elliptic::bam_bound = "bamrobin"
+
+# Output.
+
+IO::out_dir = "test_brilldata_2"
+IO::out_fileinfo = "none"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "idbrilldata::brillpsi"
+
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy idbrilldata::brillpsi staticconformal::psi"
+
+IOASCII::out1D_every = 1
+IOASCII::out1D_vars = "admbase::gxx admbase::gyy admbase::gzz admbase::gxy idbrilldata::brillpsi staticconformal::psi"
+
+IO::new_filename_scheme = "no" \ No newline at end of file