Regenerate code

Test ML_BSSN_sgw3d_rhs fails with differences in B, Brhs and betarhs because the initial data for these has been modified.  Tests ML_BSSN_sgw3d and ML_BSSN_O8_sgw3d_rhs fail in all variables due to coupling.

24 files changed, 1382 insertions, 6 deletions

diff --git a/ML_BSSN/param.ccl b/ML_BSSN/param.ccl
index e70849a..3d1cb43 100644
--- a/ML_BSSN/param.ccl
+++ b/ML_BSSN/param.ccl
@@ -263,6 +263,12 @@ CCTK_INT ML_BSSN_Advect_calc_every "ML_BSSN_Advect_calc_every" STEERABLE=ALWAYS
 } 1
 
 restricted:
+CCTK_INT ML_BSSN_InitRHS_calc_every "ML_BSSN_InitRHS_calc_every" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN_RHSStaticBoundary_calc_every "ML_BSSN_RHSStaticBoundary_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -365,6 +371,12 @@ CCTK_INT ML_BSSN_Advect_calc_offset "ML_BSSN_Advect_calc_offset" STEERABLE=ALWAY
 } 0
 
 restricted:
+CCTK_INT ML_BSSN_InitRHS_calc_offset "ML_BSSN_InitRHS_calc_offset" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 0
+
+restricted:
 CCTK_INT ML_BSSN_RHSStaticBoundary_calc_offset "ML_BSSN_RHSStaticBoundary_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN/schedule.ccl b/ML_BSSN/schedule.ccl
index f5679ed..8bbb338 100644
--- a/ML_BSSN/schedule.ccl
+++ b/ML_BSSN/schedule.ccl
@@ -326,6 +326,11 @@ schedule ML_BSSN_Advect IN ML_BSSN_evolCalcGroup after ML_BSSN_RHS2
   LANG: C
 } "ML_BSSN_Advect"
 
+schedule ML_BSSN_InitRHS AT ANALYSIS before ML_BSSN_evolCalcGroup
+{
+  LANG: C
+} "ML_BSSN_InitRHS"
+
 
 if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
 {
diff --git a/ML_BSSN/src/ML_BSSN_InitRHS.cc b/ML_BSSN/src/ML_BSSN_InitRHS.cc
new file mode 100644
index 0000000..24f5ae8
--- /dev/null
+++ b/ML_BSSN/src/ML_BSSN_InitRHS.cc
@@ -0,0 +1,194 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 QAD(x) (SQR(SQR(x)))
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+
+static void ML_BSSN_InitRHS_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 ML_BSSN_InitRHS_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_InitRHS_calc_every != ML_BSSN_InitRHS_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_BSSN::ML_curvrhs","ML_BSSN::ML_dtlapserhs","ML_BSSN::ML_dtshiftrhs","ML_BSSN::ML_Gammarhs","ML_BSSN::ML_lapserhs","ML_BSSN::ML_log_confacrhs","ML_BSSN::ML_metricrhs","ML_BSSN::ML_shiftrhs","ML_BSSN::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_InitRHS", 9, groups);
+  
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  ptrdiff_t const di = 1;
+  ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
+  CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
+  CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
+  CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
+  CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const dxi = INV(dx);
+  CCTK_REAL const dyi = INV(dy);
+  CCTK_REAL const dzi = INV(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 = 0.0833333333333333333333333333333*INV(dx);
+  CCTK_REAL const p1o12dy = 0.0833333333333333333333333333333*INV(dy);
+  CCTK_REAL const p1o12dz = 0.0833333333333333333333333333333*INV(dz);
+  CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx)*INV(dy);
+  CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx)*INV(dz);
+  CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy)*INV(dz);
+  CCTK_REAL const p1o24dx = 0.0416666666666666666666666666667*INV(dx);
+  CCTK_REAL const p1o24dy = 0.0416666666666666666666666666667*INV(dy);
+  CCTK_REAL const p1o24dz = 0.0416666666666666666666666666667*INV(dz);
+  CCTK_REAL const p1o64dx = 0.015625*INV(dx);
+  CCTK_REAL const p1o64dy = 0.015625*INV(dy);
+  CCTK_REAL const p1o64dz = 0.015625*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o12dx2 = -0.0833333333333333333333333333333*INV(SQR(dx));
+  CCTK_REAL const pm1o12dy2 = -0.0833333333333333333333333333333*INV(SQR(dy));
+  CCTK_REAL const pm1o12dz2 = -0.0833333333333333333333333333333*INV(SQR(dz));
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_InitRHS,
+    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL phirhsL = 0;
+    
+    CCTK_REAL gt11rhsL = 0;
+    
+    CCTK_REAL gt12rhsL = 0;
+    
+    CCTK_REAL gt13rhsL = 0;
+    
+    CCTK_REAL gt22rhsL = 0;
+    
+    CCTK_REAL gt23rhsL = 0;
+    
+    CCTK_REAL gt33rhsL = 0;
+    
+    CCTK_REAL trKrhsL = 0;
+    
+    CCTK_REAL At11rhsL = 0;
+    
+    CCTK_REAL At12rhsL = 0;
+    
+    CCTK_REAL At13rhsL = 0;
+    
+    CCTK_REAL At22rhsL = 0;
+    
+    CCTK_REAL At23rhsL = 0;
+    
+    CCTK_REAL At33rhsL = 0;
+    
+    CCTK_REAL Xt1rhsL = 0;
+    
+    CCTK_REAL Xt2rhsL = 0;
+    
+    CCTK_REAL Xt3rhsL = 0;
+    
+    CCTK_REAL alpharhsL = 0;
+    
+    CCTK_REAL ArhsL = 0;
+    
+    CCTK_REAL beta1rhsL = 0;
+    
+    CCTK_REAL beta2rhsL = 0;
+    
+    CCTK_REAL beta3rhsL = 0;
+    
+    CCTK_REAL B1rhsL = 0;
+    
+    CCTK_REAL B2rhsL = 0;
+    
+    CCTK_REAL 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;
+  }
+  LC_ENDLOOP3 (ML_BSSN_InitRHS);
+}
+
+extern "C" void ML_BSSN_InitRHS(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_InitRHS_Body);
+}
diff --git a/ML_BSSN/src/make.code.defn b/ML_BSSN/src/make.code.defn
index 17219b8..5fdc3cf 100644
--- a/ML_BSSN/src/make.code.defn
+++ b/ML_BSSN/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_Minkowski.cc ML_BSSN_convertFromADMBase.cc ML_BSSN_InitGamma.cc ML_BSSN_convertFromADMBaseGamma.cc ML_BSSN_RHS1.cc ML_BSSN_RHS2.cc ML_BSSN_Dissipation.cc ML_BSSN_Advect.cc ML_BSSN_RHSStaticBoundary.cc ML_BSSN_enforce.cc ML_BSSN_boundary.cc ML_BSSN_convertToADMBase.cc ML_BSSN_convertToADMBaseDtLapseShift.cc ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_constraints1.cc ML_BSSN_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_Minkowski.cc ML_BSSN_convertFromADMBase.cc ML_BSSN_InitGamma.cc ML_BSSN_convertFromADMBaseGamma.cc ML_BSSN_RHS1.cc ML_BSSN_RHS2.cc ML_BSSN_Dissipation.cc ML_BSSN_Advect.cc ML_BSSN_InitRHS.cc ML_BSSN_RHSStaticBoundary.cc ML_BSSN_enforce.cc ML_BSSN_boundary.cc ML_BSSN_convertToADMBase.cc ML_BSSN_convertToADMBaseDtLapseShift.cc ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_constraints1.cc ML_BSSN_constraints2.cc Boundaries.cc 
diff --git a/ML_BSSN_MP/param.ccl b/ML_BSSN_MP/param.ccl
index 844250c..80d0e00 100644
--- a/ML_BSSN_MP/param.ccl
+++ b/ML_BSSN_MP/param.ccl
@@ -266,6 +266,12 @@ CCTK_INT ML_BSSN_MP_Advect_calc_every "ML_BSSN_MP_Advect_calc_every" STEERABLE=A
 } 1
 
 restricted:
+CCTK_INT ML_BSSN_MP_InitRHS_calc_every "ML_BSSN_MP_InitRHS_calc_every" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN_MP_RHSStaticBoundary_calc_every "ML_BSSN_MP_RHSStaticBoundary_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -368,6 +374,12 @@ CCTK_INT ML_BSSN_MP_Advect_calc_offset "ML_BSSN_MP_Advect_calc_offset" STEERABLE
 } 0
 
 restricted:
+CCTK_INT ML_BSSN_MP_InitRHS_calc_offset "ML_BSSN_MP_InitRHS_calc_offset" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 0
+
+restricted:
 CCTK_INT ML_BSSN_MP_RHSStaticBoundary_calc_offset "ML_BSSN_MP_RHSStaticBoundary_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN_MP/schedule.ccl b/ML_BSSN_MP/schedule.ccl
index a0c0fd6..f00f79c 100644
--- a/ML_BSSN_MP/schedule.ccl
+++ b/ML_BSSN_MP/schedule.ccl
@@ -326,6 +326,11 @@ schedule ML_BSSN_MP_Advect IN ML_BSSN_MP_evolCalcGroup after ML_BSSN_MP_RHS2
   LANG: C
 } "ML_BSSN_MP_Advect"
 
+schedule ML_BSSN_MP_InitRHS AT ANALYSIS before ML_BSSN_MP_evolCalcGroup
+{
+  LANG: C
+} "ML_BSSN_MP_InitRHS"
+
 
 if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
 {
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_InitRHS.cc b/ML_BSSN_MP/src/ML_BSSN_MP_InitRHS.cc
new file mode 100644
index 0000000..a40c62f
--- /dev/null
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_InitRHS.cc
@@ -0,0 +1,240 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 QAD(x) (SQR(SQR(x)))
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+
+static void ML_BSSN_MP_InitRHS_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 ML_BSSN_MP_InitRHS_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_MP_InitRHS_calc_every != ML_BSSN_MP_InitRHS_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_BSSN_MP::ML_curvrhs","ML_BSSN_MP::ML_dtlapserhs","ML_BSSN_MP::ML_dtshiftrhs","ML_BSSN_MP::ML_Gammarhs","ML_BSSN_MP::ML_lapserhs","ML_BSSN_MP::ML_log_confacrhs","ML_BSSN_MP::ML_metricrhs","ML_BSSN_MP::ML_shiftrhs","ML_BSSN_MP::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_MP_InitRHS", 9, groups);
+  
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  ptrdiff_t const di = 1;
+  ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
+  CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
+  CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
+  CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
+  CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const dxi = INV(dx);
+  CCTK_REAL const dyi = INV(dy);
+  CCTK_REAL const dzi = INV(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 = 0.0833333333333333333333333333333*INV(dx);
+  CCTK_REAL const p1o12dy = 0.0833333333333333333333333333333*INV(dy);
+  CCTK_REAL const p1o12dz = 0.0833333333333333333333333333333*INV(dz);
+  CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx)*INV(dy);
+  CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx)*INV(dz);
+  CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy)*INV(dz);
+  CCTK_REAL const p1o24dx = 0.0416666666666666666666666666667*INV(dx);
+  CCTK_REAL const p1o24dy = 0.0416666666666666666666666666667*INV(dy);
+  CCTK_REAL const p1o24dz = 0.0416666666666666666666666666667*INV(dz);
+  CCTK_REAL const p1o64dx = 0.015625*INV(dx);
+  CCTK_REAL const p1o64dy = 0.015625*INV(dy);
+  CCTK_REAL const p1o64dz = 0.015625*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o12dx2 = -0.0833333333333333333333333333333*INV(SQR(dx));
+  CCTK_REAL const pm1o12dy2 = -0.0833333333333333333333333333333*INV(SQR(dy));
+  CCTK_REAL const pm1o12dz2 = -0.0833333333333333333333333333333*INV(SQR(dz));
+  
+  /* Jacobian variable pointers */
+  bool const use_jacobian = (!CCTK_IsFunctionAliased("MultiPatch_GetMap") || MultiPatch_GetMap(cctkGH) != jacobian_identity_map)
+                       && strlen(jacobian_group) > 0;
+  if (use_jacobian && strlen(jacobian_derivative_group) == 0)
+  {
+    CCTK_WARN (1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
+  }
+  
+  CCTK_REAL const *restrict jacobian_ptrs[9];
+  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_group,
+                                                9, jacobian_ptrs);
+  
+  CCTK_REAL const *restrict const J11 = use_jacobian ? jacobian_ptrs[0] : 0;
+  CCTK_REAL const *restrict const J12 = use_jacobian ? jacobian_ptrs[1] : 0;
+  CCTK_REAL const *restrict const J13 = use_jacobian ? jacobian_ptrs[2] : 0;
+  CCTK_REAL const *restrict const J21 = use_jacobian ? jacobian_ptrs[3] : 0;
+  CCTK_REAL const *restrict const J22 = use_jacobian ? jacobian_ptrs[4] : 0;
+  CCTK_REAL const *restrict const J23 = use_jacobian ? jacobian_ptrs[5] : 0;
+  CCTK_REAL const *restrict const J31 = use_jacobian ? jacobian_ptrs[6] : 0;
+  CCTK_REAL const *restrict const J32 = use_jacobian ? jacobian_ptrs[7] : 0;
+  CCTK_REAL const *restrict const J33 = use_jacobian ? jacobian_ptrs[8] : 0;
+  
+  CCTK_REAL const *restrict jacobian_derivative_ptrs[18];
+  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
+                                                18, jacobian_derivative_ptrs);
+  
+  CCTK_REAL const *restrict const dJ111 = use_jacobian ? jacobian_derivative_ptrs[0] : 0;
+  CCTK_REAL const *restrict const dJ112 = use_jacobian ? jacobian_derivative_ptrs[1] : 0;
+  CCTK_REAL const *restrict const dJ113 = use_jacobian ? jacobian_derivative_ptrs[2] : 0;
+  CCTK_REAL const *restrict const dJ122 = use_jacobian ? jacobian_derivative_ptrs[3] : 0;
+  CCTK_REAL const *restrict const dJ123 = use_jacobian ? jacobian_derivative_ptrs[4] : 0;
+  CCTK_REAL const *restrict const dJ133 = use_jacobian ? jacobian_derivative_ptrs[5] : 0;
+  CCTK_REAL const *restrict const dJ211 = use_jacobian ? jacobian_derivative_ptrs[6] : 0;
+  CCTK_REAL const *restrict const dJ212 = use_jacobian ? jacobian_derivative_ptrs[7] : 0;
+  CCTK_REAL const *restrict const dJ213 = use_jacobian ? jacobian_derivative_ptrs[8] : 0;
+  CCTK_REAL const *restrict const dJ222 = use_jacobian ? jacobian_derivative_ptrs[9] : 0;
+  CCTK_REAL const *restrict const dJ223 = use_jacobian ? jacobian_derivative_ptrs[10] : 0;
+  CCTK_REAL const *restrict const dJ233 = use_jacobian ? jacobian_derivative_ptrs[11] : 0;
+  CCTK_REAL const *restrict const dJ311 = use_jacobian ? jacobian_derivative_ptrs[12] : 0;
+  CCTK_REAL const *restrict const dJ312 = use_jacobian ? jacobian_derivative_ptrs[13] : 0;
+  CCTK_REAL const *restrict const dJ313 = use_jacobian ? jacobian_derivative_ptrs[14] : 0;
+  CCTK_REAL const *restrict const dJ322 = use_jacobian ? jacobian_derivative_ptrs[15] : 0;
+  CCTK_REAL const *restrict const dJ323 = use_jacobian ? jacobian_derivative_ptrs[16] : 0;
+  CCTK_REAL const *restrict const dJ333 = use_jacobian ? jacobian_derivative_ptrs[17] : 0;
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_MP_InitRHS,
+    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL phirhsL = 0;
+    
+    CCTK_REAL gt11rhsL = 0;
+    
+    CCTK_REAL gt12rhsL = 0;
+    
+    CCTK_REAL gt13rhsL = 0;
+    
+    CCTK_REAL gt22rhsL = 0;
+    
+    CCTK_REAL gt23rhsL = 0;
+    
+    CCTK_REAL gt33rhsL = 0;
+    
+    CCTK_REAL trKrhsL = 0;
+    
+    CCTK_REAL At11rhsL = 0;
+    
+    CCTK_REAL At12rhsL = 0;
+    
+    CCTK_REAL At13rhsL = 0;
+    
+    CCTK_REAL At22rhsL = 0;
+    
+    CCTK_REAL At23rhsL = 0;
+    
+    CCTK_REAL At33rhsL = 0;
+    
+    CCTK_REAL Xt1rhsL = 0;
+    
+    CCTK_REAL Xt2rhsL = 0;
+    
+    CCTK_REAL Xt3rhsL = 0;
+    
+    CCTK_REAL alpharhsL = 0;
+    
+    CCTK_REAL ArhsL = 0;
+    
+    CCTK_REAL beta1rhsL = 0;
+    
+    CCTK_REAL beta2rhsL = 0;
+    
+    CCTK_REAL beta3rhsL = 0;
+    
+    CCTK_REAL B1rhsL = 0;
+    
+    CCTK_REAL B2rhsL = 0;
+    
+    CCTK_REAL 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;
+  }
+  LC_ENDLOOP3 (ML_BSSN_MP_InitRHS);
+}
+
+extern "C" void ML_BSSN_MP_InitRHS(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_MP_InitRHS_Body);
+}
diff --git a/ML_BSSN_MP/src/make.code.defn b/ML_BSSN_MP/src/make.code.defn
index 8db0cbb..a63207b 100644
--- a/ML_BSSN_MP/src/make.code.defn
+++ b/ML_BSSN_MP/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_MP_Minkowski.cc ML_BSSN_MP_convertFromADMBase.cc ML_BSSN_MP_InitGamma.cc ML_BSSN_MP_convertFromADMBaseGamma.cc ML_BSSN_MP_RHS1.cc ML_BSSN_MP_RHS2.cc ML_BSSN_MP_Dissipation.cc ML_BSSN_MP_Advect.cc ML_BSSN_MP_RHSStaticBoundary.cc ML_BSSN_MP_enforce.cc ML_BSSN_MP_boundary.cc ML_BSSN_MP_convertToADMBase.cc ML_BSSN_MP_convertToADMBaseDtLapseShift.cc ML_BSSN_MP_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_MP_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_MP_constraints1.cc ML_BSSN_MP_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_MP_Minkowski.cc ML_BSSN_MP_convertFromADMBase.cc ML_BSSN_MP_InitGamma.cc ML_BSSN_MP_convertFromADMBaseGamma.cc ML_BSSN_MP_RHS1.cc ML_BSSN_MP_RHS2.cc ML_BSSN_MP_Dissipation.cc ML_BSSN_MP_Advect.cc ML_BSSN_MP_InitRHS.cc ML_BSSN_MP_RHSStaticBoundary.cc ML_BSSN_MP_enforce.cc ML_BSSN_MP_boundary.cc ML_BSSN_MP_convertToADMBase.cc ML_BSSN_MP_convertToADMBaseDtLapseShift.cc ML_BSSN_MP_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_MP_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_MP_constraints1.cc ML_BSSN_MP_constraints2.cc Boundaries.cc 
diff --git a/ML_BSSN_MP_O8/param.ccl b/ML_BSSN_MP_O8/param.ccl
index db03946..e1fd41f 100644
--- a/ML_BSSN_MP_O8/param.ccl
+++ b/ML_BSSN_MP_O8/param.ccl
@@ -266,6 +266,12 @@ CCTK_INT ML_BSSN_MP_O8_Advect_calc_every "ML_BSSN_MP_O8_Advect_calc_every" STEER
 } 1
 
 restricted:
+CCTK_INT ML_BSSN_MP_O8_InitRHS_calc_every "ML_BSSN_MP_O8_InitRHS_calc_every" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN_MP_O8_RHSStaticBoundary_calc_every "ML_BSSN_MP_O8_RHSStaticBoundary_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -368,6 +374,12 @@ CCTK_INT ML_BSSN_MP_O8_Advect_calc_offset "ML_BSSN_MP_O8_Advect_calc_offset" STE
 } 0
 
 restricted:
+CCTK_INT ML_BSSN_MP_O8_InitRHS_calc_offset "ML_BSSN_MP_O8_InitRHS_calc_offset" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 0
+
+restricted:
 CCTK_INT ML_BSSN_MP_O8_RHSStaticBoundary_calc_offset "ML_BSSN_MP_O8_RHSStaticBoundary_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN_MP_O8/schedule.ccl b/ML_BSSN_MP_O8/schedule.ccl
index c19dda7..60fd34c 100644
--- a/ML_BSSN_MP_O8/schedule.ccl
+++ b/ML_BSSN_MP_O8/schedule.ccl
@@ -326,6 +326,11 @@ schedule ML_BSSN_MP_O8_Advect IN ML_BSSN_MP_O8_evolCalcGroup after ML_BSSN_MP_O8
   LANG: C
 } "ML_BSSN_MP_O8_Advect"
 
+schedule ML_BSSN_MP_O8_InitRHS AT ANALYSIS before ML_BSSN_MP_O8_evolCalcGroup
+{
+  LANG: C
+} "ML_BSSN_MP_O8_InitRHS"
+
 
 if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
 {
diff --git a/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_InitRHS.cc b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_InitRHS.cc
new file mode 100644
index 0000000..b797780
--- /dev/null
+++ b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_InitRHS.cc
@@ -0,0 +1,246 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 QAD(x) (SQR(SQR(x)))
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+
+static void ML_BSSN_MP_O8_InitRHS_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 ML_BSSN_MP_O8_InitRHS_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_MP_O8_InitRHS_calc_every != ML_BSSN_MP_O8_InitRHS_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_BSSN_MP_O8::ML_curvrhs","ML_BSSN_MP_O8::ML_dtlapserhs","ML_BSSN_MP_O8::ML_dtshiftrhs","ML_BSSN_MP_O8::ML_Gammarhs","ML_BSSN_MP_O8::ML_lapserhs","ML_BSSN_MP_O8::ML_log_confacrhs","ML_BSSN_MP_O8::ML_metricrhs","ML_BSSN_MP_O8::ML_shiftrhs","ML_BSSN_MP_O8::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_MP_O8_InitRHS", 9, groups);
+  
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  ptrdiff_t const di = 1;
+  ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
+  CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
+  CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
+  CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
+  CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const dxi = INV(dx);
+  CCTK_REAL const dyi = INV(dy);
+  CCTK_REAL const dzi = INV(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 p1o1024dx = 0.0009765625*INV(dx);
+  CCTK_REAL const p1o1024dy = 0.0009765625*INV(dy);
+  CCTK_REAL const p1o1024dz = 0.0009765625*INV(dz);
+  CCTK_REAL const p1o1680dx = 0.000595238095238095238095238095238*INV(dx);
+  CCTK_REAL const p1o1680dy = 0.000595238095238095238095238095238*INV(dy);
+  CCTK_REAL const p1o1680dz = 0.000595238095238095238095238095238*INV(dz);
+  CCTK_REAL const p1o5040dx2 = 0.000198412698412698412698412698413*INV(SQR(dx));
+  CCTK_REAL const p1o5040dy2 = 0.000198412698412698412698412698413*INV(SQR(dy));
+  CCTK_REAL const p1o5040dz2 = 0.000198412698412698412698412698413*INV(SQR(dz));
+  CCTK_REAL const p1o560dx = 0.00178571428571428571428571428571*INV(dx);
+  CCTK_REAL const p1o560dy = 0.00178571428571428571428571428571*INV(dy);
+  CCTK_REAL const p1o560dz = 0.00178571428571428571428571428571*INV(dz);
+  CCTK_REAL const p1o705600dxdy = 1.41723356009070294784580498866e-6*INV(dx)*INV(dy);
+  CCTK_REAL const p1o705600dxdz = 1.41723356009070294784580498866e-6*INV(dx)*INV(dz);
+  CCTK_REAL const p1o705600dydz = 1.41723356009070294784580498866e-6*INV(dy)*INV(dz);
+  CCTK_REAL const p1o840dx = 0.00119047619047619047619047619048*INV(dx);
+  CCTK_REAL const p1o840dy = 0.00119047619047619047619047619048*INV(dy);
+  CCTK_REAL const p1o840dz = 0.00119047619047619047619047619048*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o840dx = -0.00119047619047619047619047619048*INV(dx);
+  CCTK_REAL const pm1o840dy = -0.00119047619047619047619047619048*INV(dy);
+  CCTK_REAL const pm1o840dz = -0.00119047619047619047619047619048*INV(dz);
+  
+  /* Jacobian variable pointers */
+  bool const use_jacobian = (!CCTK_IsFunctionAliased("MultiPatch_GetMap") || MultiPatch_GetMap(cctkGH) != jacobian_identity_map)
+                       && strlen(jacobian_group) > 0;
+  if (use_jacobian && strlen(jacobian_derivative_group) == 0)
+  {
+    CCTK_WARN (1, "GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names");
+  }
+  
+  CCTK_REAL const *restrict jacobian_ptrs[9];
+  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_group,
+                                                9, jacobian_ptrs);
+  
+  CCTK_REAL const *restrict const J11 = use_jacobian ? jacobian_ptrs[0] : 0;
+  CCTK_REAL const *restrict const J12 = use_jacobian ? jacobian_ptrs[1] : 0;
+  CCTK_REAL const *restrict const J13 = use_jacobian ? jacobian_ptrs[2] : 0;
+  CCTK_REAL const *restrict const J21 = use_jacobian ? jacobian_ptrs[3] : 0;
+  CCTK_REAL const *restrict const J22 = use_jacobian ? jacobian_ptrs[4] : 0;
+  CCTK_REAL const *restrict const J23 = use_jacobian ? jacobian_ptrs[5] : 0;
+  CCTK_REAL const *restrict const J31 = use_jacobian ? jacobian_ptrs[6] : 0;
+  CCTK_REAL const *restrict const J32 = use_jacobian ? jacobian_ptrs[7] : 0;
+  CCTK_REAL const *restrict const J33 = use_jacobian ? jacobian_ptrs[8] : 0;
+  
+  CCTK_REAL const *restrict jacobian_derivative_ptrs[18];
+  if (use_jacobian) GenericFD_GroupDataPointers(cctkGH, jacobian_derivative_group,
+                                                18, jacobian_derivative_ptrs);
+  
+  CCTK_REAL const *restrict const dJ111 = use_jacobian ? jacobian_derivative_ptrs[0] : 0;
+  CCTK_REAL const *restrict const dJ112 = use_jacobian ? jacobian_derivative_ptrs[1] : 0;
+  CCTK_REAL const *restrict const dJ113 = use_jacobian ? jacobian_derivative_ptrs[2] : 0;
+  CCTK_REAL const *restrict const dJ122 = use_jacobian ? jacobian_derivative_ptrs[3] : 0;
+  CCTK_REAL const *restrict const dJ123 = use_jacobian ? jacobian_derivative_ptrs[4] : 0;
+  CCTK_REAL const *restrict const dJ133 = use_jacobian ? jacobian_derivative_ptrs[5] : 0;
+  CCTK_REAL const *restrict const dJ211 = use_jacobian ? jacobian_derivative_ptrs[6] : 0;
+  CCTK_REAL const *restrict const dJ212 = use_jacobian ? jacobian_derivative_ptrs[7] : 0;
+  CCTK_REAL const *restrict const dJ213 = use_jacobian ? jacobian_derivative_ptrs[8] : 0;
+  CCTK_REAL const *restrict const dJ222 = use_jacobian ? jacobian_derivative_ptrs[9] : 0;
+  CCTK_REAL const *restrict const dJ223 = use_jacobian ? jacobian_derivative_ptrs[10] : 0;
+  CCTK_REAL const *restrict const dJ233 = use_jacobian ? jacobian_derivative_ptrs[11] : 0;
+  CCTK_REAL const *restrict const dJ311 = use_jacobian ? jacobian_derivative_ptrs[12] : 0;
+  CCTK_REAL const *restrict const dJ312 = use_jacobian ? jacobian_derivative_ptrs[13] : 0;
+  CCTK_REAL const *restrict const dJ313 = use_jacobian ? jacobian_derivative_ptrs[14] : 0;
+  CCTK_REAL const *restrict const dJ322 = use_jacobian ? jacobian_derivative_ptrs[15] : 0;
+  CCTK_REAL const *restrict const dJ323 = use_jacobian ? jacobian_derivative_ptrs[16] : 0;
+  CCTK_REAL const *restrict const dJ333 = use_jacobian ? jacobian_derivative_ptrs[17] : 0;
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_MP_O8_InitRHS,
+    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL phirhsL = 0;
+    
+    CCTK_REAL gt11rhsL = 0;
+    
+    CCTK_REAL gt12rhsL = 0;
+    
+    CCTK_REAL gt13rhsL = 0;
+    
+    CCTK_REAL gt22rhsL = 0;
+    
+    CCTK_REAL gt23rhsL = 0;
+    
+    CCTK_REAL gt33rhsL = 0;
+    
+    CCTK_REAL trKrhsL = 0;
+    
+    CCTK_REAL At11rhsL = 0;
+    
+    CCTK_REAL At12rhsL = 0;
+    
+    CCTK_REAL At13rhsL = 0;
+    
+    CCTK_REAL At22rhsL = 0;
+    
+    CCTK_REAL At23rhsL = 0;
+    
+    CCTK_REAL At33rhsL = 0;
+    
+    CCTK_REAL Xt1rhsL = 0;
+    
+    CCTK_REAL Xt2rhsL = 0;
+    
+    CCTK_REAL Xt3rhsL = 0;
+    
+    CCTK_REAL alpharhsL = 0;
+    
+    CCTK_REAL ArhsL = 0;
+    
+    CCTK_REAL beta1rhsL = 0;
+    
+    CCTK_REAL beta2rhsL = 0;
+    
+    CCTK_REAL beta3rhsL = 0;
+    
+    CCTK_REAL B1rhsL = 0;
+    
+    CCTK_REAL B2rhsL = 0;
+    
+    CCTK_REAL 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;
+  }
+  LC_ENDLOOP3 (ML_BSSN_MP_O8_InitRHS);
+}
+
+extern "C" void ML_BSSN_MP_O8_InitRHS(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_MP_O8_InitRHS_Body);
+}
diff --git a/ML_BSSN_MP_O8/src/make.code.defn b/ML_BSSN_MP_O8/src/make.code.defn
index 0c7337d..16b178f 100644
--- a/ML_BSSN_MP_O8/src/make.code.defn
+++ b/ML_BSSN_MP_O8/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_MP_O8_Minkowski.cc ML_BSSN_MP_O8_convertFromADMBase.cc ML_BSSN_MP_O8_InitGamma.cc ML_BSSN_MP_O8_convertFromADMBaseGamma.cc ML_BSSN_MP_O8_RHS1.cc ML_BSSN_MP_O8_RHS2.cc ML_BSSN_MP_O8_Dissipation.cc ML_BSSN_MP_O8_Advect.cc ML_BSSN_MP_O8_RHSStaticBoundary.cc ML_BSSN_MP_O8_enforce.cc ML_BSSN_MP_O8_boundary.cc ML_BSSN_MP_O8_convertToADMBase.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShift.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_MP_O8_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_MP_O8_constraints1.cc ML_BSSN_MP_O8_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_MP_O8_Minkowski.cc ML_BSSN_MP_O8_convertFromADMBase.cc ML_BSSN_MP_O8_InitGamma.cc ML_BSSN_MP_O8_convertFromADMBaseGamma.cc ML_BSSN_MP_O8_RHS1.cc ML_BSSN_MP_O8_RHS2.cc ML_BSSN_MP_O8_Dissipation.cc ML_BSSN_MP_O8_Advect.cc ML_BSSN_MP_O8_InitRHS.cc ML_BSSN_MP_O8_RHSStaticBoundary.cc ML_BSSN_MP_O8_enforce.cc ML_BSSN_MP_O8_boundary.cc ML_BSSN_MP_O8_convertToADMBase.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShift.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_MP_O8_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_MP_O8_constraints1.cc ML_BSSN_MP_O8_constraints2.cc Boundaries.cc 
diff --git a/ML_BSSN_O2/param.ccl b/ML_BSSN_O2/param.ccl
index 18a4f2e..9cf8a84 100644
--- a/ML_BSSN_O2/param.ccl
+++ b/ML_BSSN_O2/param.ccl
@@ -263,6 +263,12 @@ CCTK_INT ML_BSSN_O2_Advect_calc_every "ML_BSSN_O2_Advect_calc_every" STEERABLE=A
 } 1
 
 restricted:
+CCTK_INT ML_BSSN_O2_InitRHS_calc_every "ML_BSSN_O2_InitRHS_calc_every" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN_O2_RHSStaticBoundary_calc_every "ML_BSSN_O2_RHSStaticBoundary_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -365,6 +371,12 @@ CCTK_INT ML_BSSN_O2_Advect_calc_offset "ML_BSSN_O2_Advect_calc_offset" STEERABLE
 } 0
 
 restricted:
+CCTK_INT ML_BSSN_O2_InitRHS_calc_offset "ML_BSSN_O2_InitRHS_calc_offset" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 0
+
+restricted:
 CCTK_INT ML_BSSN_O2_RHSStaticBoundary_calc_offset "ML_BSSN_O2_RHSStaticBoundary_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN_O2/schedule.ccl b/ML_BSSN_O2/schedule.ccl
index 14f2b91..3211dd9 100644
--- a/ML_BSSN_O2/schedule.ccl
+++ b/ML_BSSN_O2/schedule.ccl
@@ -326,6 +326,11 @@ schedule ML_BSSN_O2_Advect IN ML_BSSN_O2_evolCalcGroup after ML_BSSN_O2_RHS2
   LANG: C
 } "ML_BSSN_O2_Advect"
 
+schedule ML_BSSN_O2_InitRHS AT ANALYSIS before ML_BSSN_O2_evolCalcGroup
+{
+  LANG: C
+} "ML_BSSN_O2_InitRHS"
+
 
 if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
 {
diff --git a/ML_BSSN_O2/src/ML_BSSN_O2_InitRHS.cc b/ML_BSSN_O2/src/ML_BSSN_O2_InitRHS.cc
new file mode 100644
index 0000000..42677c7
--- /dev/null
+++ b/ML_BSSN_O2/src/ML_BSSN_O2_InitRHS.cc
@@ -0,0 +1,200 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 QAD(x) (SQR(SQR(x)))
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+
+static void ML_BSSN_O2_InitRHS_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 ML_BSSN_O2_InitRHS_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_O2_InitRHS_calc_every != ML_BSSN_O2_InitRHS_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_BSSN_O2::ML_curvrhs","ML_BSSN_O2::ML_dtlapserhs","ML_BSSN_O2::ML_dtshiftrhs","ML_BSSN_O2::ML_Gammarhs","ML_BSSN_O2::ML_lapserhs","ML_BSSN_O2::ML_log_confacrhs","ML_BSSN_O2::ML_metricrhs","ML_BSSN_O2::ML_shiftrhs","ML_BSSN_O2::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_O2_InitRHS", 9, groups);
+  
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  ptrdiff_t const di = 1;
+  ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
+  CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
+  CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
+  CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
+  CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const dxi = INV(dx);
+  CCTK_REAL const dyi = INV(dy);
+  CCTK_REAL const dzi = INV(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 p1o16dx = 0.0625*INV(dx);
+  CCTK_REAL const p1o16dy = 0.0625*INV(dy);
+  CCTK_REAL const p1o16dz = 0.0625*INV(dz);
+  CCTK_REAL const p1o2dx = 0.5*INV(dx);
+  CCTK_REAL const p1o2dy = 0.5*INV(dy);
+  CCTK_REAL const p1o2dz = 0.5*INV(dz);
+  CCTK_REAL const p1o4dx = 0.25*INV(dx);
+  CCTK_REAL const p1o4dxdy = 0.25*INV(dx)*INV(dy);
+  CCTK_REAL const p1o4dxdz = 0.25*INV(dx)*INV(dz);
+  CCTK_REAL const p1o4dy = 0.25*INV(dy);
+  CCTK_REAL const p1o4dydz = 0.25*INV(dy)*INV(dz);
+  CCTK_REAL const p1o4dz = 0.25*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1odx2 = INV(SQR(dx));
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1ody2 = INV(SQR(dy));
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const p1odz2 = INV(SQR(dz));
+  CCTK_REAL const pm1o2dx = -0.5*INV(dx);
+  CCTK_REAL const pm1o2dy = -0.5*INV(dy);
+  CCTK_REAL const pm1o2dz = -0.5*INV(dz);
+  CCTK_REAL const pm1o4dx = -0.25*INV(dx);
+  CCTK_REAL const pm1o4dy = -0.25*INV(dy);
+  CCTK_REAL const pm1o4dz = -0.25*INV(dz);
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_O2_InitRHS,
+    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL phirhsL = 0;
+    
+    CCTK_REAL gt11rhsL = 0;
+    
+    CCTK_REAL gt12rhsL = 0;
+    
+    CCTK_REAL gt13rhsL = 0;
+    
+    CCTK_REAL gt22rhsL = 0;
+    
+    CCTK_REAL gt23rhsL = 0;
+    
+    CCTK_REAL gt33rhsL = 0;
+    
+    CCTK_REAL trKrhsL = 0;
+    
+    CCTK_REAL At11rhsL = 0;
+    
+    CCTK_REAL At12rhsL = 0;
+    
+    CCTK_REAL At13rhsL = 0;
+    
+    CCTK_REAL At22rhsL = 0;
+    
+    CCTK_REAL At23rhsL = 0;
+    
+    CCTK_REAL At33rhsL = 0;
+    
+    CCTK_REAL Xt1rhsL = 0;
+    
+    CCTK_REAL Xt2rhsL = 0;
+    
+    CCTK_REAL Xt3rhsL = 0;
+    
+    CCTK_REAL alpharhsL = 0;
+    
+    CCTK_REAL ArhsL = 0;
+    
+    CCTK_REAL beta1rhsL = 0;
+    
+    CCTK_REAL beta2rhsL = 0;
+    
+    CCTK_REAL beta3rhsL = 0;
+    
+    CCTK_REAL B1rhsL = 0;
+    
+    CCTK_REAL B2rhsL = 0;
+    
+    CCTK_REAL 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;
+  }
+  LC_ENDLOOP3 (ML_BSSN_O2_InitRHS);
+}
+
+extern "C" void ML_BSSN_O2_InitRHS(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_O2_InitRHS_Body);
+}
diff --git a/ML_BSSN_O2/src/make.code.defn b/ML_BSSN_O2/src/make.code.defn
index 246aefd..a98a680 100644
--- a/ML_BSSN_O2/src/make.code.defn
+++ b/ML_BSSN_O2/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_O2_Minkowski.cc ML_BSSN_O2_convertFromADMBase.cc ML_BSSN_O2_InitGamma.cc ML_BSSN_O2_convertFromADMBaseGamma.cc ML_BSSN_O2_RHS1.cc ML_BSSN_O2_RHS2.cc ML_BSSN_O2_Dissipation.cc ML_BSSN_O2_Advect.cc ML_BSSN_O2_RHSStaticBoundary.cc ML_BSSN_O2_enforce.cc ML_BSSN_O2_boundary.cc ML_BSSN_O2_convertToADMBase.cc ML_BSSN_O2_convertToADMBaseDtLapseShift.cc ML_BSSN_O2_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_O2_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_O2_constraints1.cc ML_BSSN_O2_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_O2_Minkowski.cc ML_BSSN_O2_convertFromADMBase.cc ML_BSSN_O2_InitGamma.cc ML_BSSN_O2_convertFromADMBaseGamma.cc ML_BSSN_O2_RHS1.cc ML_BSSN_O2_RHS2.cc ML_BSSN_O2_Dissipation.cc ML_BSSN_O2_Advect.cc ML_BSSN_O2_InitRHS.cc ML_BSSN_O2_RHSStaticBoundary.cc ML_BSSN_O2_enforce.cc ML_BSSN_O2_boundary.cc ML_BSSN_O2_convertToADMBase.cc ML_BSSN_O2_convertToADMBaseDtLapseShift.cc ML_BSSN_O2_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_O2_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_O2_constraints1.cc ML_BSSN_O2_constraints2.cc Boundaries.cc 
diff --git a/ML_BSSN_O8/param.ccl b/ML_BSSN_O8/param.ccl
index fb6d66e..6f79b9f 100644
--- a/ML_BSSN_O8/param.ccl
+++ b/ML_BSSN_O8/param.ccl
@@ -263,6 +263,12 @@ CCTK_INT ML_BSSN_O8_Advect_calc_every "ML_BSSN_O8_Advect_calc_every" STEERABLE=A
 } 1
 
 restricted:
+CCTK_INT ML_BSSN_O8_InitRHS_calc_every "ML_BSSN_O8_InitRHS_calc_every" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN_O8_RHSStaticBoundary_calc_every "ML_BSSN_O8_RHSStaticBoundary_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -365,6 +371,12 @@ CCTK_INT ML_BSSN_O8_Advect_calc_offset "ML_BSSN_O8_Advect_calc_offset" STEERABLE
 } 0
 
 restricted:
+CCTK_INT ML_BSSN_O8_InitRHS_calc_offset "ML_BSSN_O8_InitRHS_calc_offset" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 0
+
+restricted:
 CCTK_INT ML_BSSN_O8_RHSStaticBoundary_calc_offset "ML_BSSN_O8_RHSStaticBoundary_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN_O8/schedule.ccl b/ML_BSSN_O8/schedule.ccl
index 81939f3..d8abb89 100644
--- a/ML_BSSN_O8/schedule.ccl
+++ b/ML_BSSN_O8/schedule.ccl
@@ -326,6 +326,11 @@ schedule ML_BSSN_O8_Advect IN ML_BSSN_O8_evolCalcGroup after ML_BSSN_O8_RHS2
   LANG: C
 } "ML_BSSN_O8_Advect"
 
+schedule ML_BSSN_O8_InitRHS AT ANALYSIS before ML_BSSN_O8_evolCalcGroup
+{
+  LANG: C
+} "ML_BSSN_O8_InitRHS"
+
 
 if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
 {
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_InitRHS.cc b/ML_BSSN_O8/src/ML_BSSN_O8_InitRHS.cc
new file mode 100644
index 0000000..d99892c
--- /dev/null
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_InitRHS.cc
@@ -0,0 +1,200 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 QAD(x) (SQR(SQR(x)))
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+
+static void ML_BSSN_O8_InitRHS_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 ML_BSSN_O8_InitRHS_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_O8_InitRHS_calc_every != ML_BSSN_O8_InitRHS_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_BSSN_O8::ML_curvrhs","ML_BSSN_O8::ML_dtlapserhs","ML_BSSN_O8::ML_dtshiftrhs","ML_BSSN_O8::ML_Gammarhs","ML_BSSN_O8::ML_lapserhs","ML_BSSN_O8::ML_log_confacrhs","ML_BSSN_O8::ML_metricrhs","ML_BSSN_O8::ML_shiftrhs","ML_BSSN_O8::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_O8_InitRHS", 9, groups);
+  
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  ptrdiff_t const di = 1;
+  ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
+  CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
+  CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
+  CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
+  CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const dxi = INV(dx);
+  CCTK_REAL const dyi = INV(dy);
+  CCTK_REAL const dzi = INV(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 p1o1024dx = 0.0009765625*INV(dx);
+  CCTK_REAL const p1o1024dy = 0.0009765625*INV(dy);
+  CCTK_REAL const p1o1024dz = 0.0009765625*INV(dz);
+  CCTK_REAL const p1o1680dx = 0.000595238095238095238095238095238*INV(dx);
+  CCTK_REAL const p1o1680dy = 0.000595238095238095238095238095238*INV(dy);
+  CCTK_REAL const p1o1680dz = 0.000595238095238095238095238095238*INV(dz);
+  CCTK_REAL const p1o5040dx2 = 0.000198412698412698412698412698413*INV(SQR(dx));
+  CCTK_REAL const p1o5040dy2 = 0.000198412698412698412698412698413*INV(SQR(dy));
+  CCTK_REAL const p1o5040dz2 = 0.000198412698412698412698412698413*INV(SQR(dz));
+  CCTK_REAL const p1o560dx = 0.00178571428571428571428571428571*INV(dx);
+  CCTK_REAL const p1o560dy = 0.00178571428571428571428571428571*INV(dy);
+  CCTK_REAL const p1o560dz = 0.00178571428571428571428571428571*INV(dz);
+  CCTK_REAL const p1o705600dxdy = 1.41723356009070294784580498866e-6*INV(dx)*INV(dy);
+  CCTK_REAL const p1o705600dxdz = 1.41723356009070294784580498866e-6*INV(dx)*INV(dz);
+  CCTK_REAL const p1o705600dydz = 1.41723356009070294784580498866e-6*INV(dy)*INV(dz);
+  CCTK_REAL const p1o840dx = 0.00119047619047619047619047619048*INV(dx);
+  CCTK_REAL const p1o840dy = 0.00119047619047619047619047619048*INV(dy);
+  CCTK_REAL const p1o840dz = 0.00119047619047619047619047619048*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o840dx = -0.00119047619047619047619047619048*INV(dx);
+  CCTK_REAL const pm1o840dy = -0.00119047619047619047619047619048*INV(dy);
+  CCTK_REAL const pm1o840dz = -0.00119047619047619047619047619048*INV(dz);
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_O8_InitRHS,
+    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL phirhsL = 0;
+    
+    CCTK_REAL gt11rhsL = 0;
+    
+    CCTK_REAL gt12rhsL = 0;
+    
+    CCTK_REAL gt13rhsL = 0;
+    
+    CCTK_REAL gt22rhsL = 0;
+    
+    CCTK_REAL gt23rhsL = 0;
+    
+    CCTK_REAL gt33rhsL = 0;
+    
+    CCTK_REAL trKrhsL = 0;
+    
+    CCTK_REAL At11rhsL = 0;
+    
+    CCTK_REAL At12rhsL = 0;
+    
+    CCTK_REAL At13rhsL = 0;
+    
+    CCTK_REAL At22rhsL = 0;
+    
+    CCTK_REAL At23rhsL = 0;
+    
+    CCTK_REAL At33rhsL = 0;
+    
+    CCTK_REAL Xt1rhsL = 0;
+    
+    CCTK_REAL Xt2rhsL = 0;
+    
+    CCTK_REAL Xt3rhsL = 0;
+    
+    CCTK_REAL alpharhsL = 0;
+    
+    CCTK_REAL ArhsL = 0;
+    
+    CCTK_REAL beta1rhsL = 0;
+    
+    CCTK_REAL beta2rhsL = 0;
+    
+    CCTK_REAL beta3rhsL = 0;
+    
+    CCTK_REAL B1rhsL = 0;
+    
+    CCTK_REAL B2rhsL = 0;
+    
+    CCTK_REAL 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;
+  }
+  LC_ENDLOOP3 (ML_BSSN_O8_InitRHS);
+}
+
+extern "C" void ML_BSSN_O8_InitRHS(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_O8_InitRHS_Body);
+}
diff --git a/ML_BSSN_O8/src/make.code.defn b/ML_BSSN_O8/src/make.code.defn
index 5991c88..bd625ef 100644
--- a/ML_BSSN_O8/src/make.code.defn
+++ b/ML_BSSN_O8/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_O8_Minkowski.cc ML_BSSN_O8_convertFromADMBase.cc ML_BSSN_O8_InitGamma.cc ML_BSSN_O8_convertFromADMBaseGamma.cc ML_BSSN_O8_RHS1.cc ML_BSSN_O8_RHS2.cc ML_BSSN_O8_Dissipation.cc ML_BSSN_O8_Advect.cc ML_BSSN_O8_RHSStaticBoundary.cc ML_BSSN_O8_enforce.cc ML_BSSN_O8_boundary.cc ML_BSSN_O8_convertToADMBase.cc ML_BSSN_O8_convertToADMBaseDtLapseShift.cc ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_O8_constraints1.cc ML_BSSN_O8_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_O8_Minkowski.cc ML_BSSN_O8_convertFromADMBase.cc ML_BSSN_O8_InitGamma.cc ML_BSSN_O8_convertFromADMBaseGamma.cc ML_BSSN_O8_RHS1.cc ML_BSSN_O8_RHS2.cc ML_BSSN_O8_Dissipation.cc ML_BSSN_O8_Advect.cc ML_BSSN_O8_InitRHS.cc ML_BSSN_O8_RHSStaticBoundary.cc ML_BSSN_O8_enforce.cc ML_BSSN_O8_boundary.cc ML_BSSN_O8_convertToADMBase.cc ML_BSSN_O8_convertToADMBaseDtLapseShift.cc ML_BSSN_O8_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_O8_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_O8_constraints1.cc ML_BSSN_O8_constraints2.cc Boundaries.cc 
diff --git a/ML_BSSN_UPW/param.ccl b/ML_BSSN_UPW/param.ccl
index 305e84c..90d9def 100644
--- a/ML_BSSN_UPW/param.ccl
+++ b/ML_BSSN_UPW/param.ccl
@@ -263,6 +263,12 @@ CCTK_INT ML_BSSN_UPW_Advect_calc_every "ML_BSSN_UPW_Advect_calc_every" STEERABLE
 } 1
 
 restricted:
+CCTK_INT ML_BSSN_UPW_InitRHS_calc_every "ML_BSSN_UPW_InitRHS_calc_every" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN_UPW_RHSStaticBoundary_calc_every "ML_BSSN_UPW_RHSStaticBoundary_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -365,6 +371,12 @@ CCTK_INT ML_BSSN_UPW_Advect_calc_offset "ML_BSSN_UPW_Advect_calc_offset" STEERAB
 } 0
 
 restricted:
+CCTK_INT ML_BSSN_UPW_InitRHS_calc_offset "ML_BSSN_UPW_InitRHS_calc_offset" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 0
+
+restricted:
 CCTK_INT ML_BSSN_UPW_RHSStaticBoundary_calc_offset "ML_BSSN_UPW_RHSStaticBoundary_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN_UPW/schedule.ccl b/ML_BSSN_UPW/schedule.ccl
index 0e52e92..b067c2b 100644
--- a/ML_BSSN_UPW/schedule.ccl
+++ b/ML_BSSN_UPW/schedule.ccl
@@ -326,6 +326,11 @@ schedule ML_BSSN_UPW_Advect IN ML_BSSN_UPW_evolCalcGroup after ML_BSSN_UPW_RHS2
   LANG: C
 } "ML_BSSN_UPW_Advect"
 
+schedule ML_BSSN_UPW_InitRHS AT ANALYSIS before ML_BSSN_UPW_evolCalcGroup
+{
+  LANG: C
+} "ML_BSSN_UPW_InitRHS"
+
 
 if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
 {
diff --git a/ML_BSSN_UPW/src/ML_BSSN_UPW_InitRHS.cc b/ML_BSSN_UPW/src/ML_BSSN_UPW_InitRHS.cc
new file mode 100644
index 0000000..d22ada4
--- /dev/null
+++ b/ML_BSSN_UPW/src/ML_BSSN_UPW_InitRHS.cc
@@ -0,0 +1,194 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 QAD(x) (SQR(SQR(x)))
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+
+static void ML_BSSN_UPW_InitRHS_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 ML_BSSN_UPW_InitRHS_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_UPW_InitRHS_calc_every != ML_BSSN_UPW_InitRHS_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_BSSN_UPW::ML_curvrhs","ML_BSSN_UPW::ML_dtlapserhs","ML_BSSN_UPW::ML_dtshiftrhs","ML_BSSN_UPW::ML_Gammarhs","ML_BSSN_UPW::ML_lapserhs","ML_BSSN_UPW::ML_log_confacrhs","ML_BSSN_UPW::ML_metricrhs","ML_BSSN_UPW::ML_shiftrhs","ML_BSSN_UPW::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_UPW_InitRHS", 9, groups);
+  
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  ptrdiff_t const di = 1;
+  ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
+  CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
+  CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
+  CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
+  CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const dxi = INV(dx);
+  CCTK_REAL const dyi = INV(dy);
+  CCTK_REAL const dzi = INV(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 = 0.0833333333333333333333333333333*INV(dx);
+  CCTK_REAL const p1o12dy = 0.0833333333333333333333333333333*INV(dy);
+  CCTK_REAL const p1o12dz = 0.0833333333333333333333333333333*INV(dz);
+  CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx)*INV(dy);
+  CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx)*INV(dz);
+  CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy)*INV(dz);
+  CCTK_REAL const p1o24dx = 0.0416666666666666666666666666667*INV(dx);
+  CCTK_REAL const p1o24dy = 0.0416666666666666666666666666667*INV(dy);
+  CCTK_REAL const p1o24dz = 0.0416666666666666666666666666667*INV(dz);
+  CCTK_REAL const p1o64dx = 0.015625*INV(dx);
+  CCTK_REAL const p1o64dy = 0.015625*INV(dy);
+  CCTK_REAL const p1o64dz = 0.015625*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o12dx2 = -0.0833333333333333333333333333333*INV(SQR(dx));
+  CCTK_REAL const pm1o12dy2 = -0.0833333333333333333333333333333*INV(SQR(dy));
+  CCTK_REAL const pm1o12dz2 = -0.0833333333333333333333333333333*INV(SQR(dz));
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_UPW_InitRHS,
+    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL phirhsL = 0;
+    
+    CCTK_REAL gt11rhsL = 0;
+    
+    CCTK_REAL gt12rhsL = 0;
+    
+    CCTK_REAL gt13rhsL = 0;
+    
+    CCTK_REAL gt22rhsL = 0;
+    
+    CCTK_REAL gt23rhsL = 0;
+    
+    CCTK_REAL gt33rhsL = 0;
+    
+    CCTK_REAL trKrhsL = 0;
+    
+    CCTK_REAL At11rhsL = 0;
+    
+    CCTK_REAL At12rhsL = 0;
+    
+    CCTK_REAL At13rhsL = 0;
+    
+    CCTK_REAL At22rhsL = 0;
+    
+    CCTK_REAL At23rhsL = 0;
+    
+    CCTK_REAL At33rhsL = 0;
+    
+    CCTK_REAL Xt1rhsL = 0;
+    
+    CCTK_REAL Xt2rhsL = 0;
+    
+    CCTK_REAL Xt3rhsL = 0;
+    
+    CCTK_REAL alpharhsL = 0;
+    
+    CCTK_REAL ArhsL = 0;
+    
+    CCTK_REAL beta1rhsL = 0;
+    
+    CCTK_REAL beta2rhsL = 0;
+    
+    CCTK_REAL beta3rhsL = 0;
+    
+    CCTK_REAL B1rhsL = 0;
+    
+    CCTK_REAL B2rhsL = 0;
+    
+    CCTK_REAL 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;
+  }
+  LC_ENDLOOP3 (ML_BSSN_UPW_InitRHS);
+}
+
+extern "C" void ML_BSSN_UPW_InitRHS(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_UPW_InitRHS_Body);
+}
diff --git a/ML_BSSN_UPW/src/make.code.defn b/ML_BSSN_UPW/src/make.code.defn
index 300aa1a..ba8a337 100644
--- a/ML_BSSN_UPW/src/make.code.defn
+++ b/ML_BSSN_UPW/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_UPW_Minkowski.cc ML_BSSN_UPW_convertFromADMBase.cc ML_BSSN_UPW_InitGamma.cc ML_BSSN_UPW_convertFromADMBaseGamma.cc ML_BSSN_UPW_RHS1.cc ML_BSSN_UPW_RHS2.cc ML_BSSN_UPW_Dissipation.cc ML_BSSN_UPW_Advect.cc ML_BSSN_UPW_RHSStaticBoundary.cc ML_BSSN_UPW_enforce.cc ML_BSSN_UPW_boundary.cc ML_BSSN_UPW_convertToADMBase.cc ML_BSSN_UPW_convertToADMBaseDtLapseShift.cc ML_BSSN_UPW_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_UPW_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_UPW_constraints1.cc ML_BSSN_UPW_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_UPW_Minkowski.cc ML_BSSN_UPW_convertFromADMBase.cc ML_BSSN_UPW_InitGamma.cc ML_BSSN_UPW_convertFromADMBaseGamma.cc ML_BSSN_UPW_RHS1.cc ML_BSSN_UPW_RHS2.cc ML_BSSN_UPW_Dissipation.cc ML_BSSN_UPW_Advect.cc ML_BSSN_UPW_InitRHS.cc ML_BSSN_UPW_RHSStaticBoundary.cc ML_BSSN_UPW_enforce.cc ML_BSSN_UPW_boundary.cc ML_BSSN_UPW_convertToADMBase.cc ML_BSSN_UPW_convertToADMBaseDtLapseShift.cc ML_BSSN_UPW_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_UPW_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_UPW_constraints1.cc ML_BSSN_UPW_constraints2.cc Boundaries.cc