LCPQ/quantum_package
10
0
Fork 0
mirror of https://github.com/LCPQ/quantum_package synced 2025-04-29 19:55:03 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2 from LCPQ/master

Browse Source 
Merge
This commit is contained in:
Thomas Applencourt 2017-01-19 16:54:41 -06:00 committed by GitHub
commit 803b48cc64
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -122,7 +122,7 @@ docopt = Info(
default_path=join(QP_ROOT_INSTALL, "docopt")) default_path=join(QP_ROOT_INSTALL, "docopt"))
resultsFile = Info( resultsFile = Info(
url='{head}/TApplencourt/resultsFile/{tail}'.format(**path_github), url='{head}/LCPQ/resultsFile/{tail}'.format(**path_github),
description=' resultsFile', description=' resultsFile',
default_path=join(QP_ROOT_INSTALL, "resultsFile")) default_path=join(QP_ROOT_INSTALL, "resultsFile"))

16
src/Utils/map_module.f90
View File

@ -17,7 +17,6 @@ module map_module
! should be called before getting data from the map. ! should be called before getting data from the map.
use omp_lib use omp_lib
use iso_fortran_env
integer, parameter :: integral_kind = 8 integer, parameter :: integral_kind = 8
@ -28,11 +27,7 @@ module map_module
integer, parameter :: map_size_kind = 8 integer, parameter :: map_size_kind = 8
integer, parameter :: map_shift = -15 integer, parameter :: map_shift = -15
integer*8, parameter :: map_mask = ibset(0_8,15)-1_8 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
type cache_map_type type cache_map_type
real(integral_kind), pointer :: value(:) 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(:) integer*8, pointer :: consolidated_idx(:)
logical :: sorted logical :: sorted
logical :: consolidated logical :: consolidated
integer(kind=map_size_kind) :: map_size integer(map_size_kind) :: map_size
integer(kind=map_size_kind) :: n_elements integer(map_size_kind) :: n_elements
integer(kind=int16) :: map_size
integer(kind=int16) :: n_elements
integer(omp_lock_kind) :: lock integer(omp_lock_kind) :: lock
end type map_type end type map_type