Mainly changing to new IO parameters and synchronising routines

git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/WaveToyF90/trunk@18 f80f6fb6-8356-4fd4-90bc-d84ad503c100

8 files changed, 49 insertions, 53 deletions

diff --git a/interface.ccl b/interface.ccl
index 672a310..536f479 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -17,10 +17,10 @@ cctk_real scalarold type = GF
 
 private: 
 
-cctk_real scalartmps type = GF
+cctk_real temps type = GF
 {
   phi_tmp 
-} "Temporary GFs for WaveToy"
+} "Temporary grid functions"
  
 
 
diff --git a/par/wavetoyf90_flat.par b/par/wavetoyf90_flat.par
index 7dc98d2..36f5ee5 100644
--- a/par/wavetoyf90_flat.par
+++ b/par/wavetoyf90_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 = "wavetoyf90_flat"
 
diff --git a/par/wavetoyf90_none.par b/par/wavetoyf90_none.par
index bd3a67c..d2366b3 100644
--- a/par/wavetoyf90_none.par
+++ b/par/wavetoyf90_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 = "wavetoyf90_none"
 
diff --git a/par/wavetoyf90_rad.par b/par/wavetoyf90_rad.par
index 713cea7..541fc51 100644
--- a/par/wavetoyf90_rad.par
+++ b/par/wavetoyf90_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 = "wavetoy_rad"
 
diff --git a/schedule.ccl b/schedule.ccl
index 2b443e2..5d511dc 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,27 +1,23 @@
 # Schedule definitions for thorn WaveToy90
 # $Header$
 
-schedule WaveToyF90_Startup at CCTK_STARTUP
+STORAGE: scalarevolve,scalarold
+
+schedule WaveToyF90_Startup at STARTUP
 {
   LANG: C
 } "Register banner"
 
-schedule WaveToyF90_InitSymBound at CCTK_BASEGRID
+schedule WaveToyF90_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 WaveToyF90_Evolution at CCTK_EVOL
+schedule WaveToyF90_Evolution at EVOL
 {
   LANG: Fortran
-  STORAGE: scalartmps
+  STORAGE: temps
+  COMM: temps
 } "Evolution of 3D wave equation"
 
   
diff --git a/src/InitSymBound.F b/src/InitSymBound.F
index 8f1dd64..a6c4685 100644
--- a/src/InitSymBound.F
+++ b/src/InitSymBound.F
@@ -3,7 +3,7 @@
    @date    
    @author  Gabrielle Allen
    @desc
-            Sets the symmetries for Wave Toy
+            Sets the symmetries across the coordinate axes
    @enddesc
  @@*/
 
@@ -34,8 +34,7 @@
       INTEGER, DIMENSION(3) :: sym = 1
 
       call SetCartSymmetry(cctkGH, sym, 'wavetoy::phi')
-
-      return
+      call SetCartSymmetry(cctkGH, sym, 'wavetoyf90::phi_tmp')
 
       end subroutine WaveToyF90_InitSymbound
 
diff --git a/src/WaveToy.F b/src/WaveToy.F
index eb9bc0f..1c9bc8f 100644
--- a/src/WaveToy.F
+++ b/src/WaveToy.F
@@ -32,20 +32,20 @@
 
 @@*/
 
-      subroutine wavetoyf90_evolution(CCTK_FARGUMENTS)
+      subroutine WaveToyf90_Evolution(CCTK_FARGUMENTS)
 
       implicit none
 
       DECLARE_CCTK_FARGUMENTS
       DECLARE_CCTK_PARAMETERS
 
-c     Declare local variables
+!     Declare local variables
       INTEGER :: i,j,k
       INTEGER :: istart, jstart, kstart, iend, jend, kend
       CCTK_REAL :: dx,dy,dz,dt
 
-c     Set up shorthands
-c     -----------------
+!     Set up shorthands
+!     -----------------
       dx = CCTK_DELTA_SPACE(1)
       dy = CCTK_DELTA_SPACE(2)
       dz = CCTK_DELTA_SPACE(3)
@@ -59,8 +59,8 @@ c     -----------------
       jend = cctk_lsh(2)-1
       kend = cctk_lsh(3)-1
 
-c     Do the evolution
-c     ----------------
+!     Do the evolution
+!     ----------------
       do k = kstart, kend
          do j = jstart, jend
             do i = istart, iend
@@ -77,20 +77,21 @@ c     ----------------
          end do
       end do
          
+!     Synchronize
+!     -----------
+      call CCTK_SyncGroup(cctkGH,"wavetoyf90::temps")
+
+!     Apply boundary conditions
+!     -------------------------
+      call WaveToyF90_Boundaries(CCTK_PASS_FTOF)
+
 !     Update timeslices
 !     -----------------
       phi_old = phi
       phi     = phi_tmp
 
-!     Apply boundary conditions
-!     -------------------------
-      call WaveToyF90_Boundaries(CCTK_FARGUMENTS)
-
-!     Synchronize
-!     -----------
-      call CCTK_SyncGroup(cctkGH,"wavetoy::scalarevolve")
 
-      end subroutine wavetoyf90_evolution
+      end subroutine WaveToyF90_Evolution
 
 
  /*@@
@@ -121,20 +122,20 @@ c     ----------------
       CCTK_REAL,parameter :: zero = 0.0
       CCTK_REAL,parameter :: one = 1.0
       
-      call ApplySymmetry(cctkGH,"wavetoy::scalarevolve")
+      call ApplySymmetry(cctkGH,"wavetoyf90::temps")
 
       if (CCTK_EQUALS(bound,"flat")) then
-         call ApplyFlatBC(ierr,cctkGH,sw,"wavetoy::phi")
+         call ApplyFlatBC(ierr,cctkGH,sw,"wavetoyf90::phi_tmp")
       else if (CCTK_EQUALS(bound,"radiation")) then
          call ApplyRadiativeBC(ierr,cctkGH,zero,one,sw,
-     &        "wavetoy::phi","wavetoy::phi_old")
+     &        "wavetoyf90::phi_tmp","wavetoy::phi")
       end if
 
       if (ierr < 0)  then
-        call CCTK_WARN(0,"Boundary conditions not applied - giving up!");
+        call CCTK_WARN(0,"Boundary conditions not applied - giving up!")
       end if
 
-      end subroutine wavetoyf90_boundaries
+      end subroutine WaveToyF90_Boundaries
 
 
 
diff --git a/test/test_wavetoyf90.par b/test/test_wavetoyf90.par
index ac2a323..8268b71 100644
--- a/test/test_wavetoyf90.par
+++ b/test/test_wavetoyf90.par
@@ -1,6 +1,6 @@
-# test_wavetoyf90.par : WaveToyF90 
+# DESC "Octant evolution with no boundary condition"
 
-ActiveThorns = "time idscalarwave wavetoyf90 pugh cartgrid3d ioutil ioascii"
+ActiveThorns = "iobasic time idscalarwave wavetoyf90 pugh cartgrid3d ioutil ioascii"
 
 time::dtfac = 0.5
 
@@ -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_wavetoyf90"