change enum geometry_method

to   bool hardwire_Schwarzschild_geometry


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

1 files changed, 13 insertions, 18 deletions

diff --git a/param.ccl b/param.ccl
index eb894fe..c9857fa 100644
--- a/param.ccl
+++ b/param.ccl
@@ -944,22 +944,10 @@ boolean test_all_Jacobian_compute_methods \
 # ***** (gij, Kij, partial_k gij) *****
 #
 
-keyword geometry_method "how do we compute the slice's geometry?"
-{
-# this is for normal use
-"interpolate from Cactus grid" :: \
-   "interpolate gij and Kij from global Cactus grid \
-    using CCTK_InterpGridArrays() global interpolator API"
-
-# for testing/debugging
-"Schwarzschild/EF"             :: \
-  "hard-wire to Schwarzschild spacetime / Eddington-Finkelstein slice"
-} "globally interpolate from Cactus grid"
-
 ########################################
 
 #
-# parameters for geometry_method = "interpolate from Cactus grid"
+# parameters for geometry interpolation
 #
 # This 3D interpolator is used to interpolate gij and Kij from the
 # Cactus grid to the position of each trial horizon surface, giving
@@ -1006,8 +994,15 @@ string geometry_interpolator_pars \
 ########################################
 
 #
-# parameters for geometry_method = "Schwarzschild/EF"
+# for testing/debugging purposes, instead of interpolating the geometry
+# from the Cactus grid, we can instead hardwire it to an Eddington-Finkelstein
+# slice of Schwarzschild spacetime
 #
+boolean hardwire_Schwarzschild_EF_geometry \
+  "should we hard-wire the geometry to Schwarzschild/EF instead of \
+   interpolating from the Cactus grid?"
+{
+} "false"
 
 real geometry__Schwarzschild_EF__mass "mass of Schwarzschild BH"
 {
@@ -1027,9 +1022,9 @@ real geometry__Schwarzschild_EF__z_posn "z coordinate of Schwarzschild BH"
 *:* :: "any real number"
 } 0.0
 
-# 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
+# some of the Schwarzschild/EF 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
@@ -1058,7 +1053,7 @@ real geometry__Schwarzschild_EF__Delta_xyz \
 ########################################
 
 #
-# These tests control whether we check that various angular gridfns
+# These parameters control whether we check that various angular gridfns
 # are finite (neither NaN nor infinity) at various points in evaluating
 # the Theta(h) function.  These are pretty cheap tests, and they're quite
 # useful in catching assorted wierdness, so it's probably worth leaving