Amending par files for demos

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDAnalyticBH/trunk@57 6a3ddf76-46e1-4315-99d9-bc56cac1ef84

3 files changed, 67 insertions, 89 deletions

diff --git a/par/BrillLindDemo-Iso.par~ b/par/BrillLindDemo-Iso.par~
deleted file mode 100644
index c65197d..0000000
--- a/par/BrillLindDemo-Iso.par~
+++ /dev/null
@@ -1,85 +0,0 @@
-#------------------------------------------------------------------------------
-#
-# Parameter file for evolutions of colliding black holes (Brill Lindquist)
-#
-# For use with Cactus 4.0 (Beta 4)
-#
-# For help on running Cactus, either run the Cactus exectuable with the 
-#   command line option -help, or consult the documentation at
-#   www.cactuscode.org
-#
-# Max Planck Institute for Gravitational Physics, Potsdam, Germany, 1999
-#
-#------------------------------------------------------------------------------
-
-
-!DESC "Evolution of Colliding Black Holes: Demo"
-
-
-# These thorns must be compiled
-
-ActiveThorns = "ADM_BSSN CartGrid3D Einstein IDanalyticBH IOBasic IOUtil IOASCII PsiKadelia Pugh Time"
- 
-
-#------------------------------------------------------------------------------
-
-
-# Number of grid points in each direction
- 
-driver::global_nsize       = 93
-
-# How many iterations 
-
-cactus::cctk_final_time    = 30.0
-
-# What output and how often
-
-IOBasic::outInfo_vars      = "einstein::alp"
-IOBasic::outInfo_every     = 10 
-IOASCII::out1D_vars        = "einstein::alp einstein::grr psikadelia::psi0re"
-IOASCII::out1D_every       = 10
-
-
-#------------------------------------------------------------------------------
-# 
-# Evolution and initial data
-#
-#------------------------------------------------------------------------------
-
-
-IO::outdir                 = "BrillLindDemo"
-
-grid::domain               = "full"
-grid::type                 = "byrange"
-grid::xyzmin               = -15.0
-grid::xyzmax               =  15.0
-
-cactus::cctk_initial_time  = 0.
-
-time::dtfac                = 0.25 
- 
-einstein::initial_data     = "bl_bh"  
-einstein::evolution_system = "ADM_BSSN"     
-einstein::slicing          = "1+log"
-einstein::initial_lapse	   = "one"
-
-idanalyticbh::bl_nbh       = 2
-idanalyticbh::bl_x0_1      = 0.0
-idanalyticbh::bl_y0_1      = 1.2
-idanalyticbh::bl_z0_1      = 0.0
-idanalyticbh::bl_M_1       = 1.0
-idanalyticbh::bl_x0_2      =  0.0
-idanalyticbh::bl_y0_2      = -1.2
-idanalyticbh::bl_z0_2      =  0.0
-idanalyticbh::bl_M_2       =  1.5
-
-adm_bssn::harmonic_f       = 2.0
-adm_bssn::bound            = "radiative"      
-adm_bssn::method           = "icn"
-adm_bssn::ICN_itnum        = 3
-adm_bssn::evolveG          = "yes"
-adm_bssn::RfromH	   = "yes"
-adm_bssn::forceKzero	   = "no"
-adm_bssn::subtracttrA	   = "no"
-
-
diff --git a/par/MisnerDemo-Simple.par b/par/MisnerDemo-Simple.par
new file mode 100644
index 0000000..05123f0
--- /dev/null
+++ b/par/MisnerDemo-Simple.par
@@ -0,0 +1,67 @@
+#------------------------------------------------------------------------------
+#
+# Parameter file for evolutions of colliding black holes (Misner)
+#
+# For use with Cactus 4.0 (Beta 4)
+#
+# For help on running Cactus, either run the Cactus exectuable with the 
+#   command line option -help, or consult the documentation at
+#   www.cactuscode.org
+#
+# Max Planck Institute for Gravitational Physics, Potsdam, Germany, 1999
+#
+#------------------------------------------------------------------------------
+
+!DESC "Evolution of Colliding Black Holes: Demo (C thorns only)"
+
+# These thorns must be compiled
+
+ActiveThorns = "Boundary EvolGRC CartGrid3D Einstein IDanalyticBH IOBasic IOUtil IOASCII Pugh Time"
+ 
+#------------------------------------------------------------------------------
+
+# Number of grid points in each direction (must be around 100 or larger)
+ 
+driver::global_nsize       = 100
+
+# How many iterations 
+
+cactus::cctk_final_time    = 30.0
+
+# What output and how often
+
+IOBasic::outInfo_vars      = "einstein::alp"
+IOBasic::outInfo_every     = 10
+IOASCII::out1D_vars        = "einstein::alp einstein::grr"
+IOASCII::out1D_every       = 1
+
+#------------------------------------------------------------------------------
+# 
+# Evolution and initial data
+#
+#------------------------------------------------------------------------------
+
+IO::outdir                 = "MisnerDemo-Simple"
+
+grid::domain               = "full"
+grid::type                 = "byrange"
+grid::xyzmin               = -10.0
+grid::xyzmax               =  10.0
+
+cactus::cctk_initial_time  = 0.
+
+time::dtfac                = 0.25 
+ 
+einstein::initial_data     = "misner_bh"  
+einstein::evolution_system = "ADM"     
+einstein::slicing          = "1+log"
+einstein::initial_lapse	   = "one"
+
+idanalyticbh::mu           = 2.2
+
+adm::harmonic_f            = 2.0
+adm::bound                 = "flat"      
+adm::method                = "leapfrog"
+
+#------------------------------------------------------------------------------
+
diff --git a/par/MisnerDemo.par b/par/MisnerDemo.par
index 4be45ee..09ffb46 100644
--- a/par/MisnerDemo.par
+++ b/par/MisnerDemo.par
@@ -24,10 +24,6 @@ ActiveThorns = "Boundary ADM CartGrid3D Einstein IDanalyticBH IOBasic IOUtil IOA
  
 driver::global_nsize       = 100
 
-# Hosts to announce the remote vizualisation to
-
-NetGeometry::amira_announce = ""
-
 # How many iterations 
 
 cactus::cctk_final_time    = 30.0