various changes including d/dr terms in Jacobian by numerical perturbation,

tweak I/O parameters,
move printing Jacobian out of Jacobian class into test driver,
drop unused array BLAS routines in jtutil::


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

4 files changed, 16 insertions, 11 deletions

diff --git a/run/test-ahfinderdirect/Jacobian-small.par b/run/test-ahfinderdirect/Jacobian-small.par
index 39fb556..7f0e72d 100644
--- a/run/test-ahfinderdirect/Jacobian-small.par
+++ b/run/test-ahfinderdirect/Jacobian-small.par
@@ -26,6 +26,10 @@ Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
 Exact::Kerr_KerrSchild__spin = 0.6
 
+AHFinderDirect::method = "Jacobian test"
+AHFinderDirect::Jacobian_type = "dense matrix"
+AHFinderDirect::Jacobian_file_name = "Jacobian-small.dat"
+
 AHFinderDirect::origin_x = 0.5
 AHFinderDirect::origin_y = 0.7
 AHFinderDirect::origin_z = 0.9
@@ -42,6 +46,3 @@ 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::method = "Jacobian (SD+NP)"
-AHFinderDirect::NP_Jacobian__perturbation_amplitude = 1.0e-6
-AHFinderDirect::Jacobian_file_name = "Jacobian-small.dat"
diff --git a/run/test-ahfinderdirect/Kerr-offset-small-ahf.par b/run/test-ahfinderdirect/Kerr-offset-small-ahf.par
index 9550fbd..fcfd442 100644
--- a/run/test-ahfinderdirect/Kerr-offset-small-ahf.par
+++ b/run/test-ahfinderdirect/Kerr-offset-small-ahf.par
@@ -26,6 +26,10 @@ Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
 Exact::Kerr_KerrSchild__spin = 0.6
 
+AHFinderDirect::method = "Newton solve"
+AHFinderDirect::h_file_name      = "Kerr-offset-small-ahf.h.dat"
+AHFinderDirect::H_of_h_file_name = "Kerr-offset-small-ahf.H.dat"
+
 AHFinderDirect::origin_x = 0.5
 AHFinderDirect::origin_y = 0.7
 AHFinderDirect::origin_z = 0.9
@@ -43,9 +47,3 @@ AHFinderDirect::initial_guess_method = "ellipsoid"
 AHFinderDirect::initial_guess__ellipsoid__x_radius = 1.8
 AHFinderDirect::initial_guess__ellipsoid__y_radius = 1.8
 AHFinderDirect::initial_guess__ellipsoid__z_radius = 1.8
-
-AHFinderDirect::method = "Newton (NP Jacobian)"
-AHFinderDirect::Jacobian_type = "dense matrix"
-AHFinderDirect::max_Newton_iterations = 10
-AHFinderDirect::H_norm_for_convergence = 1.0e-10
-AHFinderDirect::NP_Jacobian__perturbation_amplitude = 1.0e-6
diff --git a/run/test-ahfinderdirect/Kerr-offset-small.par b/run/test-ahfinderdirect/Kerr-offset-small.par
index c83c33e..0a873b6 100644
--- a/run/test-ahfinderdirect/Kerr-offset-small.par
+++ b/run/test-ahfinderdirect/Kerr-offset-small.par
@@ -26,6 +26,10 @@ Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
 Exact::Kerr_KerrSchild__spin = 0.6
 
+AHFinderDirect::method = "horizon function"
+AHFinderDirect::h_file_name      = "Kerr-offset-small.h.dat"
+AHFinderDirect::H_of_h_file_name = "Kerr-offset-small.H.dat"
+
 AHFinderDirect::origin_x = 0.5
 AHFinderDirect::origin_y = 0.7
 AHFinderDirect::origin_z = 0.9
@@ -42,4 +46,3 @@ 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::method = "horizon"
diff --git a/run/test-ahfinderdirect/Kerr-offset.par b/run/test-ahfinderdirect/Kerr-offset.par
index 61b562b..301e84f 100644
--- a/run/test-ahfinderdirect/Kerr-offset.par
+++ b/run/test-ahfinderdirect/Kerr-offset.par
@@ -26,6 +26,10 @@ Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
 Exact::Kerr_KerrSchild__spin = 0.6
 
+AHFinderDirect::method = "horizon function"
+AHFinderDirect::h_file_name      = "Kerr-offset.h.dat"
+AHFinderDirect::H_of_h_file_name = "Kerr-offset.H.dat"
+
 AHFinderDirect::origin_x = 0.5
 AHFinderDirect::origin_y = 0.7
 AHFinderDirect::origin_z = 0.9
@@ -42,4 +46,3 @@ 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::method = "horizon"