glue code to actually compute H(h)

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

1 files changed, 94 insertions, 92 deletions

diff --git a/src/gr/cg.hh b/src/gr/cg.hh
index 7cb9580..7061b8c 100644
--- a/src/gr/cg.hh
+++ b/src/gr/cg.hh
@@ -18,115 +18,117 @@
 // partial derivatives
 //
 #define PARTIAL_RHO(ghosted_gridfn_name)	\
-	p.partial_rho(gfn__ ## ghosted_gridfn_name, irho,isigma)
+  p.partial_rho(ghosted_gfns::gfn__ ## ghosted_gridfn_name, irho,isigma)
 #define PARTIAL_SIGMA(ghosted_gridfn_name)	\
-	p.partial_sigma(gfn__ ## ghosted_gridfn_name, irho,isigma)
+  p.partial_sigma(ghosted_gfns::gfn__ ## ghosted_gridfn_name, irho,isigma)
 #define PARTIAL_RHO_RHO(ghosted_gridfn_name)	\
-	p.partial_rho_rho(gfn__ ## ghosted_gridfn_name, irho,isigma)
+  p.partial_rho_rho(ghosted_gfns::gfn__ ## ghosted_gridfn_name, irho,isigma)
 #define PARTIAL_RHO_SIGMA(ghosted_gridfn_name)	\
-	p.partial_rho_sigma(gfn__ ## ghosted_gridfn_name, irho,isigma)
+  p.partial_rho_sigma(ghosted_gfns::gfn__ ## ghosted_gridfn_name, irho,isigma)
 #define PARTIAL_SIGMA_SIGMA(ghosted_gridfn_name)	\
-	p.partial_sigma_sigma(gfn__ ## ghosted_gridfn_name, irho,isigma)
+  p.partial_sigma_sigma(ghosted_gfns::gfn__ ## ghosted_gridfn_name, irho,isigma)
 
 //
 // ghosted-grid gridfns
+// n.b. since we're always evaluating on the surface, r == h
 //
-#define h			p.ghosted_gridfn(gfn__h, irho,isigma)
+#define h	p.ghosted_gridfn(ghosted_gfns::gfn__h, irho,isigma)
+#define r	h
 
 //
 // nominal-grid gridfns
 //
-#define xx			p.gridfn(gfn__xx, irho,isigma)
-#define yy			p.gridfn(gfn__yy, irho,isigma)
-#define zz			p.gridfn(gfn__zz, irho,isigma)
+#define xx	p.gridfn(nominal_gfns::gfn__xx, irho,isigma)
+#define yy	p.gridfn(nominal_gfns::gfn__yy, irho,isigma)
+#define zz	p.gridfn(nominal_gfns::gfn__zz, irho,isigma)
 
-#define X_ud_11			p.gridfn(gfn__X_ud_11, irho,isigma)
-#define X_ud_12			p.gridfn(gfn__X_ud_12, irho,isigma)
-#define X_ud_13			p.gridfn(gfn__X_ud_13, irho,isigma)
-#define X_ud_21			p.gridfn(gfn__X_ud_21, irho,isigma)
-#define X_ud_22			p.gridfn(gfn__X_ud_22, irho,isigma)
-#define X_ud_23			p.gridfn(gfn__X_ud_23, irho,isigma)
+#define X_ud_11	p.gridfn(nominal_gfns::gfn__X_ud_11, irho,isigma)
+#define X_ud_12	p.gridfn(nominal_gfns::gfn__X_ud_12, irho,isigma)
+#define X_ud_13	p.gridfn(nominal_gfns::gfn__X_ud_13, irho,isigma)
+#define X_ud_21	p.gridfn(nominal_gfns::gfn__X_ud_21, irho,isigma)
+#define X_ud_22	p.gridfn(nominal_gfns::gfn__X_ud_22, irho,isigma)
+#define X_ud_23	p.gridfn(nominal_gfns::gfn__X_ud_23, irho,isigma)
 
-#define X_udd_111		p.gridfn(gfn__X_udd_111, irho,isigma)
-#define X_udd_112		p.gridfn(gfn__X_udd_112, irho,isigma)
-#define X_udd_113		p.gridfn(gfn__X_udd_113, irho,isigma)
-#define X_udd_122		p.gridfn(gfn__X_udd_122, irho,isigma)
-#define X_udd_123		p.gridfn(gfn__X_udd_123, irho,isigma)
-#define X_udd_133		p.gridfn(gfn__X_udd_133, irho,isigma)
-#define X_udd_211		p.gridfn(gfn__X_udd_211, irho,isigma)
-#define X_udd_212		p.gridfn(gfn__X_udd_212, irho,isigma)
-#define X_udd_213		p.gridfn(gfn__X_udd_213, irho,isigma)
-#define X_udd_222		p.gridfn(gfn__X_udd_222, irho,isigma)
-#define X_udd_223		p.gridfn(gfn__X_udd_223, irho,isigma)
-#define X_udd_233		p.gridfn(gfn__X_udd_233, irho,isigma)
+#define X_udd_111	p.gridfn(nominal_gfns::gfn__X_udd_111, irho,isigma)
+#define X_udd_112	p.gridfn(nominal_gfns::gfn__X_udd_112, irho,isigma)
+#define X_udd_113	p.gridfn(nominal_gfns::gfn__X_udd_113, irho,isigma)
+#define X_udd_122	p.gridfn(nominal_gfns::gfn__X_udd_122, irho,isigma)
+#define X_udd_123	p.gridfn(nominal_gfns::gfn__X_udd_123, irho,isigma)
+#define X_udd_133	p.gridfn(nominal_gfns::gfn__X_udd_133, irho,isigma)
+#define X_udd_211	p.gridfn(nominal_gfns::gfn__X_udd_211, irho,isigma)
+#define X_udd_212	p.gridfn(nominal_gfns::gfn__X_udd_212, irho,isigma)
+#define X_udd_213	p.gridfn(nominal_gfns::gfn__X_udd_213, irho,isigma)
+#define X_udd_222	p.gridfn(nominal_gfns::gfn__X_udd_222, irho,isigma)
+#define X_udd_223	p.gridfn(nominal_gfns::gfn__X_udd_223, irho,isigma)
+#define X_udd_233	p.gridfn(nominal_gfns::gfn__X_udd_233, irho,isigma)
 
-#define g_dd_11			p.gridfn(gfn__g_dd_11, irho,isigma)
-#define g_dd_12			p.gridfn(gfn__g_dd_12, irho,isigma)
-#define g_dd_13			p.gridfn(gfn__g_dd_13, irho,isigma)
-#define g_dd_22			p.gridfn(gfn__g_dd_22, irho,isigma)
-#define g_dd_23			p.gridfn(gfn__g_dd_23, irho,isigma)
-#define g_dd_33			p.gridfn(gfn__g_dd_33, irho,isigma)
-#define K_dd_11			p.gridfn(gfn__K_dd_11, irho,isigma)
-#define K_dd_12			p.gridfn(gfn__K_dd_12, irho,isigma)
-#define K_dd_13			p.gridfn(gfn__K_dd_13, irho,isigma)
-#define K_dd_22			p.gridfn(gfn__K_dd_22, irho,isigma)
-#define K_dd_23			p.gridfn(gfn__K_dd_23, irho,isigma)
-#define K_dd_33			p.gridfn(gfn__K_dd_33, irho,isigma)
+#define g_dd_11	p.gridfn(nominal_gfns::gfn__g_dd_11, irho,isigma)
+#define g_dd_12	p.gridfn(nominal_gfns::gfn__g_dd_12, irho,isigma)
+#define g_dd_13	p.gridfn(nominal_gfns::gfn__g_dd_13, irho,isigma)
+#define g_dd_22	p.gridfn(nominal_gfns::gfn__g_dd_22, irho,isigma)
+#define g_dd_23	p.gridfn(nominal_gfns::gfn__g_dd_23, irho,isigma)
+#define g_dd_33	p.gridfn(nominal_gfns::gfn__g_dd_33, irho,isigma)
+#define K_dd_11	p.gridfn(nominal_gfns::gfn__K_dd_11, irho,isigma)
+#define K_dd_12	p.gridfn(nominal_gfns::gfn__K_dd_12, irho,isigma)
+#define K_dd_13	p.gridfn(nominal_gfns::gfn__K_dd_13, irho,isigma)
+#define K_dd_22	p.gridfn(nominal_gfns::gfn__K_dd_22, irho,isigma)
+#define K_dd_23	p.gridfn(nominal_gfns::gfn__K_dd_23, irho,isigma)
+#define K_dd_33	p.gridfn(nominal_gfns::gfn__K_dd_33, irho,isigma)
 
-#define g_uu_11			p.gridfn(gfn__g_uu_11, irho,isigma)
-#define g_uu_12			p.gridfn(gfn__g_uu_12, irho,isigma)
-#define g_uu_13			p.gridfn(gfn__g_uu_13, irho,isigma)
-#define g_uu_22			p.gridfn(gfn__g_uu_22, irho,isigma)
-#define g_uu_23			p.gridfn(gfn__g_uu_23, irho,isigma)
-#define g_uu_33			p.gridfn(gfn__g_uu_33, irho,isigma)
-#define K_uu_11			p.gridfn(gfn__K_uu_11, irho,isigma)
-#define K_uu_12			p.gridfn(gfn__K_uu_12, irho,isigma)
-#define K_uu_13			p.gridfn(gfn__K_uu_13, irho,isigma)
-#define K_uu_22			p.gridfn(gfn__K_uu_22, irho,isigma)
-#define K_uu_23			p.gridfn(gfn__K_uu_23, irho,isigma)
-#define K_uu_33			p.gridfn(gfn__K_uu_33, irho,isigma)
-#define K			p.gridfn(gfn__K, irho,isigma)
+#define g_uu_11	p.gridfn(nominal_gfns::gfn__g_uu_11, irho,isigma)
+#define g_uu_12	p.gridfn(nominal_gfns::gfn__g_uu_12, irho,isigma)
+#define g_uu_13	p.gridfn(nominal_gfns::gfn__g_uu_13, irho,isigma)
+#define g_uu_22	p.gridfn(nominal_gfns::gfn__g_uu_22, irho,isigma)
+#define g_uu_23	p.gridfn(nominal_gfns::gfn__g_uu_23, irho,isigma)
+#define g_uu_33	p.gridfn(nominal_gfns::gfn__g_uu_33, irho,isigma)
+#define K	p.gridfn(nominal_gfns::gfn__K, irho,isigma)
+#define K_uu_11	p.gridfn(nominal_gfns::gfn__K_uu_11, irho,isigma)
+#define K_uu_12	p.gridfn(nominal_gfns::gfn__K_uu_12, irho,isigma)
+#define K_uu_13	p.gridfn(nominal_gfns::gfn__K_uu_13, irho,isigma)
+#define K_uu_22	p.gridfn(nominal_gfns::gfn__K_uu_22, irho,isigma)
+#define K_uu_23	p.gridfn(nominal_gfns::gfn__K_uu_23, irho,isigma)
+#define K_uu_33	p.gridfn(nominal_gfns::gfn__K_uu_33, irho,isigma)
 
-#define partial_d_g_dd_111	p.gridfn(gfn__partial_d_g_dd_111, irho,isigma)
-#define partial_d_g_dd_112	p.gridfn(gfn__partial_d_g_dd_112, irho,isigma)
-#define partial_d_g_dd_113	p.gridfn(gfn__partial_d_g_dd_113, irho,isigma)
-#define partial_d_g_dd_122	p.gridfn(gfn__partial_d_g_dd_122, irho,isigma)
-#define partial_d_g_dd_123	p.gridfn(gfn__partial_d_g_dd_123, irho,isigma)
-#define partial_d_g_dd_133	p.gridfn(gfn__partial_d_g_dd_133, irho,isigma)
-#define partial_d_g_dd_211	p.gridfn(gfn__partial_d_g_dd_211, irho,isigma)
-#define partial_d_g_dd_212	p.gridfn(gfn__partial_d_g_dd_212, irho,isigma)
-#define partial_d_g_dd_213	p.gridfn(gfn__partial_d_g_dd_213, irho,isigma)
-#define partial_d_g_dd_222	p.gridfn(gfn__partial_d_g_dd_222, irho,isigma)
-#define partial_d_g_dd_223	p.gridfn(gfn__partial_d_g_dd_223, irho,isigma)
-#define partial_d_g_dd_233	p.gridfn(gfn__partial_d_g_dd_233, irho,isigma)
-#define partial_d_g_dd_311	p.gridfn(gfn__partial_d_g_dd_311, irho,isigma)
-#define partial_d_g_dd_312	p.gridfn(gfn__partial_d_g_dd_312, irho,isigma)
-#define partial_d_g_dd_313	p.gridfn(gfn__partial_d_g_dd_313, irho,isigma)
-#define partial_d_g_dd_322	p.gridfn(gfn__partial_d_g_dd_322, irho,isigma)
-#define partial_d_g_dd_323	p.gridfn(gfn__partial_d_g_dd_323, irho,isigma)
-#define partial_d_g_dd_333	p.gridfn(gfn__partial_d_g_dd_333, irho,isigma)
+#define partial_d_g_dd_111	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_111, irho,isigma)
+#define partial_d_g_dd_112	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_112, irho,isigma)
+#define partial_d_g_dd_113	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_113, irho,isigma)
+#define partial_d_g_dd_122	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_122, irho,isigma)
+#define partial_d_g_dd_123	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_123, irho,isigma)
+#define partial_d_g_dd_133	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_133, irho,isigma)
+#define partial_d_g_dd_211	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_211, irho,isigma)
+#define partial_d_g_dd_212	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_212, irho,isigma)
+#define partial_d_g_dd_213	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_213, irho,isigma)
+#define partial_d_g_dd_222	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_222, irho,isigma)
+#define partial_d_g_dd_223	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_223, irho,isigma)
+#define partial_d_g_dd_233	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_233, irho,isigma)
+#define partial_d_g_dd_311	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_311, irho,isigma)
+#define partial_d_g_dd_312	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_312, irho,isigma)
+#define partial_d_g_dd_313	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_313, irho,isigma)
+#define partial_d_g_dd_322	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_322, irho,isigma)
+#define partial_d_g_dd_323	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_323, irho,isigma)
+#define partial_d_g_dd_333	p.gridfn(nominal_gfns::gfn__partial_d_g_dd_333, irho,isigma)
 
-#define partial_d_ln_sqrt_g_1	p.gridfn(gfn__partial_d_ln_sqrt_g_1, irho,isigma)
-#define partial_d_ln_sqrt_g_2	p.gridfn(gfn__partial_d_ln_sqrt_g_2, irho,isigma)
-#define partial_d_ln_sqrt_g_3	p.gridfn(gfn__partial_d_ln_sqrt_g_3, irho,isigma)
+#define partial_d_ln_sqrt_g_1	p.gridfn(nominal_gfns::gfn__partial_d_ln_sqrt_g_1, irho,isigma)
+#define partial_d_ln_sqrt_g_2	p.gridfn(nominal_gfns::gfn__partial_d_ln_sqrt_g_2, irho,isigma)
+#define partial_d_ln_sqrt_g_3	p.gridfn(nominal_gfns::gfn__partial_d_ln_sqrt_g_3, irho,isigma)
 
-#define partial_d_g_uu_111	p.gridfn(gfn__partial_d_g_uu_111, irho,isigma)
-#define partial_d_g_uu_112	p.gridfn(gfn__partial_d_g_uu_112, irho,isigma)
-#define partial_d_g_uu_113	p.gridfn(gfn__partial_d_g_uu_113, irho,isigma)
-#define partial_d_g_uu_122	p.gridfn(gfn__partial_d_g_uu_122, irho,isigma)
-#define partial_d_g_uu_123	p.gridfn(gfn__partial_d_g_uu_123, irho,isigma)
-#define partial_d_g_uu_133	p.gridfn(gfn__partial_d_g_uu_133, irho,isigma)
-#define partial_d_g_uu_211	p.gridfn(gfn__partial_d_g_uu_211, irho,isigma)
-#define partial_d_g_uu_212	p.gridfn(gfn__partial_d_g_uu_212, irho,isigma)
-#define partial_d_g_uu_213	p.gridfn(gfn__partial_d_g_uu_213, irho,isigma)
-#define partial_d_g_uu_222	p.gridfn(gfn__partial_d_g_uu_222, irho,isigma)
-#define partial_d_g_uu_223	p.gridfn(gfn__partial_d_g_uu_223, irho,isigma)
-#define partial_d_g_uu_233	p.gridfn(gfn__partial_d_g_uu_233, irho,isigma)
-#define partial_d_g_uu_311	p.gridfn(gfn__partial_d_g_uu_311, irho,isigma)
-#define partial_d_g_uu_312	p.gridfn(gfn__partial_d_g_uu_312, irho,isigma)
-#define partial_d_g_uu_313	p.gridfn(gfn__partial_d_g_uu_313, irho,isigma)
-#define partial_d_g_uu_322	p.gridfn(gfn__partial_d_g_uu_322, irho,isigma)
-#define partial_d_g_uu_323	p.gridfn(gfn__partial_d_g_uu_323, irho,isigma)
-#define partial_d_g_uu_333	p.gridfn(gfn__partial_d_g_uu_333, irho,isigma)
+#define partial_d_g_uu_111	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_111, irho,isigma)
+#define partial_d_g_uu_112	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_112, irho,isigma)
+#define partial_d_g_uu_113	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_113, irho,isigma)
+#define partial_d_g_uu_122	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_122, irho,isigma)
+#define partial_d_g_uu_123	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_123, irho,isigma)
+#define partial_d_g_uu_133	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_133, irho,isigma)
+#define partial_d_g_uu_211	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_211, irho,isigma)
+#define partial_d_g_uu_212	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_212, irho,isigma)
+#define partial_d_g_uu_213	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_213, irho,isigma)
+#define partial_d_g_uu_222	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_222, irho,isigma)
+#define partial_d_g_uu_223	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_223, irho,isigma)
+#define partial_d_g_uu_233	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_233, irho,isigma)
+#define partial_d_g_uu_311	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_311, irho,isigma)
+#define partial_d_g_uu_312	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_312, irho,isigma)
+#define partial_d_g_uu_313	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_313, irho,isigma)
+#define partial_d_g_uu_322	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_322, irho,isigma)
+#define partial_d_g_uu_323	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_323, irho,isigma)
+#define partial_d_g_uu_333	p.gridfn(nominal_gfns::gfn__partial_d_g_uu_333, irho,isigma)
 
-#define H			p.gridfn(gfn__H, irho,isigma)
+#define H	p.gridfn(nominal_gfns::gfn__H, irho,isigma)