User: rhaas Date: 2013/03/27 08:47 PM

Modified: /trunk/src/ GRHydro_Prim2ConM.F90

Log: GRHydro: move critical section in prim2conM into if statement

otherwise the code will enter and leave the critical section during each loop iteration

From: Roland Haas rhaas@tapir.caltech.edu

File Changes:

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

File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Prim2ConM.F90 2013-03-28 01:47:00 UTC (rev 498) +++ trunk/src/GRHydro_Prim2ConM.F90 2013-03-28 01:47:09 UTC (rev 499) @@ -159,12 +159,12 @@ xtemp(1) = 0.5d0*(temperature(i,j,k) + & temperature(i-xoffset,j-yoffset,k-zoffset))

- !$OMP CRITICAL if (y_e_minus(i,j,k) .le. 0.0d0 .or. y_e_plus(i,j,k) .le. 0.0d0) then + !$OMP CRITICAL write(NaN_WarnLine,'(a100,7g15.6)') '(y_e_minus,y_e_plus,x,y,z,rho)', y_e(i,j,k), y_e_minus(i,j,k), y_e_plus(i,j,k), x(i,j,k),y(i,j,k),z(i,j,k),rho(i,j,k) call CCTK_WARN(1, NaN_WarnLine) + !$OMP END CRITICAL endif - !$OMP END CRITICAL call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,& i,j,k,x(i,j,k),y(i,j,k),z(i,j,k), gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & avg_detl,densminus(i,j,k),sxminus(i,j,k),&