1 files changed, 76 insertions, 36 deletions
diff --git a/test/test_dbh.par b/test/test_dbh.par
index eec9d07..cdd0a8a 100755
--- a/test/test_dbh.par
+++ b/test/test_dbh.par
@@ -1,33 +1,21 @@
-######################################################################
-#!DESC "Initial data for axisymmetric distored black hole"
-######################################################################
+#==============================================================================
+# single rotating black hole
+#==============================================================================
 
-ActiveThorns = "time boundary iobasic ADMconstraints pugh pughreduce pughslab pughinterp cartgrid3d einstein ADM DistortedBHIVP ioascii ioutil"
+ActiveThorns = " DistortedBHIVP adm coordbase coordgauge staticconformal spacemask admbase admcoupling admmacros admanalysis ellbase cartgrid3d time pugh pughreduce pughslab ioascii ioutil iobasic adm admconstraints boundary pughinterp LocalInterp flexio nanchecker "
+IOBasic::outScalar_vars = " admbase::metric admbase::curv admbase::lapse admbase::shift admconstraints::momy admconstraints::ham "
+IOBasic::outInfo_vars = " admconstraints::ham admbase::alp "
+IOASCII::out1D_vars = " admbase::metric admbase::curv admbase::lapse admbase::shift admconstraints::momy admconstraints::ham "
 
-# GENERAL 
+IOASCII::out2D_vars = ""
 
-einstein::evolution_system = "ADM"     
+#==============================================================================
+# MODEL distored BH 
+#==============================================================================
 
-driver::global_nx =  32
-driver::global_ny =  32
-driver::global_nz =  32
+admbase::initial_data                  = "distortedbh"
+admbase::metric_type = "static conformal"
 
-grid::type = "byspacing"
-grid::dxyz = 0.4
-grid::domain = "full"
-
-time::dtfac = 0.25   
-
-cactus::cctk_initial_time = 0.   
-cactus::cctk_itlast       = 1
-
-adm::method           = "stagleap" 
-adm::bound            = "static"
-admconstraints::bound = "static"
-
-# MODEL 
-
-einstein::initial_data = "distortedbh"
 distortedbhivp::amp      = -0.1
 distortedbhivp::eta0     = 0.0
 distortedbhivp::c        = 0.5
@@ -37,19 +25,71 @@ distortedbhivp::n        = 4
 distortedbhivp::neta     = 102
 distortedbhivp::ntheta   = 27
 distortedbhivp::nphi     = 5
-distortedbhivp::interpolation_order = 1
 
+#==============================================================================
+# generic output directory
+#==============================================================================
+
+IO::out_dir="test_dbh"
+
+#==============================================================================
+
+driver::global_nx                       = 30
+driver::global_ny                       = 30
+driver::global_nz                       = 30
+
+
+time::dtfac                             = 0.25
+
+grid::type                              = "byspacing"
+
+grid::dxyz                              = 0.1
+grid::domain                            = "full"
+
+pugh::ghost_size                        = 2
+
+cactus::cctk_itlast                     = 1
+
+
+#==============================================================================
+# Standard ADM_BSSN evolution
+#==============================================================================
+
+
+
+admbase::evolution_method              = "adm"
+
+
+#==============================================================================
+# lapse
+#==============================================================================
+
+admbase::lapse_evolution_method         = "geodesic"
+
+#==============================================================================
+# NaNchecker
+#==============================================================================
+
+NaNChecker::check_every 	=	10
+NaNChecker::check_vars	 	=	"admbase::metric admbase::curv"
+NaNChecker::action_if_found	=	"abort"
+
+
+
+
+#==============================================================================
+# 1D output
+#==============================================================================
+
+
+
+
+IOBasic::outScalar_every                = 1
+IOASCII::out1D_every                    = 10
+IOBasic::outInfo_every                  = 10
 
-# GAUGE
-einstein::slicing    = "geodesic"  
+#IO::out_xline_y				= 2.342904144
+#IO::out_zline_y				= 2.342904144
 
-# OUTPUT ########################################################
-IO::outdir         = "test_dbh"
-IOASCII::out1d_every     =  1
-IOBasic::outScalar_vars  = "einstein::metric einstein::curv admconstraints::ham"
-IOASCII::out1D_vars      = "einstein::metric einstein::curv einstein::lapse admconstraints::ham einstein::grr einstein::psi einstein::psix einstein::psiy einstein::psiz einstein::psixx einstein::psixy einstein::psixz einstein::psiyy einstein::psiyz einstein::psizz"
-IOBasic::outInfo_every   = 1
-IOBasic::outInfo_vars    = "admconstraints::ham einstein::gxx"
 
-##################################################################