various updates so these par files work again

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

2 files changed, 33 insertions, 31 deletions

diff --git a/run/test-ahfinderdirect/Schw/Schw.par b/run/test-ahfinderdirect/Schw/Schw.par
index a9f3e48..56edd9d 100644
--- a/run/test-ahfinderdirect/Schw/Schw.par
+++ b/run/test-ahfinderdirect/Schw/Schw.par
@@ -1,17 +1,19 @@
 # parameter file for patch system test
-ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling StaticConformal CoordGauge Exact AHFinderDirect"
 
-# PUGH
-driver::ghost_size = 0
-driver::global_nx = 61
-driver::global_ny = 61
-driver::global_nz = 61
+# flesh
+cactus::cctk_itlast = 0
 
 # CartGrid3D
 grid::domain = "full"
-grid::type = "byrange"
-grid::xyzmin = -3.0
-grid::xyzmax =  3.0
+grid::type = "byspacing"
+grid::dxyz = 0.2
+
+# PUGH
+driver::ghost_size = 0
+driver::global_nx = 31
+driver::global_ny = 31
+driver::global_nz = 31
 
 # ADMBase
 ADMBase::initial_lapse = "exact"
@@ -24,18 +26,18 @@ ADMBase::metric_type = "physical"
 # Exact
 Exact::exact_model = "Schwarzschild/EF"
 
-AHFinderDirect::origin_x = 0.0
-AHFinderDirect::origin_y = 0.0
-AHFinderDirect::origin_z = 0.0
-AHFinderDirect::patch_system_type = "full sphere"
-AHFinderDirect::ghost_zone_width = 2
-AHFinderDirect::patch_overlap_width = 1
-AHFinderDirect::N_zones_per_right_angle = 18
+AHFinderDirect::find_AHs_at_postinitial = "true"
+AHFinderDirect::find_AHs_at_poststep    = "false"
+AHFinderDirect::verbose_level = "physics details"
 
-AHFinderDirect::geometry_interpolator_name = "generalized polynomial interpolation"
-AHFinderDirect::geometry_interpolator_pars = "order=3"
-AHFinderDirect::interpatch_interpolator_name = "generalized polynomial interpolation"
-AHFinderDirect::interpatch_interpolator_pars = "order=3"
+AHFinderDirect::h_base_file_name      = "Schw.h"
+AHFinderDirect::H_of_h_base_file_name = "Schw.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = 0.0
+AHFinderDirect::origin_y[1] = 0.0
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::patch_system_type = "full sphere"
 
-AHFinderDirect::initial_guess_method = "ellipsoid"
-AHFinderDirect::method = "horizon"
+AHFinderDirect::initial_guess_method = "coordinate sphere"
+AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0
diff --git a/run/test-ahfinderdirect/misc/Kerr.par b/run/test-ahfinderdirect/misc/Kerr.par
index 58760d2..9ba6be0 100644
--- a/run/test-ahfinderdirect/misc/Kerr.par
+++ b/run/test-ahfinderdirect/misc/Kerr.par
@@ -1,5 +1,8 @@
 # parameter file for patch system test
-ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling StaticConformal CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
 
 # PUGH
 driver::ghost_size = 0
@@ -26,15 +29,12 @@ Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
 Exact::Kerr_KerrSchild__spin = 0.6
 
-AHFinderDirect::origin_x = 0.0
-AHFinderDirect::origin_y = 0.0
-AHFinderDirect::origin_z = 0.0
+AHFinderDirect::find_AHs_at_poststep = "false"
+
 AHFinderDirect::patch_system_type = "full sphere"
-AHFinderDirect::ghost_zone_width = 2
-AHFinderDirect::patch_overlap_width = 1
 AHFinderDirect::N_zones_per_right_angle = 18
 
+AHFinderDirect::N_horizons = 1
 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"
+AHFinderDirect::initial_guess__Kerr_KerrSchild__mass[1] = 1.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__spin[1] = 0.6