* rename initial-guess suboptions to make them a bit clearer

  ("sphere" --> "coordinate sphere", "ellipsoid" --> "coordinate ellipsoid")
* more comments in param.ccl
* add option to allow only writing "large" data files every N time steps


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

1 files changed, 33 insertions, 33 deletions

diff --git a/src/driver/initial_guess.cc b/src/driver/initial_guess.cc
index 0c11742..9c92ca9 100644
--- a/src/driver/initial_guess.cc
+++ b/src/driver/initial_guess.cc
@@ -6,7 +6,7 @@
 // setup_initial_guess - set up initial guess in h
 // decode_initial_guess_method - decode the  initial_guess_method  parameter
 /// setup_Kerr_horizon - set up Kerr horizon in h (Kerr or Kerr-Schild coords)
-/// setup_ellipsoid - setup up a coordinate ellipsoid in h
+/// setup_coord_ellipsoid - setup up a coordinate ellipsoid in h
 ///
 
 #include <stdio.h>
@@ -56,10 +56,10 @@ void setup_Kerr_horizon(patch_system& ps,
 			fp m, fp a,
 			bool Kerr_Schild_flag,
 			const struct verbose_info& verbose_info);
-void setup_ellipsoid(patch_system& ps,
-		     fp x_center, fp y_center, fp z_center,
-		     fp x_radius, fp y_radius, fp z_radius,
-		     bool print_msg_flag);
+void setup_coord_ellipsoid(patch_system& ps,
+			   fp x_center, fp y_center, fp z_center,
+			   fp x_radius, fp y_radius, fp z_radius,
+			   bool print_msg_flag);
 	  }
 
 //******************************************************************************
@@ -107,26 +107,26 @@ case initial_guess__Kerr_KerrSchild:
 			   verbose_info);
 	break;
 
-case initial_guess__sphere:
-	setup_ellipsoid(ps,
-			igi.sphere_info.x_center,
-			igi.sphere_info.y_center,
-			igi.sphere_info.z_center,
-			igi.sphere_info.radius,
-			igi.sphere_info.radius,
-			igi.sphere_info.radius,
-			verbose_info.print_algorithm_highlights);
+case initial_guess__coord_sphere:
+	setup_coord_ellipsoid(ps,
+			      igi.coord_sphere_info.x_center,
+			      igi.coord_sphere_info.y_center,
+			      igi.coord_sphere_info.z_center,
+			      igi.coord_sphere_info.radius,
+			      igi.coord_sphere_info.radius,
+			      igi.coord_sphere_info.radius,
+			      verbose_info.print_algorithm_highlights);
 	break;
 
-case initial_guess__ellipsoid:
-	setup_ellipsoid(ps,
-			igi.ellipsoid_info.x_center,
-			igi.ellipsoid_info.y_center,
-			igi.ellipsoid_info.z_center,
-			igi.ellipsoid_info.x_radius,
-			igi.ellipsoid_info.y_radius,
-			igi.ellipsoid_info.z_radius,
-			verbose_info.print_algorithm_highlights);
+case initial_guess__coord_ellipsoid:
+	setup_coord_ellipsoid(ps,
+			      igi.coord_ellipsoid_info.x_center,
+			      igi.coord_ellipsoid_info.y_center,
+			      igi.coord_ellipsoid_info.z_center,
+			      igi.coord_ellipsoid_info.x_radius,
+			      igi.coord_ellipsoid_info.y_radius,
+			      igi.coord_ellipsoid_info.z_radius,
+			      verbose_info.print_algorithm_highlights);
 	break;
 
 default:
@@ -151,10 +151,10 @@ else if (STRING_EQUAL(initial_guess_method_string, "Kerr/Kerr"))
    then return initial_guess__Kerr_Kerr;
 else if (STRING_EQUAL(initial_guess_method_string, "Kerr/Kerr-Schild"))
    then return initial_guess__Kerr_KerrSchild;
-else if (STRING_EQUAL(initial_guess_method_string, "sphere"))
-   then return initial_guess__sphere;
-else if (STRING_EQUAL(initial_guess_method_string, "ellipsoid"))
-   then return initial_guess__ellipsoid;
+else if (STRING_EQUAL(initial_guess_method_string, "coordinate sphere"))
+   then return initial_guess__coord_sphere;
+else if (STRING_EQUAL(initial_guess_method_string, "coordinate ellipsoid"))
+   then return initial_guess__coord_ellipsoid;
 else	CCTK_VWarn(-1, __LINE__, __FILE__, CCTK_THORNSTRING,
 "\n"
 "   decode_initial_guess_method():\n"
@@ -212,7 +212,7 @@ if (verbose_info.print_algorithm_details)
    then CCTK_VInfo(CCTK_THORNSTRING,
 		   "   setting coordinate %s",
 		   Kerr_Schild_flag ? "ellipsoid" : "sphere");
-setup_ellipsoid(ps,
+setup_coord_ellipsoid(ps,
 		x_posn, y_posn, z_posn,
 		xy_radius, xy_radius, z_radius,
 		verbose_info.print_algorithm_details);
@@ -242,10 +242,10 @@ setup_ellipsoid(ps,
 //	CW = C - W
 //
 namespace {
-void setup_ellipsoid(patch_system& ps,
-		     fp x_center, fp y_center, fp z_center,
-		     fp x_radius, fp y_radius, fp z_radius,
-		     bool print_msg_flag)
+void setup_coord_ellipsoid(patch_system& ps,
+			   fp x_center, fp y_center, fp z_center,
+			   fp x_radius, fp y_radius, fp z_radius,
+			   bool print_msg_flag)
 {
 if (print_msg_flag)
    then {
@@ -292,7 +292,7 @@ if (print_msg_flag)
 		   then r = r_minus;
 		else    CCTK_VWarn(-1, __LINE__, __FILE__, CCTK_THORNSTRING,
 				   "\n"
-"   setup_ellipsoid():\n"
+"   setup_coord_ellipsoid():\n"
 "        expected exactly one r>0 solution to quadratic, got 0 or 2!\n"
 "        %s patch (irho,isigma)=(%d,%d) ==> (rho,sigma)=(%g,%g)\n"
 "        direction cosines (xcos,ycos,zcos)=(%g,%g,%g)\n"