* Move suboptions out of top-level "method" parameter into separate

  parameters; the top-level method parameter is now just
    keyword method "what should this thorn do for each apparent horizon?"
    {
    # these options are mostly for testing/debugging
    "horizon function"      :: "evaluate the LHS function H(h)"
    "test Jacobian"         :: "compute/print the J[H(h)] Jacobian matrix"

    # this is for normal apparent horizon finding
    "find horizon"          :: "find the apparent horizon"
    } "find horizon"
  The keyword strings have changed a bit, but since most users will
  not need to change the default value, this shouldn't change their
  parameter files.
* Revise driver logic to clean up handling of the different values
  of the top-level method parameter.
* Slightly tweak output format for BH diagnostics, and documentation
  (thorn guide) to make it explicit that what we're calculating is the
  irreducible mass of the apparent horizon.


Modified Files:
	param.ccl doc/documentation.tex par/misner-run.par
	run/test-ahfinderdirect/misc/Kerr.par
	run/test-ahfinderdirect/misc/try-5.par
	run/test-ahfinderdirect/misc/try-7.5-debug.par
	run/test-ahfinderdirect/misc/try-7.5.par
	run/test-ahfinderdirect/misc/try-9.par src/driver/driver.hh
	src/driver/find_horizons.cc src/driver/setup.cc
Added Files:
	# new par file to compute/print the analytical horizon
	# for this Kerr/Schild test, for comparison with numerical ones
	run/test-ahfinderdirect/misc/try-7.5-horizon.par


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

6 files changed, 59 insertions, 18 deletions

diff --git a/run/test-ahfinderdirect/misc/Kerr.par b/run/test-ahfinderdirect/misc/Kerr.par
index bcee119..a727c02 100644
--- a/run/test-ahfinderdirect/misc/Kerr.par
+++ b/run/test-ahfinderdirect/misc/Kerr.par
@@ -34,11 +34,6 @@ AHFinderDirect::N_ghost_points = 2
 AHFinderDirect::N_overlap_points = 1
 AHFinderDirect::delta_drho_dsigma = 5.0
 
-AHFinderDirect::geometry_interpolator_name = "generalized polynomial interpolation"
-AHFinderDirect::geometry_interpolator_pars = "order=3"
-AHFinderDirect::interpatch_interpolator_name = "generalized polynomial interpolation"
-AHFinderDirect::interpatch_interpolator_pars = "order=3"
-
 AHFinderDirect::initial_guess_method = "Kerr/Kerr-Schild"
 AHFinderDirect::initial_guess__Kerr_KerrSchild__mass = 1.0
 AHFinderDirect::initial_guess__Kerr_KerrSchild__spin = 0.6
diff --git a/run/test-ahfinderdirect/misc/try-5.par b/run/test-ahfinderdirect/misc/try-5.par
index fb9f964..20b070c 100644
--- a/run/test-ahfinderdirect/misc/try-5.par
+++ b/run/test-ahfinderdirect/misc/try-5.par
@@ -31,8 +31,7 @@ Exact::Kerr_KerrSchild__spin = 0.6
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
-AHFinderDirect::verbose_level = "algorithm details"
-AHFinderDirect::print_timing_stats = "true"
+AHFinderDirect::verbose_level = "algorithm highlights"
 
 AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
 AHFinderDirect::h_base_file_name      = "try-5.h"
@@ -44,8 +43,6 @@ AHFinderDirect::origin_y[1] = 0.7
 AHFinderDirect::origin_z[1] = 0.0
 AHFinderDirect::delta_drho_dsigma = 5.0
 
-AHFinderDirect::geometry_interpolator_pars = "order=3   out_of_range_tolerance={-1.0 -1.0 -1.0 -1.0 -1.0 -1.0}"
-
 AHFinderDirect::initial_guess_method = "coordinate sphere"
 AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
 AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3
diff --git a/run/test-ahfinderdirect/misc/try-7.5-debug.par b/run/test-ahfinderdirect/misc/try-7.5-debug.par
index 8b4d8f2..e337cbc 100644
--- a/run/test-ahfinderdirect/misc/try-7.5-debug.par
+++ b/run/test-ahfinderdirect/misc/try-7.5-debug.par
@@ -31,7 +31,7 @@ Exact::Kerr_KerrSchild__spin = 0.6
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
-AHFinderDirect::verbose_level = "algorithm details"
+AHFinderDirect::verbose_level = "algorithm highlights"
 AHFinderDirect::print_timing_stats = "true"
 
 AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
@@ -46,8 +46,6 @@ AHFinderDirect::origin_y[1] = 0.7
 AHFinderDirect::origin_z[1] = 0.0
 AHFinderDirect::delta_drho_dsigma = 7.5
 
-AHFinderDirect::geometry_interpolator_pars = "order=3   out_of_range_tolerance={-1.0 -1.0 -1.0 -1.0 -1.0 -1.0}"
-
 AHFinderDirect::initial_guess_method = "coordinate sphere"
 AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
 AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3
diff --git a/run/test-ahfinderdirect/misc/try-7.5-horizon.par b/run/test-ahfinderdirect/misc/try-7.5-horizon.par
new file mode 100644
index 0000000..2de1ce3
--- /dev/null
+++ b/run/test-ahfinderdirect/misc/try-7.5-horizon.par
@@ -0,0 +1,55 @@
+# parameter file for patch system test
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling StaticConformal CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
+
+# PUGH
+driver::ghost_size = 2
+driver::global_nx = 31
+driver::global_ny = 31
+driver::global_nz = 17
+
+# CartGrid3D
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.2
+
+# ADMBase
+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::exact_model = "Kerr/Kerr-Schild"
+Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.6
+
+AHFinderDirect::method = "horizon function"
+AHFinderDirect::find_AHs_at_postinitial = "true"
+AHFinderDirect::find_AHs_at_poststep    = "false"
+AHFinderDirect::verbose_level = "algorithm highlights"
+AHFinderDirect::print_timing_stats = "true"
+
+AHFinderDirect::output_initial_guess = "true"
+AHFinderDirect::how_often_to_output_H_of_h = 1
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
+AHFinderDirect::h_base_file_name      = "try-7.5-horizon.h"
+AHFinderDirect::H_of_h_base_file_name = "try-7.5-horizon.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = 0.5
+AHFinderDirect::origin_y[1] = 0.7
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::delta_drho_dsigma = 7.5
+
+AHFinderDirect::initial_guess_method = "Kerr/Kerr-Schild"
+AHFinderDirect::initial_guess__Kerr_KerrSchild__x_posn[1] = 0.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__y_posn[1] = 0.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__z_posn[1] = 0.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__mass[1] = 1.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__spin[1] = 0.6
diff --git a/run/test-ahfinderdirect/misc/try-7.5.par b/run/test-ahfinderdirect/misc/try-7.5.par
index 5e80c22..eadb5b7 100644
--- a/run/test-ahfinderdirect/misc/try-7.5.par
+++ b/run/test-ahfinderdirect/misc/try-7.5.par
@@ -31,7 +31,7 @@ Exact::Kerr_KerrSchild__spin = 0.6
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
-AHFinderDirect::verbose_level = "algorithm details"
+AHFinderDirect::verbose_level = "algorithm highlights"
 AHFinderDirect::print_timing_stats = "true"
 
 AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
@@ -44,8 +44,6 @@ AHFinderDirect::origin_y[1] = 0.7
 AHFinderDirect::origin_z[1] = 0.0
 AHFinderDirect::delta_drho_dsigma = 7.5
 
-AHFinderDirect::geometry_interpolator_pars = "order=3   out_of_range_tolerance={-1.0 -1.0 -1.0 -1.0 -1.0 -1.0}"
-
 AHFinderDirect::initial_guess_method = "coordinate sphere"
 AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
 AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3
diff --git a/run/test-ahfinderdirect/misc/try-9.par b/run/test-ahfinderdirect/misc/try-9.par
index f8d38f9..4df4812 100644
--- a/run/test-ahfinderdirect/misc/try-9.par
+++ b/run/test-ahfinderdirect/misc/try-9.par
@@ -31,7 +31,7 @@ Exact::Kerr_KerrSchild__spin = 0.6
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
-AHFinderDirect::verbose_level = "algorithm details"
+AHFinderDirect::verbose_level = "algorithm highlights"
 AHFinderDirect::print_timing_stats = "true"
 
 AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
@@ -44,8 +44,6 @@ AHFinderDirect::origin_y[1] = 0.7
 AHFinderDirect::origin_z[1] = 0.0
 AHFinderDirect::delta_drho_dsigma = 9.0
 
-AHFinderDirect::geometry_interpolator_pars = "order=3   out_of_range_tolerance={-1.0 -1.0 -1.0 -1.0 -1.0 -1.0}"
-
 AHFinderDirect::initial_guess_method = "coordinate sphere"
 AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
 AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3