Major update after a quiet time.

Major update after a quiet time.
Carpet: The flesh now has new cGH fields cctk_levoff[],
cctk_levoffdenom[], and cctk_timefac that describe the spatial offset
and temporal refinement factor between the base and the current
refinement level.  These fields are now set and used; they change how
coordinates are handled.

CarpetIOASCII: Fix bugs regarding choosing the output hyperslab and
the output coordinates.

ID*, *Toy*: New WaveToy examples with various formulations and
different integrations methods.  Currently, none of them converge to
second order except the standard WaveToy formulation.

These updates require the recent flesh, base thorn (and MoL) updates.

darcs-hash:20030618162427-07bb3-70761f74bce6ae246b5a2943a385647657d46d34.gz

17 files changed, 29 insertions, 30 deletions

diff --git a/CarpetExtra/WaveToyExpl/interface.ccl b/CarpetExtra/WaveToyExpl/interface.ccl
index 231d8e0ee..f565d69c8 100644
--- a/CarpetExtra/WaveToyExpl/interface.ccl
+++ b/CarpetExtra/WaveToyExpl/interface.ccl
@@ -1,17 +1,17 @@
 # Interface definition for thorn WaveToyExpl
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/interface.ccl,v 1.3 2004/05/21 17:43:57 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/interface.ccl,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 IMPLEMENTS: WaveToyExpl
 
-INHERITS: grid
+INHERITS: boundary grid
 
 
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, \
+CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER IN GH, \
   CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, \
   CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
 
-REQUIRES FUNCTION Boundary_SelectGroupForBC
+USES FUNCTION Boundary_SelectGroupForBC
 
 
 
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_1l_0020.par b/CarpetExtra/WaveToyExpl/par/ew1d_1l_0020.par
index 5f559808e..99c59e571 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_1l_0020.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_1l_0020.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_1l_0020.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_1l_0020.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 3200
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_1l_0040.par b/CarpetExtra/WaveToyExpl/par/ew1d_1l_0040.par
index 9e17b21d3..8137ed8c4 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_1l_0040.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_1l_0040.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_1l_0040.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_1l_0040.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 6400
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_1l_0080.par b/CarpetExtra/WaveToyExpl/par/ew1d_1l_0080.par
index 317a31c3e..da7d1b8f3 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_1l_0080.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_1l_0080.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_1l_0080.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_1l_0080.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 12800
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0020.par b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0020.par
index 1655ca90c..8665f42be 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0020.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0020.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0020.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0020.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 3200
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0040.par b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0040.par
index 9a03d1161..c2ebfca19 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0040.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0040.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0040.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0040.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 6400
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0080.par b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0080.par
index 19f8e285f..5ffce558f 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0080.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0080.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0080.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0080.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 12800
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0160.par b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0160.par
index c35b6f512..4862fe62a 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0160.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0160.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0160.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0160.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 25600
diff --git a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0320.par b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0320.par
index 03637dfb0..0dc9290c1 100644
--- a/CarpetExtra/WaveToyExpl/par/ew1d_2l_0320.par
+++ b/CarpetExtra/WaveToyExpl/par/ew1d_2l_0320.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0320.par,v 1.2 2004/03/23 12:00:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/par/ew1d_2l_0320.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 Cactus::cctk_initial_time = 0
 Cactus::cctk_itlast = 51200
diff --git a/CarpetExtra/WaveToyExpl/schedule.ccl b/CarpetExtra/WaveToyExpl/schedule.ccl
index 8ef598e24..08dc51abc 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.3 2003/11/05 16:18:40 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/schedule.ccl,v 1.1 2003/06/18 18:24:30 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 AT POSTRESTRICT
+SCHEDULE WaveToyExpl_IntBoundaries IN postrestrict
 {
   LANG: Fortran
   SYNC: scalarevolveint
 } "Select boundary conditions after restricting"
 
-SCHEDULE WaveToyExpl_FinalBoundaries AT POSTRESTRICT
+SCHEDULE WaveToyExpl_FinalBoundaries IN postrestrict
 {
   LANG: Fortran
   SYNC: scalarevolve
 } "Select boundary conditions after restricting"
 
-SCHEDULE GROUP ApplyBCs AS WaveToyExpl_ApplyBoundaries AT POSTRESTRICT AFTER (WaveToyMoL_IntBoundaries, WaveToyMoL_FinalBoundaries)
+SCHEDULE GROUP ApplyBCs AS WaveToyExpl_ApplyBoundaries IN postrestrict AFTER (WaveToyMoL_IntBoundaries, WaveToyMoL_FinalBoundaries)
 {
 } "Apply boundary conditions after restricting"
diff --git a/CarpetExtra/WaveToyExpl/src/finalboundaries.F77 b/CarpetExtra/WaveToyExpl/src/finalboundaries.F77
index c00960fc3..1f128821e 100644
--- a/CarpetExtra/WaveToyExpl/src/finalboundaries.F77
+++ b/CarpetExtra/WaveToyExpl/src/finalboundaries.F77
@@ -1,8 +1,8 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/finalboundaries.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/finalboundaries.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Functions.h"
+#include "cctk_Faces.h"
 #include "cctk_Parameters.h"
 
       subroutine WaveToyExpl_FinalBoundaries (CCTK_ARGUMENTS)
@@ -10,6 +10,8 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/finalb
       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/WaveToyExpl/src/finalstep.F77 b/CarpetExtra/WaveToyExpl/src/finalstep.F77
index b4304d60e..39c19b42e 100644
--- a/CarpetExtra/WaveToyExpl/src/finalstep.F77
+++ b/CarpetExtra/WaveToyExpl/src/finalstep.F77
@@ -1,8 +1,7 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/finalstep.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/finalstep.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
 
       subroutine WaveToyExpl_FinalStep (CCTK_ARGUMENTS)
diff --git a/CarpetExtra/WaveToyExpl/src/initsymbound.F77 b/CarpetExtra/WaveToyExpl/src/initsymbound.F77
index 2f4f182fc..5237b2644 100644
--- a/CarpetExtra/WaveToyExpl/src/initsymbound.F77
+++ b/CarpetExtra/WaveToyExpl/src/initsymbound.F77
@@ -1,8 +1,7 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/initsymbound.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/initsymbound.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
 
       subroutine WaveToyExpl_InitSymBound (CCTK_ARGUMENTS)
diff --git a/CarpetExtra/WaveToyExpl/src/intboundaries.F77 b/CarpetExtra/WaveToyExpl/src/intboundaries.F77
index 838729f73..b5263c267 100644
--- a/CarpetExtra/WaveToyExpl/src/intboundaries.F77
+++ b/CarpetExtra/WaveToyExpl/src/intboundaries.F77
@@ -1,8 +1,8 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intboundaries.F77,v 1.3 2003/11/05 16:18:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intboundaries.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Functions.h"
+#include "cctk_Faces.h"
 #include "cctk_Parameters.h"
 
       subroutine WaveToyExpl_IntBoundaries (CCTK_ARGUMENTS)
@@ -10,6 +10,8 @@ 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/WaveToyExpl/src/intinit.F77 b/CarpetExtra/WaveToyExpl/src/intinit.F77
index b2ebbaea2..58b406dec 100644
--- a/CarpetExtra/WaveToyExpl/src/intinit.F77
+++ b/CarpetExtra/WaveToyExpl/src/intinit.F77
@@ -1,8 +1,7 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intinit.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intinit.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
 
       subroutine WaveToyExpl_IntInit (CCTK_ARGUMENTS)
diff --git a/CarpetExtra/WaveToyExpl/src/intstep.F77 b/CarpetExtra/WaveToyExpl/src/intstep.F77
index 909842c2a..02ecc5e75 100644
--- a/CarpetExtra/WaveToyExpl/src/intstep.F77
+++ b/CarpetExtra/WaveToyExpl/src/intstep.F77
@@ -1,8 +1,7 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intstep.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/intstep.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
-#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
 
       subroutine WaveToyExpl_IntStep (CCTK_ARGUMENTS)
diff --git a/CarpetExtra/WaveToyExpl/src/startup.F77 b/CarpetExtra/WaveToyExpl/src/startup.F77
index ce33d9a1c..5dbf2c4a6 100644
--- a/CarpetExtra/WaveToyExpl/src/startup.F77
+++ b/CarpetExtra/WaveToyExpl/src/startup.F77
@@ -1,7 +1,6 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/startup.F77,v 1.2 2003/10/27 15:31:40 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyExpl/src/startup.F77,v 1.1 2003/06/18 18:24:30 schnetter Exp $
 
 #include "cctk.h"
-#include "cctk_Functions.h"
 #include "cctk_Parameters.h"
 
       subroutine WaveToyExpl_Startup