diff options
| author | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2011-09-15 16:43:29 +0000 |
|---|---|---|
| committer | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2011-09-15 16:43:29 +0000 |
| commit | 76ba623bb876010bae337587f20a440531956fe0 (patch) | |
| tree | 07e4e801becf69d1bd048303af85c8820eb822bc /src/GRHydro_Prim2Con.F90 | |
| parent | 3fe900e7b6808a214b3341bf923bd57a67ce9450 (diff) | |
add more workarounds in Con2Prim for hot EOS
* fix con2prim issues (pertaining to error messages)
* fix OMP CRITICAL issues in Prim2Con and Con2Prim
original commits by Christian Ott (cott)
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@267 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
Diffstat (limited to 'src/GRHydro_Prim2Con.F90')
| -rw-r--r-- | src/GRHydro_Prim2Con.F90 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/GRHydro_Prim2Con.F90 b/src/GRHydro_Prim2Con.F90 index 8a428c9..fbe118b 100644 --- a/src/GRHydro_Prim2Con.F90 +++ b/src/GRHydro_Prim2Con.F90 @@ -254,7 +254,7 @@ subroutine prim2con_hot(handle, GRHydro_reflevel, ii, jj, kk, & drho,deps,temp,ye,dpress,keyerr,anyerr) keytemp=0 if(anyerr.ne.0) then - !$OMP CRITICAL(p2c1) + !$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) @@ -264,13 +264,13 @@ subroutine prim2con_hot(handle, GRHydro_reflevel, ii, jj, kk, & call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) - !$OMP END CRITICAL(p2c1) + !$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(p2c2) + !$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) @@ -280,14 +280,14 @@ subroutine prim2con_hot(handle, GRHydro_reflevel, ii, jj, kk, & call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) - !$OMP END CRITICAL(p2c2) + !$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(p2c3) + !$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) @@ -298,7 +298,7 @@ subroutine prim2con_hot(handle, GRHydro_reflevel, ii, jj, kk, & write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") - !$OMP END CRITICAL(p2c3) + !$OMP END CRITICAL endif endif endif |