Changed to ADM, need to be tested again ...

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

2 files changed, 41 insertions, 55 deletions

diff --git a/par/BrillLindDemo-Iso.par b/par/BrillLindDemo-Iso.par
index b1e1376..62a3cbe 100644
--- a/par/BrillLindDemo-Iso.par
+++ b/par/BrillLindDemo-Iso.par
@@ -12,20 +12,22 @@
 #
 #------------------------------------------------------------------------------
 
-
 !DESC "Evolution of Colliding Black Holes: Demo"
 
 
 # These thorns must be compiled
 
-ActiveThorns = "Boundary ADM_BSSN CartGrid3D Einstein IDanalyticBH IOBasic IOUtil IOASCII PsiKadelia IsoSurfacer http NetGeometry Pugh Time"
+ActiveThorns = "Boundary ADM CartGrid3D Einstein IDanalyticBH IOBasic IOUtil IOASCII PsiKadelia IsoSurfacer http NetGeometry Pugh Time"
  
-
 #------------------------------------------------------------------------------
 
-# Number of grid points in each direction
+# Number of grid points in each direction (must be around 100 or larger)
  
-driver::global_nsize       = 93
+driver::global_nsize       = 100
+
+# Hosts to announce the remote vizualisation to
+
+NetGeometry::amira_announce = ""
 
 # How many iterations 
 
@@ -33,8 +35,8 @@ cactus::cctk_final_time    = 30.0
 
 # What output and how often
 
-IOBasic::outInfo_vars      = "einstein::alp psikadelia::psi0re"
-IOBasic::outInfo_every     = 1 
+IOBasic::outInfo_vars      = "einstein::alp"
+IOBasic::outInfo_every     = 10
 IOASCII::out1D_vars        = "einstein::alp einstein::grr psikadelia::psi0re"
 IOASCII::out1D_every       = 10
 
@@ -50,16 +52,13 @@ IOASCII::out1D_every       = 10
 #  - the output format
 #  - frequency , first iteration, resolution of output, uniq_vertices flag
 
-IsoSurfacer::isosurfacer = "{(psikadelia::psi0re) (0.999,1.001) (SOCK) (1, 1, 1, 1)}"
+IsoSurfacer::isosurfacer = "{(psikadelia::psi0re) (-0.001,0.001) (SOCK) (1, 1, 1, 1)}"
 IsoSurfacer::allow_empty_sends = "yes"
 
-http::port                  = 7050
-
-NetGeometry::port           = 7051
-NetGeometry::tcpwindowsize  = 1048576
+http::port                 = 7050
 
-# A list of hosts to which announce the remote viz when it starts up.
-NetGeometry::amira_announce = ""
+NetGeometry::port          = 7051
+NetGeometry::tcpwindowsize = 1048576
 
 
 #------------------------------------------------------------------------------
@@ -69,7 +68,7 @@ NetGeometry::amira_announce = ""
 #------------------------------------------------------------------------------
 
 
-IO::outdir                 = "BrillLindDemo"
+IO::outdir                 = "BrillLindDemo-Iso"
 
 grid::domain               = "full"
 grid::type                 = "byrange"
@@ -81,27 +80,22 @@ cactus::cctk_initial_time  = 0.
 time::dtfac                = 0.25 
  
 einstein::initial_data     = "bl_bh"  
-einstein::evolution_system = "ADM_BSSN"     
+einstein::evolution_system = "ADM"     
 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_nbh       =  2
+idanalyticbh::bl_x0_1      =  0.0
+idanalyticbh::bl_y0_1      =  0.0
+idanalyticbh::bl_z0_1      =  1.2
+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_y0_2      =  0.0
+idanalyticbh::bl_z0_2      = -1.2
 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"
+adm::harmonic_f            = 2.0
+adm::bound                 = "radiative"      
+adm::method                = "stagleap"
 
 
diff --git a/par/BrillLindDemo.par b/par/BrillLindDemo.par
index 799eb7e..a16378a 100644
--- a/par/BrillLindDemo.par
+++ b/par/BrillLindDemo.par
@@ -12,21 +12,18 @@
 #
 #------------------------------------------------------------------------------
 
-
 !DESC "Evolution of Colliding Black Holes: Demo"
 
 
 # These thorns must be compiled
 
-ActiveThorns = "Boundary ADM_BSSN CartGrid3D Einstein IDanalyticBH IOBasic IOUtil IOASCII PsiKadelia Pugh Time"
+ActiveThorns = "Boundary ADM CartGrid3D Einstein IDanalyticBH IOBasic IOUtil IOASCII PsiKadelia Pugh Time"
  
-
 #------------------------------------------------------------------------------
 
-
-# Number of grid points in each direction
+# Number of grid points in each direction (must be around 100 or larger)
  
-driver::global_nsize       = 93
+driver::global_nsize       = 100
 
 # How many iterations 
 
@@ -35,7 +32,7 @@ cactus::cctk_final_time    = 30.0
 # What output and how often
 
 IOBasic::outInfo_vars      = "einstein::alp"
-IOBasic::outInfo_every     = 10 
+IOBasic::outInfo_every     = 10
 IOASCII::out1D_vars        = "einstein::alp einstein::grr psikadelia::psi0re"
 IOASCII::out1D_every       = 10
 
@@ -47,7 +44,7 @@ IOASCII::out1D_every       = 10
 #------------------------------------------------------------------------------
 
 
-IO::outdir                 = "BrillLindDemo"
+IO::outdir                 = "BrillLindDemo-Iso"
 
 grid::domain               = "full"
 grid::type                 = "byrange"
@@ -59,27 +56,22 @@ cactus::cctk_initial_time  = 0.
 time::dtfac                = 0.25 
  
 einstein::initial_data     = "bl_bh"  
-einstein::evolution_system = "ADM_BSSN"     
+einstein::evolution_system = "ADM"     
 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_nbh       =  2
+idanalyticbh::bl_x0_1      =  0.0
+idanalyticbh::bl_y0_1      =  0.0
+idanalyticbh::bl_z0_1      =  1.2
+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_y0_2      =  0.0
+idanalyticbh::bl_z0_2      = -1.2
 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"
+adm::harmonic_f            = 2.0
+adm::bound                 = "radiative"      
+adm::method                = "stagleap"