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

1 files changed, 49 insertions, 0 deletions

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