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

[rhaas at tapir.caltech.edu]

User: rhaas
Date: 2012/07/17 12:08 PM

Modified:
 /trunk/src/
  GRHydro_Prim2Con.F90, GRHydro_UpdateMask.F90

Log:
 * ensure consistency in calls to prim2con_hot (fixes issue with my previous patch)
 
 From: Christian Ott <cott at bethe.tapir.caltech.edu>

File Changes:

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

File [modified]: GRHydro_Prim2Con.F90
Delta lines: +5 -4
===================================================================
--- trunk/src/GRHydro_Prim2Con.F90	2012-07-17 17:08:20 UTC (rev 394)
+++ trunk/src/GRHydro_Prim2Con.F90	2012-07-17 17:08:22 UTC (rev 395)
@@ -305,8 +305,8 @@
         ! This is a way of recovering even on finer refinement levels:
         ! Use the average temperature at the interface instead of the
         ! reconstructed specific internal energy.
+        if(GRHydro_eos_hot_prim2con_warn.ne.0) then
         !$OMP CRITICAL
-        if(GRHydro_eos_hot_prim2con_warn.ne.0) then
            call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!")
            write(warnline,"(i8,3i5,1P10E15.6)") cctk_iteration,ii,jj,kk,x,y,z,r
            call CCTK_WARN(1,warnline)
@@ -316,8 +316,8 @@
            call CCTK_WARN(1,warnline)
            write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
            call CCTK_WARN(1,warnline)
+        !$OMP END CRITICAL
         endif
-        !$OMP END CRITICAL
         keytemp=1
         temp = temp0
         call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,&
@@ -441,8 +441,9 @@
               det = SPATIAL_DETERMINANT(g11(i,j,k),g12(i,j,k),g13(i,j,k), \
               g22(i,j,k),g23(i,j,k),g33(i,j,k))
 
-              call prim2con_hot(GRHydro_eos_handle,GRHydro_reflevel,i,j,k,&
-                   x(i,j,k),y(i,j,k),z(i,j,k),g11(i,j,k),&
+              call prim2con_hot(GRHydro_eos_handle,GRHydro_reflevel,cctk_iteration,&
+                   i,j,k,&
+                   x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),g11(i,j,k),&
                    g12(i,j,k),g13(i,j,k),&
                    g22(i,j,k),g23(i,j,k),g33(i,j,k),&
                    det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&

File [modified]: GRHydro_UpdateMask.F90
Delta lines: +8 -4
===================================================================
--- trunk/src/GRHydro_UpdateMask.F90	2012-07-17 17:08:20 UTC (rev 394)
+++ trunk/src/GRHydro_UpdateMask.F90	2012-07-17 17:08:22 UTC (rev 395)
@@ -303,7 +303,8 @@
                   press(i,j,k),keyerr,anyerr)
 
              call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,&
-                  i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),g11(i,j,k),g12(i,j,k),&
+                  cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
+                  g11(i,j,k),g12(i,j,k),&
                   g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), &
                   det,dens(i,j,k),scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
                   tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), &
@@ -465,7 +466,8 @@
                   press(i,j,k),keyerr,anyerr)
 
              call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,&
-                  i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),g11(i,j,k),g12(i,j,k),&
+                  cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
+                  g11(i,j,k),g12(i,j,k),&
                   g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), &
                   det,dens(i,j,k),scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
                   tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), &
@@ -505,7 +507,8 @@
                   press_p(i,j,k),keyerr,anyerr)
 
              call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,&
-                  i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),g11_p(i,j,k),g12_p(i,j,k),&
+                  cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
+                  g11_p(i,j,k),g12_p(i,j,k),&
                   g13_p(i,j,k),g22_p(i,j,k),g23_p(i,j,k),g33_p(i,j,k), &
                   det,dens_p(i,j,k),scon_p(i,j,k,1), scon_p(i,j,k,2), scon_p(i,j,k,3), &
                   tau_p(i,j,k), rho_p(i,j,k), velx_p(i,j,k), vely_p(i,j,k), &
@@ -545,7 +548,8 @@
                   rho_p_p(i,j,k),eps_p_p(i,j,k),temperature_p_p(i,j,k),y_e_p_p(i,j,k),&
                   press_p_p(i,j,k),keyerr,anyerr)
              call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,&
-                  i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),g11_p_p(i,j,k),g12_p_p(i,j,k),&
+                  cctk_iteration,i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k),&
+                  g11_p_p(i,j,k),g12_p_p(i,j,k),&
                   g13_p_p(i,j,k),g22_p_p(i,j,k),g23_p_p(i,j,k),g33_p_p(i,j,k), &
                   det,dens_p_p(i,j,k),scon_p_p(i,j,k,1), scon_p_p(i,j,k,2), scon_p_p(i,j,k,3), &
                   tau_p_p(i,j,k), rho_p_p(i,j,k), velx_p_p(i,j,k), vely_p_p(i,j,k), &