Commits May 2010

commits@lists.einsteintoolkit.org

12 participants
48 discussions

[svn:einsteintoolkit] GRHydro/trunk/test/ (Rev. 114)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 10:59 PM Modified: /trunk/test/ GRHydro_test_tov_ppm_eosg_ML.par Log: testsuite Whisky parameter renamed to GRHydro. File Changes: Directory: /trunk/test/ ======================= File [modified]: GRHydro_test_tov_ppm_eosg_ML.par Delta lines: +20 -20 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_eosg_ML.par 2010-05-03 03:03:13 UTC (rev 113) +++ trunk/test/GRHydro_test_tov_ppm_eosg_ML.par 2010-05-03 03:59:34 UTC (rev 114) @@ -10,7 +10,7 @@ time::dtfac = 0.375 hydrobase::timelevels = 2 -hydrobase::evolution_method = "whisky" +hydrobase::evolution_method = "GRHydro" admbase::evolution_method = "ml_bssn_o2" ADMBase::lapse_evolution_method = "ML_BSSN_O2" @@ -53,24 +53,24 @@ methodoflines::ode_method = "icn" -whisky::riemann_solver = "Marquina" -whisky::whisky_eos_type = "Polytype" -whisky::whisky_eos_table = "2D_Polytrope" -whisky::use_eosgeneral = "yes" -whisky::eosgeneral_name = "Polytrope" -whisky::recon_method = "ppm" -whisky::whisky_stencil = 3 -whisky::bound = "none" -whisky::rho_abs_min = 1.e-7 -whisky::initial_atmosphere_factor = 0.999 +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::use_eosgeneral = "yes" +GRHydro::eosgeneral_name = "Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 -whisky::ppm_detect = "no" -whisky::ppm_epsilon = 0.0 -whisky::ppm_omega1 = 0.52 -whisky::ppm_omega2 = 0.0 -whisky::ppm_epsilon_shock = 0.1 -whisky::ppm_eta1 = 5.0 -whisky::ppm_k0 = 0.2 +GRHydro::ppm_detect = "no" +GRHydro::ppm_epsilon = 0.0 +GRHydro::ppm_omega1 = 0.52 +GRHydro::ppm_omega2 = 0.0 +GRHydro::ppm_epsilon_shock = 0.1 +GRHydro::ppm_eta1 = 5.0 +GRHydro::ppm_k0 = 0.2 ADMBase::initial_data = "tov" ADMBase::initial_lapse = "tov" @@ -91,8 +91,8 @@ 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" +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" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admconstraints::ham admconstraints::momentum" +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::out_format = ".10e"

1 0

[svn:einsteintoolkit] TOVSolver/trunk/test/ (Rev. 110)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 10:53 PM Modified: /trunk/test/ test_one_boost_max.par, test_one_static_max.par, test_tov_carpet.par, test_two_av.par, test_two_max.par Log: testsuite Whisky parameters renamed to GRHydro File Changes: Directory: /trunk/test/ ======================= File [modified]: test_one_boost_max.par Delta lines: +12 -12 =================================================================== --- trunk/test/test_one_boost_max.par 2010-05-03 03:06:10 UTC (rev 109) +++ trunk/test/test_one_boost_max.par 2010-05-03 03:53:11 UTC (rev 110) @@ -24,17 +24,17 @@ methodoflines::ode_method = "icn" hydrobase::timelevels = 2 -hydrobase::evolution_method = "whisky" +hydrobase::evolution_method = "GRHydro" -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 +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::tvd_limiter = "VanLeerMC2" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 ADMBase::initial_data = "tov" ADMBase::initial_lapse = "tov" @@ -55,8 +55,8 @@ 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" +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" 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::out1D_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" IOASCII::out_format = ".10e" File [modified]: test_one_static_max.par Delta lines: +12 -12 =================================================================== --- trunk/test/test_one_static_max.par 2010-05-03 03:06:10 UTC (rev 109) +++ trunk/test/test_one_static_max.par 2010-05-03 03:53:11 UTC (rev 110) @@ -24,17 +24,17 @@ methodoflines::ode_method = "icn" hydrobase::timelevels = 2 -hydrobase::evolution_method = "whisky" +hydrobase::evolution_method = "GRHydro" -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 +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::tvd_limiter = "VanLeerMC2" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 ADMBase::initial_data = "tov" ADMBase::initial_lapse = "tov" @@ -53,8 +53,8 @@ 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" +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" 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::out1D_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" IOASCII::out_format = ".10e" File [modified]: test_tov_carpet.par Delta lines: +11 -11 =================================================================== --- trunk/test/test_tov_carpet.par 2010-05-03 03:06:10 UTC (rev 109) +++ trunk/test/test_tov_carpet.par 2010-05-03 03:53:11 UTC (rev 110) @@ -35,17 +35,17 @@ methodoflines::ode_method = "icn" hydrobase::timelevels = 2 -hydrobase::evolution_method = "whisky" +hydrobase::evolution_method = "GRHydro" -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 +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::tvd_limiter = "VanLeerMC2" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 ADMBase::initial_data = "tov" ADMBase::initial_lapse = "tov" @@ -66,5 +66,5 @@ 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_vars = "hydrobase::rho hydrobase::press hydrobase::eps hydrobase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum GRHydro::w_lorentz" IOScalar::outScalar_reductions = "minimum maximum norm1 norm2" File [modified]: test_two_av.par Delta lines: +12 -12 =================================================================== --- trunk/test/test_two_av.par 2010-05-03 03:06:10 UTC (rev 109) +++ trunk/test/test_two_av.par 2010-05-03 03:53:11 UTC (rev 110) @@ -24,17 +24,17 @@ methodoflines::ode_method = "icn" hydrobase::timelevels = 2 -hydrobase::evolution_method = "whisky" +hydrobase::evolution_method = "GRHydro" -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 +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::tvd_limiter = "VanLeerMC2" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 ADMBase::initial_data = "tov" ADMBase::initial_lapse = "tov" @@ -61,9 +61,9 @@ 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" +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" 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::out1D_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" IOASCII::out_format = ".10e" File [modified]: test_two_max.par Delta lines: +12 -12 =================================================================== --- trunk/test/test_two_max.par 2010-05-03 03:06:10 UTC (rev 109) +++ trunk/test/test_two_max.par 2010-05-03 03:53:11 UTC (rev 110) @@ -24,17 +24,17 @@ methodoflines::ode_method = "icn" hydrobase::timelevels = 2 -hydrobase::evolution_method = "whisky" +hydrobase::evolution_method = "GRHydro" -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 +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::tvd_limiter = "VanLeerMC2" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 ADMBase::initial_data = "tov" ADMBase::initial_lapse = "tov" @@ -61,9 +61,9 @@ 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" +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" 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::out1D_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" IOASCII::out_format = ".10e"

1 0

[svn:einsteintoolkit] Hydro_InitExcision/trunk/test/ (Rev. 107)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 10:47 PM Modified: /trunk/test/ diag_flip_pugh_eno.par, diag_flip_pugh_ppm.par, diag_flip_pugh_tvd.par, diag_pugh_eno.par, diag_pugh_ppm.par, diag_pugh_tvd.par, halfsphere_pugh_eno.par, halfsphere_pugh_ppm.par, halfsphere_pugh_tvd.par, sphere_pugh_eno.par, sphere_pugh_ppm.par, sphere_pugh_tvd.par, x_flip_pugh_eno.par, x_flip_pugh_ppm.par, x_flip_pugh_tvd.par, x_pugh_eno.par, x_pugh_ppm.par, x_pugh_tvd.par Log: Whisky parameters in test suites renamed to GRHydro. sphere_pugh_eno.par and halfsphere_pugh_eno.par present "substantial" differences to their repo counterparts. The same "substantial" differences were also encountered before renaming. File Changes: Directory: /trunk/test/ ======================= File [modified]: diag_flip_pugh_eno.par Delta lines: <Unavailable> File [modified]: diag_flip_pugh_ppm.par Delta lines: <Unavailable> File [modified]: diag_flip_pugh_tvd.par Delta lines: <Unavailable> File [modified]: diag_pugh_eno.par Delta lines: <Unavailable> File [modified]: diag_pugh_ppm.par Delta lines: <Unavailable> File [modified]: diag_pugh_tvd.par Delta lines: <Unavailable> File [modified]: halfsphere_pugh_eno.par Delta lines: <Unavailable> File [modified]: halfsphere_pugh_ppm.par Delta lines: <Unavailable> File [modified]: halfsphere_pugh_tvd.par Delta lines: <Unavailable> File [modified]: sphere_pugh_eno.par Delta lines: <Unavailable> File [modified]: sphere_pugh_ppm.par Delta lines: <Unavailable> File [modified]: sphere_pugh_tvd.par Delta lines: <Unavailable> File [modified]: x_flip_pugh_eno.par Delta lines: <Unavailable> File [modified]: x_flip_pugh_ppm.par Delta lines: <Unavailable> File [modified]: x_flip_pugh_tvd.par Delta lines: <Unavailable> File [modified]: x_pugh_eno.par Delta lines: <Unavailable> File [modified]: x_pugh_ppm.par Delta lines: <Unavailable> File [modified]: x_pugh_tvd.par Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] TOVSolver/trunk/ (Rev. 109)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 10:06 PM Modified: /trunk/ configuration.ccl, interface.ccl, param.ccl, schedule.ccl /trunk/doc/ documentation.tex /trunk/src/ external.inc, tov.c Log: file/parameter string replacement from whisky to GRHydro File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: +1 -1 =================================================================== --- trunk/doc/documentation.tex 2010-04-28 20:30:56 UTC (rev 108) +++ trunk/doc/documentation.tex 2010-05-03 03:06:10 UTC (rev 109) @@ -332,7 +332,7 @@ scalar field code) all use the {\tt CalcTmunu} interface. You also have the possibility to use a parameter -{\tt whiskytovsolver::TOV\_Separation} to obtain a spacetime consisting +{\tt GRHydrotovsolver::TOV\_Separation} to obtain a spacetime consisting of one TOV-system for $x>0$ and a second (similar) for $x<0$. This parameter sets the separation of the centers of two neutron stars, has to be positive and should be larger than twice the radius of one star.\\ Directory: /trunk/src/ ====================== File [modified]: external.inc Delta lines: +19 -19 =================================================================== --- trunk/src/external.inc 2010-04-28 20:30:56 UTC (rev 108) +++ trunk/src/external.inc 2010-05-03 03:06:10 UTC (rev 109) @@ -372,45 +372,45 @@ CCTK_INFO("Rescaling Sources"); - /* get Whisky variables */ + /* get GRHydro variables */ rho =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::rho"); press =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::press"); eps =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::eps"); - dens =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::dens"); - tau =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::tau"); - w_lorentz=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::w_lorentz"); + dens =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::dens"); + tau =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::tau"); + w_lorentz=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::w_lorentz"); vel0 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::vel[0]"); vel1 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::vel[1]"); vel2 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "HydroBase::vel[2]"); - scon0 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::scon[0]"); - scon1 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::scon[1]"); - scon2 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "Whisky::scon[2]"); + scon0 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::scon[0]"); + scon1 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::scon[1]"); + scon2 =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 0, "GRHydro::scon[2]"); rho_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::rho"); press_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::press"); eps_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::eps"); - dens_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::dens"); - tau_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::tau"); - w_lorentz_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::w_lorentz"); + dens_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::dens"); + tau_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::tau"); + w_lorentz_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::w_lorentz"); vel0_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::vel[0]"); vel1_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::vel[1]"); vel2_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "HydroBase::vel[2]"); - scon0_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::scon[0]"); - scon1_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::scon[1]"); - scon2_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "Whisky::scon[2]"); + scon0_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::scon[0]"); + scon1_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::scon[1]"); + scon2_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 1, "GRHydro::scon[2]"); rho_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::rho"); press_p_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::press"); eps_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::eps"); - dens_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::dens"); - tau_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::tau"); - w_lorentz_p_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::w_lorentz"); + dens_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::dens"); + tau_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::tau"); + w_lorentz_p_p=(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::w_lorentz"); vel0_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::vel[0]"); vel1_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::vel[1]"); vel2_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "HydroBase::vel[2]"); - scon0_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::scon[0]"); - scon1_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::scon[1]"); - scon2_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "Whisky::scon[2]"); + scon0_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::scon[0]"); + scon1_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::scon[1]"); + scon2_p_p =(CCTK_REAL*)CCTK_VarDataPtr(cctkGH, 2, "GRHydro::scon[2]"); /* get u */ u=calloc(size, sizeof(CCTK_REAL)); File [modified]: tov.c Delta lines: +2 -2 =================================================================== --- trunk/src/tov.c 2010-04-28 20:30:56 UTC (rev 108) +++ trunk/src/tov.c 2010-05-03 03:06:10 UTC (rev 109) @@ -219,8 +219,8 @@ star_i = star * TOV_Num_Radial; /* check for parameters */ - if ((TOV_Rho_Central[star]==0.0) && (whisky_rho_central>0.0)) - rho_central=whisky_rho_central; + if ((TOV_Rho_Central[star]==0.0) && (GRHydro_rho_central>0.0)) + rho_central=GRHydro_rho_central; else rho_central=TOV_Rho_Central[star]; Directory: /trunk/ ================== File [modified]: configuration.ccl Delta lines: +1 -1 =================================================================== --- trunk/configuration.ccl 2010-04-28 20:30:56 UTC (rev 108) +++ trunk/configuration.ccl 2010-05-03 03:06:10 UTC (rev 109) @@ -1,4 +1,4 @@ -# Configuration definition for thorn Whisky +# Configuration definition for thorn GRHydro REQUIRES THORNS: Boundary CartGrid3D SpaceMask File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2010-04-28 20:30:56 UTC (rev 108) +++ trunk/interface.ccl 2010-05-03 03:06:10 UTC (rev 109) @@ -1,7 +1,7 @@ # Interface definition for thorn TOVSolver implements: TOVSolver -inherits: Whisky, Constants +inherits: GRHydro, Constants USES INCLUDE: constants.h File [modified]: param.ccl Delta lines: +2 -2 =================================================================== --- trunk/param.ccl 2010-04-28 20:30:56 UTC (rev 108) +++ trunk/param.ccl 2010-05-03 03:06:10 UTC (rev 109) @@ -158,12 +158,12 @@ USES KEYWORD conformal_storage -shares:Whisky +shares:GRHydro USES real rho_abs_min USES real rho_rel_min USES REAL initial_rho_abs_min USES REAL initial_rho_rel_min USES REAL initial_atmosphere_factor -USES real whisky_rho_central +USES real GRHydro_rho_central File [modified]: schedule.ccl Delta lines: +1 -1 =================================================================== --- trunk/schedule.ccl 2010-04-28 20:30:56 UTC (rev 108) +++ trunk/schedule.ccl 2010-05-03 03:06:10 UTC (rev 109) @@ -75,7 +75,7 @@ { LANG: C } "prepare for fake evolution" - schedule TOV_C_Exact IN MoL_PostStep AFTER Whisky_PostStep + schedule TOV_C_Exact IN MoL_PostStep AFTER GRHydro_PostStep { LANG: C } "use fake evolution"

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 106)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 10:04 PM Added: /trunk/src/ GRHydro_C2P2C.F90, GRHydro_Con2Prim.F90, GRHydro_Only_Atmo.F90, GRHydro_ReadConformalData.F90, GRHydro_ReconstructTest.F90, GRHydro_ShockTube.F90, GRHydro_SimpleWave.F90, GRHydro_TOV.F90 Removed: /trunk/src/ Whisky_C2P2C.F90, Whisky_Con2Prim.F90, Whisky_Only_Atmo.F90, Whisky_ReadConformalData.F90, Whisky_ReconstructTest.F90, Whisky_ShockTube.F90, Whisky_SimpleWave.F90, Whisky_TOV.F90 Modified: /trunk/ README, interface.ccl, param.ccl, schedule.ccl /trunk/doc/ documentation.tex /trunk/src/ CheckParam.c, make.code.defn, tov_fcn.F Log: file/parameter string replacement from whisky to GRHydro File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: <Unavailable> Directory: /trunk/src/ ====================== File [modified]: CheckParam.c Delta lines: <Unavailable> File [added]: GRHydro_C2P2C.F90 Delta lines: <Unavailable> File [added]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [added]: GRHydro_Only_Atmo.F90 Delta lines: <Unavailable> File [added]: GRHydro_ReadConformalData.F90 Delta lines: <Unavailable> File [added]: GRHydro_ReconstructTest.F90 Delta lines: <Unavailable> File [added]: GRHydro_ShockTube.F90 Delta lines: <Unavailable> File [added]: GRHydro_SimpleWave.F90 Delta lines: <Unavailable> File [added]: GRHydro_TOV.F90 Delta lines: <Unavailable> File [removed]: Whisky_C2P2C.F90 Delta lines: <Unavailable> File [removed]: Whisky_Con2Prim.F90 Delta lines: <Unavailable> File [removed]: Whisky_Only_Atmo.F90 Delta lines: <Unavailable> File [removed]: Whisky_ReadConformalData.F90 Delta lines: <Unavailable> File [removed]: Whisky_ReconstructTest.F90 Delta lines: <Unavailable> File [removed]: Whisky_ShockTube.F90 Delta lines: <Unavailable> File [removed]: Whisky_SimpleWave.F90 Delta lines: <Unavailable> File [removed]: Whisky_TOV.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> File [modified]: tov_fcn.F Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: README Delta lines: <Unavailable> File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/test/ (Rev. 113)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 10:03 PM Added: /trunk/test/ GRHydro_test_shock.par, GRHydro_test_shock_ppm.par, GRHydro_test_tov_ppm.par, GRHydro_test_tov_ppm_ML.par, GRHydro_test_tov_ppm_eosg.par, GRHydro_test_tov_ppm_eosg_ML.par, GRHydro_test_tov_ppm_no_trp.par, GRHydro_test_tov_ppm_no_trp_ML.par Removed: /trunk/test/ GRHydrotest_shock.par, GRHydrotest_shock_ppm.par, GRHydrotest_tov_ppm.par, GRHydrotest_tov_ppm_ML.par, GRHydrotest_tov_ppm_eosg.par, GRHydrotest_tov_ppm_eosg_ML.par, GRHydrotest_tov_ppm_no_trp.par, GRHydrotest_tov_ppm_no_trp_ML.par Log: testsuite parameter files correctly renamed File Changes: Directory: /trunk/test/ ======================= File [added]: GRHydro_test_shock.par Delta lines: <Unavailable> File [added]: GRHydro_test_shock_ppm.par Delta lines: <Unavailable> File [added]: GRHydro_test_tov_ppm.par Delta lines: <Unavailable> File [added]: GRHydro_test_tov_ppm_ML.par Delta lines: <Unavailable> File [added]: GRHydro_test_tov_ppm_eosg.par Delta lines: <Unavailable> File [added]: GRHydro_test_tov_ppm_eosg_ML.par Delta lines: <Unavailable> File [added]: GRHydro_test_tov_ppm_no_trp.par Delta lines: <Unavailable> File [added]: GRHydro_test_tov_ppm_no_trp_ML.par Delta lines: <Unavailable> File [removed]: GRHydrotest_shock.par Delta lines: <Unavailable> File [removed]: GRHydrotest_shock_ppm.par Delta lines: <Unavailable> File [removed]: GRHydrotest_tov_ppm.par Delta lines: <Unavailable> File [removed]: GRHydrotest_tov_ppm_ML.par Delta lines: <Unavailable> File [removed]: GRHydrotest_tov_ppm_eosg.par Delta lines: <Unavailable> File [removed]: GRHydrotest_tov_ppm_eosg_ML.par Delta lines: <Unavailable> File [removed]: GRHydrotest_tov_ppm_no_trp.par Delta lines: <Unavailable> File [removed]: GRHydrotest_tov_ppm_no_trp_ML.par Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 112)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 03:59 PM Added: /trunk/par/ GRHydro.par, GRHydro.th /trunk/src/ GRHydro_Boundaries.F90, GRHydro_CalcUpdate.F90, GRHydro_CarpetWeights.cc, GRHydro_Con2Prim.F90, GRHydro_Differences.F90, GRHydro_ENOReconstruct.F90, GRHydro_ENOScalars.F90, GRHydro_EOS.c, GRHydro_Eigenproblem.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_EoSChangeGamma.F90, GRHydro_Flux.F90, GRHydro_FluxSplit.F90, GRHydro_HLLE.F90, GRHydro_HLLEPoly.F90, GRHydro_Loop.F90, GRHydro_Marquina.F90, GRHydro_Minima.F90, GRHydro_Minima.cc, GRHydro_PPM.F90, GRHydro_ParamCheck.F90, GRHydro_Particle.F90, GRHydro_PreLoop.F90, GRHydro_Prim2Con.F90, GRHydro_Reconstruct.F90, GRHydro_ReconstructPoly.F90, GRHydro_RegisterGZ.cc, GRHydro_RegisterMask.c, GRHydro_RegisterVars.cc, GRHydro_RiemannSolve.F90, GRHydro_RoeAverage.F90, GRHydro_RoeSolver.F90, GRHydro_Scalars.F90, GRHydro_Set_TP_GF.c, GRHydro_Shift.F90, GRHydro_SlopeLimiter.F90, GRHydro_Source.F90, GRHydro_Startup.F90, GRHydro_TVDReconstruct.F90, GRHydro_Tmunu.F90, GRHydro_UpdateMask.F90, GRHydro_Weights.c /trunk/src/include/ GRHydro_EMTensor.inc, GRHydro_EMTensor_temps.inc /trunk/test/ GRHydrotest_shock.par, GRHydrotest_shock_ppm.par, GRHydrotest_tov_ppm.par, GRHydrotest_tov_ppm_ML.par, GRHydrotest_tov_ppm_eosg.par, GRHydrotest_tov_ppm_eosg_ML.par, GRHydrotest_tov_ppm_no_trp.par, GRHydrotest_tov_ppm_no_trp_ML.par /trunk/test/GRHydro_test_shock/ /trunk/test/GRHydro_test_shock_ppm/ /trunk/test/GRHydro_test_tov_ppm/ /trunk/test/GRHydro_test_tov_ppm_ML/ /trunk/test/GRHydro_test_tov_ppm_eosg/ /trunk/test/GRHydro_test_tov_ppm_eosg_ML/ /trunk/test/GRHydro_test_tov_ppm_no_trp/ /trunk/test/GRHydro_test_tov_ppm_no_trp_ML/ Removed: /trunk/par/ Whisky.th, whisky.par /trunk/src/ Whisky_Boundaries.F90, Whisky_CalcUpdate.F90, Whisky_CarpetWeights.cc, Whisky_Con2Prim.F90, Whisky_Differences.F90, Whisky_ENOReconstruct.F90, Whisky_ENOScalars.F90, Whisky_EOS.c, Whisky_Eigenproblem.F90, Whisky_Eigenproblem_Marquina.F90, Whisky_EoSChangeGamma.F90, Whisky_Flux.F90, Whisky_FluxSplit.F90, Whisky_HLLE.F90, Whisky_HLLEPoly.F90, Whisky_Loop.F90, Whisky_Marquina.F90, Whisky_Minima.F90, Whisky_Minima.cc, Whisky_PPM.F90, Whisky_ParamCheck.F90, Whisky_Particle.F90, Whisky_PreLoop.F90, Whisky_Prim2Con.F90, Whisky_Reconstruct.F90, Whisky_ReconstructPoly.F90, Whisky_RegisterGZ.cc, Whisky_RegisterMask.c, Whisky_RegisterVars.cc, Whisky_RiemannSolve.F90, Whisky_RoeAverage.F90, Whisky_RoeSolver.F90, Whisky_Scalars.F90, Whisky_Set_TP_GF.c, Whisky_Shift.F90, Whisky_SlopeLimiter.F90, Whisky_Source.F90, Whisky_Startup.F90, Whisky_TVDReconstruct.F90, Whisky_Tmunu.F90, Whisky_UpdateMask.F90, Whisky_Weights.c /trunk/src/include/ Whisky_EMTensor.inc, Whisky_EMTensor_temps.inc /trunk/test/ whisky_test_shock.par, whisky_test_shock_ppm.par, whisky_test_tov_ppm.par, whisky_test_tov_ppm_ML.par, whisky_test_tov_ppm_eosg.par, whisky_test_tov_ppm_eosg_ML.par, whisky_test_tov_ppm_no_trp.par, whisky_test_tov_ppm_no_trp_ML.par /trunk/test/whisky_test_shock/ /trunk/test/whisky_test_shock_ppm/ /trunk/test/whisky_test_tov_ppm/ /trunk/test/whisky_test_tov_ppm_ML/ /trunk/test/whisky_test_tov_ppm_eosg/ /trunk/test/whisky_test_tov_ppm_eosg_ML/ /trunk/test/whisky_test_tov_ppm_no_trp/ /trunk/test/whisky_test_tov_ppm_no_trp_ML/ Modified: /trunk/ README, configuration.ccl, interface.ccl, param.ccl, schedule.ccl /trunk/doc/ documentation.tex /trunk/par/ BenchRNS_Carpet_3level.par /trunk/src/ Utils.F90, make.code.defn, make.code.deps, make.configuration.defn, make.configuration.deps Log: file/parameter string replacement from whisky to GRHydro File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: <Unavailable> Directory: /trunk/src/include/ ============================== File [added]: GRHydro_EMTensor.inc Delta lines: <Unavailable> File [added]: GRHydro_EMTensor_temps.inc Delta lines: <Unavailable> File [removed]: Whisky_EMTensor.inc Delta lines: <Unavailable> File [removed]: Whisky_EMTensor_temps.inc Delta lines: <Unavailable> Directory: /trunk/par/ ====================== File [modified]: BenchRNS_Carpet_3level.par Delta lines: <Unavailable> File [added]: GRHydro.par Delta lines: <Unavailable> File [added]: GRHydro.th Delta lines: <Unavailable> File [removed]: Whisky.th Delta lines: <Unavailable> File [removed]: whisky.par Delta lines: <Unavailable> Directory: /trunk/src/ ====================== File [added]: GRHydro_Boundaries.F90 Delta lines: <Unavailable> File [added]: GRHydro_CalcUpdate.F90 Delta lines: <Unavailable> File [added]: GRHydro_CarpetWeights.cc Delta lines: <Unavailable> File [added]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [added]: GRHydro_Differences.F90 Delta lines: <Unavailable> File [added]: GRHydro_ENOReconstruct.F90 Delta lines: <Unavailable> File [added]: GRHydro_ENOScalars.F90 Delta lines: <Unavailable> File [added]: GRHydro_EOS.c Delta lines: <Unavailable> File [added]: GRHydro_Eigenproblem.F90 Delta lines: <Unavailable> File [added]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: <Unavailable> File [added]: GRHydro_EoSChangeGamma.F90 Delta lines: <Unavailable> File [added]: GRHydro_Flux.F90 Delta lines: <Unavailable> File [added]: GRHydro_FluxSplit.F90 Delta lines: <Unavailable> File [added]: GRHydro_HLLE.F90 Delta lines: <Unavailable> File [added]: GRHydro_HLLEPoly.F90 Delta lines: <Unavailable> File [added]: GRHydro_Loop.F90 Delta lines: <Unavailable> File [added]: GRHydro_Marquina.F90 Delta lines: <Unavailable> File [added]: GRHydro_Minima.F90 Delta lines: <Unavailable> File [added]: GRHydro_Minima.cc Delta lines: <Unavailable> File [added]: GRHydro_PPM.F90 Delta lines: <Unavailable> File [added]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> File [added]: GRHydro_Particle.F90 Delta lines: <Unavailable> File [added]: GRHydro_PreLoop.F90 Delta lines: <Unavailable> File [added]: GRHydro_Prim2Con.F90 Delta lines: <Unavailable> File [added]: GRHydro_Reconstruct.F90 Delta lines: <Unavailable> File [added]: GRHydro_ReconstructPoly.F90 Delta lines: <Unavailable> File [added]: GRHydro_RegisterGZ.cc Delta lines: <Unavailable> File [added]: GRHydro_RegisterMask.c Delta lines: <Unavailable> File [added]: GRHydro_RegisterVars.cc Delta lines: <Unavailable> File [added]: GRHydro_RiemannSolve.F90 Delta lines: <Unavailable> File [added]: GRHydro_RoeAverage.F90 Delta lines: <Unavailable> File [added]: GRHydro_RoeSolver.F90 Delta lines: <Unavailable> File [added]: GRHydro_Scalars.F90 Delta lines: <Unavailable> File [added]: GRHydro_Set_TP_GF.c Delta lines: <Unavailable> File [added]: GRHydro_Shift.F90 Delta lines: <Unavailable> File [added]: GRHydro_SlopeLimiter.F90 Delta lines: <Unavailable> File [added]: GRHydro_Source.F90 Delta lines: <Unavailable> File [added]: GRHydro_Startup.F90 Delta lines: <Unavailable> File [added]: GRHydro_TVDReconstruct.F90 Delta lines: <Unavailable> File [added]: GRHydro_Tmunu.F90 Delta lines: <Unavailable> File [added]: GRHydro_UpdateMask.F90 Delta lines: <Unavailable> File [added]: GRHydro_Weights.c Delta lines: <Unavailable> File [modified]: Utils.F90 Delta lines: <Unavailable> File [removed]: Whisky_Boundaries.F90 Delta lines: <Unavailable> File [removed]: Whisky_CalcUpdate.F90 Delta lines: <Unavailable> File [removed]: Whisky_CarpetWeights.cc Delta lines: <Unavailable> File [removed]: Whisky_Con2Prim.F90 Delta lines: <Unavailable> File [removed]: Whisky_Differences.F90 Delta lines: <Unavailable> File [removed]: Whisky_ENOReconstruct.F90 Delta lines: <Unavailable> File [removed]: Whisky_ENOScalars.F90 Delta lines: <Unavailable> File [removed]: Whisky_EOS.c Delta lines: <Unavailable> File [removed]: Whisky_Eigenproblem.F90 Delta lines: <Unavailable> File [removed]: Whisky_Eigenproblem_Marquina.F90 Delta lines: <Unavailable> File [removed]: Whisky_EoSChangeGamma.F90 Delta lines: <Unavailable> File [removed]: Whisky_Flux.F90 Delta lines: <Unavailable> File [removed]: Whisky_FluxSplit.F90 Delta lines: <Unavailable> File [removed]: Whisky_HLLE.F90 Delta lines: <Unavailable> File [removed]: Whisky_HLLEPoly.F90 Delta lines: <Unavailable> File [removed]: Whisky_Loop.F90 Delta lines: <Unavailable> File [removed]: Whisky_Marquina.F90 Delta lines: <Unavailable> File [removed]: Whisky_Minima.F90 Delta lines: <Unavailable> File [removed]: Whisky_Minima.cc Delta lines: <Unavailable> File [removed]: Whisky_PPM.F90 Delta lines: <Unavailable> File [removed]: Whisky_ParamCheck.F90 Delta lines: <Unavailable> File [removed]: Whisky_Particle.F90 Delta lines: <Unavailable> File [removed]: Whisky_PreLoop.F90 Delta lines: <Unavailable> File [removed]: Whisky_Prim2Con.F90 Delta lines: <Unavailable> File [removed]: Whisky_Reconstruct.F90 Delta lines: <Unavailable> File [removed]: Whisky_ReconstructPoly.F90 Delta lines: <Unavailable> File [removed]: Whisky_RegisterGZ.cc Delta lines: <Unavailable> File [removed]: Whisky_RegisterMask.c Delta lines: <Unavailable> File [removed]: Whisky_RegisterVars.cc Delta lines: <Unavailable> File [removed]: Whisky_RiemannSolve.F90 Delta lines: <Unavailable> File [removed]: Whisky_RoeAverage.F90 Delta lines: <Unavailable> File [removed]: Whisky_RoeSolver.F90 Delta lines: <Unavailable> File [removed]: Whisky_Scalars.F90 Delta lines: <Unavailable> File [removed]: Whisky_Set_TP_GF.c Delta lines: <Unavailable> File [removed]: Whisky_Shift.F90 Delta lines: <Unavailable> File [removed]: Whisky_SlopeLimiter.F90 Delta lines: <Unavailable> File [removed]: Whisky_Source.F90 Delta lines: <Unavailable> File [removed]: Whisky_Startup.F90 Delta lines: <Unavailable> File [removed]: Whisky_TVDReconstruct.F90 Delta lines: <Unavailable> File [removed]: Whisky_Tmunu.F90 Delta lines: <Unavailable> File [removed]: Whisky_UpdateMask.F90 Delta lines: <Unavailable> File [removed]: Whisky_Weights.c Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> File [modified]: make.code.deps Delta lines: <Unavailable> File [modified]: make.configuration.defn Delta lines: <Unavailable> File [modified]: make.configuration.deps Delta lines: <Unavailable> Directory: /trunk/test/ ======================= File [added]: GRHydrotest_shock.par Delta lines: <Unavailable> File [added]: GRHydrotest_shock_ppm.par Delta lines: <Unavailable> File [added]: GRHydrotest_tov_ppm.par Delta lines: <Unavailable> File [added]: GRHydrotest_tov_ppm_ML.par Delta lines: <Unavailable> File [added]: GRHydrotest_tov_ppm_eosg.par Delta lines: <Unavailable> File [added]: GRHydrotest_tov_ppm_eosg_ML.par Delta lines: <Unavailable> File [added]: GRHydrotest_tov_ppm_no_trp.par Delta lines: <Unavailable> File [added]: GRHydrotest_tov_ppm_no_trp_ML.par Delta lines: <Unavailable> File [removed]: whisky_test_shock.par Delta lines: <Unavailable> File [removed]: whisky_test_shock_ppm.par Delta lines: <Unavailable> File [removed]: whisky_test_tov_ppm.par Delta lines: <Unavailable> File [removed]: whisky_test_tov_ppm_ML.par Delta lines: <Unavailable> File [removed]: whisky_test_tov_ppm_eosg.par Delta lines: <Unavailable> File [removed]: whisky_test_tov_ppm_eosg_ML.par Delta lines: <Unavailable> File [removed]: whisky_test_tov_ppm_no_trp.par Delta lines: <Unavailable> File [removed]: whisky_test_tov_ppm_no_trp_ML.par Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: README Delta lines: <Unavailable> File [modified]: configuration.ccl Delta lines: <Unavailable> File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] Hydro_Analysis/trunk/src/ (Rev. 107)
by None＠einsteintoolkit.org 02 May '10

02 May '10

User: bmundim Date: 2010/05/02 03:49 PM Added: /trunk/src/ GRHydro_Separation.F90 Removed: /trunk/src/ Whisky_Separation.F90 Modified: /trunk/src/ make.code.defn Log: file/parameter string replacement from whisky to GRHydro File Changes: Directory: /trunk/src/ ====================== File [added]: GRHydro_Separation.F90 Delta lines: +164 -0 =================================================================== --- trunk/src/GRHydro_Separation.F90 (rev 0) +++ trunk/src/GRHydro_Separation.F90 2010-05-02 20:49:45 UTC (rev 107) @@ -0,0 +1,164 @@ +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" + + /*@@ + @routine Hydro_Analysis_FindSeparation + @date Thu May 20 12:35:20 2004 + @author Ian Hawke + @desc + Finds the separation (in coordinate and proper distance) + between the NS. Equal mass symmetry is assumed so it is + actually the distance between the origin and the location + of maximum density. This is along a straight line, not a + geodesic, so still not perfect. + @enddesc + @calls + @calledby + @history + + @endhistory + +@@*/ + +subroutine Hydro_Analysis_FindSeparation(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_REAL :: separation_dx, separation_dy, separation_dz + CCTK_REAL, dimension(:), allocatable :: separation_x, separation_y, & + separation_z + CCTK_REAL, dimension(:), allocatable :: s_gxx, s_gxy, s_gxz, & + s_gyy, s_gyz, s_gzz + CCTK_INT :: ierr, i + CCTK_INT :: param_table_handle, interp_handle, coord_system_handle + CCTK_INT :: vindex + + CCTK_POINTER, dimension(3) :: interp_coords + CCTK_INT, dimension(6) :: in_array_indices + CCTK_POINTER, dimension(6) :: out_arrays + CCTK_INT, dimension(6) :: out_array_type_codes + +!!$ Proper separation requires interpolation + + allocate(separation_x(Hydro_Analysis_rho_max_origin_distance_npoints), & + separation_y(Hydro_Analysis_rho_max_origin_distance_npoints), & + separation_z(Hydro_Analysis_rho_max_origin_distance_npoints), STAT=ierr) + + if (ierr .ne. 0) then + call CCTK_WARN(0, "Failed to allocate separation coordinate arrays") + end if + + separation_dx = Hydro_Analysis_rho_max_loc(1) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) + separation_dy = Hydro_Analysis_rho_max_loc(2) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) + separation_dz = Hydro_Analysis_rho_max_loc(3) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) + + do i = 1, Hydro_Analysis_rho_max_origin_distance_npoints + + separation_x(i) = i * separation_dx + separation_y(i) = i * separation_dy + separation_z(i) = i * separation_dz + + end do + + allocate(s_gxx(Hydro_Analysis_rho_max_origin_distance_npoints), & + s_gxy(Hydro_Analysis_rho_max_origin_distance_npoints), & + s_gxz(Hydro_Analysis_rho_max_origin_distance_npoints), & + s_gyy(Hydro_Analysis_rho_max_origin_distance_npoints), & + s_gyz(Hydro_Analysis_rho_max_origin_distance_npoints), & + s_gzz(Hydro_Analysis_rho_max_origin_distance_npoints), & + STAT=ierr) + + if (ierr .ne. 0) then + call CCTK_WARN(0, "Failed to allocate separation metric arrays") + end if + + param_table_handle = -1 + interp_handle = -1 + coord_system_handle = -1 + + call Util_TableCreateFromString (param_table_handle, "order = 2") + if (param_table_handle .lt. 0) then + call CCTK_WARN(0,"Cannot create parameter table for interpolator") + endif + + call CCTK_InterpHandle (interp_handle, "uniform cartesian") + if (interp_handle.lt.0) then + call CCTK_WARN(0,"Cannot get handle for interpolation ! Forgot to activate an implementation providing interpolation operators (e.g. LocalInterp)?") + endif + + call CCTK_CoordSystemHandle (coord_system_handle, "cart3d") + if (coord_system_handle .lt. 0) then + call CCTK_WARN(0,"Cannot get handle for cart3d coordinate system ! Forgot to activate an implementation providing coordinates (e.g. LocalInterp)?") + endif + +! fill in the input/output arrays for the interpolator + interp_coords(1) = CCTK_PointerTo(separation_x) + interp_coords(2) = CCTK_PointerTo(separation_y) + interp_coords(3) = CCTK_PointerTo(separation_z) + + call CCTK_VarIndex (vindex, "admbase::gxx") + in_array_indices(1) = vindex + call CCTK_VarIndex (vindex, "admbase::gyy") + in_array_indices(2) = vindex + call CCTK_VarIndex (vindex, "admbase::gzz") + in_array_indices(3) = vindex + call CCTK_VarIndex (vindex, "admbase::gxy") + in_array_indices(4) = vindex + call CCTK_VarIndex (vindex, "admbase::gxz") + in_array_indices(5) = vindex + call CCTK_VarIndex (vindex, "admbase::gyz") + in_array_indices(6) = vindex + + out_arrays(1) = CCTK_PointerTo(s_gxx) + out_arrays(2) = CCTK_PointerTo(s_gyy) + out_arrays(3) = CCTK_PointerTo(s_gzz) + out_arrays(4) = CCTK_PointerTo(s_gxy) + out_arrays(5) = CCTK_PointerTo(s_gxz) + out_arrays(6) = CCTK_PointerTo(s_gyz) + + out_array_type_codes = CCTK_VARIABLE_REAL + +! Interpolation. + + call CCTK_InterpGridArrays (ierr, cctkGH, 3, interp_handle,& + param_table_handle, coord_system_handle,& + Hydro_Analysis_rho_max_origin_distance_npoints, CCTK_VARIABLE_REAL, interp_coords,& + 6, in_array_indices,& + 6, out_array_type_codes, out_arrays) + if (ierr < 0) then + call CCTK_WARN (1, "interpolator call returned an error code"); + endif + +! release parameter table + call Util_TableDestroy (ierr, param_table_handle) + +! Integrate using trapezoidal rule. + + Hydro_Analysis_rho_max_origin_distance = 0.d0 + + do i=2, Hydro_Analysis_rho_max_origin_distance_npoints + + Hydro_Analysis_rho_max_origin_distance = Hydro_Analysis_rho_max_origin_distance + 0.5d0 & + *(sqrt(s_gxx(i-1)*separation_dx**2 + & + s_gyy(i-1)*separation_dy**2 + & + s_gzz(i-1)*separation_dz**2 & + + 2.d0*(s_gxy(i-1)*separation_dx*separation_dy + & + s_gxz(i-1)*separation_dx*separation_dz + & + s_gyz(i-1)*separation_dy*separation_dz)) & + + sqrt(s_gxx(i )*separation_dx**2 + & + s_gyy(i )*separation_dy**2 + & + s_gzz(i )*separation_dz**2 & + + 2.d0*(s_gxy(i )*separation_dx*separation_dy + & + s_gxz(i )*separation_dx*separation_dz + & + s_gyz(i )*separation_dy*separation_dz))) + + end do + +end subroutine Hydro_Analysis_FindSeparation + File [removed]: Whisky_Separation.F90 Delta lines: +0 -164 =================================================================== --- trunk/src/Whisky_Separation.F90 2010-04-29 07:37:53 UTC (rev 106) +++ trunk/src/Whisky_Separation.F90 2010-05-02 20:49:45 UTC (rev 107) @@ -1,164 +0,0 @@ -#include "cctk.h" -#include "cctk_Parameters.h" -#include "cctk_Arguments.h" -#include "cctk_Functions.h" - - /*@@ - @routine Hydro_Analysis_FindSeparation - @date Thu May 20 12:35:20 2004 - @author Ian Hawke - @desc - Finds the separation (in coordinate and proper distance) - between the NS. Equal mass symmetry is assumed so it is - actually the distance between the origin and the location - of maximum density. This is along a straight line, not a - geodesic, so still not perfect. - @enddesc - @calls - @calledby - @history - - @endhistory - -@@*/ - -subroutine Hydro_Analysis_FindSeparation(CCTK_ARGUMENTS) - - implicit none - - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS - DECLARE_CCTK_FUNCTIONS - - CCTK_REAL :: separation_dx, separation_dy, separation_dz - CCTK_REAL, dimension(:), allocatable :: separation_x, separation_y, & - separation_z - CCTK_REAL, dimension(:), allocatable :: s_gxx, s_gxy, s_gxz, & - s_gyy, s_gyz, s_gzz - CCTK_INT :: ierr, i - CCTK_INT :: param_table_handle, interp_handle, coord_system_handle - CCTK_INT :: vindex - - CCTK_POINTER, dimension(3) :: interp_coords - CCTK_INT, dimension(6) :: in_array_indices - CCTK_POINTER, dimension(6) :: out_arrays - CCTK_INT, dimension(6) :: out_array_type_codes - -!!$ Proper separation requires interpolation - - allocate(separation_x(Hydro_Analysis_rho_max_origin_distance_npoints), & - separation_y(Hydro_Analysis_rho_max_origin_distance_npoints), & - separation_z(Hydro_Analysis_rho_max_origin_distance_npoints), STAT=ierr) - - if (ierr .ne. 0) then - call CCTK_WARN(0, "Failed to allocate separation coordinate arrays") - end if - - separation_dx = Hydro_Analysis_rho_max_loc(1) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) - separation_dy = Hydro_Analysis_rho_max_loc(2) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) - separation_dz = Hydro_Analysis_rho_max_loc(3) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) - - do i = 1, Hydro_Analysis_rho_max_origin_distance_npoints - - separation_x(i) = i * separation_dx - separation_y(i) = i * separation_dy - separation_z(i) = i * separation_dz - - end do - - allocate(s_gxx(Hydro_Analysis_rho_max_origin_distance_npoints), & - s_gxy(Hydro_Analysis_rho_max_origin_distance_npoints), & - s_gxz(Hydro_Analysis_rho_max_origin_distance_npoints), & - s_gyy(Hydro_Analysis_rho_max_origin_distance_npoints), & - s_gyz(Hydro_Analysis_rho_max_origin_distance_npoints), & - s_gzz(Hydro_Analysis_rho_max_origin_distance_npoints), & - STAT=ierr) - - if (ierr .ne. 0) then - call CCTK_WARN(0, "Failed to allocate separation metric arrays") - end if - - param_table_handle = -1 - interp_handle = -1 - coord_system_handle = -1 - - call Util_TableCreateFromString (param_table_handle, "order = 2") - if (param_table_handle .lt. 0) then - call CCTK_WARN(0,"Cannot create parameter table for interpolator") - endif - - call CCTK_InterpHandle (interp_handle, "uniform cartesian") - if (interp_handle.lt.0) then - call CCTK_WARN(0,"Cannot get handle for interpolation ! Forgot to activate an implementation providing interpolation operators (e.g. LocalInterp)?") - endif - - call CCTK_CoordSystemHandle (coord_system_handle, "cart3d") - if (coord_system_handle .lt. 0) then - call CCTK_WARN(0,"Cannot get handle for cart3d coordinate system ! Forgot to activate an implementation providing coordinates (e.g. LocalInterp)?") - endif - -! fill in the input/output arrays for the interpolator - interp_coords(1) = CCTK_PointerTo(separation_x) - interp_coords(2) = CCTK_PointerTo(separation_y) - interp_coords(3) = CCTK_PointerTo(separation_z) - - call CCTK_VarIndex (vindex, "admbase::gxx") - in_array_indices(1) = vindex - call CCTK_VarIndex (vindex, "admbase::gyy") - in_array_indices(2) = vindex - call CCTK_VarIndex (vindex, "admbase::gzz") - in_array_indices(3) = vindex - call CCTK_VarIndex (vindex, "admbase::gxy") - in_array_indices(4) = vindex - call CCTK_VarIndex (vindex, "admbase::gxz") - in_array_indices(5) = vindex - call CCTK_VarIndex (vindex, "admbase::gyz") - in_array_indices(6) = vindex - - out_arrays(1) = CCTK_PointerTo(s_gxx) - out_arrays(2) = CCTK_PointerTo(s_gyy) - out_arrays(3) = CCTK_PointerTo(s_gzz) - out_arrays(4) = CCTK_PointerTo(s_gxy) - out_arrays(5) = CCTK_PointerTo(s_gxz) - out_arrays(6) = CCTK_PointerTo(s_gyz) - - out_array_type_codes = CCTK_VARIABLE_REAL - -! Interpolation. - - call CCTK_InterpGridArrays (ierr, cctkGH, 3, interp_handle,& - param_table_handle, coord_system_handle,& - Hydro_Analysis_rho_max_origin_distance_npoints, CCTK_VARIABLE_REAL, interp_coords,& - 6, in_array_indices,& - 6, out_array_type_codes, out_arrays) - if (ierr < 0) then - call CCTK_WARN (1, "interpolator call returned an error code"); - endif - -! release parameter table - call Util_TableDestroy (ierr, param_table_handle) - -! Integrate using trapezoidal rule. - - Hydro_Analysis_rho_max_origin_distance = 0.d0 - - do i=2, Hydro_Analysis_rho_max_origin_distance_npoints - - Hydro_Analysis_rho_max_origin_distance = Hydro_Analysis_rho_max_origin_distance + 0.5d0 & - *(sqrt(s_gxx(i-1)*separation_dx**2 + & - s_gyy(i-1)*separation_dy**2 + & - s_gzz(i-1)*separation_dz**2 & - + 2.d0*(s_gxy(i-1)*separation_dx*separation_dy + & - s_gxz(i-1)*separation_dx*separation_dz + & - s_gyz(i-1)*separation_dy*separation_dz)) & - + sqrt(s_gxx(i )*separation_dx**2 + & - s_gyy(i )*separation_dy**2 + & - s_gzz(i )*separation_dz**2 & - + 2.d0*(s_gxy(i )*separation_dx*separation_dy + & - s_gxz(i )*separation_dx*separation_dz + & - s_gyz(i )*separation_dy*separation_dz))) - - end do - -end subroutine Hydro_Analysis_FindSeparation - File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- trunk/src/make.code.defn 2010-04-29 07:37:53 UTC (rev 106) +++ trunk/src/make.code.defn 2010-05-02 20:49:45 UTC (rev 107) @@ -1,7 +1,7 @@ # Main make.code.defn file for thorn Hydro_Analysis # Source files in this directory -SRCS = Hydro_Analysis.c Whisky_Separation.F90 +SRCS = Hydro_Analysis.c GRHydro_Separation.F90 # Subdirectories containing source files SUBDIRS =

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits May 2010