Higher-order interpolation requires more ghost zones. Changed Carpet

Higher-order interpolation requires more ghost zones.  Changed Carpet
and CarpetLib to provide for that, and switched WaveToy to using two
ghost zones.

darcs-hash:20010328165604-f6438-1cb76681b90dda1f5934cbda405b6c32b754b6e5.gz

8 files changed, 87 insertions, 64 deletions

diff --git a/CarpetExtra/WaveToyF77/par/convtest.gnuplot b/CarpetExtra/WaveToyF77/par/convtest.gnuplot
index 007ffda6f..acd6d1526 100644
--- a/CarpetExtra/WaveToyF77/par/convtest.gnuplot
+++ b/CarpetExtra/WaveToyF77/par/convtest.gnuplot
@@ -9,17 +9,17 @@ omega=sqrt(kx**2 + ky**2 + kz**2)
 # without refinement
 
 # solutions
-p "wavetoyf77_periodic/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "wavetoyf77_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
+p "wavetoyf77_periodic/phi.zl" u ($8-1):($1==time&&$3==0?$9:0/0) w lp, "wavetoyf77_periodic_coarse/phi.zl" u (2*($8-1)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.3*x-9) + omega*(0.15*time))*pi) w l
 
 # errors
-p "wavetoyf77_periodic/phi.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.3*$8-9) + omega*(0.15*time))*pi):0/0) w lp, "wavetoyf77_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*$8)-9) + omega*(0.15*time))*pi):0/0) w lp
+p "wavetoyf77_periodic/phi.zl" u ($8-1):($1==time&&$3==0?$9-cos((kz*(0.3*($8-1)-9) + omega*(0.15*time))*pi):0/0) w lp, "wavetoyf77_periodic_coarse/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.3*(2*($8-1))-9) + omega*(0.15*time))*pi):0/0) w lp
 
 
 
 # with refinement
 
 # solutions
-p "wavetoyf77_periodic_rl2/phi.zl" u 8:($1==time&&$3==0?$9:0/0) w lp, "wavetoyf77_periodic_coarse_rl2/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
+p "wavetoyf77_periodic_rl2/phi.zl" u ($8-2):($1==time&&$3==0?$9:0/0) w lp, "wavetoyf77_periodic_coarse_rl2/phi.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9:0/0) w lp, cos((kz*(0.15*x-9) + omega*(0.075*time))*pi) w l
 
 # errors
-p "wavetoyf77_periodic_rl2/phi.zl" u 8:($1==time&&$3==0?$9-cos((kz*(0.15*$8-9) + omega*(0.075*time))*pi):0/0) w lp, "wavetoyf77_periodic_coarse_rl2/phi.zl" u (2*$8):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*$8)-9) + omega*(0.075*time))*pi):0/0) w lp
+p "wavetoyf77_periodic_rl2/phi.zl" u ($8-2):($1==time&&$3==0?$9-cos((kz*(0.15*($8-2)-9) + omega*(0.075*time))*pi):0/0) w lp, "wavetoyf77_periodic_coarse_rl2/phi.zl" u (2*($8-2)):(2*$1==time&&$3==0?$9-cos((kz*(0.15*(2*($8-2))-9) + omega*(0.075*time))*pi):0/0) w lp
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic.par
index e5ff3f880..11ca8fa40 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic.par,v 1.3 2001/03/16 22:42:31 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic.par,v 1.4 2001/03/28 18:56:09 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
@@ -15,17 +15,19 @@ Cactus::cctk_itlast		= 120
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "wavetoyf77_periodic"
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par
index 11ab69ece..87b45a39b 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par,v 1.4 2001/03/17 00:36:14 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par,v 1.5 2001/03/28 18:56:09 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
@@ -15,17 +15,19 @@ Cactus::cctk_itlast		= 60
 
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "wavetoyf77_periodic_coarse"
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par
index db3d76f2c..98f33031f 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par,v 1.5 2001/03/24 22:38:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par,v 1.6 2001/03/28 18:56:09 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
@@ -15,21 +15,23 @@ Cactus::cctk_itlast		= 120
  
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "wavetoyf77_periodic_coarse_rl2"
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par
index ea72c8295..d38ff4d12 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par,v 1.6 2001/03/26 02:29:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par,v 1.7 2001/03/28 18:56:09 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
@@ -15,21 +15,23 @@ Cactus::cctk_itlast		= 240
  
 Time::dtfac			= 0.5
 
-driver::global_nx		= 17
-driver::global_ny		= 24
-driver::global_nz		= 32
+driver::global_nx		= 19
+driver::global_ny		= 26
+driver::global_nz		= 34
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.8
-grid::ymax			=  7.2
-grid::zmax			=  9.6
+grid::xmin			= -5.4
+grid::ymin			= -7.2
+grid::zmin			= -9.6
+grid::xmax			=  5.4
+grid::ymax			=  7.8
+grid::zmax			= 10.2
 grid::mode			= periodic
 
 IO::outdir			= "wavetoyf77_periodic_coarse_rl3"
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl2.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl2.par
index b8141e51c..eb4ce80be 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl2.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl2.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl2.par,v 1.6 2001/03/24 22:38:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl2.par,v 1.7 2001/03/28 18:56:09 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
@@ -15,21 +15,23 @@ Cactus::cctk_itlast		= 240
  
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 2
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "wavetoyf77_periodic_rl2"
diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl3.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl3.par
index da79cfcbc..01926b4e9 100644
--- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl3.par
+++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl3.par
@@ -7,7 +7,7 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl3.par,v 1.6 2001/03/26 02:29:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_rl3.par,v 1.7 2001/03/28 18:56:09 eschnett Exp $
 
 ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77"
 
@@ -15,21 +15,23 @@ Cactus::cctk_itlast		= 480
  
 Time::dtfac			= 0.5
 
-driver::global_nx		= 32
-driver::global_ny		= 46
-driver::global_nz		= 62
+driver::global_nx		= 34
+driver::global_ny		= 48
+driver::global_nz		= 64
+
+driver::ghost_size		= 2
 
 Carpet::max_refinement_levels	= 3
 Carpet::prolongation_order_space= 3
 Carpet::prolongation_order_time	= 2
 
 grid::type			= byrange
-grid::xmin			= -4.8
-grid::ymin			= -6.6
-grid::zmin			= -9.0
-grid::xmax			=  4.5
-grid::ymax			=  6.9
-grid::zmax			=  9.3
+grid::xmin			= -5.1
+grid::ymin			= -6.9
+grid::zmin			= -9.3
+grid::xmax			=  4.8
+grid::ymax			=  7.2
+grid::zmax			=  9.6
 grid::mode			= periodic
 
 IO::outdir			= "wavetoyf77_periodic_rl3"
diff --git a/CarpetExtra/WaveToyF77/src/WaveToy.F77 b/CarpetExtra/WaveToyF77/src/WaveToy.F77
index adcdea62a..76d15e183 100644
--- a/CarpetExtra/WaveToyF77/src/WaveToy.F77
+++ b/CarpetExtra/WaveToyF77/src/WaveToy.F77
@@ -77,6 +77,17 @@ c     -----------------
       
 c     Do the evolution
 c     ----------------
+      do k = 1, cctk_lsh(3)
+         do j = 1, cctk_lsh(2)
+            do i = 1, cctk_lsh(1)
+               if (phi(i,j,k).gt.1.0d10) then
+                  print *,"problem",i,j,k
+               end if
+               phi_n(i,j,k) = 1.0d100
+            end do
+         end do
+      end do
+      
       do k = kstart, kend
          do j = jstart, jend
             do i = istart, iend