merge in changes from laptop:

- add support for condition number estimating when solving linear system
- cleanup Schw/EF analytic geometry option
- add option to dump h and H at each Newton iteration for debuggin


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

7 files changed, 20 insertions, 9 deletions

diff --git a/run/test-ahfinderdirect/Kerr-offset/large-Jacobian.par b/run/test-ahfinderdirect/Kerr-offset/large-Jacobian.par
index 63f7c93..9fa37de 100644
--- a/run/test-ahfinderdirect/Kerr-offset/large-Jacobian.par
+++ b/run/test-ahfinderdirect/Kerr-offset/large-Jacobian.par
@@ -44,5 +44,5 @@ AHFinderDirect::interpatch_interpolator_name = "generalized polynomial interpola
 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
+AHFinderDirect::initial_guess__Kerr__mass = 1.0
+AHFinderDirect::initial_guess__Kerr__spin = 0.6
diff --git a/run/test-ahfinderdirect/Kerr-offset/large-ahf.par b/run/test-ahfinderdirect/Kerr-offset/large-ahf.par
index c28ebc5..fb5b390 100644
--- a/run/test-ahfinderdirect/Kerr-offset/large-ahf.par
+++ b/run/test-ahfinderdirect/Kerr-offset/large-ahf.par
@@ -27,6 +27,7 @@ Exact::Kerr_KerrSchild__mass = 1.0
 Exact::Kerr_KerrSchild__spin = 0.6
 
 AHFinderDirect::method = "Newton solve"
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
 AHFinderDirect::h_file_name      = "large-ahf.h.dat"
 AHFinderDirect::H_of_h_file_name = "large-ahf.H.dat"
 
diff --git a/run/test-ahfinderdirect/Kerr-offset/large.par b/run/test-ahfinderdirect/Kerr-offset/large.par
index 6220e09..bef93fc 100644
--- a/run/test-ahfinderdirect/Kerr-offset/large.par
+++ b/run/test-ahfinderdirect/Kerr-offset/large.par
@@ -27,6 +27,7 @@ Exact::Kerr_KerrSchild__mass = 1.0
 Exact::Kerr_KerrSchild__spin = 0.6
 
 AHFinderDirect::method = "horizon function"
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
 AHFinderDirect::h_file_name      = "large.h.dat"
 AHFinderDirect::H_of_h_file_name = "large.H.dat"
 
@@ -44,5 +45,5 @@ AHFinderDirect::interpatch_interpolator_name = "generalized polynomial interpola
 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
+AHFinderDirect::initial_guess__Kerr__mass = 1.0
+AHFinderDirect::initial_guess__Kerr__spin = 0.6
diff --git a/run/test-ahfinderdirect/Kerr-offset/small-Jacobian.par b/run/test-ahfinderdirect/Kerr-offset/small-Jacobian.par
index 953fb07..e7b270c 100644
--- a/run/test-ahfinderdirect/Kerr-offset/small-Jacobian.par
+++ b/run/test-ahfinderdirect/Kerr-offset/small-Jacobian.par
@@ -44,5 +44,5 @@ AHFinderDirect::interpatch_interpolator_name = "generalized polynomial interpola
 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
+AHFinderDirect::initial_guess__Kerr__mass = 1.0
+AHFinderDirect::initial_guess__Kerr__spin = 0.6
diff --git a/run/test-ahfinderdirect/Kerr-offset/small.par b/run/test-ahfinderdirect/Kerr-offset/small.par
index 3b7f8f4..6759004 100644
--- a/run/test-ahfinderdirect/Kerr-offset/small.par
+++ b/run/test-ahfinderdirect/Kerr-offset/small.par
@@ -44,5 +44,5 @@ AHFinderDirect::interpatch_interpolator_name = "generalized polynomial interpola
 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
+AHFinderDirect::initial_guess__Kerr__mass = 1.0
+AHFinderDirect::initial_guess__Kerr__spin = 0.6
diff --git a/run/test-ahfinderdirect/Schw/large-ahf.par b/run/test-ahfinderdirect/Schw/large-ahf.par
index 536d893..c7daeb7 100644
--- a/run/test-ahfinderdirect/Schw/large-ahf.par
+++ b/run/test-ahfinderdirect/Schw/large-ahf.par
@@ -26,6 +26,7 @@ Exact::exact_model = "Schwarzschild/EF"
 Exact::Schwarzschild_EF__mass = 1.0
 
 AHFinderDirect::method = "Newton solve"
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
 AHFinderDirect::h_file_name      = "large-ahf.h.dat"
 AHFinderDirect::H_of_h_file_name = "large-ahf.H.dat"
 
diff --git a/run/test-ahfinderdirect/Schw/offset.par b/run/test-ahfinderdirect/Schw/offset.par
index 8b32933..c16dcfc 100644
--- a/run/test-ahfinderdirect/Schw/offset.par
+++ b/run/test-ahfinderdirect/Schw/offset.par
@@ -23,6 +23,12 @@ ADMBase::metric_type = "physical"
 
 # Exact
 Exact::exact_model = "Schwarzschild/EF"
+Exact::Schwarzschild_EF__mass = 1.0
+
+AHFinderDirect::method = "horizon function"
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
+AHFinderDirect::h_file_name      = "offset.h.dat"
+AHFinderDirect::H_of_h_file_name = "offset.H.dat"
 
 AHFinderDirect::origin_x = 0.5
 AHFinderDirect::origin_y = 0.7
@@ -38,4 +44,6 @@ AHFinderDirect::interpatch_interpolator_name = "generalized polynomial interpola
 AHFinderDirect::interpatch_interpolator_pars = "order=3"
 
 AHFinderDirect::initial_guess_method = "ellipsoid"
-AHFinderDirect::method = "horizon"
+AHFinderDirect::initial_guess__ellipsoid__x_radius = 2.0
+AHFinderDirect::initial_guess__ellipsoid__y_radius = 2.0
+AHFinderDirect::initial_guess__ellipsoid__z_radius = 2.0