aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcott <cott@8e189c6b-2ab8-4400-aa02-70a9cfce18b9>2010-11-16 22:45:24 +0000
committercott <cott@8e189c6b-2ab8-4400-aa02-70a9cfce18b9>2010-11-16 22:45:24 +0000
commitd471320fbb24b753f970b611c67fd7d35aff25cc (patch)
tree928523337f366eb32342117a45dee256e0ae8295 /src
parent44ff1e4799a014f4bac2b2fcb2cc34d75a2c5edc (diff)
* add a parameter controlling a potential energy shift
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEOS/EOS_Omni/EOS_Omni@21 8e189c6b-2ab8-4400-aa02-70a9cfce18b9
Diffstat (limited to 'src')
-rw-r--r--src/EOS_Omni_SingleVarCalls.F907
-rw-r--r--src/nuc_eos/readtable.F9012
2 files changed, 11 insertions, 8 deletions
diff --git a/src/EOS_Omni_SingleVarCalls.F90 b/src/EOS_Omni_SingleVarCalls.F90
index 3cd6c38..72abe97 100644
--- a/src/EOS_Omni_SingleVarCalls.F90
+++ b/src/EOS_Omni_SingleVarCalls.F90
@@ -96,13 +96,6 @@ subroutine EOS_Omni_EOS_Press(eoskey,keytemp,rf_precision,npoints,&
xtemp = temp(i)
xye = ye(i)
xenr = eps(i) * inv_eps_gf
- if(xye.lt.0.1) then
- write (warnstring,"(A6,1P10E16.7)") "blah: ",xye,xrho
- call CCTK_WARN(1,warnstring)
- keyerr(i) = 102
- anyerr = 1
- return
- endif
call nuc_eos_press_eps(xrho,xtemp,xye,xenr,xprs,&
keytemp,keyerr(i),rf_precision)
diff --git a/src/nuc_eos/readtable.F90 b/src/nuc_eos/readtable.F90
index 1eee600..a06cff8 100644
--- a/src/nuc_eos/readtable.F90
+++ b/src/nuc_eos/readtable.F90
@@ -1,3 +1,7 @@
+#include "cctk.h"
+#include "cctk_Parameters.h"
+
+
subroutine nuc_eos_readtable(eos_filename)
! This routine reads the table and initializes
! all variables in the module.
@@ -7,6 +11,8 @@ subroutine nuc_eos_readtable(eos_filename)
implicit none
+ DECLARE_CCTK_PARAMETERS;
+
character(*) eos_filename
character(len=100) message
@@ -205,13 +211,17 @@ subroutine nuc_eos_readtable(eos_filename)
call h5dread_f(dset_id, H5T_NATIVE_DOUBLE, energy_shift, dims1, error)
call h5dclose_f(dset_id,error)
accerr=accerr+error
-
+
if(accerr.ne.0) then
stop "Problem reading EOS table file"
endif
call h5fclose_f (file_id,error)
+ if(do_energy_shift.ne.1) then
+ energy_shift = 0.0d0
+ endif
+
! not a good idea to call this function as it will screw recovery
! call h5close_f (error)