From 44ccc24e72f80f3d89402027bbdd4ff0d73331cd Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Thu, 19 Jan 2017 16:29:50 -0600 Subject: [PATCH] Restaure map_module.f90 --- src/Utils/map_module.f90 | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/Utils/map_module.f90 b/src/Utils/map_module.f90 index 1a42bfde..80260233 100644 --- a/src/Utils/map_module.f90 +++ b/src/Utils/map_module.f90 @@ -17,7 +17,6 @@ module map_module ! should be called before getting data from the map. use omp_lib - use iso_fortran_env integer, parameter :: integral_kind = 8 @@ -28,11 +27,7 @@ module map_module integer, parameter :: map_size_kind = 8 integer, parameter :: map_shift = -15 -integer*8, parameter :: map_mask = ibset(0_8,15)-1_8 - - integer(kind=int16), parameter :: z_kind = 0 - integer(kind=int16), parameter :: o_kind = 1 - integer(kind=int16), parameter :: map_mask = ibset(z_kind,15)-o_kind + integer*8, parameter :: map_mask = ibset(0_8,15)-1_8 type cache_map_type real(integral_kind), pointer :: value(:) @@ -50,13 +45,8 @@ integer*8, parameter :: map_mask = ibset(0_8,15)-1_8 integer*8, pointer :: consolidated_idx(:) logical :: sorted logical :: consolidated - integer(kind=map_size_kind) :: map_size - integer(kind=map_size_kind) :: n_elements - - integer(kind=int16) :: map_size - integer(kind=int16) :: n_elements - - + integer(map_size_kind) :: map_size + integer(map_size_kind) :: n_elements integer(omp_lock_kind) :: lock end type map_type