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

6 Feb 2011

User: cott
Date: 2011/02/06 08:42 PM
Modified:
 /trunk/src/
  GRHydro_Prim2Con.F90
Log:
 * add !OMP CRITICAL around CCTK_WARN statements
File Changes:
Directory: /trunk/src/
======================
File [modified]: GRHydro_Prim2Con.F90
Delta lines: +7 -1
===================================================================

--- trunk/src/GRHydro_Prim2Con.F90	2011-02-06 16:22:28 UTC (rev 214)
+++ trunk/src/GRHydro_Prim2Con.F90	2011-02-07 02:42:02 UTC (rev 215)
@@ -46,7 +46,7 @@
   integer :: i, j, k
   CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
        gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr
-  CCTK_REAL :: xtemp(1)
+  CCTK_REAL :: xtemp
if(evolve_temper.ne.1) then
      !$OMP PARALLEL DO PRIVATE(i, j, avg_detl, avg_detr,&
@@ -253,6 +253,7 @@
              drho,deps,temp,ye,dpress,keyerr,anyerr)  
         keytemp=0
         if(anyerr.ne.0) then
+           !OMP CRITICAL
            call CCTK_WARN(1,"EOS error in prim2con_hot: lev 2")
            write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
            call CCTK_WARN(1,warnline)
@@ -262,11 +263,13 @@
            call CCTK_WARN(1,warnline)
            write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
            call CCTK_WARN(1,warnline)
+           !OMP END CRITICAL
         endif
      else
         ! 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.
+        !OMP CRITICAL
         call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!")
         write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
         call CCTK_WARN(1,warnline)
@@ -276,12 +279,14 @@
         call CCTK_WARN(1,warnline)
         write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
         call CCTK_WARN(1,warnline)
+        !OMP END CRITICAL
         keytemp=1
         temp = temp0
         call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,&
              drho,deps,temp,ye,dpress,keyerr,anyerr)  
         keytemp=0
         if(anyerr.ne.0) then
+           !OMP CRITICAL
            call CCTK_WARN(1,"EOS error in prim2con_hot")
            write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
            call CCTK_WARN(1,warnline)
@@ -292,6 +297,7 @@
            write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
            call CCTK_WARN(1,warnline)
            call CCTK_WARN(0,"Aborting!!!")
+           !OMP END CRITICAL
         endif
      endif
   endif

    