rename this header file, since it's really specific to this directory

(driver stuff) rather than to this thorn as a whole


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

1 files changed, 28 insertions, 9 deletions

diff --git a/src/driver/AHFinderDirect.hh b/src/driver/driver.hh
index 5435701..f01a64c 100644
--- a/src/driver/AHFinderDirect.hh
+++ b/src/driver/driver.hh
@@ -1,4 +1,4 @@
-// AHFinderDirect.hh -- misc global-within-this-thorn stuff
+// driver.hh -- header file for driver code
 // $Header$
 
 //******************************************************************************
@@ -55,7 +55,6 @@ struct	Jacobian_info
 //
 struct	solver_info
 	{
-	// stuff for Newton_solve()
 	int max_Newton_iterations;
 	bool output_h_and_H_at_each_Newton_iteration;
 	fp max_Delta_h_over_h;
@@ -78,6 +77,22 @@ struct	IO_info
 				// (cctk_iteration)
 	};
 
+//
+// This struct holds info describing how verbose we should be
+//
+struct	verbose_info
+	{
+	// decoded from verbose_level parameter
+	enum verbose_level verbose_level;
+
+	// derived Boolean flags saying whether or not
+	// verbose_level is >= the appropriate level
+	bool print_physics_highlights;
+	bool print_physics_details;
+	bool print_algorithm_highlights;
+	bool print_algorithm_details;
+	};
+
 //******************************************************************************
 
 //
@@ -90,8 +105,8 @@ struct	AH_info
 	Jacobian* Jac_ptr;
 
 	bool AH_found;
-	fp centroid_x, centroid_y, centroid_z;
 	fp area, mass;
+	fp centroid_x, centroid_y, centroid_z;
 	};
 
 //
@@ -100,9 +115,10 @@ struct	AH_info
 //
 struct	state
 	{
-	enum method        method;
-	enum verbose_level verbose_level;
+	enum method method;
+	struct verbose_info verbose_info;
 	int timer_handle;
+	enum patch::integration_method surface_integral_method;
 
 	struct IO_info IO_info;
 	struct Jacobian_info Jac_info;
@@ -112,7 +128,9 @@ struct	state
 
 	int N_horizons;
 
-	// this vector is indexed with a 0-origin integer hn ("horizon number")
+	// this vector is of size N_horizons+1,
+	// and is indexed with a "horizon number" hn
+	// which is (hopefully) always in the range 1 <= hn <= N_horizons
 	std::vector<AH_info *> AH_info_ptrs;
 	};
 
@@ -143,7 +161,7 @@ extern "C"
 //**************************************
 
 // Newton.cc
-// return true for success, false for failure to converge
+// returns true for success, false for failure to converge
 bool Newton_solve(patch_system& ps,
 		  Jacobian& Jac,
 		  const struct cactus_grid_info& cgi,
@@ -151,10 +169,11 @@ bool Newton_solve(patch_system& ps,
 		  const struct Jacobian_info& Jacobian_info,
 		  const struct solver_info& solver_info,
 		  struct IO_info& IO_info,
-		  int hn, enum verbose_level verbose_level);
+		  int hn, const struct verbose_info& verbose_info);
 
 // horizon_Jacobian.cc
-void horizon_Jacobian(patch_system& ps,
+// returns true for successful computation, false for failure
+bool horizon_Jacobian(patch_system& ps,
 		      Jacobian& Jac,
 		      const struct cactus_grid_info& cgi,
 		      const struct geometry_info& gi,