Make "Erik" branch the default trunk for AHFinderDirect.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1526 f88db872-0e4f-0410-b76b-b9085cfa78c5

25 files changed, 543 insertions, 608 deletions

diff --git a/par/Kerr-carpet.par b/par/Kerr-carpet.par
deleted file mode 100644
index 423536a..0000000
--- a/par/Kerr-carpet.par
+++ /dev/null
@@ -1,132 +0,0 @@
-# This parameter file sets up Kerr/Kerr-Schild initial data, then
-# finds the apparent horizon in it.  The local coordinate system origin
-# and the initial guess are both deliberately de-centered with respect
-# to the black hole, to make this a non-trivial test for the apparent
-# horizon finder.
-
-# flesh
-cactus::cctk_itlast = 0
-
-########################################
-
-#
-# ***** output setup (also see below for more output stuff) *****
-#
-ActiveThorns = "IOUtil IOBasic"
-IOUtil::parfile_write = "no"
-IO::out_dir = $parfile
-
-########################################
-
-#
-# basic grid setup
-#
-
-ActiveThorns = "Carpet CarpetLib CarpetInterp CarpetReduce"
-Carpet::domain_from_coordbase    = true
-
-ActiveThorns = "SymBase Boundary"
-ActiveThorns = "CoordBase"
-CoordBase::domainsize = "minmax"
-CoordBase::xmin = -3.0		# specify full domain for "new" symmetries
-CoordBase::xmax = +3.0
-CoordBase::ymin = -3.0
-CoordBase::ymax = +3.0
-CoordBase::zmin =  0.0		# specify active domain for "old" symmetries
-CoordBase::zmax = +3.0
-CoordBase::dx   = 0.2
-CoordBase::dy   = 0.2
-CoordBase::dz   = 0.2
-
-#
-# ghost zones
-#
-
-driver::ghost_size_x = 2
-driver::ghost_size_y = 2
-driver::ghost_size_z = 2
-
-# ghost zones are outside the nominal grid
-CoordBase::boundary_internal_x_lower = false
-CoordBase::boundary_internal_x_upper = false
-CoordBase::boundary_internal_y_lower = false
-CoordBase::boundary_internal_y_upper = false
-CoordBase::boundary_internal_z_lower = false
-CoordBase::boundary_internal_z_upper = false
-
-# ghost zone widths
-CoordBase::boundary_size_x_lower     = 2
-CoordBase::boundary_size_x_upper     = 2
-CoordBase::boundary_size_y_lower     = 2
-CoordBase::boundary_size_y_upper     = 2
-CoordBase::boundary_size_z_lower     = 2
-CoordBase::boundary_size_z_upper     = 2
-
-# ghost zones start 0.5 point outside nominal grid boundary
-CoordBase::boundary_shiftout_x_lower = 0
-CoordBase::boundary_shiftout_x_upper = 0
-CoordBase::boundary_shiftout_y_lower = 0
-CoordBase::boundary_shiftout_y_upper = 0
-CoordBase::boundary_shiftout_z_lower = 0
-CoordBase::boundary_shiftout_z_upper = 0
-
-# staggered grids everywhere
-CoordBase::boundary_staggered_x_lower = true
-CoordBase::boundary_staggered_x_upper = true
-CoordBase::boundary_staggered_y_lower = true
-CoordBase::boundary_staggered_y_upper = true
-CoordBase::boundary_staggered_z_lower = true
-CoordBase::boundary_staggered_z_upper = true
-
-# octant symmetry
-ActiveThorns = "ReflectionSymmetry"
-ReflectionSymmetry::avoid_origin_x = true
-ReflectionSymmetry::avoid_origin_y = true
-ReflectionSymmetry::avoid_origin_z = true
-ReflectionSymmetry::reflection_x = true
-ReflectionSymmetry::reflection_y = true
-ReflectionSymmetry::reflection_z = false	# CartGrid3D will take care of
-						# this reflection symmetry
-
-ActiveThorns = "CartGrid3D"
-CartGrid3D::type = "CoordBase"
-Grid::domain = "bitant"
-
-########################################
-
-#
-# Kerr initial data
-#
-ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge SpaceMask Exact"
-ADMBase::initial_lapse = "exact"
-ADMBase::initial_shift = "exact"
-ADMBase::initial_data = "exact"
-ADMBase::lapse_evolution_method = "static"
-ADMBase::shift_evolution_method = "static"
-ADMBase::metric_type = "physical"
-Exact::exact_model = "Kerr/Kerr-Schild"
-Exact::Kerr_KerrSchild__mass = 1.0
-Exact::Kerr_KerrSchild__spin = 0.6
-
-########################################
-
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp AHFinderDirect"
-
-AHFinderDirect::print_timing_stats = "true"
-AHFinderDirect::verbose_level = "algorithm highlights"
-
-AHFinderDirect::output_Theta_every = 1
-AHFinderDirect::h_base_file_name     = "Kerr.h"
-AHFinderDirect::Theta_base_file_name = "Kerr.Theta"
-
-AHFinderDirect::N_horizons = 1
-AHFinderDirect::origin_x[1] = 0.5
-AHFinderDirect::origin_y[1] = 0.7
-AHFinderDirect::origin_z[1] = 0.0
-
-AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] =  0.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0
diff --git a/par/Kerr-centered.par b/par/Kerr-centered.par
index c2b21cf..80a6055 100644
--- a/par/Kerr-centered.par
+++ b/par/Kerr-centered.par
@@ -13,7 +13,7 @@ driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
 
-ActiveThorns = "CoordBase CartGrid3D"
+ActiveThorns = "CoordBase SymBase CartGrid3D"
 grid::domain = "bitant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
@@ -37,8 +37,7 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 
diff --git a/par/Kerr-mask.par b/par/Kerr-mask.par
index 18a4dba..50cfe63 100644
--- a/par/Kerr-mask.par
+++ b/par/Kerr-mask.par
@@ -13,7 +13,7 @@ driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
 
-ActiveThorns = "CoordBase CartGrid3D"
+ActiveThorns = "CoordBase SymBase CartGrid3D"
 grid::domain = "bitant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
@@ -35,16 +35,14 @@ SpaceMask::use_mask = "true"
 
 ActiveThorns = "PUGHSlab IOUtil IOASCII"
 IOUtil::parfile_write = "no"
-IO::out_dir = "$parfile"
-
+IO::out_dir = "Kerr-mask"
 IOASCII::out2D_every = 1
 IOASCII::out2D_style = "gnuplot f(x,y)"
 IOASCII::out2D_vars = "SpaceMask::emask"
 
 ########################################
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 
diff --git a/par/Kerr-order3.par b/par/Kerr-order3.par
index 36610aa..94091d7 100644
--- a/par/Kerr-order3.par
+++ b/par/Kerr-order3.par
@@ -14,7 +14,7 @@ driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
 
-ActiveThorns = "CoordBase CartGrid3D"
+ActiveThorns = "CoordBase SymBase CartGrid3D"
 grid::domain = "bitant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
@@ -38,8 +38,7 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 
diff --git a/par/Kerr-tiny.par b/par/Kerr-tiny.par
index f7c9829..4aaedf3 100644
--- a/par/Kerr-tiny.par
+++ b/par/Kerr-tiny.par
@@ -16,13 +16,13 @@ driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
 
-ActiveThorns = "CoordBase CartGrid3D"
+ActiveThorns = "CoordBase SymBase CartGrid3D"
 grid::domain = "bitant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
 grid::dxyz = 0.2
 
-ActiveThorns = "ADMBase ADMCoupling StaticConformal Spacemask CoordGauge Exact"
+ActiveThorns = "ADMBase ADMCoupling StaticConformal SpaceMask CoordGauge Exact"
 ADMBase::initial_lapse = "exact"
 ADMBase::initial_shift = "exact"
 ADMBase::initial_data = "exact"
@@ -40,8 +40,7 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 AHFinderDirect::h_base_file_name     = "Kerr-tiny.h"
 
 AHFinderDirect::N_horizons = 1
diff --git a/par/Kerr.par b/par/Kerr.par
index eb5b1f8..095f843 100644
--- a/par/Kerr.par
+++ b/par/Kerr.par
@@ -13,7 +13,7 @@ driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
 
-ActiveThorns = "CoordBase CartGrid3D"
+ActiveThorns = "CoordBase SymBase CartGrid3D"
 grid::domain = "bitant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
@@ -37,11 +37,9 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
-AHFinderDirect::verbose_level = "algorithm highlights"
 
 AHFinderDirect::output_Theta_every = 1
 AHFinderDirect::h_base_file_name     = "Kerr.h"
diff --git a/par/bl-bad.par b/par/bl-bad.par
index b9c2d32..37137a6 100644
--- a/par/bl-bad.par
+++ b/par/bl-bad.par
@@ -9,7 +9,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 42
 Driver::global_ny   = 42
@@ -69,8 +69,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/bl-carpet-mask.par b/par/bl-carpet-mask.par
deleted file mode 100644
index 7e482ff..0000000
--- a/par/bl-carpet-mask.par
+++ /dev/null
@@ -1,170 +0,0 @@
-# This parameter file sets up Brill-Lindquist initial data and finds the
-# apparent horizons in it with AHFinderDirect.
-
-########################################
-
-#
-# ***** output setup (also see below for more output stuff) *****
-#
-ActiveThorns = "IOUtil"
-IOUtil::parfile_write = "no"
-IO::out_dir = $parfile
-
-########################################
-
-#
-# basic grid setup
-#
-
-ActiveThorns = "Carpet CarpetLib CarpetInterp CarpetReduce"
-Carpet::domain_from_coordbase    = true
-
-ActiveThorns = "SymBase Boundary"
-ActiveThorns = "CoordBase"
-CoordBase::domainsize = "minmax"
-CoordBase::xmin = -3.0
-CoordBase::xmax = +3.0
-CoordBase::ymin = -3.0
-CoordBase::ymax = +3.0
-CoordBase::zmin = -3.0
-CoordBase::zmax = +3.0
-CoordBase::dx   = 0.15
-CoordBase::dy   = 0.15
-CoordBase::dz   = 0.15
-
-#
-# ghost zones
-#
-
-driver::ghost_size_x = 2
-driver::ghost_size_y = 2
-driver::ghost_size_z = 2
-
-# ghost zones are outside the nominal grid
-CoordBase::boundary_internal_x_lower = false
-CoordBase::boundary_internal_x_upper = false
-CoordBase::boundary_internal_y_lower = false
-CoordBase::boundary_internal_y_upper = false
-CoordBase::boundary_internal_z_lower = false
-CoordBase::boundary_internal_z_upper = false
-
-# ghost zone widths
-CoordBase::boundary_size_x_lower     = 2
-CoordBase::boundary_size_x_upper     = 2
-CoordBase::boundary_size_y_lower     = 2
-CoordBase::boundary_size_y_upper     = 2
-CoordBase::boundary_size_z_lower     = 2
-CoordBase::boundary_size_z_upper     = 2
-
-# ghost zones start 0.5 point outside nominal grid boundary
-CoordBase::boundary_shiftout_x_lower = 0
-CoordBase::boundary_shiftout_x_upper = 0
-CoordBase::boundary_shiftout_y_lower = 0
-CoordBase::boundary_shiftout_y_upper = 0
-CoordBase::boundary_shiftout_z_lower = 0
-CoordBase::boundary_shiftout_z_upper = 0
-
-# staggered grids everywhere
-CoordBase::boundary_staggered_x_lower = true
-CoordBase::boundary_staggered_x_upper = true
-CoordBase::boundary_staggered_y_lower = true
-CoordBase::boundary_staggered_y_upper = true
-CoordBase::boundary_staggered_z_lower = true
-CoordBase::boundary_staggered_z_upper = true
-
-ActiveThorns = "CartGrid3D"
-CartGrid3D::type = "CoordBase"
-
-########################################
-########################################
-
-#
-# physics
-#
-
-ActiveThorns = "ADMBase ADMCoupling CoordGauge StaticConformal"
-ActiveThorns = "IDAnalyticBH"
-
-ADMBase::initial_data              = "bl_bh"
-IDAnalyticBH::bl_nbh = 2
-
-IDAnalyticBH::bl_m_1 = 1.0
-IDAnalyticBH::bl_x0_1 = 0.0
-IDAnalyticBH::bl_y0_1 = 0.0
-IDAnalyticBH::bl_z0_1 = 1.0
-
-IDAnalyticBH::bl_m_2 = 1.0
-IDAnalyticBH::bl_x0_2 = 0.0
-IDAnalyticBH::bl_y0_2 = 0.0
-IDAnalyticBH::bl_z0_2 = -1.0
-
-########################################
-
-#
-# numerical methods
-#
-
-Cactus::cctk_itlast = 0
-ADMBase::metric_type            = "static conformal"
-StaticConformal::conformal_storage = "factor+derivs+2nd derivs"
-ADMBase::evolution_method       = "none"
-ADMBase::initial_lapse          = "Cadez"
-ADMBase::lapse_evolution_method = "static"
-ADMBase::initial_shift          = "zero"
-ADMBase::shift_evolution_method = "static"
-
-########################################
-
-#
-# apparent horizons
-#
-
-ActiveThorns = "SpaceMask"
-SpaceMask::use_mask = true
-
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp AHFinderDirect"
-
-AHFinderDirect::print_timing_stats = "true"
-AHFinderDirect::verbose_level      = "algorithm highlights"
-
-AHFinderDirect::h_base_file_name              = "bl.h"
-AHFinderDirect::BH_diagnostics_base_file_name = "bl.BH_diagnostics"
-
-AHFinderDirect::N_horizons = 2
-AHFinderDirect::set_mask_for_all_horizons = true
-
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = +1.0
-AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] = +1.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 0.5
-
-AHFinderDirect::origin_x[2] = 0.0
-AHFinderDirect::origin_y[2] = 0.0
-AHFinderDirect::origin_z[2] = -1.0
-AHFinderDirect::initial_guess_method[2] = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[2] = -1.0
-AHFinderDirect::initial_guess__coord_sphere__radius[2] = 0.5
-
-########################################
-
-#
-# ASCII output
-#
-
-########################################
-
-ActiveThorns = "CarpetIOASCII"
-CarpetIOASCII::out3D_ghosts = true
-CarpetIOASCII::out3D_outer_ghosts = true
-
-IOASCII::out2d_every = 1
-IOASCII::out2d_vars = "SpaceMask::emask"
-
-########################################
diff --git a/par/bl-carpet.par b/par/bl-carpet.par
deleted file mode 100644
index e2ef125..0000000
--- a/par/bl-carpet.par
+++ /dev/null
@@ -1,149 +0,0 @@
-# This parameter file sets up Brill-Lindquist initial data and finds the
-# apparent horizons in it with AHFinderDirect.
-
-########################################
-
-#
-# ***** output setup (also see below for more output stuff) *****
-#
-ActiveThorns = "IOUtil IOBasic"
-IOUtil::parfile_write = "no"
-IO::out_dir = $parfile
-
-########################################
-
-#
-# basic grid setup
-#
-
-ActiveThorns = "Carpet CarpetLib CarpetInterp CarpetReduce"
-Carpet::domain_from_coordbase    = true
-
-ActiveThorns = "SymBase Boundary"
-ActiveThorns = "CoordBase"
-CoordBase::domainsize = "minmax"
-CoordBase::xmin = -3.0
-CoordBase::xmax = +3.0
-CoordBase::ymin = -3.0
-CoordBase::ymax = +3.0
-CoordBase::zmin = -3.0
-CoordBase::zmax = +3.0
-CoordBase::dx   = 0.15
-CoordBase::dy   = 0.15
-CoordBase::dz   = 0.15
-
-#
-# ghost zones
-#
-
-driver::ghost_size_x = 2
-driver::ghost_size_y = 2
-driver::ghost_size_z = 2
-
-# ghost zones are outside the nominal grid
-CoordBase::boundary_internal_x_lower = false
-CoordBase::boundary_internal_x_upper = false
-CoordBase::boundary_internal_y_lower = false
-CoordBase::boundary_internal_y_upper = false
-CoordBase::boundary_internal_z_lower = false
-CoordBase::boundary_internal_z_upper = false
-
-# ghost zone widths
-CoordBase::boundary_size_x_lower     = 2
-CoordBase::boundary_size_x_upper     = 2
-CoordBase::boundary_size_y_lower     = 2
-CoordBase::boundary_size_y_upper     = 2
-CoordBase::boundary_size_z_lower     = 2
-CoordBase::boundary_size_z_upper     = 2
-
-# ghost zones start 0.5 point outside nominal grid boundary
-CoordBase::boundary_shiftout_x_lower = 0
-CoordBase::boundary_shiftout_x_upper = 0
-CoordBase::boundary_shiftout_y_lower = 0
-CoordBase::boundary_shiftout_y_upper = 0
-CoordBase::boundary_shiftout_z_lower = 0
-CoordBase::boundary_shiftout_z_upper = 0
-
-# staggered grids everywhere
-CoordBase::boundary_staggered_x_lower = true
-CoordBase::boundary_staggered_x_upper = true
-CoordBase::boundary_staggered_y_lower = true
-CoordBase::boundary_staggered_y_upper = true
-CoordBase::boundary_staggered_z_lower = true
-CoordBase::boundary_staggered_z_upper = true
-
-ActiveThorns = "CartGrid3D"
-CartGrid3D::type = "CoordBase"
-
-########################################
-########################################
-
-#
-# physics
-#
-
-ActiveThorns = "ADMBase ADMCoupling CoordGauge StaticConformal SpaceMask"
-ActiveThorns = "IDAnalyticBH"
-
-ADMBase::initial_data              = "bl_bh"
-IDAnalyticBH::bl_nbh = 2
-
-IDAnalyticBH::bl_m_1 = 1.0
-IDAnalyticBH::bl_x0_1 = 0.0
-IDAnalyticBH::bl_y0_1 = 0.0
-IDAnalyticBH::bl_z0_1 = 1.0
-
-IDAnalyticBH::bl_m_2 = 1.0
-IDAnalyticBH::bl_x0_2 = 0.0
-IDAnalyticBH::bl_y0_2 = 0.0
-IDAnalyticBH::bl_z0_2 = -1.0
-
-########################################
-
-#
-# numerical methods
-#
-
-Cactus::cctk_itlast = 0
-ADMBase::metric_type            = "static conformal"
-StaticConformal::conformal_storage = "factor+derivs+2nd derivs"
-ADMBase::evolution_method       = "none"
-ADMBase::initial_lapse          = "Cadez"
-ADMBase::lapse_evolution_method = "static"
-ADMBase::initial_shift          = "zero"
-ADMBase::shift_evolution_method = "static"
-
-########################################
-
-#
-# AHFinderDirect
-#
-
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp AHFinderDirect"
-
-AHFinderDirect::print_timing_stats = "true"
-AHFinderDirect::verbose_level      = "algorithm highlights"
-
-AHFinderDirect::h_base_file_name              = "bl.h"
-AHFinderDirect::BH_diagnostics_base_file_name = "bl.BH_diagnostics"
-
-AHFinderDirect::N_horizons = 2
-
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = +1.0
-AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] = +1.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 0.5
-
-AHFinderDirect::origin_x[2] = 0.0
-AHFinderDirect::origin_y[2] = 0.0
-AHFinderDirect::origin_z[2] = -1.0
-AHFinderDirect::initial_guess_method[2] = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[2] = -1.0
-AHFinderDirect::initial_guess__coord_sphere__radius[2] = 0.5
diff --git a/par/bl-different-mask-min-radius-points=5.par b/par/bl-different-mask-min-radius-points=5.par
index 8c06566..73739a9 100644
--- a/par/bl-different-mask-min-radius-points=5.par
+++ b/par/bl-different-mask-min-radius-points=5.par
@@ -7,7 +7,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 52
 Driver::global_ny   = 52
@@ -73,8 +73,7 @@ IOASCII::out2D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/bl-different-mask.par b/par/bl-different-mask.par
index dbd641c..f2449c8 100644
--- a/par/bl-different-mask.par
+++ b/par/bl-different-mask.par
@@ -7,7 +7,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 52
 Driver::global_ny   = 52
@@ -73,8 +73,7 @@ IOASCII::out2D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/bl-ss.par b/par/bl-ss.par
deleted file mode 100644
index dd9764b..0000000
--- a/par/bl-ss.par
+++ /dev/null
@@ -1,103 +0,0 @@
-# This parameter file sets up Brill-Lindquist initial data and finds the
-# apparent horizons in it with AHFinderDirect.
-
-########################################
- 
-#
-# ***** grid *****
-#
-
-ActiveThorns = "CoordBase CartGrid3D PUGH"
-
-Driver::global_nx   = 42
-Driver::global_ny   = 42
-Driver::global_nz   = 82
-PUGH::ghost_size    = 2
-
-Grid::domain        = "full"
-Grid::type          = "byspacing"
-Grid::dxyz          = 0.05
-Grid::avoid_origin  = "true"
-
-########################################
-
-#
-# physics
-#
-
-ActiveThorns = "ADMBase ADMCoupling CoordGauge StaticConformal SpaceMask"
-ActiveThorns = "IDAnalyticBH"
-
-ADMBase::initial_data              = "bl_bh"
-IDAnalyticBH::bl_nbh = 2
-
-IDAnalyticBH::bl_m_1 = 1.0
-IDAnalyticBH::bl_x0_1 = 0.0
-IDAnalyticBH::bl_y0_1 = 0.0
-IDAnalyticBH::bl_z0_1 = 1.0
-
-IDAnalyticBH::bl_m_2 = 1.0
-IDAnalyticBH::bl_x0_2 = 0.0
-IDAnalyticBH::bl_y0_2 = 0.0
-IDAnalyticBH::bl_z0_2 = -1.0
-
-########################################
-
-#
-# numerical methods
-#
-
-Cactus::cctk_itlast = 0
-ADMBase::metric_type            = "static conformal"
-StaticConformal::conformal_storage = "factor+derivs+2nd derivs"
-ADMBase::evolution_method       = "none"
-ADMBase::initial_lapse          = "Cadez"
-ADMBase::lapse_evolution_method = "static"
-ADMBase::initial_shift          = "zero"
-ADMBase::shift_evolution_method = "static"
-
-########################################
-
-ActiveThorns = "IOUtil"
-IOUtil::parfile_write = "no"
-
-########################################
-
-ActiveThorns = "SphericalSurface"
-SphericalSurface::nsurfaces = 1
-
-########################################
-
-#
-# AHFinderDirect
-#
-
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
-
-AHFinderDirect::print_timing_stats = "true"
-##AHFinderDirect::verbose_level = "algorithm details"
-
-AHFinderDirect::h_base_file_name              = "bl.h"
-AHFinderDirect::BH_diagnostics_base_file_name = "bl.BH_diagnostics"
-
-AHFinderDirect::N_horizons = 2
-
-AHFinderDIrect::which_surface_to_store_info[1] = 0
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = +1.0
-AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] = +1.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 0.5
-
-AHFinderDirect::origin_x[2] = 0.0
-AHFinderDirect::origin_y[2] = 0.0
-AHFinderDirect::origin_z[2] = -1.0
-AHFinderDirect::initial_guess_method[2] = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[2] = -1.0
-AHFinderDirect::initial_guess__coord_sphere__radius[2] = 0.5
diff --git a/par/bl-y.par b/par/bl-y.par
index 6bd203f..8e8fea9 100644
--- a/par/bl-y.par
+++ b/par/bl-y.par
@@ -7,7 +7,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 42
 Driver::global_ny   = 42
@@ -67,8 +67,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/bl.par b/par/bl.par
index d304359..d2d9349 100644
--- a/par/bl.par
+++ b/par/bl.par
@@ -7,7 +7,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 42
 Driver::global_ny   = 42
@@ -67,14 +67,13 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
 
-AHFinderDirect::h_base_file_name              = "bl.h"
-AHFinderDirect::BH_diagnostics_base_file_name = "bl.BH_diagnostics"
+AHFinderDirect::h_base_file_name              = "misner.h"
+AHFinderDirect::BH_diagnostics_base_file_name = "misner.BH_diagnostics"
 
 AHFinderDirect::N_horizons = 2
 
diff --git a/par/checkpoint.par b/par/checkpoint.par
new file mode 100644
index 0000000..84595f8
--- /dev/null
+++ b/par/checkpoint.par
@@ -0,0 +1,87 @@
+# This parameter file sets up Kerr/Kerr-Schild initial data, then
+# finds the apparent horizon in it.
+
+cactus::cctk_itlast = 1
+
+ActiveThorns = "IOUtil"
+IO::out_dir = $parfile
+IO::parfile_write = "no"
+
+ActiveThorns = "Carpet CarpetLib CarpetReduce"
+driver::ghost_size = 2
+driver::global_nx = 33
+driver::global_ny = 33
+driver::global_nz = 33
+
+ActiveThorns = "Boundary CartGrid3D CoordBase RotatingSymmetry90 Slab SymBase"
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byrange"
+grid::xmin = -0.2
+grid::ymin = -0.2
+grid::zmin = -0.2
+grid::xmax =  3.0
+grid::ymax =  3.0
+grid::zmax =  3.0
+
+ActiveThorns = "ADMBase ADMCoupling ADMMacros StaticConformal CoordGauge SpaceMask LegoExcision Exact NaNChecker Time MoL BSSN_MoL"
+ADMBase::initial_lapse = "exact"
+ADMBase::initial_shift = "exact"
+ADMBase::initial_data = "exact"
+ADMBase::lapse_evolution_method = "static"
+ADMBase::shift_evolution_method = "static"
+ADMBase::evolution_method = "adm_bssn"
+ADMBase::metric_type = "physical"
+Exact::exact_model = "Kerr/Kerr-Schild"
+Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.6
+LegoExcision::fixed_excision = sphere
+LegoExcision::fixed_size = 1.0
+SpaceMask::use_mask = yes
+Time::dtfac = 0.25
+BSSN_MoL::excise = yes
+BSSN_MoL::BSSN_MaxNumConstrainedVars = 16
+
+########################################
+
+ActiveThorns = "SphericalSurface"
+
+ActiveThorns = "LocalInterp AEILocalInterp CarpetInterp CarpetReduce SphericalSurface AHFinderDirect"
+
+AHFinderDirect::print_timing_stats = "true"
+
+AHFinderDirect::h_base_file_name              = "h"
+AHFinderDirect::BH_diagnostics_base_file_name = "BH_diagnostics"
+AHFinderDirect::output_OpenDX_control_files   = "no"
+AHFinderDirect::Theta_norm_for_convergence = 1.0e-12
+
+AHFinderDirect::geometry_interpolator_name = "Lagrange polynomial interpolation"
+AHFinderDirect::geometry_interpolator_pars = "order=4"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = 0.5
+AHFinderDirect::origin_y[1] = 0.7
+AHFinderDirect::origin_z[1] = 0.0
+
+AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
+AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
+AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3
+AHFinderDirect::initial_guess__coord_sphere__z_center[1] =  0.0
+AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0
+
+########################################
+
+ActiveThorns = "CarpetIOASCII"
+CarpetIOASCII::out0D_every = 1
+CarpetIOASCII::out0D_vars = "ADMBase::gxx AHFinderDirect::ah_radius AHFinderDirect::ah_origin AHFinderDirect::ah_flags"
+CarpetIOASCII::out1D_every = 1
+CarpetIOASCII::out1D_vars = "ADMBase::gxx AHFinderDirect::ah_radius"
+CarpetIOASCII::out2D_every = 1
+CarpetIOASCII::out2D_vars = "AHFinderDirect::ah_radius"
+
+ActiveThorns = "CarpetIOHDF5"
+IO::checkpoint_ID           = yes
+IO::checkpoint_every        = 1
+IO::checkpoint_on_terminate = yes
+IO::checkpoint_dir          = $parfile
+CarpetIOHDF5::checkpoint    = yes
diff --git a/par/horizon-movie.gnuplot b/par/horizon-movie.gnuplot
new file mode 100755
index 0000000..2732b22
--- /dev/null
+++ b/par/horizon-movie.gnuplot
@@ -0,0 +1,88 @@
+#! /bin/bash
+
+set -e
+
+echo "Preparing..." >&2
+
+dir="mec-4-t100"
+prefix="h.t"
+suffix=".ah3.gp"
+control="mec-4-t100/BH_diagnostics.ah3.gp"
+output="mec-4-t100.horizons"
+
+backslash=\\
+
+rm -f $output.png.*
+
+{
+    cat <<EOF
+        set terminal png
+        set title "Horizons for mec-4"
+        set xlabel "x"
+        set ylabel "y"
+        set zlabel "z"
+        set grid
+        set size ratio -1
+        set view 0, 0
+EOF
+    shopt -s nullglob
+    files="$dir/$prefix?$suffix \
+           $dir/$prefix??$suffix \
+           $dir/$prefix???$suffix \
+           $dir/$prefix????$suffix \
+           $dir/$prefix?????$suffix \
+           $dir/$prefix??????$suffix \
+           $dir/$prefix???????$suffix \
+           $dir/$prefix????????$suffix \
+           $dir/$prefix?????????$suffix"
+    for file in $files; do
+        iter=$(echo $file | sed -e "s+$dir/$prefix\(.*\)$suffix+\1+")
+        iterf=$(printf "%09d" $iter)
+        time=$(echo $iter | awk '{ printf "%.3f", $1 * 0.8 / 524288; }')
+        echo "Plotting iteration $iter, time $time..." >&2
+        input1=$dir/$prefix$iter.ah1.gp
+        input2=$dir/$prefix$iter.ah2.gp
+        input3=$dir/$prefix$iter.ah3.gp
+        cat <<EOF
+            set output "$output.png.$iterf"
+            set label 1 "t=$time" at -17,11,0
+            splot [-15:15] [-10:10] $backslash
+EOF
+        sep=""
+        if test -f $input1; then
+            cat <<EOF
+                $sep "$input1" using 4:5:6 title "individual horizon" with lines 1 $backslash
+EOF
+            sep=","
+        fi
+        if test -f $input2; then
+            cat <<EOF
+                $sep "$input2" using 4:5:6 title "" with lines 1 $backslash
+EOF
+            sep=","
+        fi
+        if test -f $input3; then
+            if (( $iter < 52428800 )); then
+                cat <<EOF
+                    $sep "$input3" using 4:5:6 title "pretracking horizon" with lines 2 $backslash
+EOF
+            else
+                cat <<EOF
+                    $sep "$input3" using 4:5:6 title "common horizon" with lines 3 $backslash
+EOF
+            fi
+            sep=","
+        fi
+        cat <<EOF
+        
+EOF
+    done
+} | gnuplot
+
+echo "Creating movie..." >&2
+convert $output.png.* $output.mng
+
+echo "Cleaning up..." >&2
+rm $output.png.*
+
+echo "Done." >&2
diff --git a/par/misner-mask-noshrink.par b/par/misner-mask-noshrink.par
index 440f7cc..7c3285f 100644
--- a/par/misner-mask-noshrink.par
+++ b/par/misner-mask-noshrink.par
@@ -12,7 +12,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 83
 Driver::global_ny   = 83
@@ -71,8 +71,7 @@ IOASCII::out3D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner-mask-xnoshrink.par b/par/misner-mask-xnoshrink.par
index 602656d..ae8dfec 100644
--- a/par/misner-mask-xnoshrink.par
+++ b/par/misner-mask-xnoshrink.par
@@ -12,7 +12,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 83
 Driver::global_ny   = 83
@@ -71,8 +71,7 @@ IOASCII::out3D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner-max-allowable-horizon-radius=0.75.par b/par/misner-max-allowable-horizon-radius=0.75.par
index 4d3c9f2..522ce18 100644
--- a/par/misner-max-allowable-horizon-radius=0.75.par
+++ b/par/misner-max-allowable-horizon-radius=0.75.par
@@ -12,7 +12,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 83
 Driver::global_ny   = 83
@@ -62,8 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner-max-allowable-horizon-radius=0.8.par b/par/misner-max-allowable-horizon-radius=0.8.par
index 3925685..6c82c3e 100644
--- a/par/misner-max-allowable-horizon-radius=0.8.par
+++ b/par/misner-max-allowable-horizon-radius=0.8.par
@@ -12,7 +12,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 83
 Driver::global_ny   = 83
@@ -62,8 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner-umfpack.par b/par/misner-umfpack.par
index 079135d..1b5877d 100644
--- a/par/misner-umfpack.par
+++ b/par/misner-umfpack.par
@@ -12,7 +12,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 83
 Driver::global_ny   = 83
@@ -62,8 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner.par b/par/misner.par
index c733fc4..092f886 100644
--- a/par/misner.par
+++ b/par/misner.par
@@ -12,7 +12,7 @@
 # ***** grid *****
 #
 
-ActiveThorns = "CoordBase CartGrid3D PUGH"
+ActiveThorns = "CoordBase SymBase CartGrid3D PUGH"
 
 Driver::global_nx   = 83
 Driver::global_ny   = 83
@@ -62,8 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
-ActiveThorns = "SphericalSurface"
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce SphericalSurface AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/pretrack.gnuplot b/par/pretrack.gnuplot
new file mode 100644
index 0000000..93f99e0
--- /dev/null
+++ b/par/pretrack.gnuplot
@@ -0,0 +1,4 @@
+set grid
+col=29
+p "BH_diagnostics.ah1.gp" u 2:col w lp, "BH_diagnostics.ah2.gp" u 2:col w lp, "BH_diagnostics.ah3.gp" u 2:col w lp, "BH_diagnostics.ah4.gp" u 2:col w lp, "BH_diagnostics.ah5.gp" u 2:col w lp, "BH_diagnostics.ah6.gp" u 2:col w lp, "BH_diagnostics.ah7.gp" u 2:col w lp, "BH_diagnostics.ah8.gp" u 2:col w lp, "BH_diagnostics.ah9.gp" u 2:col w lp
+sp "h.t670.ah9.gp" u 4:5:6 w l
diff --git a/par/pretrack.par b/par/pretrack.par
new file mode 100644
index 0000000..85aa2b1
--- /dev/null
+++ b/par/pretrack.par
@@ -0,0 +1,303 @@
+# Demonstrate pretracking in a binary black hole collision.
+# 2004-01-10 Erik Schnetter <schnetter@aei.mpg.de>
+# $Header$
+
+# Most parameter settings are fairly standard and should be looked up
+# in their respective thorns.  Mostly the pretracking parameters are
+# explained.
+
+
+
+Cactus::cctk_run_title     = "Pretracking the common apparent horizon with Brill-Lindquist black holes"
+Cactus::cctk_timer_output  = full
+Cactus::cctk_full_warnings = yes
+Cactus::terminate          = time
+Cactus::cctk_final_time    = 5.0
+
+
+
+ActiveThorns = "CoordBase SymBase"
+
+ActiveThorns = "LocalInterp AEILocalInterp"
+
+ActiveThorns = "NaNCatcher"
+
+ActiveThorns = "TGRtensor"
+
+
+
+ActiveThorns = "SphericalSurface"
+
+
+
+ActiveThorns = "IOUtil"
+
+IO::out_dir = $parfile
+
+
+
+ActiveThorns = "PUGH PUGHInterp PUGHReduce PUGHSlab"
+
+driver::global_nx  = 35
+driver::global_ny  = 35
+driver::global_nz  = 43
+driver::ghost_size = 2
+
+
+
+ActiveThorns = "NaNChecker"
+
+NaNChecker::check_every     = 1
+NaNChecker::action_if_found = terminate
+NaNChecker::check_vars      = "ADMBase::gxx"
+
+
+
+ActiveThorns = "Boundary CartGrid3D"
+
+grid::type         = byspacing
+grid::dxyz         = 0.125
+grid::domain       = octant
+
+
+
+ActiveThorns = "Time MoL SpaceMask Dissipation"
+
+Time::dtfac = 0.25
+
+MoL::ODE_Method = RK3
+
+Dissipation::epsdis = 0.3
+Dissipation::vars   = "ADM_BSSN::ADM_BSSN_phi ADM_BSSN::ADM_BSSN_metric ADM_BSSN::ADM_BSSN_K ADM_BSSN::ADM_BSSN_curv ADM_BSSN::ADM_BSSN_gamma ADMBase::lapse"
+
+
+
+ActiveThorns = "ADMBase ADMCoupling ADMMacros CoordGauge StaticConformal"
+
+ADMBase::metric_type = "static conformal"
+
+
+
+ActiveThorns = "IDAnalyticBH"
+
+ADMBase::initial_data = bl_bh
+
+IDAnalyticBH::bl_nbh  =  2
+IDAnalyticBH::bl_z0_1 = +1.0
+IDAnalyticBH::bl_z0_2 = -1.0
+
+
+
+ActiveThorns = "BSSN_MoL"
+
+ADMBase::evolution_method = ADM_BSSN
+
+BSSN_MoL::bound        = newrad
+BSSN_MoL::stencil_size = 2
+BSSN_MoL::advection    = upwind2
+
+ADMBase::initial_lapse          = one
+ADMBase::lapse_evolution_method = 1+log
+BSSN_MoL::lapsesource           = standard
+BSSN_MoL::harmonic_f            = 2.0
+
+ADMBase::initial_shift = none
+
+
+
+ActiveThorns = "ADMConstraints"
+
+
+
+ActiveThorns = "AHFinder"
+
+AHFinder::ahf_verbose     = yes
+#AHFinder::ahf_veryverbose = yes
+AHFinder::ahf_active      = yes
+AHFinder::ahf_findevery   = 1
+
+AHFinder::ahf_guessold     = yes
+AHFinder::ahf_manual_guess = yes
+AHFinder::ahf_l0_guess     = +2.5
+AHFinder::ahf_l2_guess     = +0.2
+
+AHFinder::ahf_ntheta = 36
+AHFinder::ahf_nphi   = 72
+AHFinder::ahf_octant = high
+
+AHFinder::ahf_1Doutput      = yes
+
+
+
+ActiveThorns = "SphericalSurface AHFinderDirect"
+
+# less output
+#AHFinderDirect::verbose_level = "physics highlights"
+AHFinderDirect::N_horizons = 12
+AHFinderDirect::find_every =  1
+
+AHFinderDirect::max_Newton_iterations__initial           = 20
+AHFinderDirect::max_Newton_iterations__subsequent        = 20
+AHFinderDirect::max_allowable_Theta_growth_iterations    = 10
+AHFinderDirect::max_allowable_Theta_nonshrink_iterations = 10
+
+# these always seem to be positive, even for inner horizons
+AHFinderDirect::want_expansion_gradients                 = yes
+
+# individual apparent horizon
+AHFinderDirect::origin_z[1]                              =  1.0
+AHFinderDirect::initial_guess__coord_sphere__z_center[1] =  1.0
+AHFinderDirect::initial_guess__coord_sphere__radius[1]   =  0.5
+
+# common apparent horizon
+AHFinderDirect::initial_guess__coord_sphere__radius[2]   =  3.5
+
+# pretrack: find CE surface with smallest Theta_l
+# (this is the simplest method, but it might not work)
+AHFinderDirect::use_pretracking[3]                       = yes
+AHFinderDirect::initial_guess__coord_sphere__radius[3]   =  3.5
+AHFinderDirect::pretracking_value[3]                     =  0.1
+AHFinderDirect::pretracking_minimum_value[3]             = -1.0
+AHFinderDirect::pretracking_maximum_value[3]             =  1.0
+AHFinderDirect::pretracking_delta[3]                     =  0.01
+AHFinderDirect::pretracking_minimum_delta[3]             =  0.0001
+AHFinderDirect::pretracking_maximum_delta[3]             =  0.01
+AHFinderDirect::smoothing_factor[3]                      =  0.25
+
+# pretrack: find CE surface with smallest (Theta_l r)
+# (this is probably the best method)
+AHFinderDirect::use_pretracking[4]                       = yes
+AHFinderDirect::surface_modification[4]                  = "radius"
+AHFinderDirect::initial_guess__coord_sphere__radius[4]   = 3.5
+AHFinderDirect::pretracking_value[4]                     =   0.1
+AHFinderDirect::pretracking_minimum_value[4]             = -1.0
+AHFinderDirect::pretracking_maximum_value[4]             =  1.0
+AHFinderDirect::pretracking_delta[4]                     =  0.01
+AHFinderDirect::pretracking_minimum_delta[4]             =  0.0001
+AHFinderDirect::pretracking_maximum_delta[4]             =  0.01
+AHFinderDirect::smoothing_factor[4]                      =  0.25
+
+# pretrack: find CE surface with smallest (Theta_l r^2)
+# (this is probably another good method)
+AHFinderDirect::use_pretracking[5]                       = yes
+AHFinderDirect::surface_modification[5]                  = "radius^2"
+AHFinderDirect::initial_guess__coord_sphere__radius[5]   =  3.5
+AHFinderDirect::pretracking_value[5]                     =  0.1
+AHFinderDirect::pretracking_minimum_value[5]             = -1.0
+AHFinderDirect::pretracking_maximum_value[5]             =  1.0
+AHFinderDirect::pretracking_delta[5]                     =  0.01
+AHFinderDirect::pretracking_minimum_delta[5]             =  0.0001
+AHFinderDirect::pretracking_maximum_delta[5]             =  0.01
+AHFinderDirect::smoothing_factor[5]                      =  0.25
+
+# pretrack: find CE surface with smallest mean coordinate radius
+# (this might not find the horizon, or if it does, it might find it later)
+AHFinderDirect::use_pretracking[6]                       = yes
+AHFinderDirect::surface_selection[6]                     = "mean coordinate radius"
+AHFinderDirect::initial_guess__coord_sphere__radius[6]   =  3.5
+AHFinderDirect::pretracking_value[6]                     =  2.0
+AHFinderDirect::pretracking_minimum_value[6]             =  0.0
+AHFinderDirect::pretracking_maximum_value[6]             = 10.0
+AHFinderDirect::pretracking_delta[6]                     =  0.1
+AHFinderDirect::pretracking_minimum_delta[6]             =  0.0001
+AHFinderDirect::pretracking_maximum_delta[6]             =  0.1
+AHFinderDirect::smoothing_factor[6]                      =  0.25
+
+# dependent surface: find CE surface with [smallest (Theta_l r)] + offset
+AHFinderDirect::depends_on[7]                            = 4
+AHFinderDirect::surface_modification[7]                  = "radius"
+AHFinderDirect::initial_guess__coord_sphere__radius[7]   =  3.5
+AHFinderDirect::desired_value_offset[7]                  = -0.01
+
+# dependent surface: find CE surface with [smallest (Theta_l r)] + offset
+AHFinderDirect::depends_on[8]                            = 4
+AHFinderDirect::surface_modification[8]                  = "radius"
+AHFinderDirect::initial_guess__coord_sphere__radius[8]   =  3.5
+AHFinderDirect::desired_value_offset[8]                  =  0.01
+
+# dependent surface: find CE surface with [smallest (Theta_l r^2)] + offset
+AHFinderDirect::depends_on[9]                            = 5
+AHFinderDirect::surface_modification[9]                  = "radius^2"
+AHFinderDirect::initial_guess__coord_sphere__radius[9]   =  3.5
+AHFinderDirect::desired_value_offset[9]                  = -0.01
+
+# dependent surface: find CE surface with [smallest (Theta_l r^2)] + offset
+AHFinderDirect::depends_on[10]                           = 5
+AHFinderDirect::surface_modification[10]                 = "radius^2"
+AHFinderDirect::initial_guess__coord_sphere__radius[10]  =  3.5
+AHFinderDirect::desired_value_offset[10]                 =  0.01
+
+# pretrack: find CE surface with smallest (Theta_l r)
+# try to find an inner horizon
+AHFinderDirect::use_pretracking[11]                      = yes
+AHFinderDirect::surface_modification[11]                 = "radius"
+AHFinderDirect::initial_guess__coord_sphere__radius[11]  = 3.5
+AHFinderDirect::pretracking_value[11]                    =   0.1
+AHFinderDirect::pretracking_minimum_value[11]            = -1.0
+AHFinderDirect::pretracking_maximum_value[11]            =  1.0
+AHFinderDirect::pretracking_delta[11]                    =  0.01
+AHFinderDirect::pretracking_minimum_delta[11]            =  0.0001
+AHFinderDirect::pretracking_maximum_delta[11]            =  0.01
+
+# pretrack: find CE surface with smallest (Theta_l r)
+# desperately try to find an inner horizon
+AHFinderDirect::use_pretracking[12]                      = yes
+AHFinderDirect::surface_modification[12]                 = "radius"
+AHFinderDirect::initial_guess__coord_sphere__radius[12]  = 3.5
+AHFinderDirect::pretracking_value[12]                    =   0.1
+AHFinderDirect::pretracking_minimum_value[12]            = -1.0
+AHFinderDirect::pretracking_maximum_value[12]            =  1.0
+AHFinderDirect::pretracking_delta[12]                    =  0.01
+AHFinderDirect::pretracking_minimum_delta[12]            =  0.0001
+AHFinderDirect::pretracking_maximum_delta[12]            =  0.01
+AHFinderDirect::smoothing_factor[12]                     = -0.25
+
+
+
+ActiveThorns = "HTTPD Socket"
+
+HTTPD::use_pthreads = yes
+
+
+
+ActiveThorns = "IOASCII IOBasic"
+
+IOBasic::outInfo_every      = 1
+IOBasic::outInfo_reductions = "norm2"
+IOBasic::outInfo_vars       = "ADMBase::gxx ADMConstraints::ham"
+
+IOBasic::outScalar_every      = 1
+IOBasic::outScalar_style      = gnuplot
+IOBasic::out_format           = ".15g"
+IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
+IOBasic::outScalar_vars       = "
+        StaticConformal::confac
+        ADMBase::metric
+        ADMBase::curv
+        ADMBase::lapse
+        ADMConstraints::hamiltonian
+        ADMConstraints::momentum
+        ADM_BSSN::ADM_BSSN_ham
+        ADM_BSSN::ADM_BSSN_normham
+        ADM_BSSN::ADM_BSSN_mom
+        ADM_BSSN::ADM_BSSN_dG
+        ADM_BSSN::ADM_BSSN_A
+        ADM_BSSN::ADM_BSSN_S
+"
+
+IOASCII::out1D_every = 1
+IOASCII::out1D_style = "gnuplot f(x)"
+IOASCII::out1D_vars  = "
+        StaticConformal::confac
+        ADMBase::metric
+        ADMBase::curv
+        ADMBase::lapse
+        ADMConstraints::hamiltonian
+        ADMConstraints::momentum
+        ADM_BSSN::ADM_BSSN_ham
+        ADM_BSSN::ADM_BSSN_normham
+        ADM_BSSN::ADM_BSSN_mom
+        ADM_BSSN::ADM_BSSN_dG
+        ADM_BSSN::ADM_BSSN_A
+        ADM_BSSN::ADM_BSSN_S
+"
diff --git a/par/recover.par b/par/recover.par
new file mode 100644
index 0000000..875d4cb
--- /dev/null
+++ b/par/recover.par
@@ -0,0 +1,25 @@
+# This parameter file sets up Kerr/Kerr-Schild initial data, then
+# finds the apparent horizon in it.
+
+cactus::cctk_itlast = 2
+
+ActiveThorns = "IOUtil"
+IO::out_dir = $parfile
+
+ActiveThorns = "Carpet CarpetLib CarpetReduce"
+ActiveThorns = "Boundary CartGrid3D CoordBase RotatingSymmetry90 Slab SymBase"
+ActiveThorns = "ADMBase ADMCoupling ADMMacros StaticConformal CoordGauge SpaceMask LegoExcision Exact NaNChecker Time MoL BSSN_MoL"
+
+########################################
+
+ActiveThorns = "SphericalSurface"
+
+ActiveThorns = "LocalInterp AEILocalInterp CarpetInterp CarpetReduce SphericalSurface AHFinderDirect"
+
+########################################
+
+ActiveThorns = "CarpetIOASCII"
+ActiveThorns = "CarpetIOHDF5"
+IO::checkpoint_dir = $parfile
+IO::recover        = auto
+IO::recover_dir    = "checkpoint"