Regenerate code (Kranc commit caf12ddfb11ccd9a7bf822cc8ec0d7691cded0aa)

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

1 files changed, 198 insertions, 396 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 04afbdd..1027a85 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,239 +1,41 @@
 # File produced by Kranc
 
 
-if (timelevels == 1)
-{
-  STORAGE: curvIi_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvIi_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvIi_group[3]
-}
+STORAGE: curvIi_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: curvIr_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvIr_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvIr_group[3]
-}
+STORAGE: curvIr_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: curvJ1_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvJ1_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvJ1_group[3]
-}
+STORAGE: curvJ1_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: curvJ2_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvJ2_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvJ2_group[3]
-}
+STORAGE: curvJ2_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: curvJ3_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvJ3_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvJ3_group[3]
-}
+STORAGE: curvJ3_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: curvJ4_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvJ4_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvJ4_group[3]
-}
+STORAGE: curvJ4_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: curvJi_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvJi_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvJi_group[3]
-}
+STORAGE: curvJi_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: curvJr_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: curvJr_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: curvJr_group[3]
-}
+STORAGE: curvJr_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi0i_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi0i_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi0i_group[3]
-}
+STORAGE: Psi0i_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi0r_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi0r_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi0r_group[3]
-}
+STORAGE: Psi0r_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi1i_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi1i_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi1i_group[3]
-}
+STORAGE: Psi1i_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi1r_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi1r_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi1r_group[3]
-}
+STORAGE: Psi1r_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi2i_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi2i_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi2i_group[3]
-}
+STORAGE: Psi2i_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi2r_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi2r_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi2r_group[3]
-}
+STORAGE: Psi2r_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi3i_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi3i_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi3i_group[3]
-}
+STORAGE: Psi3i_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi3r_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi3r_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi3r_group[3]
-}
+STORAGE: Psi3r_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi4i_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi4i_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi4i_group[3]
-}
+STORAGE: Psi4i_group[timelevels]
 
-if (timelevels == 1)
-{
-  STORAGE: Psi4r_group[1]
-}
-if (timelevels == 2)
-{
-  STORAGE: Psi4r_group[2]
-}
-if (timelevels == 3)
-{
-  STORAGE: Psi4r_group[3]
-}
+STORAGE: Psi4r_group[timelevels]
 
 schedule WeylScal4_Startup at STARTUP
 {
@@ -262,23 +64,23 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
 schedule WeylScal4_psi4_calc_Nth in WeylScal4_psi4_calc_Nth_group
 {
   LANG: C
-  READS:    admbase::kxx(Everywhere)
-  READS:    admbase::kxy(Everywhere)
-  READS:    admbase::kxz(Everywhere)
-  READS:    admbase::kyy(Everywhere)
-  READS:    admbase::kyz(Everywhere)
-  READS:    admbase::kzz(Everywhere)
-  READS:    admbase::gxx(Everywhere)
-  READS:    admbase::gxy(Everywhere)
-  READS:    admbase::gxz(Everywhere)
-  READS:    admbase::gyy(Everywhere)
-  READS:    admbase::gyz(Everywhere)
-  READS:    admbase::gzz(Everywhere)
-  READS:    grid::x(Everywhere)
-  READS:    grid::y(Everywhere)
-  READS:    grid::z(Everywhere)
-  WRITES:   WeylScal4::Psi4i(Interior)
-  WRITES:   WeylScal4::Psi4r(Interior)
+  READS: admbase::kxx(Everywhere)
+  READS: admbase::kxy(Everywhere)
+  READS: admbase::kxz(Everywhere)
+  READS: admbase::kyy(Everywhere)
+  READS: admbase::kyz(Everywhere)
+  READS: admbase::kzz(Everywhere)
+  READS: admbase::gxx(Everywhere)
+  READS: admbase::gxy(Everywhere)
+  READS: admbase::gxz(Everywhere)
+  READS: admbase::gyy(Everywhere)
+  READS: admbase::gyz(Everywhere)
+  READS: admbase::gzz(Everywhere)
+  READS: grid::x(Everywhere)
+  READS: grid::y(Everywhere)
+  READS: grid::z(Everywhere)
+  WRITES: WeylScal4::Psi4i(Interior)
+  WRITES: WeylScal4::Psi4r(Interior)
 } "WeylScal4_psi4_calc_Nth"
 
 schedule WeylScal4_psi4_calc_Nth_SelectBCs in WeylScal4_psi4_calc_Nth_bc_group
@@ -332,23 +134,23 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
 schedule WeylScal4_psi4_calc_2nd in WeylScal4_psi4_calc_2nd_group
 {
   LANG: C
-  READS:    admbase::kxx(Everywhere)
-  READS:    admbase::kxy(Everywhere)
-  READS:    admbase::kxz(Everywhere)
-  READS:    admbase::kyy(Everywhere)
-  READS:    admbase::kyz(Everywhere)
-  READS:    admbase::kzz(Everywhere)
-  READS:    admbase::gxx(Everywhere)
-  READS:    admbase::gxy(Everywhere)
-  READS:    admbase::gxz(Everywhere)
-  READS:    admbase::gyy(Everywhere)
-  READS:    admbase::gyz(Everywhere)
-  READS:    admbase::gzz(Everywhere)
-  READS:    grid::x(Everywhere)
-  READS:    grid::y(Everywhere)
-  READS:    grid::z(Everywhere)
-  WRITES:   WeylScal4::Psi4i(Interior)
-  WRITES:   WeylScal4::Psi4r(Interior)
+  READS: admbase::kxx(Everywhere)
+  READS: admbase::kxy(Everywhere)
+  READS: admbase::kxz(Everywhere)
+  READS: admbase::kyy(Everywhere)
+  READS: admbase::kyz(Everywhere)
+  READS: admbase::kzz(Everywhere)
+  READS: admbase::gxx(Everywhere)
+  READS: admbase::gxy(Everywhere)
+  READS: admbase::gxz(Everywhere)
+  READS: admbase::gyy(Everywhere)
+  READS: admbase::gyz(Everywhere)
+  READS: admbase::gzz(Everywhere)
+  READS: grid::x(Everywhere)
+  READS: grid::y(Everywhere)
+  READS: grid::z(Everywhere)
+  WRITES: WeylScal4::Psi4i(Interior)
+  WRITES: WeylScal4::Psi4r(Interior)
 } "WeylScal4_psi4_calc_2nd"
 
 schedule WeylScal4_psi4_calc_2nd_SelectBCs in WeylScal4_psi4_calc_2nd_bc_group
@@ -402,23 +204,23 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
 schedule WeylScal4_psi4_calc_4th in WeylScal4_psi4_calc_4th_group
 {
   LANG: C
-  READS:    admbase::kxx(Everywhere)
-  READS:    admbase::kxy(Everywhere)
-  READS:    admbase::kxz(Everywhere)
-  READS:    admbase::kyy(Everywhere)
-  READS:    admbase::kyz(Everywhere)
-  READS:    admbase::kzz(Everywhere)
-  READS:    admbase::gxx(Everywhere)
-  READS:    admbase::gxy(Everywhere)
-  READS:    admbase::gxz(Everywhere)
-  READS:    admbase::gyy(Everywhere)
-  READS:    admbase::gyz(Everywhere)
-  READS:    admbase::gzz(Everywhere)
-  READS:    grid::x(Everywhere)
-  READS:    grid::y(Everywhere)
-  READS:    grid::z(Everywhere)
-  WRITES:   WeylScal4::Psi4i(Interior)
-  WRITES:   WeylScal4::Psi4r(Interior)
+  READS: admbase::kxx(Everywhere)
+  READS: admbase::kxy(Everywhere)
+  READS: admbase::kxz(Everywhere)
+  READS: admbase::kyy(Everywhere)
+  READS: admbase::kyz(Everywhere)
+  READS: admbase::kzz(Everywhere)
+  READS: admbase::gxx(Everywhere)
+  READS: admbase::gxy(Everywhere)
+  READS: admbase::gxz(Everywhere)
+  READS: admbase::gyy(Everywhere)
+  READS: admbase::gyz(Everywhere)
+  READS: admbase::gzz(Everywhere)
+  READS: grid::x(Everywhere)
+  READS: grid::y(Everywhere)
+  READS: grid::z(Everywhere)
+  WRITES: WeylScal4::Psi4i(Interior)
+  WRITES: WeylScal4::Psi4r(Interior)
 } "WeylScal4_psi4_calc_4th"
 
 schedule WeylScal4_psi4_calc_4th_SelectBCs in WeylScal4_psi4_calc_4th_bc_group
@@ -472,31 +274,31 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
 schedule WeylScal4_psis_calc_Nth in WeylScal4_psis_calc_Nth_group
 {
   LANG: C
-  READS:    admbase::kxx(Everywhere)
-  READS:    admbase::kxy(Everywhere)
-  READS:    admbase::kxz(Everywhere)
-  READS:    admbase::kyy(Everywhere)
-  READS:    admbase::kyz(Everywhere)
-  READS:    admbase::kzz(Everywhere)
-  READS:    admbase::gxx(Everywhere)
-  READS:    admbase::gxy(Everywhere)
-  READS:    admbase::gxz(Everywhere)
-  READS:    admbase::gyy(Everywhere)
-  READS:    admbase::gyz(Everywhere)
-  READS:    admbase::gzz(Everywhere)
-  READS:    grid::x(Everywhere)
-  READS:    grid::y(Everywhere)
-  READS:    grid::z(Everywhere)
-  WRITES:   WeylScal4::Psi0i(Interior)
-  WRITES:   WeylScal4::Psi0r(Interior)
-  WRITES:   WeylScal4::Psi1i(Interior)
-  WRITES:   WeylScal4::Psi1r(Interior)
-  WRITES:   WeylScal4::Psi2i(Interior)
-  WRITES:   WeylScal4::Psi2r(Interior)
-  WRITES:   WeylScal4::Psi3i(Interior)
-  WRITES:   WeylScal4::Psi3r(Interior)
-  WRITES:   WeylScal4::Psi4i(Interior)
-  WRITES:   WeylScal4::Psi4r(Interior)
+  READS: admbase::kxx(Everywhere)
+  READS: admbase::kxy(Everywhere)
+  READS: admbase::kxz(Everywhere)
+  READS: admbase::kyy(Everywhere)
+  READS: admbase::kyz(Everywhere)
+  READS: admbase::kzz(Everywhere)
+  READS: admbase::gxx(Everywhere)
+  READS: admbase::gxy(Everywhere)
+  READS: admbase::gxz(Everywhere)
+  READS: admbase::gyy(Everywhere)
+  READS: admbase::gyz(Everywhere)
+  READS: admbase::gzz(Everywhere)
+  READS: grid::x(Everywhere)
+  READS: grid::y(Everywhere)
+  READS: grid::z(Everywhere)
+  WRITES: WeylScal4::Psi0i(Interior)
+  WRITES: WeylScal4::Psi0r(Interior)
+  WRITES: WeylScal4::Psi1i(Interior)
+  WRITES: WeylScal4::Psi1r(Interior)
+  WRITES: WeylScal4::Psi2i(Interior)
+  WRITES: WeylScal4::Psi2r(Interior)
+  WRITES: WeylScal4::Psi3i(Interior)
+  WRITES: WeylScal4::Psi3r(Interior)
+  WRITES: WeylScal4::Psi4i(Interior)
+  WRITES: WeylScal4::Psi4r(Interior)
 } "WeylScal4_psis_calc_Nth"
 
 schedule WeylScal4_psis_calc_Nth_SelectBCs in WeylScal4_psis_calc_Nth_bc_group
@@ -558,31 +360,31 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
 schedule WeylScal4_psis_calc_2nd in WeylScal4_psis_calc_2nd_group
 {
   LANG: C
-  READS:    admbase::kxx(Everywhere)
-  READS:    admbase::kxy(Everywhere)
-  READS:    admbase::kxz(Everywhere)
-  READS:    admbase::kyy(Everywhere)
-  READS:    admbase::kyz(Everywhere)
-  READS:    admbase::kzz(Everywhere)
-  READS:    admbase::gxx(Everywhere)
-  READS:    admbase::gxy(Everywhere)
-  READS:    admbase::gxz(Everywhere)
-  READS:    admbase::gyy(Everywhere)
-  READS:    admbase::gyz(Everywhere)
-  READS:    admbase::gzz(Everywhere)
-  READS:    grid::x(Everywhere)
-  READS:    grid::y(Everywhere)
-  READS:    grid::z(Everywhere)
-  WRITES:   WeylScal4::Psi0i(Interior)
-  WRITES:   WeylScal4::Psi0r(Interior)
-  WRITES:   WeylScal4::Psi1i(Interior)
-  WRITES:   WeylScal4::Psi1r(Interior)
-  WRITES:   WeylScal4::Psi2i(Interior)
-  WRITES:   WeylScal4::Psi2r(Interior)
-  WRITES:   WeylScal4::Psi3i(Interior)
-  WRITES:   WeylScal4::Psi3r(Interior)
-  WRITES:   WeylScal4::Psi4i(Interior)
-  WRITES:   WeylScal4::Psi4r(Interior)
+  READS: admbase::kxx(Everywhere)
+  READS: admbase::kxy(Everywhere)
+  READS: admbase::kxz(Everywhere)
+  READS: admbase::kyy(Everywhere)
+  READS: admbase::kyz(Everywhere)
+  READS: admbase::kzz(Everywhere)
+  READS: admbase::gxx(Everywhere)
+  READS: admbase::gxy(Everywhere)
+  READS: admbase::gxz(Everywhere)
+  READS: admbase::gyy(Everywhere)
+  READS: admbase::gyz(Everywhere)
+  READS: admbase::gzz(Everywhere)
+  READS: grid::x(Everywhere)
+  READS: grid::y(Everywhere)
+  READS: grid::z(Everywhere)
+  WRITES: WeylScal4::Psi0i(Interior)
+  WRITES: WeylScal4::Psi0r(Interior)
+  WRITES: WeylScal4::Psi1i(Interior)
+  WRITES: WeylScal4::Psi1r(Interior)
+  WRITES: WeylScal4::Psi2i(Interior)
+  WRITES: WeylScal4::Psi2r(Interior)
+  WRITES: WeylScal4::Psi3i(Interior)
+  WRITES: WeylScal4::Psi3r(Interior)
+  WRITES: WeylScal4::Psi4i(Interior)
+  WRITES: WeylScal4::Psi4r(Interior)
 } "WeylScal4_psis_calc_2nd"
 
 schedule WeylScal4_psis_calc_2nd_SelectBCs in WeylScal4_psis_calc_2nd_bc_group
@@ -644,31 +446,31 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
 schedule WeylScal4_psis_calc_4th in WeylScal4_psis_calc_4th_group
 {
   LANG: C
-  READS:    admbase::kxx(Everywhere)
-  READS:    admbase::kxy(Everywhere)
-  READS:    admbase::kxz(Everywhere)
-  READS:    admbase::kyy(Everywhere)
-  READS:    admbase::kyz(Everywhere)
-  READS:    admbase::kzz(Everywhere)
-  READS:    admbase::gxx(Everywhere)
-  READS:    admbase::gxy(Everywhere)
-  READS:    admbase::gxz(Everywhere)
-  READS:    admbase::gyy(Everywhere)
-  READS:    admbase::gyz(Everywhere)
-  READS:    admbase::gzz(Everywhere)
-  READS:    grid::x(Everywhere)
-  READS:    grid::y(Everywhere)
-  READS:    grid::z(Everywhere)
-  WRITES:   WeylScal4::Psi0i(Interior)
-  WRITES:   WeylScal4::Psi0r(Interior)
-  WRITES:   WeylScal4::Psi1i(Interior)
-  WRITES:   WeylScal4::Psi1r(Interior)
-  WRITES:   WeylScal4::Psi2i(Interior)
-  WRITES:   WeylScal4::Psi2r(Interior)
-  WRITES:   WeylScal4::Psi3i(Interior)
-  WRITES:   WeylScal4::Psi3r(Interior)
-  WRITES:   WeylScal4::Psi4i(Interior)
-  WRITES:   WeylScal4::Psi4r(Interior)
+  READS: admbase::kxx(Everywhere)
+  READS: admbase::kxy(Everywhere)
+  READS: admbase::kxz(Everywhere)
+  READS: admbase::kyy(Everywhere)
+  READS: admbase::kyz(Everywhere)
+  READS: admbase::kzz(Everywhere)
+  READS: admbase::gxx(Everywhere)
+  READS: admbase::gxy(Everywhere)
+  READS: admbase::gxz(Everywhere)
+  READS: admbase::gyy(Everywhere)
+  READS: admbase::gyz(Everywhere)
+  READS: admbase::gzz(Everywhere)
+  READS: grid::x(Everywhere)
+  READS: grid::y(Everywhere)
+  READS: grid::z(Everywhere)
+  WRITES: WeylScal4::Psi0i(Interior)
+  WRITES: WeylScal4::Psi0r(Interior)
+  WRITES: WeylScal4::Psi1i(Interior)
+  WRITES: WeylScal4::Psi1r(Interior)
+  WRITES: WeylScal4::Psi2i(Interior)
+  WRITES: WeylScal4::Psi2r(Interior)
+  WRITES: WeylScal4::Psi3i(Interior)
+  WRITES: WeylScal4::Psi3r(Interior)
+  WRITES: WeylScal4::Psi4i(Interior)
+  WRITES: WeylScal4::Psi4r(Interior)
 } "WeylScal4_psis_calc_4th"
 
 schedule WeylScal4_psis_calc_4th_SelectBCs in WeylScal4_psis_calc_4th_bc_group
@@ -734,24 +536,24 @@ if (CCTK_EQUALS(calc_invariants, "always"))
 schedule WeylScal4_invars_calc_Nth in WeylScal4_invars_calc_Nth_group
 {
   LANG: C
-  READS:    WeylScal4::Psi0i(Everywhere)
-  READS:    WeylScal4::Psi0r(Everywhere)
-  READS:    WeylScal4::Psi1i(Everywhere)
-  READS:    WeylScal4::Psi1r(Everywhere)
-  READS:    WeylScal4::Psi2i(Everywhere)
-  READS:    WeylScal4::Psi2r(Everywhere)
-  READS:    WeylScal4::Psi3i(Everywhere)
-  READS:    WeylScal4::Psi3r(Everywhere)
-  READS:    WeylScal4::Psi4i(Everywhere)
-  READS:    WeylScal4::Psi4r(Everywhere)
-  WRITES:   WeylScal4::curvIi(Interior)
-  WRITES:   WeylScal4::curvIr(Interior)
-  WRITES:   WeylScal4::curvJ1(Interior)
-  WRITES:   WeylScal4::curvJ2(Interior)
-  WRITES:   WeylScal4::curvJ3(Interior)
-  WRITES:   WeylScal4::curvJ4(Interior)
-  WRITES:   WeylScal4::curvJi(Interior)
-  WRITES:   WeylScal4::curvJr(Interior)
+  READS: WeylScal4::Psi0i(Everywhere)
+  READS: WeylScal4::Psi0r(Everywhere)
+  READS: WeylScal4::Psi1i(Everywhere)
+  READS: WeylScal4::Psi1r(Everywhere)
+  READS: WeylScal4::Psi2i(Everywhere)
+  READS: WeylScal4::Psi2r(Everywhere)
+  READS: WeylScal4::Psi3i(Everywhere)
+  READS: WeylScal4::Psi3r(Everywhere)
+  READS: WeylScal4::Psi4i(Everywhere)
+  READS: WeylScal4::Psi4r(Everywhere)
+  WRITES: WeylScal4::curvIi(Interior)
+  WRITES: WeylScal4::curvIr(Interior)
+  WRITES: WeylScal4::curvJ1(Interior)
+  WRITES: WeylScal4::curvJ2(Interior)
+  WRITES: WeylScal4::curvJ3(Interior)
+  WRITES: WeylScal4::curvJ4(Interior)
+  WRITES: WeylScal4::curvJi(Interior)
+  WRITES: WeylScal4::curvJr(Interior)
 } "WeylScal4_invars_calc_Nth"
 
 
@@ -773,24 +575,24 @@ if (CCTK_EQUALS(calc_invariants, "always"))
 schedule WeylScal4_invars_calc_2nd in WeylScal4_invars_calc_2nd_group
 {
   LANG: C
-  READS:    WeylScal4::Psi0i(Everywhere)
-  READS:    WeylScal4::Psi0r(Everywhere)
-  READS:    WeylScal4::Psi1i(Everywhere)
-  READS:    WeylScal4::Psi1r(Everywhere)
-  READS:    WeylScal4::Psi2i(Everywhere)
-  READS:    WeylScal4::Psi2r(Everywhere)
-  READS:    WeylScal4::Psi3i(Everywhere)
-  READS:    WeylScal4::Psi3r(Everywhere)
-  READS:    WeylScal4::Psi4i(Everywhere)
-  READS:    WeylScal4::Psi4r(Everywhere)
-  WRITES:   WeylScal4::curvIi(Interior)
-  WRITES:   WeylScal4::curvIr(Interior)
-  WRITES:   WeylScal4::curvJ1(Interior)
-  WRITES:   WeylScal4::curvJ2(Interior)
-  WRITES:   WeylScal4::curvJ3(Interior)
-  WRITES:   WeylScal4::curvJ4(Interior)
-  WRITES:   WeylScal4::curvJi(Interior)
-  WRITES:   WeylScal4::curvJr(Interior)
+  READS: WeylScal4::Psi0i(Everywhere)
+  READS: WeylScal4::Psi0r(Everywhere)
+  READS: WeylScal4::Psi1i(Everywhere)
+  READS: WeylScal4::Psi1r(Everywhere)
+  READS: WeylScal4::Psi2i(Everywhere)
+  READS: WeylScal4::Psi2r(Everywhere)
+  READS: WeylScal4::Psi3i(Everywhere)
+  READS: WeylScal4::Psi3r(Everywhere)
+  READS: WeylScal4::Psi4i(Everywhere)
+  READS: WeylScal4::Psi4r(Everywhere)
+  WRITES: WeylScal4::curvIi(Interior)
+  WRITES: WeylScal4::curvIr(Interior)
+  WRITES: WeylScal4::curvJ1(Interior)
+  WRITES: WeylScal4::curvJ2(Interior)
+  WRITES: WeylScal4::curvJ3(Interior)
+  WRITES: WeylScal4::curvJ4(Interior)
+  WRITES: WeylScal4::curvJi(Interior)
+  WRITES: WeylScal4::curvJr(Interior)
 } "WeylScal4_invars_calc_2nd"
 
 
@@ -812,24 +614,24 @@ if (CCTK_EQUALS(calc_invariants, "always"))
 schedule WeylScal4_invars_calc_4th in WeylScal4_invars_calc_4th_group
 {
   LANG: C
-  READS:    WeylScal4::Psi0i(Everywhere)
-  READS:    WeylScal4::Psi0r(Everywhere)
-  READS:    WeylScal4::Psi1i(Everywhere)
-  READS:    WeylScal4::Psi1r(Everywhere)
-  READS:    WeylScal4::Psi2i(Everywhere)
-  READS:    WeylScal4::Psi2r(Everywhere)
-  READS:    WeylScal4::Psi3i(Everywhere)
-  READS:    WeylScal4::Psi3r(Everywhere)
-  READS:    WeylScal4::Psi4i(Everywhere)
-  READS:    WeylScal4::Psi4r(Everywhere)
-  WRITES:   WeylScal4::curvIi(Interior)
-  WRITES:   WeylScal4::curvIr(Interior)
-  WRITES:   WeylScal4::curvJ1(Interior)
-  WRITES:   WeylScal4::curvJ2(Interior)
-  WRITES:   WeylScal4::curvJ3(Interior)
-  WRITES:   WeylScal4::curvJ4(Interior)
-  WRITES:   WeylScal4::curvJi(Interior)
-  WRITES:   WeylScal4::curvJr(Interior)
+  READS: WeylScal4::Psi0i(Everywhere)
+  READS: WeylScal4::Psi0r(Everywhere)
+  READS: WeylScal4::Psi1i(Everywhere)
+  READS: WeylScal4::Psi1r(Everywhere)
+  READS: WeylScal4::Psi2i(Everywhere)
+  READS: WeylScal4::Psi2r(Everywhere)
+  READS: WeylScal4::Psi3i(Everywhere)
+  READS: WeylScal4::Psi3r(Everywhere)
+  READS: WeylScal4::Psi4i(Everywhere)
+  READS: WeylScal4::Psi4r(Everywhere)
+  WRITES: WeylScal4::curvIi(Interior)
+  WRITES: WeylScal4::curvIr(Interior)
+  WRITES: WeylScal4::curvJ1(Interior)
+  WRITES: WeylScal4::curvJ2(Interior)
+  WRITES: WeylScal4::curvJ3(Interior)
+  WRITES: WeylScal4::curvJ4(Interior)
+  WRITES: WeylScal4::curvJi(Interior)
+  WRITES: WeylScal4::curvJr(Interior)
 } "WeylScal4_invars_calc_4th"
 
 schedule WeylScal4_SelectBoundConds in MoL_PostStep