Make eta (the Gamma driver damping parameter) a local variable only, not a grid function

2 files changed, 11 insertions, 33 deletions

diff --git a/m/McLachlan_BSSN.m b/m/McLachlan_BSSN.m
index bb1f094..99fa876 100644
--- a/m/McLachlan_BSSN.m
+++ b/m/McLachlan_BSSN.m
@@ -140,7 +140,7 @@ Map [DefineTensor,
       e4phi, em4phi, ddetg, detgt, gtu, ddetgt, dgtu, ddgtu, Gtl, Gtlu, Gt,
       Rt, Rphi, gK,
       T00, T0, T, rho, S,
-      eta, x, y, z, r,
+      x, y, z, r,
       Psi0re, Psi0im, Psi1re, Psi1im, Psi2re, Psi2im, Psi3re, Psi3im,
       Psi4re, Psi4im,
       er, eth, eph, mm1A, mm1L, mm1, mm2A, mm2B, mm2L, mm2,
@@ -220,8 +220,7 @@ evolvedGroups =
    SetGroupName [CreateGroupFromTensor [alpha    ], prefix <> "lapse"     ],
    SetGroupName [CreateGroupFromTensor [A        ], prefix <> "dtlapse"   ],
    SetGroupName [CreateGroupFromTensor [beta[ua] ], prefix <> "shift"     ],
-   SetGroupName [CreateGroupFromTensor [B[ua]    ], prefix <> "dtshift"   ],
-   SetGroupName [CreateGroupFromTensor [eta      ], prefix <> "BetaDriver"]};
+   SetGroupName [CreateGroupFromTensor [B[ua]    ], prefix <> "dtshift"   ]};
 evaluatedGroups =
   {SetGroupName [CreateGroupFromTensor [H      ], prefix <> "Ham"],
    SetGroupName [CreateGroupFromTensor [M[la]  ], prefix <> "mom"],
@@ -361,29 +360,6 @@ convertFromADMBaseGammaCalc =
   }
 };
 
-setBetaDriverConstantCalc =
-{
-  Name -> BSSN <> "_setBetaDriverConstant",
-  Schedule -> {"IN "<> BSSN <> "_InitEta"},
-  ConditionalOnKeyword -> {"UseSpatialBetaDriver", "no"},
-  Equations ->
-  {
-    eta -> BetaDriver 
-  }
-};
-
-setBetaDriverSpatialCalc =
-{
-  Name -> BSSN <> "_setBetaDriverSpatial",
-  Schedule -> {"IN "<> BSSN <> "_InitEta"},
-  ConditionalOnKeyword -> {"UseSpatialBetaDriver", "yes"},
-  Equations ->
-  {
-    eta -> BetaDriver
-           IfThen [r > SpatialBetaDriverRadius, SpatialBetaDriverRadius / r, 1]
-  }
-};
-
 (******************************************************************************)
 (* Convert to ADMBase *)
 (******************************************************************************)
@@ -477,7 +453,7 @@ evolCalc =
                  Gt[ua,lb,lc], Xtn[ua], Rt[la,lb], Rphi[la,lb], R[la,lb],
                  Atm[ua,lb], Atu[ua,ub],
                  e4phi, em4phi, cdphi[la], cdphi2[la,lb], g[la,lb], detg,
-                 gu[ua,ub], G[ua,lb,lc], Ats[la,lb], trAts,
+                 gu[ua,ub], G[ua,lb,lc], Ats[la,lb], trAts, eta,
                  rho, S[la], trS, fac1, fac2},
   Equations -> 
   {
@@ -596,7 +572,10 @@ evolCalc =
                   + LapseAdvectionCoeff beta[ua] PDu[alpha,la],
 
     dot[A]     -> (1 - LapseAdvectionCoeff) (dot[trK] - AlphaDriver A),
-
+    
+    eta -> BetaDriver
+           IfThen [r > SpatialBetaDriverRadius, SpatialBetaDriverRadius / r, 1],
+    
     (* dot[beta[ua]] -> eta Xt[ua], *)
     (* dot[beta[ua]] -> ShiftGammaCoeff alpha^ShiftAlphaPower B[ua], *)
     dot[beta[ua]] -> + ShiftGammaCoeff B[ua]
@@ -623,7 +602,7 @@ evol1Calc =
                  detgt, gtu[ua,ub],
                  Gt[ua,lb,lc], Xtn[ua], Rt[la,lb], Rphi[la,lb], R[la,lb],
                  Atm[ua,lb], Atu[ua,ub],
-                 e4phi, em4phi, cdphi[la], cdphi2[la,lb], g[la,lb], detg,
+                 e4phi, em4phi, cdphi[la], cdphi2[la,lb], g[la,lb], detg, eta,
                  rho, S[la], trS, fac1, fac2},
   Equations -> 
   {
@@ -678,6 +657,9 @@ evol1Calc =
     (* Equation (4.28) in Baumgarte & Shapiro (Phys. Rept. 376 (2003) 41-131) *)
                       + addMatter (- 16 pi alpha gtu[ui,uj] S[lj]),
     
+    eta -> BetaDriver
+           IfThen [r > SpatialBetaDriverRadius, SpatialBetaDriverRadius / r, 1],
+    
     (* dot[beta[ua]] -> eta Xt[ua], *)
     (* dot[beta[ua]] -> ShiftGammaCoeff alpha^ShiftAlphaPower B[ua], *)
     dot[beta[ua]] -> + ShiftGammaCoeff B[ua]
@@ -1217,8 +1199,6 @@ calculations =
   initialCalc,
   convertFromADMBaseCalc,
   convertFromADMBaseGammaCalc,
-  setBetaDriverConstantCalc,
-  setBetaDriverSpatialCalc,
   evolCalc,
   evol1Calc, evol2Calc,
   RHSStaticBoundaryCalc,
diff --git a/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c b/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
index 3113637..0666c1b 100644
--- a/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
+++ b/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
@@ -28,8 +28,6 @@ ML_BSSN_SetGroupTags (void)
   set_group_tags (0, 0, 0, "ML_BSSN::ML_Ham");
   set_group_tags (0, 0, 0, "ML_BSSN::ML_mom");
   
-  set_group_tags (0, 1, 0, "ML_BSSN::ML_BetaDriver");
-  
   int const checkpoint = rhs_timelevels > 1;
   set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_dtlapserhs");
   set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_dtshiftrhs");