[Commits] [svn:einsteintoolkit] GRHydro/trunk/ (Rev. 431)

[rhaas at tapir.caltech.edu]

User: rhaas
Date: 2012/11/08 07:53 PM

Modified:
 /trunk/
  param.ccl
 /trunk/src/
  GRHydro_EoSChangeGamma.F90

Log:
 GRHydro: remove usage of EOS_Module, poly_gamma_ini
 
 From: Roland Haas <roland.haas at physics.gatech.edu>

File Changes:

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

File [modified]: GRHydro_EoSChangeGamma.F90
Delta lines: +8 -12
===================================================================
--- trunk/src/GRHydro_EoSChangeGamma.F90	2012-11-05 14:45:59 UTC (rev 430)
+++ trunk/src/GRHydro_EoSChangeGamma.F90	2012-11-09 01:53:00 UTC (rev 431)
@@ -39,8 +39,6 @@
 
 subroutine GRHydro_EoSChangeGamma(CCTK_ARGUMENTS)
 
-  USE EOS_Omni_Module, only: press_gf, inv_rho_gf, poly_k_cgs, rho_gf
-
   implicit none
 
   ! save memory when MP is not used
@@ -95,8 +93,8 @@
   end if
   
   local_Gamma = 1.0d0 + xpress/xeps
-  press = press_gf * poly_k_cgs * &
-       (rho * inv_rho_gf)**local_Gamma 
+  press = poly_k * &
+       rho**local_Gamma 
   eps = press / (rho * (local_Gamma - 1.d0))
 
 !!$  Change the pressure and specific internal energy
@@ -277,8 +275,6 @@
 
 subroutine GRHydro_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS)
 
-  USE EOS_Omni_Module, only: press_gf, inv_rho_gf, poly_k_cgs, rho_gf
-
   implicit none
 
   ! save memory when MP is not used
@@ -293,7 +289,7 @@
   CCTK_INT :: i, j, k
   CCTK_REAL :: det
   
-  CCTK_REAL :: local_Gamma, local_k, eos_k_initial_cgs
+  CCTK_REAL :: local_Gamma, local_k, eos_k_initial
 
   CCTK_REAL, dimension(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)) :: Q
 
@@ -340,13 +336,13 @@
   local_Gamma = 1.0d0 + xpress/xeps
   local_K    = xpress
 
-  eos_k_initial_cgs = initial_k * rho_gf**initial_Gamma / press_gf
+  eos_k_initial = initial_k
 
-  press = (local_Gamma - 1.d0) / (initial_Gamma - 1.0d0 ) * press_gf * eos_k_initial_cgs * &
-  	     (rho * rho_gf) ** initial_Gamma
+  press = (local_Gamma - 1.d0) / (initial_Gamma - 1.0d0 ) * eos_k_initial * &
+  	     rho ** initial_Gamma
 
-  eps = press_gf * eos_k_initial_cgs * & 
-     (rho * inv_rho_gf) ** initial_Gamma / &
+  eps = eos_k_initial * & 
+     rho ** initial_Gamma / &
      (rho * (initial_Gamma - 1.0d0))
 
   do k = 1, cctk_lsh(3)

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

File [modified]: param.ccl
Delta lines: +8 -0
===================================================================
--- trunk/param.ccl	2012-11-05 14:45:59 UTC (rev 430)
+++ trunk/param.ccl	2012-11-09 01:53:00 UTC (rev 431)
@@ -64,6 +64,14 @@
 
 USES INT spatial_order
 
+#########################################
+###  PARAMETRES SHARED FROM EOS_Omni  ###
+#########################################
+
+SHARES: EOS_Omni
+
+USES REAL poly_k
+
 restricted:
 
 BOOLEAN GRHydro_enable_internal_excision "Set this to 'false' to disable the thorn-internal excision." STEERABLE=ALWAYS