From 310ca3eac352f26bfc5ac24596ea7bc16f8f315e Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Thu, 3 Mar 2022 14:59:53 +0200 Subject: [PATCH] Remove everything related to FUJITSU_VPP(64) I removed this target from makefile.h in 2015 and no one has noticed, so clearly none of this code has been in use. This platform was relevant in the year 2000. Signed-off-by: Jeff Hammond --- src/config/makefile.h | 12 ------------ src/geninterface/NWChemWrap.F | 2 +- src/geninterface/geninterface.F | 2 +- src/geom/geom.F | 4 ---- src/input/get_inp_file.F | 8 -------- src/nwchem.F | 2 +- src/nwdft/xc/xc_att_xc.F | 3 --- src/nwdft/xc/xc_becke88.F | 3 --- src/nwdft/xc/xc_camb88.F | 3 --- src/nwdft/xc/xc_cams12x.F | 3 --- src/nwdft/xc/xc_cs00.F | 3 --- src/nwdft/xc/xc_s12x.F | 3 --- src/nwpw/nwpwlib/nwpwxc/nwpwxc_cs00.F | 3 --- src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_att.F | 3 --- src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_b88.F | 3 --- src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_camb88.F | 3 --- src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_cams12.F | 3 --- src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_s12.F | 3 --- src/nwxc/nwxc_cs00.F | 3 --- src/nwxc/nwxc_x_att.F | 3 --- src/nwxc/nwxc_x_b88.F | 3 --- src/nwxc/nwxc_x_camb88.F | 3 --- src/nwxc/nwxc_x_cams12.F | 3 --- src/nwxc/nwxc_x_s12.F | 3 --- src/peigs/DEFS | 10 ---------- src/peigs/DEFS.nwchem | 5 ----- src/peigs/h/blas_lapack.data | 10 ---------- src/peigs/h/blas_lapack.h | 9 --------- src/rimp2/ftnio.fh | 2 +- src/util/util_cpusec.F | 2 +- 30 files changed, 5 insertions(+), 117 deletions(-) diff --git a/src/config/makefile.h b/src/config/makefile.h index da84505f74..c4f595d5e2 100644 --- a/src/config/makefile.h +++ b/src/config/makefile.h @@ -634,18 +634,6 @@ ifeq ($(TARGET),PURESOLARIS) endif -ifeq ($(TARGET),FUJITSU_VPP) - @echo DEPRECATED - @exit -endif - - -ifeq ($(TARGET),FUJITSU_VPP64) - @echo DEPRECATED - @exit -endif - - ifeq ($(TARGET),cray-sv2) @echo DEPRECATED @exit diff --git a/src/geninterface/NWChemWrap.F b/src/geninterface/NWChemWrap.F index 6152d531f3..fad7842449 100644 --- a/src/geninterface/NWChemWrap.F +++ b/src/geninterface/NWChemWrap.F @@ -33,7 +33,7 @@ C Worry about input file. For now use a dummy one 10001 continue c else -#if !(defined(KSR) || defined(IBM) || defined(FUJITSU_SOLARIS) ||defined(FUJITSU_VPP) ||defined(FUJITSU_VPP64)) +#if !(defined(KSR) || defined(IBM) || defined(FUJITSU_SOLARIS) ) close(LuIn) #endif endif diff --git a/src/geninterface/geninterface.F b/src/geninterface/geninterface.F index d6d56df13b..1b62b6a987 100644 --- a/src/geninterface/geninterface.F +++ b/src/geninterface/geninterface.F @@ -84,7 +84,7 @@ c10000 call errquit('nwchem: failed to open the input file', 0) c10001 continue c c else -c#if !(defined(KSR) || defined(IBM) || defined(FUJITSU_SOLARIS) ||defined(FUJITSU_VPP) ||defined(FUJITSU_VPP64)) +c#if !(defined(KSR) || defined(IBM) || defined(FUJITSU_SOLARIS) ) c close(LuIn) c#endif c endif diff --git a/src/geom/geom.F b/src/geom/geom.F index e0136f3df9..ca38289b0a 100644 --- a/src/geom/geom.F +++ b/src/geom/geom.F @@ -984,11 +984,7 @@ c rz = coords(3,i,geom)-coords(3,j,geom) rz = rz*rz r = sqrt(rx+ry+rz) -#ifdef FUJITSU_VPP - if (r > 1.d-10) e = e + charge(i,geom)*charge(j,geom)/r -#else e = e + charge(i,geom)*charge(j,geom)/r -#endif endif end do end do diff --git a/src/input/get_inp_file.F b/src/input/get_inp_file.F index 9f966de10b..dd7ed13aad 100644 --- a/src/input/get_inp_file.F +++ b/src/input/get_inp_file.F @@ -17,9 +17,6 @@ c integer arg,nargs #if defined(CRAY) integer ilen,ierror -#endif -#if defined(FUJITSU_VPP) - logical file_exists #endif integer l #ifdef USE_POSIXF @@ -65,13 +62,8 @@ c call fix_windows_path(input_filename) #endif c -#ifdef FUJITSU_VPP - inquire (file=input_filename, exist=file_exists) - if (.not. file_exists) goto 10 -#else open(LuIn,file=input_filename,status='old',err=10) close(LuIn) -#endif return c 10 l = inp_strlen(input_filename) diff --git a/src/nwchem.F b/src/nwchem.F index aa6c906e27..e41730faf6 100644 --- a/src/nwchem.F +++ b/src/nwchem.F @@ -118,7 +118,7 @@ c 10001 continue c else -#if !(defined(KSR) || defined(IBM) || defined(FUJITSU_SOLARIS) ||defined(FUJITSU_VPP) ||defined(FUJITSU_VPP64)) +#if !(defined(KSR) || defined(IBM) || defined(FUJITSU_SOLARIS) ) close(LuIn) #endif endif diff --git a/src/nwdft/xc/xc_att_xc.F b/src/nwdft/xc/xc_att_xc.F index 0b45d90055..6551ff79c0 100644 --- a/src/nwdft/xc/xc_att_xc.F +++ b/src/nwdft/xc/xc_att_xc.F @@ -1,6 +1,3 @@ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) Subroutine xc_att_xc(rho,ipol,Ex,Amat,Cmat) #elif defined(SECOND_DERIV) && !defined(THIRD_DERIV) diff --git a/src/nwdft/xc/xc_becke88.F b/src/nwdft/xc/xc_becke88.F index 87de501cef..0d27bd088a 100644 --- a/src/nwdft/xc/xc_becke88.F +++ b/src/nwdft/xc/xc_becke88.F @@ -1,6 +1,3 @@ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) Subroutine xc_becke88(tol_rho, fac, lfac, nlfac, rho, delrho, & Amat, Cmat, nq, ipol, Ex, qwght,ldew,func) diff --git a/src/nwdft/xc/xc_camb88.F b/src/nwdft/xc/xc_camb88.F index 1ea8acb31a..b85476846c 100644 --- a/src/nwdft/xc/xc_camb88.F +++ b/src/nwdft/xc/xc_camb88.F @@ -1,6 +1,3 @@ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) Subroutine xc_camb88(tol_rho, fac, lfac, nlfac, rho, delrho, & Amat, Cmat, nq, ipol, Ex, qwght,ldew,func) diff --git a/src/nwdft/xc/xc_cams12x.F b/src/nwdft/xc/xc_cams12x.F index 745623893d..3e74c87353 100644 --- a/src/nwdft/xc/xc_cams12x.F +++ b/src/nwdft/xc/xc_cams12x.F @@ -1,6 +1,3 @@ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #ifndef SECOND_DERIV Subroutine xc_cams12x(tol_rho, fac, lfac, nlfac, rho, delrho, & Amat, Cmat, nq, ipol, Ex, qwght,ldew,func,is12x) diff --git a/src/nwdft/xc/xc_cs00.F b/src/nwdft/xc/xc_cs00.F index 645267a422..84de17ea3d 100644 --- a/src/nwdft/xc/xc_cs00.F +++ b/src/nwdft/xc/xc_cs00.F @@ -1,6 +1,3 @@ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif Subroutine xc_cs00(tol_rho, fac, rho, delrho, & Amat, nq, ipol, delta, e_homo) c diff --git a/src/nwdft/xc/xc_s12x.F b/src/nwdft/xc/xc_s12x.F index c5d3db21cc..cf9d97c258 100644 --- a/src/nwdft/xc/xc_s12x.F +++ b/src/nwdft/xc/xc_s12x.F @@ -1,6 +1,3 @@ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #ifndef SECOND_DERIV Subroutine xc_s12x(tol_rho, fac, lfac, nlfac, rho, delrho, & Amat, Cmat, nq, ipol, Ex, qwght,ldew,func,is12x) diff --git a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_cs00.F b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_cs00.F index 6efcc7ef7a..eee0c9938b 100644 --- a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_cs00.F +++ b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_cs00.F @@ -25,9 +25,6 @@ C> spectra", J. Chem. Phys. 113, 8918-8935 (2000), DOI: C> C> 10.1063/1.1319649. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif Subroutine nwpwxc_cs00(param, tol_rho, ipol, nq, wght, rho, & rgamma, func, Amat, Cmat) c diff --git a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_att.F b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_att.F index 075f36259a..7bcc9ca06d 100644 --- a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_att.F +++ b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_att.F @@ -10,9 +10,6 @@ C> @} C> C> \ingroup nwpwxc_priv C> @{ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #ifndef SECOND_DERIV Subroutine nwpwxc_x_att(param,tol_rho,rho,ipol,Ex,Amat,Cmat) #else diff --git a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_b88.F b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_b88.F index 8279e282ca..e05d41c7e4 100644 --- a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_b88.F +++ b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_b88.F @@ -23,9 +23,6 @@ C> Phys. Rev. A 38, 3098-3100 (1998), DOI: C> C> 10.1103/PhysRevA.38.3098. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #ifndef SECOND_DERIV Subroutine nwpwxc_x_b88(tol_rho, ipol, nq, wght, rho, rgamma, & func, Amat, Cmat) diff --git a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_camb88.F b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_camb88.F index 8c1e4c323d..02fca51868 100644 --- a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_camb88.F +++ b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_camb88.F @@ -31,9 +31,6 @@ C> Phys. Rev. A 38, 3098-3100 (1998), DOI: C> C> 10.1103/PhysRevA.38.3098. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #ifndef SECOND_DERIV Subroutine nwpwxc_x_camb88(param,tol_rho, ipol, nq, wght, & rho, rgamma, func, Amat, Cmat) diff --git a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_cams12.F b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_cams12.F index 3d53a36809..3f33838dae 100644 --- a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_cams12.F +++ b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_cams12.F @@ -22,9 +22,6 @@ C> Chem. Phys. Lett. (In Press, 2013), DOI: C> C> 10.1016/j.cplett.2013.06.045. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #ifndef SECOND_DERIV Subroutine nwpwxc_x_cams12(param, tol_rho, ipol, nq, wght, rho, & rgamma, func, Amat, Cmat) diff --git a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_s12.F b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_s12.F index f1270ffb4e..4439628cf2 100644 --- a/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_s12.F +++ b/src/nwpw/nwpwlib/nwpwxc/nwpwxc_x_s12.F @@ -22,9 +22,6 @@ C> Chem. Phys. Lett. 580 (2013) 166-171, DOI: C> C> 10.1016/j.cplett.2013.06.045. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #ifndef SECOND_DERIV Subroutine nwpwxc_x_s12(param,tol_rho,ipol,nq,wght,rho,rgamma, & func, Amat, Cmat) diff --git a/src/nwxc/nwxc_cs00.F b/src/nwxc/nwxc_cs00.F index c873772ec7..4490268f38 100644 --- a/src/nwxc/nwxc_cs00.F +++ b/src/nwxc/nwxc_cs00.F @@ -25,9 +25,6 @@ C> spectra", J. Chem. Phys. 113, 8918-8935 (2000), DOI: C> C> 10.1063/1.1319649. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif Subroutine nwxc_cs00(param, tol_rho, ipol, nq, wght, rho, & rgamma, func, Amat, Cmat) c diff --git a/src/nwxc/nwxc_x_att.F b/src/nwxc/nwxc_x_att.F index 7017c96c9f..9e4de18ab5 100644 --- a/src/nwxc/nwxc_x_att.F +++ b/src/nwxc/nwxc_x_att.F @@ -12,9 +12,6 @@ C> @} C> C> \ingroup nwxc_priv C> @{ -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) #if defined(NWAD_PRINT) Subroutine nwxc_x_att_p(param,tol_rho,rho,ipol,Ex) diff --git a/src/nwxc/nwxc_x_b88.F b/src/nwxc/nwxc_x_b88.F index 23d717d5f0..cb9da53170 100644 --- a/src/nwxc/nwxc_x_b88.F +++ b/src/nwxc/nwxc_x_b88.F @@ -25,9 +25,6 @@ C> Phys. Rev. A 38, 3098-3100 (1998), DOI: C> C> 10.1103/PhysRevA.38.3098. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) #if defined(NWAD_PRINT) Subroutine nwxc_x_b88_p(tol_rho, ipol, nq, wght, rho, rgamma, diff --git a/src/nwxc/nwxc_x_camb88.F b/src/nwxc/nwxc_x_camb88.F index 0bb8c7da83..85300cb679 100644 --- a/src/nwxc/nwxc_x_camb88.F +++ b/src/nwxc/nwxc_x_camb88.F @@ -33,9 +33,6 @@ C> Phys. Rev. A 38, 3098-3100 (1998), DOI: C> C> 10.1103/PhysRevA.38.3098. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) #if defined(NWAD_PRINT) Subroutine nwxc_x_camb88_p(param,tol_rho, ipol, nq, wght, diff --git a/src/nwxc/nwxc_x_cams12.F b/src/nwxc/nwxc_x_cams12.F index 47bb057467..10bb706c52 100644 --- a/src/nwxc/nwxc_x_cams12.F +++ b/src/nwxc/nwxc_x_cams12.F @@ -24,9 +24,6 @@ C> Chem. Phys. Lett. (In Press, 2013), DOI: C> C> 10.1016/j.cplett.2013.06.045. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) #if defined(NWAD_PRINT) Subroutine nwxc_x_cams12_p(param, tol_rho, ipol, nq, wght, rho, diff --git a/src/nwxc/nwxc_x_s12.F b/src/nwxc/nwxc_x_s12.F index 583ca8583c..84cb0f1a6b 100644 --- a/src/nwxc/nwxc_x_s12.F +++ b/src/nwxc/nwxc_x_s12.F @@ -24,9 +24,6 @@ C> Chem. Phys. Lett. 580 (2013) 166-171, DOI: C> C> 10.1016/j.cplett.2013.06.045. C> -#if defined(FUJITSU_VPP) -!ocl scalar -#endif #if !defined(SECOND_DERIV) && !defined(THIRD_DERIV) #if defined(NWAD_PRINT) Subroutine nwxc_x_s12_p(param, tol_rho, ipol, nq, wght, rho, diff --git a/src/peigs/DEFS b/src/peigs/DEFS index 53532309d9..ad5558e683 100644 --- a/src/peigs/DEFS +++ b/src/peigs/DEFS @@ -658,16 +658,6 @@ peigs_CPP = /usr/bin/cpp -I${peigs_HDIR} -D${peigs_CPU} -D${peigs_COMM} \ -D${peigs_TARGET_definition} endif -ifeq ($(peigs_TARGET),FUJITSU_VPP) -peigs_CODEOBJ = DBLE -peigs_CPU = VPP -endif - -ifeq ($(peigs_TARGET),FUJITSU_VPP64) -peigs_CODEOBJ = DBLE -peigs_CPU = VPP -endif - ifeq ($(peigs_TARGET),BGL) #Blue Gene/L peigs_COMM =TCGMSG diff --git a/src/peigs/DEFS.nwchem b/src/peigs/DEFS.nwchem index fda9ce2e3e..e0c02a440c 100644 --- a/src/peigs/DEFS.nwchem +++ b/src/peigs/DEFS.nwchem @@ -443,11 +443,6 @@ peigs_CPP = /usr/bin/cpp -I${peigs_HDIR} -D${peigs_CPU} -D${peigs_COMM} \ -D${peigs_TARGET_definition} endif -ifeq ($(peigs_TARGET),FUJITSU_VPP) -peigs_CODEOBJ = DBLE -peigs_CPU = VPP -endif - export peigs_COMM export peigs_CC export peigs_FC diff --git a/src/peigs/h/blas_lapack.data b/src/peigs/h/blas_lapack.data index dbd32ca791..66955ca9e9 100644 --- a/src/peigs/h/blas_lapack.data +++ b/src/peigs/h/blas_lapack.data @@ -127,13 +127,3 @@ data DLAMCHS/2.2250738585072014D-308/ data DLAMCHU/2.22507385850720138D-308/ #endif - -#ifdef FUJITSU_VPP - double precision DLAMCHE, DLAMCHP, DLAMCHS, DLAMCHU, DLAMCHB - real SLAMCHE, SLAMCHP, SLAMCHS, SLAMCHU, SLAMCHB - data DLAMCHE/1.1102230246251565D-16/ - data DLAMCHP/1.1102230246251565D-16/ - data DLAMCHB/2.D0/ - data DLAMCHS/2.2250738585072014D-308/ - data DLAMCHU/2.22507385850720138D-308/ -#endif diff --git a/src/peigs/h/blas_lapack.h b/src/peigs/h/blas_lapack.h index a3f4676ee1..98a07b0780 100644 --- a/src/peigs/h/blas_lapack.h +++ b/src/peigs/h/blas_lapack.h @@ -220,15 +220,6 @@ #define DLAMCHU 2.2250738585072014e-308 -#endif -#ifdef FUJITSU_VPP - -#define DLAMCHE 1.1102230246251565e-016 -#define DLAMCHP 1.1102230246251565e-016 -#define DLAMCHB 2.e0 -#define DLAMCHS 2.2250738585072014e-308 -#define DLAMCHU 2.2250738585072014e-308 - #endif /* DLAMCH guesses when they are not set */ diff --git a/src/rimp2/ftnio.fh b/src/rimp2/ftnio.fh index 4dea843704..fd0aa70a48 100644 --- a/src/rimp2/ftnio.fh +++ b/src/rimp2/ftnio.fh @@ -7,7 +7,7 @@ C #if defined(sun) || defined(IBM) || defined(SP1) || defined(_CRAY) || defined(__ksr__) || (defined(LINUX)&&!defined(__alpha)) || defined(WIN32) || defined(MACX) C$Id$ Parameter ( MT_DAFRecL = MT_BYTE ) -#elif defined(__PARAGON__) || defined(__IPSC__) ||defined(HPUX) ||defined(FUJITSU_VPP) || defined(FUJITSU_VPP64) +#elif defined(__PARAGON__) || defined(__IPSC__) ||defined(HPUX) Parameter ( MT_DAFRecL = MT_BYTE ) #elif defined(sgi) || defined(__alpha) Parameter ( MT_DAFRecL = MT_INT ) diff --git a/src/util/util_cpusec.F b/src/util/util_cpusec.F index 700e553429..b7a14ccce2 100644 --- a/src/util/util_cpusec.F +++ b/src/util/util_cpusec.F @@ -13,7 +13,7 @@ c $Id$ double precision ibm_cputime external ibm_cputime util_cpusec = ibm_cputime() -#elif defined(SUN) || defined(SOLARIS) || defined(FUJITSU_VPP)|| defined(LINUXALPHA) +#elif defined(SUN) || defined(SOLARIS) || defined(LINUXALPHA) real*4 tarray(2) real*4 etime #ifndef GCC4