axbrillbh_ADM.par is removed because it seems to be simply an ancient

version of axibrill_ADM.par.

axibrill_ADM.par is converted to CactusEinstein2, but it gives nans at
iteration 1.  The nans persist even with flat initial data. (?!)

pablo.par is converted, but I cannot get CactusEinstein2/PsiKadelia to
compile to test it...


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDAxiBrillBH/trunk@38 0a4070d5-58f5-498f-b6c0-2693e757fa0f

3 files changed, 34 insertions, 87 deletions

diff --git a/par/axbrillbh_ADM.par b/par/axbrillbh_ADM.par
deleted file mode 100644
index dbc38f0..0000000
--- a/par/axbrillbh_ADM.par
+++ /dev/null
@@ -1,55 +0,0 @@
-######################################################################
-# Geodesically sliced black hole + brill wave, ADM, Staggered leapfrog
-######################################################################
-
-#Required thorns
-ActiveThorns = "time ADMconstraints pugh pughreduce pughslab cartgrid3d einstein ADM AxiBrillBHIVP ioascii ioutil"
-
-pugh::enable_all_storage = "yes"
-
-# GENERAL 
-
-einstein::evolution_system = "ADM"     
-
-driver::global_nx =  32     
-driver::global_ny =  32     
-driver::global_nz =  32     
-
-grid::type = "byspacing"
-grid::dxyz = 0.4
-grid::symmetry = "full"
-
-time::dtfac = 0.25   
-
-cactus::cctk_initial_time = 0.     
-cactus::cctk_itlast       =     10      
-
-adm::method       =    "stagleap" 
-adm::bound 	  = "static"
-
-# MODEL 
-einstein::initial_data = "axibrillbh"
-axibrillbhivp::axibrillbh_amp      = 0.5
-axibrillbhivp::axibrillbh_eta0 i   = 0.0
-axibrillbhivp::axibrillbh_sigma    = 1.0
-axibrillbhivp::axibrillbh_etamax   = 6.0
-axibrillbhivp::axibrillbh_n        = 2
-axibrillbhivp::axibrillbh_ne       = 302
-axibrillbhivp::axibrillbh_nq	   = 54
-axibrillbhivp::axibrillbh_intorder = 1
-
-# GAUGE
-adm::slicing 	= "geodesic"  
-
-
-# OUTPUT ########################################################
-
-IO::IO_outdir = "AxiBrillBHIVP"
-
-IO::IO_0Devery         =     2      
-IO::info_every = 1
-IOASCII::output_info = "einstein"
-IOASCII::output0D = "einstein::gxx einstein::kxx admconstraints::ADMconstraints
-                einstein::grr einstein::alp"
-
-##################################################################
diff --git a/par/axibrill_ADM.par b/par/axibrill_ADM.par
index 36b72c8..4aa44be 100644
--- a/par/axibrill_ADM.par
+++ b/par/axibrill_ADM.par
@@ -3,32 +3,35 @@
 ######################################################################
 
 #Required thorns
-ActiveThorns = "Boundary Time ADMconstraints PUGH PUGHSlab PUGHReduce PUGHInterp CartGrid3D Einstein ADM IDAxiBrillBH IOASCII IOUtil IOBasic"
+ActiveThorns = "Boundary Time ADMconstraints PUGH PUGHSlab PUGHReduce PUGHInterp CartGrid3D ADMBase admmacros coordgauge staticconformal ADM ADMAnalysis IDAxiBrillBH IOASCII IOUtil IOBasic"
 
 pugh::enable_all_storage = "yes"
 
-# GENERAL 
+# GENERAL
 
-einstein::evolution_system = "ADM"     
+ADMBase::evolution_method = "ADM"
+#ADMBase::metric_type = "static conformal"
+ADMBase::metric_type = "physical"
 
-driver::global_nx =  20     
-driver::global_ny =  20     
-driver::global_nz =  20     
+driver::global_nx =  22
+driver::global_ny =  22
+driver::global_nz =  22
 
 grid::type = "byspacing"
 grid::dxyz = 0.2
-grid::domain = "octant"
+#grid::domain = "octant"
 
-time::dtfac         =     0.25   
+time::dtfac = 0.25   
 
-cactus::cctk_initial_time         =     0.     
-cactus::cctk_itlast        =     10      
+cactus::cctk_initial_time  =     0.
+cactus::cctk_itlast        =     10
 
-adm::method        =    "stagleap" 
-adm::bound = "flat"
+adm::method = "stagleap"
+adm::bound  = "flat"
 
-# MODEL 
-einstein::initial_data = "axibrillbh"
+# MODEL
+#ADMBase::initial_data = "axibrillbh"
+# gives nans, independent of initial data -- something is wrong with these parameters, but not this thorn (DPR, 3 may 002)
 idaxibrillbh::amp = 0.5
 idaxibrillbh::eta0 = 0.0
 idaxibrillbh::sigma = 1.0
@@ -38,16 +41,16 @@ idaxibrillbh::ne = 302
 idaxibrillbh::nq = 54
 
 # GAUGE
-einstein::slicing       =    "geodesic"  
+ADMBase::lapse_evolution_method = "geodesic"
 
 
 # OUTPUT ########################################################
 
 IO::outdir = "IDAxiBrillBH"
 
-IOBasic::outInfo_every = 2      
-IOASCII::out1d_every = 1
-IOBasic::outInfo_vars = "einstein::gxx"
-IOASCII::out1d_vars = "einstein::gxx einstein::kxx admconstraints::ham einstein::grr einstein::alp"
+IOBasic::outInfo_every = 1
+IOASCII::out1d_every   = 1
+IOBasic::outInfo_vars = "admbase::gxx"
+IOASCII::out1d_vars = "admbase::gxx admbase::kxx admconstraints::ham admanalysis::grr admbase::alp"
 
 ##################################################################
diff --git a/par/pablo.par b/par/pablo.par
index 9258f0b..d8f9099 100644
--- a/par/pablo.par
+++ b/par/pablo.par
@@ -1,6 +1,6 @@
 !DESC "Demonstration file for Pablo/AutoPilot"
 
-ActiveThorns = "Pughslab FlexIO Boundary Time PsiKadelia ADMConstraints PUGH PUGHInterp PUGHReduce CartGrid3D Einstein ADM IDAxiBrillBH IOBasic IOFlexIO IOASCII IOUtil"
+ActiveThorns = "Pughslab FlexIO Boundary Time PsiKadelia ADMConstraints PUGH PUGHInterp PUGHReduce CartGrid3D ADMBase ADM IDAxiBrillBH IOBasic IOFlexIO IOASCII IOUtil"
 
 
 # Parameters which will affect performance
@@ -15,25 +15,25 @@ ActiveThorns = "Pughslab FlexIO Boundary Time PsiKadelia ADMConstraints PUGH PUG
 
 
 # GLOBAL GRID SIZE IN EACH DIRECTION
-driver::global_nsize = 32    
+driver::global_nsize = 32
 
 # OUTPUT TO SCREEN
 iobasic::outInfo_every   = 1
-iobasic::outInfo_vars    = "einstein::alp PsiKadelia::psi4re admconstraints::ham "
+iobasic::outInfo_vars    = "ADMBase::alp PsiKadelia::psi4re admconstraints::ham"
 
 # OUTPUT Scalars reductions
 iobasic::outScalar_every = 1
-iobasic::outScalar_vars  = "einstein::alp einstein::metric admconstraints::ham PsiKadelia::psi4re "
- 
+iobasic::outScalar_vars  = "ADMBase::alp ADMBase::metric admconstraints::ham PsiKadelia::psi4re "
+
 # OUTPUT 1D ASCII
 ioascii::out1D_every     = 10
-ioascii::out1D_vars      = "einstein::alp einstein::metric admconstraints::ham PsiKadelia::psi4re "
- 
+ioascii::out1D_vars      = "admbase::alp admbase::metric admconstraints::ham PsiKadelia::psi4re"
+
 # OUTPUT 3D IEEEIO
 #ioflexio::out3D_every    = 10
-#ioflexio::out3D_vars     = "einstein::alp einstein::metric admconstraints::ham PsiKadelia::psi4re "
+#ioflexio::out3D_vars     = "admbase::alp admbase::metric admconstraints::ham PsiKadelia::psi4re "
 
-# CHECKPOINT 
+# CHECKPOINT
 IOFlexIO::checkpoint       = "yes"
 IO::checkpoint_every       = 10
 
@@ -52,7 +52,7 @@ IO::checkpoint_dir         = "pablo"
 # -----------------------------
 IO::checkpoint_keep        = 1
 IO::checkpoint_file        = "checkpoint"
-einstein::evolution_system = "ADM"     
+admbase::evolution_method  = "ADM"     
 grid::type                 = "byspacing"
 grid::dxyz                 = 0.1
 grid::domain               = "octant"
@@ -60,8 +60,8 @@ time::dtfac                = 0.25
 cactus::cctk_initial_time  = 0.     
 adm::method                = "stagleap" 
 adm::bound                 = "flat"
-einstein::slicing          = "1+log"  
-einstein::initial_data     = "axibrillbh"
+ADMBase::lapse_evolution_method = "1+log"  
+admbase::initial_data     = "axibrillbh"
 idaxibrillbh::amp          = 0.5
 idaxibrillbh::eta0         = 0.0
 idaxibrillbh::sigma        = 1.0
@@ -69,4 +69,3 @@ idaxibrillbh::etamax       = 6.0
 idaxibrillbh::n            = 2
 idaxibrillbh::ne           = 302
 idaxibrillbh::nq           = 54
-