User: knarf Date: 2010/04/22 04:49 PM
Modified: /trunk/ schedule.ccl /trunk/test/ whisky_test_shock.par, whisky_test_shock_ppm.par, whisky_test_tov_ppm.par, whisky_test_tov_ppm_eosg.par, whisky_test_tov_ppm_no_trp.par
Log: thorn renaming, remove duplicate calls, fix scheduling of SetTmunu
File Changes:
Directory: /trunk/test/ =======================
File [modified]: whisky_test_shock.par Delta lines: +6 -6 =================================================================== --- trunk/test/whisky_test_shock.par 2010-04-22 15:12:10 UTC (rev 107) +++ trunk/test/whisky_test_shock.par 2010-04-22 21:49:02 UTC (rev 108) @@ -47,11 +47,11 @@ ADMBase::metric_type = "physical" SpaceMask::use_mask = "yes"
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope" +ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma = 1.66666666666666 +EOS_IdealFluid::eos_ideal_fluid_gamma = 1.66666666666666
-ActiveThorns = "hydrobase whisky initbase" +ActiveThorns = "hydrobase grhydro initbase"
hydrobase::timelevels = 2 hydrobase::evolution_method = "whisky" @@ -64,8 +64,8 @@ whisky::tvd_limiter = "minmod" whisky::bound = "flat"
-ActiveThorns = "whisky_init_data" +ActiveThorns = "grhydro_initdata"
hydrobase::initial_hydro = "shocktube" -whisky_init_data::shocktube_type = "diagshock" -whisky_init_data::shock_case = "Simple" +grhydro_initdata::shocktube_type = "diagshock" +grhydro_initdata::shock_case = "Simple"
File [modified]: whisky_test_shock_ppm.par Delta lines: +6 -6 =================================================================== --- trunk/test/whisky_test_shock_ppm.par 2010-04-22 15:12:10 UTC (rev 107) +++ trunk/test/whisky_test_shock_ppm.par 2010-04-22 21:49:02 UTC (rev 108) @@ -47,11 +47,11 @@ ADMBase::metric_type = "physical" SpaceMask::use_mask = "yes"
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope" +ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma = 1.66666666666666 +EOS_IdealFluid::eos_ideal_fluid_gamma = 1.66666666666666
-ActiveThorns = "hydrobase whisky initbase" +ActiveThorns = "hydrobase grhydro initbase"
hydrobase::timelevels = 2 hydrobase::evolution_method = "whisky" @@ -63,8 +63,8 @@ whisky::recon_method = "ppm" whisky::bound = "flat"
-ActiveThorns = "whisky_init_data" +ActiveThorns = "grhydro_initdata"
hydrobase::initial_hydro = "shocktube" -whisky_init_data::shocktube_type = "diagshock" -whisky_init_data::shock_case = "Simple" +grhydro_initdata::shocktube_type = "diagshock" +grhydro_initdata::shock_case = "Simple"
File [modified]: whisky_test_tov_ppm.par Delta lines: +5 -5 =================================================================== --- trunk/test/whisky_test_tov_ppm.par 2010-04-22 15:12:10 UTC (rev 107) +++ trunk/test/whisky_test_tov_ppm.par 2010-04-22 21:49:02 UTC (rev 108) @@ -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 whisky whisky_init_data whisky_tovsolverc nanchecker eos_base eos_ideal_fluid eos_polytrope bssn_mol 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_base eos_idealfluid eos_polytrope bssn_mol admconstraints Constants localreduce Tmunubase InitBase"
TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -58,10 +58,10 @@ 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" +tovsolver::TOV_Rho_Central[0] = 1.28e-3 +tovsolver::TOV_Gamma[0] = 2.0 +tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Combine_Method = "maximum"
EOS_Polytrope::eos_gamma = 2.0 EOS_Polytrope::eos_k = 100.0
File [modified]: whisky_test_tov_ppm_eosg.par Delta lines: +5 -5 =================================================================== --- trunk/test/whisky_test_tov_ppm_eosg.par 2010-04-22 15:12:10 UTC (rev 107) +++ trunk/test/whisky_test_tov_ppm_eosg.par 2010-04-22 21:49:02 UTC (rev 108) @@ -1,6 +1,6 @@ !DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope, EOSG"
-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 eosg_base eos_base eos_polytrope eosg_polytrope bssn_mol 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 eosg_base eos_base eos_polytrope eosg_polytrope bssn_mol admconstraints Constants localreduce Tmunubase InitBase"
TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -60,10 +60,10 @@ 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" +tovsolver::TOV_Rho_Central[0] = 1.28e-3 +tovsolver::TOV_Gamma[0] = 2.0 +tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Combine_Method = "maximum"
EOSG_Polytrope::eos_gamma = 2.0 EOSG_Polytrope::eos_k = 100.0
File [modified]: whisky_test_tov_ppm_no_trp.par Delta lines: +5 -5 =================================================================== --- trunk/test/whisky_test_tov_ppm_no_trp.par 2010-04-22 15:12:10 UTC (rev 107) +++ trunk/test/whisky_test_tov_ppm_no_trp.par 2010-04-22 21:49:02 UTC (rev 108) @@ -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 whisky whisky_init_data whisky_tovsolverc nanchecker eos_base eos_ideal_fluid eos_polytrope bssn_mol 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_base eos_idealfluid eos_polytrope bssn_mol admconstraints Constants localreduce Tmunubase InitBase"
TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -59,10 +59,10 @@ 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" +tovsolver::TOV_Rho_Central[0] = 1.28e-3 +tovsolver::TOV_Gamma[0] = 2.0 +tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Combine_Method = "maximum"
EOS_Polytrope::eos_gamma = 2.0 EOS_Polytrope::eos_k = 100.0
Directory: /trunk/ ==================
File [modified]: schedule.ccl Delta lines: +2 -6 =================================================================== --- trunk/schedule.ccl 2010-04-22 15:12:10 UTC (rev 107) +++ trunk/schedule.ccl 2010-04-22 21:49:02 UTC (rev 108) @@ -61,7 +61,7 @@
# leave this here for compatibility with older code, should not be used anymore # and go out at some point -schedule group Whisky_Initial IN HydroBase_Initial +schedule group Whisky_Initial IN HydroBase_Initial BEFORE SetTmunu { } "Whisky initial data group"
@@ -902,14 +902,10 @@
#the following is necessary because TmunuBase does not have enough schedule
-schedule GROUP SetTmunu AT POSTRESTRICTINITIAL AFTER HydroBase_Con2Prim BEFORE ADMConstraintsGroup +schedule GROUP SetTmunu AT POSTPOSTINITIAL AFTER Con2Prim BEFORE ADMConstraintsGroup { } "Calculate the stress-energy tensor"
-schedule GROUP SetTmunu AT POSTPOSTINITIAL AFTER HydroBase_Con2Prim BEFORE ADMConstraintsGroup -{ -} "Calculate the stress-energy tensor" - schedule GROUP SetTmunu AT POST_RECOVER_VARIABLES { } "Calculate the stress-energy tensor"