Major changes to clean up and comment the code.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@130 2a26948c-0e4f-0410-aee8-f1d3e353619c

1 files changed, 20 insertions, 41 deletions

diff --git a/param.ccl b/param.ccl
index 530cb71..b592acf 100644
--- a/param.ccl
+++ b/param.ccl
@@ -12,19 +12,19 @@ KEYWORD eh_metric_type "Do we use numerical or analytic metric information"
 {
   "numerical" :: "Read in metric from numerical data"
   "analytic"  :: "Use external analytic metric"
-} "analytic"
+} "numerical"
  
 KEYWORD eh_lapse_type "Do we use numerical or analytic metric information"
 {
   "numerical" :: "Read in metric from numerical data"
   "analytic"  :: "Use external analytic metric"
-} "analytic"
+} "numerical"
 
 KEYWORD eh_shift_type "Do we use numerical or analytic metric information"
 {
   "numerical" :: "Read in metric from numerical data"
   "analytic"  :: "Use external analytic metric"
-} "analytic"
+} "numerical"
 
 BOOLEAN read_conformal_factor_once "Should the conformal factor only be read once"
 {
@@ -42,57 +42,57 @@ REAL initial_rad[10] "Initial radius of surface"
 0.0:            :: "Positive please"
 } 1.0
 
-REAL initial_a "Initial a coefficient of ellipsoid"
+REAL initial_a[10] "Initial a coefficient of ellipsoid"
 {
 0.0:            :: "Positive please"
 } 1.0
 
-REAL initial_b "Initial b coefficient of ellipsoid"
+REAL initial_b[10] "Initial b coefficient of ellipsoid"
 {
 0.0:            :: "Positive please"
 } 1.0
 
-REAL initial_c "Initial c coefficient of ellipsoid"
+REAL initial_c[10] "Initial c coefficient of ellipsoid"
 {
 0.0:            :: "Positive please"
 } 1.0
 
-REAL rotation_alpha "Rotation angle around z-axis of ellipsoid"
+REAL rotation_alpha[10] "Rotation angle around z-axis of ellipsoid"
 {
 *:*              :: "Everything is possible"
 } 0.0
 
-REAL rotation_beta "Rotation angle around y-axis of ellipsoid"
+REAL rotation_beta[10] "Rotation angle around y-axis of ellipsoid"
 {
 *:*              :: "Everything is possible"
 } 0.0
 
-REAL rotation_gamma "Rotation angle around x-axis of ellipsoid"
+REAL rotation_gamma[10] "Rotation angle around x-axis of ellipsoid"
 {
 *:*              :: "Everything is possible"
 } 0.0
 
-REAL translate_x "Translation in x-direction"
+REAL translate_x[10] "Translation in x-direction"
 {
 *:*              :: "Everything is possible"
 } 0.0
 
-REAL translate_y "Translation in y-direction"
+REAL translate_y[10] "Translation in y-direction"
 {
 *:*              :: "Everything is possible"
 } 0.0
 
-REAL translate_z "Translation in z-direction"
+REAL translate_z[10] "Translation in z-direction"
 {
 *:*              :: "Everything is possible"
 } 0.0
 
-REAL cas_a "Initial a coefficient of ovaloid of cassini"
+REAL cas_a[10] "Initial a coefficient of ovaloid of cassini"
 {
 :                :: "Any number (negative and positive are equivalent)"
 } 2.0
 
-REAL cas_b "Initial b coefficient of ovaloid of cassini"
+REAL cas_b[10] "Initial b coefficient of ovaloid of cassini"
 {
 :                :: "Any number (negative and positive are equivalent)"
 } 2.05
@@ -110,18 +110,9 @@ BOOLEAN use_outer_excision "Should outer excision be used?"
 {
 } "yes"
 
-BOOLEAN normalize "normalize the derivatives of the level set function"
-{
-} "no"
-
-BOOLEAN one_sided "Use one sided differences everywhere"
-{
-} "no"
-
 KEYWORD mode "Mode of operation"
 {
   "normal"  :: "Find event horizons"
-  "test_reparam" :: "Test reparametrization routines with MoL"
   "analysis" :: "Provide storage for f without evolving"
   "generator" :: "Provide storage for f and initialize without evolving"
 } "normal"
@@ -139,43 +130,31 @@ KEYWORD surface_direction "Should we track outward or inward moving surfaces"
   "inward"  :: "Track inward moving surfaces."
 } "outward"
 
-BOOLEAN reparam_undo "Should re-parametrization be undone at pinch-off"
+BOOLEAN re_init_undo "Should re-initialization be undone at pinch-off"
 {
 } "no"
 
-KEYWORD re_param_method "Integration method in re-parametrization"
-{
-  "approx"  :: "Approximate re-parametrization scheme"
-  "pde"     :: "Re-parametrize by solving an pde"
-  "mixed"   :: "Use both schemes interchangably"
-} "pde"
-
-KEYWORD re_param_int_method "Integration method in pde re-parametrization"
+KEYWORD re_init_int_method "Integration method used in re-initialization"
 {
   "euler"  :: "Standard euler scheme"
   "rk2"    :: "Second order Runge-Kutta scheme"
 } "euler"
 
-INT re_param_max_iter "maximum number of iteration in the re-parametrization"
+INT re_init_max_iter "maximum number of iterations in the re-initialization"
 {
 0:        :: "Positive please"
 } 800
 
-KEYWORD pde_differences "Type of finite diffencing used in pde re-parametrization"
+KEYWORD pde_differences "Type of finite diffencing used in pde re-initialization"
 {
   "centered" :: "Use 2nd order centered differences except at the boundaries"
   "upwind"   :: "Use 1st order upwinded differences everywhere"
   "upwind2"  :: "Use 2nd order upwinded differences everywhere"
 } "upwind2"
 
-INT reparametrize_every_pde "Re-parametrize every using pde method"
-{
-0:               :: "If 0 don't re-parametrize using pde method"
-} 100
-
-INT reparametrize_every_approx "Re-parametrize every using approx method"
+INT re_initialize_every "How often to re-initialize the level set function"
 {
-0:               :: "If 0 don't re-parametrize using approx method"
+0:               :: "If 0 don't re-initialize"
 } 10
 
 INT last_iteration_number "The starting iteration number for the EH_Finder (last iteration number of the simulation)"