Mainly changing to new IO parameters and synchronising routines

git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/WaveToyF77/trunk@26 4451c3c6-1034-4891-99ea-21147727ccdf

7 files changed, 29 insertions, 40 deletions

diff --git a/interface.ccl b/interface.ccl
index 397c0b4..c23b8a0 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -22,10 +22,6 @@ cctk_real scalartmps type = GF
   phi_next 
 } "Temporary GFs for WaveToy"
 
-CCTK_INT teee type=SCALAR
-{
-  test
-} "" 
  
 
 
diff --git a/par/wavetoyf77_flat.par b/par/wavetoyf77_flat.par
index 25d456d..5cc2d3c 100644
--- a/par/wavetoyf77_flat.par
+++ b/par/wavetoyf77_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 = "wavetoyf77_flat"
 
diff --git a/par/wavetoyf77_none.par b/par/wavetoyf77_none.par
index 2188ad0..27c71e3 100644
--- a/par/wavetoyf77_none.par
+++ b/par/wavetoyf77_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 = "wavetoyf77_none"
 
diff --git a/par/wavetoyf77_rad.par b/par/wavetoyf77_rad.par
index 735f93e..8fd4f42 100644
--- a/par/wavetoyf77_rad.par
+++ b/par/wavetoyf77_rad.par
@@ -10,7 +10,7 @@
 #   @enddesc
 # @@*/          
 
-ActiveThorns = "idscalarwave time wavetoyf77 pugh cartgrid3d ioutil ioascii"
+ActiveThorns = "iobasic idscalarwave time wavetoyf77 pugh cartgrid3d ioutil ioascii"
  
 time::dtfac = 0.5
 
@@ -30,16 +30,16 @@ driver::global_nz = 30
 
 cctk_itlast = 120
 
-IOASCII::out0D_every = 2
-IOASCII::out0D_vars = "wavetoy::phi"
+IOScalar::outScalar_every = 2
+IOScalar::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"
+IOScalar::outinfo_every = 10
+IOScalar::outinfo_vars = "wavetoy::phi"
  
 IO::outdir = "wavetoyf77_rad"
 
diff --git a/schedule.ccl b/schedule.ccl
index 7c39c3f..a78fd34 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,28 +1,23 @@
 # Schedule definitions for thorn WaveToy77
 # $Header$
 
-schedule WaveToyF77_Startup at CCTK_STARTUP
+STORAGE: scalarevolve,scalarold
+
+schedule WaveToyF77_Startup at STARTUP
 {
   LANG: C
 } "Register banner"
 
-schedule WaveToyF77_InitSymBound at CCTK_BASEGRID
+schedule WaveToyF77_InitSymBound at BASEGRID
 {
   LANG: Fortran
 } "Schedule symmetries"
 
-# The basic fields always need memory and communication
-# -----------------------------------------------------
-STORAGE:       scalarevolve,scalarold
-COMMUNICATION: scalarevolve
-
-# Scalartmps are needed, without communication, during evolution
-# --------------------------------------------------------------
-schedule WaveToyF77_Evolution at CCTK_EVOL
+schedule WaveToyF77_Evolution at EVOL
 {
   LANG: Fortran
-  STORAGE:scalartmps
-  COMMUNICATION:scalartmps
+  STORAGE: scalartmps
+  COMMUNICATION: scalartmps
 } "Evolution of 3D wave equation"
 
   
diff --git a/src/WaveToy.F77 b/src/WaveToy.F77
index e0a9453..600c65f 100644
--- a/src/WaveToy.F77
+++ b/src/WaveToy.F77
@@ -50,8 +50,6 @@ c     -----------------
       dz = CCTK_DELTA_SPACE(3)
       dt = CCTK_DELTA_TIME
 
-      test = cctk_time
-      call CCTK_OutputVarAsByMethod(ierr,cctkGH,"WaveToyF77::test","IOScalar","Gab")
       istart = 2
       jstart = 2
       kstart = 2
@@ -127,14 +125,14 @@ c     Declare arguement list
 c     Declare parameters
       DECLARE_CCTK_PARAMETERS
 
+c     Declare functions
+      DECLARE_CCTK_FUNCTIONS
+
 c     Local declarations
       CCTK_REAL zero,one
       integer ierr
       integer sw(3)
 
-c     Cactus declarations
-      integer CCTK_Equals
-
       zero = 0.0
       one = 1.0
 
diff --git a/test/test_wavetoyf77.par b/test/test_wavetoyf77.par
index 8e26463..3b4b45f 100644
--- a/test/test_wavetoyf77.par
+++ b/test/test_wavetoyf77.par
@@ -1,6 +1,6 @@
-# test_wavetoyf77.par : WaveToyF77 
+# DESC "Octant evolution with no boundary condition"
 
-ActiveThorns = "time wavetoyf77 idscalarwave pugh cartgrid3d ioutil ioascii"
+ActiveThorns = "time wavetoyf77 idscalarwave pugh cartgrid3d ioutil iobasic 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_wavetoyf77"