diff options
Diffstat (limited to 'src/EOS_Omni_SingleVarCalls.F90')
-rw-r--r-- | src/EOS_Omni_SingleVarCalls.F90 | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/src/EOS_Omni_SingleVarCalls.F90 b/src/EOS_Omni_SingleVarCalls.F90 index 8e3b92c..bbff17c 100644 --- a/src/EOS_Omni_SingleVarCalls.F90 +++ b/src/EOS_Omni_SingleVarCalls.F90 @@ -27,7 +27,7 @@ subroutine EOS_Omni_EOS_Press(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_Press(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_Press(eoskey,keytemp,rf_precision,npoints,& 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 @@ subroutine EOS_Omni_EOS_DPressByDRho(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_DPressByDRho(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_DPressByDRho(eoskey,keytemp,rf_precision,npoints,& 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 @@ subroutine EOS_Omni_EOS_DPressByDEps(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_DPressByDEps(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_cs2(eoskey,keytemp,rf_precision,npoints,& 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 @@ subroutine EOS_Omni_EOS_cs2(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_cs2(eoskey,keytemp,rf_precision,npoints,& ! 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 @@ subroutine EOS_Omni_EOS_cs2(eoskey,keytemp,rf_precision,npoints,& 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 |