* 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

1 files changed, 19 insertions, 0 deletions

diff --git a/src/driver/setup.cc b/src/driver/setup.cc
index 3ec6ca1..13a404f 100644
--- a/src/driver/setup.cc
+++ b/src/driver/setup.cc
@@ -570,6 +570,25 @@ if (strlen(surface_interpolator_name) > 0)
 	AH_data.found_flag = false;
 	AH_data.h_files_written = false;
 	AH_data.BH_diagnostics_fileptr = NULL;
+
+	AH_data.store_info_in_SS_vars = (which_surface_to_store_info[hn] >= 0);
+	if (AH_data.store_info_in_SS_vars)
+	   then {
+		AH_data.SS_surface_number = which_surface_to_store_info[hn];
+		if (AH_data.SS_surface_number
+		    >= /* SphericalSurface:: */ nsurfaces)
+		   then CCTK_VWarn(FATAL_ERROR,
+				   __LINE__, __FILE__, CCTK_THORNSTRING,
+"\n"
+"   AHFinderDirect_setup():\n"
+"        which_surface_to_store_info[%d] = %d\n"
+"        is outside the legal range [0,SphericalSurface::nsurfaces=%d)!\n"
+				   ,
+				   hn, AH_data.SS_surface_number,
+				   int(/* SphericalSurface:: */ nsurfaces));
+								/*NOTREACHED*/
+		}
+	   else AH_data.SS_surface_number = 0;	// dummy value
 	}
 	  }
 }