Treate Tmunu variables as tensors, instead of accessing them via local helper scalars.

3 files changed, 14 insertions, 96 deletions

diff --git a/m/McLachlan_ADMConstraints.m b/m/McLachlan_ADMConstraints.m
index a3312a3..2ac7b6c 100644
--- a/m/McLachlan_ADMConstraints.m
+++ b/m/McLachlan_ADMConstraints.m
@@ -155,10 +155,10 @@ K11=kxx; K12=kxy; K22=kyy; K13=kxz; K23=kyz; K33=kzz;
 alpha=alp;
 beta1=betax; beta2=betay; beta3=betaz;
 
-Map [DefineTensor,
-     {eTtt,
-      eTtx, eTty, eTtz,
-      eTxx, eTxy, eTxz, eTyy, eTyz, eTzz}];
+(* Use the TmunuBase variable names *)
+T00=eTtt;
+T01=eTtx; T02=eTty; T03=eTtz;
+T11=eTxx; T12=eTxy; T22=eTyy; T13=eTxz; T23=eTyz; T33=eTzz;
 
 (******************************************************************************)
 (* Expressions *)
@@ -196,13 +196,13 @@ declaredGroupNames = Map [First, declaredGroups];
 
 
 extraGroups =
-  {{"ADMBase::metric",  {gxx, gxy, gxz, gyy, gyz, gzz}},
+  {{"Grid::coordinates", {x, y, z, r}},
+   {"ADMBase::metric",  {gxx, gxy, gxz, gyy, gyz, gzz}},
    {"ADMBase::curv",    {kxx, kxy, kxz, kyy, kyz, kzz}},
    {"ADMBase::lapse",   {alp}},
    {"ADMBase::dtlapse", {dtalp}},
    {"ADMBase::shift",   {betax, betay, betaz}},
    {"ADMBase::dtshift", {dtbetax, dtbetay, dtbetaz}},
-   {"Grid::coordinates", {x, y, z, r}},
    {"TmunuBase::stress_energy_scalar", {eTtt}},
    {"TmunuBase::stress_energy_vector", {eTtx, eTty, eTtz}},
    {"TmunuBase::stress_energy_tensor", {eTxx, eTxy, eTxz, eTyy, eTyz, eTzz}},
@@ -230,7 +230,7 @@ ADMConstraintsCalc =
   Where -> Interior,
   Shorthands -> {detg, gu[ua,ub], G[ua,lb,lc],
                  R[la,lb], trR, Km[la,lb], trK,
-                 T00, T0[la], T[la,lb], rho, S[la]},
+                 rho, S[la]},
   Equations -> 
   {
     detg -> detgExpr,
@@ -247,17 +247,6 @@ ADMConstraintsCalc =
 
     (* Matter terms *)
 
-    T00 -> eTtt,
-    T01 -> eTtx,
-    T02 -> eTty,
-    T03 -> eTtz,
-    T11 -> eTxx,
-    T12 -> eTxy,
-    T13 -> eTxz,
-    T22 -> eTyy,
-    T23 -> eTyz,
-    T33 -> eTzz,
-
     (* rho = n^a n^b T_ab *)
     rho -> 1/alpha^2 (T00 - 2 beta[ui] T0[li] + beta[ui] beta[uj] T[li,lj]),
 
diff --git a/m/McLachlan_ADMQuantities.m b/m/McLachlan_ADMQuantities.m
index fec1d56..932ed0c 100644
--- a/m/McLachlan_ADMQuantities.m
+++ b/m/McLachlan_ADMQuantities.m
@@ -132,15 +132,6 @@ Map [DefineTensor,
      {normal, tangentA, tangentB, dir,
       nn, nu, nlen, nlen2, su, vg,
       J, dJ,
-      (*
-      phi,
-      gt11, gt12, gt13, gt22, gt23, gt33,
-      Xt1, Xt2, Xt3,
-      trK,
-      At11, At12, At13, At22, At23, At33,
-      alpha,
-      beta1, beta2, beta3,
-      *)
       g, K, alpha, beta, detg, gu, G, R, trR, Km, trK,
       phi, gt, At, Xt, Xtn, alpha, A, beta, B, Atm, Atu, trA, Ats, trAts,
       ephi, detgt, gtu, ddetgt, dgtu, ddgtu, Gtl, Gtlu, Gt,
@@ -164,10 +155,10 @@ AssertSymmetricIncreasing [ddgtu[ua,ub,lc,ld], lc, ld];
 (* Use the CartGrid3D variable names *)
 x1=x; x2=y; x3=z;
 
-Map [DefineTensor,
-     {eTtt,
-      eTtx, eTty, eTtz,
-      eTxx, eTxy, eTxz, eTyy, eTyz, eTzz}];
+(* Use the TmunuBase variable names *)
+T00=eTtt;
+T01=eTtx; T02=eTty; T03=eTtz;
+T11=eTxx; T12=eTxy; T22=eTyy; T13=eTxz; T23=eTyz; T33=eTzz;
 
 (******************************************************************************)
 (* Expressions *)
@@ -202,7 +193,8 @@ declaredGroupNames = Map [First, declaredGroups];
 
 
 extraGroups =
-  {{"ADMBase::metric",   {gxx, gxy, gxz, gyy, gyz, gzz}},
+  {{"Grid::coordinates", {x, y, z, r}},
+   {"ADMBase::metric",   {gxx, gxy, gxz, gyy, gyz, gzz}},
    {"ADMBase::curv",     {kxx, kxy, kxz, kyy, kyz, kzz}},
    {"ADMBase::lapse",    {alp}},
    {"ADMBase::dtlapse",  {dtalp}},
@@ -218,7 +210,6 @@ extraGroups =
    {"TmunuBase::stress_energy_scalar", {eTtt}},
    {"TmunuBase::stress_energy_vector", {eTtx, eTty, eTtz}},
    {"TmunuBase::stress_energy_tensor", {eTxx, eTxy, eTxz, eTyy, eTyz, eTzz}},
-   {"Grid::coordinates", {x, y, z, r}},
    {"Coordinates::jacobian",  {J11, J12, J13, J21, J22, J23, J31, J32, J33}},
    {"Coordinates::jacobian2", {dJ111, dJ112, dJ113, dJ122, dJ123, dJ133,
                                dJ211, dJ212, dJ213, dJ222, dJ223, dJ233,
@@ -246,7 +237,7 @@ ADMQuantitiesCalc =
                  Xtn[ua], Rt[la,lb], trRt,
                  Atm[ua,lb],
                  ephi,
-                 T00, T0[la], T[la,lb], rho, S[la]},
+                 rho, S[la]},
   Equations -> 
   {
     detgt          -> 1 (* detgtExpr *),
@@ -279,17 +270,6 @@ ADMQuantitiesCalc =
 
     (* Matter terms *)
 
-    T00 -> eTtt,
-    T01 -> eTtx,
-    T02 -> eTty,
-    T03 -> eTtz,
-    T11 -> eTxx,
-    T12 -> eTxy,
-    T13 -> eTxz,
-    T22 -> eTyy,
-    T23 -> eTyz,
-    T33 -> eTzz,
-
     (* rho = n^a n^b T_ab *)
     rho -> addMatter
            1/alpha^2 (T00 - 2 beta[ui] T0[li] + beta[ui] beta[uj] T[li,lj]),
diff --git a/m/McLachlan_BSSN.m b/m/McLachlan_BSSN.m
index 4c31040..be448fe 100644
--- a/m/McLachlan_BSSN.m
+++ b/m/McLachlan_BSSN.m
@@ -532,19 +532,6 @@ evolCalc =
     
     (* Matter terms *)
     
-    (*
-    T00 -> addMatter eTtt,
-    T01 -> addMatter eTtx,
-    T02 -> addMatter eTty,
-    T03 -> addMatter eTtz,
-    T11 -> addMatter eTxx,
-    T12 -> addMatter eTxy,
-    T13 -> addMatter eTxz,
-    T22 -> addMatter eTyy,
-    T23 -> addMatter eTyz,
-    T33 -> addMatter eTzz,
-    *)
-    
     (* rho = n^a n^b T_ab *)
     rho -> addMatter
            (1/alpha^2 (T00 - 2 beta[ui] T0[li] + beta[ui] beta[uj] T[li,lj])),
@@ -661,18 +648,6 @@ evol1Calc =
     
     (* Matter terms *)
     
-    (*
-    T01 -> addMatter eTtx,
-    T02 -> addMatter eTty,
-    T03 -> addMatter eTtz,
-    T11 -> addMatter eTxx,
-    T12 -> addMatter eTxy,
-    T13 -> addMatter eTxz,
-    T22 -> addMatter eTyy,
-    T23 -> addMatter eTyz,
-    T33 -> addMatter eTzz,
-    *)
-    
     (* S_i = -p^a_i n^b T_ab, where p^a_i = delta^a_i + n^a n_i *)
     S[li] -> addMatter (-1/alpha (T0[li] - beta[uj] T[li,lj])),
     
@@ -786,19 +761,6 @@ evol2Calc =
     
     (* Matter terms *)
     
-    (*
-    T00 -> addMatter eTtt,
-    T01 -> addMatter eTtx,
-    T02 -> addMatter eTty,
-    T03 -> addMatter eTtz,
-    T11 -> addMatter eTxx,
-    T12 -> addMatter eTxy,
-    T13 -> addMatter eTxz,
-    T22 -> addMatter eTyy,
-    T23 -> addMatter eTyz,
-    T33 -> addMatter eTzz,
-    *)
-    
     (* rho = n^a n^b T_ab *)
     rho -> addMatter
            (1/alpha^2 (T00 - 2 beta[ui] T0[li] + beta[ui] beta[uj] T[li,lj])),
@@ -1045,19 +1007,6 @@ constraintsCalc =
     
     (* Matter terms *)
     
-    (*
-    T00 -> eTtt,
-    T01 -> eTtx,
-    T02 -> eTty,
-    T03 -> eTtz,
-    T11 -> eTxx,
-    T12 -> eTxy,
-    T13 -> eTxz,
-    T22 -> eTyy,
-    T23 -> eTyz,
-    T33 -> eTzz,
-    *)
-    
     (* rho = n^a n^b T_ab *)
     rho -> 1/alpha^2 (T00 - 2 beta[ui] T0[li] + beta[ui] beta[uj] T[li,lj]),