Thornlists for two ways of using Carpet. The first uses Carpet along,

Thornlists for two ways of using Carpet.  The first uses Carpet along,
not relying on the standard Cactus WaveToy.  This should always work,
but is likely not very compatible.  The second uses Carpet together
with the standard Cactus WaveToy.  This might have problems, because
the standard WaveToy might not be fully AMR compatible.

darcs-hash:20020503103236-07bb3-79dcd97721edb9a4ec4b9cdc30d003beb4afa9c6.gz

2 files changed, 28 insertions, 28 deletions

diff --git a/CarpetExtra/thornlists/carpet-wavetoy.th b/CarpetExtra/thornlists/carpet-wavetoy.th
index 04c3367e0..061c91c30 100644
--- a/CarpetExtra/thornlists/carpet-wavetoy.th
+++ b/CarpetExtra/thornlists/carpet-wavetoy.th
@@ -1,13 +1,12 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/thornlists/carpet-wavetoy.th,v 1.2 2002/09/25 18:44:03 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/thornlists/carpet-wavetoy.th,v 1.1 2002/05/03 12:32:36 schnetter Exp $
 
-# This thornlist is for using Carpet together with the Carpet versions
-# of Wavetoy.
+# This thornlist is for using Carpet together with the standard Cactus
+# Wavetoy example.
 
 # arrangement/thorn                # implements (inherits) [friend] {shares}
 #
-AlphaThorns/Cart3d                 # grid (hyperslab) [ ] { }
 CactusBase/Boundary                # boundary (grid) [ ] { }
-#CactusBase/CartGrid3D              # grid ( ) [ ] {driver}
+CactusBase/CartGrid3D              # grid ( ) [ ] {driver}
 #CactusBase/IOASCII                 # IOASCII (IO,hyperslab) [ ] {IO}
 CactusBase/IOBasic                 # IOBasic (IO) [ ] {IO}
 CactusBase/IOUtil                  # IO ( ) [ ] { }
@@ -15,18 +14,19 @@ CactusBase/Time                    # time ( ) [ ] { }
 CactusConnect/HTTPD                # httpd ( ) [ ] {Cactus}
 CactusConnect/HTTPDExtra           # http_utils (httpd,IO) [ ] { }
 CactusUtils/NaNChecker             # NaNChecker ( ) [ ] { }
-Carpet/Carpet                      # driver (CarpetLib) [ ] {Cactus}
+CactusWave/IDScalarWave            # idscalarwave (wavetoy,grid) [ ] {grid}
+CactusWave/IDScalarWaveC           # idscalarwave (wavetoy,grid) [ ] {grid}
+CactusWave/IDScalarWaveCXX         # idscalarwave (wavetoy,grid) [ ] {grid}
+CactusWave/WaveBinarySource        # binarysource (wavetoy,grid,idscalarwave) [ ] { }
+CactusWave/WaveToyC                # wavetoy (Grid,Boundary) [ ] { }
+CactusWave/WaveToyCXX              # wavetoy (Grid,Boundary) [ ] { }
+CactusWave/WaveToyF77              # wavetoy (Grid,Boundary) [ ] { }
+Carpet/Carpet                      # driver (CarpetLib) [ ] {Cactus,IO}
 Carpet/CarpetIOASCII               # IOASCII (CarpetLib,driver,Hyperslab) [ ] {IO}
 Carpet/CarpetIOFlexIO              # IOFlexIO (CarpetLib,driver,Hyperslab) [ ] {IO}
 Carpet/CarpetLib                   # CarpetLib ( ) [ ] { }
 Carpet/CarpetReduce                # reduce (CarpetLib,driver) [ ] { }
-Carpet/CarpetRegrid                # CarpetRegrid (CarpetLib,Carpet) [ ] { }
+Carpet/CarpetRegrid                # CarpetRegrid (CarpetLib,driver) [ ] { }
 Carpet/CarpetSlab                  # Hyperslab (CarpetLib,driver) [ ] { }
 Carpet/CarpetTest                  # CarpetTest ( ) [ ] { }
-Carpet/Cart3dTest                  # Cart3dTest (grid) [ ] { }
-Carpet/HydroToy                    # hydrotoy (boundary,grid) [ ] { }
-Carpet/IDHydroToy                  # idhydrotoy (hydrotoy,grid) [ ] {grid}
-Carpet/IDScalarWave                # idscalarwave (wavetoy,grid) [ ] {grid}
-Carpet/IDSpaceTimeToy              # idspacetimetoy (spacetimetoy,hydrotoy,grid) [ ] {grid,hydrotoy}
-Carpet/SpaceTimeToy                # spacetimetoy (hydrotoy,boundary,grid) [ ] {hydrotoy}
-Carpet/WaveToyF77                  # wavetoy (boundary,grid) [ ] { }
+#Carpet/CartGrid3D                  # grid ( ) [ ] {driver}
diff --git a/CarpetExtra/thornlists/std-wavetoy.th b/CarpetExtra/thornlists/std-wavetoy.th
index ae97b6ade..f4a025e7b 100644
--- a/CarpetExtra/thornlists/std-wavetoy.th
+++ b/CarpetExtra/thornlists/std-wavetoy.th
@@ -1,12 +1,13 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/thornlists/std-wavetoy.th,v 1.2 2002/09/25 18:44:03 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/thornlists/std-wavetoy.th,v 1.1 2002/05/03 12:32:36 schnetter Exp $
 
-# This thornlist is for using Carpet together with the standard Cactus
-# Wavetoy example.
+# This thornlist is for using Carpet together with the Carpet versions
+# of Wavetoy.
 
 # arrangement/thorn                # implements (inherits) [friend] {shares}
 #
+AlphaThorns/Cart3d                 # grid (hyperslab) [ ] { }
 CactusBase/Boundary                # boundary (grid) [ ] { }
-CactusBase/CartGrid3D              # grid ( ) [ ] {driver}
+#CactusBase/CartGrid3D              # grid ( ) [ ] {driver}
 #CactusBase/IOASCII                 # IOASCII (IO,hyperslab) [ ] {IO}
 CactusBase/IOBasic                 # IOBasic (IO) [ ] {IO}
 CactusBase/IOUtil                  # IO ( ) [ ] { }
@@ -14,19 +15,18 @@ CactusBase/Time                    # time ( ) [ ] { }
 CactusConnect/HTTPD                # httpd ( ) [ ] {Cactus}
 CactusConnect/HTTPDExtra           # http_utils (httpd,IO) [ ] { }
 CactusUtils/NaNChecker             # NaNChecker ( ) [ ] { }
-CactusWave/IDScalarWave            # idscalarwave (wavetoy,grid) [ ] {grid}
-CactusWave/IDScalarWaveC           # idscalarwave (wavetoy,grid) [ ] {grid}
-CactusWave/IDScalarWaveCXX         # idscalarwave (wavetoy,grid) [ ] {grid}
-CactusWave/WaveBinarySource        # binarysource (wavetoy,grid,idscalarwave) [ ] { }
-CactusWave/WaveToyC                # wavetoy (Grid,Boundary) [ ] { }
-CactusWave/WaveToyCXX              # wavetoy (Grid,Boundary) [ ] { }
-CactusWave/WaveToyF77              # wavetoy (Grid,Boundary) [ ] { }
-Carpet/Carpet                      # driver (CarpetLib) [ ] {Cactus,IO}
+Carpet/Carpet                      # driver (CarpetLib) [ ] {Cactus}
 Carpet/CarpetIOASCII               # IOASCII (CarpetLib,driver,Hyperslab) [ ] {IO}
 Carpet/CarpetIOFlexIO              # IOFlexIO (CarpetLib,driver,Hyperslab) [ ] {IO}
 Carpet/CarpetLib                   # CarpetLib ( ) [ ] { }
 Carpet/CarpetReduce                # reduce (CarpetLib,driver) [ ] { }
-Carpet/CarpetRegrid                # CarpetRegrid (CarpetLib,driver) [ ] { }
+Carpet/CarpetRegrid                # CarpetRegrid (CarpetLib,Carpet) [ ] { }
 Carpet/CarpetSlab                  # Hyperslab (CarpetLib,driver) [ ] { }
 Carpet/CarpetTest                  # CarpetTest ( ) [ ] { }
-#Carpet/CartGrid3D                  # grid ( ) [ ] {driver}
+Carpet/Cart3dTest                  # Cart3dTest (grid) [ ] { }
+Carpet/HydroToy                    # hydrotoy (boundary,grid) [ ] { }
+Carpet/IDHydroToy                  # idhydrotoy (hydrotoy,grid) [ ] {grid}
+Carpet/IDScalarWave                # idscalarwave (wavetoy,grid) [ ] {grid}
+Carpet/IDSpaceTimeToy              # idspacetimetoy (spacetimetoy,hydrotoy,grid) [ ] {grid,hydrotoy}
+Carpet/SpaceTimeToy                # spacetimetoy (hydrotoy,boundary,grid) [ ] {hydrotoy}
+Carpet/WaveToyF77                  # wavetoy (boundary,grid) [ ] { }