rename direction cosines (alpha,beta,gamma) --> (xcos,ycos,zcos)

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

3 files changed, 34 insertions, 53 deletions

diff --git a/src/patch/coords.cc b/src/patch/coords.cc
index 473e375..0222840 100644
--- a/src/patch/coords.cc
+++ b/src/patch/coords.cc
@@ -13,7 +13,7 @@
 //
 // usual polar spherical (r,theta,phi) <--> (x,y,z)
 // ((mu,nu,phi)) <--> usual polar spherical (theta,phi)
-// ((mu,nu,phi)) --> direction cosines (alpha,beta,gamma)
+// ((mu,nu,phi)) --> direction cosines (xcos,ycos,zcos)
 //
 // local_coords::mu_nu_phi::name_of_coords_set
 //
@@ -426,42 +426,33 @@ assert( fuzzy_EQ_ang(phi, ps_phi) );
 
 //
 // these functions convert ((mu,nu,phi)) to the direction cosines
-// (alpha,beta,gamma)
+// (xcos,ycos,zcos)
 //
 
 namespace local_coords
 	  {
-void alpha_beta_gamma_of_mu_nu (fp mu, fp nu , fp& alpha, fp& beta, fp& gamma)
+void xcos_ycos_zcos_of_mu_nu (fp mu, fp nu , fp& xcos, fp& ycos, fp& zcos)
 {
-fp x, y, z;
-xyz_of_r_mu_nu(1.0,mu,nu, x,y,z);
-alpha = x;
-beta  = y;
-gamma = z;
+xyz_of_r_mu_nu(1.0,mu,nu, xcos,ycos,zcos);
 }
 	  }
 
 namespace local_coords
 	  {
-void alpha_beta_gamma_of_mu_phi(fp mu, fp phi, fp& alpha, fp& beta, fp& gamma)
+void xcos_ycos_zcos_of_mu_phi(fp mu, fp phi, fp& xcos, fp& ycos, fp& zcos)
 {
-fp x, y, z;
-xyz_of_r_mu_phi(1.0,mu,phi, x,y,z);
-alpha = x;
-beta  = y;
-gamma = z;
+xyz_of_r_mu_phi(1.0,mu,phi, xcos,ycos,zcos);
+xcos = x;
+ycos = y;
+zcos = z;
 }
 	  }
 
 namespace local_coords
 	  {
-void alpha_beta_gamma_of_nu_phi(fp nu, fp phi, fp& alpha, fp& beta, fp& gamma)
+void xcos_ycos_zcos_of_nu_phi(fp nu, fp phi, fp& xcos, fp& ycos, fp& zcos)
 {
-fp x, y, z;
-xyz_of_r_nu_phi(1.0,nu,phi, x,y,z);
-alpha = x;
-beta  = y;
-gamma = z;
+xyz_of_r_nu_phi(1.0,nu,phi, xcos,ycos,zcos);
 }
 	  }
 
diff --git a/src/patch/coords.hh b/src/patch/coords.hh
index f101b1f..c0ae3e8 100644
--- a/src/patch/coords.hh
+++ b/src/patch/coords.hh
@@ -53,10 +53,10 @@
 //
 
 //
-// We also use direction cosines (alpha,beta,gamma):
-// alpha = x/r = cos(angle between vector from origin to (x,y,z), and x axis)
-// beta  = y/r = cos(angle between vector from origin to (x,y,z), and y axis)
-// gamma = z/r = cos(angle between vector from origin to (x,y,z), and z axis)
+// We also use direction cosines (xcos,ycos,zcos):
+// xcos = x/r = cos(angle between vector from origin to (x,y,z), and x axis)
+// ycos = y/r = cos(angle between vector from origin to (x,y,z), and y axis)
+// zcos = z/r = cos(angle between vector from origin to (x,y,z), and z axis)
 //
 
 //
@@ -177,10 +177,10 @@ void  mu_nu_of_theta_phi(fp ps_theta, fp ps_phi,   fp& mu, fp& nu );
 void mu_phi_of_theta_phi(fp ps_theta, fp ps_phi,   fp& mu, fp& phi);
 void nu_phi_of_theta_phi(fp ps_theta, fp ps_phi,   fp& nu, fp& phi);
 
-// ((mu,nu,phi)) --> direction cosines (alpha,beta,gamma)
-void alpha_beta_gamma_of_mu_nu (fp mu, fp nu , fp& alpha, fp& beta, fp& gamma);
-void alpha_beta_gamma_of_mu_phi(fp mu, fp phi, fp& alpha, fp& beta, fp& gamma);
-void alpha_beta_gamma_of_nu_phi(fp nu, fp phi, fp& alpha, fp& beta, fp& gamma);
+// ((mu,nu,phi)) --> direction cosines (xcos,ycos,zcos)
+void xyzcos_of_mu_nu (fp mu, fp nu , fp& xcos, fp& ycos, fp& zcos);
+void xyzcos_of_mu_phi(fp mu, fp phi, fp& xcos, fp& ycos, fp& zcos);
+void xyzcos_of_nu_phi(fp nu, fp phi, fp& xcos, fp& ycos, fp& zcos);
 	  };	// close namespace local_coords::
 
 //*****************************************************************************
diff --git a/src/patch/patch.hh b/src/patch/patch.hh
index 5faca70..a7d64d7 100644
--- a/src/patch/patch.hh
+++ b/src/patch/patch.hh
@@ -211,11 +211,10 @@ public:
 	virtual fp   rho_of_xyz(fp x, fp y, fp z) const = 0;
 	virtual fp sigma_of_xyz(fp x, fp y, fp z) const = 0;
 
-	// convert (rho,sigma) --> direction cosines (alpha,beta,gamma)
+	// convert (rho,sigma) --> direction cosines (xcos,ycos,zcos)
 	//                         with respect to the local coordinate system
-	virtual void alpha_beta_gamma_of_rho_sigma
-		(fp rho, fp sigma,
-		 fp& alpha, fp& beta, fp& gamma)
+	virtual void xyzcos_of_rho_sigma(fp rho, fp sigma,
+					 fp& xcos, fp& ycos, fp& zcos)
 		const = 0;
 
 	// partial (rho,sigma) / partial (x,y,z)
@@ -527,15 +526,12 @@ public:
 	fp sigma_of_xyz(fp x, fp y, fp z) const
 		{ return local_coords::nu_of_xz(x,z); }
 
-	// convert (rho,sigma) --> direction cosines (alpha,beta,gamma)
+	// convert (rho,sigma) --> direction cosines (xcos,ycos,zcos)
 	//                         with respect to the local coordinate system
-	void alpha_beta_gamma_of_rho_sigma(fp rho, fp sigma,
-					   fp& alpha, fp& beta, fp& gamma)
+	void xyzcos_of_rho_sigma(fp rho, fp sigma,
+				 fp& xcos, fp& ycos, fp& zcos)
 		const
-		{
-		local_coords::alpha_beta_gamma_of_mu_nu(rho,sigma,
-							alpha,beta,gamma);
-		}
+		{ local_coords::xyzcos_of_mu_nu(rho,sigma, xcos,ycos,zcos); }
 
 	// partial (rho,sigma) / partial (x,y,z)
 	fp partial_rho_wrt_x(fp x, fp y, fp z) const { return 0.0; }
@@ -649,15 +645,12 @@ public:
 	fp sigma_of_xyz(fp x, fp y, fp z) const
 		{ return local_coords::phi_of_xy(x, y); }
 
-	// convert (rho,sigma) --> direction cosines (alpha,beta,gamma)
+	// convert (rho,sigma) --> direction cosines (xcos,ycos,zcos)
 	//                         with respect to the local coordinate system
-	void alpha_beta_gamma_of_rho_sigma(fp rho, fp sigma,
-					   fp& alpha, fp& beta, fp& gamma)
+	void xyzcos_of_rho_sigma(fp rho, fp sigma,
+				 fp& xcos, fp& ycos, fp& zcos)
 		const
-		{
-		local_coords::alpha_beta_gamma_of_nu_phi(rho,sigma,
-							 alpha,beta,gamma);
-		}
+		{ local_coords::xyzcos_of_nu_phi(rho,sigma, xcos,ycos,zcos); }
 
 	// partial (rho,sigma) / partial (x,y,z)
 	fp partial_rho_wrt_x(fp x, fp y, fp z) const
@@ -773,15 +766,12 @@ public:
 	fp sigma_of_xyz(fp x, fp y, fp z) const
 		{ return local_coords::phi_of_xy(x, y); }
 
-	// convert (rho,sigma) --> direction cosines (alpha,beta,gamma)
+	// convert (rho,sigma) --> direction cosines (xcos,ycos,zcos)
 	//                         with respect to the local coordinate system
-	void alpha_beta_gamma_of_rho_sigma(fp rho, fp sigma,
-					   fp& alpha, fp& beta, fp& gamma)
+	void xyzcos_of_rho_sigma(fp rho, fp sigma,
+				 fp& xcos, fp& ycos, fp& zcos)
 		const
-		{
-		local_coords::alpha_beta_gamma_of_mu_phi(rho,sigma,
-							 alpha,beta,gamma);
-		}
+		{ local_coords::xyzcos_of_mu_phi(rho,sigma, xcos,ycos,zcos); }
 
 	// partial (rho,sigma) / partial (x,y,z)
 	fp partial_rho_wrt_x(fp x, fp y, fp z) const { return 0.0; }