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

1 files changed, 64 insertions, 37 deletions

diff --git a/param.ccl b/param.ccl
index 77feb3d..9b17296 100644
--- a/param.ccl
+++ b/param.ccl
@@ -64,6 +64,12 @@ int max_Newton_iterations "maximum number of Newton iterations before giving up"
 (0:* :: "any positive integer"
 } 10
 
+# if this is used, the file names are the usual ones with ".it%d" appended
+boolean output_h_and_H_at_each_Newton_iteration \
+  "should we output h and H at each Newton iteration (for debugging)?"
+{
+} "false"
+
 #
 # we declare convergence if *either* of the following two criteria are met
 #
@@ -78,6 +84,12 @@ real Delta_h_norm_for_convergence \
 (0.0:* :: "any positive real number"
 } 1.0e-10
 
+boolean final_H_update_if_exit_x_H_small \
+  "should we do a final H(h) update after a h += Delta_h update which is\
+   so small it meets the Delta_h_norm_for_convergence convergence criterion?"
+{
+} "false"
+
 ################################################################################
 
 #
@@ -149,47 +161,81 @@ real delta_drho_dsigma "angular grid spacing of patches, in degrees"
 ################################################################################
 
 #
-# parameters for (optionally) hard-wiring the geometry to
-# Schwarzschild spacetime in Eddington-Finkelstein coordinates
-# (useful for testing smoothness requirements of interpolation)
+# parameters for how we compute the slice's geometry
+# (gij, Kij, partial_k gij)
 #
 
-boolean hardwire_Schwarzschild_EF \
-  "should we hard-wire Schwarzschild/EF geometry, \
-   bypassing the usual $g_{ij}$/$K_{ij}$ interpolation from the Cactus grid?"
+keyword geometry_method "how do we compute the slice's geometry?"
 {
-} "false"
+"interpolate from Cactus grid" :: "interpolate gij and Kij from Cactus grid"
+"Schwarzschild/EF"             :: \
+  "hard-wire to Schwarzschild spacetime / Eddington-Finkelstein slice"
+} "interpolate from Cactus grid"
 
-real hardwire_Schwarzschild_EF__mass "mass of Schwarzschild BH"
+########################################
+
+#
+# parameters for geometry_method = "interpolate from Cactus grid"
+#
+
+string geometry_interpolator_name \
+  "name under which the geometry interpolation operator is registered in Cactus"
+{
+.* :: "any string"
+} "generalized polynomial interpolation"
+
+string geometry_interpolator_pars \
+  "parameters for the geometry interpolator"
+{
+.* :: "any string acceptable to Util_TableSetFromString()"
+} ""
+########################################
+
+#
+# parameters for geometry_method = "Schwarzschild/EF"
+#
+
+real geometry__Schwarzschild_EF__mass "mass of Schwarzschild BH"
 {
 (0.0:*		:: "BH mass = any real number > 0"
 } 1.0
 
-real hardwire_Schwarzschild_EF__x_posn "x coordinate of Schwarzschild BH"
+real geometry__Schwarzschild_EF__x_posn "x coordinate of Schwarzschild BH"
 {
 *:* :: "any real number"
 } 0.0
-real hardwire_Schwarzschild_EF__y_posn "y coordinate of Schwarzschild BH"
+real geometry__Schwarzschild_EF__y_posn "y coordinate of Schwarzschild BH"
 {
 *:* :: "any real number"
 } 0.0
-real hardwire_Schwarzschild_EF__z_posn "z coordinate of Schwarzschild BH"
+real geometry__Schwarzschild_EF__z_posn "z coordinate of Schwarzschild BH"
 {
 *:* :: "any real number"
 } 0.0
 
-real hardwire_Schwarzschild_EF__epsilon \
+# some of the formulas have 0/0 limits on the z axis; this parameter controls
+# where we switch from the generic formulas to the L'Hopital's-rule z axis
+# limits
+# - don't set this parameter too small or roundoff errors will be excessive
+# - don't set this parameter too large or finite differencing errors will
+#   be excessive
+# in practice the default value should be fine
+# n.b. this is used for centered finite differencing, unlike the Jacobian
+real geometry__Schwarzschild_EF__epsilon \
   "threshold for sin^2 theta = (x^2+y^2)/r^2 below which we use z axis limits"
 {
-(0.0:*	:: "this should be a little bit above the floating-point roundoff level"
+(0.0:*	:: "this should be somewhat above the floating-point roundoff level"
 } 1.0e-12
 
-# notes on this parameter:
-# - don't set it too small or roundoff errors will become large
-# - don't set it too large or finite differencing errors will become large
+# we compute partial_k g_ij by numerical finite differencing of the exact
+# analytical g_ij values; this parameter sets the "grid spacing" for this
+# - don't set this parameter too small or roundoff errors will be excessive
+# - don't set this parameter too large or finite differencing errors will
+#   be excessive
 # in practice the default value should be fine
-# n.b. this is used for centered finite differencing, unlike the Jacobian
-real hardwire_Schwarzschild_EF__Delta_xyz \
+# ... n.b. this finite differencing is *centered*, unlike that in the
+#          Jacobian computation
+real geometry__Schwarzschild_EF__Delta_xyz \
   "finite diff pseuo-grid spacing for computing $\partial_k g_{ij}$"
 {
 (0.0:* :: "any real number > 0"
@@ -198,25 +244,6 @@ real hardwire_Schwarzschild_EF__Delta_xyz \
 ################################################################################
 
 #
-# parameters for the interpolator used to interpolate the "geometry"
-# $g_{ij}$ and $K_{ij}$ to the apparent horizon surface position
-#
-
-string geometry_interpolator_name \
-  "name under which the geometry interpolation operator is registered in Cactus"
-{
-.* :: "any string"
-} "generalized polynomial interpolation"
-
-string geometry_interpolator_pars \
-  "parameters for the geometry interpolator"
-{
-.* :: "any string acceptable to Util_TableSetFromString()"
-} ""
-
-################################################################################
-
-#
 # parameters for the interpatch interpolator
 #
 string interpatch_interpolator_name \