Merge with Erik's latest changes.

Signed-off-by: Peter Diener <diener@linux-hn3d.site>

18 files changed, 310 insertions, 453 deletions

diff --git a/ML_BSSN/src/Boundaries.c b/ML_BSSN/src/Boundaries.c
index ded5d44..c4b99c3 100644
--- a/ML_BSSN/src/Boundaries.c
+++ b/ML_BSSN/src/Boundaries.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
@@ -28,7 +25,7 @@ void ML_BSSN_CheckBoundaries(CCTK_ARGUMENTS)
   return;
 }
 
-void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
+void ML_BSSN_SelectBoundConds(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -411,7 +408,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_curv_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_curv_bound = -1;
     if (handle_ML_curv_bound < 0) handle_ML_curv_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_curv_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -430,7 +427,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_dtlapse_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_dtlapse_bound = -1;
     if (handle_ML_dtlapse_bound < 0) handle_ML_dtlapse_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_dtlapse_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -449,7 +446,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_dtshift_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_dtshift_bound = -1;
     if (handle_ML_dtshift_bound < 0) handle_ML_dtshift_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_dtshift_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -468,7 +465,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_Gamma_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_Gamma_bound = -1;
     if (handle_ML_Gamma_bound < 0) handle_ML_Gamma_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_Gamma_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -487,7 +484,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_lapse_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_lapse_bound = -1;
     if (handle_ML_lapse_bound < 0) handle_ML_lapse_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_lapse_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -506,7 +503,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_log_confac_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_log_confac_bound = -1;
     if (handle_ML_log_confac_bound < 0) handle_ML_log_confac_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_log_confac_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -525,7 +522,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_metric_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_metric_bound = -1;
     if (handle_ML_metric_bound < 0) handle_ML_metric_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_metric_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -544,7 +541,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_shift_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_shift_bound = -1;
     if (handle_ML_shift_bound < 0) handle_ML_shift_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_shift_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -563,7 +560,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_trace_curv_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_ML_trace_curv_bound = -1;
     if (handle_ML_trace_curv_bound < 0) handle_ML_trace_curv_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_trace_curv_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -582,7 +579,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At11_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_At11_bound = -1;
     if (handle_At11_bound < 0) handle_At11_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At11_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -601,7 +598,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At12_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_At12_bound = -1;
     if (handle_At12_bound < 0) handle_At12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At12_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -620,7 +617,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At13_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_At13_bound = -1;
     if (handle_At13_bound < 0) handle_At13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At13_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -639,7 +636,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At22_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_At22_bound = -1;
     if (handle_At22_bound < 0) handle_At22_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At22_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -658,7 +655,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At23_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_At23_bound = -1;
     if (handle_At23_bound < 0) handle_At23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At23_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -677,7 +674,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At33_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_At33_bound = -1;
     if (handle_At33_bound < 0) handle_At33_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At33_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -696,7 +693,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(A_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_A_bound = -1;
     if (handle_A_bound < 0) handle_A_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_A_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -715,7 +712,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(B1_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_B1_bound = -1;
     if (handle_B1_bound < 0) handle_B1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_B1_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -734,7 +731,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(B2_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_B2_bound = -1;
     if (handle_B2_bound < 0) handle_B2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_B2_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -753,7 +750,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(B3_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_B3_bound = -1;
     if (handle_B3_bound < 0) handle_B3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_B3_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -772,7 +769,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(Xt1_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_Xt1_bound = -1;
     if (handle_Xt1_bound < 0) handle_Xt1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_Xt1_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -791,7 +788,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(Xt2_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_Xt2_bound = -1;
     if (handle_Xt2_bound < 0) handle_Xt2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_Xt2_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -810,7 +807,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(Xt3_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_Xt3_bound = -1;
     if (handle_Xt3_bound < 0) handle_Xt3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_Xt3_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -829,7 +826,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(alpha_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_alpha_bound = -1;
     if (handle_alpha_bound < 0) handle_alpha_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_alpha_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -848,7 +845,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(phi_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_phi_bound = -1;
     if (handle_phi_bound < 0) handle_phi_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_phi_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -867,7 +864,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt11_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_gt11_bound = -1;
     if (handle_gt11_bound < 0) handle_gt11_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt11_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -886,7 +883,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt12_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_gt12_bound = -1;
     if (handle_gt12_bound < 0) handle_gt12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt12_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -905,7 +902,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt13_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_gt13_bound = -1;
     if (handle_gt13_bound < 0) handle_gt13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt13_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -924,7 +921,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt22_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_gt22_bound = -1;
     if (handle_gt22_bound < 0) handle_gt22_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt22_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -943,7 +940,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt23_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_gt23_bound = -1;
     if (handle_gt23_bound < 0) handle_gt23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt23_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -962,7 +959,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt33_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_gt33_bound = -1;
     if (handle_gt33_bound < 0) handle_gt33_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt33_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -981,7 +978,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(beta1_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_beta1_bound = -1;
     if (handle_beta1_bound < 0) handle_beta1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_beta1_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1000,7 +997,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(beta2_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_beta2_bound = -1;
     if (handle_beta2_bound < 0) handle_beta2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_beta2_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1019,7 +1016,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(beta3_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_beta3_bound = -1;
     if (handle_beta3_bound < 0) handle_beta3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_beta3_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1038,7 +1035,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(trK_bound, "radiative"))
   {
-   /* apply radiation boundary condition */
+   /* select radiation boundary condition */
     static CCTK_INT handle_trK_bound = -1;
     if (handle_trK_bound < 0) handle_trK_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_trK_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1057,7 +1054,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_curv_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_curv_bound = -1;
     if (handle_ML_curv_bound < 0) handle_ML_curv_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_curv_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1074,7 +1071,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_dtlapse_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_dtlapse_bound = -1;
     if (handle_ML_dtlapse_bound < 0) handle_ML_dtlapse_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_dtlapse_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1091,7 +1088,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_dtshift_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_dtshift_bound = -1;
     if (handle_ML_dtshift_bound < 0) handle_ML_dtshift_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_dtshift_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1108,7 +1105,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_Gamma_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_Gamma_bound = -1;
     if (handle_ML_Gamma_bound < 0) handle_ML_Gamma_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_Gamma_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1125,7 +1122,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_lapse_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_lapse_bound = -1;
     if (handle_ML_lapse_bound < 0) handle_ML_lapse_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_lapse_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1142,7 +1139,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_log_confac_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_log_confac_bound = -1;
     if (handle_ML_log_confac_bound < 0) handle_ML_log_confac_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_log_confac_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1159,7 +1156,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_metric_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_metric_bound = -1;
     if (handle_ML_metric_bound < 0) handle_ML_metric_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_metric_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1176,7 +1173,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_shift_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_shift_bound = -1;
     if (handle_ML_shift_bound < 0) handle_ML_shift_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_shift_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1193,7 +1190,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(ML_trace_curv_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_ML_trace_curv_bound = -1;
     if (handle_ML_trace_curv_bound < 0) handle_ML_trace_curv_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_ML_trace_curv_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1210,7 +1207,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At11_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_At11_bound = -1;
     if (handle_At11_bound < 0) handle_At11_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At11_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1227,7 +1224,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At12_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_At12_bound = -1;
     if (handle_At12_bound < 0) handle_At12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At12_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1244,7 +1241,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At13_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_At13_bound = -1;
     if (handle_At13_bound < 0) handle_At13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At13_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1261,7 +1258,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At22_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_At22_bound = -1;
     if (handle_At22_bound < 0) handle_At22_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At22_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1278,7 +1275,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At23_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_At23_bound = -1;
     if (handle_At23_bound < 0) handle_At23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At23_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1295,7 +1292,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(At33_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_At33_bound = -1;
     if (handle_At33_bound < 0) handle_At33_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_At33_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1312,7 +1309,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(A_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_A_bound = -1;
     if (handle_A_bound < 0) handle_A_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_A_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1329,7 +1326,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(B1_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_B1_bound = -1;
     if (handle_B1_bound < 0) handle_B1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_B1_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1346,7 +1343,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(B2_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_B2_bound = -1;
     if (handle_B2_bound < 0) handle_B2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_B2_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1363,7 +1360,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(B3_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_B3_bound = -1;
     if (handle_B3_bound < 0) handle_B3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_B3_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1380,7 +1377,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(Xt1_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_Xt1_bound = -1;
     if (handle_Xt1_bound < 0) handle_Xt1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_Xt1_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1397,7 +1394,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(Xt2_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_Xt2_bound = -1;
     if (handle_Xt2_bound < 0) handle_Xt2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_Xt2_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1414,7 +1411,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(Xt3_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_Xt3_bound = -1;
     if (handle_Xt3_bound < 0) handle_Xt3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_Xt3_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1431,7 +1428,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(alpha_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_alpha_bound = -1;
     if (handle_alpha_bound < 0) handle_alpha_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_alpha_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1448,7 +1445,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(phi_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_phi_bound = -1;
     if (handle_phi_bound < 0) handle_phi_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_phi_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1465,7 +1462,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt11_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_gt11_bound = -1;
     if (handle_gt11_bound < 0) handle_gt11_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt11_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1482,7 +1479,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt12_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_gt12_bound = -1;
     if (handle_gt12_bound < 0) handle_gt12_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt12_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1499,7 +1496,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt13_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_gt13_bound = -1;
     if (handle_gt13_bound < 0) handle_gt13_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt13_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1516,7 +1513,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt22_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_gt22_bound = -1;
     if (handle_gt22_bound < 0) handle_gt22_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt22_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1533,7 +1530,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt23_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_gt23_bound = -1;
     if (handle_gt23_bound < 0) handle_gt23_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt23_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1550,7 +1547,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(gt33_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_gt33_bound = -1;
     if (handle_gt33_bound < 0) handle_gt33_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_gt33_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1567,7 +1564,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(beta1_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_beta1_bound = -1;
     if (handle_beta1_bound < 0) handle_beta1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_beta1_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1584,7 +1581,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(beta2_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_beta2_bound = -1;
     if (handle_beta2_bound < 0) handle_beta2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_beta2_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1601,7 +1598,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(beta3_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_beta3_bound = -1;
     if (handle_beta3_bound < 0) handle_beta3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_beta3_bound < 0) CCTK_WARN(0, "could not create table!");
@@ -1618,7 +1615,7 @@ void ML_BSSN_ApplyBoundConds(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(trK_bound, "scalar"))
   {
-   /* apply scalar boundary condition */
+   /* select scalar boundary condition */
     static CCTK_INT handle_trK_bound = -1;
     if (handle_trK_bound < 0) handle_trK_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
     if (handle_trK_bound < 0) CCTK_WARN(0, "could not create table!");
diff --git a/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c b/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
index 6d4915c..d33ed61 100644
--- a/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
+++ b/ML_BSSN/src/ML_BSSN_ADMBaseBoundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_Minkowski.c b/ML_BSSN/src/ML_BSSN_Minkowski.c
index 183aa44..75df735 100644
--- a/ML_BSSN/src/ML_BSSN_Minkowski.c
+++ b/ML_BSSN/src/ML_BSSN_Minkowski.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_RHS.c b/ML_BSSN/src/ML_BSSN_RHS.c
index e2da913..d788aa5 100644
--- a/ML_BSSN/src/ML_BSSN_RHS.c
+++ b/ML_BSSN/src/ML_BSSN_RHS.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_RHSBoundary.c b/ML_BSSN/src/ML_BSSN_RHSBoundary.c
deleted file mode 100644
index 5d52f91..0000000
--- a/ML_BSSN/src/ML_BSSN_RHSBoundary.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
-
-#define KRANC_C
-
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
-#include "GenericFD.h"
-#include "Differencing.h"
-#include "loopcontrol.h"
-
-/* Define macros used in calculations */
-#define INITVALUE  (42)
-#define INV(x) ((1.0) / (x))
-#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
-#define QAD(x) ((x) * (x) * (x) * (x))
-
-void ML_BSSN_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* Declare finite differencing variables */
-  CCTK_REAL dx = INITVALUE, dy = INITVALUE, dz = INITVALUE;
-  CCTK_REAL dxi = INITVALUE, dyi = INITVALUE, dzi = INITVALUE;
-  CCTK_REAL khalf = INITVALUE, kthird = INITVALUE, ktwothird = INITVALUE, kfourthird = INITVALUE, keightthird = INITVALUE;
-  CCTK_REAL hdxi = INITVALUE, hdyi = INITVALUE, hdzi = INITVALUE;
-  
-  
-  /* Declare predefined quantities */
-  CCTK_REAL p1o12dx = INITVALUE;
-  CCTK_REAL p1o12dy = INITVALUE;
-  CCTK_REAL p1o12dz = INITVALUE;
-  CCTK_REAL p1o144dxdy = INITVALUE;
-  CCTK_REAL p1o144dxdz = INITVALUE;
-  CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1odx = INITVALUE;
-  CCTK_REAL p1ody = INITVALUE;
-  CCTK_REAL p1odz = INITVALUE;
-  CCTK_REAL pm1o12dx2 = INITVALUE;
-  CCTK_REAL pm1o12dy2 = INITVALUE;
-  CCTK_REAL pm1o12dz2 = INITVALUE;
-  
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_RHSBoundary_Body");
-  }
-  
-  if (cctk_iteration % ML_BSSN_RHSBoundary_calc_every != ML_BSSN_RHSBoundary_calc_offset)
-  {
-    return;
-  }
-  
-  /* Include user-supplied include files */
-  
-  /* Initialise finite differencing variables */
-  dx = CCTK_DELTA_SPACE(0);
-  dy = CCTK_DELTA_SPACE(1);
-  dz = CCTK_DELTA_SPACE(2);
-  dxi = 1.0 / dx;
-  dyi = 1.0 / dy;
-  dzi = 1.0 / dz;
-  khalf = 0.5;
-  kthird = 1/3.0;
-  ktwothird = 2.0/3.0;
-  kfourthird = 4.0/3.0;
-  keightthird = 8.0/3.0;
-  hdxi = 0.5 * dxi;
-  hdyi = 0.5 * dyi;
-  hdzi = 0.5 * dzi;
-  
-  /* Initialize predefined quantities */
-  p1o12dx = INV(dx)/12.;
-  p1o12dy = INV(dy)/12.;
-  p1o12dz = INV(dz)/12.;
-  p1o144dxdy = (INV(dx)*INV(dy))/144.;
-  p1o144dxdz = (INV(dx)*INV(dz))/144.;
-  p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1odx = INV(dx);
-  p1ody = INV(dy);
-  p1odz = INV(dz);
-  pm1o12dx2 = -pow(dx,-2)/12.;
-  pm1o12dy2 = -pow(dy,-2)/12.;
-  pm1o12dz2 = -pow(dz,-2)/12.;
-  
-  /* Loop over the grid points */
-  #pragma omp parallel
-  LC_LOOP3 (ML_BSSN_RHSBoundary,
-            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
-  {
-    int index = INITVALUE;
-    int subblock_index = INITVALUE;
-    index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    CCTK_REAL detgt = INITVALUE;
-    CCTK_REAL dir1 = INITVALUE, dir2 = INITVALUE, dir3 = INITVALUE;
-    CCTK_REAL em4phi = INITVALUE;
-    CCTK_REAL gtu11 = INITVALUE, gtu21 = INITVALUE, gtu22 = INITVALUE, gtu31 = INITVALUE, gtu32 = INITVALUE, gtu33 = INITVALUE;
-    CCTK_REAL gu11 = INITVALUE, gu21 = INITVALUE, gu22 = INITVALUE, gu31 = INITVALUE, gu32 = INITVALUE, gu33 = INITVALUE;
-    CCTK_REAL nlen = INITVALUE, nlen2 = INITVALUE;
-    CCTK_REAL nn1 = INITVALUE, nn2 = INITVALUE, nn3 = INITVALUE;
-    CCTK_REAL nu1 = INITVALUE, nu2 = INITVALUE, nu3 = INITVALUE;
-    CCTK_REAL su1 = INITVALUE, su2 = INITVALUE, su3 = INITVALUE;
-    CCTK_REAL vg = INITVALUE;
-    
-    /* Declare local copies of grid functions */
-    CCTK_REAL AL = INITVALUE;
-    CCTK_REAL alphaL = INITVALUE, alpharhsL = INITVALUE;
-    CCTK_REAL ArhsL = INITVALUE;
-    CCTK_REAL At11L = INITVALUE, At11rhsL = INITVALUE, At12L = INITVALUE, At12rhsL = INITVALUE, At13L = INITVALUE, At13rhsL = INITVALUE;
-    CCTK_REAL At22L = INITVALUE, At22rhsL = INITVALUE, At23L = INITVALUE, At23rhsL = INITVALUE, At33L = INITVALUE, At33rhsL = INITVALUE;
-    CCTK_REAL B1L = INITVALUE, B1rhsL = INITVALUE, B2L = INITVALUE, B2rhsL = INITVALUE, B3L = INITVALUE, B3rhsL = INITVALUE;
-    CCTK_REAL beta1L = INITVALUE, beta1rhsL = INITVALUE, beta2L = INITVALUE, beta2rhsL = INITVALUE, beta3L = INITVALUE, beta3rhsL = INITVALUE;
-    CCTK_REAL gt11L = INITVALUE, gt11rhsL = INITVALUE, gt12L = INITVALUE, gt12rhsL = INITVALUE, gt13L = INITVALUE, gt13rhsL = INITVALUE;
-    CCTK_REAL gt22L = INITVALUE, gt22rhsL = INITVALUE, gt23L = INITVALUE, gt23rhsL = INITVALUE, gt33L = INITVALUE, gt33rhsL = INITVALUE;
-    CCTK_REAL phiL = INITVALUE, phirhsL = INITVALUE;
-    CCTK_REAL trKL = INITVALUE, trKrhsL = INITVALUE;
-    CCTK_REAL Xt1L = INITVALUE, Xt1rhsL = INITVALUE, Xt2L = INITVALUE, Xt2rhsL = INITVALUE, Xt3L = INITVALUE, Xt3rhsL = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
-    /* Declare derivatives */
-    
-    /* Assign local copies of grid functions */
-    AL = A[index];
-    alphaL = alpha[index];
-    At11L = At11[index];
-    At12L = At12[index];
-    At13L = At13[index];
-    At22L = At22[index];
-    At23L = At23[index];
-    At33L = At33[index];
-    B1L = B1[index];
-    B2L = B2[index];
-    B3L = B3[index];
-    beta1L = beta1[index];
-    beta2L = beta2[index];
-    beta3L = beta3[index];
-    gt11L = gt11[index];
-    gt12L = gt12[index];
-    gt13L = gt13[index];
-    gt22L = gt22[index];
-    gt23L = gt23[index];
-    gt33L = gt33[index];
-    phiL = phi[index];
-    trKL = trK[index];
-    Xt1L = Xt1[index];
-    Xt2L = Xt2[index];
-    Xt3L = Xt3[index];
-    
-    /* Assign local copies of subblock grid functions */
-    
-    /* Include user supplied include files */
-    
-    /* Precompute derivatives (new style) */
-    
-    /* Precompute derivatives (old style) */
-    
-    /* Calculate temporaries and grid functions */
-    dir1  =  Sign(normal[0]);
-    
-    dir2  =  Sign(normal[1]);
-    
-    dir3  =  Sign(normal[2]);
-    
-    detgt  =  1;
-    
-    gtu11  =  INV(detgt)*(gt22L*gt33L - SQR(gt23L));
-    
-    gtu21  =  (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
-    
-    gtu31  =  (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
-    
-    gtu22  =  INV(detgt)*(gt11L*gt33L - SQR(gt13L));
-    
-    gtu32  =  (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
-    
-    gtu33  =  INV(detgt)*(gt11L*gt22L - SQR(gt12L));
-    
-    em4phi  =  IfThen(conformalmethod,SQR(phiL),exp(-4*phiL));
-    
-    gu11  =  em4phi*gtu11;
-    
-    gu21  =  em4phi*gtu21;
-    
-    gu31  =  em4phi*gtu31;
-    
-    gu22  =  em4phi*gtu22;
-    
-    gu32  =  em4phi*gtu32;
-    
-    gu33  =  em4phi*gtu33;
-    
-    nn1  =  normal[0];
-    
-    nn2  =  normal[1];
-    
-    nn3  =  normal[2];
-    
-    nu1  =  gu11*nn1 + gu21*nn2 + gu31*nn3;
-    
-    nu2  =  gu21*nn1 + gu22*nn2 + gu32*nn3;
-    
-    nu3  =  gu31*nn1 + gu32*nn2 + gu33*nn3;
-    
-    nlen2  =  nn1*nu1 + nn2*nu2 + nn3*nu3;
-    
-    nlen  =  pow(nlen2,0.5);
-    
-    su1  =  nu1*INV(nlen);
-    
-    su2  =  nu2*INV(nlen);
-    
-    su3  =  nu3*INV(nlen);
-    
-    vg  =  pow(harmonicF,0.5);
-    
-    phirhsL  =  -((PDonesided1(phi, i, j, k)*su1 + PDonesided2(phi, i, j, k)*su2 + PDonesided3(phi, i, j, k)*su3)*vg);
-    
-    gt11rhsL  =  -(PDonesided1(gt11, i, j, k)*su1) - PDonesided2(gt11, i, j, k)*su2 - PDonesided3(gt11, i, j, k)*su3;
-    
-    gt12rhsL  =  -(PDonesided1(gt12, i, j, k)*su1) - PDonesided2(gt12, i, j, k)*su2 - PDonesided3(gt12, i, j, k)*su3;
-    
-    gt13rhsL  =  -(PDonesided1(gt13, i, j, k)*su1) - PDonesided2(gt13, i, j, k)*su2 - PDonesided3(gt13, i, j, k)*su3;
-    
-    gt22rhsL  =  -(PDonesided1(gt22, i, j, k)*su1) - PDonesided2(gt22, i, j, k)*su2 - PDonesided3(gt22, i, j, k)*su3;
-    
-    gt23rhsL  =  -(PDonesided1(gt23, i, j, k)*su1) - PDonesided2(gt23, i, j, k)*su2 - PDonesided3(gt23, i, j, k)*su3;
-    
-    gt33rhsL  =  -(PDonesided1(gt33, i, j, k)*su1) - PDonesided2(gt33, i, j, k)*su2 - PDonesided3(gt33, i, j, k)*su3;
-    
-    trKrhsL  =  -((PDonesided1(trK, i, j, k)*su1 + PDonesided2(trK, i, j, k)*su2 + PDonesided3(trK, i, j, k)*su3)*vg);
-    
-    At11rhsL  =  -(PDonesided1(At11, i, j, k)*su1) - PDonesided2(At11, i, j, k)*su2 - PDonesided3(At11, i, j, k)*su3;
-    
-    At12rhsL  =  -(PDonesided1(At12, i, j, k)*su1) - PDonesided2(At12, i, j, k)*su2 - PDonesided3(At12, i, j, k)*su3;
-    
-    At13rhsL  =  -(PDonesided1(At13, i, j, k)*su1) - PDonesided2(At13, i, j, k)*su2 - PDonesided3(At13, i, j, k)*su3;
-    
-    At22rhsL  =  -(PDonesided1(At22, i, j, k)*su1) - PDonesided2(At22, i, j, k)*su2 - PDonesided3(At22, i, j, k)*su3;
-    
-    At23rhsL  =  -(PDonesided1(At23, i, j, k)*su1) - PDonesided2(At23, i, j, k)*su2 - PDonesided3(At23, i, j, k)*su3;
-    
-    At33rhsL  =  -(PDonesided1(At33, i, j, k)*su1) - PDonesided2(At33, i, j, k)*su2 - PDonesided3(At33, i, j, k)*su3;
-    
-    Xt1rhsL  =  -(PDonesided1(Xt1, i, j, k)*su1) - PDonesided2(Xt1, i, j, k)*su2 - PDonesided3(Xt1, i, j, k)*su3;
-    
-    Xt2rhsL  =  -(PDonesided1(Xt2, i, j, k)*su1) - PDonesided2(Xt2, i, j, k)*su2 - PDonesided3(Xt2, i, j, k)*su3;
-    
-    Xt3rhsL  =  -(PDonesided1(Xt3, i, j, k)*su1) - PDonesided2(Xt3, i, j, k)*su2 - PDonesided3(Xt3, i, j, k)*su3;
-    
-    alpharhsL  =  -((PDonesided1(alpha, i, j, k)*su1 + PDonesided2(alpha, i, j, k)*su2 + 
-            PDonesided3(alpha, i, j, k)*su3)*vg);
-    
-    ArhsL  =  -((PDonesided1(A, i, j, k)*su1 + PDonesided2(A, i, j, k)*su2 + PDonesided3(A, i, j, k)*su3)*vg);
-    
-    beta1rhsL  =  -(PDonesided1(beta1, i, j, k)*su1) - PDonesided2(beta1, i, j, k)*su2 - 
-        PDonesided3(beta1, i, j, k)*su3;
-    
-    beta2rhsL  =  -(PDonesided1(beta2, i, j, k)*su1) - PDonesided2(beta2, i, j, k)*su2 - 
-        PDonesided3(beta2, i, j, k)*su3;
-    
-    beta3rhsL  =  -(PDonesided1(beta3, i, j, k)*su1) - PDonesided2(beta3, i, j, k)*su2 - 
-        PDonesided3(beta3, i, j, k)*su3;
-    
-    B1rhsL  =  -(PDonesided1(B1, i, j, k)*su1) - PDonesided2(B1, i, j, k)*su2 - PDonesided3(B1, i, j, k)*su3;
-    
-    B2rhsL  =  -(PDonesided1(B2, i, j, k)*su1) - PDonesided2(B2, i, j, k)*su2 - PDonesided3(B2, i, j, k)*su3;
-    
-    B3rhsL  =  -(PDonesided1(B3, i, j, k)*su1) - PDonesided2(B3, i, j, k)*su2 - PDonesided3(B3, i, j, k)*su3;
-    
-    
-    /* Copy local copies back to grid functions */
-    alpharhs[index] = alpharhsL;
-    Arhs[index] = ArhsL;
-    At11rhs[index] = At11rhsL;
-    At12rhs[index] = At12rhsL;
-    At13rhs[index] = At13rhsL;
-    At22rhs[index] = At22rhsL;
-    At23rhs[index] = At23rhsL;
-    At33rhs[index] = At33rhsL;
-    B1rhs[index] = B1rhsL;
-    B2rhs[index] = B2rhsL;
-    B3rhs[index] = B3rhsL;
-    beta1rhs[index] = beta1rhsL;
-    beta2rhs[index] = beta2rhsL;
-    beta3rhs[index] = beta3rhsL;
-    gt11rhs[index] = gt11rhsL;
-    gt12rhs[index] = gt12rhsL;
-    gt13rhs[index] = gt13rhsL;
-    gt22rhs[index] = gt22rhsL;
-    gt23rhs[index] = gt23rhsL;
-    gt33rhs[index] = gt33rhsL;
-    phirhs[index] = phirhsL;
-    trKrhs[index] = trKrhsL;
-    Xt1rhs[index] = Xt1rhsL;
-    Xt2rhs[index] = Xt2rhsL;
-    Xt3rhs[index] = Xt3rhsL;
-    
-    /* Copy local copies back to subblock grid functions */
-  }
-  LC_ENDLOOP3 (ML_BSSN_RHSBoundary);
-}
-
-void ML_BSSN_RHSBoundary(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  GenericFD_LoopOverBoundary(cctkGH, &ML_BSSN_RHSBoundary_Body);
-}
diff --git a/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c b/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c
index 9c186df..a2a25c8 100644
--- a/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c
+++ b/ML_BSSN/src/ML_BSSN_RHSRadiativeBoundary.c
@@ -185,7 +185,7 @@ void ML_BSSN_RHSRadiativeBoundary_Body(cGH const * const cctkGH, CCTK_INT const
     
     gtu33  =  INV(detgt)*(gt11L*gt22L - SQR(gt12L));
     
-    em4phi  =  exp(-4*phiL);
+    em4phi  =  IfThen(conformalmethod,SQR(phiL),exp(-4*phiL));
     
     gu11  =  em4phi*gtu11;
     
diff --git a/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.c b/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.c
new file mode 100644
index 0000000..d2c5559
--- /dev/null
+++ b/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.c
@@ -0,0 +1,219 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "cctk.h"
+#include "cctk_Arguments.h"
+#include "cctk_Parameters.h"
+#include "GenericFD.h"
+#include "Differencing.h"
+#include "loopcontrol.h"
+
+/* Define macros used in calculations */
+#define INITVALUE  (42)
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+#define QAD(x) ((x) * (x) * (x) * (x))
+
+void ML_BSSN_RHSStaticBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  
+  /* Declare finite differencing variables */
+  CCTK_REAL dx = INITVALUE, dy = INITVALUE, dz = INITVALUE;
+  CCTK_REAL dxi = INITVALUE, dyi = INITVALUE, dzi = INITVALUE;
+  CCTK_REAL khalf = INITVALUE, kthird = INITVALUE, ktwothird = INITVALUE, kfourthird = INITVALUE, keightthird = INITVALUE;
+  CCTK_REAL hdxi = INITVALUE, hdyi = INITVALUE, hdzi = INITVALUE;
+  
+  
+  /* Declare predefined quantities */
+  CCTK_REAL p1o12dx = INITVALUE;
+  CCTK_REAL p1o12dy = INITVALUE;
+  CCTK_REAL p1o12dz = INITVALUE;
+  CCTK_REAL p1o144dxdy = INITVALUE;
+  CCTK_REAL p1o144dxdz = INITVALUE;
+  CCTK_REAL p1o144dydz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
+  CCTK_REAL pm1o12dx2 = INITVALUE;
+  CCTK_REAL pm1o12dy2 = INITVALUE;
+  CCTK_REAL pm1o12dz2 = INITVALUE;
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_RHSStaticBoundary_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_RHSStaticBoundary_calc_every != ML_BSSN_RHSStaticBoundary_calc_offset)
+  {
+    return;
+  }
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  dx = CCTK_DELTA_SPACE(0);
+  dy = CCTK_DELTA_SPACE(1);
+  dz = CCTK_DELTA_SPACE(2);
+  dxi = 1.0 / dx;
+  dyi = 1.0 / dy;
+  dzi = 1.0 / dz;
+  khalf = 0.5;
+  kthird = 1/3.0;
+  ktwothird = 2.0/3.0;
+  kfourthird = 4.0/3.0;
+  keightthird = 8.0/3.0;
+  hdxi = 0.5 * dxi;
+  hdyi = 0.5 * dyi;
+  hdzi = 0.5 * dzi;
+  
+  /* Initialize predefined quantities */
+  p1o12dx = INV(dx)/12.;
+  p1o12dy = INV(dy)/12.;
+  p1o12dz = INV(dz)/12.;
+  p1o144dxdy = (INV(dx)*INV(dy))/144.;
+  p1o144dxdz = (INV(dx)*INV(dz))/144.;
+  p1o144dydz = (INV(dy)*INV(dz))/144.;
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
+  pm1o12dx2 = -pow(dx,-2)/12.;
+  pm1o12dy2 = -pow(dy,-2)/12.;
+  pm1o12dz2 = -pow(dz,-2)/12.;
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_RHSStaticBoundary,
+            i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    int index = INITVALUE;
+    int subblock_index = INITVALUE;
+    index = CCTK_GFINDEX3D(cctkGH,i,j,k);
+    subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
+    
+    /* Declare shorthands */
+    
+    /* Declare local copies of grid functions */
+    CCTK_REAL alpharhsL = INITVALUE;
+    CCTK_REAL ArhsL = INITVALUE;
+    CCTK_REAL At11rhsL = INITVALUE, At12rhsL = INITVALUE, At13rhsL = INITVALUE, At22rhsL = INITVALUE, At23rhsL = INITVALUE, At33rhsL = INITVALUE;
+    CCTK_REAL B1rhsL = INITVALUE, B2rhsL = INITVALUE, B3rhsL = INITVALUE;
+    CCTK_REAL beta1rhsL = INITVALUE, beta2rhsL = INITVALUE, beta3rhsL = INITVALUE;
+    CCTK_REAL gt11rhsL = INITVALUE, gt12rhsL = INITVALUE, gt13rhsL = INITVALUE, gt22rhsL = INITVALUE, gt23rhsL = INITVALUE, gt33rhsL = INITVALUE;
+    CCTK_REAL phirhsL = INITVALUE;
+    CCTK_REAL trKrhsL = INITVALUE;
+    CCTK_REAL Xt1rhsL = INITVALUE, Xt2rhsL = INITVALUE, Xt3rhsL = INITVALUE;
+    /* Declare precomputed derivatives*/
+    
+    /* Declare derivatives */
+    
+    /* Assign local copies of grid functions */
+    
+    /* Assign local copies of subblock grid functions */
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives (new style) */
+    
+    /* Precompute derivatives (old style) */
+    
+    /* Calculate temporaries and grid functions */
+    phirhsL  =  0;
+    
+    gt11rhsL  =  0;
+    
+    gt12rhsL  =  0;
+    
+    gt13rhsL  =  0;
+    
+    gt22rhsL  =  0;
+    
+    gt23rhsL  =  0;
+    
+    gt33rhsL  =  0;
+    
+    trKrhsL  =  0;
+    
+    At11rhsL  =  0;
+    
+    At12rhsL  =  0;
+    
+    At13rhsL  =  0;
+    
+    At22rhsL  =  0;
+    
+    At23rhsL  =  0;
+    
+    At33rhsL  =  0;
+    
+    Xt1rhsL  =  0;
+    
+    Xt2rhsL  =  0;
+    
+    Xt3rhsL  =  0;
+    
+    alpharhsL  =  0;
+    
+    ArhsL  =  0;
+    
+    beta1rhsL  =  0;
+    
+    beta2rhsL  =  0;
+    
+    beta3rhsL  =  0;
+    
+    B1rhsL  =  0;
+    
+    B2rhsL  =  0;
+    
+    B3rhsL  =  0;
+    
+    
+    /* Copy local copies back to grid functions */
+    alpharhs[index] = alpharhsL;
+    Arhs[index] = ArhsL;
+    At11rhs[index] = At11rhsL;
+    At12rhs[index] = At12rhsL;
+    At13rhs[index] = At13rhsL;
+    At22rhs[index] = At22rhsL;
+    At23rhs[index] = At23rhsL;
+    At33rhs[index] = At33rhsL;
+    B1rhs[index] = B1rhsL;
+    B2rhs[index] = B2rhsL;
+    B3rhs[index] = B3rhsL;
+    beta1rhs[index] = beta1rhsL;
+    beta2rhs[index] = beta2rhsL;
+    beta3rhs[index] = beta3rhsL;
+    gt11rhs[index] = gt11rhsL;
+    gt12rhs[index] = gt12rhsL;
+    gt13rhs[index] = gt13rhsL;
+    gt22rhs[index] = gt22rhsL;
+    gt23rhs[index] = gt23rhsL;
+    gt33rhs[index] = gt33rhsL;
+    phirhs[index] = phirhsL;
+    trKrhs[index] = trKrhsL;
+    Xt1rhs[index] = Xt1rhsL;
+    Xt2rhs[index] = Xt2rhsL;
+    Xt3rhs[index] = Xt3rhsL;
+    
+    /* Copy local copies back to subblock grid functions */
+  }
+  LC_ENDLOOP3 (ML_BSSN_RHSStaticBoundary);
+}
+
+void ML_BSSN_RHSStaticBoundary(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverBoundary(cctkGH, &ML_BSSN_RHSStaticBoundary_Body);
+}
diff --git a/ML_BSSN/src/ML_BSSN_boundary.c b/ML_BSSN/src/ML_BSSN_boundary.c
index 4998ae0..18e4726 100644
--- a/ML_BSSN/src/ML_BSSN_boundary.c
+++ b/ML_BSSN/src/ML_BSSN_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_constraints.c b/ML_BSSN/src/ML_BSSN_constraints.c
index f057f75..e1e1ba3 100644
--- a/ML_BSSN/src/ML_BSSN_constraints.c
+++ b/ML_BSSN/src/ML_BSSN_constraints.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_constraints_boundary.c b/ML_BSSN/src/ML_BSSN_constraints_boundary.c
index 5c17f63..364ac66 100644
--- a/ML_BSSN/src/ML_BSSN_constraints_boundary.c
+++ b/ML_BSSN/src/ML_BSSN_constraints_boundary.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
index 464815b..45b9fda 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
index e77551b..ef2a0a3 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBase.c b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
index 60e88b0..1fd7424 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBase.c
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBase.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
diff --git a/ML_BSSN/src/ML_BSSN_enforce.c b/ML_BSSN/src/ML_BSSN_enforce.c
index 58d85da..eb3b430 100644
--- a/ML_BSSN/src/ML_BSSN_enforce.c
+++ b/ML_BSSN/src/ML_BSSN_enforce.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #define KRANC_C
 
@@ -109,6 +106,7 @@ void ML_BSSN_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL trAt = INITVALUE;
     
     /* Declare local copies of grid functions */
+    CCTK_REAL alphaL = INITVALUE;
     CCTK_REAL At11L = INITVALUE, At12L = INITVALUE, At13L = INITVALUE, At22L = INITVALUE, At23L = INITVALUE, At33L = INITVALUE;
     CCTK_REAL gt11L = INITVALUE, gt12L = INITVALUE, gt13L = INITVALUE, gt22L = INITVALUE, gt23L = INITVALUE, gt33L = INITVALUE;
     /* Declare precomputed derivatives*/
@@ -116,6 +114,7 @@ void ML_BSSN_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
+    alphaL = alpha[index];
     At11L = At11[index];
     At12L = At12[index];
     At13L = At13[index];
@@ -166,8 +165,11 @@ void ML_BSSN_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     
     At33L  =  At33L - gt33L*kthird*trAt;
     
+    alphaL  =  fmax(alphaL,MinimumLapse);
+    
     
     /* Copy local copies back to grid functions */
+    alpha[index] = alphaL;
     At11[index] = At11L;
     At12[index] = At12L;
     At13[index] = At13L;
diff --git a/ML_BSSN/src/RegisterMoL.c b/ML_BSSN/src/RegisterMoL.c
index 93049e2..f02fa5c 100644
--- a/ML_BSSN/src/RegisterMoL.c
+++ b/ML_BSSN/src/RegisterMoL.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN/src/RegisterSymmetries.c b/ML_BSSN/src/RegisterSymmetries.c
index 013e3d1..20db895 100644
--- a/ML_BSSN/src/RegisterSymmetries.c
+++ b/ML_BSSN/src/RegisterSymmetries.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
diff --git a/ML_BSSN/src/Startup.c b/ML_BSSN/src/Startup.c
index 91eac42..705a850 100644
--- a/ML_BSSN/src/Startup.c
+++ b/ML_BSSN/src/Startup.c
@@ -1,7 +1,4 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009) */
-
-/*  Mathematica script written by Ian Hinder and Sascha Husa */
+/*  File produced by Kranc */
 
 #include "cctk.h"
 
diff --git a/ML_BSSN/src/make.code.defn b/ML_BSSN/src/make.code.defn
index cf27ba6..9a0354d 100644
--- a/ML_BSSN/src/make.code.defn
+++ b/ML_BSSN/src/make.code.defn
@@ -1,6 +1,3 @@
-# File produced by user diener
-# Produced with Mathematica Version 7.0 for Linux x86 (64-bit) (February 18, 2009)
+# File produced by Kranc
 
-# Mathematica script written by Ian Hinder and Sascha Husa
-
-SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_Minkowski.c ML_BSSN_convertFromADMBase.c ML_BSSN_convertFromADMBaseGamma.c ML_BSSN_RHS.c ML_BSSN_RHSBoundary.c ML_BSSN_enforce.c ML_BSSN_boundary.c ML_BSSN_convertToADMBase.c ML_BSSN_ADMBaseBoundary.c ML_BSSN_constraints.c ML_BSSN_constraints_boundary.c Boundaries.c 
+SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c ML_BSSN_Minkowski.c ML_BSSN_convertFromADMBase.c ML_BSSN_convertFromADMBaseGamma.c ML_BSSN_RHS.c ML_BSSN_RHSStaticBoundary.c ML_BSSN_RHSRadiativeBoundary.c ML_BSSN_enforce.c ML_BSSN_boundary.c ML_BSSN_convertToADMBase.c ML_BSSN_ADMBaseBoundary.c ML_BSSN_constraints.c ML_BSSN_constraints_boundary.c Boundaries.c