remove poly_gamma_ini

EOS_Omni used this to compute (initially) conversion factors from code (assumed
to e G=c=M_sun=1) to cgs units. It then goes back and forth between these units
even for polytropic and gamma law eos. This is very confusing since
poly_gamma_ini since poly_gamma_ini must mast poly_gamma and gl_gamma for a
"usual" run with a Gamma law eos.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEOS/EOS_Omni/trunk@73 8e189c6b-2ab8-4400-aa02-70a9cfce18b9

1 files changed, 32 insertions, 32 deletions

diff --git a/src/EOS_Omni_MultiVarCalls.F90 b/src/EOS_Omni_MultiVarCalls.F90
index a989fd3..417ae99 100644
--- a/src/EOS_Omni_MultiVarCalls.F90
+++ b/src/EOS_Omni_MultiVarCalls.F90
@@ -104,7 +104,7 @@ subroutine EOS_Omni_EOS_dpderho_dpdrhoe(eoskey,keytemp,rf_precision,npoints,&
   integer          :: i
   character(256)   :: warnstring
   real*8           :: hybrid_local_gamma
-  real*8           :: hybrid_local_k_cgs
+  real*8           :: hybrid_local_k
   real*8           :: hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2
   ! temporary vars for nuc_eos
   real*8           :: xrho,xye,xtemp,xenr,xent
@@ -120,23 +120,23 @@ subroutine EOS_Omni_EOS_dpderho_dpdrhoe(eoskey,keytemp,rf_precision,npoints,&
      ! polytropic EOS                                                                                      
         if(keytemp.eq.1) then
            do i=1,npoints
-              eps(i) = press_gf * poly_k_cgs * &
-                   (rho(i)*inv_rho_gf)**(poly_gamma) / &
+              eps(i) = poly_k * &
+                   rho(i)**(poly_gamma) / &
                    (poly_gamma - 1.0d0) / rho(i)
            enddo
         endif
         do i=1,npoints
-           dpdrhoe(i) = press_gf * poly_k_cgs *  &
-                poly_gamma * inv_rho_gf *        &
-                (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0)
+           dpdrhoe(i) = poly_k *  &
+                poly_gamma *        &
+                rho(i) ** (poly_gamma - 1.d0)
            dpderho(i) = 0.0d0
         enddo
   case (2)
      ! gamma-law EOS                                                                                       
         if(keytemp.eq.1) then
            do i=1,npoints
-              eps(i) = press_gf * gl_k_cgs * &
-                   (rho(i)*inv_rho_gf)**(gl_gamma) / &
+              eps(i) = gl_k * &
+                   rho(i)**(gl_gamma) / &
                    (gl_gamma - 1.0d0) / rho(i)
            enddo
         endif
@@ -151,23 +151,23 @@ subroutine EOS_Omni_EOS_dpderho_dpdrhoe(eoskey,keytemp,rf_precision,npoints,&
         do i=1,npoints
            if(rho(i).gt.hybrid_rho_nuc) then
               hybrid_local_gamma = hybrid_gamma2
-              hybrid_local_k_cgs = hybrid_k2_cgs
+              hybrid_local_k = hybrid_k2
            else
               hybrid_local_gamma = hybrid_gamma1
-              hybrid_local_k_cgs = hybrid_k1_cgs
+              hybrid_local_k = hybrid_k1
            endif
-           hybrid_dp_poly = hybrid_local_gamma * press_gf *                 &
-                hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * &
-                inv_rho_gf**hybrid_local_gamma
+           hybrid_dp_poly = hybrid_local_gamma *                 &
+                hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0)
+                
 
-           hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * &
+           hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * &
                 (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) *      &
-                rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma
+                rho(i)**(hybrid_local_gamma - 1.d0)
 
            hybrid_dp_th2  = (hybrid_gamma_th - 1.d0) * eps(i)                        &
                 - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) /  &
                 (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) *                    &
-                press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 *               &
+                hybrid_k1 *                &
                 hybrid_rho_nuc**(hybrid_gamma1 - 1.d0)
 
            dpdrhoe(i) = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2
@@ -224,7 +224,7 @@ subroutine EOS_Omni_EOS_dpderho_dpdrhoe(eoskey,keytemp,rf_precision,npoints,&
   integer          :: i
   character(256)   :: warnstring
   real*8           :: hybrid_local_gamma
-  real*8           :: hybrid_local_k_cgs
+  real*8           :: hybrid_local_k
   real*8           :: hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2
   ! temporary vars for nuc_eos
   real*8           :: xrho,xye,xtemp,xenr,xent
@@ -240,23 +240,23 @@ subroutine EOS_Omni_EOS_dpderho_dpdrhoe(eoskey,keytemp,rf_precision,npoints,&
      ! polytropic EOS                                                                                      
         if(keytemp.eq.1) then
            do i=1,npoints
-              eps(i) = press_gf * poly_k_cgs * &
-                   (rho(i)*inv_rho_gf)**(poly_gamma) / &
+              eps(i) = poly_k * &
+                   rho(i)**(poly_gamma) / &
                    (poly_gamma - 1.0d0) / rho(i)
            enddo
         endif
         do i=1,npoints
            depsdpress(i) = 1.0d0/(poly_gamma - 1.0d0)/rho(i)
-           depsdrho(i) = depsdpress(i) * press_gf * poly_k_cgs *  &
-                poly_gamma * inv_rho_gf *        &
-                (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0)
+           depsdrho(i) = depsdpress(i) * poly_k *  &
+                poly_gamma *         &
+                rho(i) ** (poly_gamma - 1.d0)
         enddo
   case (2)
      ! gamma-law EOS                                                                                       
         if(keytemp.eq.1) then
            do i=1,npoints
-              eps(i) = press_gf * gl_k_cgs * &
-                   (rho(i)*inv_rho_gf)**(gl_gamma) / &
+              eps(i) = gl_k * &
+                   rho(i)**(gl_gamma) / &
                    (gl_gamma - 1.0d0) / rho(i)
            enddo
         endif
@@ -270,23 +270,23 @@ subroutine EOS_Omni_EOS_dpderho_dpdrhoe(eoskey,keytemp,rf_precision,npoints,&
         do i=1,npoints
            if(rho(i).gt.hybrid_rho_nuc) then
               hybrid_local_gamma = hybrid_gamma2
-              hybrid_local_k_cgs = hybrid_k2_cgs
+              hybrid_local_k = hybrid_k2
            else
               hybrid_local_gamma = hybrid_gamma1
-              hybrid_local_k_cgs = hybrid_k1_cgs
+              hybrid_local_k = hybrid_k1
            endif
-           hybrid_dp_poly = hybrid_local_gamma * press_gf *                 &
-                hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * &
-                inv_rho_gf**hybrid_local_gamma
+           hybrid_dp_poly = hybrid_local_gamma *                 &
+                hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0)
+                
 
-           hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * &
+           hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * &
                 (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) *      &
-                rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma
+                rho(i)**(hybrid_local_gamma - 1.d0)
 
            hybrid_dp_th2  = (hybrid_gamma_th - 1.d0) * eps(i)                        &
                 - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) /  &
                 (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) *                    &
-                press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 *               &
+                hybrid_k1 *               &
                 hybrid_rho_nuc**(hybrid_gamma1 - 1.d0)
 
            xdpdrhoe = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2