aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcott <cott@8e189c6b-2ab8-4400-aa02-70a9cfce18b9>2010-11-12 00:35:41 +0000
committercott <cott@8e189c6b-2ab8-4400-aa02-70a9cfce18b9>2010-11-12 00:35:41 +0000
commit828cdf7aa06c6a1d6e56ade9465c27260028ccc7 (patch)
treed53cd93de64c8c3f34d9431d861859cc9016dd7e /src
parentcbb9792fc45269b26ed09f60148563abbd461fda (diff)
* fix a bug in call with entropy
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEOS/EOS_Omni/EOS_Omni@16 8e189c6b-2ab8-4400-aa02-70a9cfce18b9
Diffstat (limited to 'src')
-rw-r--r--src/EOS_Omni_MultiVarCalls.F904
-rw-r--r--src/nuc_eos/nuc_eos.F901
2 files changed, 3 insertions, 2 deletions
diff --git a/src/EOS_Omni_MultiVarCalls.F90 b/src/EOS_Omni_MultiVarCalls.F90
index 8880fa8..ec35cfe 100644
--- a/src/EOS_Omni_MultiVarCalls.F90
+++ b/src/EOS_Omni_MultiVarCalls.F90
@@ -25,7 +25,7 @@ subroutine EOS_Omni_EOS_short(eoskey,keytemp,rf_precision,npoints,&
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 @@ subroutine EOS_Omni_EOS_short(eoskey,keytemp,rf_precision,npoints,&
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 @@ subroutine EOS_Omni_EOS_short(eoskey,keytemp,rf_precision,npoints,&
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)
diff --git a/src/nuc_eos/nuc_eos.F90 b/src/nuc_eos/nuc_eos.F90
index ba16882..5e73b82 100644
--- a/src/nuc_eos/nuc_eos.F90
+++ b/src/nuc_eos/nuc_eos.F90
@@ -236,6 +236,7 @@ subroutine nuc_eos_short(xrho,xtemp,xye,xenr,xprs,xent,xcs2,xdedt,&
return
endif
xtemp = 10.0d0**lt
+
endif
! have temperature, proceed: