Rename CMBSSNW and CMBSSNphi to CMW and CMphi.

They can be used with both BSSN and CCZ4 formulations.

1 files changed, 15 insertions, 15 deletions

diff --git a/m/McLachlan_BSSN.m b/m/McLachlan_BSSN.m
index 0ce97b7..fa8e79c 100644
--- a/m/McLachlan_BSSN.m
+++ b/m/McLachlan_BSSN.m
@@ -163,8 +163,8 @@ T11=eTxx; T12=eTxy; T22=eTyy; T13=eTxz; T23=eTyz; T33=eTzz;
 
 (* enum constants for conformalMethod; these must be consistent
    with the definition of the Cactus parameter conformalMethod *)
-CMBSSNphi = 0;
-CMBSSNW   = 1;
+CMphi = 0;
+CMW   = 1;
 
 detgExpr  = Det [MatrixOfComponents [g [la,lb]]];
 ddetgExpr[la_] =
@@ -236,7 +236,7 @@ initialCalc =
   ConditionalOnKeyword -> {"my_initial_data", "Minkowski"},
   Equations -> 
   {
-    phi       -> IfThen[conformalMethod==CMBSSNW, 1, 0],
+    phi       -> IfThen[conformalMethod==CMW, 1, 0],
     gt[la,lb] -> KD[la,lb],
     trK       -> 0,
     At[la,lb] -> 0,
@@ -292,8 +292,8 @@ convertFromADMBaseCalc =
     detg      -> detgExpr,
     gu[ua,ub] -> 1/detg detgExpr MatrixInverse [g[ua,ub]],
     
-    phi       -> IfThen[conformalMethod==CMBSSNW, detg^(-1/6), Log[detg]/12],
-    em4phi    -> IfThen[conformalMethod==CMBSSNW, phi^2, Exp[-4 phi]],
+    phi       -> IfThen[conformalMethod==CMW, detg^(-1/6), Log[detg]/12],
+    em4phi    -> IfThen[conformalMethod==CMW, phi^2, Exp[-4 phi]],
     gt[la,lb] -> em4phi g[la,lb],
     
     trK       -> gu[ua,ub] admK[la,lb],
@@ -392,7 +392,7 @@ convertToADMBaseCalc =
   Shorthands -> {e4phi},
   Equations -> 
   {
-    e4phi       -> IfThen[conformalMethod, 1/phi^2, Exp[4 phi]],
+    e4phi       -> IfThen[conformalMethod==CMW, 1/phi^2, Exp[4 phi]],
     admg[la,lb] -> e4phi gt[la,lb],
     admK[la,lb] -> e4phi At[la,lb] + (1/3) admg[la,lb] trK,
     admalpha    -> alpha,
@@ -557,7 +557,7 @@ evolCalc =
        used instead of Xt where no derivatives of Xt are taken *)
     Xtn[ui] -> gtu[uj,uk] Gt[ui,lj,lk],
 
-    e4phi       -> IfThen[conformalMethod==CMBSSNW, 1/phi^2, Exp[4 phi]],
+    e4phi       -> IfThen[conformalMethod==CMW, 1/phi^2, Exp[4 phi]],
     em4phi      -> 1 / e4phi,
     g[la,lb]    -> e4phi gt[la,lb],
     detg        -> detgExpr,
@@ -580,9 +580,9 @@ evolCalc =
                     + Gt[uk,lj,ll] Gtlu[li,lk,ul]
                     + Gt[uk,li,ll] Gtlu[lk,lj,ul]),
 
-    fac1 -> IfThen[conformalMethod==CMBSSNW, -1/(2 phi), 1],
+    fac1 -> IfThen[conformalMethod==CMW, -1/(2 phi), 1],
     cdphi[la] -> fac1 CDt[phi,la],
-    fac2 -> IfThen[conformalMethod==CMBSSNW, 1/(2 phi^2), 0],
+    fac2 -> IfThen[conformalMethod==CMW, 1/(2 phi^2), 0],
     cdphi2[la,lb] -> fac1 CDt[phi,la,lb] + fac2 CDt[phi,la] CDt[phi,lb],
 
     (* PRD 62, 044034 (2000), eqn. (15) *)
@@ -617,7 +617,7 @@ evolCalc =
     
     (* PRD 62, 044034 (2000), eqn. (10) *)
     (* PRD 67 084023 (2003), eqn. (16) and (23) *)
-    dot[phi]       -> IfThen[conformalMethod==CMBSSNW, 1/3 phi, -1/6]
+    dot[phi]       -> IfThen[conformalMethod==CMW, 1/3 phi, -1/6]
                       (alpha trK - PD[beta[ua],la]),
     
     (* PRD 62, 044034 (2000), eqn. (9) *)
@@ -912,7 +912,7 @@ RHSRadiativeBoundaryCalc =
     
     detgt      -> 1 (* detgtExpr *),
     gtu[ua,ub] -> 1/detgt detgtExpr MatrixInverse [gt[ua,ub]],
-    em4phi     -> IfThen[conformalMethod==CMBSSNW, phi^2, Exp[-4 phi]],
+    em4phi     -> IfThen[conformalMethod==CMW, phi^2, Exp[-4 phi]],
     gu[ua,ub]  -> em4phi gtu[ua,ub],
     
     nn[la] -> Euc[la,lb] normal[ub],
@@ -977,7 +977,7 @@ boundaryCalc =
   Where -> BoundaryWithGhosts,
   Equations -> 
   {
-    phi       -> IfThen[conformalMethod==CMBSSNW, 1, 0],
+    phi       -> IfThen[conformalMethod==CMW, 1, 0],
     gt[la,lb] -> KD[la,lb],
     trK       -> 0,
     At[la,lb] -> 0,
@@ -1023,7 +1023,7 @@ constraintsCalc =
        used instead of Xt where no derivatives of Xt are taken *)
     Xtn[ui] -> gtu[uj,uk] Gt[ui,lj,lk],
 
-    e4phi       -> IfThen[conformalMethod==CMBSSNW, 1/phi^2, Exp[4 phi]],
+    e4phi       -> IfThen[conformalMethod==CMW, 1/phi^2, Exp[4 phi]],
     em4phi      -> 1 / e4phi,
     g[la,lb]    -> e4phi gt[la,lb],
     detg        -> e4phi^3,
@@ -1066,9 +1066,9 @@ constraintsCalc =
                                    - PD[gt[la,lb],l1,l2] + PD[gt[l2,lb],l1,la]),
 *)
 
-    fac1 -> IfThen[conformalMethod==CMBSSNW, -1/(2 phi), 1],
+    fac1 -> IfThen[conformalMethod==CMW, -1/(2 phi), 1],
     cdphi[la] -> fac1 CDt[phi,la],
-    fac2 -> IfThen[conformalMethod==CMBSSNW, 1/(2 phi^2), 0],
+    fac2 -> IfThen[conformalMethod==CMW, 1/(2 phi^2), 0],
     cdphi2[la,lb] -> fac1 CDt[phi,la,lb] + fac2 CDt[phi,la] CDt[phi,lb],
 
     (* PRD 62, 044034 (2000), eqn. (15) *)