* modify test suite parameter files:

  * those using carpet now activate loopcontrol
  * change GRHydro::w_lorentz to HydroBase::w_lorentz



git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@222 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

8 files changed, 17 insertions, 17 deletions

diff --git a/test/GRHydro_test_shock.par b/test/GRHydro_test_shock.par
index bf8a693..6b036d1 100644
--- a/test/GRHydro_test_shock.par
+++ b/test/GRHydro_test_shock.par
@@ -28,7 +28,7 @@ IOBasic::outInfo_every 			= 	1
 IOBasic::outInfo_vars 			= 	"HydroBase::rho"
 
 IOASCII::out1D_every 			= 	1
-IOASCII::out1D_vars 			= 	"GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon"
+IOASCII::out1D_vars 			= 	"hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon"
 
 ActiveThorns = "nanchecker mol"
 
diff --git a/test/GRHydro_test_shock_ppm.par b/test/GRHydro_test_shock_ppm.par
index 5431c26..2969f7f 100644
--- a/test/GRHydro_test_shock_ppm.par
+++ b/test/GRHydro_test_shock_ppm.par
@@ -28,7 +28,7 @@ IOBasic::outInfo_every 			= 	1
 IOBasic::outInfo_vars 			= 	"HydroBase::rho"
 
 IOASCII::out1D_every 			= 	1
-IOASCII::out1D_vars 			= 	"GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon"
+IOASCII::out1D_vars 			= 	"hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon"
 
 ActiveThorns = "nanchecker mol"
 
diff --git a/test/GRHydro_test_tov_ppm.par b/test/GRHydro_test_tov_ppm.par
index f64102f..35197ce 100644
--- a/test/GRHydro_test_tov_ppm.par
+++ b/test/GRHydro_test_tov_ppm.par
@@ -74,8 +74,8 @@ IO::out_fileinfo="none"
 IO::out_dir = "GRHydro_test_tov_ppm"
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/GRHydro_test_tov_ppm_ML.par b/test/GRHydro_test_tov_ppm_ML.par
index 49f5e3c..b5e2430 100644
--- a/test/GRHydro_test_tov_ppm_ML.par
+++ b/test/GRHydro_test_tov_ppm_ML.par
@@ -1,6 +1,6 @@
 !DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope"
 
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase"
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase LoopControl"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
@@ -89,8 +89,8 @@ IO::out_fileinfo="none"
 IO::out_dir = $parfile
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par b/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par
index 88911e9..a4aaeb9 100644
--- a/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par
+++ b/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par
@@ -1,6 +1,6 @@
 !DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope"
 
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase"
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase LoopControl"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
@@ -91,8 +91,8 @@ IO::out_fileinfo="none"
 IO::out_dir = $parfile
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/GRHydro_test_tov_ppm_disable_internal_excision.par b/test/GRHydro_test_tov_ppm_disable_internal_excision.par
index 755388c..028c590 100644
--- a/test/GRHydro_test_tov_ppm_disable_internal_excision.par
+++ b/test/GRHydro_test_tov_ppm_disable_internal_excision.par
@@ -76,8 +76,8 @@ IO::out_fileinfo="none"
 IO::out_dir = $parfile
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/GRHydro_test_tov_ppm_no_trp.par b/test/GRHydro_test_tov_ppm_no_trp.par
index 4c36750..bf79ed5 100644
--- a/test/GRHydro_test_tov_ppm_no_trp.par
+++ b/test/GRHydro_test_tov_ppm_no_trp.par
@@ -75,8 +75,8 @@ IO::out_dir = "GRHydro_test_tov_ppm_no_trp"
 IO::out_fileinfo="none"
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/GRHydro_test_tov_ppm_no_trp_ML.par b/test/GRHydro_test_tov_ppm_no_trp_ML.par
index e69f78a..879c330 100644
--- a/test/GRHydro_test_tov_ppm_no_trp_ML.par
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML.par
@@ -1,6 +1,6 @@
 !DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope"
 
-ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce Tmunubase InitBase"
+ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce Tmunubase InitBase LoopControl"
 
 TmunuBase::stress_energy_storage	=	yes
 TmunuBase::stress_energy_at_RHS		=	yes
@@ -90,8 +90,8 @@ IO::out_dir = $parfile
 IO::out_fileinfo="none"
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"