User: cott Date: 2010/11/16 04:45 PM
Modified: /EOS_Omni/ param.ccl /EOS_Omni/src/ EOS_Omni_SingleVarCalls.F90 /EOS_Omni/src/nuc_eos/ readtable.F90
Log: * add a parameter controlling a potential energy shift
File Changes:
Directory: /EOS_Omni/ =====================
File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- EOS_Omni/param.ccl 2010-11-16 15:19:04 UTC (rev 20) +++ EOS_Omni/param.ccl 2010-11-16 22:45:24 UTC (rev 21) @@ -62,6 +62,10 @@ { } "No"
+BOOLEAN do_energy_shift "shift energies around?" STEERABLE=ALWAYS +{ +} "yes" + STRING nuceos_table_name "nuceos table name (hdf5)" { .* :: "Can be anything"
Directory: /EOS_Omni/src/nuc_eos/ =================================
File [modified]: readtable.F90 Delta lines: +11 -1 =================================================================== --- EOS_Omni/src/nuc_eos/readtable.F90 2010-11-16 15:19:04 UTC (rev 20) +++ EOS_Omni/src/nuc_eos/readtable.F90 2010-11-16 22:45:24 UTC (rev 21) @@ -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 @@
implicit none
+ DECLARE_CCTK_PARAMETERS; + character(*) eos_filename
character(len=100) message @@ -205,13 +211,17 @@ 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)
Directory: /EOS_Omni/src/ =========================
File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +0 -7 =================================================================== --- EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-16 15:19:04 UTC (rev 20) +++ EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-16 22:45:24 UTC (rev 21) @@ -96,13 +96,6 @@ 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)
commits@lists.einsteintoolkit.org