Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

Start a nNew thread

[Carpet] branch, master, updated. carpet-6-init-149-g9b0294c
by Carpet git repositories 18 Feb '13

18 Feb '13

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 938)
by knarf＠cct.lsu.edu 16 Feb '13

16 Feb '13

User: knarf Date: 2013/02/16 04:08 PM Modified: /about/members/ members.txt Log: new member File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +3 -0 =================================================================== --- about/members/members.txt 2013-02-13 09:35:44 UTC (rev 937) +++ about/members/members.txt 2013-02-16 22:08:18 UTC (rev 938) @@ -16,6 +16,9 @@ http://www.auth.gr/home/index_en.html Aristotle University of Thessaloniki Nick Stergioulas +http://www.ua.pt Aveiro University + Carlos Herdeiro + http://www.belmont.edu/ Belmont University Scott Hawley

1 0

[svn:einsteintoolkit] Exact/trunk/ (Rev. 289)
by rhaas＠tapir.caltech.edu 15 Feb '13

15 Feb '13

User: rhaas Date: 2013/02/15 10:28 PM Modified: /trunk/ schedule.ccl Log: exlicitly schedule before ADMBase_SetADMVars in MoL_PostStep File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +2 -2 =================================================================== --- trunk/schedule.ccl 2013-01-17 17:03:58 UTC (rev 288) +++ trunk/schedule.ccl 2013-02-16 04:28:28 UTC (rev 289) @@ -89,7 +89,7 @@ } "Set evolution lapse and/or shift from exact solution on a trivial slice" # Necessary if MoL is used - schedule Exact__gauge in MoL_PostStep + schedule Exact__gauge in MoL_PostStep BEFORE ADMBase_SetADMVars { LANG: Fortran } "Set evolution lapse and/or shift from exact solution on a trivial slice" @@ -133,7 +133,7 @@ LANG: Fortran } "Set data from exact solution on an exact slice" # Necessary if MoL is used - schedule Exact__initialize in MoL_PostStep + schedule Exact__initialize in MoL_PostStep BEFORE ADMBase_SetADMVars { LANG: Fortran } "Set data from exact solution on an exact slice"

1 0

[svn:einsteintoolkit] www/seminars/ (Rev. 937)
by rhaas＠tapir.caltech.edu 13 Feb '13

13 Feb '13

User: rhaas Date: 2013/02/13 03:35 AM Modified: /seminars/ index.php Log: correct link to C Reisswig's talk slides on the top level seminars page File Changes: Directory: /seminars/ ===================== File [modified]: index.php Delta lines: +1 -1 =================================================================== --- seminars/index.php 2013-02-04 20:13:52 UTC (rev 936) +++ seminars/index.php 2013-02-13 09:35:44 UTC (rev 937) @@ -14,7 +14,7 @@ <td><a href="2013_02_04/">Three-Dimensional General-Relativistic Hydrodynamic Simulations of Binary Neutron Star Coalescence and Stellar Collapse with Multipatch Grids</a></td> <td>Christian Reisswig</td> <td>California Institute of Technology</td> - <td><a href="2013_02_04/talk.pdf">pdf</a></td> + <td><a href="2013_02_04/reisswig-et-2013_02_04.pdf">pdf</a></td> <td> </td> </tr> </table>

1 0

[Carpet] branch, master, updated. carpet-6-init-147-g4f9723f
by Carpet git repositories 12 Feb '13

12 Feb '13

1 0

[Carpet] branch, master, updated. carpet-6-init-146-gcd8d4f6
by Carpet git repositories 11 Feb '13

11 Feb '13

1 0

[Carpet] branch, master, updated. carpet-6-init-145-g4e166b6
by Carpet git repositories 11 Feb '13

11 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 4e166b68d40ec9ced2acdbebaccace667f6f6eeb (commit) from cb1399a1072460b74e75b7d5c54389fbd7dffbb6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4e166b68d40ec9ced2acdbebaccace667f6f6eeb Author: Roland Haas <roland.haas(a)physics.gatech.edu> Date: Fri Nov 9 09:39:42 2012 -0800 CarpetEvolutionMask: compute a mask indicating where buffers are this is s first implementatoion of this functionality. Eventually I want to extend it to label buffer points by the last MoL substep at which the grid point needs to have a RHS computed. Zero will mean "all the time" large numbers will mean "never". ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetEvolutionMask/interface.ccl | 5 + Carpet/CarpetEvolutionMask/param.ccl | 4 + Carpet/CarpetEvolutionMask/schedule.ccl | 4 + Carpet/CarpetEvolutionMask/src/evolution_mask.cc | 56 ++++++++ .../CarpetEvolutionMask/src/evolution_mask_init.c | 3 + Carpet/CarpetEvolutionMask/test/buffer_mask.par | 81 ++++++++++++ .../test/buffer_mask/buffer_mask.par | 79 ++++++++++++ .../test/buffer_mask/buffer_mask.x.asc | 132 +++++++++++++++++++ .../test/buffer_mask/buffer_mask.y.asc | 135 ++++++++++++++++++++ .../test/buffer_mask/buffer_mask.z.asc | 135 ++++++++++++++++++++ 10 files changed, 634 insertions(+), 0 deletions(-) create mode 100644 Carpet/CarpetEvolutionMask/test/buffer_mask.par create mode 100644 Carpet/CarpetEvolutionMask/test/buffer_mask/buffer_mask.par create mode 100644 Carpet/CarpetEvolutionMask/test/buffer_mask/buffer_mask.x.asc create mode 100644 Carpet/CarpetEvolutionMask/test/buffer_mask/buffer_mask.y.asc create mode 100644 Carpet/CarpetEvolutionMask/test/buffer_mask/buffer_mask.z.asc hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 73)
by rhaas＠tapir.caltech.edu 11 Feb '13

11 Feb '13

User: rhaas Date: 2013/02/11 10:35 AM Modified: /trunk/ param.ccl /trunk/src/ EOS_Omni_Module.F90, EOS_Omni_MultiVarCalls.F90, EOS_Omni_SingleVarCalls.F90, EOS_Omni_Startup.F90 Log: remove poly_gamma_ini EOS_Omni used this to compute (initially) conversion factors from code (assumed to e G=c=M_sun=1) to cgs units. It then goes back and forth between these units even for polytropic and gamma law eos. This is very confusing since poly_gamma_ini since poly_gamma_ini must mast poly_gamma and gl_gamma for a "usual" run with a Gamma law eos. File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_Module.F90 Delta lines: +1 -5 =================================================================== --- trunk/src/EOS_Omni_Module.F90 2012-12-29 21:37:30 UTC (rev 72) +++ trunk/src/EOS_Omni_Module.F90 2013-02-11 16:35:39 UTC (rev 73) @@ -26,10 +26,6 @@ ! These values are set by EOS_Omni_Startup - real*8 :: poly_k_cgs = 0.0d0 - real*8 :: gl_k_cgs = 0.0d0 + real*8 :: hybrid_k2 = 0.0d0 - real*8 :: hybrid_k1_cgs = 0.0d0 - real*8 :: hybrid_k2_cgs = 0.0d0 - end module EOS_Omni_Module File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +32 -32 =================================================================== --- trunk/src/EOS_Omni_MultiVarCalls.F90 2012-12-29 21:37:30 UTC (rev 72) +++ trunk/src/EOS_Omni_MultiVarCalls.F90 2013-02-11 16:35:39 UTC (rev 73) @@ -104,7 +104,7 @@ integer :: i character(256) :: warnstring real*8 :: hybrid_local_gamma - real*8 :: hybrid_local_k_cgs + real*8 :: hybrid_local_k real*8 :: hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2 ! temporary vars for nuc_eos real*8 :: xrho,xye,xtemp,xenr,xent @@ -120,23 +120,23 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * poly_k_cgs * & - (rho(i)*inv_rho_gf)**(poly_gamma) / & + eps(i) = poly_k * & + rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - dpdrhoe(i) = press_gf * poly_k_cgs * & - poly_gamma * inv_rho_gf * & - (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0) + dpdrhoe(i) = poly_k * & + poly_gamma * & + rho(i) ** (poly_gamma - 1.d0) dpderho(i) = 0.0d0 enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * gl_k_cgs * & - (rho(i)*inv_rho_gf)**(gl_gamma) / & + eps(i) = gl_k * & + rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -151,23 +151,23 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k_cgs = hybrid_k2_cgs + hybrid_local_k = hybrid_k2 else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k_cgs = hybrid_k1_cgs + hybrid_local_k = hybrid_k1 endif - hybrid_dp_poly = hybrid_local_gamma * press_gf * & - hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * & - inv_rho_gf**hybrid_local_gamma + hybrid_dp_poly = hybrid_local_gamma * & + hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0) + - hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * & + hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * & (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) * & - rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma + rho(i)**(hybrid_local_gamma - 1.d0) hybrid_dp_th2 = (hybrid_gamma_th - 1.d0) * eps(i) & - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & + hybrid_k1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) dpdrhoe(i) = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2 @@ -224,7 +224,7 @@ integer :: i character(256) :: warnstring real*8 :: hybrid_local_gamma - real*8 :: hybrid_local_k_cgs + real*8 :: hybrid_local_k real*8 :: hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2 ! temporary vars for nuc_eos real*8 :: xrho,xye,xtemp,xenr,xent @@ -240,23 +240,23 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * poly_k_cgs * & - (rho(i)*inv_rho_gf)**(poly_gamma) / & + eps(i) = poly_k * & + rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints depsdpress(i) = 1.0d0/(poly_gamma - 1.0d0)/rho(i) - depsdrho(i) = depsdpress(i) * press_gf * poly_k_cgs * & - poly_gamma * inv_rho_gf * & - (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0) + depsdrho(i) = depsdpress(i) * poly_k * & + poly_gamma * & + rho(i) ** (poly_gamma - 1.d0) enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * gl_k_cgs * & - (rho(i)*inv_rho_gf)**(gl_gamma) / & + eps(i) = gl_k * & + rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -270,23 +270,23 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k_cgs = hybrid_k2_cgs + hybrid_local_k = hybrid_k2 else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k_cgs = hybrid_k1_cgs + hybrid_local_k = hybrid_k1 endif - hybrid_dp_poly = hybrid_local_gamma * press_gf * & - hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * & - inv_rho_gf**hybrid_local_gamma + hybrid_dp_poly = hybrid_local_gamma * & + hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0) + - hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * & + hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * & (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) * & - rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma + rho(i)**(hybrid_local_gamma - 1.d0) hybrid_dp_th2 = (hybrid_gamma_th - 1.d0) * eps(i) & - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & + hybrid_k1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) xdpdrhoe = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2 File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +48 -48 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2012-12-29 21:37:30 UTC (rev 72) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2013-02-11 16:35:39 UTC (rev 73) @@ -27,7 +27,7 @@ ! local vars integer :: i character(256) :: warnstring - real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + real*8 :: hybrid_local_gamma, hybrid_local_k, & hybrid_p_poly, hybrid_p_th real*8,parameter :: zero = 0.0d0 ! temporary vars for nuc_eos @@ -43,21 +43,21 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * poly_k_cgs * & - (rho(i)*inv_rho_gf)**(poly_gamma) / & + eps(i) = poly_k * & + rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - press(i) = press_gf * poly_k_cgs * & - (rho(i)*inv_rho_gf)**poly_gamma + press(i) = poly_k * & + rho(i)**poly_gamma enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * gl_k_cgs * & - (rho(i)*inv_rho_gf)**(gl_gamma) / & + eps(i) = gl_k * & + rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -70,19 +70,19 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k_cgs = hybrid_k2_cgs + hybrid_local_k = hybrid_k2 else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k_cgs = hybrid_k1_cgs + hybrid_local_k = hybrid_k1 endif - hybrid_p_poly = press_gf * hybrid_local_k_cgs * & - (rho(i) * inv_rho_gf)**hybrid_local_gamma - hybrid_p_th = - press_gf * hybrid_local_k_cgs * (hybrid_gamma_th - 1.d0) / & - (hybrid_local_gamma - 1.0d0) * (rho(i) * inv_rho_gf)**hybrid_local_gamma + & + hybrid_p_poly = hybrid_local_k * & + rho(i)**hybrid_local_gamma + hybrid_p_th = - hybrid_local_k * (hybrid_gamma_th - 1.d0) / & + (hybrid_local_gamma - 1.0d0) * rho(i)**hybrid_local_gamma + & (hybrid_gamma_th - 1.0d0) * rho(i) * eps(i) - & (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & + hybrid_k1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) * rho(i) hybrid_p_th = max(zero, hybrid_p_th) press(i) = hybrid_p_poly + hybrid_p_th @@ -140,7 +140,7 @@ ! local vars integer :: i character(256) :: warnstring - real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + real*8 :: hybrid_local_gamma, hybrid_local_k, & hybrid_dp_poly, hybrid_dp_th1, hybrid_dp_th2 real*8,parameter :: zero = 0.0d0 ! temporary vars for nuc_eos @@ -156,22 +156,22 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * poly_k_cgs * & - (rho(i)*inv_rho_gf)**(poly_gamma) / & + eps(i) = poly_k * & + rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - dpdrhoe(i) = press_gf * poly_k_cgs * & - poly_gamma * inv_rho_gf * & - (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0) + dpdrhoe(i) = poly_k * & + poly_gamma * & + rho(i) ** (poly_gamma - 1.d0) enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * gl_k_cgs * & - (rho(i)*inv_rho_gf)**(gl_gamma) / & + eps(i) = gl_k * & + rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -184,23 +184,23 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k_cgs = hybrid_k2_cgs + hybrid_local_k = hybrid_k2 else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k_cgs = hybrid_k1_cgs + hybrid_local_k = hybrid_k1 endif - hybrid_dp_poly = hybrid_local_gamma * press_gf * & - hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * & - inv_rho_gf**hybrid_local_gamma + hybrid_dp_poly = hybrid_local_gamma * & + hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0) + - hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * & + hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * & (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) * & - rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma + rho(i)**(hybrid_local_gamma - 1.d0) hybrid_dp_th2 = (hybrid_gamma_th - 1.d0) * eps(i) & - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & + hybrid_k1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) dpdrhoe(i) = hybrid_dp_poly + max(0.0d0,hybrid_dp_th1 + hybrid_dp_th2) @@ -269,8 +269,8 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * poly_k_cgs * & - (rho(i)*inv_rho_gf)**(poly_gamma) / & + eps(i) = poly_k * & + rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif @@ -281,8 +281,8 @@ ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * gl_k_cgs * & - (rho(i)*inv_rho_gf)**(gl_gamma) / & + eps(i) = gl_k * & + rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -348,7 +348,7 @@ integer :: i character(256) :: warnstring real*8 :: xpress,xdpdrhoe,xdpderho - real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & + real*8 :: hybrid_local_gamma, hybrid_local_k, & hybrid_p_poly, hybrid_p_th real*8,parameter :: zero = 0.0d0 ! temporary vars for nuc_eos @@ -364,14 +364,14 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * poly_k_cgs * & - (rho(i)*inv_rho_gf)**(poly_gamma) / & + eps(i) = poly_k * & + rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - xpress = press_gf*poly_k_cgs * & - (rho(i)*inv_rho_gf)**(poly_gamma) + xpress = poly_k * & + rho(i)**(poly_gamma) cs2(i) = poly_gamma * xpress / rho(i) / & (1 + eps(i) + xpress/rho(i)) enddo @@ -379,8 +379,8 @@ ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = press_gf * gl_k_cgs * & - (rho(i)*inv_rho_gf)**(gl_gamma) / & + eps(i) = gl_k * & + rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -396,20 +396,20 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k_cgs = hybrid_k2_cgs + hybrid_local_k = hybrid_k2 else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k_cgs = hybrid_k1_cgs + hybrid_local_k = hybrid_k1 endif ! first calculate the pressure - hybrid_p_poly = press_gf * hybrid_local_k_cgs * & - (rho(i) * inv_rho_gf)**hybrid_local_gamma - hybrid_p_th = - press_gf * hybrid_local_k_cgs * (hybrid_gamma_th - 1.d0) / & - (hybrid_local_gamma - 1.0d0) * (rho(i) * inv_rho_gf)**hybrid_local_gamma + & + hybrid_p_poly = hybrid_local_k * & + rho(i)**hybrid_local_gamma + hybrid_p_th = - hybrid_local_k * (hybrid_gamma_th - 1.d0) / & + (hybrid_local_gamma - 1.0d0) * rho(i)**hybrid_local_gamma + & (hybrid_gamma_th - 1.0d0) * rho(i) * eps(i) - & (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & + hybrid_k1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) * rho(i) hybrid_p_th = max(zero, hybrid_p_th) xpress = hybrid_p_poly + hybrid_p_th File [modified]: EOS_Omni_Startup.F90 Delta lines: +2 -8 =================================================================== --- trunk/src/EOS_Omni_Startup.F90 2012-12-29 21:37:30 UTC (rev 72) +++ trunk/src/EOS_Omni_Startup.F90 2013-02-11 16:35:39 UTC (rev 73) @@ -11,13 +11,7 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_ARGUMENTS - poly_k_cgs = poly_k * rho_gf**poly_gamma_ini / press_gf + hybrid_k2 = hybrid_k1 * & + hybrid_rho_nuc**(hybrid_gamma1-hybrid_gamma2) - gl_k_cgs = gl_k * rho_gf**poly_gamma_ini / press_gf - - hybrid_k1_cgs = hybrid_k1 * rho_gf**poly_gamma_ini / press_gf - - hybrid_k2_cgs = hybrid_k1_cgs * & - (hybrid_rho_nuc * inv_rho_gf)**(hybrid_gamma1-hybrid_gamma2) - end subroutine EOS_Omni_Startup Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +0 -5 =================================================================== --- trunk/param.ccl 2012-12-29 21:37:30 UTC (rev 72) +++ trunk/param.ccl 2013-02-11 16:35:39 UTC (rev 73) @@ -9,11 +9,6 @@ : :: "" } 2.0 -REAL poly_gamma_ini "Initial Adiabatic Index for poly EOS" STEERABLE=RECOVER -{ - : :: "" -} 2.0 - REAL poly_k "Polytropic constant in c=G=Msun=1" STEERABLE=RECOVER { : :: ""

1 0

[svn:einsteintoolkit] GRHydro/trunk/test/ (Rev. 483)
by rhaas＠tapir.caltech.edu 11 Feb '13

11 Feb '13

User: rhaas Date: 2013/02/11 10:30 AM Added: /trunk/test/ test_one_hybrid.par /trunk/test/test_one_hybrid/ dens_3D_diagonal.xg, dens_maximum.xg, dens_minimum.xg, dens_norm1.xg, dens_norm2.xg, dens_x_[16][16].xg, dens_y_[16][16].xg, dens_z_[16][16].xg, eps_3D_diagonal.xg, eps_maximum.xg, eps_minimum.xg, eps_norm1.xg, eps_norm2.xg, eps_x_[16][16].xg, eps_y_[16][16].xg, eps_z_[16][16].xg, press_3D_diagonal.xg, press_maximum.xg, press_minimum.xg, press_norm1.xg, press_norm2.xg, press_x_[16][16].xg, press_y_[16][16].xg, press_z_[16][16].xg, rho_3D_diagonal.xg, rho_maximum.xg, rho_minimum.xg, rho_norm1.xg, rho_norm2.xg, rho_x_[16][16].xg, rho_y_[16][16].xg, rho_z_[16][16].xg, scon[0]_3D_diagonal.xg, scon[0]_maximum.xg, scon[0]_minimum.xg, scon[0]_norm1.xg, scon[0]_norm2.xg, scon[0]_x_[16][16].xg, scon[0]_y_[16][16].xg, scon[0]_z_[16][16].xg, scon[1]_3D_diagonal.xg, scon[1]_maximum.xg, scon[1]_minimum.xg, scon[1]_norm1.xg, scon[1]_norm2.xg, scon[1]_x_[16][16].xg, scon[1]_y_[16][16].xg, scon[1]_z_[16][16].xg, scon[2]_3D_diagonal.xg, scon[2]_maximum.xg, scon[2]_minimum.xg, scon[2]_norm1.xg, scon[2]_norm2.xg, scon[2]_x_[16][16].xg, scon[2]_y_[16][16].xg, scon[2]_z_[16][16].xg, tau_3D_diagonal.xg, tau_maximum.xg, tau_minimum.xg, tau_norm1.xg, tau_norm2.xg, tau_x_[16][16].xg, tau_y_[16][16].xg, tau_z_[16][16].xg, test_one_hybrid.par, vel[0]_3D_diagonal.xg, vel[0]_maximum.xg, vel[0]_minimum.xg, vel[0]_norm1.xg, vel[0]_norm2.xg, vel[0]_x_[16][16].xg, vel[0]_y_[16][16].xg, vel[0]_z_[16][16].xg, vel[1]_3D_diagonal.xg, vel[1]_maximum.xg, vel[1]_minimum.xg, vel[1]_norm1.xg, vel[1]_norm2.xg, vel[1]_x_[16][16].xg, vel[1]_y_[16][16].xg, vel[1]_z_[16][16].xg, vel[2]_3D_diagonal.xg, vel[2]_maximum.xg, vel[2]_minimum.xg, vel[2]_norm1.xg, vel[2]_norm2.xg, vel[2]_x_[16][16].xg, vel[2]_y_[16][16].xg, vel[2]_z_[16][16].xg, w_lorentz_3D_diagonal.xg, w_lorentz_maximum.xg, w_lorentz_minimum.xg, w_lorentz_norm1.xg, w_lorentz_norm2.xg, w_lorentz_x_[16][16].xg, w_lorentz_y_[16][16].xg, w_lorentz_z_[16][16].xg Log: GRHydro: add test case for hybrid EOS From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/test/ ======================= File [added]: test_one_hybrid.par Delta lines: <Unavailable> Directory: /trunk/test/test_one_hybrid/ ======================================= File [added]: dens_3D_diagonal.xg Delta lines: <Unavailable> File [added]: dens_maximum.xg Delta lines: <Unavailable> File [added]: dens_minimum.xg Delta lines: <Unavailable> File [added]: dens_norm1.xg Delta lines: <Unavailable> File [added]: dens_norm2.xg Delta lines: <Unavailable> File [added]: dens_x_[16][16].xg Delta lines: <Unavailable> File [added]: dens_y_[16][16].xg Delta lines: <Unavailable> File [added]: dens_z_[16][16].xg Delta lines: <Unavailable> File [added]: eps_3D_diagonal.xg Delta lines: <Unavailable> File [added]: eps_maximum.xg Delta lines: <Unavailable> File [added]: eps_minimum.xg Delta lines: <Unavailable> File [added]: eps_norm1.xg Delta lines: <Unavailable> File [added]: eps_norm2.xg Delta lines: <Unavailable> File [added]: eps_x_[16][16].xg Delta lines: <Unavailable> File [added]: eps_y_[16][16].xg Delta lines: <Unavailable> File [added]: eps_z_[16][16].xg Delta lines: <Unavailable> File [added]: press_3D_diagonal.xg Delta lines: <Unavailable> File [added]: press_maximum.xg Delta lines: <Unavailable> File [added]: press_minimum.xg Delta lines: <Unavailable> File [added]: press_norm1.xg Delta lines: <Unavailable> File [added]: press_norm2.xg Delta lines: <Unavailable> File [added]: press_x_[16][16].xg Delta lines: <Unavailable> File [added]: press_y_[16][16].xg Delta lines: <Unavailable> File [added]: press_z_[16][16].xg Delta lines: <Unavailable> File [added]: rho_3D_diagonal.xg Delta lines: <Unavailable> File [added]: rho_maximum.xg Delta lines: <Unavailable> File [added]: rho_minimum.xg Delta lines: <Unavailable> File [added]: rho_norm1.xg Delta lines: <Unavailable> File [added]: rho_norm2.xg Delta lines: <Unavailable> File [added]: rho_x_[16][16].xg Delta lines: <Unavailable> File [added]: rho_y_[16][16].xg Delta lines: <Unavailable> File [added]: rho_z_[16][16].xg Delta lines: <Unavailable> File [added]: scon[0]_3D_diagonal.xg Delta lines: <Unavailable> File [added]: scon[0]_maximum.xg Delta lines: <Unavailable> File [added]: scon[0]_minimum.xg Delta lines: <Unavailable> File [added]: scon[0]_norm1.xg Delta lines: <Unavailable> File [added]: scon[0]_norm2.xg Delta lines: <Unavailable> File [added]: scon[0]_x_[16][16].xg Delta lines: <Unavailable> File [added]: scon[0]_y_[16][16].xg Delta lines: <Unavailable> File [added]: scon[0]_z_[16][16].xg Delta lines: <Unavailable> File [added]: scon[1]_3D_diagonal.xg Delta lines: <Unavailable> File [added]: scon[1]_maximum.xg Delta lines: <Unavailable> File [added]: scon[1]_minimum.xg Delta lines: <Unavailable> File [added]: scon[1]_norm1.xg Delta lines: <Unavailable> File [added]: scon[1]_norm2.xg Delta lines: <Unavailable> File [added]: scon[1]_x_[16][16].xg Delta lines: <Unavailable> File [added]: scon[1]_y_[16][16].xg Delta lines: <Unavailable> File [added]: scon[1]_z_[16][16].xg Delta lines: <Unavailable> File [added]: scon[2]_3D_diagonal.xg Delta lines: <Unavailable> File [added]: scon[2]_maximum.xg Delta lines: <Unavailable> File [added]: scon[2]_minimum.xg Delta lines: <Unavailable> File [added]: scon[2]_norm1.xg Delta lines: <Unavailable> File [added]: scon[2]_norm2.xg Delta lines: <Unavailable> File [added]: scon[2]_x_[16][16].xg Delta lines: <Unavailable> File [added]: scon[2]_y_[16][16].xg Delta lines: <Unavailable> File [added]: scon[2]_z_[16][16].xg Delta lines: <Unavailable> File [added]: tau_3D_diagonal.xg Delta lines: <Unavailable> File [added]: tau_maximum.xg Delta lines: <Unavailable> File [added]: tau_minimum.xg Delta lines: <Unavailable> File [added]: tau_norm1.xg Delta lines: <Unavailable> File [added]: tau_norm2.xg Delta lines: <Unavailable> File [added]: tau_x_[16][16].xg Delta lines: <Unavailable> File [added]: tau_y_[16][16].xg Delta lines: <Unavailable> File [added]: tau_z_[16][16].xg Delta lines: <Unavailable> File [added]: test_one_hybrid.par Delta lines: <Unavailable> File [added]: vel[0]_3D_diagonal.xg Delta lines: <Unavailable> File [added]: vel[0]_maximum.xg Delta lines: <Unavailable> File [added]: vel[0]_minimum.xg Delta lines: <Unavailable> File [added]: vel[0]_norm1.xg Delta lines: <Unavailable> File [added]: vel[0]_norm2.xg Delta lines: <Unavailable> File [added]: vel[0]_x_[16][16].xg Delta lines: <Unavailable> File [added]: vel[0]_y_[16][16].xg Delta lines: <Unavailable> File [added]: vel[0]_z_[16][16].xg Delta lines: <Unavailable> File [added]: vel[1]_3D_diagonal.xg Delta lines: <Unavailable> File [added]: vel[1]_maximum.xg Delta lines: <Unavailable> File [added]: vel[1]_minimum.xg Delta lines: <Unavailable> File [added]: vel[1]_norm1.xg Delta lines: <Unavailable> File [added]: vel[1]_norm2.xg Delta lines: <Unavailable> File [added]: vel[1]_x_[16][16].xg Delta lines: <Unavailable> File [added]: vel[1]_y_[16][16].xg Delta lines: <Unavailable> File [added]: vel[1]_z_[16][16].xg Delta lines: <Unavailable> File [added]: vel[2]_3D_diagonal.xg Delta lines: <Unavailable> File [added]: vel[2]_maximum.xg Delta lines: <Unavailable> File [added]: vel[2]_minimum.xg Delta lines: <Unavailable> File [added]: vel[2]_norm1.xg Delta lines: <Unavailable> File [added]: vel[2]_norm2.xg Delta lines: <Unavailable> File [added]: vel[2]_x_[16][16].xg Delta lines: <Unavailable> File [added]: vel[2]_y_[16][16].xg Delta lines: <Unavailable> File [added]: vel[2]_z_[16][16].xg Delta lines: <Unavailable> File [added]: w_lorentz_3D_diagonal.xg Delta lines: <Unavailable> File [added]: w_lorentz_maximum.xg Delta lines: <Unavailable> File [added]: w_lorentz_minimum.xg Delta lines: <Unavailable> File [added]: w_lorentz_norm1.xg Delta lines: <Unavailable> File [added]: w_lorentz_norm2.xg Delta lines: <Unavailable> File [added]: w_lorentz_x_[16][16].xg Delta lines: <Unavailable> File [added]: w_lorentz_y_[16][16].xg Delta lines: <Unavailable> File [added]: w_lorentz_z_[16][16].xg Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/test/ (Rev. 482)
by rhaas＠tapir.caltech.edu 11 Feb '13

11 Feb '13

User: rhaas Date: 2013/02/11 10:30 AM Modified: /trunk/test/ GRHydro_test_shock.par, GRHydro_test_shock_ppm.par, GRHydro_test_tov_ppm_ML.par, GRHydro_test_tov_ppm_ML_disable_internal_excision.par, GRHydro_test_tov_ppm_no_trp_ML.par, test_tov_carpet_refined_nosync.par, tov_carpetevolutionmask.par, tov_carpetevolutionmask2.par, tov_slowsector.par Log: GRHydro: remove poly_gamma_ini from test cases From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/test/ ======================= File [modified]: GRHydro_test_shock.par Delta lines: +0 -1 =================================================================== --- trunk/test/GRHydro_test_shock.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/GRHydro_test_shock.par 2013-02-11 16:30:26 UTC (rev 482) @@ -64,7 +64,6 @@ eos_omni::poly_gamma = 2.0 -eos_omni::poly_gamma_ini = 2.0 eos_omni::poly_k = 80.0 eos_omni::gl_gamma = 1.66666666666666 eos_omni::gl_k = 80.0 File [modified]: GRHydro_test_shock_ppm.par Delta lines: +0 -1 =================================================================== --- trunk/test/GRHydro_test_shock_ppm.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/GRHydro_test_shock_ppm.par 2013-02-11 16:30:26 UTC (rev 482) @@ -60,7 +60,6 @@ GRHydro::bound = "flat" eos_omni::poly_gamma = 2.0 -eos_omni::poly_gamma_ini = 2.0 eos_omni::poly_k = 80.0 eos_omni::gl_gamma = 1.66666666666666 eos_omni::gl_k = 80.0 File [modified]: GRHydro_test_tov_ppm_ML.par Delta lines: +0 -1 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_ML.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/GRHydro_test_tov_ppm_ML.par 2013-02-11 16:30:26 UTC (rev 482) @@ -88,7 +88,6 @@ tovsolver::TOV_Combine_Method = "maximum" eos_omni::poly_gamma = 2.0 -eos_omni::poly_gamma_ini = 2.0 eos_omni::poly_k = 100.0 IOBasic::outInfo_every = 1 File [modified]: GRHydro_test_tov_ppm_ML_disable_internal_excision.par Delta lines: +0 -1 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par 2013-02-11 16:30:26 UTC (rev 482) @@ -90,7 +90,6 @@ tovsolver::TOV_Combine_Method = "maximum" eos_omni::poly_gamma = 2.0 -eos_omni::poly_gamma_ini = 2.0 eos_omni::poly_k = 100.0 IOBasic::outInfo_every = 1 File [modified]: GRHydro_test_tov_ppm_no_trp_ML.par Delta lines: +0 -1 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_no_trp_ML.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/GRHydro_test_tov_ppm_no_trp_ML.par 2013-02-11 16:30:26 UTC (rev 482) @@ -89,7 +89,6 @@ tovsolver::TOV_Combine_Method = "maximum" eos_omni::poly_gamma = 2.0 -eos_omni::poly_gamma_ini = 2.0 eos_omni::poly_k = 100.0 IOBasic::outInfo_every = 1 File [modified]: test_tov_carpet_refined_nosync.par Delta lines: +0 -1 =================================================================== --- trunk/test/test_tov_carpet_refined_nosync.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/test_tov_carpet_refined_nosync.par 2013-02-11 16:30:26 UTC (rev 482) @@ -84,7 +84,6 @@ GRHydro::rho_abs_min = 1.e-7 GRHydro::initial_atmosphere_factor = 0.999 EOS_Omni::poly_gamma = 2.0 -EOS_Omni::poly_gamma_ini = 2.0 EOS_Omni::gl_gamma = 2.0 EOS_Omni::poly_k = 100 EOS_Omni::gl_k = 100 File [modified]: tov_carpetevolutionmask.par Delta lines: +0 -1 =================================================================== --- trunk/test/tov_carpetevolutionmask.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/tov_carpetevolutionmask.par 2013-02-11 16:30:26 UTC (rev 482) @@ -91,7 +91,6 @@ tovsolver::TOV_Combine_Method = "maximum" eos_omni::poly_gamma=2.0 -eos_omni::poly_gamma_ini=2.0 eos_omni::poly_k=100. Carpet::prolongation_order_space = 3 File [modified]: tov_carpetevolutionmask2.par Delta lines: +0 -1 =================================================================== --- trunk/test/tov_carpetevolutionmask2.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/tov_carpetevolutionmask2.par 2013-02-11 16:30:26 UTC (rev 482) @@ -92,7 +92,6 @@ tovsolver::TOV_Combine_Method = "maximum" eos_omni::gl_gamma=2.0 -eos_omni::poly_gamma_ini=2.0 eos_omni::gl_k=100. Carpet::prolongation_order_space = 3 File [modified]: tov_slowsector.par Delta lines: +0 -1 =================================================================== --- trunk/test/tov_slowsector.par 2013-02-11 16:30:23 UTC (rev 481) +++ trunk/test/tov_slowsector.par 2013-02-11 16:30:26 UTC (rev 482) @@ -78,7 +78,6 @@ GRHydro::initial_atmosphere_factor = 0.999 # these do not match TOVSolver to make the star actually move EOS_Omni::poly_gamma = 2.0 -EOS_Omni::poly_gamma_ini = 2.0 EOS_Omni::gl_gamma = 2.0 EOS_Omni::poly_k = 100 EOS_Omni::gl_k = 100

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits