[Commits] [svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 11)

cott at tapir.caltech.edu cott at tapir.caltech.edu
Sun Oct 24 09:06:52 CDT 2010


User: cott
Date: 2010/10/24 09:06 AM

Modified:
 /EOS_Omni/
  param.ccl
 /EOS_Omni/src/
  EOS_Omni_SingleVarCalls.F90, EOS_Omni_Startup.F90
 /EOS_Omni/src/nuc_eos/
  readtable.F90

Log:
 * add capability allowing to read in finite-T EOS tables.

File Changes:

Directory: /EOS_Omni/
=====================

File [modified]: param.ccl
Delta lines: +11 -0
===================================================================
--- EOS_Omni/param.ccl	2010-10-24 13:33:35 UTC (rev 10)
+++ EOS_Omni/param.ccl	2010-10-24 14:06:52 UTC (rev 11)
@@ -55,3 +55,14 @@
 {
  : :: ""
 } 3.238607e-4
+
+################ Finite-Temperature Nuclear EOS
+
+BOOLEAN nuceos_read_table "Read in EOS table?"
+{
+} "No"
+
+STRING nuceos_table_name "nuceos table name (hdf5)"
+{
+ .* :: "Can be anything"
+} "blah.h5"

Directory: /EOS_Omni/src/nuc_eos/
=================================

File [modified]: readtable.F90
Delta lines: +3 -3
===================================================================
--- EOS_Omni/src/nuc_eos/readtable.F90	2010-10-24 13:33:35 UTC (rev 10)
+++ EOS_Omni/src/nuc_eos/readtable.F90	2010-10-24 14:06:52 UTC (rev 11)
@@ -1,4 +1,4 @@
-subroutine readtable(eos_filename)
+subroutine nuc_eos_readtable(eos_filename)
 ! This routine reads the table and initializes
 ! all variables in the module. 
 
@@ -21,7 +21,7 @@
   real*8 buffer1,buffer2,buffer3,buffer4
   accerr=0
 
-  write(*,*) "Reading Ott EOS Table"
+  write(*,*) "Reading Nuclear EOS Table"
 
   call h5open_f(error)
 
@@ -229,6 +229,6 @@
   write(6,*) "Done reading eos tables"
 
 
-end subroutine readtable
+end subroutine nuc_eos_readtable
 
 

Directory: /EOS_Omni/src/
=========================

File [modified]: EOS_Omni_SingleVarCalls.F90
Delta lines: +7 -0
===================================================================
--- EOS_Omni/src/EOS_Omni_SingleVarCalls.F90	2010-10-24 13:33:35 UTC (rev 10)
+++ EOS_Omni/src/EOS_Omni_SingleVarCalls.F90	2010-10-24 14:06:52 UTC (rev 11)
@@ -84,6 +84,13 @@
            press(i) = hybrid_p_poly + hybrid_p_th
         enddo
 
+!!!     case (4)
+!!!
+!!!        do i=1,npoints
+!!!
+!!!        enddo
+
+
      case DEFAULT
         write(warnstring,*) "eoskey ",eoskey," not implemented!"
         call CCTK_WARN(0,warnstring)

File [modified]: EOS_Omni_Startup.F90
Delta lines: +14 -1
===================================================================
--- EOS_Omni/src/EOS_Omni_Startup.F90	2010-10-24 13:33:35 UTC (rev 10)
+++ EOS_Omni/src/EOS_Omni_Startup.F90	2010-10-24 14:06:52 UTC (rev 11)
@@ -10,6 +10,8 @@
 
   DECLARE_CCTK_PARAMETERS
   DECLARE_CCTK_ARGUMENTS
+  character(len=512) eosfilename
+  CCTK_INT fslen
 
   poly_k_cgs = poly_k * rho_gf**poly_gamma_ini / press_gf
 
@@ -17,7 +19,18 @@
 
   hybrid_k1_cgs = hybrid_k1 * rho_gf**poly_gamma_ini / press_gf
 
-  hybrid_k2_cgs = hybrid_k1_cgs * (hybrid_rho_nuc * inv_rho_gf)**(hybrid_gamma1-hybrid_gamma2)
+  hybrid_k2_cgs = hybrid_k1_cgs * &
+       (hybrid_rho_nuc * inv_rho_gf)**(hybrid_gamma1-hybrid_gamma2)
 
+  if(nuceos_read_table.ne.0) then
+     ! call EOS table reader
+     call CCTK_FortranString(fslen,nuceos_table_name,eosfilename)
+     call CCTK_INFO("##################################################")
+     call CCTK_INFO("EOS_Omni: Reading finite-T nuclear EOS table")
+     call CCTK_INFO(eosfilename)
+     call CCTK_INFO("##################################################")
+     call nuc_eos_readtable(eosfilename)
+  endif
+  
 
 end subroutine EOS_Omni_Startup



More information about the Commits mailing list