Mainly changing to new IO parameters and synchronising routines

git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/WaveToyC/trunk@12 90eea020-d82d-4da5-bf6e-4ee79ff7632f

6 files changed, 27 insertions, 32 deletions

diff --git a/par/wavetoyc_flat.par b/par/wavetoyc_flat.par
index 257ae76..8ba1b0d 100644
--- a/par/wavetoyc_flat.par
+++ b/par/wavetoyc_flat.par
@@ -30,16 +30,16 @@ driver::global_nz = 30
 
 cctk_itlast = 500
 
-IOASCII::out0D_every = 10
-IOASCII::out0D_vars = "wavetoy::phi"
+IOBasic::outScalar_every = 10
+IOBasic::outScalar_vars = "wavetoy::phi"
 
 IOASCII::out1D_every = 10
 IOASCII::out1D_z = "no"
 IOASCII::out1D_y = "no"
 IOASCII::out1D_vars = "wavetoy::phi "
 
-IOASCII::outinfo_every = 50
-IOASCII::outinfo_vars = "wavetoy::phi"
+IOBasic::outInfo_every = 50
+IOBasic::outInfo_vars = "wavetoy::phi"
  
 IO::outdir = "wavetoyc_flat"
 
diff --git a/par/wavetoyc_none.par b/par/wavetoyc_none.par
index 7997d14..efbd03b 100644
--- a/par/wavetoyc_none.par
+++ b/par/wavetoyc_none.par
@@ -30,16 +30,16 @@ driver::global_nz = 30
 
 cctk_itlast = 500
 
-IOASCII::out0D_every = 10
-IOASCII::out0D_vars = "wavetoy::phi"
+IOBasic::outScalar_every = 10
+IOBasic::outScalar_vars = "wavetoy::phi"
 
 IOASCII::out1D_every = 10
 IOASCII::out1D_z = "no"
 IOASCII::out1D_y = "no"
 IOASCII::out1D_vars = "wavetoy::phi "
 
-IOASCII::outinfo_every = 50
-IOASCII::outinfo_vars = "wavetoy::phi"
+IOBasic::outInfo_every = 50
+IOBasic::outInfo_vars = "wavetoy::phi"
  
 IO::outdir = "wavetoyc_none"
 
diff --git a/par/wavetoyc_rad.par b/par/wavetoyc_rad.par
index eec1011..a9505df 100644
--- a/par/wavetoyc_rad.par
+++ b/par/wavetoyc_rad.par
@@ -30,16 +30,16 @@ driver::global_nz = 30
 
 cctk_itlast = 120
 
-IOASCII::out0D_every = 2
-IOASCII::out0D_vars = "wavetoy::phi"
+IOBasic::outScalar_every = 2
+IOBasic::outScalar_vars = "wavetoy::phi"
 
 IOASCII::out1D_every = 2
 #IOASCII::out1D_z = "no"
 #IOASCII::out1D_y = "no"
 IOASCII::out1D_vars = "wavetoy::phi "
 
-IOASCII::outinfo_every = 10
-IOASCII::outinfo_vars = "wavetoy::phi"
+IOBasic::outInfo_every = 10
+IOBasic::outInfo_vars = "wavetoy::phi"
  
 IO::outdir = "wavetoyc_rad"
 
diff --git a/schedule.ccl b/schedule.ccl
index 1adbc4c..a32d4ea 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,24 +1,19 @@
 # Schedule definitions for thorn WaveToyC
 # $Header$
 
-schedule WaveToyC_Startup at CCTK_STARTUP
+STORAGE: scalarevolve,scalarold
+
+schedule WaveToyC_Startup at STARTUP
 {
   LANG: C
 } "Register banner"
 
-schedule WaveToyC_InitSymBound at CCTK_BASEGRID
+schedule WaveToyC_InitSymBound at BASEGRID
 {
   LANG: C
 } "Schedule symmetries"
 
-# The basic fields always need memory and communication
-# -----------------------------------------------------
-STORAGE:       scalarevolve,scalarold
-COMMUNICATION: scalarevolve
-
-# Scalartmps are needed, without communication, during evolution
-# --------------------------------------------------------------
-schedule WaveToyC_Evolution at CCTK_EVOL
+schedule WaveToyC_Evolution at EVOL
 {
   LANG: C
   STORAGE: scalartmps
diff --git a/test/test_rad.par b/test/test_rad.par
index 1c80ae9..bf7f1cd 100644
--- a/test/test_rad.par
+++ b/test/test_rad.par
@@ -1,4 +1,4 @@
-# DESC : wavetoy evolution with radiation boundaries
+# DESC "Octant evolution with radiation boundaries"
 
 # $Id$
 #
@@ -11,7 +11,7 @@
 #   @enddesc
 # @@*/          
 
-ActiveThorns = "idscalarwave time wavetoyc pugh cartgrid3d ioutil ioascii"
+ActiveThorns = "iobasic idscalarwave time wavetoyc pugh cartgrid3d ioutil ioascii"
  
 time::dtfac = 0.5
 
@@ -31,8 +31,8 @@ driver::global_nz = 15
 
 cctk_itlast = 10
 
-IOASCII::out0D_every = 1
-IOASCII::out0D_vars = "wavetoy::phi"
+IOBasic::outScalar_every = 1
+IOBasic::outScalar_vars = "wavetoy::phi"
 
 IOASCII::out1D_every = 1
 IOASCII::out1D_z = "no"
diff --git a/test/test_wavetoyc.par b/test/test_wavetoyc.par
index df54eaa..8d7972f 100644
--- a/test/test_wavetoyc.par
+++ b/test/test_wavetoyc.par
@@ -1,6 +1,6 @@
-# test_wavetoyc.par : WaveToyC 
+# DESC "Octant evolution with no boundary condition"
 
-ActiveThorns = "time wavetoyc idscalarwave pugh cartgrid3d ioutil ioascii"
+ActiveThorns = "iobasic time wavetoyc idscalarwave pugh cartgrid3d ioutil ioascii"
 
 grid::type  = "box"
 
@@ -20,11 +20,11 @@ IOASCII::out1D_every = 2
 IOASCII::out1D_vars = "wavetoy::phi "
 IOASCII::out1D_z = "no"
 
-IOASCII::out0D_every = 2
-IOASCII::out0D_vars = "wavetoy::phi "
+IOBasic::outScalar_every = 2
+IOBasic::outScalar_vars = "wavetoy::phi "
 
-IOASCII::outinfo_every = 2
-IOASCII::outinfo_vars = "wavetoy::phi "
+IOBasic::outInfo_every = 2
+IOBasic::outInfo_vars = "wavetoy::phi "
 
 IO::outdir = "test_wavetoyc"