Regenerate code (Kranc commit 17deb8b4ff45a8a3cd1645cb626f6d33a5e17beb)

The previous commit was missing the new WeylScal4_*.cc files, and had some unrecognised parameters in param.ccl.  Possibly it was generated with something other than the current master branch of Kranc.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/WeylScal4/trunk@127 4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843

10 files changed, 111 insertions, 212 deletions

diff --git a/param.ccl b/param.ccl
index 97471d0..d922126 100644
--- a/param.ccl
+++ b/param.ccl
@@ -4,8 +4,6 @@
 shares: GenericFD
 
 USES CCTK_STRING jacobian_group
-USES CCTK_STRING jacobian_determinant_group
-USES CCTK_STRING jacobian_inverse_group
 USES CCTK_STRING jacobian_derivative_group
 USES CCTK_INT jacobian_identity_map
 
diff --git a/src/invars_calc_2nd.cc b/src/WeylScal4_invars_calc_2nd.cc
index 683c2fd..63a4fd2 100644
--- a/src/invars_calc_2nd.cc
+++ b/src/WeylScal4_invars_calc_2nd.cc
@@ -27,40 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void invars_calc_2nd_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 */, "WeylScal4::curvIi_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvIi_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvIr_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvIr_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ1_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ1_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ2_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ2_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ3_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ3_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ4_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ4_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJi_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJi_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJr_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJr_group.");
-  return;
-}
-
-static void invars_calc_2nd_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_invars_calc_2nd_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -185,7 +152,7 @@ static void invars_calc_2nd_Body(cGH const * restrict const cctkGH, int const di
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(invars_calc_2nd,
+  LC_LOOP3VEC(WeylScal4_invars_calc_2nd,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -262,10 +229,10 @@ static void invars_calc_2nd_Body(cGH const * restrict const cctkGH, int const di
     vec_store_nta_partial(curvJi[index],curvJiL);
     vec_store_nta_partial(curvJr[index],curvJrL);
   }
-  LC_ENDLOOP3VEC(invars_calc_2nd);
+  LC_ENDLOOP3VEC(WeylScal4_invars_calc_2nd);
 }
 
-extern "C" void invars_calc_2nd(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_invars_calc_2nd(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -273,10 +240,10 @@ extern "C" void invars_calc_2nd(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering invars_calc_2nd_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_invars_calc_2nd_Body");
   }
   
-  if (cctk_iteration % invars_calc_2nd_calc_every != invars_calc_2nd_calc_offset)
+  if (cctk_iteration % WeylScal4_invars_calc_2nd_calc_every != WeylScal4_invars_calc_2nd_calc_offset)
   {
     return;
   }
@@ -300,7 +267,7 @@ extern "C" void invars_calc_2nd(CCTK_ARGUMENTS)
     "WeylScal4::Psi3r_group",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "invars_calc_2nd", 18, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_invars_calc_2nd", 18, groups);
   
   switch(fdOrder)
   {
@@ -317,10 +284,10 @@ extern "C" void invars_calc_2nd(CCTK_ARGUMENTS)
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, invars_calc_2nd_Body);
+  GenericFD_LoopOverEverything(cctkGH, WeylScal4_invars_calc_2nd_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving invars_calc_2nd_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_invars_calc_2nd_Body");
   }
 }
diff --git a/src/invars_calc_4th.cc b/src/WeylScal4_invars_calc_4th.cc
index 71ea9c1..736c481 100644
--- a/src/invars_calc_4th.cc
+++ b/src/WeylScal4_invars_calc_4th.cc
@@ -27,40 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void invars_calc_4th_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 */, "WeylScal4::curvIi_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvIi_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvIr_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvIr_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ1_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ1_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ2_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ2_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ3_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ3_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ4_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ4_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJi_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJi_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJr_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJr_group.");
-  return;
-}
-
-static void invars_calc_4th_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_invars_calc_4th_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -185,7 +152,7 @@ static void invars_calc_4th_Body(cGH const * restrict const cctkGH, int const di
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(invars_calc_4th,
+  LC_LOOP3VEC(WeylScal4_invars_calc_4th,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -262,10 +229,10 @@ static void invars_calc_4th_Body(cGH const * restrict const cctkGH, int const di
     vec_store_nta_partial(curvJi[index],curvJiL);
     vec_store_nta_partial(curvJr[index],curvJrL);
   }
-  LC_ENDLOOP3VEC(invars_calc_4th);
+  LC_ENDLOOP3VEC(WeylScal4_invars_calc_4th);
 }
 
-extern "C" void invars_calc_4th(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_invars_calc_4th(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -273,10 +240,10 @@ extern "C" void invars_calc_4th(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering invars_calc_4th_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_invars_calc_4th_Body");
   }
   
-  if (cctk_iteration % invars_calc_4th_calc_every != invars_calc_4th_calc_offset)
+  if (cctk_iteration % WeylScal4_invars_calc_4th_calc_every != WeylScal4_invars_calc_4th_calc_offset)
   {
     return;
   }
@@ -300,7 +267,7 @@ extern "C" void invars_calc_4th(CCTK_ARGUMENTS)
     "WeylScal4::Psi3r_group",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "invars_calc_4th", 18, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_invars_calc_4th", 18, groups);
   
   switch(fdOrder)
   {
@@ -317,10 +284,10 @@ extern "C" void invars_calc_4th(CCTK_ARGUMENTS)
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, invars_calc_4th_Body);
+  GenericFD_LoopOverEverything(cctkGH, WeylScal4_invars_calc_4th_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving invars_calc_4th_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_invars_calc_4th_Body");
   }
 }
diff --git a/src/invars_calc_Nth.cc b/src/WeylScal4_invars_calc_Nth.cc
index b06d7e3..2181e09 100644
--- a/src/invars_calc_Nth.cc
+++ b/src/WeylScal4_invars_calc_Nth.cc
@@ -27,40 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void invars_calc_Nth_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 */, "WeylScal4::curvIi_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvIi_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvIr_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvIr_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ1_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ1_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ2_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ2_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ3_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ3_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJ4_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJ4_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJi_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJi_group.");
-  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "WeylScal4::curvJr_group","flat");
-  if (ierr < 0)
-    CCTK_WARN(1, "Failed to register flat BC for WeylScal4::curvJr_group.");
-  return;
-}
-
-static void invars_calc_Nth_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_invars_calc_Nth_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -185,7 +152,7 @@ static void invars_calc_Nth_Body(cGH const * restrict const cctkGH, int const di
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(invars_calc_Nth,
+  LC_LOOP3VEC(WeylScal4_invars_calc_Nth,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -262,10 +229,10 @@ static void invars_calc_Nth_Body(cGH const * restrict const cctkGH, int const di
     vec_store_nta_partial(curvJi[index],curvJiL);
     vec_store_nta_partial(curvJr[index],curvJrL);
   }
-  LC_ENDLOOP3VEC(invars_calc_Nth);
+  LC_ENDLOOP3VEC(WeylScal4_invars_calc_Nth);
 }
 
-extern "C" void invars_calc_Nth(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_invars_calc_Nth(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -273,10 +240,10 @@ extern "C" void invars_calc_Nth(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering invars_calc_Nth_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_invars_calc_Nth_Body");
   }
   
-  if (cctk_iteration % invars_calc_Nth_calc_every != invars_calc_Nth_calc_offset)
+  if (cctk_iteration % WeylScal4_invars_calc_Nth_calc_every != WeylScal4_invars_calc_Nth_calc_offset)
   {
     return;
   }
@@ -300,7 +267,7 @@ extern "C" void invars_calc_Nth(CCTK_ARGUMENTS)
     "WeylScal4::Psi3r_group",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "invars_calc_Nth", 18, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_invars_calc_Nth", 18, groups);
   
   switch(fdOrder)
   {
@@ -317,10 +284,10 @@ extern "C" void invars_calc_Nth(CCTK_ARGUMENTS)
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, invars_calc_Nth_Body);
+  GenericFD_LoopOverEverything(cctkGH, WeylScal4_invars_calc_Nth_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving invars_calc_Nth_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_invars_calc_Nth_Body");
   }
 }
diff --git a/src/psi4_calc_2nd.cc b/src/WeylScal4_psi4_calc_2nd.cc
index 5c70f94..7dd68c3 100644
--- a/src/psi4_calc_2nd.cc
+++ b/src/WeylScal4_psi4_calc_2nd.cc
@@ -27,7 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void psi4_calc_2nd_SelectBCs(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psi4_calc_2nd_SelectBCs(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -42,7 +42,7 @@ extern "C" void psi4_calc_2nd_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void psi4_calc_2nd_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_psi4_calc_2nd_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -167,7 +167,7 @@ static void psi4_calc_2nd_Body(cGH const * restrict const cctkGH, int const dir,
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(psi4_calc_2nd,
+  LC_LOOP3VEC(WeylScal4_psi4_calc_2nd,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -1301,10 +1301,10 @@ static void psi4_calc_2nd_Body(cGH const * restrict const cctkGH, int const dir,
     vec_store_nta_partial(Psi4i[index],Psi4iL);
     vec_store_nta_partial(Psi4r[index],Psi4rL);
   }
-  LC_ENDLOOP3VEC(psi4_calc_2nd);
+  LC_ENDLOOP3VEC(WeylScal4_psi4_calc_2nd);
 }
 
-extern "C" void psi4_calc_2nd(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psi4_calc_2nd(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -1312,10 +1312,10 @@ extern "C" void psi4_calc_2nd(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering psi4_calc_2nd_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_psi4_calc_2nd_Body");
   }
   
-  if (cctk_iteration % psi4_calc_2nd_calc_every != psi4_calc_2nd_calc_offset)
+  if (cctk_iteration % WeylScal4_psi4_calc_2nd_calc_every != WeylScal4_psi4_calc_2nd_calc_offset)
   {
     return;
   }
@@ -1326,31 +1326,31 @@ extern "C" void psi4_calc_2nd(CCTK_ARGUMENTS)
     "grid::coordinates",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "psi4_calc_2nd", 5, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_psi4_calc_2nd", 5, groups);
   
   switch(fdOrder)
   {
     case 2:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_2nd", 1, 1, 1);
       break;
     
     case 4:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_2nd", 1, 1, 1);
       break;
     
     case 6:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_2nd", 1, 1, 1);
       break;
     
     case 8:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_2nd", 1, 1, 1);
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, psi4_calc_2nd_Body);
+  GenericFD_LoopOverInterior(cctkGH, WeylScal4_psi4_calc_2nd_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving psi4_calc_2nd_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_psi4_calc_2nd_Body");
   }
 }
diff --git a/src/psi4_calc_4th.cc b/src/WeylScal4_psi4_calc_4th.cc
index da44533..491e384 100644
--- a/src/psi4_calc_4th.cc
+++ b/src/WeylScal4_psi4_calc_4th.cc
@@ -27,7 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void psi4_calc_4th_SelectBCs(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psi4_calc_4th_SelectBCs(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -42,7 +42,7 @@ extern "C" void psi4_calc_4th_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void psi4_calc_4th_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_psi4_calc_4th_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -167,7 +167,7 @@ static void psi4_calc_4th_Body(cGH const * restrict const cctkGH, int const dir,
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(psi4_calc_4th,
+  LC_LOOP3VEC(WeylScal4_psi4_calc_4th,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -1301,10 +1301,10 @@ static void psi4_calc_4th_Body(cGH const * restrict const cctkGH, int const dir,
     vec_store_nta_partial(Psi4i[index],Psi4iL);
     vec_store_nta_partial(Psi4r[index],Psi4rL);
   }
-  LC_ENDLOOP3VEC(psi4_calc_4th);
+  LC_ENDLOOP3VEC(WeylScal4_psi4_calc_4th);
 }
 
-extern "C" void psi4_calc_4th(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psi4_calc_4th(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -1312,10 +1312,10 @@ extern "C" void psi4_calc_4th(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering psi4_calc_4th_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_psi4_calc_4th_Body");
   }
   
-  if (cctk_iteration % psi4_calc_4th_calc_every != psi4_calc_4th_calc_offset)
+  if (cctk_iteration % WeylScal4_psi4_calc_4th_calc_every != WeylScal4_psi4_calc_4th_calc_offset)
   {
     return;
   }
@@ -1326,31 +1326,31 @@ extern "C" void psi4_calc_4th(CCTK_ARGUMENTS)
     "grid::coordinates",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "psi4_calc_4th", 5, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_psi4_calc_4th", 5, groups);
   
   switch(fdOrder)
   {
     case 2:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_4th", 2, 2, 2);
       break;
     
     case 4:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_4th", 2, 2, 2);
       break;
     
     case 6:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_4th", 2, 2, 2);
       break;
     
     case 8:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_4th", 2, 2, 2);
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, psi4_calc_4th_Body);
+  GenericFD_LoopOverInterior(cctkGH, WeylScal4_psi4_calc_4th_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving psi4_calc_4th_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_psi4_calc_4th_Body");
   }
 }
diff --git a/src/psi4_calc_Nth.cc b/src/WeylScal4_psi4_calc_Nth.cc
index b6c7351..b0f9387 100644
--- a/src/psi4_calc_Nth.cc
+++ b/src/WeylScal4_psi4_calc_Nth.cc
@@ -27,7 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void psi4_calc_Nth_SelectBCs(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psi4_calc_Nth_SelectBCs(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -42,7 +42,7 @@ extern "C" void psi4_calc_Nth_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void psi4_calc_Nth_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_psi4_calc_Nth_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -167,7 +167,7 @@ static void psi4_calc_Nth_Body(cGH const * restrict const cctkGH, int const dir,
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(psi4_calc_Nth,
+  LC_LOOP3VEC(WeylScal4_psi4_calc_Nth,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -1301,10 +1301,10 @@ static void psi4_calc_Nth_Body(cGH const * restrict const cctkGH, int const dir,
     vec_store_nta_partial(Psi4i[index],Psi4iL);
     vec_store_nta_partial(Psi4r[index],Psi4rL);
   }
-  LC_ENDLOOP3VEC(psi4_calc_Nth);
+  LC_ENDLOOP3VEC(WeylScal4_psi4_calc_Nth);
 }
 
-extern "C" void psi4_calc_Nth(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psi4_calc_Nth(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -1312,10 +1312,10 @@ extern "C" void psi4_calc_Nth(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering psi4_calc_Nth_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_psi4_calc_Nth_Body");
   }
   
-  if (cctk_iteration % psi4_calc_Nth_calc_every != psi4_calc_Nth_calc_offset)
+  if (cctk_iteration % WeylScal4_psi4_calc_Nth_calc_every != WeylScal4_psi4_calc_Nth_calc_offset)
   {
     return;
   }
@@ -1326,31 +1326,31 @@ extern "C" void psi4_calc_Nth(CCTK_ARGUMENTS)
     "grid::coordinates",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "psi4_calc_Nth", 5, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_psi4_calc_Nth", 5, groups);
   
   switch(fdOrder)
   {
     case 2:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_Nth", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_Nth", 1, 1, 1);
       break;
     
     case 4:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_Nth", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_Nth", 2, 2, 2);
       break;
     
     case 6:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_Nth", 3, 3, 3);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_Nth", 3, 3, 3);
       break;
     
     case 8:
-      GenericFD_EnsureStencilFits(cctkGH, "psi4_calc_Nth", 4, 4, 4);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psi4_calc_Nth", 4, 4, 4);
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, psi4_calc_Nth_Body);
+  GenericFD_LoopOverInterior(cctkGH, WeylScal4_psi4_calc_Nth_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving psi4_calc_Nth_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_psi4_calc_Nth_Body");
   }
 }
diff --git a/src/psis_calc_2nd.cc b/src/WeylScal4_psis_calc_2nd.cc
index 9dff1a1..0cc5b1b 100644
--- a/src/psis_calc_2nd.cc
+++ b/src/WeylScal4_psis_calc_2nd.cc
@@ -27,7 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void psis_calc_2nd_SelectBCs(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psis_calc_2nd_SelectBCs(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -66,7 +66,7 @@ extern "C" void psis_calc_2nd_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void psis_calc_2nd_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_psis_calc_2nd_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -191,7 +191,7 @@ static void psis_calc_2nd_Body(cGH const * restrict const cctkGH, int const dir,
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(psis_calc_2nd,
+  LC_LOOP3VEC(WeylScal4_psis_calc_2nd,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -1363,10 +1363,10 @@ static void psis_calc_2nd_Body(cGH const * restrict const cctkGH, int const dir,
     vec_store_nta_partial(Psi4i[index],Psi4iL);
     vec_store_nta_partial(Psi4r[index],Psi4rL);
   }
-  LC_ENDLOOP3VEC(psis_calc_2nd);
+  LC_ENDLOOP3VEC(WeylScal4_psis_calc_2nd);
 }
 
-extern "C" void psis_calc_2nd(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psis_calc_2nd(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -1374,10 +1374,10 @@ extern "C" void psis_calc_2nd(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering psis_calc_2nd_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_psis_calc_2nd_Body");
   }
   
-  if (cctk_iteration % psis_calc_2nd_calc_every != psis_calc_2nd_calc_offset)
+  if (cctk_iteration % WeylScal4_psis_calc_2nd_calc_every != WeylScal4_psis_calc_2nd_calc_offset)
   {
     return;
   }
@@ -1396,31 +1396,31 @@ extern "C" void psis_calc_2nd(CCTK_ARGUMENTS)
     "WeylScal4::Psi3r_group",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "psis_calc_2nd", 13, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_psis_calc_2nd", 13, groups);
   
   switch(fdOrder)
   {
     case 2:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_2nd", 1, 1, 1);
       break;
     
     case 4:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_2nd", 1, 1, 1);
       break;
     
     case 6:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_2nd", 1, 1, 1);
       break;
     
     case 8:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_2nd", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_2nd", 1, 1, 1);
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, psis_calc_2nd_Body);
+  GenericFD_LoopOverInterior(cctkGH, WeylScal4_psis_calc_2nd_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving psis_calc_2nd_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_psis_calc_2nd_Body");
   }
 }
diff --git a/src/psis_calc_4th.cc b/src/WeylScal4_psis_calc_4th.cc
index 5e349aa..fbe29bb 100644
--- a/src/psis_calc_4th.cc
+++ b/src/WeylScal4_psis_calc_4th.cc
@@ -27,7 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void psis_calc_4th_SelectBCs(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psis_calc_4th_SelectBCs(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -66,7 +66,7 @@ extern "C" void psis_calc_4th_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void psis_calc_4th_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_psis_calc_4th_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -191,7 +191,7 @@ static void psis_calc_4th_Body(cGH const * restrict const cctkGH, int const dir,
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(psis_calc_4th,
+  LC_LOOP3VEC(WeylScal4_psis_calc_4th,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -1363,10 +1363,10 @@ static void psis_calc_4th_Body(cGH const * restrict const cctkGH, int const dir,
     vec_store_nta_partial(Psi4i[index],Psi4iL);
     vec_store_nta_partial(Psi4r[index],Psi4rL);
   }
-  LC_ENDLOOP3VEC(psis_calc_4th);
+  LC_ENDLOOP3VEC(WeylScal4_psis_calc_4th);
 }
 
-extern "C" void psis_calc_4th(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psis_calc_4th(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -1374,10 +1374,10 @@ extern "C" void psis_calc_4th(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering psis_calc_4th_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_psis_calc_4th_Body");
   }
   
-  if (cctk_iteration % psis_calc_4th_calc_every != psis_calc_4th_calc_offset)
+  if (cctk_iteration % WeylScal4_psis_calc_4th_calc_every != WeylScal4_psis_calc_4th_calc_offset)
   {
     return;
   }
@@ -1396,31 +1396,31 @@ extern "C" void psis_calc_4th(CCTK_ARGUMENTS)
     "WeylScal4::Psi3r_group",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "psis_calc_4th", 13, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_psis_calc_4th", 13, groups);
   
   switch(fdOrder)
   {
     case 2:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_4th", 2, 2, 2);
       break;
     
     case 4:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_4th", 2, 2, 2);
       break;
     
     case 6:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_4th", 2, 2, 2);
       break;
     
     case 8:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_4th", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_4th", 2, 2, 2);
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, psis_calc_4th_Body);
+  GenericFD_LoopOverInterior(cctkGH, WeylScal4_psis_calc_4th_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving psis_calc_4th_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_psis_calc_4th_Body");
   }
 }
diff --git a/src/psis_calc_Nth.cc b/src/WeylScal4_psis_calc_Nth.cc
index e6bae2f..99c4514 100644
--- a/src/psis_calc_Nth.cc
+++ b/src/WeylScal4_psis_calc_Nth.cc
@@ -27,7 +27,7 @@
 #define CUB(x) (kmul(x,SQR(x)))
 #define QAD(x) (SQR(SQR(x)))
 
-extern "C" void psis_calc_Nth_SelectBCs(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psis_calc_Nth_SelectBCs(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -66,7 +66,7 @@ extern "C" void psis_calc_Nth_SelectBCs(CCTK_ARGUMENTS)
   return;
 }
 
-static void psis_calc_Nth_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+static void WeylScal4_psis_calc_Nth_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 imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -191,7 +191,7 @@ static void psis_calc_Nth_Body(cGH const * restrict const cctkGH, int const dir,
   
   /* Loop over the grid points */
   #pragma omp parallel
-  LC_LOOP3VEC(psis_calc_Nth,
+  LC_LOOP3VEC(WeylScal4_psis_calc_Nth,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
     CCTK_REAL_VEC_SIZE)
@@ -1363,10 +1363,10 @@ static void psis_calc_Nth_Body(cGH const * restrict const cctkGH, int const dir,
     vec_store_nta_partial(Psi4i[index],Psi4iL);
     vec_store_nta_partial(Psi4r[index],Psi4rL);
   }
-  LC_ENDLOOP3VEC(psis_calc_Nth);
+  LC_ENDLOOP3VEC(WeylScal4_psis_calc_Nth);
 }
 
-extern "C" void psis_calc_Nth(CCTK_ARGUMENTS)
+extern "C" void WeylScal4_psis_calc_Nth(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -1374,10 +1374,10 @@ extern "C" void psis_calc_Nth(CCTK_ARGUMENTS)
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Entering psis_calc_Nth_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering WeylScal4_psis_calc_Nth_Body");
   }
   
-  if (cctk_iteration % psis_calc_Nth_calc_every != psis_calc_Nth_calc_offset)
+  if (cctk_iteration % WeylScal4_psis_calc_Nth_calc_every != WeylScal4_psis_calc_Nth_calc_offset)
   {
     return;
   }
@@ -1396,31 +1396,31 @@ extern "C" void psis_calc_Nth(CCTK_ARGUMENTS)
     "WeylScal4::Psi3r_group",
     "WeylScal4::Psi4i_group",
     "WeylScal4::Psi4r_group"};
-  GenericFD_AssertGroupStorage(cctkGH, "psis_calc_Nth", 13, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "WeylScal4_psis_calc_Nth", 13, groups);
   
   switch(fdOrder)
   {
     case 2:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_Nth", 1, 1, 1);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_Nth", 1, 1, 1);
       break;
     
     case 4:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_Nth", 2, 2, 2);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_Nth", 2, 2, 2);
       break;
     
     case 6:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_Nth", 3, 3, 3);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_Nth", 3, 3, 3);
       break;
     
     case 8:
-      GenericFD_EnsureStencilFits(cctkGH, "psis_calc_Nth", 4, 4, 4);
+      GenericFD_EnsureStencilFits(cctkGH, "WeylScal4_psis_calc_Nth", 4, 4, 4);
       break;
   }
   
-  GenericFD_LoopOverInterior(cctkGH, psis_calc_Nth_Body);
+  GenericFD_LoopOverInterior(cctkGH, WeylScal4_psis_calc_Nth_Body);
   
   if (verbose > 1)
   {
-    CCTK_VInfo(CCTK_THORNSTRING,"Leaving psis_calc_Nth_Body");
+    CCTK_VInfo(CCTK_THORNSTRING,"Leaving WeylScal4_psis_calc_Nth_Body");
   }
 }