Many changes that accumulated while Cactus and Carpet diverged.

Many changes that accumulated while Cactus and Carpet diverged.
Add processor splitting mechanism "along-dir" that splits along a
specified direction.

Rename group PostRestrict to bin POSTRESTRICT.

Prolongate initial data only when desired.  This saves much time.
Sorry, Ian.

Fix bug in time level cycling of grid arrays.  (Note: grid arrays
should not have time levels.)

Fix time_t bug on IRIX.

Make sure that there is no integer overflow when there are many
refinement levels.  Always put parentheses around
(maxreflevelfact/reflevelfact).

Fix typo in Carpet verbose output.

Add debug output in processor splitting.

Communicate in three stages: Irecv, (work), Isend, Wait.  This might
be more efficient.  Much more, potentially.

Fix bug in processor layout of grid arrays.  Sorry, Ian.

Make the interpolator interpolate between time levels.  Untested.

Fix bug in processor communication in interpolator.  Sorry, Ian.

Rewrite prolongation operators to make them twice as fast.  There you
are, Ian.

Move prolongation operator kind handling from data to gdata.

Add official hyperslabbing interfaces to CarpetSlab.

Adapt to new cGH * handling.

darcs-hash:20031105141838-07bb3-d348d033307d82905893e241be485c4db2ce8ce3.gz

28 files changed, 48 insertions, 45 deletions

diff --git a/CarpetExtra/CarpetIOSer/schedule.ccl b/CarpetExtra/CarpetIOSer/schedule.ccl
index 44bae0dce..ee9aa7bc9 100644
--- a/CarpetExtra/CarpetIOSer/schedule.ccl
+++ b/CarpetExtra/CarpetIOSer/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn CarpetIOSer
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/CarpetIOSer/schedule.ccl,v 1.1 2002/02/08 14:55:30 shawley Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/CarpetIOSer/schedule.ccl,v 1.2 2003/11/05 16:18:38 schnetter Exp $
 
 schedule CarpetIOSerStartup at STARTUP after IOUtil_Startup
 {
diff --git a/CarpetExtra/FOWaveToyF77/schedule.ccl b/CarpetExtra/FOWaveToyF77/schedule.ccl
index 05e414b85..a3cd168c0 100644
--- a/CarpetExtra/FOWaveToyF77/schedule.ccl
+++ b/CarpetExtra/FOWaveToyF77/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn FOWaveToy77
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/FOWaveToyF77/schedule.ccl,v 1.9 2003/07/20 21:03:43 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/FOWaveToyF77/schedule.ccl,v 1.10 2003/11/05 16:18:39 schnetter Exp $
 
 STORAGE: scalarevolve[3] scalarevolve_derivs[3]
 
@@ -45,12 +45,12 @@ schedule group ApplyBCs as FOWaveToy_ApplyBCs at EVOL after FOWaveToy_Boundaries
 
 
 
-schedule FOWaveToyF77_Boundaries as FOWaveToy_Boundaries in PostRestrict
+schedule FOWaveToyF77_Boundaries as FOWaveToy_Boundaries at POSTRESTRICT
 {
   LANG: Fortran
   SYNC: scalarevolve scalarevolve_derivs
 } "Select boundary conditions of 3D wave equation"
 
-schedule group ApplyBCs as FOWaveToy_ApplyBCs in PostRestrict after FOWaveToy_Boundaries
+schedule group ApplyBCs as FOWaveToy_ApplyBCs at POSTRESTRICT after FOWaveToy_Boundaries
 {
 } "Apply boundary conditions of 3D wave equation"
diff --git a/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77 b/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
index a89c8cd57..bc2a17549 100644
--- a/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
+++ b/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
@@ -13,9 +13,9 @@ c     -*-Fortran-*-
  @@*/
   
 #include "cctk.h" 
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
 
 
 
diff --git a/CarpetExtra/FOWaveToyF77/src/InitSymBound.F77 b/CarpetExtra/FOWaveToyF77/src/InitSymBound.F77
index 84a62f076..a64c3463c 100644
--- a/CarpetExtra/FOWaveToyF77/src/InitSymBound.F77
+++ b/CarpetExtra/FOWaveToyF77/src/InitSymBound.F77
@@ -11,6 +11,7 @@ c	-*-Fortran-*-
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
 
  /*@@
diff --git a/CarpetExtra/HydroToy/schedule.ccl b/CarpetExtra/HydroToy/schedule.ccl
index 29d27ecc2..2a1e5d536 100644
--- a/CarpetExtra/HydroToy/schedule.ccl
+++ b/CarpetExtra/HydroToy/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn HydroToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.3 2002/04/29 11:28:01 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.4 2003/11/05 16:18:39 schnetter Exp $
 
 if (hydrotoy_active) {
 
diff --git a/CarpetExtra/HydroToy/src/HydroToy.F77 b/CarpetExtra/HydroToy/src/HydroToy.F77
index f3569bb32..559f66497 100644
--- a/CarpetExtra/HydroToy/src/HydroToy.F77
+++ b/CarpetExtra/HydroToy/src/HydroToy.F77
@@ -1,10 +1,10 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.6 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/HydroToy.F77,v 1.7 2003/11/05 16:18:39 schnetter Exp $
       
 #include "cctk.h" 
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
       
       
       
diff --git a/CarpetExtra/HydroToy/src/InitSymBound.F77 b/CarpetExtra/HydroToy/src/InitSymBound.F77
index b73d5f177..20fb46456 100644
--- a/CarpetExtra/HydroToy/src/InitSymBound.F77
+++ b/CarpetExtra/HydroToy/src/InitSymBound.F77
@@ -1,10 +1,10 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/InitSymBound.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/src/InitSymBound.F77,v 1.3 2003/11/05 16:18:39 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
       
       subroutine HydroToy_InitSymBound (CCTK_ARGUMENTS)
       
diff --git a/CarpetExtra/IDFOScalarWave/schedule.ccl b/CarpetExtra/IDFOScalarWave/schedule.ccl
index 1b89fc2d4..f74df1185 100644
--- a/CarpetExtra/IDFOScalarWave/schedule.ccl
+++ b/CarpetExtra/IDFOScalarWave/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn IDScalarWave
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/schedule.ccl,v 1.6 2003/06/27 16:26:11 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/schedule.ccl,v 1.7 2003/11/05 16:18:40 schnetter Exp $
 
 schedule IDFOScalarWave_InitialData as FOWaveToy_InitialData at INITIAL
 {
diff --git a/CarpetExtra/IDFOScalarWave/src/InitialData.F77 b/CarpetExtra/IDFOScalarWave/src/InitialData.F77
index cfc740ccf..aa361f8a1 100644
--- a/CarpetExtra/IDFOScalarWave/src/InitialData.F77
+++ b/CarpetExtra/IDFOScalarWave/src/InitialData.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/InitialData.F77,v 1.7 2003/07/08 23:02:19 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/InitialData.F77,v 1.8 2003/11/05 16:18:40 schnetter Exp $
 
  /*@@
    @file      InitialData.F77
@@ -11,8 +11,9 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/Ini
  @@*/
 
 #include "cctk.h" 
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
+#include "cctk_Functions.h"
+#include "cctk_Parameters.h"
 
 
  /*@@
diff --git a/CarpetExtra/IDHydroToy/schedule.ccl b/CarpetExtra/IDHydroToy/schedule.ccl
index febd956ec..c47184aab 100644
--- a/CarpetExtra/IDHydroToy/schedule.ccl
+++ b/CarpetExtra/IDHydroToy/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn IDHydroToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/schedule.ccl,v 1.2 2002/04/29 11:28:02 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/schedule.ccl,v 1.3 2003/11/05 16:18:40 schnetter Exp $
 
 schedule IDHydroToy_Startup at STARTUP
 {
diff --git a/CarpetExtra/IDHydroToy/src/InitialData.F77 b/CarpetExtra/IDHydroToy/src/InitialData.F77
index b4c4f063c..65f6e4e3a 100644
--- a/CarpetExtra/IDHydroToy/src/InitialData.F77
+++ b/CarpetExtra/IDHydroToy/src/InitialData.F77
@@ -1,10 +1,10 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.5 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.6 2003/11/05 16:18:40 schnetter Exp $
       
 #include "cctk.h"
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
       
       subroutine IDHydroToy_InitialData (CCTK_ARGUMENTS)
       
diff --git a/CarpetExtra/IDScalarWave/schedule.ccl b/CarpetExtra/IDScalarWave/schedule.ccl
index ee249fff2..19bbd7cd1 100644
--- a/CarpetExtra/IDScalarWave/schedule.ccl
+++ b/CarpetExtra/IDScalarWave/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn IDScalarWave
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/schedule.ccl,v 1.4 2002/04/29 11:28:03 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/schedule.ccl,v 1.5 2003/11/05 16:18:40 schnetter Exp $
 
 schedule IDScalarWave_CheckParameters at PARAMCHECK
 {
diff --git a/CarpetExtra/IDScalarWave/src/CheckParameters.F77 b/CarpetExtra/IDScalarWave/src/CheckParameters.F77
index f711b7ab5..56cf12d1f 100644
--- a/CarpetExtra/IDScalarWave/src/CheckParameters.F77
+++ b/CarpetExtra/IDScalarWave/src/CheckParameters.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/CheckParameters.F77,v 1.4 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/CheckParameters.F77,v 1.5 2003/11/05 16:18:40 schnetter Exp $
 
  /*@@
    @file      CheckParameters.F77
@@ -11,9 +11,9 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/Check
  @@*/
 
 #include "cctk.h" 
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
 
 
  /*@@
diff --git a/CarpetExtra/IDScalarWave/src/InitialData.F77 b/CarpetExtra/IDScalarWave/src/InitialData.F77
index 7c1a22a3c..0ee71e625 100644
--- a/CarpetExtra/IDScalarWave/src/InitialData.F77
+++ b/CarpetExtra/IDScalarWave/src/InitialData.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/InitialData.F77,v 1.13 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/InitialData.F77,v 1.14 2003/11/05 16:18:40 schnetter Exp $
 
  /*@@
    @file      InitialData.F77
@@ -11,9 +11,9 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/Initi
  @@*/
 
 #include "cctk.h" 
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
 
 
  /*@@
diff --git a/CarpetExtra/IDScalarWaveExpl/schedule.ccl b/CarpetExtra/IDScalarWaveExpl/schedule.ccl
index b485852ac..f3cf87be0 100644
--- a/CarpetExtra/IDScalarWaveExpl/schedule.ccl
+++ b/CarpetExtra/IDScalarWaveExpl/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn IDScalarWaveExpl
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveExpl/schedule.ccl,v 1.1 2003/06/18 18:24:29 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveExpl/schedule.ccl,v 1.2 2003/11/05 16:18:40 schnetter Exp $
 
 SCHEDULE IDScalarWaveExpl_InitialData AT initial
 {
diff --git a/CarpetExtra/IDScalarWaveExpl/src/initialdata.F77 b/CarpetExtra/IDScalarWaveExpl/src/initialdata.F77
index 052a616c0..33a19b6cb 100644
--- a/CarpetExtra/IDScalarWaveExpl/src/initialdata.F77
+++ b/CarpetExtra/IDScalarWaveExpl/src/initialdata.F77
@@ -1,7 +1,8 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveExpl/src/initialdata.F77,v 1.1 2003/06/18 18:24:29 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveExpl/src/initialdata.F77,v 1.2 2003/11/05 16:18:40 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
       
       subroutine IDScalarWaveExpl_InitialData (CCTK_ARGUMENTS)
diff --git a/CarpetExtra/IDScalarWaveMoL/schedule.ccl b/CarpetExtra/IDScalarWaveMoL/schedule.ccl
index 85b47361e..4cb14d4d9 100644
--- a/CarpetExtra/IDScalarWaveMoL/schedule.ccl
+++ b/CarpetExtra/IDScalarWaveMoL/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn IDScalarWaveMoL
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/schedule.ccl,v 1.1 2003/06/18 18:24:29 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/schedule.ccl,v 1.2 2003/11/05 16:18:40 schnetter Exp $
 
 SCHEDULE IDScalarWaveMoL_InitialData AT initial
 {
diff --git a/CarpetExtra/IDScalarWaveMoL/src/errors.F77 b/CarpetExtra/IDScalarWaveMoL/src/errors.F77
index 8bfeac41c..a47394f84 100644
--- a/CarpetExtra/IDScalarWaveMoL/src/errors.F77
+++ b/CarpetExtra/IDScalarWaveMoL/src/errors.F77
@@ -1,7 +1,8 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/errors.F77,v 1.1 2003/06/18 18:24:29 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/errors.F77,v 1.2 2003/11/05 16:18:40 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
       
       subroutine IDScalarWaveMoL_Errors (CCTK_ARGUMENTS)
diff --git a/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77 b/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77
index 638030eb0..f8385b48a 100644
--- a/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77
+++ b/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77
@@ -1,7 +1,8 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77,v 1.2 2003/08/14 17:22:09 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77,v 1.3 2003/11/05 16:18:40 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
       
       subroutine IDScalarWaveMoL_InitialData (CCTK_ARGUMENTS)
diff --git a/CarpetExtra/IDSpaceTimeToy/schedule.ccl b/CarpetExtra/IDSpaceTimeToy/schedule.ccl
index c959aaf11..8a6c9e306 100644
--- a/CarpetExtra/IDSpaceTimeToy/schedule.ccl
+++ b/CarpetExtra/IDSpaceTimeToy/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn IDSpaceTimeToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/schedule.ccl,v 1.4 2002/04/29 11:28:05 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/schedule.ccl,v 1.5 2003/11/05 16:18:40 schnetter Exp $
 
 schedule IDSpaceTimeToy_Startup at STARTUP
 {
diff --git a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
index 012053223..118f0d075 100644
--- a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
+++ b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
@@ -1,10 +1,10 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.7 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.8 2003/11/05 16:18:40 schnetter Exp $
       
 #include "cctk.h"
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
       
       subroutine IDSpaceTimeToy_InitialData (CCTK_ARGUMENTS)
       
diff --git a/CarpetExtra/SpaceTimeToy/schedule.ccl b/CarpetExtra/SpaceTimeToy/schedule.ccl
index 35f556492..85afb3e27 100644
--- a/CarpetExtra/SpaceTimeToy/schedule.ccl
+++ b/CarpetExtra/SpaceTimeToy/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn SpaceTimeToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.7 2003/07/20 21:03:43 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.8 2003/11/05 16:18:40 schnetter Exp $
 
 STORAGE: spacetimeevolve[3]
 STORAGE: icn_state
@@ -72,13 +72,13 @@ schedule GROUP ApplyBCs in SpaceTimeToy_ICNLoop \
 
 
 
-schedule SpaceTimeToy_Boundaries in PostRestrict
+schedule SpaceTimeToy_Boundaries at POSTRESTRICT
 {
   LANG: Fortran
   SYNC: spacetimeevolve
 } "Select boundary conditions after restricting"
 
-schedule GROUP ApplyBCs in PostRestrict \
+schedule GROUP ApplyBCs at POSTRESTRICT \
 	after SpaceTimeToy_Boundaries
 {
 } "Apply boundary conditions after restricting"
diff --git a/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77 b/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77
index e245bf248..ab98da34a 100644
--- a/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77
+++ b/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77
@@ -1,10 +1,10 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77,v 1.3 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/InitSymBound.F77,v 1.4 2003/11/05 16:18:40 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
       
       subroutine SpaceTimeToy_InitSymBound (CCTK_ARGUMENTS)
       
diff --git a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
index d43dcd54f..0fbc5963e 100644
--- a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
+++ b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
@@ -1,10 +1,10 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.11 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.12 2003/11/05 16:18:40 schnetter Exp $
       
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"
       
       
       
diff --git a/CarpetExtra/WaveToyExpl/schedule.ccl b/CarpetExtra/WaveToyExpl/schedule.ccl
index 8e9e6cb26..8ef598e24 100644
--- a/CarpetExtra/WaveToyExpl/schedule.ccl
+++ b/CarpetExtra/WaveToyExpl/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn WaveToyExpl
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/schedule.ccl,v 1.2 2003/07/20 21:03:43 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/schedule.ccl,v 1.3 2003/11/05 16:18:40 schnetter Exp $
 
 STORAGE: scalarevolve[3]
 STORAGE: scalarevolveint[3]
@@ -60,18 +60,18 @@ SCHEDULE GROUP ApplyBCs AS WaveToyExpl_ApplyFinalBoundaries AT evol AFTER WaveTo
 
 
 
-SCHEDULE WaveToyExpl_IntBoundaries IN PostRestrict
+SCHEDULE WaveToyExpl_IntBoundaries AT POSTRESTRICT
 {
   LANG: Fortran
   SYNC: scalarevolveint
 } "Select boundary conditions after restricting"
 
-SCHEDULE WaveToyExpl_FinalBoundaries IN PostRestrict
+SCHEDULE WaveToyExpl_FinalBoundaries AT POSTRESTRICT
 {
   LANG: Fortran
   SYNC: scalarevolve
 } "Select boundary conditions after restricting"
 
-SCHEDULE GROUP ApplyBCs AS WaveToyExpl_ApplyBoundaries IN PostRestrict AFTER (WaveToyMoL_IntBoundaries, WaveToyMoL_FinalBoundaries)
+SCHEDULE GROUP ApplyBCs AS WaveToyExpl_ApplyBoundaries AT POSTRESTRICT AFTER (WaveToyMoL_IntBoundaries, WaveToyMoL_FinalBoundaries)
 {
 } "Apply boundary conditions after restricting"
diff --git a/CarpetExtra/WaveToyExpl/src/intboundaries.F77 b/CarpetExtra/WaveToyExpl/src/intboundaries.F77
index 17766a737..838729f73 100644
--- a/CarpetExtra/WaveToyExpl/src/intboundaries.F77
+++ b/CarpetExtra/WaveToyExpl/src/intboundaries.F77
@@ -1,4 +1,4 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intboundaries.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intboundaries.F77,v 1.3 2003/11/05 16:18:40 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
@@ -10,8 +10,6 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intbou
       DECLARE_CCTK_ARGUMENTS
       DECLARE_CCTK_FUNCTIONS
       DECLARE_CCTK_PARAMETERS
-      external Boundary_SelectGroupForBC
-      CCTK_INT Boundary_SelectGroupForBC
       CCTK_INT bndwidth
       parameter (bndwidth = 1)
       character fbound*100
diff --git a/CarpetExtra/WaveToyF77/schedule.ccl b/CarpetExtra/WaveToyF77/schedule.ccl
index cab2e59ef..df5b885ec 100644
--- a/CarpetExtra/WaveToyF77/schedule.ccl
+++ b/CarpetExtra/WaveToyF77/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn WaveToy77
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/schedule.ccl,v 1.5 2002/04/29 11:28:07 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/schedule.ccl,v 1.6 2003/11/05 16:18:40 schnetter Exp $
 
 STORAGE: scalarevolve[3]
 
diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77
index 7ea3afbfe..ed243b42c 100644
--- a/CarpetExtra/WaveToyF77/src/WaveToy.F77
+++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77
@@ -10,9 +10,9 @@ c     -*-Fortran-*-
  @@*/
   
 #include "cctk.h" 
-#include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 #include "cctk_Functions.h"
+#include "cctk_Parameters.h"