More changes.

darcs-hash:20030627144403-07bb3-eef90b47b87e79f643cba49f2dc68e8b268c1a2a.gz

4 files changed, 30 insertions, 28 deletions

diff --git a/CarpetExtra/FOWaveToyF77/interface.ccl b/CarpetExtra/FOWaveToyF77/interface.ccl
index 0b5bdad9b..4c8131958 100644
--- a/CarpetExtra/FOWaveToyF77/interface.ccl
+++ b/CarpetExtra/FOWaveToyF77/interface.ccl
@@ -1,5 +1,5 @@
 # Interface definition for thorn WaveToyF77
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/FOWaveToyF77/interface.ccl,v 1.6 2003/06/27 15:54:58 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/FOWaveToyF77/interface.ccl,v 1.7 2003/06/27 16:44:03 schnetter Exp $
 
 implements: fowavetoy
 inherits: boundary grid idfoscalarwave
@@ -21,7 +21,7 @@ CCTK_REAL scalarevolve_derivs type=GF timelevels=3
   phiz,
 } "Time and space derivatives of phi"
 
-CCTK_INT FUNCTION Boundary_SelectVarForBC(CCTK_POINTER 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 var_name, CCTK_STRING IN bc_name)
-USES FUNCTION Boundary_SelectVarForBC
+  CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+USES FUNCTION Boundary_SelectGroupForBC
diff --git a/CarpetExtra/FOWaveToyF77/par/fowavetoyf77_excision.par b/CarpetExtra/FOWaveToyF77/par/fowavetoyf77_excision.par
index b49519f98..9598ebb8d 100644
--- a/CarpetExtra/FOWaveToyF77/par/fowavetoyf77_excision.par
+++ b/CarpetExtra/FOWaveToyF77/par/fowavetoyf77_excision.par
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/FOWaveToyF77/par/fowavetoyf77_excision.par,v 1.1 2003/06/27 16:05:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/FOWaveToyF77/par/fowavetoyf77_excision.par,v 1.2 2003/06/27 16:44:03 schnetter Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time CartGrid3D Carpet CarpetIOASCII  CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDFOScalarWave FOWaveToyF77"
 
@@ -22,11 +22,11 @@ IOBasic::outinfo_every		= 8
 IOBasic::outinfo_vars		= "fowavetoy::phi"
 
 IOBasic::outScalar_every	= 8
-IOBasic::outScalar_vars		= "fowavetoy::phi"
+IOBasic::outScalar_vars		= "fowavetoy::scalarevolve fowavetoy::scalarevolve_derivs"
 IOBasic::outScalar_style	= gnuplot
 
 IOASCII::out1D_every		= 8
-IOASCII::out1D_vars		= "fowavetoy::phi"
+IOASCII::out1D_vars		= "fowavetoy::scalarevolve fowavetoy::scalarevolve_derivs"
 
 FOWaveToyF77::bound		= Radiation
 FOWaveToyF77::excision_bound	= 1/r
diff --git a/CarpetExtra/FOWaveToyF77/schedule.ccl b/CarpetExtra/FOWaveToyF77/schedule.ccl
index cff105611..01d8b5605 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.5 2003/06/27 16:05:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/FOWaveToyF77/schedule.ccl,v 1.6 2003/06/27 16:44:03 schnetter Exp $
 
 STORAGE: scalarevolve[3] scalarevolve_derivs[3]
 
@@ -42,3 +42,15 @@ schedule FOWaveToyF77_Boundaries as FOWaveToy_Boundaries at EVOL after FOWaveToy
 schedule group ApplyBCs as FOWaveToy_ApplyBCs at EVOL after FOWaveToy_Boundaries
 {
 } "Apply boundary conditions of 3D wave equation"
+
+
+
+schedule FOWaveToyF77_Boundaries as FOWaveToy_Boundaries in 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
+{
+} "Apply boundary conditions of 3D wave equation"
diff --git a/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77 b/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
index 1450ff325..5f2af0b6d 100644
--- a/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
+++ b/CarpetExtra/FOWaveToyF77/src/FOWaveToy.F77
@@ -121,14 +121,14 @@ c     ----------------
       DECLARE_CCTK_PARAMETERS
       DECLARE_CCTK_FUNCTIONS
       
-      external Boundary_SelectVarForBC 
-      CCTK_INT Boundary_SelectVarForBC 
+      external Boundary_SelectGroupForBC 
+      CCTK_INT Boundary_SelectGroupForBC 
       
 c     Local declarations
       CCTK_REAL zero, one
       parameter (zero=0, one=1)
       
-      integer table, table_derivs
+      integer table
       
       character fbound*100
       CCTK_INT  fboundlen
@@ -185,27 +185,17 @@ c     -----------------------------------
       call CCTK_FortranString (fboundlen, bound, fbound)
       if (fboundlen.lt.0) call CCTK_WARN (0, "internal error")
       
-      
-      call Util_TableCreateFromString (table, "LIMIT=1.0 SPEED=1.0")
+      call Util_TableCreateFromString (table, "LIMIT=0.0 SPEED=1.0")
       if (table.lt.0) call CCTK_WARN (0, "internal error")
-      call Util_TableCreateFromString (table_derivs, "LIMIT=0.0 SPEED=1.0")
-      if (table_derivs.lt.0) call CCTK_WARN (0, "internal error")
-      
-      ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table,
-     $     "fowavetoy::phi", fbound)
-      ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
-     $     "fowavetoy::pi", fbound)
-      ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
-     $     "fowavetoy::phix", fbound)
-      ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
-     $     "fowavetoy::phiy", fbound)
-      ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, table_derivs,
-     $     "fowavetoy::phiz", fbound)
+      
+      ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, 1, table,
+     $     "fowavetoy::scalarevolve", fbound)
+      if (ierr.ne.0) call CCTK_WARN (0, "internal error")
+      ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, 1, table,
+     $     "fowavetoy::scalarevolve_derivs", fbound)
       if (ierr.ne.0) call CCTK_WARN (0, "internal error")
       
       call Util_TableDestroy (ierr, table)
       if (ierr.ne.0) call CCTK_WARN (0, "internal error")
-      call Util_TableDestroy (ierr, table_derivs)
-      if (ierr.ne.0) call CCTK_WARN (0, "internal error")
       
       end