Carpet: update parfiles in the par/ directory

The parfiles didn't run because not all thorns were activated.
test_rad.par activated IOASCII and set an IOASCII parameter instead of using
CarpetIOASCII. multipatch.par was a very old parfile which didn't run at all.
It was therefore removed.

This closes bug report http://bugs.carpetcode.org/show_bug.cgi?id=78
"Fails to run test par files (unactivated thorns)".

darcs-hash:20050728171716-776a0-104c9ba1f0ff601febbcc682ff60c43edcaba5f0.gz

6 files changed, 10 insertions, 44 deletions

diff --git a/Carpet/Carpet/par/carpet-test.par b/Carpet/Carpet/par/carpet-test.par
index 05ec6c7e9..89a1c1c1c 100644
--- a/Carpet/Carpet/par/carpet-test.par
+++ b/Carpet/Carpet/par/carpet-test.par
@@ -1,4 +1,4 @@
-ActiveThorns = "Carpet"
+ActiveThorns = "Carpet CarpetLib IOUtil CoordBase CartGrid3D"
 
 Cactus::cctk_itlast		= 10
 
diff --git a/Carpet/Carpet/par/carpet-test.th b/Carpet/Carpet/par/carpet-test.th
index ab588089f..b4ad562e3 100644
--- a/Carpet/Carpet/par/carpet-test.th
+++ b/Carpet/Carpet/par/carpet-test.th
@@ -1,2 +1,6 @@
+CactusBase/CartGrid3D
+CactusBase/CoordBase
+CactusBase/IOUtil
+
 Carpet/Carpet                      # driver (CarpetLib) [ ] {Cactus,IO}
 Carpet/CarpetLib                   # CarpetLib ( ) [ ] { }
diff --git a/Carpet/Carpet/par/multipatch.par b/Carpet/Carpet/par/multipatch.par
deleted file mode 100644
index e1eaaf170..000000000
--- a/Carpet/Carpet/par/multipatch.par
+++ /dev/null
@@ -1,40 +0,0 @@
-Cactus::cctk_itlast = 20
-
-ActiveThorns = "Slab"
-
-ActiveThorns = "IOUtil"
-IO::out_dir = $parfile
-
-ActiveThorns = "Carpet CarpetLib CarpetReduce"
-Carpet::num_maps     =  2
-driver::global_nsize = 12
-
-ActiveThorns = "Boundary CartGrid3D CoordBase SymBase"
-grid::type = byspacing
-grid::dxyz = 0.1
-
-#ActiveThorns = "Periodic"
-#Periodic::periodic_y = yes
-#Periodic::periodic_z = yes
-
-ActiveThorns = "SimplePatchBoundary"
-SimplePatchBoundary::offset_x[1] = 1.0
-
-ActiveThorns = "WaveToyC"
-WaveToy::bound = radiation
-
-ActiveThorns = "IDScalarWaveC"
-#IDScalarWave::initial_data = plane
-#IDScalarWave::kx = 6.28318530717959
-#IDScalarWave::ky = 6.28318530717959
-
-ActiveThorns = "Time"
-Time::dtfac = 0.5
-
-ActiveThorns = "IOBasic"
-IOBasic::outInfo_every = 1
-IOBasic::outInfo_vars = "WaveToy::phi"
-
-ActiveThorns = "CarpetIOASCII"
-IOASCII::out1D_every = 1
-IOASCII::out1D_vars = "WaveToy::phi"
diff --git a/Carpet/Carpet/par/test_rad.par b/Carpet/Carpet/par/test_rad.par
index ee7af3cd2..425c90525 100644
--- a/Carpet/Carpet/par/test_rad.par
+++ b/Carpet/Carpet/par/test_rad.par
@@ -11,7 +11,7 @@
 #   @enddesc
 # @@*/          
 
-ActiveThorns = "boundary iobasic idscalarwavec time wavetoyc carpet carpetlib carpetslab carpetreduce cartgrid3d ioutil ioascii"
+ActiveThorns = "boundary idscalarwavec time wavetoyc carpet carpetlib carpetreduce cartgrid3d coordbase symbase ioutil iobasic carpetioascii"
  
 time::dtfac = 0.5
 
@@ -34,7 +34,6 @@ cactus::cctk_itlast = 10
 IOBasic::outScalar_every = 1
 IOBasic::outScalar_vars = "wavetoy::phi"
 
-IOASCII::out1D_style = "gnuplot f(x)"
 IOASCII::out1D_every = 1
 IOASCII::out1D_z = "no"
 IOASCII::out1D_y = "no"
diff --git a/Carpet/Carpet/par/test_rad_ref.par b/Carpet/Carpet/par/test_rad_ref.par
index e00217ac4..2ecceb3ea 100644
--- a/Carpet/Carpet/par/test_rad_ref.par
+++ b/Carpet/Carpet/par/test_rad_ref.par
@@ -11,7 +11,7 @@
 #   @enddesc
 # @@*/          
 
-ActiveThorns = "boundary iobasic idscalarwavec time wavetoyc carpet carpetlib carpetregrid carpetslab carpetreduce cartgrid3d ioutil carpetioascii"
+ActiveThorns = "boundary iobasic idscalarwavec time wavetoyc carpet carpetlib carpetregrid carpetreduce cartgrid3d coordbase symbase ioutil carpetioascii"
  
 time::dtfac = 0.5
 
@@ -24,6 +24,7 @@ wavetoyc::bound = "radiation"
 grid::type = "BySpacing"
 grid::domain = "octant"
 grid::dxyz = 0.6
+grid::avoid_origin = "no"
 
 # this file produces wrong output because the coordinat thorn
 # produces wrong coordinate arrays.
diff --git a/Carpet/Carpet/par/test_rad_ref.th b/Carpet/Carpet/par/test_rad_ref.th
index 538d486c2..3f7b413d1 100644
--- a/Carpet/Carpet/par/test_rad_ref.th
+++ b/Carpet/Carpet/par/test_rad_ref.th
@@ -11,5 +11,7 @@ Carpet/CarpetRegrid                # CarpetRegrid (CarpetLib,driver) [ ] { }
 Carpet/CarpetSlab                  # Hyperslab (CarpetLib,driver) [ ] { }
 Carpet/CarpetReduce                # reduce (CarpetLib,driver) [ ] { }
 CactusBase/CartGrid3D              # grid ( ) [ ] {driver}
+CactusBase/CoordBase               # grid ( ) [ ] {driver}
+CactusBase/SymBase                 # grid ( ) [ ] {driver}
 CactusBase/IOUtil                  # IO ( ) [ ] { }
 Carpet/CarpetIOASCII               # IOASCII (CarpetLib,driver,Hyperslab) [ ] {IO}