Skip to content
Snippets Groups Projects
Commit aa86432e authored by Massimiliano Culpo's avatar Massimiliano Culpo Committed by Todd Gamblin
Browse files

patch directive : fixed retrieval from urls ( fixes #1584 ) (#2039) 

* patch directive : fixed retrieval from urls fixes #1584

 - add support for 'gz' archives
 - fixed bugs with URL patches
 - updated nwchem

* patch directive : added checksum to UrlPatch

 - refactored classes in patch.py
 - updated nwchem

* patch directive : added caching
parent 8de143a9
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
var/spack/repos/builtin/packages/nwchem/tools_lib64.patch deleted 100755 → 0
+ 0
− 14
View file @ 8de143a9
Index: src/config/makefile.h
===================================================================
--- src/config/makefile.h (revision 27828)
+++ src/config/makefile.h (revision 27829)
@@ -99,7 +99,8 @@
ifdef OLD_GA
LIBPATH = -L$(SRCDIR)/tools/lib/$(TARGET)
else
- LIBPATH = -L$(SRCDIR)/tools/install/lib
+ TOOLSLIB = $(shell grep libdir\ = $(NWCHEM_TOP)/src/tools/build/Makefile |grep -v pkgl|cut -b 25-)
+ LIBPATH = -L$(SRCDIR)/tools/install/$(TOOLSLIB)
endif
#
var/spack/repos/builtin/packages/nwchem/txs_gcc6.patch deleted 100755 → 0
+ 0
− 551
View file @ 8de143a9
Index: src/NWints/texas/assemblx.f
===================================================================
--- src/NWints/texas/assemblx.f (revision 28366)
+++ src/NWints/texas/assemblx.f (working copy)
@@ -133,7 +133,9 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
c
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
@@ -258,7 +260,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension aax(nbls1),bbx(nbls1),ccx(nbls1)
@@ -346,7 +350,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension aax(nbls1),bbx(nbls1),ccx(nbls1)
@@ -428,7 +434,9 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
c
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
@@ -626,7 +634,9 @@
character*11 scftype
character*8 where
common /runtype/ scftype,where
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
COMMON/SHELL/LSHELLT,LSHELIJ,LSHELKL,LHELP,LCAS2(4),LCAS3(4)
common /lcases/ lcase
common/obarai/
@@ -913,7 +923,9 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
C
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
@@ -972,7 +984,9 @@
implicit real*8 (a-h,o-z)
logical firstc
c
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
c
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
@@ -1045,7 +1059,9 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
c
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
@@ -1131,7 +1147,9 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
c
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
@@ -1217,7 +1235,9 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
C
dimension indx(*)
dimension xt1(nbls1,lt1,lt2), bf3l(nbls,lt5,lt6)
@@ -1385,7 +1405,9 @@
character*11 scftype
character*8 where
common /runtype/ scftype,where
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
COMMON/SHELL/LSHELLT,LSHELIJ,LSHELKL,LHELP,LCAS2(4),LCAS3(4)
common /lcases/ lcase
common/obarai/
@@ -1659,7 +1681,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension bfij1(nbls,lt3,lt4)
@@ -1707,7 +1731,9 @@
* bfij3,lt3,lt4, factij, indx, ij3b,kl3b)
implicit real*8 (a-h,o-z)
logical firstc
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension bfij3(nbls,lt3,lt4)
@@ -1762,7 +1788,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension bf2l1(nbls,lt3,lt4)
@@ -1829,7 +1857,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension bf3l(nbls,lt5,lt6)
@@ -1895,7 +1925,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2), bf3l(nbls,lt5,lt6)
cccc dimension facti(*), factkl(*)
@@ -2018,7 +2050,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension aax(nbls1),bbx(nbls1),ccx(nbls1)
@@ -2110,7 +2144,9 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension aax(nbls1),bbx(nbls1),ccx(nbls1)
@@ -2196,7 +2232,9 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
c
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
Index: src/NWints/texas/derivat.f
===================================================================
--- src/NWints/texas/derivat.f (revision 28366)
+++ src/NWints/texas/derivat.f (working copy)
@@ -16,7 +16,9 @@
c
implicit real*8 (a-h,o-z)
c
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter (lpar1=34)
+ common /logic4/ nfu(lpar1)
common /big/ bl(1)
COMMON/SHELL/LSHELLT,LSHELIJ,LSHELKL,LHELP,LCAS2(4),LCAS3(4)
common /lcases/ lcase
@@ -289,9 +291,15 @@
* nqij,nqkl, deriv, xab,xcd, xyab,xycd)
implicit real*8 (a-h,o-z)
c
- common /logic4/ nfu(1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
dimension buf2(nbls,lnijr,lnklr,ngcd)
dimension deriv(6,nbls,lnij,lnkl,ngcd)
@@ -374,7 +382,9 @@
c
implicit real*8 (a-h,o-z)
c
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
COMMON/SHELL/LSHELLT,LSHELIJ,LSHELKL,LHELP,LCAS2(4),LCAS3(4)
common /lcases/ lcase
common/obarai/
@@ -705,10 +715,15 @@
c second-der. That's why dimension for buf2(ndim,*,*,*,*) has ndim=4
c for first- and ndim=10 for second-derivatives.
c
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
cccc dimension buf2(4,nbls,lnijr,lnklr,ngcd) OR buf2(10,etc.)
c2002 dimension buf2(ndim,nbls,lnijr,lnklr,ngcd)
@@ -862,7 +877,9 @@
c
implicit real*8 (a-h,o-z)
c
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter(lpar1=34)
+ common /logic4/ nfu(lpar1)
COMMON/SHELL/LSHELLT,LSHELIJ,LSHELKL,LHELP,LCAS2(4),LCAS3(4)
common /lcases/ lcase
common/obarai/
@@ -1131,10 +1148,15 @@
* nqij,nqkl,der2,xab)
implicit real*8 (a-h,o-z)
c
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
c2002 dimension buf2(10,nbls,lnijr,lnklr,ngcd)
dimension buf2(nbls,lnijr,lnklr,ngcd,10)
@@ -1386,10 +1408,15 @@
* nqij,nqkl,
* nder_aa,der2)
implicit real*8 (a-h,o-z)
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
dimension buf2(nbls,lnijr,lnklr,ngcd,10)
dimension der2(45,nbls,lnij,lnkl,ngcd)
@@ -1462,10 +1489,15 @@
* nqij,nqkl,
* nder_cc,der2)
implicit real*8 (a-h,o-z)
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
c2002 dimension buf2(10,nbls,lnijr,lnklr,ngcd)
dimension buf2(nbls,lnijr,lnklr,ngcd,10)
@@ -1533,10 +1565,15 @@
* nqij,nqkl,
* nder_bb,der2,xab)
implicit real*8 (a-h,o-z)
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
c2002 dimension buf2(10,nbls,lnijr,lnklr,ngcd)
dimension buf2(nbls,lnijr,lnklr,ngcd,10)
@@ -1592,10 +1629,15 @@
* nqij,nqkl,
* nder_ab,der2,xab)
implicit real*8 (a-h,o-z)
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
c2002 dimension buf2(10,nbls,lnijr,lnklr,ngcd)
dimension buf2(nbls,lnijr,lnklr,ngcd,10)
@@ -1668,10 +1710,15 @@
* nqij,nqkl,
* nder_ac,der2)
implicit real*8 (a-h,o-z)
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
c2002 dimension buf2(10,nbls,lnijr,lnklr,ngcd)
dimension buf2(nbls,lnijr,lnklr,ngcd,10)
@@ -1742,10 +1789,15 @@
* nqij,nqkl,
* nder_bc,der2,xab)
implicit real*8 (a-h,o-z)
- common /logic4/ nfu(1)
- common /logic9/ nia(3,1)
- common /logic10/ nmxyz(3,1)
- common /logic11/ npxyz(3,1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
c2002 dimension buf2(10,nbls,lnijr,lnklr,ngcd)
dimension buf2(nbls,lnijr,lnklr,ngcd,10)
Index: src/NWints/texas/gencon.f
===================================================================
--- src/NWints/texas/gencon.f (revision 28366)
+++ src/NWints/texas/gencon.f (working copy)
@@ -388,7 +388,15 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,mmax,
* nqi,nqj,nqk,nql,nsij,nskl,
* nqij,nqij1,nsij1,nqkl,nqkl1,nskl1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension buf2(nbls,lt1,lt2,ngcd)
@@ -466,7 +474,15 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
c
- common /logic4/ nfu(1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
@@ -579,7 +595,15 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,mmax,
* nqi,nqj,nqk,nql,nsij,nskl,
* nqij,nqij1,nsij1,nqkl,nqkl1,nskl1,ijbeg,klbeg
- common /logic4/ nfu(1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
dimension indx(*)
dimension xt1(nbls1,lt1,lt2)
dimension gcoef(nbls,ngcd)
Index: src/NWints/texas/shells.f
===================================================================
--- src/NWints/texas/shells.f (revision 28366)
+++ src/NWints/texas/shells.f (working copy)
@@ -5,7 +5,12 @@
common /contr/ ngci,ngcj,ngck,ngcl,lci,lcj,lck,lcl,lcij,lckl
common /lengt/ ilen,jlen,klen,llen, ilen1,jlen1,klen1,llen1
common /gcont/ ngci1,ngcj1,ngck1,ngcl1,ngcd
- common /logic2/ len(1)
+ integer lpar1,lpar4,lpar5
+ parameter(lpar1=34,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
dimension inx(12,*)
c
c This subroutine sets up TYPE and LENGTH of shells and
@@ -93,10 +98,12 @@
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
C
- common /logic1/ ndege(1)
- common /logic2/ len(1)
- common /logic3/ lensm(1)
- common /logic4/ nfu(1)
+ integer lpar1,lpar4,lpar5
+ parameter(lpar1=34,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
c
COMMON/SHELL/LSHELLT,LSHELIJ,LSHELKL,LHELP,LCAS2(4),LCAS3(4)
common /lcases/ lcase
@@ -237,7 +244,15 @@
* lni,lnj,lnk,lnl,lnij,lnkl,lnijkl,MMAX,
* NQI,NQJ,NQK,NQL,NSIJ,NSKL,
* NQIJ,NQIJ1,NSIJ1,NQKL,NQKL1,NSKL1,ijbeg,klbeg
- common /logic3/ lensm(1)
+ integer lpar1,lpar2,lpar3,lpar4,lpar5
+ parameter(lpar1=34,lpar2=6545,lpar3=4060,lpar4=10,lpar5=33)
+ common /logic1/ ndege(lpar4)
+ common /logic2/ len(lpar4)
+ common /logic3/ lensm(lpar5)
+ common /logic4/ nfu(lpar1)
+ common /logic9/ nia(3,lpar2)
+ common /logic10/ nmxyz(3,lpar2)
+ common /logic11/ npxyz(3,lpar3)
c
C************************************************************
c
Index: src/NWints/texas/zeroint.f
===================================================================
--- src/NWints/texas/zeroint.f (revision 28366)
+++ src/NWints/texas/zeroint.f (working copy)
@@ -12,7 +12,9 @@
character*11 scftype
character*8 where
common /runtype/ scftype,where
- common /logic4/ nfu(1)
+ integer lpar1
+ parameter (lpar1=34)
+ common /logic4/ nfu(lpar1)
COMMON/SHELL/LSHELLT,LSHELIJ,LSHELKL,LHELP,LCAS2(4),LCAS3(4)
common /lcases/ lcase
common/obarai/
var/spack/repos/builtin/packages/nwchem/xccvs98.patch deleted 100755 → 0
+ 0
− 54
View file @ 8de143a9
Index: src/nwdft/xc/xc_cvs98.F
===================================================================
--- src/nwdft/xc/xc_cvs98.F (revision 27970)
+++ src/nwdft/xc/xc_cvs98.F (revision 27971)
@@ -160,12 +160,10 @@
GAA = ( delrho(n,1,1)*delrho(n,1,1) +
& delrho(n,2,1)*delrho(n,2,1) +
& delrho(n,3,1)*delrho(n,3,1))/4.0d0
- if(sqrt(gaa).lt.dtol) goto 20
c In the bc95css subroutine, we use 2*TA as the tau, so we do not divide
c the tau by 2 here
TA = tau(n,1)
- if(ta.lt.dtol) goto 20
Call vs98ss(tol_rho,PA,GAA,TA,FA,FPA,FGA,FTA,EUA,ZA,
& ChiA,EUPA,ChiAP,ChiAG,ZAP,ZAT,ijzy)
@@ -213,7 +211,6 @@
c In the bc95css subroutine, we use 2*TA as the tau
c
TA = tau(n,1)*2.0d0
- if(ta.lt.dtol) goto 25
Call vs98ss(tol_rho,PA,GAA,TA,FA,FPA,FGA,FTA,EUA,ZA,
& ChiA,EUPA,ChiAP,ChiAG,ZAP,ZAT,ijzy)
@@ -235,7 +232,6 @@
c
25 continue
PB = rho(n,3)
- if(PB.le.DTol) go to 30
GBB = delrho(n,1,2)*delrho(n,1,2) +
& delrho(n,2,2)*delrho(n,2,2) +
& delrho(n,3,2)*delrho(n,3,2)
@@ -242,7 +238,6 @@
TB = tau(n,2)*2.0d0
- if(tb.lt.dtol) goto 30
Call vs98ss(tol_rho,PB,GBB,TB,FB,FPB,FGB,FTB,EUB,ZB,
& ChiB,EUPB,ChiBP,ChiBG,ZBP,ZBT,ijzy)
Ec = Ec + FB*qwght(n)
@@ -378,10 +373,9 @@
else
call errquit("vs98ss: illegal value of ijzy",ijzy,UERR)
endif
-couch
-c DTol =1.0d-7
+
dtol=tol_rho
- If(PX.le.DTol) then
+ If(PX.le.DTol.or.gx.le.dtol.or.tx.le.dtol) then
EUEG = Zero
Chi = Zero
EUEGP = Zero
var/spack/repos/builtin/packages/nwchem/zgesdv.patch deleted 100755 → 0
+ 0
− 55
View file @ 8de143a9
Index: src/64to32blas/xgesvd.F
===================================================================
--- src/64to32blas/xgesvd.F (revision 0)
+++ src/64to32blas/xgesvd.F (revision 28050)
@@ -0,0 +1,25 @@
+ SUBROUTINE XGESVD( JOBU, JOBVT, M, N, A, LDA, S, U, LDU,
+ $ VT, LDVT, WORK, LWORK, RWORK, INFO )
+* $Id: ygesvd.F 19697 2010-10-29 16:57:34Z d3y133 $
+ implicit none
+#include "y64.fh"
+ CHARACTER JOBU, JOBVT
+ INTEGER INFO, LDA, LDU, LDVT, LWORK, M, N
+ DOUBLE PRECISION A( LDA, * ), S( * ), U( LDU, * ),
+ $ VT( LDVT, * ), WORK( * ), RWORK(*)
+c
+ INTGR4 INFO4, LDA4, LDU4, LDVT4, LWORK4, M4, N4
+c
+ lda4=lda
+ ldu4=ldu
+ ldvt4=ldvt
+ m4=m
+ n4=n
+ lwork4=lwork
+c
+ call ZGESVD( JOBU, JOBVT, M4, N4, A, LDA4, S, U, LDU4,
+ $ VT, LDVT4, WORK, LWORK4, RWORK, INFO4 )
+ info=info4
+
+ RETURN
+ END
Index: src/64to32blas/GNUmakefile
===================================================================
--- src/64to32blas/GNUmakefile (revision 28049)
+++ src/64to32blas/GNUmakefile (revision 28050)
@@ -10,7 +10,7 @@
ypotri.o ypotrf.o ysygv.o ygeev.o ygeevx.o \
ifily.o\
xscal.o xaxpy.o xgemm.o xheev.o xcopy.o xdotc.o \
- ixamax.o
+ ixamax.o xgesvd.o
ifeq ($(BLAS_SIZE),8)
LIB_DEFINES += -DUSE_INTEGER8
Index: src/config/data.64_to_32
===================================================================
--- src/config/data.64_to_32 (revision 28049)
+++ src/config/data.64_to_32 (revision 28050)
@@ -50,6 +50,7 @@
zdotc xdotc
zdscal xsscal
zgemm xgemm
+zgesvd xgesvd
zgemv xgemv
zgerc xgerc
zhemm xhemm
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment