dump the atmosphere bitmask in favor of the atmosphere integer mask which is used/allocated already anyway

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@292 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

1 files changed, 5 insertions, 32 deletions

diff --git a/src/GRHydro_Con2PrimM.F90 b/src/GRHydro_Con2PrimM.F90
index 2764739..43c8374 100644
--- a/src/GRHydro_Con2PrimM.F90
+++ b/src/GRHydro_Con2PrimM.F90
@@ -55,9 +55,6 @@ subroutine Conservative2PrimitiveM(CCTK_ARGUMENTS)
   CCTK_INT :: epsnegative
   character(len=100) warnline
   
-  CCTK_INT :: type_bits, atmosphere
-  CCTK_INT :: type2_bits
-
   CCTK_REAL :: local_min_tracer, local_gam, local_pgam,local_K,sc
 
 ! begin EOS Omni vars                                                                                       
@@ -67,10 +64,6 @@ subroutine Conservative2PrimitiveM(CCTK_ARGUMENTS)
   xpress=0.0d0;xtemp=0.0d0;xye=0.0d0;xeps=0.0d0
 ! end EOS Omni vars                 
 
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere")
-  type2_bits = -1
-
   nx = cctk_lsh(1)
   ny = cctk_lsh(2)
   nz = cctk_lsh(3)
@@ -100,7 +93,7 @@ subroutine Conservative2PrimitiveM(CCTK_ARGUMENTS)
         do i = 1, nx
            
            !do not compute if in atmosphere or in excised region
-           if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
+           if ((atmosphere_mask(i,j,k) .ne. 0) .or. &
                 (hydro_excision_mask(i,j,k) .ne. 0)) cycle
            
            epsnegative = 0
@@ -297,9 +290,6 @@ subroutine Conservative2PrimitiveBoundsM(CCTK_ARGUMENTS)
   CCTK_INT :: epsnegative
   character(len=100) warnline
  
-  CCTK_INT :: type_bits, atmosphere
-  CCTK_INT :: type2_bits
-
   CCTK_REAL :: local_min_tracer
 
 ! begin EOS Omni vars                                            
@@ -320,10 +310,6 @@ subroutine Conservative2PrimitiveBoundsM(CCTK_ARGUMENTS)
          1.d0,1.0d0,xtemp,xye,local_gam,keyerr,anyerr)
   local_gam=local_gam+1.0
 
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere")
-  type2_bits = -1
-  
   nx = cctk_lsh(1)
   ny = cctk_lsh(2)
   nz = cctk_lsh(3) 
@@ -339,7 +325,7 @@ subroutine Conservative2PrimitiveBoundsM(CCTK_ARGUMENTS)
         do i = GRHydro_stencil, nx - GRHydro_stencil + 1
            
            !do not compute if in atmosphere or in an excised region
-           if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
+           if ((atmosphere_mask(i,j,k) .ne. 0) .or. &
                 GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
            
            gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
@@ -531,9 +517,6 @@ subroutine Conservative2PrimitivePolytypeM(CCTK_ARGUMENTS)
   integer :: i, j, k, itracer, nx, ny, nz
   CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det,b2
 
-  CCTK_INT :: type_bits, atmosphere
-  CCTK_INT :: type2_bits
-
   CCTK_INT :: epsnegative
   
   CCTK_REAL :: local_min_tracer, local_gam, local_pgam,local_K, sc
@@ -546,10 +529,6 @@ subroutine Conservative2PrimitivePolytypeM(CCTK_ARGUMENTS)
   xpress=0.0d0;xtemp=0.0d0;xye=0.0d0;xeps=0.0d0
 ! end EOS Omni vars                 
   
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere")
-  type2_bits = -1
-  
   nx = cctk_lsh(1)
   ny = cctk_lsh(2)
   nz = cctk_lsh(3)
@@ -572,7 +551,7 @@ subroutine Conservative2PrimitivePolytypeM(CCTK_ARGUMENTS)
         do i = 1, nx
            
            !do not compute if in atmosphere or in an excised region
-           if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
+           if ((atmosphere_mask(i,j,k) .ne. 0) .or. &
                 GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
            
         det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k))
@@ -661,9 +640,7 @@ subroutine Con2PrimBoundsPolytypeM(CCTK_ARGUMENTS)
   CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
        gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr
   CCTK_REAL :: b2minus, b2plus
-
-  CCTK_INT :: type_bits, atmosphere
-  CCTK_INT :: type2_bits, epsnegative
+  CCTK_INT :: epsnegative
 
   CCTK_REAL :: local_gam, local_pgam,local_K,scplus,scminus
 
@@ -674,10 +651,6 @@ subroutine Con2PrimBoundsPolytypeM(CCTK_ARGUMENTS)
   xpress=0.0d0;xtemp=0.0d0;xye=0.0d0;xeps=0.0d0
 ! end EOS Omni vars                 
   
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere")
-  type2_bits = -1
-  
   nx = cctk_lsh(1)
   ny = cctk_lsh(2)
   nz = cctk_lsh(3)
@@ -687,7 +660,7 @@ subroutine Con2PrimBoundsPolytypeM(CCTK_ARGUMENTS)
         do i = GRHydro_stencil, nx - GRHydro_stencil + 1
            
            !do not compute if in atmosphere or in an excised region
-           if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
+           if ((atmosphere_mask(i,j,k) .ne. 0) .or. &
                 GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
            
            gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))