Regenerate code

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

3 files changed, 105 insertions, 262 deletions

diff --git a/param.ccl b/param.ccl
index 489b6ba..97471d0 100644
--- a/param.ccl
+++ b/param.ccl
@@ -4,6 +4,8 @@
 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
 
@@ -102,109 +104,109 @@ CCTK_INT other_timelevels "Number of active timelevels for non-evolved grid func
 } 1
 
 restricted:
-CCTK_INT psi4_calc_Nth_calc_every "psi4_calc_Nth_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psi4_calc_Nth_calc_every "WeylScal4_psi4_calc_Nth_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT psi4_calc_2nd_calc_every "psi4_calc_2nd_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psi4_calc_2nd_calc_every "WeylScal4_psi4_calc_2nd_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT psi4_calc_4th_calc_every "psi4_calc_4th_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psi4_calc_4th_calc_every "WeylScal4_psi4_calc_4th_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT psis_calc_Nth_calc_every "psis_calc_Nth_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psis_calc_Nth_calc_every "WeylScal4_psis_calc_Nth_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT psis_calc_2nd_calc_every "psis_calc_2nd_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psis_calc_2nd_calc_every "WeylScal4_psis_calc_2nd_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT psis_calc_4th_calc_every "psis_calc_4th_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psis_calc_4th_calc_every "WeylScal4_psis_calc_4th_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT invars_calc_Nth_calc_every "invars_calc_Nth_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_invars_calc_Nth_calc_every "WeylScal4_invars_calc_Nth_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT invars_calc_2nd_calc_every "invars_calc_2nd_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_invars_calc_2nd_calc_every "WeylScal4_invars_calc_2nd_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT invars_calc_4th_calc_every "invars_calc_4th_calc_every" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_invars_calc_4th_calc_every "WeylScal4_invars_calc_4th_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 1
 
 restricted:
-CCTK_INT psi4_calc_Nth_calc_offset "psi4_calc_Nth_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psi4_calc_Nth_calc_offset "WeylScal4_psi4_calc_Nth_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT psi4_calc_2nd_calc_offset "psi4_calc_2nd_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psi4_calc_2nd_calc_offset "WeylScal4_psi4_calc_2nd_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT psi4_calc_4th_calc_offset "psi4_calc_4th_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psi4_calc_4th_calc_offset "WeylScal4_psi4_calc_4th_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT psis_calc_Nth_calc_offset "psis_calc_Nth_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psis_calc_Nth_calc_offset "WeylScal4_psis_calc_Nth_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT psis_calc_2nd_calc_offset "psis_calc_2nd_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psis_calc_2nd_calc_offset "WeylScal4_psis_calc_2nd_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT psis_calc_4th_calc_offset "psis_calc_4th_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_psis_calc_4th_calc_offset "WeylScal4_psis_calc_4th_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT invars_calc_Nth_calc_offset "invars_calc_Nth_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_invars_calc_Nth_calc_offset "WeylScal4_invars_calc_Nth_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT invars_calc_2nd_calc_offset "invars_calc_2nd_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_invars_calc_2nd_calc_offset "WeylScal4_invars_calc_2nd_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
 
 restricted:
-CCTK_INT invars_calc_4th_calc_offset "invars_calc_4th_calc_offset" STEERABLE=ALWAYS
+CCTK_INT WeylScal4_invars_calc_4th_calc_offset "WeylScal4_invars_calc_4th_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
 } 0
diff --git a/schedule.ccl b/schedule.ccl
index 01c02c3..161dd1f 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -253,14 +253,14 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "Nth"))
   {
-    schedule group psi4_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+    schedule group WeylScal4_psi4_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars
     {
       # no language specified
-    } "psi4_calc_Nth"
+    } "WeylScal4_psi4_calc_Nth"
   }
 }
 
-schedule psi4_calc_Nth in psi4_calc_Nth_group
+schedule WeylScal4_psi4_calc_Nth in WeylScal4_psi4_calc_Nth_group
 {
   LANG: C
   READS:    admbase::gxx
@@ -280,20 +280,20 @@ schedule psi4_calc_Nth in psi4_calc_Nth_group
   READS:    grid::z
   WRITES:   WeylScal4::Psi4i
   WRITES:   WeylScal4::Psi4r
-} "psi4_calc_Nth"
+} "WeylScal4_psi4_calc_Nth"
 
-schedule psi4_calc_Nth_SelectBCs in psi4_calc_Nth_bc_group
+schedule WeylScal4_psi4_calc_Nth_SelectBCs in WeylScal4_psi4_calc_Nth_bc_group
 {
   LANG: C
   OPTIONS: level
   SYNC: Psi4i_group
   SYNC: Psi4r_group
-} "psi4_calc_Nth_SelectBCs"
+} "WeylScal4_psi4_calc_Nth_SelectBCs"
 
-schedule group ApplyBCs as psi4_calc_Nth_ApplyBCs in psi4_calc_Nth_bc_group after psi4_calc_Nth_SelectBCs
+schedule group ApplyBCs as WeylScal4_psi4_calc_Nth_ApplyBCs in WeylScal4_psi4_calc_Nth_bc_group after WeylScal4_psi4_calc_Nth_SelectBCs
 {
   # no language specified
-} "Apply BCs for groups set in psi4_calc_Nth"
+} "Apply BCs for groups set in WeylScal4_psi4_calc_Nth"
 
 
 if (CCTK_EQUALS(calc_scalars, "psi4"))
@@ -301,10 +301,10 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "Nth"))
   {
-    schedule group psi4_calc_Nth_bc_group in psi4_calc_Nth_group after psi4_calc_Nth
+    schedule group WeylScal4_psi4_calc_Nth_bc_group in WeylScal4_psi4_calc_Nth_group after WeylScal4_psi4_calc_Nth
     {
       # no language specified
-    } "psi4_calc_Nth"
+    } "WeylScal4_psi4_calc_Nth"
   }
 }
 
@@ -314,10 +314,10 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "Nth"))
   {
-    schedule group psi4_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
+    schedule group WeylScal4_psi4_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
     {
       # no language specified
-    } "psi4_calc_Nth"
+    } "WeylScal4_psi4_calc_Nth"
   }
 }
 
@@ -327,14 +327,14 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "2nd"))
   {
-    schedule group psi4_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+    schedule group WeylScal4_psi4_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars
     {
       # no language specified
-    } "psi4_calc_2nd"
+    } "WeylScal4_psi4_calc_2nd"
   }
 }
 
-schedule psi4_calc_2nd in psi4_calc_2nd_group
+schedule WeylScal4_psi4_calc_2nd in WeylScal4_psi4_calc_2nd_group
 {
   LANG: C
   READS:    admbase::gxx
@@ -354,20 +354,20 @@ schedule psi4_calc_2nd in psi4_calc_2nd_group
   READS:    grid::z
   WRITES:   WeylScal4::Psi4i
   WRITES:   WeylScal4::Psi4r
-} "psi4_calc_2nd"
+} "WeylScal4_psi4_calc_2nd"
 
-schedule psi4_calc_2nd_SelectBCs in psi4_calc_2nd_bc_group
+schedule WeylScal4_psi4_calc_2nd_SelectBCs in WeylScal4_psi4_calc_2nd_bc_group
 {
   LANG: C
   OPTIONS: level
   SYNC: Psi4i_group
   SYNC: Psi4r_group
-} "psi4_calc_2nd_SelectBCs"
+} "WeylScal4_psi4_calc_2nd_SelectBCs"
 
-schedule group ApplyBCs as psi4_calc_2nd_ApplyBCs in psi4_calc_2nd_bc_group after psi4_calc_2nd_SelectBCs
+schedule group ApplyBCs as WeylScal4_psi4_calc_2nd_ApplyBCs in WeylScal4_psi4_calc_2nd_bc_group after WeylScal4_psi4_calc_2nd_SelectBCs
 {
   # no language specified
-} "Apply BCs for groups set in psi4_calc_2nd"
+} "Apply BCs for groups set in WeylScal4_psi4_calc_2nd"
 
 
 if (CCTK_EQUALS(calc_scalars, "psi4"))
@@ -375,10 +375,10 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "2nd"))
   {
-    schedule group psi4_calc_2nd_bc_group in psi4_calc_2nd_group after psi4_calc_2nd
+    schedule group WeylScal4_psi4_calc_2nd_bc_group in WeylScal4_psi4_calc_2nd_group after WeylScal4_psi4_calc_2nd
     {
       # no language specified
-    } "psi4_calc_2nd"
+    } "WeylScal4_psi4_calc_2nd"
   }
 }
 
@@ -388,10 +388,10 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "2nd"))
   {
-    schedule group psi4_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
+    schedule group WeylScal4_psi4_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
     {
       # no language specified
-    } "psi4_calc_2nd"
+    } "WeylScal4_psi4_calc_2nd"
   }
 }
 
@@ -401,14 +401,14 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "4th"))
   {
-    schedule group psi4_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+    schedule group WeylScal4_psi4_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars
     {
       # no language specified
-    } "psi4_calc_4th"
+    } "WeylScal4_psi4_calc_4th"
   }
 }
 
-schedule psi4_calc_4th in psi4_calc_4th_group
+schedule WeylScal4_psi4_calc_4th in WeylScal4_psi4_calc_4th_group
 {
   LANG: C
   READS:    admbase::gxx
@@ -428,20 +428,20 @@ schedule psi4_calc_4th in psi4_calc_4th_group
   READS:    grid::z
   WRITES:   WeylScal4::Psi4i
   WRITES:   WeylScal4::Psi4r
-} "psi4_calc_4th"
+} "WeylScal4_psi4_calc_4th"
 
-schedule psi4_calc_4th_SelectBCs in psi4_calc_4th_bc_group
+schedule WeylScal4_psi4_calc_4th_SelectBCs in WeylScal4_psi4_calc_4th_bc_group
 {
   LANG: C
   OPTIONS: level
   SYNC: Psi4i_group
   SYNC: Psi4r_group
-} "psi4_calc_4th_SelectBCs"
+} "WeylScal4_psi4_calc_4th_SelectBCs"
 
-schedule group ApplyBCs as psi4_calc_4th_ApplyBCs in psi4_calc_4th_bc_group after psi4_calc_4th_SelectBCs
+schedule group ApplyBCs as WeylScal4_psi4_calc_4th_ApplyBCs in WeylScal4_psi4_calc_4th_bc_group after WeylScal4_psi4_calc_4th_SelectBCs
 {
   # no language specified
-} "Apply BCs for groups set in psi4_calc_4th"
+} "Apply BCs for groups set in WeylScal4_psi4_calc_4th"
 
 
 if (CCTK_EQUALS(calc_scalars, "psi4"))
@@ -449,10 +449,10 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "4th"))
   {
-    schedule group psi4_calc_4th_bc_group in psi4_calc_4th_group after psi4_calc_4th
+    schedule group WeylScal4_psi4_calc_4th_bc_group in WeylScal4_psi4_calc_4th_group after WeylScal4_psi4_calc_4th
     {
       # no language specified
-    } "psi4_calc_4th"
+    } "WeylScal4_psi4_calc_4th"
   }
 }
 
@@ -462,10 +462,10 @@ if (CCTK_EQUALS(calc_scalars, "psi4"))
   
   if (CCTK_EQUALS(fd_order, "4th"))
   {
-    schedule group psi4_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
+    schedule group WeylScal4_psi4_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
     {
       # no language specified
-    } "psi4_calc_4th"
+    } "WeylScal4_psi4_calc_4th"
   }
 }
 
@@ -475,14 +475,14 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "Nth"))
   {
-    schedule group psis_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+    schedule group WeylScal4_psis_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars
     {
       # no language specified
-    } "psis_calc_Nth"
+    } "WeylScal4_psis_calc_Nth"
   }
 }
 
-schedule psis_calc_Nth in psis_calc_Nth_group
+schedule WeylScal4_psis_calc_Nth in WeylScal4_psis_calc_Nth_group
 {
   LANG: C
   READS:    admbase::gxx
@@ -510,9 +510,9 @@ schedule psis_calc_Nth in psis_calc_Nth_group
   WRITES:   WeylScal4::Psi3r
   WRITES:   WeylScal4::Psi4i
   WRITES:   WeylScal4::Psi4r
-} "psis_calc_Nth"
+} "WeylScal4_psis_calc_Nth"
 
-schedule psis_calc_Nth_SelectBCs in psis_calc_Nth_bc_group
+schedule WeylScal4_psis_calc_Nth_SelectBCs in WeylScal4_psis_calc_Nth_bc_group
 {
   LANG: C
   OPTIONS: level
@@ -526,12 +526,12 @@ schedule psis_calc_Nth_SelectBCs in psis_calc_Nth_bc_group
   SYNC: Psi3r_group
   SYNC: Psi4i_group
   SYNC: Psi4r_group
-} "psis_calc_Nth_SelectBCs"
+} "WeylScal4_psis_calc_Nth_SelectBCs"
 
-schedule group ApplyBCs as psis_calc_Nth_ApplyBCs in psis_calc_Nth_bc_group after psis_calc_Nth_SelectBCs
+schedule group ApplyBCs as WeylScal4_psis_calc_Nth_ApplyBCs in WeylScal4_psis_calc_Nth_bc_group after WeylScal4_psis_calc_Nth_SelectBCs
 {
   # no language specified
-} "Apply BCs for groups set in psis_calc_Nth"
+} "Apply BCs for groups set in WeylScal4_psis_calc_Nth"
 
 
 if (CCTK_EQUALS(calc_scalars, "psis"))
@@ -539,10 +539,10 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "Nth"))
   {
-    schedule group psis_calc_Nth_bc_group in psis_calc_Nth_group after psis_calc_Nth
+    schedule group WeylScal4_psis_calc_Nth_bc_group in WeylScal4_psis_calc_Nth_group after WeylScal4_psis_calc_Nth
     {
       # no language specified
-    } "psis_calc_Nth"
+    } "WeylScal4_psis_calc_Nth"
   }
 }
 
@@ -552,10 +552,10 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "Nth"))
   {
-    schedule group psis_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
+    schedule group WeylScal4_psis_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
     {
       # no language specified
-    } "psis_calc_Nth"
+    } "WeylScal4_psis_calc_Nth"
   }
 }
 
@@ -565,14 +565,14 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "2nd"))
   {
-    schedule group psis_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+    schedule group WeylScal4_psis_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars
     {
       # no language specified
-    } "psis_calc_2nd"
+    } "WeylScal4_psis_calc_2nd"
   }
 }
 
-schedule psis_calc_2nd in psis_calc_2nd_group
+schedule WeylScal4_psis_calc_2nd in WeylScal4_psis_calc_2nd_group
 {
   LANG: C
   READS:    admbase::gxx
@@ -600,9 +600,9 @@ schedule psis_calc_2nd in psis_calc_2nd_group
   WRITES:   WeylScal4::Psi3r
   WRITES:   WeylScal4::Psi4i
   WRITES:   WeylScal4::Psi4r
-} "psis_calc_2nd"
+} "WeylScal4_psis_calc_2nd"
 
-schedule psis_calc_2nd_SelectBCs in psis_calc_2nd_bc_group
+schedule WeylScal4_psis_calc_2nd_SelectBCs in WeylScal4_psis_calc_2nd_bc_group
 {
   LANG: C
   OPTIONS: level
@@ -616,12 +616,12 @@ schedule psis_calc_2nd_SelectBCs in psis_calc_2nd_bc_group
   SYNC: Psi3r_group
   SYNC: Psi4i_group
   SYNC: Psi4r_group
-} "psis_calc_2nd_SelectBCs"
+} "WeylScal4_psis_calc_2nd_SelectBCs"
 
-schedule group ApplyBCs as psis_calc_2nd_ApplyBCs in psis_calc_2nd_bc_group after psis_calc_2nd_SelectBCs
+schedule group ApplyBCs as WeylScal4_psis_calc_2nd_ApplyBCs in WeylScal4_psis_calc_2nd_bc_group after WeylScal4_psis_calc_2nd_SelectBCs
 {
   # no language specified
-} "Apply BCs for groups set in psis_calc_2nd"
+} "Apply BCs for groups set in WeylScal4_psis_calc_2nd"
 
 
 if (CCTK_EQUALS(calc_scalars, "psis"))
@@ -629,10 +629,10 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "2nd"))
   {
-    schedule group psis_calc_2nd_bc_group in psis_calc_2nd_group after psis_calc_2nd
+    schedule group WeylScal4_psis_calc_2nd_bc_group in WeylScal4_psis_calc_2nd_group after WeylScal4_psis_calc_2nd
     {
       # no language specified
-    } "psis_calc_2nd"
+    } "WeylScal4_psis_calc_2nd"
   }
 }
 
@@ -642,10 +642,10 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "2nd"))
   {
-    schedule group psis_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
+    schedule group WeylScal4_psis_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
     {
       # no language specified
-    } "psis_calc_2nd"
+    } "WeylScal4_psis_calc_2nd"
   }
 }
 
@@ -655,14 +655,14 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "4th"))
   {
-    schedule group psis_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+    schedule group WeylScal4_psis_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars
     {
       # no language specified
-    } "psis_calc_4th"
+    } "WeylScal4_psis_calc_4th"
   }
 }
 
-schedule psis_calc_4th in psis_calc_4th_group
+schedule WeylScal4_psis_calc_4th in WeylScal4_psis_calc_4th_group
 {
   LANG: C
   READS:    admbase::gxx
@@ -690,9 +690,9 @@ schedule psis_calc_4th in psis_calc_4th_group
   WRITES:   WeylScal4::Psi3r
   WRITES:   WeylScal4::Psi4i
   WRITES:   WeylScal4::Psi4r
-} "psis_calc_4th"
+} "WeylScal4_psis_calc_4th"
 
-schedule psis_calc_4th_SelectBCs in psis_calc_4th_bc_group
+schedule WeylScal4_psis_calc_4th_SelectBCs in WeylScal4_psis_calc_4th_bc_group
 {
   LANG: C
   OPTIONS: level
@@ -706,12 +706,12 @@ schedule psis_calc_4th_SelectBCs in psis_calc_4th_bc_group
   SYNC: Psi3r_group
   SYNC: Psi4i_group
   SYNC: Psi4r_group
-} "psis_calc_4th_SelectBCs"
+} "WeylScal4_psis_calc_4th_SelectBCs"
 
-schedule group ApplyBCs as psis_calc_4th_ApplyBCs in psis_calc_4th_bc_group after psis_calc_4th_SelectBCs
+schedule group ApplyBCs as WeylScal4_psis_calc_4th_ApplyBCs in WeylScal4_psis_calc_4th_bc_group after WeylScal4_psis_calc_4th_SelectBCs
 {
   # no language specified
-} "Apply BCs for groups set in psis_calc_4th"
+} "Apply BCs for groups set in WeylScal4_psis_calc_4th"
 
 
 if (CCTK_EQUALS(calc_scalars, "psis"))
@@ -719,10 +719,10 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "4th"))
   {
-    schedule group psis_calc_4th_bc_group in psis_calc_4th_group after psis_calc_4th
+    schedule group WeylScal4_psis_calc_4th_bc_group in WeylScal4_psis_calc_4th_group after WeylScal4_psis_calc_4th
     {
       # no language specified
-    } "psis_calc_4th"
+    } "WeylScal4_psis_calc_4th"
   }
 }
 
@@ -732,10 +732,10 @@ if (CCTK_EQUALS(calc_scalars, "psis"))
   
   if (CCTK_EQUALS(fd_order, "4th"))
   {
-    schedule group psis_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
+    schedule group WeylScal4_psis_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
     {
       # no language specified
-    } "psis_calc_4th"
+    } "WeylScal4_psis_calc_4th"
   }
 }
 
@@ -748,15 +748,15 @@ if (CCTK_EQUALS(calc_invariants, "always"))
     
     if (CCTK_EQUALS(fd_order, "Nth"))
     {
-      schedule group invars_calc_Nth_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+      schedule group WeylScal4_invars_calc_Nth_group in MoL_PseudoEvolution after WeylScal4_psis_calc_Nth_group
       {
         # no language specified
-      } "invars_calc_Nth"
+      } "WeylScal4_invars_calc_Nth"
     }
   }
 }
 
-schedule invars_calc_Nth in invars_calc_Nth_group
+schedule WeylScal4_invars_calc_Nth in WeylScal4_invars_calc_Nth_group
 {
   LANG: C
   READS:    WeylScal4::Psi0i
@@ -777,60 +777,7 @@ schedule invars_calc_Nth in invars_calc_Nth_group
   WRITES:   WeylScal4::curvJ4
   WRITES:   WeylScal4::curvJi
   WRITES:   WeylScal4::curvJr
-} "invars_calc_Nth"
-
-schedule invars_calc_Nth_SelectBCs in invars_calc_Nth_bc_group
-{
-  LANG: C
-  OPTIONS: level
-  SYNC: curvIi_group
-  SYNC: curvIr_group
-  SYNC: curvJ1_group
-  SYNC: curvJ2_group
-  SYNC: curvJ3_group
-  SYNC: curvJ4_group
-  SYNC: curvJi_group
-  SYNC: curvJr_group
-} "invars_calc_Nth_SelectBCs"
-
-schedule group ApplyBCs as invars_calc_Nth_ApplyBCs in invars_calc_Nth_bc_group after invars_calc_Nth_SelectBCs
-{
-  # no language specified
-} "Apply BCs for groups set in invars_calc_Nth"
-
-
-if (CCTK_EQUALS(calc_invariants, "always"))
-{
-  
-  if (CCTK_EQUALS(calc_scalars, "psis"))
-  {
-    
-    if (CCTK_EQUALS(fd_order, "Nth"))
-    {
-      schedule group invars_calc_Nth_bc_group in invars_calc_Nth_group after invars_calc_Nth
-      {
-        # no language specified
-      } "invars_calc_Nth"
-    }
-  }
-}
-
-
-if (CCTK_EQUALS(calc_invariants, "always"))
-{
-  
-  if (CCTK_EQUALS(calc_scalars, "psis"))
-  {
-    
-    if (CCTK_EQUALS(fd_order, "Nth"))
-    {
-      schedule group invars_calc_Nth_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
-      {
-        # no language specified
-      } "invars_calc_Nth"
-    }
-  }
-}
+} "WeylScal4_invars_calc_Nth"
 
 
 if (CCTK_EQUALS(calc_invariants, "always"))
@@ -841,15 +788,15 @@ if (CCTK_EQUALS(calc_invariants, "always"))
     
     if (CCTK_EQUALS(fd_order, "2nd"))
     {
-      schedule group invars_calc_2nd_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+      schedule group WeylScal4_invars_calc_2nd_group in MoL_PseudoEvolution after WeylScal4_psis_calc_2nd_group
       {
         # no language specified
-      } "invars_calc_2nd"
+      } "WeylScal4_invars_calc_2nd"
     }
   }
 }
 
-schedule invars_calc_2nd in invars_calc_2nd_group
+schedule WeylScal4_invars_calc_2nd in WeylScal4_invars_calc_2nd_group
 {
   LANG: C
   READS:    WeylScal4::Psi0i
@@ -870,60 +817,7 @@ schedule invars_calc_2nd in invars_calc_2nd_group
   WRITES:   WeylScal4::curvJ4
   WRITES:   WeylScal4::curvJi
   WRITES:   WeylScal4::curvJr
-} "invars_calc_2nd"
-
-schedule invars_calc_2nd_SelectBCs in invars_calc_2nd_bc_group
-{
-  LANG: C
-  OPTIONS: level
-  SYNC: curvIi_group
-  SYNC: curvIr_group
-  SYNC: curvJ1_group
-  SYNC: curvJ2_group
-  SYNC: curvJ3_group
-  SYNC: curvJ4_group
-  SYNC: curvJi_group
-  SYNC: curvJr_group
-} "invars_calc_2nd_SelectBCs"
-
-schedule group ApplyBCs as invars_calc_2nd_ApplyBCs in invars_calc_2nd_bc_group after invars_calc_2nd_SelectBCs
-{
-  # no language specified
-} "Apply BCs for groups set in invars_calc_2nd"
-
-
-if (CCTK_EQUALS(calc_invariants, "always"))
-{
-  
-  if (CCTK_EQUALS(calc_scalars, "psis"))
-  {
-    
-    if (CCTK_EQUALS(fd_order, "2nd"))
-    {
-      schedule group invars_calc_2nd_bc_group in invars_calc_2nd_group after invars_calc_2nd
-      {
-        # no language specified
-      } "invars_calc_2nd"
-    }
-  }
-}
-
-
-if (CCTK_EQUALS(calc_invariants, "always"))
-{
-  
-  if (CCTK_EQUALS(calc_scalars, "psis"))
-  {
-    
-    if (CCTK_EQUALS(fd_order, "2nd"))
-    {
-      schedule group invars_calc_2nd_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
-      {
-        # no language specified
-      } "invars_calc_2nd"
-    }
-  }
-}
+} "WeylScal4_invars_calc_2nd"
 
 
 if (CCTK_EQUALS(calc_invariants, "always"))
@@ -934,15 +828,15 @@ if (CCTK_EQUALS(calc_invariants, "always"))
     
     if (CCTK_EQUALS(fd_order, "4th"))
     {
-      schedule group invars_calc_4th_group in MoL_PseudoEvolution after ADMBase_SetADMVars
+      schedule group WeylScal4_invars_calc_4th_group in MoL_PseudoEvolution after WeylScal4_psis_calc_4th_group
       {
         # no language specified
-      } "invars_calc_4th"
+      } "WeylScal4_invars_calc_4th"
     }
   }
 }
 
-schedule invars_calc_4th in invars_calc_4th_group
+schedule WeylScal4_invars_calc_4th in WeylScal4_invars_calc_4th_group
 {
   LANG: C
   READS:    WeylScal4::Psi0i
@@ -963,60 +857,7 @@ schedule invars_calc_4th in invars_calc_4th_group
   WRITES:   WeylScal4::curvJ4
   WRITES:   WeylScal4::curvJi
   WRITES:   WeylScal4::curvJr
-} "invars_calc_4th"
-
-schedule invars_calc_4th_SelectBCs in invars_calc_4th_bc_group
-{
-  LANG: C
-  OPTIONS: level
-  SYNC: curvIi_group
-  SYNC: curvIr_group
-  SYNC: curvJ1_group
-  SYNC: curvJ2_group
-  SYNC: curvJ3_group
-  SYNC: curvJ4_group
-  SYNC: curvJi_group
-  SYNC: curvJr_group
-} "invars_calc_4th_SelectBCs"
-
-schedule group ApplyBCs as invars_calc_4th_ApplyBCs in invars_calc_4th_bc_group after invars_calc_4th_SelectBCs
-{
-  # no language specified
-} "Apply BCs for groups set in invars_calc_4th"
-
-
-if (CCTK_EQUALS(calc_invariants, "always"))
-{
-  
-  if (CCTK_EQUALS(calc_scalars, "psis"))
-  {
-    
-    if (CCTK_EQUALS(fd_order, "4th"))
-    {
-      schedule group invars_calc_4th_bc_group in invars_calc_4th_group after invars_calc_4th
-      {
-        # no language specified
-      } "invars_calc_4th"
-    }
-  }
-}
-
-
-if (CCTK_EQUALS(calc_invariants, "always"))
-{
-  
-  if (CCTK_EQUALS(calc_scalars, "psis"))
-  {
-    
-    if (CCTK_EQUALS(fd_order, "4th"))
-    {
-      schedule group invars_calc_4th_bc_group in MoL_PseudoEvolutionBoundaries after MoL_PostStep
-      {
-        # no language specified
-      } "invars_calc_4th"
-    }
-  }
-}
+} "WeylScal4_invars_calc_4th"
 
 schedule WeylScal4_SelectBoundConds in MoL_PostStep
 {
diff --git a/src/make.code.defn b/src/make.code.defn
index 642bc51..d5c3ece 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc psi4_calc_Nth.cc psi4_calc_2nd.cc psi4_calc_4th.cc psis_calc_Nth.cc psis_calc_2nd.cc psis_calc_4th.cc invars_calc_Nth.cc invars_calc_2nd.cc invars_calc_4th.cc Boundaries.cc 
+SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc WeylScal4_psi4_calc_Nth.cc WeylScal4_psi4_calc_2nd.cc WeylScal4_psi4_calc_4th.cc WeylScal4_psis_calc_Nth.cc WeylScal4_psis_calc_2nd.cc WeylScal4_psis_calc_4th.cc WeylScal4_invars_calc_Nth.cc WeylScal4_invars_calc_2nd.cc WeylScal4_invars_calc_4th.cc Boundaries.cc