[Commits] [svn:einsteintoolkit] EOS_Omni/trunk/src/ (Rev. 32)

[cott at tapir.caltech.edu]

User: cott
Date: 2010/12/22 03:44 PM

Modified:
 /trunk/src/
  EOS_Omni_MultiVarCalls.F90
 /trunk/src/nuc_eos/
  nuc_eos.F90

Log:
 * make nuc_eos thread safe
 * fix a bug in MultiVarCalls

File Changes:

Directory: /trunk/src/nuc_eos/
==============================

File [modified]: nuc_eos.F90
Delta lines: +18 -7
===================================================================
--- trunk/src/nuc_eos/nuc_eos.F90	2010-12-16 21:02:36 UTC (rev 31)
+++ trunk/src/nuc_eos/nuc_eos.F90	2010-12-22 21:44:39 UTC (rev 32)
@@ -38,9 +38,12 @@
   real*8 :: lr,lt,y,xx,xeps,leps,xs,xpressure
   real*8 :: d1,d2,d3
   real*8 :: ff(nvars)
-  integer :: keyerrt = 0
-  integer :: keyerrr = 0
+  integer :: keyerrt 
+  integer :: keyerrr 
 
+  keyerrt = 0
+  keyerrr = 0
+
   if(xrho.gt.eos_rhomax) then
      stop "nuc_eos: rho > rhomax"
   endif
@@ -158,7 +161,8 @@
 
   implicit none
   real*8 xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe
-  real*8,parameter :: idealK1 =  1.2435d15 * (0.5d0**(4.d0/3.d0))
+  real*8,parameter :: idealK1 =  4.93483302030614d14
+!  real*8,parameter :: idealK1 =  1.2435d15 * (0.5d0**(4.d0/3.d0))
   real*8,parameter :: idealgamma = 1.41d0
   integer keytemp
 
@@ -195,9 +199,12 @@
   ! local variables
   real*8 :: lr,lt,y,xx,xeps,leps,xs,xpressure
   real*8 :: d1,d2,d3,ff(8)
-  integer :: keyerrt = 0
-  integer :: keyerrr = 0
+  integer :: keyerrt 
+  integer :: keyerrr 
 
+  keyerrt = 0
+  keyerrr = 0
+
   if(xrho.gt.eos_rhomax) then
      stop "nuc_eos: rho > rhomax"
   endif
@@ -317,8 +324,10 @@
   real*8 :: xcs2,xdpderho,xdpdrhoe
   real*8 :: lr,lt,y,xx,xeps,leps,xs
   real*8 :: d1,d2,d3,ff(8)
-  integer :: keyerrt = 0
+  integer :: keyerrt 
 
+  keyerrt = 0
+
   if(xrho.gt.eos_rhomax) then
      stop "nuc_eos: rho > rhomax"
   endif
@@ -394,8 +403,10 @@
   real*8 :: xcs2,xprs
   real*8 :: lr,lt,y,xx,xeps,leps,xs
   real*8 :: d1,d2,d3,ff(8)
-  integer :: keyerrt = 0
+  integer :: keyerrt
 
+  keyerrt = 0
+
   if(xrho.gt.eos_rhomax) then
      stop "nuc_eos: rho > rhomax"
   endif

Directory: /trunk/src/
======================

File [modified]: EOS_Omni_MultiVarCalls.F90
Delta lines: +1 -1
===================================================================
--- trunk/src/EOS_Omni_MultiVarCalls.F90	2010-12-16 21:02:36 UTC (rev 31)
+++ trunk/src/EOS_Omni_MultiVarCalls.F90	2010-12-22 21:44:39 UTC (rev 32)
@@ -62,7 +62,7 @@
         anyerr = 1
      endif
      
-     if(keytemp.eq.1.or.keytemp.eq.2) then
+     if(keytemp.eq.1) then
         eps(i) = xenr * eps_gf
      else if(keytemp.eq.2) then
         eps(i) = xenr * eps_gf