Made WaveToyF77 run on multiple processors with CarpetSlab.

darcs-hash:20010307115940-f6438-09debf696b4ec851992f65b9a7dec80942aee76c.gz

8 files changed, 81 insertions, 89 deletions

diff --git a/CarpetExtra/IDScalarWave/src/InitialData.F77 b/CarpetExtra/IDScalarWave/src/InitialData.F77
index a6d74ae59..ac277ce8f 100644
--- a/CarpetExtra/IDScalarWave/src/InitialData.F77
+++ b/CarpetExtra/IDScalarWave/src/InitialData.F77
@@ -40,7 +40,7 @@ c     -*-Fortran-*-
       INTEGER    i,j,k
       CCTK_REAL  dt,omega, pi
       
-      print '("IDScalarWave_InitialData")'
+c      print '("IDScalarWave_InitialData")'
       
       pi = 4.d0*atan(1.d0)
 
diff --git a/CarpetExtra/WaveToyF77/interface.ccl b/CarpetExtra/WaveToyF77/interface.ccl
index cf66ccea4..68be9a991 100644
--- a/CarpetExtra/WaveToyF77/interface.ccl
+++ b/CarpetExtra/WaveToyF77/interface.ccl
@@ -1,8 +1,8 @@
 # Interface definition for thorn WaveToyF77
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/interface.ccl,v 1.1 2001/03/01 13:40:11 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/interface.ccl,v 1.2 2001/03/07 13:01:47 eschnett Exp $
 
 implements: wavetoy
-inherits: boundary grid
+inherits: grid
 
 public:
 
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77.par b/CarpetExtra/WaveToyF77/par/wavetoyf77.par
index 89c6d341c..b2e616756 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77.par
@@ -1,6 +1,3 @@
-# wavetoyf77.par - minimal wavetoy evolution
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77.par,v 1.3 2001/03/05 21:49:11 eschnett Exp $
-#
 # /*@@
 #   @file      wavetoyf77.par
 #   @date      2001-01-07
@@ -8,7 +5,9 @@
 #   @desc
 #   Wavetoy parameter file demonstrating minimal evolution
 #   @enddesc
-# @@*/          
+# @@*/
+#
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77.par,v 1.4 2001/03/07 13:02:00 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib IDScalarWave WaveToyF77"
 
@@ -27,13 +26,15 @@ grid::mode			= none
 WaveToy::bound			= zero
 
 IO::outdir			= "wavetoyf77"
-IO::out_every			= 1
 
-#IOBasic::outInfo_every		= 1
+IOBasic::outInfo_every		= 1
 #IOBasic::outInfo_vars		= "wavetoy::phi"
 
 #IOBasic::outScalar_every	= 1
 #IOBasic::outScalar_vars		= "wavetoy::phi"
 #IOBasic::outScalar_style	= gnuplot
 
+IOASCII::out1D_every		= 1
 IOASCII::out1D_vars		= "wavetoy::phi"
+
+Carpet::verbose			= no
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_flat.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_flat.par
index 45fc4818c..e8b41a300 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_flat.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_flat.par
@@ -1,16 +1,15 @@
-# wavetoy_flat.par - wavetoy evolution with flat boundaries
-# $Id: wavetoyf77_flat.par,v 1.2 2001/03/05 21:49:12 eschnett Exp $
-#
 # /*@@
-#   @file      wavetoy_rad.par
-#   @date      Sunday 24th July
-#   @author    Gabrielle Allen
+#   @file      wavetoy_flat.par
+#   @date      2001-03-06
+#   @author    Erik Schnetter
 #   @desc
-#   Wavetoy parameter file demonstrating flat boundaries in Octant
+#   Wavetoy parameter file demonstrating flat boundaries in octant mode
 #   @enddesc
-# @@*/          
+# @@*/
+#
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_flat.par,v 1.3 2001/03/07 13:02:01 eschnett Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib IDScalarWave WaveToyF77"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
 Cactus::cctk_itlast		= 500
 
@@ -26,7 +25,7 @@ grid::dxyz			= 0.3
 
 IO::outdir			= "wavetoyf77_flat"
 
-#IOBasic::outInfo_every		= 50
+IOBasic::outInfo_every		= 50
 #IOBasic::outInfo_vars		= "wavetoy::phi"
 
 #IOBasic::outScalar_every	= 10
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_none.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_none.par
index 89a74bffb..f29dbd56c 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_none.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_none.par
@@ -1,45 +1,41 @@
-# wavetoy_none.par - wavetoy evolution with no boundaries
-# $Id: wavetoyf77_none.par,v 1.1 2001/03/01 13:40:11 eschnett Exp $
-#
 # /*@@
-#   @file      wavetoy_rad.par
-#   @date      Sunday 24th July
-#   @author    Gabrielle Allen
+#   @file      wavetoy_none.par
+#   @date      2001-03-06
+#   @author    Erik Schnetter
 #   @desc
-#   Wavetoy parameter file demonstrating no boundaries in Octant
+#   Wavetoy parameter file demonstrating no boundaries in octant mode
 #   @enddesc
-# @@*/          
+# @@*/
+#
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_none.par,v 1.2 2001/03/07 13:02:01 eschnett Exp $
+
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
-ActiveThorns = "idscalarwave time wavetoyf77 pugh pughreduce pughslab cartgrid3d ioutil ioascii iobasic"
- 
-time::dtfac = 0.5
+Cactus::cctk_itlast		= 500
 
-idscalarwave::initial_data = "gaussian"
-idscalarwave::sigma = 2.8 
-idscalarwave::radius = 0
+Time::dtfac			= 0.5
 
-wavetoyf77::bound = "none"
+driver::global_nx		= 30
+driver::global_ny		= 30
+driver::global_nz		= 30
 
-grid::type = "BySpacing"
-grid::domain = "octant"
-grid::dxyz = 0.3
+grid::type			= byspacing
+grid::mode			= octant
+grid::dxyz			= 0.3
 
-driver::global_nx = 30
-driver::global_ny = 30
-driver::global_nz = 30
+IO::outdir			= "wavetoyf77_none"
 
-cactus::cctk_itlast = 500
+IOBasic::outInfo_every		= 50
+#IOBasic::outInfo_vars		= "wavetoy::phi"
 
-IOBasic::outScalar_every = 10
-IOBasic::outScalar_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::out1D_every		= 10
+IOASCII::out1D_vars		= "wavetoy::phi "
 
-IOBasic::outInfo_every = 50
-IOBasic::outInfo_vars = "wavetoy::phi"
- 
-IO::outdir = "wavetoyf77_none"
+WaveToyF77::bound		= none
 
+IDScalarWave::initial_data	= gaussian
+IDScalarWave::sigma		= 2.8
+IDScalarWave::radius		= 0
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad.par
index f1b510329..4a208e11e 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad.par
@@ -1,45 +1,41 @@
-# wavetoyf77_rad.par - wavetoy evolution with radiation boundaries
-# $Id: wavetoyf77_rad.par,v 1.1 2001/03/01 13:40:11 eschnett Exp $
-#
 # /*@@
 #   @file      wavetoyf77_rad.par
-#   @date      Sunday 24th July
-#   @author    Gabrielle Allen
+#   @date      2001-03-06
+#   @author    Erik Schnetter
 #   @desc
-#   Wavetoy parameter file demonstrating radiation boundaries in Octant
+#   Wavetoy parameter file demonstrating radiation boundaries in octant mode
 #   @enddesc
-# @@*/          
-
-ActiveThorns = "iobasic idscalarwave time wavetoyf77 pugh pughslab pughreduce cartgrid3d ioutil ioascii"
- 
-time::dtfac = 0.5
+# @@*/
+#
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad.par,v 1.2 2001/03/07 13:02:01 eschnett Exp $
 
-idscalarwave::initial_data = "gaussian"
-idscalarwave::sigma = 2.8
-idscalarwave::radius = 0
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
-wavetoyf77::bound = "radiation"
+Cactus::cctk_itlast		= 120
+ 
+Time::dtfac			= 0.5
 
-grid::type = "BySpacing"
-grid::domain = "octant"
-grid::dxyz = 0.3
+driver::global_nx		= 30
+driver::global_ny		= 30
+driver::global_nz		= 30
 
-driver::global_nx = 30
-driver::global_ny = 30
-driver::global_nz = 30
+grid::type			= byspacing
+grid::mode			= octant
+grid::dxyz			= 0.3
+ 
+IO::outdir			= "wavetoyf77_rad"
 
-cactus::cctk_itlast = 120
+IOBasic::outinfo_every		= 10
+#IOBasic::outinfo_vars		= "wavetoy::phi"
 
-IOBasic::outScalar_every = 2
-IOBasic::outScalar_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::out1D_every		= 2
+IOASCII::out1D_vars		= "wavetoy::phi "
 
-IOBasic::outinfo_every = 10
-IOBasic::outinfo_vars = "wavetoy::phi"
- 
-IO::outdir = "wavetoyf77_rad"
+WaveToyF77::bound		= radiation
 
+IDScalarWave::initial_data	= gaussian
+IDScalarWave::sigma		= 2.8
+IDScalarWave::radius		= 0
diff --git a/CarpetExtra/WaveToyF77/schedule.ccl b/CarpetExtra/WaveToyF77/schedule.ccl
index f247f2eac..70a324fb7 100644
--- a/CarpetExtra/WaveToyF77/schedule.ccl
+++ b/CarpetExtra/WaveToyF77/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn WaveToy77
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/schedule.ccl,v 1.1 2001/03/01 13:40:11 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/schedule.ccl,v 1.2 2001/03/07 13:01:47 eschnett Exp $
 
 STORAGE: scalarevolve
 
@@ -11,6 +11,7 @@ schedule WaveToyF77_Startup at STARTUP
 schedule WaveToyF77_InitSymBound at BASEGRID
 {
   LANG: Fortran
+  OPTIONS: GLOBAL
 } "Schedule symmetries"
 
 schedule WaveToyF77_Evolution as WaveToy_Evolution at EVOL
@@ -19,8 +20,7 @@ schedule WaveToyF77_Evolution as WaveToy_Evolution at EVOL
   SYNC: scalarevolve
 } "Evolution of 3D wave equation"
 
-schedule WaveToyF77_Boundaries as WaveToy_Boundaries at EVOL AFTER WaveToy_Evolution
+schedule WaveToyF77_Boundaries as WaveToy_Boundaries at EVOL after WaveToy_Evolution
 {
   LANG: Fortran
 } "Boundaries of 3D wave equation"
-  
diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77
index fe40fc5e6..ec10a310c 100644
--- a/CarpetExtra/WaveToyF77/src/WaveToy.F77
+++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77
@@ -39,7 +39,7 @@ c     Declare variables in argument list
       DECLARE_CCTK_FUNCTIONS
       DECLARE_CCTK_PARAMETERS
       
-      INTEGER   i,j,k,ierr
+      INTEGER   i,j,k
       INTEGER   istart, jstart, kstart, iend, jend, kend
       CCTK_REAL dx,dy,dz,dt
       CCTK_REAL dx2,dy2,dz2,dt2
@@ -47,7 +47,7 @@ c     Declare variables in argument list
       
       CCTK_REAL factor
       
-      print '("WaveToyF77_Evolution")'
+c     call CCTK_INFO ("WaveToyF77_Evolution")
       
 c     Set up shorthands
 c     -----------------
@@ -125,7 +125,7 @@ c     Local declarations
       integer ierr
       integer sw(3)
       
-      print '("WaveToyF77_Boundaries")'
+c     call CCTK_INFO ("WaveToyF77_Boundaries")
       
       npow = 1
       finf = 1