make testsuites work with new GRHydro

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TwoPunctures/trunk@102 b2a53a04-0f4f-0410-87ed-f9f25ced00cf

4 files changed, 36 insertions, 252 deletions

diff --git a/test/bhns_eval.par b/test/bhns_eval.par
index c26e35d..14aa23b 100644
--- a/test/bhns_eval.par
+++ b/test/bhns_eval.par
@@ -4,8 +4,8 @@ ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce
 ActiveThorns = "ADMBase"
 ActiveThorns = "StaticConformal"
 ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
-ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "TmunuBase Constants SpaceMask GRHydro HydroBase"
+ActiveThorns = "TOVSolver eos_base eos_idealfluid eos_polytrope"
 ActiveThorns = "TwoPunctures"
 ActiveThorns = "coordgauge boundary"
 
@@ -63,22 +63,22 @@ TwoPunctures::TP_Tiny = 1.e-10
 
 SpaceMask::use_mask = yes
 
-whisky::whisky_stencil            = 3
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::rho_abs_min               = 1.e-10
-whisky::initial_atmosphere_factor = 0.1
-#whisky::Whisky_MaxNumSandRVars    = 0
+GRHydro::GRHydro_stencil            = 3
+GRHydro::GRHydro_eos_type           = "Polytype"
+GRHydro::GRHydro_eos_table          = "2D_Polytrope"
+GRHydro::recon_method              = "ppm"
+GRHydro::rho_abs_min               = 1.e-10
+GRHydro::initial_atmosphere_factor = 0.1
+#GRHydro::GRHydro_MaxNumSandRVars    = 0
 hydrobase::timelevels = 3
 
-Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
-Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
-Whisky_TOVSolverC::TOV_dr[0]          = 5.e-5
-Whisky_TOVSolverC::TOV_Position_x[0]  = -30
-Whisky_TOVSolverC::TOV_Rho_Central[0] = 5.e-4
-Whisky_TOVSolverC::TOV_Gamma[0]       = 2.0
-Whisky_TOVSolverC::TOV_K[0]           = 100.0
+TOVSolver::TOV_Enforce_Interpolation = "yes"
+TOVSolver::TOV_Num_Radial     = 1000000
+TOVSolver::TOV_dr[0]          = 5.e-5
+TOVSolver::TOV_Position_x[0]  = -30
+TOVSolver::TOV_Rho_Central[0] = 5.e-4
+TOVSolver::TOV_Gamma[0]       = 2.0
+TOVSolver::TOV_K[0]           = 100.0
 
 EOS_Polytrope::eos_gamma                =       2.0
 EOS_Polytrope::eos_k                    =       100.0
@@ -96,9 +96,9 @@ Carpet::init_3_timelevels         = no
 CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
 
 IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
+IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::shift"
 IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
+IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::shift"
 
 admbase::metric_type		= "physical"
 
diff --git a/test/bhns_eval/bhns_eval.par b/test/bhns_eval/bhns_eval.par
deleted file mode 100644
index c26e35d..0000000
--- a/test/bhns_eval/bhns_eval.par
+++ /dev/null
@@ -1,108 +0,0 @@
-ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase LocalReduce"
-ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce CarpetSlab CarpetIOASCII CarpetIOBasic IOUtil CarpetIOScalar CarpetIOHDF5"
-
-ActiveThorns = "ADMBase"
-ActiveThorns = "StaticConformal"
-ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
-ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
-ActiveThorns = "TwoPunctures"
-ActiveThorns = "coordgauge boundary"
-
-Carpet::init_each_timelevel 		= "no"
-InitBase::initial_data_setup_method	= "init_all_levels"
-
-Cactus::cctk_itlast = 0
-
-Time::dtfac			= 0.25
-
-CoordBase::domainsize = minmax
-
-driver::ghost_size                = 3
-
-Carpet::domain_from_coordbase = "yes"
-CoordBase::xmin = -60.0
-CoordBase::ymin =   0.0
-CoordBase::zmin =   0.0
-CoordBase::xmax =  60.0
-CoordBase::ymax =  60.0
-CoordBase::zmax =  60.0
-CoordBase::dx   =   3.0
-CoordBase::dy   =   3.0
-CoordBase::dz   =   3.0
-
-CartGrid3D::type         = "coordbase"
-CartGrid3D::domain       = "full"
-CartGrid3D::avoid_origin = "no"
-
-ADMBase::initial_data		= "twopunctures"
-ADMBase::initial_lapse  = "tov"
-ADMBase::initial_shift  = "tov"
-
-TwoPunctures::keep_u_around     = yes
-TwoPunctures::schedule_in_ADMBase_InitialData = no
-
-TwoPunctures::npoints_A         = 20
-TwoPunctures::npoints_B         = 20
-TwoPunctures::npoints_phi       = 4
-TwoPunctures::Newton_tol        = 1.e-10
-TwoPunctures::grid_setup_method = "evaluation"
-TwoPunctures::TP_Extend_Radius = 1.14
-
-TwoPunctures::par_b             =  30
-
-TwoPunctures::par_m_plus        =  5.0
-TwoPunctures::par_m_minus       =  0.0
-
-TwoPunctures::Newton_maxit       =  100
-TwoPunctures::use_sources        = 1
-TwoPunctures::do_residuum_debug_output = "no"
-TwoPunctures::do_initial_debug_output = "no"
-TwoPunctures::rescale_sources = "yes"
-TwoPunctures::TP_Tiny = 1.e-10
-
-SpaceMask::use_mask = yes
-
-whisky::whisky_stencil            = 3
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::rho_abs_min               = 1.e-10
-whisky::initial_atmosphere_factor = 0.1
-#whisky::Whisky_MaxNumSandRVars    = 0
-hydrobase::timelevels = 3
-
-Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
-Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
-Whisky_TOVSolverC::TOV_dr[0]          = 5.e-5
-Whisky_TOVSolverC::TOV_Position_x[0]  = -30
-Whisky_TOVSolverC::TOV_Rho_Central[0] = 5.e-4
-Whisky_TOVSolverC::TOV_Gamma[0]       = 2.0
-Whisky_TOVSolverC::TOV_K[0]           = 100.0
-
-EOS_Polytrope::eos_gamma                =       2.0
-EOS_Polytrope::eos_k                    =       100.0
-
-IO::out_dir			= $parfile
-IO::out_fileinfo= "axis labels"
-
-Carpet::max_refinement_levels = 10
-carpet::enable_all_storage        = no
-Carpet::prolongation_order_space  = 3
-Carpet::prolongation_order_time   = 2
-Carpet::convergence_level         = 0
-Carpet::init_3_timelevels         = no
-
-CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
-
-IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
-IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
-
-admbase::metric_type		= "physical"
-
-boundary::radpower      = 2
-
-admmacros::spatial_order    = 4
-
diff --git a/test/bhns_interp.par b/test/bhns_interp.par
index 6ce7f53..e916514 100644
--- a/test/bhns_interp.par
+++ b/test/bhns_interp.par
@@ -4,8 +4,8 @@ ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce
 ActiveThorns = "ADMBase"
 ActiveThorns = "StaticConformal"
 ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
-ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "TmunuBase Constants SpaceMask GRHydro HydroBase"
+ActiveThorns = "TOVSolver eos_base eos_idealfluid eos_polytrope"
 ActiveThorns = "TwoPunctures"
 ActiveThorns = "coordgauge boundary"
 
@@ -63,22 +63,22 @@ TwoPunctures::TP_Tiny = 1.e-10
 
 SpaceMask::use_mask = yes
 
-whisky::whisky_stencil            = 3
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::rho_abs_min               = 1.e-10
-whisky::initial_atmosphere_factor = 0.1
-#whisky::Whisky_MaxNumSandRVars    = 0
+GRHydro::GRHydro_stencil            = 3
+GRHydro::GRHydro_eos_type           = "Polytype"
+GRHydro::GRHydro_eos_table          = "2D_Polytrope"
+GRHydro::recon_method              = "ppm"
+GRHydro::rho_abs_min               = 1.e-10
+GRHydro::initial_atmosphere_factor = 0.1
+#GRHydro::GRHydro_MaxNumSandRVars    = 0
 hydrobase::timelevels = 3
 
-Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
-Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
-Whisky_TOVSolverC::TOV_dr[0]          = 5.e-5
-Whisky_TOVSolverC::TOV_Position_x[0]  = -30
-Whisky_TOVSolverC::TOV_Rho_Central[0] = 5.e-4
-Whisky_TOVSolverC::TOV_Gamma[0]       = 2.0
-Whisky_TOVSolverC::TOV_K[0]           = 100.0
+TOVSolver::TOV_Enforce_Interpolation = "yes"
+TOVSolver::TOV_Num_Radial     = 1000000
+TOVSolver::TOV_dr[0]          = 5.e-5
+TOVSolver::TOV_Position_x[0]  = -30
+TOVSolver::TOV_Rho_Central[0] = 5.e-4
+TOVSolver::TOV_Gamma[0]       = 2.0
+TOVSolver::TOV_K[0]           = 100.0
 
 EOS_Polytrope::eos_gamma                =       2.0
 EOS_Polytrope::eos_k                    =       100.0
@@ -96,9 +96,9 @@ Carpet::init_3_timelevels         = no
 CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
 
 IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
+IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::shift"
 IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
+IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::shift"
 
 admbase::metric_type		= "physical"
 
diff --git a/test/bhns_interp/bhns_interp.par b/test/bhns_interp/bhns_interp.par
deleted file mode 100644
index 6ce7f53..0000000
--- a/test/bhns_interp/bhns_interp.par
+++ /dev/null
@@ -1,108 +0,0 @@
-ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase LocalReduce"
-ActiveThorns = "Loopcontrol InitBase Carpet CarpetLib CarpetInterp CarpetReduce CarpetSlab CarpetIOASCII CarpetIOBasic IOUtil CarpetIOScalar CarpetIOHDF5"
-
-ActiveThorns = "ADMBase"
-ActiveThorns = "StaticConformal"
-ActiveThorns = "ADMCoupling ADMMacros"
-ActiveThorns = "TmunuBase Constants SpaceMask Whisky HydroBase"
-ActiveThorns = "Whisky_TOVSolverC eos_base eos_ideal_fluid eos_polytrope"
-ActiveThorns = "TwoPunctures"
-ActiveThorns = "coordgauge boundary"
-
-Carpet::init_each_timelevel 		= "no"
-InitBase::initial_data_setup_method	= "init_all_levels"
-
-Cactus::cctk_itlast = 0
-
-Time::dtfac			= 0.25
-
-CoordBase::domainsize = minmax
-
-driver::ghost_size                = 3
-
-Carpet::domain_from_coordbase = "yes"
-CoordBase::xmin = -60.0
-CoordBase::ymin =   0.0
-CoordBase::zmin =   0.0
-CoordBase::xmax =  60.0
-CoordBase::ymax =  60.0
-CoordBase::zmax =  60.0
-CoordBase::dx   =   3.0
-CoordBase::dy   =   3.0
-CoordBase::dz   =   3.0
-
-CartGrid3D::type         = "coordbase"
-CartGrid3D::domain       = "full"
-CartGrid3D::avoid_origin = "no"
-
-ADMBase::initial_data		= "twopunctures"
-ADMBase::initial_lapse  = "tov"
-ADMBase::initial_shift  = "tov"
-
-TwoPunctures::keep_u_around     = yes
-TwoPunctures::schedule_in_ADMBase_InitialData = no
-
-TwoPunctures::npoints_A         = 20
-TwoPunctures::npoints_B         = 20
-TwoPunctures::npoints_phi       = 4
-TwoPunctures::Newton_tol        = 1.e-10
-#TwoPunctures::grid_setup_method = "evaluation"
-TwoPunctures::TP_Extend_Radius = 1.14
-
-TwoPunctures::par_b             =  30
-
-TwoPunctures::par_m_plus        =  5.0
-TwoPunctures::par_m_minus       =  0.0
-
-TwoPunctures::Newton_maxit       =  100
-TwoPunctures::use_sources        = 1
-TwoPunctures::do_residuum_debug_output = "no"
-TwoPunctures::do_initial_debug_output = "no"
-TwoPunctures::rescale_sources = "yes"
-TwoPunctures::TP_Tiny = 1.e-10
-
-SpaceMask::use_mask = yes
-
-whisky::whisky_stencil            = 3
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::rho_abs_min               = 1.e-10
-whisky::initial_atmosphere_factor = 0.1
-#whisky::Whisky_MaxNumSandRVars    = 0
-hydrobase::timelevels = 3
-
-Whisky_TOVSolverC::TOV_Enforce_Interpolation = "yes"
-Whisky_TOVSolverC::TOV_Num_Radial     = 1000000
-Whisky_TOVSolverC::TOV_dr[0]          = 5.e-5
-Whisky_TOVSolverC::TOV_Position_x[0]  = -30
-Whisky_TOVSolverC::TOV_Rho_Central[0] = 5.e-4
-Whisky_TOVSolverC::TOV_Gamma[0]       = 2.0
-Whisky_TOVSolverC::TOV_K[0]           = 100.0
-
-EOS_Polytrope::eos_gamma                =       2.0
-EOS_Polytrope::eos_k                    =       100.0
-
-IO::out_dir			= $parfile
-IO::out_fileinfo= "axis labels"
-
-Carpet::max_refinement_levels = 10
-carpet::enable_all_storage        = no
-Carpet::prolongation_order_space  = 3
-Carpet::prolongation_order_time   = 2
-Carpet::convergence_level         = 0
-Carpet::init_3_timelevels         = no
-
-CarpetIOScalar::outScalar_reductions	= "minimum maximum norm1 norm2"
-
-IOScalar::outScalar_every	= 512
-IOScalar::outScalar_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
-IOASCII::out1D_every		= 512
-IOASCII::out1D_vars		= "admbase::metric admbase::curv TwoPunctures::puncture_u whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::shift"
-
-admbase::metric_type		= "physical"
-
-boundary::radpower      = 2
-
-admmacros::spatial_order    = 4
-