update from public Whisky version

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TOVSolver/trunk@12 1bdb13ef-5d69-4035-bb54-08abeb3aa7f1

7 files changed, 9 insertions, 367 deletions

diff --git a/param.ccl b/param.ccl
index 023bf40..55602b3 100644
--- a/param.ccl
+++ b/param.ccl
@@ -120,6 +120,13 @@ CCTK_INT TOV_fake_evolution "Fake evolution by setting ID at every step" STEERAB
 } 0
 
 
+shares:HydroBase
+
+EXTENDS KEYWORD initial_hydro ""
+{
+  "tov" :: "TOV star initial hydrobase variables"
+}
+
 shares:admbase
 
 EXTENDS KEYWORD initial_data
diff --git a/schedule.ccl b/schedule.ccl
index a59ffe9..f4c2446 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -42,8 +42,8 @@ schedule TOV_C_Integrate_RHS IN TOV_Initial_Data
   OPTIONS: GLOBAL
 } "Integrate the 1d equations for the TOV star"
 
-if (CCTK_Equals(initial_data, "tov") || (TOV_Use_Old_Initial_Data > 0) ||
-    TOV_Enforce_Interpolation)
+if (CCTK_Equals(initial_data, "tov") || CCTK_Equals(initial_hydro, "tov") ||
+    (TOV_Use_Old_Initial_Data > 0) || TOV_Enforce_Interpolation)
 {
   schedule TOV_C_Exact IN TOV_Initial_Data AFTER TOV_C_Integrate_RHS
   {
diff --git a/test/test_one_boost_max/test_one_boost_max.par b/test/test_one_boost_max/test_one_boost_max.par
index 03028ff..e69de29 100644
--- a/test/test_one_boost_max/test_one_boost_max.par
+++ b/test/test_one_boost_max/test_one_boost_max.par
@@ -1,69 +0,0 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase whisky whisky_init_data whisky_tovsolverc nanchecker eos_base eos_ideal_fluid eos_polytrope bssn_mol admconstraints Constants LocalReduce TmunuBase"
-
-TmunuBase::stress_energy_storage	=	yes
-TmunuBase::stress_energy_at_RHS		=	yes
-
-time::dtfac = 0.375
-
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
-ADMConstraints::constraints_persist	= yes
-admconstraints::bound     = "static"
-
-boundary::radpower        = 2
-
-SpaceMask::use_mask = "yes"
-
-grid::type            = "byrange"
-grid::domain          = "full"
-grid::xyzmin          = -15.0
-grid::xyzmax          =  15.001
-driver::ghost_size    =   3
-driver::global_nsize  =  33
-
-cactus::cctk_itlast   =       0
-
-methodoflines::ode_method        = "icn"
-
-hydrobase::timelevels             = 2
-hydrobase::evolution_method       = "whisky"
-
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::tvd_limiter               = "VanLeerMC2"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-ADMBase::initial_data  = "tov"
-ADMBase::initial_lapse = "tov"
-ADMBase::initial_shift = "tov"
-
-whiskytovsolver::TOV_Rho_Central[0] = 1.28e-3
-whiskytovsolver::TOV_Gamma[0]       = 2.0
-whiskytovsolver::TOV_K[0]           = 100.0
-whiskytovsolver::TOV_Velocity_x[0]  = 0.1
-whiskytovsolver::TOV_Velocity_y[0]  = 0.2
-whiskytovsolver::TOV_Velocity_z[0]  = 0.3
-whiskytovsolver::TOV_Combine_Method = "maximum"
-
-EOS_Polytrope::eos_gamma            = 2.0
-EOS_Polytrope::eos_k                = 100.0
-
-IO::out_dir			= $parfile
-IO::out_fileinfo="none"
-
-IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-
-IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-IOASCII::out_format      = ".10e"
diff --git a/test/test_one_static_max/test_one_static_max.par b/test/test_one_static_max/test_one_static_max.par
index 4d551b6..e69de29 100644
--- a/test/test_one_static_max/test_one_static_max.par
+++ b/test/test_one_static_max/test_one_static_max.par
@@ -1,67 +0,0 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase whisky whisky_init_data whisky_tovsolverc nanchecker eos_base eos_ideal_fluid eos_polytrope bssn_mol admconstraints Constants LocalReduce TmunuBase"
-
-TmunuBase::stress_energy_storage	=	yes
-TmunuBase::stress_energy_at_RHS		=	yes
-
-time::dtfac = 0.375
-
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
-ADMConstraints::constraints_persist	= yes
-admconstraints::bound     = "static"
-
-boundary::radpower        = 2
-
-SpaceMask::use_mask = "yes"
-
-grid::type            = "byrange"
-grid::domain          = "full"
-grid::xyzmin          = -15.0
-grid::xyzmax          =  15.001
-driver::ghost_size    =   3
-driver::global_nsize  =  33
-
-cactus::cctk_itlast   =       0
-
-methodoflines::ode_method        = "icn"
-
-hydrobase::timelevels             = 2
-hydrobase::evolution_method       = "whisky"
-
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::tvd_limiter               = "VanLeerMC2"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-ADMBase::initial_data  = "tov"
-ADMBase::initial_lapse = "tov"
-ADMBase::initial_shift = "tov"
-
-whiskytovsolver::TOV_Rho_Central[0] = 1.28e-3
-whiskytovsolver::TOV_Gamma[0]       = 2.0
-whiskytovsolver::TOV_K[0]           = 100.0
-whiskytovsolver::TOV_Combine_Method = "maximum"
-
-EOS_Polytrope::eos_gamma            = 2.0
-EOS_Polytrope::eos_k                = 100.0
-
-
-IO::out_dir			= $parfile
-IO::out_fileinfo="none"
-
-IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-
-IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-IOASCII::out_format      = ".10e"
diff --git a/test/test_tov_carpet/test_tov_carpet.par b/test/test_tov_carpet/test_tov_carpet.par
index 424a778..e69de29 100644
--- a/test/test_tov_carpet/test_tov_carpet.par
+++ b/test/test_tov_carpet/test_tov_carpet.par
@@ -1,77 +0,0 @@
-!DESC "Carpet unigrid, one TOV" 
-ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase whisky whisky_init_data whisky_tovsolverc eos_base eos_ideal_fluid eos_polytrope bssn_mol admconstraints Constants LocalReduce Carpet CarpetLib CarpetInterp CarpetReduce CarpetIOScalar CarpetIOBasic LoopControl TmunuBase"
-
-TmunuBase::stress_energy_storage	=	yes
-TmunuBase::stress_energy_at_RHS		=	yes
-
-time::dtfac = 0.375
-
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
-ADMConstraints::constraints_persist	= yes
-admconstraints::bound     = "static"
-
-boundary::radpower        = 2
-
-SpaceMask::use_mask = "yes"
-
-CartGrid3D::type = "coordbase"
-CoordBase::domainsize = minmax
-
-Carpet::domain_from_coordbase = "yes"
-CoordBase::spacing = "numcells"
-CoordBase::xmin =  -15.0
-CoordBase::ymin =  -15.0
-CoordBase::zmin =  -15.0
-CoordBase::xmax =   15.001
-CoordBase::ymax =   15.001
-CoordBase::zmax =   15.001
-CoordBase::ncells_x = 32
-CoordBase::ncells_y = 32
-CoordBase::ncells_z = 32
-
-driver::ghost_size   = 3
-
-cactus::cctk_itlast   =       0
-
-methodoflines::ode_method        = "icn"
-
-hydrobase::timelevels             = 2
-hydrobase::evolution_method       = "whisky"
-
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::tvd_limiter               = "VanLeerMC2"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-ADMBase::initial_data  = "tov"
-ADMBase::initial_lapse = "tov"
-ADMBase::initial_shift = "tov"
-
-whiskytovsolver::TOV_Rho_Central[0] = 1.28e-3
-whiskytovsolver::TOV_Gamma[0]       = 2.0
-whiskytovsolver::TOV_K[0]           = 100.0
-whiskytovsolver::TOV_Combine_Method = "maximum"
-
-EOS_Polytrope::eos_gamma            = 2.0
-EOS_Polytrope::eos_k                = 100.0
-
-Carpet::prolongation_order_space  = 3
-Carpet::prolongation_order_time   = 2
-
-IO::out_dir			= $parfile
-IO::out_fileinfo= "none"
-
-IOScalar::outScalar_every = 1
-IOScalar::outScalar_vars  = "hydrobase::rho hydrobase::press hydrobase::eps hydrobase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum whisky::w_lorentz"
-IOScalar::outScalar_reductions  = "minimum maximum norm1 norm2"
diff --git a/test/test_two_av/test_two_av.par b/test/test_two_av/test_two_av.par
index a2e5a3a..e69de29 100644
--- a/test/test_two_av/test_two_av.par
+++ b/test/test_two_av/test_two_av.par
@@ -1,76 +0,0 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase whisky whisky_init_data whisky_tovsolverc nanchecker eos_base eos_ideal_fluid eos_polytrope bssn_mol admconstraints constants LocalReduce TmunuBase"
-
-TmunuBase::stress_energy_storage	=	yes
-TmunuBase::stress_energy_at_RHS		=	yes
-
-time::dtfac = 0.375
-
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
-ADMConstraints::constraints_persist	= yes
-admconstraints::bound     = "static"
-
-boundary::radpower        = 2
-
-SpaceMask::use_mask = "yes"
-
-grid::type            = "byrange"
-grid::domain          = "full"
-grid::xyzmin          = -30.0
-grid::xyzmax          =  30.001
-driver::ghost_size    =   3
-driver::global_nsize  =  33
-
-cactus::cctk_itlast   =       0
-
-methodoflines::ode_method        = "icn"
-
-hydrobase::timelevels             = 2
-hydrobase::evolution_method       = "whisky"
-
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::tvd_limiter               = "VanLeerMC2"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-ADMBase::initial_data  = "tov"
-ADMBase::initial_lapse = "tov"
-ADMBase::initial_shift = "tov"
-
-whiskytovsolver::TOV_Num_TOVs       = 2
-whiskytovsolver::TOV_Num_Radial     = 200000
-whiskytovsolver::TOV_Combine_Method = "average"
-
-whiskytovsolver::TOV_Rho_Central[0] = 0.16e-3
-whiskytovsolver::TOV_Gamma[0]       = 2.0
-whiskytovsolver::TOV_K[0]           = 100.0
-whiskytovsolver::TOV_Position_x[0]  = -15.0
-
-whiskytovsolver::TOV_Rho_Central[1] = 0.32e-3
-whiskytovsolver::TOV_Gamma[1]       = 2.0
-whiskytovsolver::TOV_K[1]           = 100.0
-whiskytovsolver::TOV_Position_x[1]  = 15.0
-
-EOS_Polytrope::eos_gamma            = 2.0
-EOS_Polytrope::eos_k                = 100.0
-
-IO::out_fileinfo="none"
-IO::out_dir			= $parfile
-
-IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-
-IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-IOASCII::out_format      = ".10e"
-
diff --git a/test/test_two_max/test_two_max.par b/test/test_two_max/test_two_max.par
index 7b07dd7..e69de29 100644
--- a/test/test_two_max/test_two_max.par
+++ b/test/test_two_max/test_two_max.par
@@ -1,76 +0,0 @@
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase whisky whisky_init_data whisky_tovsolverc nanchecker eos_base eos_ideal_fluid eos_polytrope bssn_mol admconstraints constants LocalReduce TmunuBase"
-
-TmunuBase::stress_energy_storage	=	yes
-TmunuBase::stress_energy_at_RHS		=	yes
-
-time::dtfac = 0.375
-
-admbase::evolution_method        = "adm_bssn"
-admbase::lapse_evolution_method  = "1+log"
-admbase::shift_evolution_method  = "gamma0"
-
-adm_bssn::bound           = "radiative"
-adm_bssn::harmonic_f      = 2.0
-
-ADMConstraints::constraints_persist	= yes
-admconstraints::bound     = "static"
-
-boundary::radpower        = 2
-
-SpaceMask::use_mask = "yes"
-
-grid::type            = "byrange"
-grid::domain          = "full"
-grid::xyzmin          = -30.0
-grid::xyzmax          =  30.001
-driver::ghost_size    =   3
-driver::global_nsize  =  33
-
-cactus::cctk_itlast   =       0
-
-methodoflines::ode_method        = "icn"
-
-hydrobase::timelevels             = 2
-hydrobase::evolution_method       = "whisky"
-
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::tvd_limiter               = "VanLeerMC2"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-ADMBase::initial_data  = "tov"
-ADMBase::initial_lapse = "tov"
-ADMBase::initial_shift = "tov"
-
-whiskytovsolver::TOV_Num_TOVs       = 2
-whiskytovsolver::TOV_Num_Radial     = 200000
-whiskytovsolver::TOV_Combine_Method = "maximum"
-
-whiskytovsolver::TOV_Rho_Central[0] = 0.16e-3
-whiskytovsolver::TOV_Gamma[0]       = 2.0
-whiskytovsolver::TOV_K[0]           = 100.0
-whiskytovsolver::TOV_Position_x[0]  = -15.0
-
-whiskytovsolver::TOV_Rho_Central[1] = 0.32e-3
-whiskytovsolver::TOV_Gamma[1]       = 2.0
-whiskytovsolver::TOV_K[1]           = 100.0
-whiskytovsolver::TOV_Position_x[1]  = 15.0
-
-EOS_Polytrope::eos_gamma            = 2.0
-EOS_Polytrope::eos_k                = 100.0
-
-IO::out_fileinfo="none"
-IO::out_dir			= $parfile
-
-IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-
-IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
-IOASCII::out_format      = ".10e"
-