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, 59 deletions

diff --git a/src/GRHydro_UpdateMask.F90 b/src/GRHydro_UpdateMask.F90
index 734d84c..fbb4cda 100644
--- a/src/GRHydro_UpdateMask.F90
+++ b/src/GRHydro_UpdateMask.F90
@@ -34,11 +34,6 @@ subroutine GRHydroUpdateAtmosphereMask(CCTK_ARGUMENTS)
   CCTK_INT :: i,j,k
   CCTK_REAL :: frac
 
-  CCTK_INT :: type_bits, atmosphere
-
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere")
-
   frac = CCTK_DELTA_TIME
 
   if(evolve_temper.ne.1.and.evolve_Y_e.ne.1) then
@@ -47,16 +42,13 @@ subroutine GRHydroUpdateAtmosphereMask(CCTK_ARGUMENTS)
         do j = 1, cctk_lsh(2)
            do i = 1, cctk_lsh(1)
               if ( GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. &
-                   (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, \
-                 type_bits, atmosphere)) .or. &
+                   (atmosphere_mask(i,j,k) .ne. 0) .or. &
                       (tau(i,j,k) + frac * taurhs(i,j,k) .le. 0.d0) .or. &
                       (dens(i,j,k) + frac * densrhs(i,j,k) .le. 0.d0) ) then
                  densrhs(i,j,k) = 0.0d0
                  srhs(i,j,k,:)   = 0.0d0
                  taurhs(i,j,k)  = 0.0d0
                  atmosphere_mask(i,j,k) = 1
-                 
-                 SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, atmosphere)
               end if
            end do
         end do
@@ -69,16 +61,13 @@ subroutine GRHydroUpdateAtmosphereMask(CCTK_ARGUMENTS)
         do j = 1, cctk_lsh(2)
            do i = 1, cctk_lsh(1)
               if ( GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. &
-                   (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, \
-                 type_bits, atmosphere)) .or. &
+                   (atmosphere_mask(i,j,k) .ne. 0) .or. &
                       (dens(i,j,k) + frac * densrhs(i,j,k) .le. 0.d0) ) then
                  y_e_con_rhs(i,j,k) = 0.0d0
                  densrhs(i,j,k) = 0.0d0
                  srhs(i,j,k,:)   = 0.0d0
                  taurhs(i,j,k)  = 0.0d0
                  atmosphere_mask(i,j,k) = 1
-                 
-                 SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, atmosphere)
               end if
            end do
         end do
@@ -110,8 +99,6 @@ subroutine GRHydro_SetupMask(CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
 
-  CCTK_INT :: type_bits, not_atmosphere, i, j, k
-
   ! Initialize all rhs variables and the mask.
   ! The former vars need to be initialized since there is
   ! no rhs computation in CCTK_INITIAL or POSTINITIAL.
@@ -130,20 +117,6 @@ subroutine GRHydro_SetupMask(CCTK_ARGUMENTS)
 
   atmosphere_mask = 0
   
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(not_atmosphere, &
-       &"Hydro_Atmosphere", "not_in_atmosphere")
-
-  do k = 1, cctk_lsh(3)
-    do j = 1, cctk_lsh(2)
-      do i = 1, cctk_lsh(1)
-  
-        SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, not_atmosphere)
-
-      end do
-    end do
-  end do
-
   call CCTK_INFO("Setting up the atmosphere mask: all points are not_atmosphere")
   
 end subroutine GRHydro_SetupMask
@@ -169,23 +142,14 @@ subroutine GRHydro_InitAtmosMask(CCTK_ARGUMENTS)
 
   DECLARE_CCTK_ARGUMENTS
 
-  CCTK_INT :: type_bits, atmosphere, i, j, k
-
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, &
-       &"Hydro_Atmosphere", "in_atmosphere")
+  CCTK_INT :: i,j,k
 
   do k = 1, cctk_lsh(3)
     do j = 1, cctk_lsh(2)
       do i = 1, cctk_lsh(1)
-
         if (rho(i,j,k) .le. GRHydro_rho_min) then
-  
-          SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, atmosphere)
           atmosphere_mask(i,j,k) = 1
-
         end if
-        
       end do
     end do
   end do
@@ -225,7 +189,6 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
   CCTK_INT :: i, j, k
   CCTK_REAL :: det, psi4pt
 
-  CCTK_INT :: type_bits, atmosphere, not_atmosphere
 
   ! save memory when MP is not used
   CCTK_INT :: GRHydro_UseGeneralCoordinates
@@ -258,20 +221,12 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
     vup => vel
   end if
 
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere",&
-                              "in_atmosphere")
-  call SpaceMask_GetStateBits(not_atmosphere, "Hydro_Atmosphere",&
-                              "not_in_atmosphere")
 !$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr)
   do k = 1, cctk_lsh(3)
     do j = 1, cctk_lsh(2)
       do i = 1, cctk_lsh(1)
         
-        if ( (atmosphere_mask(i, j, k) .eq. 1) &
-             &.or. (SpaceMask_CheckStateBitsF90(space_mask,i, j, k, type_bits,\
-                    atmosphere)) &
-             &) then
+        if (atmosphere_mask(i, j, k) .ne. 0) then
 
           rho(i,j,k) = GRHydro_rho_min
           velx(i,j,k) = 0.0d0
@@ -305,9 +260,7 @@ subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
                   tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), &
                   velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k))
              if (wk_atmosphere .eq. 0) then
-                 atmosphere_mask(i, j, k) = 0
-                 SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits,\
-                                           not_atmosphere)
+                atmosphere_mask(i, j, k) = 0
              end if
           endif
 
@@ -344,7 +297,6 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
   CCTK_REAL :: det, psi4pt
   CCTK_REAL :: rho_min
 
-  CCTK_INT :: type_bits, atmosphere, not_atmosphere
   CCTK_INT :: eos_handle
 
 
@@ -428,12 +380,6 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS)
 
   eos_handle = GRHydro_polytrope_handle
   
-  call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
-  call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere",&
-                              "in_atmosphere")
-  call SpaceMask_GetStateBits(not_atmosphere, "Hydro_Atmosphere",&
-                              "not_in_atmosphere")
-
   rho_min = GRHydro_rho_min
   if (initial_atmosphere_factor .gt. 0) then
     rho_min = rho_min * initial_atmosphere_factor