Update auto-generated code as generated by the current version of Kranc

11 files changed, 17 insertions, 971 deletions

diff --git a/ML_WaveToyFO/param.ccl b/ML_WaveToyFO/param.ccl
index 4cf02e4..cef897e 100644
--- a/ML_WaveToyFO/param.ccl
+++ b/ML_WaveToyFO/param.ccl
@@ -139,7 +139,7 @@ KEYWORD WT_rho_bound "Boundary condition to implement" STEERABLE=ALWAYS
   "scalar" :: "Dirichlet boundary condition"
   "newrad" :: "Improved radiative boundary condition"
   "skip" :: "skip boundary condition code"
-} "skip"
+} "none"
 
 private:
 KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
@@ -151,7 +151,7 @@ KEYWORD WT_u_bound "Boundary condition to implement" STEERABLE=ALWAYS
   "scalar" :: "Dirichlet boundary condition"
   "newrad" :: "Improved radiative boundary condition"
   "skip" :: "skip boundary condition code"
-} "skip"
+} "none"
 
 private:
 KEYWORD WT_v_bound "Boundary condition to implement" STEERABLE=ALWAYS
@@ -163,7 +163,7 @@ KEYWORD WT_v_bound "Boundary condition to implement" STEERABLE=ALWAYS
   "scalar" :: "Dirichlet boundary condition"
   "newrad" :: "Improved radiative boundary condition"
   "skip" :: "skip boundary condition code"
-} "skip"
+} "none"
 
 private:
 CCTK_REAL rho_bound_speed "characteristic speed at boundary" STEERABLE=ALWAYS
diff --git a/ML_WaveToyFO/schedule.ccl b/ML_WaveToyFO/schedule.ccl
index 5f30943..e8c9a3f 100644
--- a/ML_WaveToyFO/schedule.ccl
+++ b/ML_WaveToyFO/schedule.ccl
@@ -114,7 +114,7 @@ schedule ML_WaveToyFO_CheckBoundaries at BASEGRID
   OPTIONS: meta
 } "check boundaries treatment"
 
-schedule group ApplyBCs as ML_WaveToyFO_ApplyBCs in MoL_PostStep  after ML_WaveToyFO_SelectBoundConds
+schedule group ApplyBCs as ML_WaveToyFO_ApplyBCs in MoL_PostStep after ML_WaveToyFO_SelectBoundConds
 {
   # no language specified
 } "Apply boundary conditions controlled by thorn Boundary"
diff --git a/ML_WaveToyFO/src/Boundaries.c b/ML_WaveToyFO/src/Boundaries.c
deleted file mode 100644
index 4f5f933..0000000
--- a/ML_WaveToyFO/src/Boundaries.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/*  File produced by Kranc */
-
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
-#include "cctk_Faces.h"
-#include "util_Table.h"
-#include "Symmetry.h"
-
-
-/* the boundary treatment is split into 3 steps:    */
-/* 1. excision                                      */
-/* 2. symmetries                                    */
-/* 3. "other" boundary conditions, e.g. radiative */
-
-/* to simplify scheduling and testing, the 3 steps  */
-/* are currently applied in separate functions      */
-
-
-void ML_WaveToyFO_CheckBoundaries(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  return;
-}
-
-void ML_WaveToyFO_SelectBoundConds(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  CCTK_INT ierr = 0;
-  
-  if (CCTK_EQUALS(WT_rho_bound, "none"  ) ||
-      CCTK_EQUALS(WT_rho_bound, "static") ||
-      CCTK_EQUALS(WT_rho_bound, "flat"  ) ||
-      CCTK_EQUALS(WT_rho_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::WT_rho", WT_rho_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register WT_rho_bound BC for ML_WaveToyFO::WT_rho!");
-  }
-  
-  if (CCTK_EQUALS(WT_u_bound, "none"  ) ||
-      CCTK_EQUALS(WT_u_bound, "static") ||
-      CCTK_EQUALS(WT_u_bound, "flat"  ) ||
-      CCTK_EQUALS(WT_u_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::WT_u", WT_u_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register WT_u_bound BC for ML_WaveToyFO::WT_u!");
-  }
-  
-  if (CCTK_EQUALS(WT_v_bound, "none"  ) ||
-      CCTK_EQUALS(WT_v_bound, "static") ||
-      CCTK_EQUALS(WT_v_bound, "flat"  ) ||
-      CCTK_EQUALS(WT_v_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::WT_v", WT_v_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register WT_v_bound BC for ML_WaveToyFO::WT_v!");
-  }
-  
-  if (CCTK_EQUALS(rho_bound, "none"  ) ||
-      CCTK_EQUALS(rho_bound, "static") ||
-      CCTK_EQUALS(rho_bound, "flat"  ) ||
-      CCTK_EQUALS(rho_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::rho", rho_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register rho_bound BC for ML_WaveToyFO::rho!");
-  }
-  
-  if (CCTK_EQUALS(u_bound, "none"  ) ||
-      CCTK_EQUALS(u_bound, "static") ||
-      CCTK_EQUALS(u_bound, "flat"  ) ||
-      CCTK_EQUALS(u_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::u", u_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register u_bound BC for ML_WaveToyFO::u!");
-  }
-  
-  if (CCTK_EQUALS(v1_bound, "none"  ) ||
-      CCTK_EQUALS(v1_bound, "static") ||
-      CCTK_EQUALS(v1_bound, "flat"  ) ||
-      CCTK_EQUALS(v1_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::v1", v1_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register v1_bound BC for ML_WaveToyFO::v1!");
-  }
-  
-  if (CCTK_EQUALS(v2_bound, "none"  ) ||
-      CCTK_EQUALS(v2_bound, "static") ||
-      CCTK_EQUALS(v2_bound, "flat"  ) ||
-      CCTK_EQUALS(v2_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::v2", v2_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register v2_bound BC for ML_WaveToyFO::v2!");
-  }
-  
-  if (CCTK_EQUALS(v3_bound, "none"  ) ||
-      CCTK_EQUALS(v3_bound, "static") ||
-      CCTK_EQUALS(v3_bound, "flat"  ) ||
-      CCTK_EQUALS(v3_bound, "zero"  ) ) 
-  {
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
-                      "ML_WaveToyFO::v3", v3_bound);
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register v3_bound BC for ML_WaveToyFO::v3!");
-  }
-  
-  if (CCTK_EQUALS(WT_rho_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_WT_rho_bound = -1;
-    if (handle_WT_rho_bound < 0) handle_WT_rho_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_WT_rho_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_WT_rho_bound , WT_rho_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_WT_rho_bound ,WT_rho_bound_speed, "SPEED") < 0)
-       CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, handle_WT_rho_bound, 
-                      "ML_WaveToyFO::WT_rho", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::WT_rho!");
-  
-  }
-  
-  if (CCTK_EQUALS(WT_u_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_WT_u_bound = -1;
-    if (handle_WT_u_bound < 0) handle_WT_u_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_WT_u_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_WT_u_bound , WT_u_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_WT_u_bound ,WT_u_bound_speed, "SPEED") < 0)
-       CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, handle_WT_u_bound, 
-                      "ML_WaveToyFO::WT_u", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::WT_u!");
-  
-  }
-  
-  if (CCTK_EQUALS(WT_v_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_WT_v_bound = -1;
-    if (handle_WT_v_bound < 0) handle_WT_v_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_WT_v_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_WT_v_bound , WT_v_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_WT_v_bound ,WT_v_bound_speed, "SPEED") < 0)
-       CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, handle_WT_v_bound, 
-                      "ML_WaveToyFO::WT_v", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::WT_v!");
-  
-  }
-  
-  if (CCTK_EQUALS(rho_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_rho_bound = -1;
-    if (handle_rho_bound < 0) handle_rho_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_rho_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_rho_bound , rho_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_rho_bound ,rho_bound_speed, "SPEED") < 0)
-        CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_rho_bound, 
-                      "ML_WaveToyFO::rho", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::rho!");
-  
-  }
-  
-  if (CCTK_EQUALS(u_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_u_bound = -1;
-    if (handle_u_bound < 0) handle_u_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_u_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_u_bound , u_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_u_bound ,u_bound_speed, "SPEED") < 0)
-        CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_u_bound, 
-                      "ML_WaveToyFO::u", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::u!");
-  
-  }
-  
-  if (CCTK_EQUALS(v1_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_v1_bound = -1;
-    if (handle_v1_bound < 0) handle_v1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_v1_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_v1_bound , v1_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_v1_bound ,v1_bound_speed, "SPEED") < 0)
-        CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_v1_bound, 
-                      "ML_WaveToyFO::v1", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::v1!");
-  
-  }
-  
-  if (CCTK_EQUALS(v2_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_v2_bound = -1;
-    if (handle_v2_bound < 0) handle_v2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_v2_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_v2_bound , v2_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_v2_bound ,v2_bound_speed, "SPEED") < 0)
-        CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_v2_bound, 
-                      "ML_WaveToyFO::v2", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::v2!");
-  
-  }
-  
-  if (CCTK_EQUALS(v3_bound, "radiative"))
-  {
-   /* select radiation boundary condition */
-    static CCTK_INT handle_v3_bound = -1;
-    if (handle_v3_bound < 0) handle_v3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_v3_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_v3_bound , v3_bound_limit, "LIMIT") < 0)
-       CCTK_WARN(0, "could not set LIMIT value in table!");
-    if (Util_TableSetReal(handle_v3_bound ,v3_bound_speed, "SPEED") < 0)
-        CCTK_WARN(0, "could not set SPEED value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_v3_bound, 
-                      "ML_WaveToyFO::v3", "Radiation");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Radiation BC for ML_WaveToyFO::v3!");
-  
-  }
-  
-  if (CCTK_EQUALS(WT_rho_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_WT_rho_bound = -1;
-    if (handle_WT_rho_bound < 0) handle_WT_rho_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_WT_rho_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_WT_rho_bound ,WT_rho_bound_scalar, "SCALAR") < 0)
-        CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, handle_WT_rho_bound, 
-                      "ML_WaveToyFO::WT_rho", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Scalar BC for ML_WaveToyFO::WT_rho!");
-  
-  }
-  
-  if (CCTK_EQUALS(WT_u_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_WT_u_bound = -1;
-    if (handle_WT_u_bound < 0) handle_WT_u_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_WT_u_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_WT_u_bound ,WT_u_bound_scalar, "SCALAR") < 0)
-        CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, handle_WT_u_bound, 
-                      "ML_WaveToyFO::WT_u", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Scalar BC for ML_WaveToyFO::WT_u!");
-  
-  }
-  
-  if (CCTK_EQUALS(WT_v_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_WT_v_bound = -1;
-    if (handle_WT_v_bound < 0) handle_WT_v_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_WT_v_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_WT_v_bound ,WT_v_bound_scalar, "SCALAR") < 0)
-        CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, handle_WT_v_bound, 
-                      "ML_WaveToyFO::WT_v", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Failed to register Scalar BC for ML_WaveToyFO::WT_v!");
-  
-  }
-  
-  if (CCTK_EQUALS(rho_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_rho_bound = -1;
-    if (handle_rho_bound < 0) handle_rho_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_rho_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_rho_bound ,rho_bound_scalar, "SCALAR") < 0)
-      CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_rho_bound, 
-                      "ML_WaveToyFO::rho", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Error in registering Scalar BC for ML_WaveToyFO::rho!");
-  
-  }
-  
-  if (CCTK_EQUALS(u_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_u_bound = -1;
-    if (handle_u_bound < 0) handle_u_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_u_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_u_bound ,u_bound_scalar, "SCALAR") < 0)
-      CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_u_bound, 
-                      "ML_WaveToyFO::u", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Error in registering Scalar BC for ML_WaveToyFO::u!");
-  
-  }
-  
-  if (CCTK_EQUALS(v1_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_v1_bound = -1;
-    if (handle_v1_bound < 0) handle_v1_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_v1_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_v1_bound ,v1_bound_scalar, "SCALAR") < 0)
-      CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_v1_bound, 
-                      "ML_WaveToyFO::v1", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Error in registering Scalar BC for ML_WaveToyFO::v1!");
-  
-  }
-  
-  if (CCTK_EQUALS(v2_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_v2_bound = -1;
-    if (handle_v2_bound < 0) handle_v2_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_v2_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_v2_bound ,v2_bound_scalar, "SCALAR") < 0)
-      CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_v2_bound, 
-                      "ML_WaveToyFO::v2", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Error in registering Scalar BC for ML_WaveToyFO::v2!");
-  
-  }
-  
-  if (CCTK_EQUALS(v3_bound, "scalar"))
-  {
-   /* select scalar boundary condition */
-    static CCTK_INT handle_v3_bound = -1;
-    if (handle_v3_bound < 0) handle_v3_bound = Util_TableCreate(UTIL_TABLE_FLAGS_CASE_INSENSITIVE);
-    if (handle_v3_bound < 0) CCTK_WARN(0, "could not create table!");
-    if (Util_TableSetReal(handle_v3_bound ,v3_bound_scalar, "SCALAR") < 0)
-      CCTK_WARN(0, "could not set SCALAR value in table!");
-  
-    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, handle_v3_bound, 
-                      "ML_WaveToyFO::v3", "scalar");
-  
-    if (ierr < 0)
-       CCTK_WARN(0, "Error in registering Scalar BC for ML_WaveToyFO::v3!");
-  
-  }
-  return;
-}
-
-
-
-/* template for entries in parameter file:
-#$bound$#ML_WaveToyFO::WT_rho_bound       = "skip"
-#$bound$#ML_WaveToyFO::WT_rho_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::WT_rho_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::WT_rho_bound_scalar = 0.0
-
-#$bound$#ML_WaveToyFO::WT_u_bound       = "skip"
-#$bound$#ML_WaveToyFO::WT_u_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::WT_u_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::WT_u_bound_scalar = 0.0
-
-#$bound$#ML_WaveToyFO::WT_v_bound       = "skip"
-#$bound$#ML_WaveToyFO::WT_v_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::WT_v_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::WT_v_bound_scalar = 0.0
-
-#$bound$#ML_WaveToyFO::rho_bound       = "skip"
-#$bound$#ML_WaveToyFO::rho_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::rho_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::rho_bound_scalar = 0.0
-
-#$bound$#ML_WaveToyFO::u_bound       = "skip"
-#$bound$#ML_WaveToyFO::u_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::u_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::u_bound_scalar = 0.0
-
-#$bound$#ML_WaveToyFO::v1_bound       = "skip"
-#$bound$#ML_WaveToyFO::v1_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::v1_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::v1_bound_scalar = 0.0
-
-#$bound$#ML_WaveToyFO::v2_bound       = "skip"
-#$bound$#ML_WaveToyFO::v2_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::v2_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::v2_bound_scalar = 0.0
-
-#$bound$#ML_WaveToyFO::v3_bound       = "skip"
-#$bound$#ML_WaveToyFO::v3_bound_speed = 1.0
-#$bound$#ML_WaveToyFO::v3_bound_limit = 0.0
-#$bound$#ML_WaveToyFO::v3_bound_scalar = 0.0
-
-*/
-
diff --git a/ML_WaveToyFO/src/Differencing.h b/ML_WaveToyFO/src/Differencing.h
index aa21060..49ee0ba 100644
--- a/ML_WaveToyFO/src/Differencing.h
+++ b/ML_WaveToyFO/src/Differencing.h
@@ -1,12 +1,12 @@
-#define PDstandardNth1(u,i,j,k) (p1o12dx*(-8*(u)[index+di*(-1)+dj*(0)+dk*(0)] + 8*(u)[index+di*(1)+dj*(0)+dk*(0)] + (u)[index+di*(-2)+dj*(0)+dk*(0)] - (u)[index+di*(2)+dj*(0)+dk*(0)]))
-#define PDstandardNth2(u,i,j,k) (p1o12dy*(-8*(u)[index+di*(0)+dj*(-1)+dk*(0)] + 8*(u)[index+di*(0)+dj*(1)+dk*(0)] + (u)[index+di*(0)+dj*(-2)+dk*(0)] - (u)[index+di*(0)+dj*(2)+dk*(0)]))
-#define PDstandardNth3(u,i,j,k) (p1o12dz*(-8*(u)[index+di*(0)+dj*(0)+dk*(-1)] + 8*(u)[index+di*(0)+dj*(0)+dk*(1)] + (u)[index+di*(0)+dj*(0)+dk*(-2)] - (u)[index+di*(0)+dj*(0)+dk*(2)]))
-#define PDstandardNth11(u,i,j,k) (pm1o12dx2*(30*(u)[index+di*(0)+dj*(0)+dk*(0)] - 16*((u)[index+di*(-1)+dj*(0)+dk*(0)] + (u)[index+di*(1)+dj*(0)+dk*(0)]) + (u)[index+di*(-2)+dj*(0)+dk*(0)] + (u)[index+di*(2)+dj*(0)+dk*(0)]))
-#define PDstandardNth22(u,i,j,k) (pm1o12dy2*(30*(u)[index+di*(0)+dj*(0)+dk*(0)] - 16*((u)[index+di*(0)+dj*(-1)+dk*(0)] + (u)[index+di*(0)+dj*(1)+dk*(0)]) + (u)[index+di*(0)+dj*(-2)+dk*(0)] + (u)[index+di*(0)+dj*(2)+dk*(0)]))
-#define PDstandardNth33(u,i,j,k) (pm1o12dz2*(30*(u)[index+di*(0)+dj*(0)+dk*(0)] - 16*((u)[index+di*(0)+dj*(0)+dk*(-1)] + (u)[index+di*(0)+dj*(0)+dk*(1)]) + (u)[index+di*(0)+dj*(0)+dk*(-2)] + (u)[index+di*(0)+dj*(0)+dk*(2)]))
-#define PDstandardNth12(u,i,j,k) (p1o144dxdy*(-64*((u)[index+di*(-1)+dj*(1)+dk*(0)] + (u)[index+di*(1)+dj*(-1)+dk*(0)]) + 64*((u)[index+di*(-1)+dj*(-1)+dk*(0)] + (u)[index+di*(1)+dj*(1)+dk*(0)]) + 8*((u)[index+di*(-1)+dj*(2)+dk*(0)] + (u)[index+di*(1)+dj*(-2)+dk*(0)] + (u)[index+di*(-2)+dj*(1)+dk*(0)] + (u)[index+di*(2)+dj*(-1)+dk*(0)]) - 8*((u)[index+di*(-1)+dj*(-2)+dk*(0)] + (u)[index+di*(1)+dj*(2)+dk*(0)] + (u)[index+di*(-2)+dj*(-1)+dk*(0)] + (u)[index+di*(2)+dj*(1)+dk*(0)]) + (u)[index+di*(-2)+dj*(-2)+dk*(0)] - (u)[index+di*(-2)+dj*(2)+dk*(0)] - (u)[index+di*(2)+dj*(-2)+dk*(0)] + (u)[index+di*(2)+dj*(2)+dk*(0)]))
-#define PDstandardNth13(u,i,j,k) (p1o144dxdz*(-64*((u)[index+di*(-1)+dj*(0)+dk*(1)] + (u)[index+di*(1)+dj*(0)+dk*(-1)]) + 64*((u)[index+di*(-1)+dj*(0)+dk*(-1)] + (u)[index+di*(1)+dj*(0)+dk*(1)]) + 8*((u)[index+di*(-1)+dj*(0)+dk*(2)] + (u)[index+di*(1)+dj*(0)+dk*(-2)] + (u)[index+di*(-2)+dj*(0)+dk*(1)] + (u)[index+di*(2)+dj*(0)+dk*(-1)]) - 8*((u)[index+di*(-1)+dj*(0)+dk*(-2)] + (u)[index+di*(1)+dj*(0)+dk*(2)] + (u)[index+di*(-2)+dj*(0)+dk*(-1)] + (u)[index+di*(2)+dj*(0)+dk*(1)]) + (u)[index+di*(-2)+dj*(0)+dk*(-2)] - (u)[index+di*(-2)+dj*(0)+dk*(2)] - (u)[index+di*(2)+dj*(0)+dk*(-2)] + (u)[index+di*(2)+dj*(0)+dk*(2)]))
-#define PDstandardNth21(u,i,j,k) (p1o144dxdy*(-64*((u)[index+di*(-1)+dj*(1)+dk*(0)] + (u)[index+di*(1)+dj*(-1)+dk*(0)]) + 64*((u)[index+di*(-1)+dj*(-1)+dk*(0)] + (u)[index+di*(1)+dj*(1)+dk*(0)]) + 8*((u)[index+di*(-1)+dj*(2)+dk*(0)] + (u)[index+di*(1)+dj*(-2)+dk*(0)] + (u)[index+di*(-2)+dj*(1)+dk*(0)] + (u)[index+di*(2)+dj*(-1)+dk*(0)]) - 8*((u)[index+di*(-1)+dj*(-2)+dk*(0)] + (u)[index+di*(1)+dj*(2)+dk*(0)] + (u)[index+di*(-2)+dj*(-1)+dk*(0)] + (u)[index+di*(2)+dj*(1)+dk*(0)]) + (u)[index+di*(-2)+dj*(-2)+dk*(0)] - (u)[index+di*(-2)+dj*(2)+dk*(0)] - (u)[index+di*(2)+dj*(-2)+dk*(0)] + (u)[index+di*(2)+dj*(2)+dk*(0)]))
-#define PDstandardNth23(u,i,j,k) (p1o144dydz*(-64*((u)[index+di*(0)+dj*(-1)+dk*(1)] + (u)[index+di*(0)+dj*(1)+dk*(-1)]) + 64*((u)[index+di*(0)+dj*(-1)+dk*(-1)] + (u)[index+di*(0)+dj*(1)+dk*(1)]) + 8*((u)[index+di*(0)+dj*(-1)+dk*(2)] + (u)[index+di*(0)+dj*(1)+dk*(-2)] + (u)[index+di*(0)+dj*(-2)+dk*(1)] + (u)[index+di*(0)+dj*(2)+dk*(-1)]) - 8*((u)[index+di*(0)+dj*(-1)+dk*(-2)] + (u)[index+di*(0)+dj*(1)+dk*(2)] + (u)[index+di*(0)+dj*(-2)+dk*(-1)] + (u)[index+di*(0)+dj*(2)+dk*(1)]) + (u)[index+di*(0)+dj*(-2)+dk*(-2)] - (u)[index+di*(0)+dj*(-2)+dk*(2)] - (u)[index+di*(0)+dj*(2)+dk*(-2)] + (u)[index+di*(0)+dj*(2)+dk*(2)]))
-#define PDstandardNth31(u,i,j,k) (p1o144dxdz*(-64*((u)[index+di*(-1)+dj*(0)+dk*(1)] + (u)[index+di*(1)+dj*(0)+dk*(-1)]) + 64*((u)[index+di*(-1)+dj*(0)+dk*(-1)] + (u)[index+di*(1)+dj*(0)+dk*(1)]) + 8*((u)[index+di*(-1)+dj*(0)+dk*(2)] + (u)[index+di*(1)+dj*(0)+dk*(-2)] + (u)[index+di*(-2)+dj*(0)+dk*(1)] + (u)[index+di*(2)+dj*(0)+dk*(-1)]) - 8*((u)[index+di*(-1)+dj*(0)+dk*(-2)] + (u)[index+di*(1)+dj*(0)+dk*(2)] + (u)[index+di*(-2)+dj*(0)+dk*(-1)] + (u)[index+di*(2)+dj*(0)+dk*(1)]) + (u)[index+di*(-2)+dj*(0)+dk*(-2)] - (u)[index+di*(-2)+dj*(0)+dk*(2)] - (u)[index+di*(2)+dj*(0)+dk*(-2)] + (u)[index+di*(2)+dj*(0)+dk*(2)]))
-#define PDstandardNth32(u,i,j,k) (p1o144dydz*(-64*((u)[index+di*(0)+dj*(-1)+dk*(1)] + (u)[index+di*(0)+dj*(1)+dk*(-1)]) + 64*((u)[index+di*(0)+dj*(-1)+dk*(-1)] + (u)[index+di*(0)+dj*(1)+dk*(1)]) + 8*((u)[index+di*(0)+dj*(-1)+dk*(2)] + (u)[index+di*(0)+dj*(1)+dk*(-2)] + (u)[index+di*(0)+dj*(-2)+dk*(1)] + (u)[index+di*(0)+dj*(2)+dk*(-1)]) - 8*((u)[index+di*(0)+dj*(-1)+dk*(-2)] + (u)[index+di*(0)+dj*(1)+dk*(2)] + (u)[index+di*(0)+dj*(-2)+dk*(-1)] + (u)[index+di*(0)+dj*(2)+dk*(1)]) + (u)[index+di*(0)+dj*(-2)+dk*(-2)] - (u)[index+di*(0)+dj*(-2)+dk*(2)] - (u)[index+di*(0)+dj*(2)+dk*(-2)] + (u)[index+di*(0)+dj*(2)+dk*(2)]))
+#define PDstandardNth1(u) (p1o12dx*(-8*(u)[di*(-1)+dj*(0)+dk*(0)] + 8*(u)[di*(1)+dj*(0)+dk*(0)] + (u)[di*(-2)+dj*(0)+dk*(0)] - (u)[di*(2)+dj*(0)+dk*(0)]))
+#define PDstandardNth2(u) (p1o12dy*(-8*(u)[di*(0)+dj*(-1)+dk*(0)] + 8*(u)[di*(0)+dj*(1)+dk*(0)] + (u)[di*(0)+dj*(-2)+dk*(0)] - (u)[di*(0)+dj*(2)+dk*(0)]))
+#define PDstandardNth3(u) (p1o12dz*(-8*(u)[di*(0)+dj*(0)+dk*(-1)] + 8*(u)[di*(0)+dj*(0)+dk*(1)] + (u)[di*(0)+dj*(0)+dk*(-2)] - (u)[di*(0)+dj*(0)+dk*(2)]))
+#define PDstandardNth11(u) (pm1o12dx2*(30*(u)[di*(0)+dj*(0)+dk*(0)] - 16*((u)[di*(-1)+dj*(0)+dk*(0)] + (u)[di*(1)+dj*(0)+dk*(0)]) + (u)[di*(-2)+dj*(0)+dk*(0)] + (u)[di*(2)+dj*(0)+dk*(0)]))
+#define PDstandardNth22(u) (pm1o12dy2*(30*(u)[di*(0)+dj*(0)+dk*(0)] - 16*((u)[di*(0)+dj*(-1)+dk*(0)] + (u)[di*(0)+dj*(1)+dk*(0)]) + (u)[di*(0)+dj*(-2)+dk*(0)] + (u)[di*(0)+dj*(2)+dk*(0)]))
+#define PDstandardNth33(u) (pm1o12dz2*(30*(u)[di*(0)+dj*(0)+dk*(0)] - 16*((u)[di*(0)+dj*(0)+dk*(-1)] + (u)[di*(0)+dj*(0)+dk*(1)]) + (u)[di*(0)+dj*(0)+dk*(-2)] + (u)[di*(0)+dj*(0)+dk*(2)]))
+#define PDstandardNth12(u) (p1o144dxdy*(-64*((u)[di*(-1)+dj*(1)+dk*(0)] + (u)[di*(1)+dj*(-1)+dk*(0)]) + 64*((u)[di*(-1)+dj*(-1)+dk*(0)] + (u)[di*(1)+dj*(1)+dk*(0)]) + 8*((u)[di*(-1)+dj*(2)+dk*(0)] + (u)[di*(1)+dj*(-2)+dk*(0)] + (u)[di*(-2)+dj*(1)+dk*(0)] + (u)[di*(2)+dj*(-1)+dk*(0)]) - 8*((u)[di*(-1)+dj*(-2)+dk*(0)] + (u)[di*(1)+dj*(2)+dk*(0)] + (u)[di*(-2)+dj*(-1)+dk*(0)] + (u)[di*(2)+dj*(1)+dk*(0)]) + (u)[di*(-2)+dj*(-2)+dk*(0)] - (u)[di*(-2)+dj*(2)+dk*(0)] - (u)[di*(2)+dj*(-2)+dk*(0)] + (u)[di*(2)+dj*(2)+dk*(0)]))
+#define PDstandardNth13(u) (p1o144dxdz*(-64*((u)[di*(-1)+dj*(0)+dk*(1)] + (u)[di*(1)+dj*(0)+dk*(-1)]) + 64*((u)[di*(-1)+dj*(0)+dk*(-1)] + (u)[di*(1)+dj*(0)+dk*(1)]) + 8*((u)[di*(-1)+dj*(0)+dk*(2)] + (u)[di*(1)+dj*(0)+dk*(-2)] + (u)[di*(-2)+dj*(0)+dk*(1)] + (u)[di*(2)+dj*(0)+dk*(-1)]) - 8*((u)[di*(-1)+dj*(0)+dk*(-2)] + (u)[di*(1)+dj*(0)+dk*(2)] + (u)[di*(-2)+dj*(0)+dk*(-1)] + (u)[di*(2)+dj*(0)+dk*(1)]) + (u)[di*(-2)+dj*(0)+dk*(-2)] - (u)[di*(-2)+dj*(0)+dk*(2)] - (u)[di*(2)+dj*(0)+dk*(-2)] + (u)[di*(2)+dj*(0)+dk*(2)]))
+#define PDstandardNth21(u) (p1o144dxdy*(-64*((u)[di*(-1)+dj*(1)+dk*(0)] + (u)[di*(1)+dj*(-1)+dk*(0)]) + 64*((u)[di*(-1)+dj*(-1)+dk*(0)] + (u)[di*(1)+dj*(1)+dk*(0)]) + 8*((u)[di*(-1)+dj*(2)+dk*(0)] + (u)[di*(1)+dj*(-2)+dk*(0)] + (u)[di*(-2)+dj*(1)+dk*(0)] + (u)[di*(2)+dj*(-1)+dk*(0)]) - 8*((u)[di*(-1)+dj*(-2)+dk*(0)] + (u)[di*(1)+dj*(2)+dk*(0)] + (u)[di*(-2)+dj*(-1)+dk*(0)] + (u)[di*(2)+dj*(1)+dk*(0)]) + (u)[di*(-2)+dj*(-2)+dk*(0)] - (u)[di*(-2)+dj*(2)+dk*(0)] - (u)[di*(2)+dj*(-2)+dk*(0)] + (u)[di*(2)+dj*(2)+dk*(0)]))
+#define PDstandardNth23(u) (p1o144dydz*(-64*((u)[di*(0)+dj*(-1)+dk*(1)] + (u)[di*(0)+dj*(1)+dk*(-1)]) + 64*((u)[di*(0)+dj*(-1)+dk*(-1)] + (u)[di*(0)+dj*(1)+dk*(1)]) + 8*((u)[di*(0)+dj*(-1)+dk*(2)] + (u)[di*(0)+dj*(1)+dk*(-2)] + (u)[di*(0)+dj*(-2)+dk*(1)] + (u)[di*(0)+dj*(2)+dk*(-1)]) - 8*((u)[di*(0)+dj*(-1)+dk*(-2)] + (u)[di*(0)+dj*(1)+dk*(2)] + (u)[di*(0)+dj*(-2)+dk*(-1)] + (u)[di*(0)+dj*(2)+dk*(1)]) + (u)[di*(0)+dj*(-2)+dk*(-2)] - (u)[di*(0)+dj*(-2)+dk*(2)] - (u)[di*(0)+dj*(2)+dk*(-2)] + (u)[di*(0)+dj*(2)+dk*(2)]))
+#define PDstandardNth31(u) (p1o144dxdz*(-64*((u)[di*(-1)+dj*(0)+dk*(1)] + (u)[di*(1)+dj*(0)+dk*(-1)]) + 64*((u)[di*(-1)+dj*(0)+dk*(-1)] + (u)[di*(1)+dj*(0)+dk*(1)]) + 8*((u)[di*(-1)+dj*(0)+dk*(2)] + (u)[di*(1)+dj*(0)+dk*(-2)] + (u)[di*(-2)+dj*(0)+dk*(1)] + (u)[di*(2)+dj*(0)+dk*(-1)]) - 8*((u)[di*(-1)+dj*(0)+dk*(-2)] + (u)[di*(1)+dj*(0)+dk*(2)] + (u)[di*(-2)+dj*(0)+dk*(-1)] + (u)[di*(2)+dj*(0)+dk*(1)]) + (u)[di*(-2)+dj*(0)+dk*(-2)] - (u)[di*(-2)+dj*(0)+dk*(2)] - (u)[di*(2)+dj*(0)+dk*(-2)] + (u)[di*(2)+dj*(0)+dk*(2)]))
+#define PDstandardNth32(u) (p1o144dydz*(-64*((u)[di*(0)+dj*(-1)+dk*(1)] + (u)[di*(0)+dj*(1)+dk*(-1)]) + 64*((u)[di*(0)+dj*(-1)+dk*(-1)] + (u)[di*(0)+dj*(1)+dk*(1)]) + 8*((u)[di*(0)+dj*(-1)+dk*(2)] + (u)[di*(0)+dj*(1)+dk*(-2)] + (u)[di*(0)+dj*(-2)+dk*(1)] + (u)[di*(0)+dj*(2)+dk*(-1)]) - 8*((u)[di*(0)+dj*(-1)+dk*(-2)] + (u)[di*(0)+dj*(1)+dk*(2)] + (u)[di*(0)+dj*(-2)+dk*(-1)] + (u)[di*(0)+dj*(2)+dk*(1)]) + (u)[di*(0)+dj*(-2)+dk*(-2)] - (u)[di*(0)+dj*(-2)+dk*(2)] - (u)[di*(0)+dj*(2)+dk*(-2)] + (u)[di*(0)+dj*(2)+dk*(2)]))
diff --git a/ML_WaveToyFO/src/RegisterMoL.c b/ML_WaveToyFO/src/RegisterMoL.c
deleted file mode 100644
index e6734d4..0000000
--- a/ML_WaveToyFO/src/RegisterMoL.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  File produced by Kranc */
-
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
-
-void ML_WaveToyFO_RegisterVars(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  CCTK_INT ierr = 0;
-  
-  /* Register all the evolved grid functions with MoL */
-  ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_WaveToyFO::rho"),  CCTK_VarIndex("ML_WaveToyFO::rhorhs"));
-  ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_WaveToyFO::u"),  CCTK_VarIndex("ML_WaveToyFO::urhs"));
-  ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_WaveToyFO::v1"),  CCTK_VarIndex("ML_WaveToyFO::v1rhs"));
-  ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_WaveToyFO::v2"),  CCTK_VarIndex("ML_WaveToyFO::v2rhs"));
-  ierr += MoLRegisterEvolved(CCTK_VarIndex("ML_WaveToyFO::v3"),  CCTK_VarIndex("ML_WaveToyFO::v3rhs"));
-  return;
-}
diff --git a/ML_WaveToyFO/src/RegisterSymmetries.c b/ML_WaveToyFO/src/RegisterSymmetries.c
deleted file mode 100644
index d6515c5..0000000
--- a/ML_WaveToyFO/src/RegisterSymmetries.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  File produced by Kranc */
-
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
-#include "Symmetry.h"
-
-void ML_WaveToyFO_RegisterSymmetries(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* array holding symmetry definitions */
-  CCTK_INT sym[3];
-  
-  
-  /* Register symmetries of grid functions */
-  sym[0] = 1;
-  sym[1] = 1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::rho");
-  
-  sym[0] = 1;
-  sym[1] = 1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::u");
-  
-  sym[0] = -1;
-  sym[1] = 1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::v1");
-  
-  sym[0] = 1;
-  sym[1] = -1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::v2");
-  
-  sym[0] = 1;
-  sym[1] = 1;
-  sym[2] = -1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::v3");
-  
-  sym[0] = -1;
-  sym[1] = 1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::w1");
-  
-  sym[0] = 1;
-  sym[1] = -1;
-  sym[2] = 1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::w2");
-  
-  sym[0] = 1;
-  sym[1] = 1;
-  sym[2] = -1;
-  SetCartSymVN(cctkGH, sym, "ML_WaveToyFO::w3");
-  
-}
diff --git a/ML_WaveToyFO/src/Startup.c b/ML_WaveToyFO/src/Startup.c
deleted file mode 100644
index 76fb99a..0000000
--- a/ML_WaveToyFO/src/Startup.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*  File produced by Kranc */
-
-#include "cctk.h"
-
-int ML_WaveToyFO_Startup(void)
-{
-  const char * banner = "ML_WaveToyFO";
-  CCTK_RegisterBanner(banner);
-  return 0;
-}
diff --git a/ML_WaveToyFO/src/WTFO_Gaussian.c b/ML_WaveToyFO/src/WTFO_Gaussian.c
deleted file mode 100644
index 44057a7..0000000
--- a/ML_WaveToyFO/src/WTFO_Gaussian.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  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 WTFO_Gaussian_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* Declare finite differencing variables */
-  
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering WTFO_Gaussian_Body");
-  }
-  
-  if (cctk_iteration % WTFO_Gaussian_calc_every != WTFO_Gaussian_calc_offset)
-  {
-    return;
-  }
-  
-  /* Include user-supplied include files */
-  
-  /* Initialise finite differencing variables */
-  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
-  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
-  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
-  int const di = 1;
-  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  CCTK_REAL const dxi = 1.0 / dx;
-  CCTK_REAL const dyi = 1.0 / dy;
-  CCTK_REAL const dzi = 1.0 / dz;
-  CCTK_REAL const khalf = 0.5;
-  CCTK_REAL const kthird = 1/3.0;
-  CCTK_REAL const ktwothird = 2.0/3.0;
-  CCTK_REAL const kfourthird = 4.0/3.0;
-  CCTK_REAL const keightthird = 8.0/3.0;
-  CCTK_REAL const hdxi = 0.5 * dxi;
-  CCTK_REAL const hdyi = 0.5 * dyi;
-  CCTK_REAL const hdzi = 0.5 * dzi;
-  
-  /* Initialize predefined quantities */
-  CCTK_REAL const p1o12dx = INV(dx)/12.;
-  CCTK_REAL const p1o12dy = INV(dy)/12.;
-  CCTK_REAL const p1o12dz = INV(dz)/12.;
-  CCTK_REAL const p1o144dxdy = (INV(dx)*INV(dy))/144.;
-  CCTK_REAL const p1o144dxdz = (INV(dx)*INV(dz))/144.;
-  CCTK_REAL const p1o144dydz = (INV(dy)*INV(dz))/144.;
-  CCTK_REAL const pm1o12dx2 = -pow(dx,-2)/12.;
-  CCTK_REAL const pm1o12dy2 = -pow(dy,-2)/12.;
-  CCTK_REAL const pm1o12dz2 = -pow(dz,-2)/12.;
-  
-  /* Loop over the grid points */
-  #pragma omp parallel
-  LC_LOOP3 (WTFO_Gaussian,
-            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 const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    /* Declare derivatives */
-    
-    /* Assign local copies of grid functions */
-    
-    /* Include user supplied include files */
-    
-    /* Precompute derivatives */
-    
-    /* Calculate temporaries and grid functions */
-    CCTK_REAL uL = 0;
-    
-    CCTK_REAL v1L = 0;
-    
-    CCTK_REAL v2L = 0;
-    
-    CCTK_REAL v3L = 0;
-    
-    CCTK_REAL rhoL = 0;
-    
-    
-    /* Copy local copies back to grid functions */
-    rho[index] = rhoL;
-    u[index] = uL;
-    v1[index] = v1L;
-    v2[index] = v2L;
-    v3[index] = v3L;
-  }
-  LC_ENDLOOP3 (WTFO_Gaussian);
-}
-
-void WTFO_Gaussian(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  GenericFD_LoopOverEverything(cctkGH, &WTFO_Gaussian_Body);
-}
diff --git a/ML_WaveToyFO/src/WTFO_RHS.c b/ML_WaveToyFO/src/WTFO_RHS.c
deleted file mode 100644
index 8a5f685..0000000
--- a/ML_WaveToyFO/src/WTFO_RHS.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  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 WTFO_RHS_SelectBCs(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  CCTK_INT ierr = 0;
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_WaveToyFO::WT_rhorhs","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for ML_WaveToyFO::WT_rhorhs.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_WaveToyFO::WT_urhs","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for ML_WaveToyFO::WT_urhs.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_WaveToyFO::WT_vrhs","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for ML_WaveToyFO::WT_vrhs.");
-  return;
-}
-
-void WTFO_RHS_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* Declare finite differencing variables */
-  
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering WTFO_RHS_Body");
-  }
-  
-  if (cctk_iteration % WTFO_RHS_calc_every != WTFO_RHS_calc_offset)
-  {
-    return;
-  }
-  
-  /* Include user-supplied include files */
-  
-  /* Initialise finite differencing variables */
-  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
-  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
-  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
-  int const di = 1;
-  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  CCTK_REAL const dxi = 1.0 / dx;
-  CCTK_REAL const dyi = 1.0 / dy;
-  CCTK_REAL const dzi = 1.0 / dz;
-  CCTK_REAL const khalf = 0.5;
-  CCTK_REAL const kthird = 1/3.0;
-  CCTK_REAL const ktwothird = 2.0/3.0;
-  CCTK_REAL const kfourthird = 4.0/3.0;
-  CCTK_REAL const keightthird = 8.0/3.0;
-  CCTK_REAL const hdxi = 0.5 * dxi;
-  CCTK_REAL const hdyi = 0.5 * dyi;
-  CCTK_REAL const hdzi = 0.5 * dzi;
-  
-  /* Initialize predefined quantities */
-  CCTK_REAL const p1o12dx = INV(dx)/12.;
-  CCTK_REAL const p1o12dy = INV(dy)/12.;
-  CCTK_REAL const p1o12dz = INV(dz)/12.;
-  CCTK_REAL const p1o144dxdy = (INV(dx)*INV(dy))/144.;
-  CCTK_REAL const p1o144dxdz = (INV(dx)*INV(dz))/144.;
-  CCTK_REAL const p1o144dydz = (INV(dy)*INV(dz))/144.;
-  CCTK_REAL const pm1o12dx2 = -pow(dx,-2)/12.;
-  CCTK_REAL const pm1o12dy2 = -pow(dy,-2)/12.;
-  CCTK_REAL const pm1o12dz2 = -pow(dz,-2)/12.;
-  
-  /* Loop over the grid points */
-  #pragma omp parallel
-  LC_LOOP3 (WTFO_RHS,
-            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 const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    /* Declare derivatives */
-    // CCTK_REAL PDstandardNth1rho = INITVALUE;
-    // CCTK_REAL PDstandardNth2rho = INITVALUE;
-    // CCTK_REAL PDstandardNth3rho = INITVALUE;
-    // CCTK_REAL PDstandardNth1v1 = INITVALUE;
-    // CCTK_REAL PDstandardNth2v2 = INITVALUE;
-    // CCTK_REAL PDstandardNth3v3 = INITVALUE;
-    
-    /* Assign local copies of grid functions */
-    CCTK_REAL  rhoL = rho[index];
-    CCTK_REAL  v1L = v1[index];
-    CCTK_REAL  v2L = v2[index];
-    CCTK_REAL  v3L = v3[index];
-    
-    /* Include user supplied include files */
-    
-    /* Precompute derivatives */
-    CCTK_REAL const PDstandardNth1rho = PDstandardNth1(rho, i, j, k);
-    CCTK_REAL const PDstandardNth2rho = PDstandardNth2(rho, i, j, k);
-    CCTK_REAL const PDstandardNth3rho = PDstandardNth3(rho, i, j, k);
-    CCTK_REAL const PDstandardNth1v1 = PDstandardNth1(v1, i, j, k);
-    CCTK_REAL const PDstandardNth2v2 = PDstandardNth2(v2, i, j, k);
-    CCTK_REAL const PDstandardNth3v3 = PDstandardNth3(v3, i, j, k);
-    
-    /* Calculate temporaries and grid functions */
-    CCTK_REAL urhsL = rhoL;
-    
-    CCTK_REAL rhorhsL = PDstandardNth1v1 + PDstandardNth2v2 + 
-      PDstandardNth3v3;
-    
-    CCTK_REAL v1rhsL = PDstandardNth1rho;
-    
-    CCTK_REAL v2rhsL = PDstandardNth2rho;
-    
-    CCTK_REAL v3rhsL = PDstandardNth3rho;
-    
-    
-    /* Copy local copies back to grid functions */
-    rhorhs[index] = rhorhsL;
-    urhs[index] = urhsL;
-    v1rhs[index] = v1rhsL;
-    v2rhs[index] = v2rhsL;
-    v3rhs[index] = v3rhsL;
-  }
-  LC_ENDLOOP3 (WTFO_RHS);
-}
-
-void WTFO_RHS(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  GenericFD_LoopOverInterior(cctkGH, &WTFO_RHS_Body);
-}
diff --git a/ML_WaveToyFO/src/WTFO_constraints.c b/ML_WaveToyFO/src/WTFO_constraints.c
deleted file mode 100644
index 875954c..0000000
--- a/ML_WaveToyFO/src/WTFO_constraints.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*  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 WTFO_constraints_SelectBCs(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  CCTK_INT ierr = 0;
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_WaveToyFO::WT_w","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for ML_WaveToyFO::WT_w.");
-  return;
-}
-
-void WTFO_constraints_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  
-  /* Declare finite differencing variables */
-  
-  if (verbose > 1)
-  {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering WTFO_constraints_Body");
-  }
-  
-  if (cctk_iteration % WTFO_constraints_calc_every != WTFO_constraints_calc_offset)
-  {
-    return;
-  }
-  
-  /* Include user-supplied include files */
-  
-  /* Initialise finite differencing variables */
-  CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
-  CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
-  CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
-  int const di = 1;
-  int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
-  CCTK_REAL const dxi = 1.0 / dx;
-  CCTK_REAL const dyi = 1.0 / dy;
-  CCTK_REAL const dzi = 1.0 / dz;
-  CCTK_REAL const khalf = 0.5;
-  CCTK_REAL const kthird = 1/3.0;
-  CCTK_REAL const ktwothird = 2.0/3.0;
-  CCTK_REAL const kfourthird = 4.0/3.0;
-  CCTK_REAL const keightthird = 8.0/3.0;
-  CCTK_REAL const hdxi = 0.5 * dxi;
-  CCTK_REAL const hdyi = 0.5 * dyi;
-  CCTK_REAL const hdzi = 0.5 * dzi;
-  
-  /* Initialize predefined quantities */
-  CCTK_REAL const p1o12dx = INV(dx)/12.;
-  CCTK_REAL const p1o12dy = INV(dy)/12.;
-  CCTK_REAL const p1o12dz = INV(dz)/12.;
-  CCTK_REAL const p1o144dxdy = (INV(dx)*INV(dy))/144.;
-  CCTK_REAL const p1o144dxdz = (INV(dx)*INV(dz))/144.;
-  CCTK_REAL const p1o144dydz = (INV(dy)*INV(dz))/144.;
-  CCTK_REAL const pm1o12dx2 = -pow(dx,-2)/12.;
-  CCTK_REAL const pm1o12dy2 = -pow(dy,-2)/12.;
-  CCTK_REAL const pm1o12dz2 = -pow(dz,-2)/12.;
-  
-  /* Loop over the grid points */
-  #pragma omp parallel
-  LC_LOOP3 (WTFO_constraints,
-            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 const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    /* Declare derivatives */
-    // CCTK_REAL PDstandardNth2v1 = INITVALUE;
-    // CCTK_REAL PDstandardNth3v1 = INITVALUE;
-    // CCTK_REAL PDstandardNth1v2 = INITVALUE;
-    // CCTK_REAL PDstandardNth3v2 = INITVALUE;
-    // CCTK_REAL PDstandardNth1v3 = INITVALUE;
-    // CCTK_REAL PDstandardNth2v3 = INITVALUE;
-    
-    /* Assign local copies of grid functions */
-    CCTK_REAL  v1L = v1[index];
-    CCTK_REAL  v2L = v2[index];
-    CCTK_REAL  v3L = v3[index];
-    
-    /* Include user supplied include files */
-    
-    /* Precompute derivatives */
-    CCTK_REAL const PDstandardNth2v1 = PDstandardNth2(v1, i, j, k);
-    CCTK_REAL const PDstandardNth3v1 = PDstandardNth3(v1, i, j, k);
-    CCTK_REAL const PDstandardNth1v2 = PDstandardNth1(v2, i, j, k);
-    CCTK_REAL const PDstandardNth3v2 = PDstandardNth3(v2, i, j, k);
-    CCTK_REAL const PDstandardNth1v3 = PDstandardNth1(v3, i, j, k);
-    CCTK_REAL const PDstandardNth2v3 = PDstandardNth2(v3, i, j, k);
-    
-    /* Calculate temporaries and grid functions */
-    CCTK_REAL w1L = -PDstandardNth2v3 + PDstandardNth3v2;
-    
-    CCTK_REAL w2L = PDstandardNth1v3 - PDstandardNth3v1;
-    
-    CCTK_REAL w3L = -PDstandardNth1v2 + PDstandardNth2v1;
-    
-    
-    /* Copy local copies back to grid functions */
-    w1[index] = w1L;
-    w2[index] = w2L;
-    w3[index] = w3L;
-  }
-  LC_ENDLOOP3 (WTFO_constraints);
-}
-
-void WTFO_constraints(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  GenericFD_LoopOverInterior(cctkGH, &WTFO_constraints_Body);
-}
diff --git a/ML_WaveToyFO/src/make.code.defn b/ML_WaveToyFO/src/make.code.defn
index a18c783..d60b8d6 100644
--- a/ML_WaveToyFO/src/make.code.defn
+++ b/ML_WaveToyFO/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c WTFO_Gaussian.c WTFO_RHS.c WTFO_constraints.c Boundaries.c 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc WTFO_Gaussian.cc WTFO_RHS.cc WTFO_constraints.cc Boundaries.cc