change storage for g_uu, K, K_uu, partial_d_ln_sqrt_g, partial_d_g_uu

from gridfn to "pseudo-gridfn" = stored only at a single grid point


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

2 files changed, 40 insertions, 70 deletions

diff --git a/src/gr/cg.hh b/src/gr/cg.hh
index 8403f7c..d2dd4a7 100644
--- a/src/gr/cg.hh
+++ b/src/gr/cg.hh
@@ -81,20 +81,6 @@
 #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(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(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)
@@ -114,27 +100,45 @@
 #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(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 H	p.gridfn(nominal_gfns::gfn__H, irho,isigma)
+
+//
+// pseudo-gridfns
+// (used only at a single grid point, not actually stored as gridfns)
+//
+fp g_uu_11;
+fp g_uu_12;
+fp g_uu_13;
+fp g_uu_22;
+fp g_uu_23;
+fp g_uu_33;
+fp K;
+fp K_uu_11;
+fp K_uu_12;
+fp K_uu_13;
+fp K_uu_22;
+fp K_uu_23;
+fp K_uu_33;
 
-#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)
+fp partial_d_ln_sqrt_g_1;
+fp partial_d_ln_sqrt_g_2;
+fp partial_d_ln_sqrt_g_3;
 
-#define H	p.gridfn(nominal_gfns::gfn__H, irho,isigma)
+fp partial_d_g_uu_111;
+fp partial_d_g_uu_112;
+fp partial_d_g_uu_113;
+fp partial_d_g_uu_122;
+fp partial_d_g_uu_123;
+fp partial_d_g_uu_133;
+fp partial_d_g_uu_211;
+fp partial_d_g_uu_212;
+fp partial_d_g_uu_213;
+fp partial_d_g_uu_222;
+fp partial_d_g_uu_223;
+fp partial_d_g_uu_233;
+fp partial_d_g_uu_311;
+fp partial_d_g_uu_312;
+fp partial_d_g_uu_313;
+fp partial_d_g_uu_322;
+fp partial_d_g_uu_323;
+fp partial_d_g_uu_333;
diff --git a/src/gr/gfn.hh b/src/gr/gfn.hh
index f1f597b..a6c1e11 100644
--- a/src/gr/gfn.hh
+++ b/src/gr/gfn.hh
@@ -47,19 +47,6 @@ enum	{
 	gfn__K_dd_22,
 	gfn__K_dd_23,
 	gfn__K_dd_33,
-	gfn__g_uu_11,
-	gfn__g_uu_12,
-	gfn__g_uu_13,
-	gfn__g_uu_22,
-	gfn__g_uu_23,
-	gfn__g_uu_33,
-	gfn__K,
-	gfn__K_uu_11,
-	gfn__K_uu_12,
-	gfn__K_uu_13,
-	gfn__K_uu_22,
-	gfn__K_uu_23,
-	gfn__K_uu_33,
 	gfn__partial_d_g_dd_111,
 	gfn__partial_d_g_dd_112,
 	gfn__partial_d_g_dd_113,
@@ -78,27 +65,6 @@ enum	{
 	gfn__partial_d_g_dd_322,
 	gfn__partial_d_g_dd_323,
 	gfn__partial_d_g_dd_333,
-	gfn__partial_d_ln_sqrt_g_1,
-	gfn__partial_d_ln_sqrt_g_2,
-	gfn__partial_d_ln_sqrt_g_3,
-	gfn__partial_d_g_uu_111,
-	gfn__partial_d_g_uu_112,
-	gfn__partial_d_g_uu_113,
-	gfn__partial_d_g_uu_122,
-	gfn__partial_d_g_uu_123,
-	gfn__partial_d_g_uu_133,
-	gfn__partial_d_g_uu_211,
-	gfn__partial_d_g_uu_212,
-	gfn__partial_d_g_uu_213,
-	gfn__partial_d_g_uu_222,
-	gfn__partial_d_g_uu_223,
-	gfn__partial_d_g_uu_233,
-	gfn__partial_d_g_uu_311,
-	gfn__partial_d_g_uu_312,
-	gfn__partial_d_g_uu_313,
-	gfn__partial_d_g_uu_322,
-	gfn__partial_d_g_uu_323,
-	gfn__partial_d_g_uu_333,
 	gfn__H,
 	max_gfn = gfn__H
 	};