User: cott Date: 2010/11/11 06:35 PM
Modified: /EOS_Omni/ interface.ccl /EOS_Omni/src/ EOS_Omni_MultiVarCalls.F90 /EOS_Omni/src/nuc_eos/ nuc_eos.F90
Log: * fix a bug in call with entropy
File Changes:
Directory: /EOS_Omni/ =====================
File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- EOS_Omni/interface.ccl 2010-11-11 06:07:33 UTC (rev 15) +++ EOS_Omni/interface.ccl 2010-11-12 00:35:41 UTC (rev 16) @@ -110,7 +110,7 @@ CCTK_REAL INOUT ARRAY temp, \ CCTK_REAL IN ARRAY ye, \ CCTK_REAL OUT ARRAY press, \ - CCTK_REAL OUT ARRAY entropy, \ + CCTK_REAL INOUT ARRAY entropy, \ CCTK_REAL OUT ARRAY cs2, \ CCTK_REAL OUT ARRAY dedt, \ CCTK_REAL OUT ARRAY dpderho, \
Directory: /EOS_Omni/src/nuc_eos/ =================================
File [modified]: nuc_eos.F90 Delta lines: +1 -0 =================================================================== --- EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-11 06:07:33 UTC (rev 15) +++ EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-12 00:35:41 UTC (rev 16) @@ -236,6 +236,7 @@ return endif xtemp = 10.0d0**lt + endif
! have temperature, proceed:
Directory: /EOS_Omni/src/ =========================
File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +2 -2 =================================================================== --- EOS_Omni/src/EOS_Omni_MultiVarCalls.F90 2010-11-11 06:07:33 UTC (rev 15) +++ EOS_Omni/src/EOS_Omni_MultiVarCalls.F90 2010-11-12 00:35:41 UTC (rev 16) @@ -25,7 +25,7 @@ CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) CCTK_REAL, intent(out) :: press(npoints) - CCTK_REAL, intent(out) :: entropy(npoints) + CCTK_REAL, intent(inout) :: entropy(npoints) CCTK_REAL, intent(out) :: cs2(npoints) CCTK_REAL, intent(out) :: dedt(npoints) CCTK_REAL, intent(out) :: dpderho(npoints) @@ -40,7 +40,6 @@ real*8 :: xprs,xmunu,xcs2 real*8 :: xdedt,xdpderho,xdpdrhoe
- if(eoskey.ne.4) then call CCTK_WARN(0,"EOS_Omni_EOS_short currently does not work for this eoskey") endif @@ -54,6 +53,7 @@ xtemp = temp(i) xye = ye(i) xenr = eps(i) * inv_eps_gf + xent = entropy(i) call nuc_eos_short(xrho,xtemp,xye,xenr,xprs,& xent,xcs2,xdedt,xdpderho,xdpdrhoe,xmunu,& keytemp,keyerr(i),rf_precision)