[Commits] [svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 33)
schnetter at cct.lsu.edu
schnetter at cct.lsu.edu
Wed Jan 26 10:14:38 CST 2011
User: eschnett
Date: 2011/01/26 10:14 AM
Modified:
/trunk/src/nuc_eos/
linterp.f, linterp_many.F90, make.code.defn, nuc_eos.F90, readtable.F90
Log:
Replace stop commands with calls to CCTK_WARN, since stop with a
string argument is not supported by all Fortran compilers.
File Changes:
Directory: /trunk/src/nuc_eos/
==============================
File [modified]: linterp.f
Delta lines: +3 -1
===================================================================
--- trunk/src/nuc_eos/linterp.f 2010-12-22 21:44:39 UTC (rev 32)
+++ trunk/src/nuc_eos/linterp.f 2011-01-26 16:14:37 UTC (rev 33)
@@ -1,3 +1,5 @@
+#include "cctk.h"
+
SUBROUTINE intp3d ( x, y, z, f, kt, ft, nx, ny, nz, xt, yt, zt,
. d1, d2, d3 )
c
@@ -50,7 +52,7 @@
double precision dx,dy,dz,dxi,dyi,dzi,dxyi,dxzi,dyzi,dxyzi
integer n,ix,iy,iz
- IF (kt .GT. ktx) STOP'***KTX**'
+ IF (kt .GT. ktx) call CCTK_WARN (0, '***KTX**')
c
c
c------ determine spacing parameters of (equidistant!!!) table
File [modified]: linterp_many.F90
Delta lines: +4 -2
===================================================================
--- trunk/src/nuc_eos/linterp_many.F90 2010-12-22 21:44:39 UTC (rev 32)
+++ trunk/src/nuc_eos/linterp_many.F90 2011-01-26 16:14:37 UTC (rev 33)
@@ -1,3 +1,5 @@
+#include "cctk.h"
+
SUBROUTINE intp3d_many ( x, y, z, f, kt, ft, nx, ny, nz, nvars, xt, yt, zt)
!
implicit none
@@ -43,7 +45,7 @@
real*8 dx,dy,dz,dxi,dyi,dzi,dxyi,dxzi,dyzi,dxyzi
integer n,ix,iy,iz
- IF (kt .GT. ktx) STOP'***KTX**'
+ IF (kt .GT. ktx) call CCTK_WARN(0, '***KTX**')
!
!
!------ determine spacing parameters of (equidistant!!!) table
@@ -65,7 +67,7 @@
!
!------- loop over all points to be interpolated
!
- dO n = 1, kt
+ do n = 1, kt
!
!------- determine location in (equidistant!!!) table
!
File [modified]: make.code.defn
Delta lines: +1 -1
===================================================================
--- trunk/src/nuc_eos/make.code.defn 2010-12-22 21:44:39 UTC (rev 32)
+++ trunk/src/nuc_eos/make.code.defn 2011-01-26 16:14:37 UTC (rev 33)
@@ -1,6 +1,6 @@
SRCS = eosmodule.F90 nuc_eos.F90 bisection.F90 \
findtemp.F90 findrho.F90 linterp_many.F90 readtable.F90 \
- linterp.f
+ linterp.F
SUBDIRS =
File [modified]: nuc_eos.F90
Delta lines: +16 -13
===================================================================
--- trunk/src/nuc_eos/nuc_eos.F90 2010-12-22 21:44:39 UTC (rev 32)
+++ trunk/src/nuc_eos/nuc_eos.F90 2011-01-26 16:14:37 UTC (rev 33)
@@ -17,6 +17,9 @@
! 1 -> coming in with temperature
! 2 -> coming in with entropy
!
+
+#include "cctk.h"
+
subroutine nuc_eos_full(xrho,xtemp,xye,xenr,xprs,xent,xcs2,xdedt,&
xdpderho,xdpdrhoe,xxa,xxh,xxn,xxp,xabar,xzbar,xmu_e,xmu_n,xmu_p, &
xmuhat,keytemp,keyerr,rfeps)
@@ -45,11 +48,11 @@
keyerrr = 0
if(xrho.gt.eos_rhomax) then
- stop "nuc_eos: rho > rhomax"
+ call CCTK_WARN(0, "nuc_eos: rho > rhomax")
endif
if(xrho.lt.eos_rhomin) then
- stop "nuc_eos: rho < rhomin"
+ call CCTK_WARN (0, "nuc_eos: rho < rhomin")
endif
if(xye.gt.eos_yemax) then
@@ -64,11 +67,11 @@
if(keytemp.eq.1) then
if(xtemp.gt.eos_tempmax) then
- stop "nuc_eos: temp > tempmax"
+ call CCTK_WARN (0, "nuc_eos: temp > tempmax")
endif
if(xtemp.lt.eos_tempmin) then
- stop "nuc_eos: temp < tempmin"
+ call CCTK_WARN (0, "nuc_eos: temp < tempmin")
endif
endif
@@ -84,7 +87,7 @@
!need to find temperature based on xeps
call findtemp(lr,lt,y,leps,keyerrt,rfeps)
if(keyerrt.ne.0) then
- stop "Did not find temperature"
+ call CCTK_WARN (0, "Did not find temperature")
endif
xtemp = 10.0d0**lt
@@ -206,7 +209,7 @@
keyerrr = 0
if(xrho.gt.eos_rhomax) then
- stop "nuc_eos: rho > rhomax"
+ call CCTK_WARN (0, "nuc_eos: rho > rhomax")
endif
if(xrho.lt.eos_rhomin*1.2d0) then
@@ -227,7 +230,7 @@
if(keytemp.eq.1) then
if(xtemp.gt.eos_tempmax) then
- stop "nuc_eos: temp > tempmax"
+ call CCTK_WARN (0, "nuc_eos: temp > tempmax")
endif
if(xtemp.lt.eos_tempmin) then
@@ -329,7 +332,7 @@
keyerrt = 0
if(xrho.gt.eos_rhomax) then
- stop "nuc_eos: rho > rhomax"
+ call CCTK_WARN (0, "nuc_eos: rho > rhomax")
endif
if(xrho.lt.eos_rhomin*1.2d0) then
@@ -349,7 +352,7 @@
if(keytemp.eq.1) then
if(xtemp.gt.eos_tempmax) then
- stop "nuc_eos: temp > tempmax"
+ call CCTK_WARN (0, "nuc_eos: temp > tempmax")
endif
if(xtemp.lt.eos_tempmin) then
@@ -361,7 +364,7 @@
keyerr = 0
if(keytemp.gt.1) then
- stop "eos_nuc_press does not support keytemp other than 0 and 1"
+ call CCTK_WARN (0, "eos_nuc_press does not support keytemp other than 0 and 1")
endif
lr = log10(xrho)
@@ -408,7 +411,7 @@
keyerrt = 0
if(xrho.gt.eos_rhomax) then
- stop "nuc_eos: rho > rhomax"
+ call CCTK_WARN (0, "nuc_eos: rho > rhomax")
endif
if(xrho.lt.eos_rhomin*1.2d0) then
@@ -428,7 +431,7 @@
if(keytemp.eq.1) then
if(xtemp.gt.eos_tempmax) then
- stop "nuc_eos: temp > tempmax"
+ call CCTK_WARN (0, "nuc_eos: temp > tempmax")
endif
if(xtemp.lt.eos_tempmin) then
@@ -455,7 +458,7 @@
xtemp = 10.0d0**lt
elseif(keytemp.gt.1) then
- stop "eos_nuc_press does not support keytemp > 1"
+ call CCTK_WARN (0, "eos_nuc_press does not support keytemp > 1")
endif
! have temperature, proceed:
File [modified]: readtable.F90
Delta lines: +4 -4
===================================================================
--- trunk/src/nuc_eos/readtable.F90 2010-12-22 21:44:39 UTC (rev 32)
+++ trunk/src/nuc_eos/readtable.F90 2011-01-26 16:14:37 UTC (rev 33)
@@ -42,7 +42,7 @@
call h5dclose_f(dset_id,error)
if(error.ne.0) then
- stop "Could not read EOS table file"
+ call CCTK_WARN (0, "Could not read EOS table file")
endif
dims1(1)=1
@@ -51,7 +51,7 @@
call h5dclose_f(dset_id,error)
if(error.ne.0) then
- stop "Could not read EOS table file"
+ call CCTK_WARN (0, "Could not read EOS table file")
endif
dims1(1)=1
@@ -60,7 +60,7 @@
call h5dclose_f(dset_id,error)
if(error.ne.0) then
- stop "Could not read EOS table file"
+ call CCTK_WARN (0, "Could not read EOS table file")
endif
! write(message,"(a25,1P3i5)") "We have nrho ntemp nye: ", nrho,ntemp,nye
@@ -213,7 +213,7 @@
accerr=accerr+error
if(accerr.ne.0) then
- stop "Problem reading EOS table file"
+ call CCTK_WARN (0, "Problem reading EOS table file")
endif
call h5fclose_f (file_id,error)
More information about the Commits
mailing list