param.ccl

   permute order of som pars

schedule.ccl
   remove initial-data setting -- this is now done inside
   the AHFinderDirect_find_horizons() routine


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

1 files changed, 50 insertions, 46 deletions

diff --git a/param.ccl b/param.ccl
index da9ae57..9a00a45 100644
--- a/param.ccl
+++ b/param.ccl
@@ -208,10 +208,11 @@ boolean final_H_update_if_exit_x_H_small \
 # input/output parameters
 #
 
+# this is mainly useful for debugging purposes
 boolean output_initial_guess \
   "should we output the initial guess back to the h data file?"
 {
-} "true"
+} "false"
 
 # if this is used, the file names are the usual ones with ".it%d" appended
 boolean output_h_and_H_at_each_Newton_iteration \
@@ -523,6 +524,9 @@ string interpatch_interpolator_pars \
 
 #
 # parameters specifying the initial guess for the apparent horizon shape
+# (Note that if at any time we fail to find the (an) apparent horizon,
+# then we reset our trial horizon surface to this initial guess before
+# next attempting to find this horizon.)
 #
 
 # n.b. Schwarzschild/EF is the special case spin=0 of Kerr/Kerr
@@ -534,54 +538,10 @@ keyword initial_guess_method \
   "set to the (analytical) horizon of Kerr spacetime in Kerr coordinates"
 "Kerr/Kerr-Schild" :: \
   "set to the (analytical) horizon of Kerr spacetime in Kerr-Schild coordinates"
-"ellipsoid"	   :: "set to a coordinate ellipsoid"
 "sphere"           :: "set to a coordinate sphere"
+"ellipsoid"	   :: "set to a coordinate ellipsoid"
 } "read from file"
 
-# parameters for initial_guess_method = "sphere"
-real initial_guess__sphere__x_center[5] "x coordinate of sphere center"
-{
-*:* :: "any real number"
-} 0.0
-real initial_guess__sphere__y_center[5] "y coordinate of sphere center"
-{
-*:* :: "any real number"
-} 0.0
-real initial_guess__sphere__z_center[5] "z coordinate of sphere center"
-{
-*:* :: "any real number"
-} 0.0
-real initial_guess__sphere__radius[5] "radius of sphere"
-{
-(0.0:* :: "any real number > 0.0"
-} 2.0
-
-# parameters for initial_guess_method = "ellipsoid"
-real initial_guess__ellipsoid__x_center[5] "x coordinate of ellipsoid center"
-{
-*:* :: "any real number"
-} 0.0
-real initial_guess__ellipsoid__y_center[5] "y coordinate of ellipsoid center"
-{
-*:* :: "any real number"
-} 0.0
-real initial_guess__ellipsoid__z_center[5] "z coordinate of ellipsoid center"
-{
-*:* :: "any real number"
-} 0.0
-real initial_guess__ellipsoid__x_radius[5] "x radius of ellipsoid"
-{
-(0.0:* :: "any real number > 0.0"
-} 2.0
-real initial_guess__ellipsoid__y_radius[5] "y radius of ellipsoid"
-{
-(0.0:* :: "any real number > 0.0"
-} 2.0
-real initial_guess__ellipsoid__z_radius[5] "z radius of ellipsoid"
-{
-(0.0:* :: "any real number > 0.0"
-} 2.0
-
 # parameters for initial_guess_method = "Kerr/Kerr"
 real initial_guess__Kerr_Kerr__x_posn[5] "x coordinate of Kerr BH"
 {
@@ -632,6 +592,50 @@ real initial_guess__Kerr_KerrSchild__spin[5] "dimensionless spin a=J/m^2 of Kerr
   "dimensionless BH spin = J/m^2 = any real number with absolute value < 1"
 } 0.6
 
+# parameters for initial_guess_method = "sphere"
+real initial_guess__sphere__x_center[5] "x coordinate of sphere center"
+{
+*:* :: "any real number"
+} 0.0
+real initial_guess__sphere__y_center[5] "y coordinate of sphere center"
+{
+*:* :: "any real number"
+} 0.0
+real initial_guess__sphere__z_center[5] "z coordinate of sphere center"
+{
+*:* :: "any real number"
+} 0.0
+real initial_guess__sphere__radius[5] "radius of sphere"
+{
+(0.0:* :: "any real number > 0.0"
+} 2.0
+
+# parameters for initial_guess_method = "ellipsoid"
+real initial_guess__ellipsoid__x_center[5] "x coordinate of ellipsoid center"
+{
+*:* :: "any real number"
+} 0.0
+real initial_guess__ellipsoid__y_center[5] "y coordinate of ellipsoid center"
+{
+*:* :: "any real number"
+} 0.0
+real initial_guess__ellipsoid__z_center[5] "z coordinate of ellipsoid center"
+{
+*:* :: "any real number"
+} 0.0
+real initial_guess__ellipsoid__x_radius[5] "x radius of ellipsoid"
+{
+(0.0:* :: "any real number > 0.0"
+} 2.0
+real initial_guess__ellipsoid__y_radius[5] "y radius of ellipsoid"
+{
+(0.0:* :: "any real number > 0.0"
+} 2.0
+real initial_guess__ellipsoid__z_radius[5] "z radius of ellipsoid"
+{
+(0.0:* :: "any real number > 0.0"
+} 2.0
+
 ################################################################################
 
 #