diff --git a/OTHER/ARPACK/dgetv0.f b/OTHER/ARPACK/dgetv0.f index 40d384e42..8a212349b 100644 --- a/OTHER/ARPACK/dgetv0.f +++ b/OTHER/ARPACK/dgetv0.f @@ -167,7 +167,7 @@ subroutine dgetv0 c | External Subroutines | c %----------------------% c - external dlarnv, dvout, dcopy, dgemv, second + external dlarnv, dvout, dcopy, dgemv, second, dvout1 c c %--------------------% c | External Functions | @@ -364,9 +364,9 @@ subroutine dgetv0 c %--------------------------------------% c if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm0, ndigit, + call dvout1 (logfil, 1, rnorm0, ndigit, & '_getv0: re-orthonalization ; rnorm0 is') - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_getv0: re-orthonalization ; rnorm is') end if c @@ -397,7 +397,7 @@ subroutine dgetv0 50 continue c if (msglvl .gt. 0) then - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_getv0: B-norm of initial / restarted starting vector') end if if (msglvl .gt. 3) then diff --git a/OTHER/ARPACK/dnaitr.f b/OTHER/ARPACK/dnaitr.f index 02c35c0a2..fe799bfc3 100644 --- a/OTHER/ARPACK/dnaitr.f +++ b/OTHER/ARPACK/dnaitr.f @@ -268,7 +268,7 @@ subroutine dnaitr c %----------------------% c external daxpy, dcopy, dscal, dgemv, dgetv0, dlabad, - & dvout, dmout, ivout, second + & dvout, dvout1, dmout, ivout, ivout1, second c c %--------------------% c | External Functions | @@ -371,9 +371,9 @@ subroutine dnaitr 1000 continue c if (msglvl .gt. 1) then - call ivout (logfil, 1, j, ndigit, + call ivout1 (logfil, 1, j, ndigit, & '_naitr: generating Arnoldi vector number') - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_naitr: B-norm of the current residual is') end if c @@ -393,7 +393,7 @@ subroutine dnaitr c %---------------------------------------------------% c if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, + call ivout1 (logfil, 1, j, ndigit, & '_naitr: ****** RESTART AT STEP ******') end if c @@ -721,7 +721,7 @@ subroutine dnaitr end if c if (msglvl .gt. 0 .and. iter .gt. 0) then - call ivout (logfil, 1, j, ndigit, + call ivout1 (logfil, 1, j, ndigit, & '_naitr: Iterative refinement for Arnoldi residual') if (msglvl .gt. 2) then xtemp(1) = rnorm diff --git a/OTHER/ARPACK/dnaup2.f b/OTHER/ARPACK/dnaup2.f index a6ded69d4..1cdf09403 100644 --- a/OTHER/ARPACK/dnaup2.f +++ b/OTHER/ARPACK/dnaup2.f @@ -236,7 +236,7 @@ subroutine dnaup2 c %----------------------% c external dcopy , dgetv0 , dnaitr , dnconv , dneigh , dngets , dnapps , - & dvout , ivout, second + & dvout , dvout1, ivout, ivout1, second c c %--------------------% c | External Functions | @@ -388,7 +388,7 @@ subroutine dnaup2 iter = iter + 1 c if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, + call ivout1 (logfil, 1, iter, ndigit, & '_naup2: **** Start of major iteration number ****') end if c @@ -401,9 +401,9 @@ subroutine dnaup2 np = kplusp - nev c if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, + call ivout1 (logfil, 1, nev, ndigit, & '_naup2: The length of the current Arnoldi factorization') - call ivout (logfil, 1, np, ndigit, + call ivout1 (logfil, 1, np, ndigit, & '_naup2: Extend the Arnoldi factorization by') end if c @@ -435,7 +435,7 @@ subroutine dnaup2 update = .false. c if (msglvl .gt. 1) then - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_naup2: Corresponding B-norm of the residual') end if c @@ -678,7 +678,7 @@ subroutine dnaup2 end if c if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, + call ivout1 (logfil, 1, nconv, ndigit, & '_naup2: no. of "converged" Ritz values at this iter.') if (msglvl .gt. 1) then kp(1) = nev @@ -730,7 +730,7 @@ subroutine dnaup2 end if c if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, + call ivout1 (logfil, 1, np, ndigit, & '_naup2: The number of shifts to apply ') call dvout (logfil, np, ritzr, ndigit, & '_naup2: Real part of the shifts') @@ -796,7 +796,7 @@ subroutine dnaup2 cnorm = .false. c if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_naup2: B-norm of residual for compressed factorization') call dmout (logfil, nev, nev, h, ldh, ndigit, & '_naup2: Compressed upper Hessenberg matrix H') diff --git a/OTHER/ARPACK/dneupd.f b/OTHER/ARPACK/dneupd.f index 2422340b7..5fb63d9f3 100644 --- a/OTHER/ARPACK/dneupd.f +++ b/OTHER/ARPACK/dneupd.f @@ -351,7 +351,8 @@ subroutine dneupd (rvec, howmny, select, dr, di, z, ldz, sigmar, c %----------------------% c external dcopy, dger, dgeqr2, dlacpy, dlahqr, dlaset, dmout, - & dorm2r, dtrevc, dtrmm, dtrsen, dscal, dvout, ivout + & dorm2r, dtrevc, dtrmm, dtrsen, dscal, dvout, ivout, + & ivout1, dvout1 c c %--------------------% c | External Functions | @@ -532,7 +533,7 @@ subroutine dneupd (rvec, howmny, select, dr, di, z, ldz, sigmar, end if c if (msglvl .gt. 2) then - call dvout(logfil, 1, thres, ndigit, + call dvout1(logfil, 1, thres, ndigit, & '_neupd: Threshold eigenvalue used for re-ordering') end if c @@ -610,9 +611,9 @@ subroutine dneupd (rvec, howmny, select, dr, di, z, ldz, sigmar, 10 continue c if (msglvl .gt. 2) then - call ivout(logfil, 1, ktrord, ndigit, + call ivout1(logfil, 1, ktrord, ndigit, & '_neupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, + call ivout1(logfil, 1, nconv, ndigit, & '_neupd: Number of "converged" eigenvalues') end if c diff --git a/OTHER/ARPACK/dsaitr.f b/OTHER/ARPACK/dsaitr.f index 9ceb0453b..13b7126fb 100644 --- a/OTHER/ARPACK/dsaitr.f +++ b/OTHER/ARPACK/dsaitr.f @@ -262,7 +262,7 @@ subroutine dsaitr c %----------------------% c external daxpy, dcopy, dscal, dgemv, dgetv0, dvout, dmout, - & dlascl, ivout, second + & dlascl, ivout, second, ivout1, dvout1 c c %--------------------% c | External Functions | @@ -364,9 +364,9 @@ subroutine dsaitr 1000 continue c if (msglvl .gt. 2) then - call ivout (logfil, 1, j, ndigit, + call ivout1 (logfil, 1, j, ndigit, & '_saitr: generating Arnoldi vector no.') - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_saitr: B-norm of the current residual =') end if c @@ -384,7 +384,7 @@ subroutine dsaitr c %---------------------------------------------------% c if (msglvl .gt. 0) then - call ivout (logfil, 1, j, ndigit, + call ivout1 (logfil, 1, j, ndigit, & '_saitr: ****** restart at step ******') end if c @@ -735,7 +735,7 @@ subroutine dsaitr end if c if (msglvl .gt. 0 .and. iter .gt. 0) then - call ivout (logfil, 1, j, ndigit, + call ivout1 (logfil, 1, j, ndigit, & '_saitr: Iterative refinement for Arnoldi residual') if (msglvl .gt. 2) then xtemp(1) = rnorm diff --git a/OTHER/ARPACK/dsaup2.f b/OTHER/ARPACK/dsaup2.f index 0b5b5129c..7b441dc92 100644 --- a/OTHER/ARPACK/dsaup2.f +++ b/OTHER/ARPACK/dsaup2.f @@ -235,7 +235,7 @@ subroutine dsaup2 c %----------------------% c external dcopy, dgetv0, dsaitr, dscal, dsconv, dseigt, dsgets, - & dsapps, dsortr, dvout, ivout, second, dswap + & dsapps,dsortr,dvout,ivout,second,dswap,ivout1, dvout1 c c %--------------------% c | External Functions | @@ -402,13 +402,13 @@ subroutine dsaup2 iter = iter + 1 c if (msglvl .gt. 0) then - call ivout (logfil, 1, iter, ndigit, + call ivout1 (logfil, 1, iter, ndigit, & '_saup2: **** Start of major iteration number ****') end if if (msglvl .gt. 1) then - call ivout (logfil, 1, nev, ndigit, + call ivout1 (logfil, 1, nev, ndigit, & '_saup2: The length of the current Lanczos factorization') - call ivout (logfil, 1, np, ndigit, + call ivout1 (logfil, 1, np, ndigit, & '_saup2: Extend the Lanczos factorization by') end if c @@ -446,7 +446,7 @@ subroutine dsaup2 update = .false. c if (msglvl .gt. 1) then - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_saup2: Current B-norm of residual for factorization') end if c @@ -694,7 +694,7 @@ subroutine dsaup2 end if c if (msglvl .gt. 0) then - call ivout (logfil, 1, nconv, ndigit, + call ivout1 (logfil, 1, nconv, ndigit, & '_saup2: no. of "converged" Ritz values at this iter.') if (msglvl .gt. 1) then kp(1) = nev @@ -742,7 +742,7 @@ subroutine dsaup2 if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) c if (msglvl .gt. 2) then - call ivout (logfil, 1, np, ndigit, + call ivout1 (logfil, 1, np, ndigit, & '_saup2: The number of shifts to apply ') call dvout (logfil, np, workl, ndigit, & '_saup2: shifts selected') @@ -809,7 +809,7 @@ subroutine dsaup2 130 continue c if (msglvl .gt. 2) then - call dvout (logfil, 1, rnorm, ndigit, + call dvout1 (logfil, 1, rnorm, ndigit, & '_saup2: B-norm of residual for NEV factorization') call dvout (logfil, nev, h(1,2), ndigit, & '_saup2: main diagonal of compressed H matrix') diff --git a/OTHER/ARPACK/dseupd.f b/OTHER/ARPACK/dseupd.f index d8dc6b1df..cf6a0d03c 100644 --- a/OTHER/ARPACK/dseupd.f +++ b/OTHER/ARPACK/dseupd.f @@ -273,7 +273,8 @@ subroutine dseupd (rvec, howmny, select, d, z, ldz, sigma, bmat, c %----------------------% c external dcopy, dger, dgeqr2, dlacpy, dorm2r, dscal, - & dsesrt, dsteqr, dswap, dvout, ivout, dsortr + & dsesrt, dsteqr, dswap, dvout, ivout, dsortr, + & ivout1,dvout1 c c %--------------------% c | External Functions | @@ -475,7 +476,7 @@ subroutine dseupd (rvec, howmny, select, d, z, ldz, sigma, bmat, thres1 = workl(ritz) c if (msglvl .gt. 2) then - call dvout(logfil, 1, thres1, ndigit, + call dvout1(logfil, 1, thres1, ndigit, & '_seupd: Threshold eigenvalue used for re-ordering') end if c @@ -572,9 +573,9 @@ subroutine dseupd (rvec, howmny, select, d, z, ldz, sigma, bmat, c %-------------------------------------------% c if (msglvl .gt. 2) then - call ivout(logfil, 1, ktrord, ndigit, + call ivout1(logfil, 1, ktrord, ndigit, & '_seupd: Number of specified eigenvalues') - call ivout(logfil, 1, nconv, ndigit, + call ivout1(logfil, 1, nconv, ndigit, & '_seupd: Number of "converged" eigenvalues') end if c