[Commits] [svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 154)

[rhaas at tapir.caltech.edu]

User: rhaas
Date: 2012/09/04 07:28 AM

Modified:
 /trunk/src/
  GRHydro_PoloidalMagFieldM.F90

Log:
 Make GRHydro_PoloidalMagFieldM.F90 call P2C correctly for temperature evolved or not evolved.
 
 From: Philipp Moesta <pmoesta at tapir.caltech.edu>

File Changes:

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

File [modified]: GRHydro_PoloidalMagFieldM.F90
Delta lines: +18 -15
===================================================================
--- trunk/src/GRHydro_PoloidalMagFieldM.F90	2012-09-04 12:28:40 UTC (rev 153)
+++ trunk/src/GRHydro_PoloidalMagFieldM.F90	2012-09-04 12:28:43 UTC (rev 154)
@@ -136,21 +136,24 @@
                    eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),&
                    w_lorentz(i,j,k))
            else
-              call Prim2ConGenM_hot(GRHydro_eos_handle,GRHydro_reflevel,&
-                   i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxx(i,j,k),gxy(i,j,k),&
-                   gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
-                   det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
-                   tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),&
-                   velx(i,j,k),vely(i,j,k),velz(i,j,k),&
-                   eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),&
-                   w_lorentz(i,j,k),temperature(i,j,k),y_e(i,j,k))
-!              call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),&
-!                   gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
-!                   det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
-!                   tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),&
-!                   velx(i,j,k),vely(i,j,k),velz(i,j,k),&
-!                   eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),&
-!                   w_lorentz(i,j,k))
+             if (evolve_temper .ne. 0) then
+               call Prim2ConGenM_hot(GRHydro_eos_handle,GRHydro_reflevel,&
+                    i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxx(i,j,k),gxy(i,j,k),&
+                    gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
+                    det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
+                    tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),&
+                    velx(i,j,k),vely(i,j,k),velz(i,j,k),&
+                    eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),&
+                    w_lorentz(i,j,k),temperature(i,j,k),y_e(i,j,k))
+             else
+               call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),&
+                    gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
+                    det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
+                    tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),&
+                    velx(i,j,k),vely(i,j,k),velz(i,j,k),&
+                    eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),&
+                    w_lorentz(i,j,k))
+             end if
            end if
            
         enddo