update some par files to recent code hanges

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

4 files changed, 114 insertions, 90 deletions

diff --git a/run/test-ahfinderdirect/Kerr/full_sphere.par b/run/test-ahfinderdirect/Kerr/full_sphere.par
index 65352f6..43b04f6 100644
--- a/run/test-ahfinderdirect/Kerr/full_sphere.par
+++ b/run/test-ahfinderdirect/Kerr/full_sphere.par
@@ -1,48 +1,54 @@
-# parameter file for patch system test
-ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling StaticConformal CoordGauge Exact AHFinderDirect"
+# This parameter file sets up Kerr/Kerr-Schild initial data, then
+# finds the apparent horizon in it.  The local coordinate system origin
+# and the initial guess are both deliberately de-centered with respect
+# to the black hole, to make this a non-trivial test for the apparent
+# horizon finder.
 
 # flesh
 cactus::cctk_itlast = 0
 
-# PUGH
-driver::ghost_size = 2
+ActiveThorns = "PUGH"
+driver::ghost_size = 3
 driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 31
 
-# CartGrid3D
+ActiveThorns = "CartGrid3D"
 grid::domain = "full"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
 grid::dxyz = 0.2
 
-# ADMBase
+ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge Exact"
 ADMBase::initial_lapse = "exact"
 ADMBase::initial_shift = "exact"
 ADMBase::initial_data = "exact"
 ADMBase::lapse_evolution_method = "static"
 ADMBase::shift_evolution_method = "static"
 ADMBase::metric_type = "physical"
-
-# Exact
 Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.6
+
+########################################
+
+ActiveThorns = "LocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
+AHFinderDirect::print_timing_stats = "true"
 
-AHFinderDirect::how_often_to_output_H_of_h = 1
-AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
-AHFinderDirect::h_base_file_name      = "full_sphere.h"
-AHFinderDirect::H_of_h_base_file_name = "full_sphere.H"
+AHFinderDirect::how_often_to_output_Theta = 1
+AHFinderDirect::h_base_file_name     = "full_sphere.h"
+AHFinderDirect::Theta_base_file_name = "full_sphere.Theta"
 
 AHFinderDirect::N_horizons = 1
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = 0.0
-
-AHFinderDirect::initial_guess_method = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 1.5
+AHFinderDirect::origin_x[1] =  0.5
+AHFinderDirect::origin_y[1] =  0.7
+AHFinderDirect::origin_z[1] = -0.6
+
+AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
+AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
+AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3
+AHFinderDirect::initial_guess__coord_sphere__z_center[1] =  0.5
+AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0
diff --git a/run/test-ahfinderdirect/Kerr/plus_xy_quadrant_mirrored.par b/run/test-ahfinderdirect/Kerr/plus_xy_quadrant_mirrored.par
index 344f197..3c2bb14 100644
--- a/run/test-ahfinderdirect/Kerr/plus_xy_quadrant_mirrored.par
+++ b/run/test-ahfinderdirect/Kerr/plus_xy_quadrant_mirrored.par
@@ -1,48 +1,54 @@
-# parameter file for patch system test
-ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling StaticConformal CoordGauge Exact AHFinderDirect"
+# This parameter file sets up Kerr/Kerr-Schild initial data, then
+# finds the apparent horizon in it.  The local coordinate system origin
+# and the initial guess are both deliberately de-centered with respect
+# to the black hole, to make this a non-trivial test for the apparent
+# horizon finder.
 
 # flesh
 cactus::cctk_itlast = 0
 
-# PUGH
-driver::ghost_size = 2
-driver::global_nx = 17
-driver::global_ny = 17
+ActiveThorns = "PUGH"
+driver::ghost_size = 3
+driver::global_nx = 19
+driver::global_ny = 19
 driver::global_nz = 31
 
-# CartGrid3D
+ActiveThorns = "CartGrid3D"
 grid::domain = "quadrant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
 grid::dxyz = 0.2
 
-# ADMBase
+ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge Exact"
 ADMBase::initial_lapse = "exact"
 ADMBase::initial_shift = "exact"
 ADMBase::initial_data = "exact"
 ADMBase::lapse_evolution_method = "static"
 ADMBase::shift_evolution_method = "static"
 ADMBase::metric_type = "physical"
-
-# Exact
 Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.6
+
+########################################
+
+ActiveThorns = "LocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
+AHFinderDirect::print_timing_stats = "true"
 
-AHFinderDirect::how_often_to_output_H_of_h = 1
-AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
-AHFinderDirect::h_base_file_name      = "plus_xy_quadrant.h"
-AHFinderDirect::H_of_h_base_file_name = "plus_xy_quadrant.H"
+AHFinderDirect::how_often_to_output_Theta = 1
+AHFinderDirect::h_base_file_name     = "plus_xy_quadrant_mirrored.h"
+AHFinderDirect::Theta_base_file_name = "plus_xy_quadrant_mirrored.Theta"
 
 AHFinderDirect::N_horizons = 1
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = 0.0
-
-AHFinderDirect::initial_guess_method = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 1.5
+AHFinderDirect::origin_x[1] =  0.0
+AHFinderDirect::origin_y[1] =  0.0
+AHFinderDirect::origin_z[1] =  0.4
+
+AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
+AHFinderDirect::initial_guess__coord_sphere__x_center[1] =  0.0
+AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.0
+AHFinderDirect::initial_guess__coord_sphere__z_center[1] = -0.2
+AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0
diff --git a/run/test-ahfinderdirect/Kerr/plus_xyz_octant_mirrored.par b/run/test-ahfinderdirect/Kerr/plus_xyz_octant_mirrored.par
index d14cf29..498265e 100644
--- a/run/test-ahfinderdirect/Kerr/plus_xyz_octant_mirrored.par
+++ b/run/test-ahfinderdirect/Kerr/plus_xyz_octant_mirrored.par
@@ -1,48 +1,54 @@
-# parameter file for patch system test
-ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling StaticConformal CoordGauge Exact AHFinderDirect"
+# This parameter file sets up Kerr/Kerr-Schild initial data, then
+# finds the apparent horizon in it.  The local coordinate system origin
+# and the initial guess are both deliberately de-centered with respect
+# to the black hole, to make this a non-trivial test for the apparent
+# horizon finder.
 
 # flesh
 cactus::cctk_itlast = 0
 
-# PUGH
-driver::ghost_size = 2
-driver::global_nx = 17
-driver::global_ny = 17
-driver::global_nz = 17
+ActiveThorns = "PUGH"
+driver::ghost_size = 3
+driver::global_nx = 19
+driver::global_ny = 19
+driver::global_nz = 19
 
-# CartGrid3D
+ActiveThorns = "CartGrid3D"
 grid::domain = "octant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
 grid::dxyz = 0.2
 
-# ADMBase
+ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge Exact"
 ADMBase::initial_lapse = "exact"
 ADMBase::initial_shift = "exact"
 ADMBase::initial_data = "exact"
 ADMBase::lapse_evolution_method = "static"
 ADMBase::shift_evolution_method = "static"
 ADMBase::metric_type = "physical"
-
-# Exact
 Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.6
+
+########################################
+
+ActiveThorns = "LocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
+AHFinderDirect::print_timing_stats = "true"
 
-AHFinderDirect::how_often_to_output_H_of_h = 1
-AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
-AHFinderDirect::h_base_file_name      = "plus_xyz_octant.h"
-AHFinderDirect::H_of_h_base_file_name = "plus_xyz_octant.H"
+AHFinderDirect::how_often_to_output_Theta = 1
+AHFinderDirect::h_base_file_name     = "plus_xyz_octant_mirrored.h"
+AHFinderDirect::Theta_base_file_name = "plus_xyz_octant_mirrored.Theta"
 
 AHFinderDirect::N_horizons = 1
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = 0.0
-
-AHFinderDirect::initial_guess_method = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 1.5
+AHFinderDirect::origin_x[1] =  0.0
+AHFinderDirect::origin_y[1] =  0.0
+AHFinderDirect::origin_z[1] =  0.0
+
+AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
+AHFinderDirect::initial_guess__coord_sphere__x_center[1] =  0.0
+AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.0
+AHFinderDirect::initial_guess__coord_sphere__z_center[1] =  0.0
+AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0
diff --git a/run/test-ahfinderdirect/Kerr/plus_z_hemisphere.par b/run/test-ahfinderdirect/Kerr/plus_z_hemisphere.par
index 1ce2666..0a535f8 100644
--- a/run/test-ahfinderdirect/Kerr/plus_z_hemisphere.par
+++ b/run/test-ahfinderdirect/Kerr/plus_z_hemisphere.par
@@ -1,48 +1,54 @@
-# parameter file for patch system test
-ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling StaticConformal CoordGauge Exact AHFinderDirect"
+# This parameter file sets up Kerr/Kerr-Schild initial data, then
+# finds the apparent horizon in it.  The local coordinate system origin
+# and the initial guess are both deliberately de-centered with respect
+# to the black hole, to make this a non-trivial test for the apparent
+# horizon finder.
 
 # flesh
 cactus::cctk_itlast = 0
 
-# PUGH
-driver::ghost_size = 2
+ActiveThorns = "PUGH"
+driver::ghost_size = 3
 driver::global_nx = 31
 driver::global_ny = 31
-driver::global_nz = 17
+driver::global_nz = 19
 
-# CartGrid3D
+ActiveThorns = "CartGrid3D"
 grid::domain = "bitant"
 grid::avoid_origin = "false"
 grid::type = "byspacing"
 grid::dxyz = 0.2
 
-# ADMBase
+ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge Exact"
 ADMBase::initial_lapse = "exact"
 ADMBase::initial_shift = "exact"
 ADMBase::initial_data = "exact"
 ADMBase::lapse_evolution_method = "static"
 ADMBase::shift_evolution_method = "static"
 ADMBase::metric_type = "physical"
-
-# Exact
 Exact::exact_model = "Kerr/Kerr-Schild"
 Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.6
+
+########################################
+
+ActiveThorns = "LocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::find_AHs_at_postinitial = "true"
 AHFinderDirect::find_AHs_at_poststep    = "false"
+AHFinderDirect::print_timing_stats = "true"
 
-AHFinderDirect::how_often_to_output_H_of_h = 1
-AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
-AHFinderDirect::h_base_file_name      = "plus_z_hemisphere.h"
-AHFinderDirect::H_of_h_base_file_name = "plus_z_hemisphere.H"
+AHFinderDirect::how_often_to_output_Theta = 1
+AHFinderDirect::h_base_file_name     = "plus_z_hemisphere.h"
+AHFinderDirect::Theta_base_file_name = "plus_z_hemisphere.Theta"
 
 AHFinderDirect::N_horizons = 1
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = 0.0
-
-AHFinderDirect::initial_guess_method = "coordinate sphere"
-AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 1.5
+AHFinderDirect::origin_x[1] =  0.5
+AHFinderDirect::origin_y[1] =  0.7
+AHFinderDirect::origin_z[1] =  0.0
+
+AHFinderDirect::initial_guess_method[1] = "coordinate sphere"
+AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2
+AHFinderDirect::initial_guess__coord_sphere__y_center[1] =  0.3
+AHFinderDirect::initial_guess__coord_sphere__z_center[1] =  0.0
+AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0