1. Added interface for AMR. Carpet still contains no clusterer, but

1. Added interface for AMR.  Carpet still contains no clusterer, but
the application can now determine where to refine.

2. Made scalars (again) available all the time.  This allows the
scheduler to use scalars.

darcs-hash:20010826115851-07bb3-eca06f09fe49430522d9770bdf5ff2e99f7578a6.gz

12 files changed, 62 insertions, 29 deletions

diff --git a/CarpetExtra/HydroToy/param.ccl b/CarpetExtra/HydroToy/param.ccl
index 2760c29dd..d27dbef12 100644
--- a/CarpetExtra/HydroToy/param.ccl
+++ b/CarpetExtra/HydroToy/param.ccl
@@ -1,5 +1,11 @@
 # Parameter definitions for thorn HydroToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/param.ccl,v 1.2 2001/03/21 22:57:40 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/param.ccl,v 1.3 2001/08/26 13:59:38 schnetter Exp $
+
+restricted:
+
+BOOLEAN hydrotoy_active "Activate or deactivate the HydroToy thorn"
+{
+} "yes"
 
 private:
 
diff --git a/CarpetExtra/HydroToy/schedule.ccl b/CarpetExtra/HydroToy/schedule.ccl
index 319793a1d..aa8716cb0 100644
--- a/CarpetExtra/HydroToy/schedule.ccl
+++ b/CarpetExtra/HydroToy/schedule.ccl
@@ -1,5 +1,9 @@
 # Schedule definitions for thorn HydroToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.1 2001/03/18 22:37:09 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/schedule.ccl,v 1.2 2001/08/26 13:59:40 schnetter Exp $
+
+if (hydrotoy_active) {
+
+
 
 STORAGE: hydroevolve
 
@@ -29,10 +33,13 @@ schedule HydroToy_EulerPredictor at EVOL
   SYNC: hydroevolve
 } "Euler predictor step"
 
-schedule HydroToy_EulerCorrector at EVOL \
-	after HydroToy_EulerPredictor
+schedule HydroToy_EulerCorrector at EVOL after HydroToy_EulerPredictor
 {
   LANG: Fortran
   STORAGE: hydrotemps
   SYNC: hydroevolve
 } "Euler corrector step"
+
+
+
+}
diff --git a/CarpetExtra/IDSpaceTimeToy/param.ccl b/CarpetExtra/IDSpaceTimeToy/param.ccl
index 8a708604c..706bad6d7 100644
--- a/CarpetExtra/IDSpaceTimeToy/param.ccl
+++ b/CarpetExtra/IDSpaceTimeToy/param.ccl
@@ -1,10 +1,14 @@
 # Parameter definitions for thorn IDSpaceTimeToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/param.ccl,v 1.1 2001/03/17 16:05:49 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/param.ccl,v 1.2 2001/08/26 13:59:41 schnetter Exp $
 
 shares: grid
 
 USES KEYWORD type 
 
+shares: hydrotoy
+
+USES BOOLEAN hydrotoy_active
+
 restricted:
 
 KEYWORD initial_data "Type of initial data"
diff --git a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
index 5582ed669..4fe16680d 100644
--- a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
+++ b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.4 2001/03/26 02:28:54 eschnett Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.5 2001/08/26 13:59:47 schnetter Exp $
       
 #include "cctk.h"
 #include "cctk_Parameters.h"
@@ -124,7 +124,7 @@ c     Use kx,ky,kz as number of modes in each direction.
          
       end if
       
-      if (cctk_isthornactive("hydrotoy").eq.1) then
+      if (hydrotoy_active.eq.1) then
          
          do k=1,cctk_lsh(3)
             do j=1,cctk_lsh(2)
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par
index 481e1f24d..0bcc7a94e 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par
@@ -7,12 +7,12 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.3 2001/04/23 08:10:20 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.4 2001/08/26 13:59:52 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy HydroToy"
 
 Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
+#Carpet::check_for_poison	= yes
 Carpet::checksum_timelevels	= yes
 
 Cactus::cctk_itlast		= 120
@@ -52,6 +52,8 @@ IOFlexIO::out3D_format		= IEEE
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
 
+HydroToy::hydrotoy_active	= no
+
 IDSpaceTimeToy::initial_data	= plane
 IDSpaceTimeToy::kx		= 0.222222222222222	# 2 / ((32-2) * 0.3)
 IDSpaceTimeToy::ky		= 0.151515151515152	# 2 / ((46-2) * 0.3)
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par
index 95b1884e9..b55dcbd75 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par
@@ -7,12 +7,12 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.5 2001/04/23 08:10:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.6 2001/08/26 13:59:53 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy"
 
 Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
+#Carpet::check_for_poison	= yes
 Carpet::checksum_timelevels	= yes
 
 Cactus::cctk_itlast		= 60
@@ -52,6 +52,8 @@ IOFlexIO::out3D_format		= IEEE
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
 
+HydroToy::hydrotoy_active	= no
+
 IDSpaceTimeToy::initial_data	= plane
 IDSpaceTimeToy::kx		= 0.222222222222222	# 2 / ((32-2) * 0.3)
 IDSpaceTimeToy::ky		= 0.151515151515152	# 2 / ((46-2) * 0.3)
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par
index df1ab595d..45be9dba9 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par
@@ -7,12 +7,12 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.5 2001/04/23 08:10:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.6 2001/08/26 13:59:54 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy"
 
 Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
+#Carpet::check_for_poison	= yes
 Carpet::checksum_timelevels	= yes
 
 Cactus::cctk_itlast		= 120
@@ -56,6 +56,8 @@ IOFlexIO::out3D_format		= IEEE
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
 
+HydroToy::hydrotoy_active	= no
+
 IDSpaceTimeToy::initial_data	= plane
 IDSpaceTimeToy::kx		= 0.222222222222222	# 2 / ((32-2) * 0.3)
 IDSpaceTimeToy::ky		= 0.151515151515152	# 2 / ((46-2) * 0.3)
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par
index ec078235d..5a15f3e71 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par
@@ -7,12 +7,12 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.6 2001/04/23 08:10:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.7 2001/08/26 13:59:54 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy"
 
 Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
+#Carpet::check_for_poison	= yes
 Carpet::checksum_timelevels	= yes
 
 Cactus::cctk_itlast		= 240
@@ -56,6 +56,8 @@ IOFlexIO::out3D_format		= IEEE
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
 
+HydroToy::hydrotoy_active	= no
+
 IDSpaceTimeToy::initial_data	= plane
 IDSpaceTimeToy::kx		= 0.222222222222222	# 2 / ((32-2) * 0.3)
 IDSpaceTimeToy::ky		= 0.151515151515152	# 2 / ((46-2) * 0.3)
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par
index 14175ee15..1114944af 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par
@@ -7,12 +7,12 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.5 2001/04/23 08:10:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.6 2001/08/26 13:59:55 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy"
 
 Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
+#Carpet::check_for_poison	= yes
 Carpet::checksum_timelevels	= yes
 
 Cactus::cctk_itlast		= 240
@@ -56,6 +56,8 @@ IOFlexIO::out3D_format		= IEEE
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
 
+HydroToy::hydrotoy_active	= no
+
 IDSpaceTimeToy::initial_data	= plane
 IDSpaceTimeToy::kx		= 0.222222222222222	# 2 / ((32-2) * 0.3)
 IDSpaceTimeToy::ky		= 0.151515151515152	# 2 / ((46-2) * 0.3)
diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par
index 6dfb5e485..8ccee9f95 100644
--- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par
+++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par
@@ -7,12 +7,12 @@
 #   @enddesc
 # @@*/
 #
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.4 2001/04/23 08:10:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.5 2001/08/26 13:59:56 schnetter Exp $
 
-ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy"
+ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy"
 
 Carpet::poison_new_timelevels	= yes
-Carpet::check_for_poison	= yes
+#Carpet::check_for_poison	= yes
 Carpet::checksum_timelevels	= yes
 
 Cactus::cctk_itlast		= 480
@@ -56,6 +56,8 @@ IOFlexIO::out3D_format		= IEEE
 SpaceTimeToy::icn_iterations	= 2
 SpaceTimeToy::bound		= radiation
 
+HydroToy::hydrotoy_active	= no
+
 IDSpaceTimeToy::initial_data	= plane
 IDSpaceTimeToy::kx		= 0.222222222222222	# 2 / ((32-2) * 0.3)
 IDSpaceTimeToy::ky		= 0.151515151515152	# 2 / ((46-2) * 0.3)
diff --git a/CarpetExtra/SpaceTimeToy/param.ccl b/CarpetExtra/SpaceTimeToy/param.ccl
index d48df8cff..0213a9f61 100644
--- a/CarpetExtra/SpaceTimeToy/param.ccl
+++ b/CarpetExtra/SpaceTimeToy/param.ccl
@@ -1,5 +1,9 @@
 # Parameter definitions for thorn SpaceTimeToy
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/param.ccl,v 1.2 2001/03/21 22:57:40 eschnett Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/param.ccl,v 1.3 2001/08/26 13:59:49 schnetter Exp $
+
+shares: hydrotoy
+
+USES BOOLEAN hydrotoy_active
 
 private:
  
diff --git a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
index a5d8eab8c..304837390 100644
--- a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
+++ b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.8 2001/04/23 08:10:22 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.9 2001/08/26 13:59:58 schnetter Exp $
       
 #include "cctk.h" 
 #include "cctk_Parameters.h"
@@ -29,7 +29,7 @@ c     Copy
          end do
       end do
       
-      if (cctk_isthornactive("hydrotoy").eq.1) then
+      if (hydrotoy_active.eq.1) then
          
          do k=1,cctk_lsh(3)
             do j=1,cctk_lsh(2)
@@ -103,7 +103,7 @@ c     Average
          end do
       end do
       
-      if (cctk_isthornactive("hydrotoy").eq.1) then
+      if (hydrotoy_active.eq.1) then
          
          do k=1,cctk_lsh(3)
             do j=1,cctk_lsh(2)