compute min/max horizon radius for each horizon found

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

1 files changed, 2 insertions, 40 deletions

diff --git a/src/driver/driver.hh b/src/driver/driver.hh
index 225130a..0995f50 100644
--- a/src/driver/driver.hh
+++ b/src/driver/driver.hh
@@ -4,6 +4,8 @@
 //
 // prerequisites:
 //	<stdio.h>
+//	"horizon_sequence.hh"
+//	"BH_diagnostics.hh"
 //
 
 //******************************************************************************
@@ -93,14 +95,6 @@ struct	solver_info
 	fp Theta_norm_for_convergence;
 	};
 
-//
-// This struct holds info for computing black hole diagnostics.
-//
-struct	BH_diagnostics_info
-	{
-	enum patch::integration_method integral_method;
-	};
-
 //******************************************************************************
 
 //
@@ -164,23 +158,6 @@ struct	verbose_info
 //******************************************************************************
 
 //
-// (A single copy of) this struct holds all of our black hole diagnostics
-// for a single apparent horizon.  These diagnostics are only meaningful
-// if the apparent horizon has indeed been found.
-//
-struct	BH_diagnostics
-	{
-	fp centroid_x, centroid_y, centroid_z;
-	fp mean_radius;
-	fp circumference_xy, circumference_xz, circumference_yz;
-	fp area;
-	fp m_irreducible;
-
-	// constructor initializes all diagnostics to 0.0
-	BH_diagnostics();
-	};
-
-//
 // (A single copy of) this struct holds all of our information about
 // a single apparent horizon.
 //
@@ -284,21 +261,6 @@ void Newton(cGH* GH,
 	    const struct error_info& error_info,
 	    const struct verbose_info& verbose_info);
 
-// BH_diagnostics.cc
-void compute_BH_diagnostics
-	(const patch_system& ps,
-	 const struct BH_diagnostics_info& BH_diagnostics_info,
-	 const struct verbose_info& verbose_info,
-	 struct BH_diagnostics& BH_diagnostics);
-void print_BH_diagnostics(const struct BH_diagnostics& BH_diagnostics,
-			  int N_horizons, int hn,
-			  const struct verbose_info& verbose_info);
-FILE* setup_BH_diagnostics_output_file(const struct IO_info& IO_info,
-				       int N_horizons, int hn);
-void output_BH_diagnostics_fn(const struct BH_diagnostics& BH_diagnostics,
-			      const struct IO_info& IO_info,
-			      int hn, FILE* fileptr);
-
 // io.cc
 void input_gridfn(patch_system& ps, int unknown_gfn,
 		  const struct IO_info& IO_info, const char base_file_name[],