Changes to include IDScalarWaveElliptic

git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/IDScalarWave/trunk@8 f5a6acaf-da7d-456b-b0a8-35edbc60b392

3 files changed, 12 insertions, 15 deletions

diff --git a/param.ccl b/param.ccl
index 4dce0db..323eac2 100644
--- a/param.ccl
+++ b/param.ccl
@@ -7,6 +7,16 @@ USES KEYWORD type ""
 {
 }
 
+restricted:
+
+KEYWORD initial_data "Type of initial data"
+{
+  "plane"      :: "Plane wave"
+  "gaussian"   :: "Gaussian wave"
+  "box"        :: "Box wave"
+} "gaussian"
+
+
 private:
 
 REAL radius "The radius of the gaussian wave"
@@ -37,10 +47,3 @@ REAL amplitude "The amplitude of the waves"
   *:* :: "No restriction"
 } 1.0
 
-KEYWORD initial_data "Type of initial data"
-{
-  "plane"      :: "Plane wave"
-  "gaussian"   :: "Gaussian wave"
-  "box"        :: "Box wave"
-} "gaussian"
-
diff --git a/schedule.ccl b/schedule.ccl
index 33a8376..9e99c12 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -6,7 +6,7 @@ schedule IDScalarWave_CheckParameters at CCTK_PARAMCHECK
   LANG: Fortran
 } "Check parameters"
 
-schedule IDScalarWave_InitialData at CCTK_INITIAL after WaveToyF77_Initial
+schedule IDScalarWave_InitialData at CCTK_INITIAL
 {
   STORAGE:       wavetoy::scalarevolve,wavetoy::scalarold
   COMMUNICATION: wavetoy::scalarevolve
diff --git a/src/InitialData.F77 b/src/InitialData.F77
index d33b56e..354a9e6 100644
--- a/src/InitialData.F77
+++ b/src/InitialData.F77
@@ -15,7 +15,7 @@
 
 
  /*@@
-   @routine    WaveToyF77_InitialData
+   @routine    IDScalarWave_InitialData
    @date       
    @author     Tom Goodale
    @desc 
@@ -40,15 +40,9 @@
 
       INTEGER    i,j,k
       CCTK_REAL  dt,omega, pi
-      CCTK_REAL  dx,dy,dz
 
       pi = 4.0*atan(1.0)
 
-c     Grid spacing shortcuts
-c     ----------------------
-      dx = cctk_delta_space(1)
-      dy = cctk_delta_space(2)
-      dz = cctk_delta_space(3)
       dt = cctk_delta_time
 
       omega = sqrt(kx**2+ky**2+kz**2)