diff --git a/configure b/configure index 8cc19b56..171bb377 100755 --- a/configure +++ b/configure @@ -76,6 +76,11 @@ from collections import namedtuple Info = namedtuple("Info", ["url", "description", "default_path"]) path_github = {"head": "http://github.com", "tail": "archive/master.tar.gz"} +def path_gitlab(user,project,branch): + """For example, + https://gitlab.com/scemama/resultsFile/-/archive/master/resultsFile-master.tar.gz + """ + return "http://gitlab.com/%(user)s/%(project)s/-/archive/%(branch)s/%(project)s-%(branch)s.tar.gz"%locals() ocaml = Info( url='http://raw.github.com/ocaml/opam/master/shell/opam_installer.sh', @@ -113,7 +118,7 @@ docopt = Info( default_path=join(QP_ROOT_INSTALL, "docopt")) resultsFile = Info( - url='{head}/LCPQ/resultsFile/{tail}'.format(**path_github), + url=path_gitlab("scemama","resultsFile","master"), description=' resultsFile', default_path=join(QP_ROOT_INSTALL, "resultsFile")) @@ -128,7 +133,7 @@ emsl = Info( default_path=join(QP_ROOT_INSTALL, "emsl")) ezfio = Info( - url='{head}/LCPQ/EZFIO/{tail}'.format(**path_github), + url=path_gitlab("scemama","EZFIO","master"), description=' EZFIO', default_path=join(QP_ROOT_INSTALL, "EZFIO")) diff --git a/src/Integrals_Bielec/map_integrals.irp.f b/src/Integrals_Bielec/map_integrals.irp.f index 05979d9f..2fd057b4 100644 --- a/src/Integrals_Bielec/map_integrals.irp.f +++ b/src/Integrals_Bielec/map_integrals.irp.f @@ -477,7 +477,6 @@ subroutine get_mo_bielec_integrals(j,k,l,sze,out_val,map) out_val(i) = dble(tmp) endif enddo - end subroutine get_mo_bielec_integrals_ij(k,l,sze,out_array,map) @@ -556,7 +555,7 @@ subroutine get_mo_bielec_integrals_coulomb_ii(k,l,sze,out_val,map) call bielec_integrals_index(k,i,l,i,hash(i)) enddo - if (key_kind == 8) then + if (integral_kind == 8) then call map_get_many(map, hash, out_val, sze) else call map_get_many(map, hash, tmp_val, sze) @@ -589,7 +588,7 @@ subroutine get_mo_bielec_integrals_exch_ii(k,l,sze,out_val,map) call bielec_integrals_index(k,i,i,l,hash(i)) enddo - if (key_kind == 8) then + if (integral_kind == 8) then call map_get_many(map, hash, out_val, sze) else call map_get_many(map, hash, tmp_val, sze)