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

[cott at tapir.caltech.edu]

User: cott
Date: 2012/01/31 04:01 PM

Modified:
 /trunk/
  schedule.ccl
 /trunk/src/nuc_eos/
  eosmodule.F90, readtable.c

Log:
 * add banner informing user that EOS table is being read
 * fix scheduling issue (reading the table was not scheduled in global mode)
 * re-add option of turning off energy shift

File Changes:

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

File [modified]: eosmodule.F90
Delta lines: +7 -0
===================================================================
--- trunk/src/nuc_eos/eosmodule.F90	2011-11-13 15:50:01 UTC (rev 54)
+++ trunk/src/nuc_eos/eosmodule.F90	2012-01-31 22:01:47 UTC (rev 55)
@@ -70,6 +70,8 @@
 ! directly.
 subroutine allocate_eosmodule(nrho_, ntemp_, nye_, alltables_, logrho_, logtemp_, ye_, energy_shift_)
  use eosmodule
+ DECLARE_CCTK_PARAMETERS
+
  CCTK_INT  :: nrho_, ntemp_, nye_
  CCTK_REAL :: alltables_(nrho_, ntemp_, nye_, 19)
  CCTK_REAL :: logrho_(nrho_)
@@ -85,12 +87,17 @@
  allocate(logrho(nrho))
  allocate(logtemp(ntemp))
  allocate(ye(nye))
+
  alltables = alltables_
  logrho    = logrho_
  logtemp   = logtemp_
  ye        = ye_
 
+
  energy_shift = energy_shift_
+ if(do_energy_shift.ne.1) then
+     energy_shift = 0.0d0
+  endif
 
  ! set min-max values:
  eos_rhomin = 10.0d0**logrho(1)

File [modified]: readtable.c
Delta lines: +9 -0
===================================================================
--- trunk/src/nuc_eos/readtable.c	2011-11-13 15:50:01 UTC (rev 54)
+++ trunk/src/nuc_eos/readtable.c	2012-01-31 22:01:47 UTC (rev 55)
@@ -43,6 +43,12 @@
   DECLARE_CCTK_PARAMETERS
   DECLARE_CCTK_ARGUMENTS
 
+  CCTK_Info(CCTK_THORNSTRING,"*******************************");
+  CCTK_Info(CCTK_THORNSTRING,"Reading nuc_eos table file:");
+  CCTK_Info(CCTK_THORNSTRING,nuceos_table_name);
+  CCTK_Info(CCTK_THORNSTRING,"*******************************");
+
+
   hid_t file;
   if (!file_is_readable(nuceos_table_name))
     CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING,
@@ -74,6 +80,7 @@
   READ_EOS_HDF5("pointstemp", &ntemp, H5T_NATIVE_INT, H5S_ALL);
   READ_EOS_HDF5("pointsye",   &nye,   H5T_NATIVE_INT, H5S_ALL);
 
+
   // Allocate memory for tables
   CCTK_REAL *alltables, *logrho, *logtemp, *ye, energy_shift;
 
@@ -116,6 +123,7 @@
   // Gamma
   READ_EOSTABLE_HDF5("gamma",    18);
 
+
   // Read additional tables and variables
   READ_EOS_HDF5("logrho",       logrho,        H5T_NATIVE_DOUBLE, H5S_ALL);
   READ_EOS_HDF5("logtemp",      logtemp,       H5T_NATIVE_DOUBLE, H5S_ALL);
@@ -129,6 +137,7 @@
   CCTK_FNAME(allocate_eosmodule)
     (&nrho, &ntemp, &nye, alltables, logrho, logtemp, ye, &energy_shift);
 
+
   // Free the memory again because fortran copied the whole thing now
   free(ye);
   free(logtemp);

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

File [modified]: schedule.ccl
Delta lines: +1 -0
===================================================================
--- trunk/schedule.ccl	2011-11-13 15:50:01 UTC (rev 54)
+++ trunk/schedule.ccl	2012-01-31 22:01:47 UTC (rev 55)
@@ -12,6 +12,7 @@
   SCHEDULE EOS_OMNI_ReadTable AT CCTK_INITIAL before ADMBase_InitialData
   {
     LANG: C
+    OPTIONS: global
   } "Read EOS HDF5 table"
 }