diff options
Diffstat (limited to 'src/nuc_eos/nuc_eos.F90')
| -rw-r--r-- | src/nuc_eos/nuc_eos.F90 | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/nuc_eos/nuc_eos.F90 b/src/nuc_eos/nuc_eos.F90 index f537930..b7c9312 100644 --- a/src/nuc_eos/nuc_eos.F90 +++ b/src/nuc_eos/nuc_eos.F90 @@ -233,13 +233,13 @@ subroutine nuc_eos_short(xrho,xtemp,xye,xenr,xprs,xent,xcs2,xdedt,& lr = log10(xrho) lt = log10(xtemp) y = xye - xeps = xenr + energy_shift - leps = log10(max(xeps,1.0d0)) keyerr = 0 if(keytemp.eq.0) then !need to find temperature based on xeps + xeps = xenr + energy_shift + leps = log10(max(xeps,1.0d0)) call findtemp(lr,lt,y,leps,keyerrt,rfeps) if(keyerrt.ne.0) then keyerr = keyerrt @@ -349,34 +349,30 @@ subroutine nuc_eos_press_eps(xrho,xtemp,xye,xenr,xprs,& endif endif - lr = log10(xrho) - lt = log10(xtemp) - y = xye - xeps = xenr + energy_shift - leps = log10(max(xeps,1.0d0)) - keyerr = 0 + if(keytemp.gt.1) then + stop "eos_nuc_press does not support keytemp other than 0 and 1" + endif + + lr = log10(xrho) + lt = log10(xtemp) + y = xye if(keytemp.eq.0) then !need to find temperature based on xeps + xeps = xenr + energy_shift + leps = log10(max(xeps,1.0d0)) call findtemp(lr,lt,y,leps,keyerrt,rfeps) if(keyerrt.ne.0) then keyerr = keyerrt return endif xtemp = 10.0d0**lt - - elseif(keytemp.gt.1) then - stop "eos_nuc_press does not support keytemp other than 0 and 1" endif - ! have temperature, proceed: call findall_press_eps(lr,lt,y,ff) xprs = 10.0d0**ff(1) - - if(keytemp.eq.1) then - xenr = 10.0d0**ff(2) - energy_shift - endif + xenr = 10.0d0**ff(2) - energy_shift end subroutine nuc_eos_press_eps |