default geometry interpolation is now order=2

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

11 files changed, 69 insertions, 130 deletions

diff --git a/par/Kerr-centered.par b/par/Kerr-centered.par
index 983d4d8..0e7a191 100644
--- a/par/Kerr-centered.par
+++ b/par/Kerr-centered.par
@@ -8,7 +8,7 @@
 cactus::cctk_itlast = 0
 
 ActiveThorns = "PUGH"
-driver::ghost_size = 3
+driver::ghost_size = 2
 driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
diff --git a/par/Kerr-order3.par b/par/Kerr-order3.par
new file mode 100644
index 0000000..43dcc06
--- /dev/null
+++ b/par/Kerr-order3.par
@@ -0,0 +1,60 @@
+# 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.  This example uses cubic Hermite interpolation for
+# maximum accuracy; note this requires driver::ghost_size to be >= 3.
+
+# flesh
+cactus::cctk_itlast = 0
+
+ActiveThorns = "PUGH"
+driver::ghost_size = 3
+driver::global_nx = 31
+driver::global_ny = 31
+driver::global_nz = 19
+
+ActiveThorns = "CartGrid3D"
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.2
+
+ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge SpaceMask 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_model = "Kerr/Kerr-Schild"
+Exact::Kerr_KerrSchild__mass = 1.0
+Exact::Kerr_KerrSchild__spin = 0.6
+
+########################################
+
+ActiveThorns = "IOUtil"
+IOUtil::parfile_write = "no"
+
+########################################
+
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+
+AHFinderDirect::print_timing_stats = "true"
+
+AHFinderDirect::geometry_interpolator_pars = "order=3 boundary_off_centering_tolerance={1.0e-10 1.0e-10 1.0e-10 1.0e-10 1.0e-10 1.0e-10} boundary_extrapolation_tolerance={0.0 0.0 0.0 0.0 0.0 0.0}"
+
+AHFinderDirect::output_Theta_every = 1
+AHFinderDirect::h_base_file_name     = "Kerr.h"
+AHFinderDirect::Theta_base_file_name = "Kerr.Theta"
+
+AHFinderDirect::N_horizons = 1
+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
diff --git a/par/Kerr-tiny.par b/par/Kerr-tiny.par
index e194d47..f866173 100644
--- a/par/Kerr-tiny.par
+++ b/par/Kerr-tiny.par
@@ -11,7 +11,7 @@
 cactus::cctk_itlast = 0
 
 ActiveThorns = "PUGH"
-driver::ghost_size = 3
+driver::ghost_size = 2
 driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
diff --git a/par/Kerr.par b/par/Kerr.par
index a5703c2..8234c1c 100644
--- a/par/Kerr.par
+++ b/par/Kerr.par
@@ -8,7 +8,7 @@
 cactus::cctk_itlast = 0
 
 ActiveThorns = "PUGH"
-driver::ghost_size = 3
+driver::ghost_size = 2
 driver::global_nx = 31
 driver::global_ny = 31
 driver::global_nz = 19
diff --git a/par/bl-bad.par b/par/bl-bad.par
index 9ef2db8..bf574a3 100644
--- a/par/bl-bad.par
+++ b/par/bl-bad.par
@@ -14,7 +14,7 @@ ActiveThorns = "CartGrid3D PUGH"
 Driver::global_nx   = 42
 Driver::global_ny   = 42
 Driver::global_nz   = 82
-PUGH::ghost_size    = 3
+PUGH::ghost_size    = 2
 
 Grid::domain        = "full"
 Grid::type          = "byspacing"
diff --git a/par/bl-y.par b/par/bl-y.par
index da70859..d8af8bf 100644
--- a/par/bl-y.par
+++ b/par/bl-y.par
@@ -12,7 +12,7 @@ ActiveThorns = "CartGrid3D PUGH"
 Driver::global_nx   = 42
 Driver::global_ny   = 42
 Driver::global_nz   = 42
-PUGH::ghost_size    = 3
+PUGH::ghost_size    = 2
 
 Grid::domain        = "octant"
 Grid::type          = "byspacing"
diff --git a/par/bl.par b/par/bl.par
index b294f58..9e01138 100644
--- a/par/bl.par
+++ b/par/bl.par
@@ -12,7 +12,7 @@ ActiveThorns = "CartGrid3D PUGH"
 Driver::global_nx   = 42
 Driver::global_ny   = 42
 Driver::global_nz   = 82
-PUGH::ghost_size    = 3
+PUGH::ghost_size    = 2
 
 Grid::domain        = "full"
 Grid::type          = "byspacing"
diff --git a/par/misner-ghost2-mask-noshrink.par b/par/misner-ghost2-mask-noshrink.par
deleted file mode 100644
index bfc530f..0000000
--- a/par/misner-ghost2-mask-noshrink.par
+++ /dev/null
@@ -1,121 +0,0 @@
-# This parameter file sets up Misner initial data and finds the
-# apparent horizons in it with AHFinderDirect.
-#
-# This run shows the AHFinderDirect interpolator parameters you need
-# to set to run with PUGH::ghost_size = 2.
-#
-# Note that the grid is very high-resolution, but small (the outer
-# boundaries are very close in).  This isn't a problem for the purposes
-# of this test.  This run takes about 198 megabytes of memory, and
-# 36 cpu seconds on a 1.07GHz PIII laptop.
-
-########################################
- 
-#
-# ***** grid *****
-#
-
-ActiveThorns = "CartGrid3D PUGH"
-
-Driver::global_nx   = 83
-Driver::global_ny   = 83
-Driver::global_nz   = 115
-PUGH::ghost_size    = 2
-
-Grid::domain        = "octant"
-Grid::type          = "byspacing"
-Grid::dxyz          = 0.025
-Grid::avoid_origin  = "true"
-
-########################################
-
-#
-# physics
-#
-
-ActiveThorns = "ADMBase ADMCoupling CoordGauge StaticConformal SpaceMask"
-ActiveThorns = "IDAnalyticBH"
-
-ADMBase::initial_data              = "misner_bh"
-IDAnalyticBH::mu                   = 1.2
-
-########################################
-
-#
-# numerical methods
-#
-
-Cactus::cctk_itlast = 0
-ADMBase::metric_type            = "static conformal"
-StaticConformal::conformal_storage = "factor+derivs+2nd derivs"
-SpaceMask::use_mask                = "true"
-ADMBase::evolution_method       = "none"
-ADMBase::initial_lapse          = "Cadez"
-ADMBase::lapse_evolution_method = "static"
-ADMBase::initial_shift          = "zero"
-ADMBase::shift_evolution_method = "static"
-
-########################################
-
-ActiveThorns = "PUGHSlab IOBasic IOUtil IOASCII"
-IO::out_dir = "misner-ghost2-mask-noshrink"
-IO::parfile_write = "no"
-IOASCII::out2D_every = 1
-IOASCII::out2D_style = "gnuplot f(x,y)"
-IOASCII::out2D_vars = "SpaceMask::emask"
-IOASCII::out3D_dir = "/tmp/misner-ghost2-mask-noshrink"
-IOASCII::out3D_every = 1
-IOASCII::out3D_style = "gnuplot f(x,y,z)"
-IOASCII::out3D_vars = "SpaceMask::emask"
-
-########################################
-
-#
-# AHFinderDirect
-#
-
-ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
-
-AHFinderDirect::print_timing_stats = "true"
-##AHFinderDirect::verbose_level = "algorithm details"
-
-# this next parameter lowers the geometry interpolator order (default=3)
-# so AHFinderDirect can run with driver::ghost_size = 2
-AHFinderDirect::geometry_interpolator_pars = "order=2 boundary_off_centering_tolerance={1.0e-10 1.0e-10 1.0e-10 1.0e-10 1.0e-10 1.0e-10} boundary_extrapolation_tolerance={0.0 0.0 0.0 0.0 0.0 0.0}"
-
-AHFinderDirect::set_mask = "true"
-AHFinderDirect::set_old_style_mask = "true"
-AHFinderDirect::set_new_style_mask = "false"
-
-# inside = horizon - 5 grid points
-# buffer = from there out to horizon
-AHFinderDirect::mask_radius_multiplier = 1.0
-AHFInderDirect::mask_radius_offset     = -5.0
-AHFInderDirect::mask_buffer_thickness  =  5.0
-AHFinderDirect::mask_is_noshrink = "true"
-
-AHFinderDirect::h_base_file_name              = "misner-ghost2-mask-noshrink.h"
-AHFinderDirect::BH_diagnostics_base_file_name = "misner-ghost2-mask-noshrink.BH_diagnostics"
-
-AHFinderDirect::N_horizons = 2
-
-AHFinderDirect::origin_x[1] = 0.0
-AHFinderDirect::origin_y[1] = 0.0
-AHFinderDirect::origin_z[1] = 1.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] = 1.1
-AHFinderDirect::initial_guess__coord_sphere__radius[1] = 0.60
-
-AHFinderDirect::N_zones_per_right_angle[2] = 30
-AHFinderDirect::origin_x[2] = 0.0
-AHFinderDirect::origin_y[2] = 0.0
-AHFinderDirect::origin_z[2] = 0.0
-AHFinderDirect::initial_guess_method[2] = "coordinate ellipsoid"
-AHFinderDirect::initial_guess__coord_ellipsoid__x_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_ellipsoid__y_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_ellipsoid__z_center[2] = 0.0
-AHFinderDirect::initial_guess__coord_ellipsoid__x_radius[2] = 0.6
-AHFinderDirect::initial_guess__coord_ellipsoid__y_radius[2] = 0.6
-AHFinderDirect::initial_guess__coord_ellipsoid__z_radius[2] = 1.8
diff --git a/par/misner-mask-noshrink.par b/par/misner-mask-noshrink.par
index 55fd698..37ef84a 100644
--- a/par/misner-mask-noshrink.par
+++ b/par/misner-mask-noshrink.par
@@ -17,7 +17,7 @@ ActiveThorns = "CartGrid3D PUGH"
 Driver::global_nx   = 83
 Driver::global_ny   = 83
 Driver::global_nz   = 115
-PUGH::ghost_size    = 3
+PUGH::ghost_size    = 2
 
 Grid::domain        = "octant"
 Grid::type          = "byspacing"
diff --git a/par/misner-mask-xnoshrink.par b/par/misner-mask-xnoshrink.par
index 4a982bf..4366590 100644
--- a/par/misner-mask-xnoshrink.par
+++ b/par/misner-mask-xnoshrink.par
@@ -17,7 +17,7 @@ ActiveThorns = "CartGrid3D PUGH"
 Driver::global_nx   = 83
 Driver::global_ny   = 83
 Driver::global_nz   = 115
-PUGH::ghost_size    = 3
+PUGH::ghost_size    = 2
 
 Grid::domain        = "octant"
 Grid::type          = "byspacing"
diff --git a/par/misner.par b/par/misner.par
index 1d175d7..7680b3d 100644
--- a/par/misner.par
+++ b/par/misner.par
@@ -17,7 +17,7 @@ ActiveThorns = "CartGrid3D PUGH"
 Driver::global_nx   = 83
 Driver::global_ny   = 83
 Driver::global_nz   = 115
-PUGH::ghost_size    = 3
+PUGH::ghost_size    = 2
 
 Grid::domain        = "octant"
 Grid::type          = "byspacing"