Use Ian's version of Kranc, which is found at

<git@github.com:ianhinder/Kranc.git>.

4 files changed, 17 insertions, 48 deletions

diff --git a/m/McLachlan_BSSN.m b/m/McLachlan_BSSN.m
index 18b9a13..25f7d12 100644
--- a/m/McLachlan_BSSN.m
+++ b/m/McLachlan_BSSN.m
@@ -140,12 +140,7 @@ Map [DefineTensor,
       e4phi, em4phi, ddetg, detgt, gtu, ddetgt, dgtu, ddgtu, Gtl, Gtlu, Gt,
       Rt, Rphi, gK,
       T00, T0, T, rho, S,
-      x, y, z, r,
-      Psi0re, Psi0im, Psi1re, Psi1im, Psi2re, Psi2im, Psi3re, Psi3im,
-      Psi4re, Psi4im,
-      er, eth, eph, mm1A, mm1L, mm1, mm2A, mm2B, mm2L, mm2,
-      ssA, ssB, ssC, ssL, ss, ss0, tt, ss0, kk, nn, kk0, nn0, mmre, mmim,
-      EE, BB}];
+      x, y, z, r}];
 
 (* NOTE: It seems as if Lie[.,.] did not take these tensor weights
    into account.  Presumably, CD[.,.] and CDt[.,.] don't do this either.  *)
@@ -841,8 +836,6 @@ RHSRadiativeBoundaryCalc =
   }
 };
 
-(* Note: We abuse the RHS variables, so that the state vector is not
-   overwritten *)
 enforceCalc =
 {
   Name -> BSSN <> "_enforce",
@@ -855,21 +848,9 @@ enforceCalc =
     
     trAt -> gtu[ua,ub] At[la,lb],
     
-    dot[At[la,lb]] -> At[la,lb] - (1/3) gt[la,lb] trAt,
+    At[la,lb] -> At[la,lb] - (1/3) gt[la,lb] trAt,
     
-    dot[alpha] -> Max[alpha, MinimumLapse]
-  }
-};
-
-(* Copy back the RHS variables *)
-enforce2Calc =
-{
-  Name -> BSSN <> "_enforce2",
-  Schedule -> {"IN MoL_PostStep AFTER " <> BSSN <> "_enforce BEFORE " <> BSSN <> "_SelectBoundConds"},
-  Equations -> 
-  {
-    At[la,lb] -> dot[At[la,lb]],
-    alpha -> dot[alpha]
+    alpha -> Max[alpha, MinimumLapse]
   }
 };
 
@@ -1030,8 +1011,11 @@ constraintsBoundaryCalc =
   Where -> BoundaryWithGhosts,
   Equations -> 
   {
-    H     -> 0,
-    M[la] -> 0
+    H       -> 0,
+    M[la]   -> 0,
+    cS      -> 0,
+    cXt[ua] -> 0,
+    cA      -> 0
   }
 };
 
@@ -1204,7 +1188,6 @@ calculations =
   RHSStaticBoundaryCalc,
   RHSRadiativeBoundaryCalc,
   enforceCalc,
-  enforce2Calc,
   boundaryCalc,
   convertToADMBaseCalc,
   convertToADMBaseDtLapseShiftCalc,
diff --git a/m/hydro.m b/m/hydro.m
index 1b90f22..280c3e8 100644
--- a/m/hydro.m
+++ b/m/hydro.m
@@ -132,8 +132,7 @@ con2primCalc =
     vel[ua] -> mom[ua] / mass,
     eps     -> ene / mass - (1/2) vel[ua] vel[la],
     
-    press   -> Gamma rho eps +
-               alpha PD[vel[ua],la]
+    press   -> Gamma rho eps
   }
 };
 
diff --git a/m/prototype/ML_BSSN_Helper/schedule.ccl b/m/prototype/ML_BSSN_Helper/schedule.ccl
index 6b6c4e8..d4609f9 100644
--- a/m/prototype/ML_BSSN_Helper/schedule.ccl
+++ b/m/prototype/ML_BSSN_Helper/schedule.ccl
@@ -56,20 +56,6 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
   
   
   
-  SCHEDULE GROUP ML_BSSN_InitEta AT initial
-  {
-  } "Initialize BetaDriver"
-  
-  SCHEDULE GROUP ML_BSSN_InitEta AT postregrid
-  {
-  } "Initialize BetaDriver"
-  
-  SCHEDULE GROUP ML_BSSN_InitEta AT post_recover_variables
-  {
-  } "Initialize BetaDriver"
-  
-  
-  
   #SCHEDULE GROUP ML_BSSN_evolCalcGroup AT postinitial AFTER MoL_PostStep
   #{
   #} "Calculate BSSN RHS"
@@ -154,8 +140,6 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
   {
     SCHEDULE GROUP ML_BSSN_convertToADMBaseGroupWrapper AT analysis BEFORE (ADMBase_SetADMVars Whisky_PostStep)
     {
-      TRIGGERS: ML_BSSN::ML_Ham
-      TRIGGERS: ML_BSSN::ML_mom
     } "Calculate ADM variables"
   }
 
@@ -179,5 +163,8 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
   {
     TRIGGERS: ML_BSSN::ML_Ham
     TRIGGERS: ML_BSSN::ML_mom
+    TRIGGERS: ML_BSSN::ML_cons_detg
+    TRIGGERS: ML_BSSN::ML_cons_Gamma
+    TRIGGERS: ML_BSSN::ML_cons_traceA
   } "Calculate BSSN constraints"
 }
diff --git a/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c b/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
index 0666c1b..4b24e56 100644
--- a/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
+++ b/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
@@ -29,15 +29,15 @@ ML_BSSN_SetGroupTags (void)
   set_group_tags (0, 0, 0, "ML_BSSN::ML_mom");
   
   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");
-  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_Gammarhs");
-  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_lapserhs");
   set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_log_confacrhs");
   set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_metricrhs");
-  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_shiftrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_Gammarhs");
   set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_trace_curvrhs");
   set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_curvrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_lapserhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_dtlapserhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_shiftrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_dtshiftrhs");
   
   return 0;
 }