* add interface to Erik's SphericalSurface thorn

  ==> With this commit, AHFinderDirect now inherits from
      AEIThorns/SphericalSurface, so you must have that thorn in
      your configuration to be able to compile.
* add computation of surface quadrupole moments and areal radius
* expand BH_diagnostics file format to accomodate quadrupole moments
  and areal radius, and also to include not-implemented-yet columns
  for 9 more diagnostics which Erik has implemented in his branch
* some other small cleanups


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

16 files changed, 16 insertions, 0 deletions

diff --git a/par/Kerr-centered.par b/par/Kerr-centered.par
index a327861..c2b21cf 100644
--- a/par/Kerr-centered.par
+++ b/par/Kerr-centered.par
@@ -37,6 +37,7 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/Kerr-mask.par b/par/Kerr-mask.par
index f222b7a..a69d534 100644
--- a/par/Kerr-mask.par
+++ b/par/Kerr-mask.par
@@ -42,6 +42,7 @@ IOASCII::out2D_vars = "SpaceMask::emask"
 
 ########################################
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/Kerr-order3.par b/par/Kerr-order3.par
index 705761c..36610aa 100644
--- a/par/Kerr-order3.par
+++ b/par/Kerr-order3.par
@@ -38,6 +38,7 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/Kerr-tiny.par b/par/Kerr-tiny.par
index f0ce3a0..0da4804 100644
--- a/par/Kerr-tiny.par
+++ b/par/Kerr-tiny.par
@@ -40,6 +40,7 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 AHFinderDirect::h_base_file_name     = "Kerr-tiny.h"
 
diff --git a/par/Kerr.par b/par/Kerr.par
index 2a236c5..e26d4fe 100644
--- a/par/Kerr.par
+++ b/par/Kerr.par
@@ -37,6 +37,7 @@ IOUtil::parfile_write = "no"
 
 ########################################
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/bl-bad.par b/par/bl-bad.par
index 449dc94..b9c2d32 100644
--- a/par/bl-bad.par
+++ b/par/bl-bad.par
@@ -69,6 +69,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/bl-different-mask-min-radius-points=5.par b/par/bl-different-mask-min-radius-points=5.par
index e04df91..8c06566 100644
--- a/par/bl-different-mask-min-radius-points=5.par
+++ b/par/bl-different-mask-min-radius-points=5.par
@@ -73,6 +73,7 @@ IOASCII::out2D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/bl-different-mask.par b/par/bl-different-mask.par
index 79720b9..dbd641c 100644
--- a/par/bl-different-mask.par
+++ b/par/bl-different-mask.par
@@ -73,6 +73,7 @@ IOASCII::out2D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/bl-y.par b/par/bl-y.par
index ec4fd6b..6bd203f 100644
--- a/par/bl-y.par
+++ b/par/bl-y.par
@@ -67,6 +67,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/bl.par b/par/bl.par
index 7823b20..d304359 100644
--- a/par/bl.par
+++ b/par/bl.par
@@ -67,6 +67,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/misner-mask-noshrink.par b/par/misner-mask-noshrink.par
index dd9edd6..440f7cc 100644
--- a/par/misner-mask-noshrink.par
+++ b/par/misner-mask-noshrink.par
@@ -71,6 +71,7 @@ IOASCII::out3D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/misner-mask-xnoshrink.par b/par/misner-mask-xnoshrink.par
index 381966f..602656d 100644
--- a/par/misner-mask-xnoshrink.par
+++ b/par/misner-mask-xnoshrink.par
@@ -71,6 +71,7 @@ IOASCII::out3D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/misner-max-allowable-horizon-radius=0.75.par b/par/misner-max-allowable-horizon-radius=0.75.par
index 65e5751..4d3c9f2 100644
--- a/par/misner-max-allowable-horizon-radius=0.75.par
+++ b/par/misner-max-allowable-horizon-radius=0.75.par
@@ -62,6 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/misner-max-allowable-horizon-radius=0.8.par b/par/misner-max-allowable-horizon-radius=0.8.par
index 341e14d..3925685 100644
--- a/par/misner-max-allowable-horizon-radius=0.8.par
+++ b/par/misner-max-allowable-horizon-radius=0.8.par
@@ -62,6 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/misner-umfpack.par b/par/misner-umfpack.par
index ffb468d..079135d 100644
--- a/par/misner-umfpack.par
+++ b/par/misner-umfpack.par
@@ -62,6 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
diff --git a/par/misner.par b/par/misner.par
index 87464f8..c733fc4 100644
--- a/par/misner.par
+++ b/par/misner.par
@@ -62,6 +62,7 @@ IOUtil::parfile_write = "no"
 # AHFinderDirect
 #
 
+ActiveThorns = "SphericalSurface"
 ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"