Mercurial > mxe-octave
comparison src/arpack-1-gcc10.patch @ 5524:794ea7ca1771
Fix compiling ARPACK with gcc 10 (part 2).
* src/arpack-1-gcc10.patch: Cherry-pick another upstream patch.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Mon, 31 Aug 2020 10:39:44 +0200 |
parents | efe91da1a169 |
children |
comparison
equal
deleted
inserted
replaced
5523:5191e4789168 | 5524:794ea7ca1771 |
---|---|
1 From 9418632214acf6d387896ab29a8f5bdff2d4e38a Mon Sep 17 00:00:00 2001 | |
2 From: =?UTF-8?q?David=20Schw=C3=B6rer?= <davidsch@fedoraproject.org> | |
3 Date: Wed, 19 Feb 2020 20:07:47 +0000 | |
4 Subject: [PATCH] ?vout expects a vector, so make sure to pass a vector | |
5 | |
6 gcc10 throws an error otherwise | |
7 | |
8 diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f | |
9 index 322b35c7..a91ef926 100644 | |
10 --- a/SRC/cgetv0.f | |
11 +++ b/SRC/cgetv0.f | |
12 @@ -361,9 +361,9 @@ subroutine cgetv0 | |
13 c %--------------------------------------% | |
14 c | |
15 if (msglvl .gt. 2) then | |
16 - call svout (logfil, 1, rnorm0, ndigit, | |
17 + call svout (logfil, 1, [rnorm0], ndigit, | |
18 & '_getv0: re-orthonalization ; rnorm0 is') | |
19 - call svout (logfil, 1, rnorm, ndigit, | |
20 + call svout (logfil, 1, [rnorm], ndigit, | |
21 & '_getv0: re-orthonalization ; rnorm is') | |
22 end if | |
23 c | |
24 @@ -394,7 +394,7 @@ subroutine cgetv0 | |
25 50 continue | |
26 c | |
27 if (msglvl .gt. 0) then | |
28 - call svout (logfil, 1, rnorm, ndigit, | |
29 + call svout (logfil, 1, [rnorm], ndigit, | |
30 & '_getv0: B-norm of initial / restarted starting vector') | |
31 end if | |
32 if (msglvl .gt. 2) then | |
33 diff --git a/SRC/cnaitr.f b/SRC/cnaitr.f | |
34 index 2bb93fff..bebd8236 100644 | |
35 --- a/SRC/cnaitr.f | |
36 +++ b/SRC/cnaitr.f | |
37 @@ -378,9 +378,9 @@ subroutine cnaitr | |
38 1000 continue | |
39 c | |
40 if (msglvl .gt. 1) then | |
41 - call ivout (logfil, 1, j, ndigit, | |
42 + call ivout (logfil, 1, [j], ndigit, | |
43 & '_naitr: generating Arnoldi vector number') | |
44 - call svout (logfil, 1, rnorm, ndigit, | |
45 + call svout (logfil, 1, [rnorm], ndigit, | |
46 & '_naitr: B-norm of the current residual is') | |
47 end if | |
48 c | |
49 @@ -400,7 +400,7 @@ subroutine cnaitr | |
50 c %---------------------------------------------------% | |
51 c | |
52 if (msglvl .gt. 0) then | |
53 - call ivout (logfil, 1, j, ndigit, | |
54 + call ivout (logfil, 1, [j], ndigit, | |
55 & '_naitr: ****** RESTART AT STEP ******') | |
56 end if | |
57 c | |
58 @@ -729,7 +729,7 @@ subroutine cnaitr | |
59 end if | |
60 c | |
61 if (msglvl .gt. 0 .and. iter .gt. 0 ) then | |
62 - call ivout (logfil, 1, j, ndigit, | |
63 + call ivout (logfil, 1, [j], ndigit, | |
64 & '_naitr: Iterative refinement for Arnoldi residual') | |
65 if (msglvl .gt. 2) then | |
66 rtemp(1) = rnorm | |
67 diff --git a/SRC/cnapps.f b/SRC/cnapps.f | |
68 index fdf878d8..c3a55623 100644 | |
69 --- a/SRC/cnapps.f | |
70 +++ b/SRC/cnapps.f | |
71 @@ -268,9 +268,9 @@ subroutine cnapps | |
72 sigma = shift(jj) | |
73 c | |
74 if (msglvl .gt. 2 ) then | |
75 - call ivout (logfil, 1, jj, ndigit, | |
76 + call ivout (logfil, 1, [jj], ndigit, | |
77 & '_napps: shift number.') | |
78 - call cvout (logfil, 1, sigma, ndigit, | |
79 + call cvout (logfil, 1, [sigma], ndigit, | |
80 & '_napps: Value of the shift ') | |
81 end if | |
82 c | |
83 @@ -291,9 +291,9 @@ subroutine cnapps | |
84 if ( abs(real(h(i+1,i))) | |
85 & .le. max(ulp*tst1, smlnum) ) then | |
86 if (msglvl .gt. 0) then | |
87 - call ivout (logfil, 1, i, ndigit, | |
88 + call ivout (logfil, 1, [i], ndigit, | |
89 & '_napps: matrix splitting at row/column no.') | |
90 - call ivout (logfil, 1, jj, ndigit, | |
91 + call ivout (logfil, 1, [jj], ndigit, | |
92 & '_napps: matrix splitting with shift number.') | |
93 call cvout (logfil, 1, h(i+1,i), ndigit, | |
94 & '_napps: off diagonal element.') | |
95 @@ -307,9 +307,9 @@ subroutine cnapps | |
96 40 continue | |
97 c | |
98 if (msglvl .gt. 2) then | |
99 - call ivout (logfil, 1, istart, ndigit, | |
100 + call ivout (logfil, 1, [istart], ndigit, | |
101 & '_napps: Start of current block ') | |
102 - call ivout (logfil, 1, iend, ndigit, | |
103 + call ivout (logfil, 1, [iend], ndigit, | |
104 & '_napps: End of current block ') | |
105 end if | |
106 c | |
107 @@ -485,7 +485,7 @@ subroutine cnapps | |
108 & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') | |
109 call cvout (logfil, 1, h(kev+1,kev), ndigit, | |
110 & '_napps: betak = e_{kev+1}^T*H*e_{kev}') | |
111 - call ivout (logfil, 1, kev, ndigit, | |
112 + call ivout (logfil, 1, [kev], ndigit, | |
113 & '_napps: Order of the final Hessenberg matrix ') | |
114 if (msglvl .gt. 2) then | |
115 call cmout (logfil, kev, kev, h, ldh, ndigit, | |
116 diff --git a/SRC/cnaup2.f b/SRC/cnaup2.f | |
117 index e528a890..3f106f05 100644 | |
118 --- a/SRC/cnaup2.f | |
119 +++ b/SRC/cnaup2.f | |
120 @@ -389,7 +389,7 @@ subroutine cnaup2 | |
121 iter = iter + 1 | |
122 c | |
123 if (msglvl .gt. 0) then | |
124 - call ivout (logfil, 1, iter, ndigit, | |
125 + call ivout (logfil, 1, [iter], ndigit, | |
126 & '_naup2: **** Start of major iteration number ****') | |
127 end if | |
128 c | |
129 @@ -402,9 +402,9 @@ subroutine cnaup2 | |
130 np = kplusp - nev | |
131 c | |
132 if (msglvl .gt. 1) then | |
133 - call ivout (logfil, 1, nev, ndigit, | |
134 + call ivout (logfil, 1, [nev], ndigit, | |
135 & '_naup2: The length of the current Arnoldi factorization') | |
136 - call ivout (logfil, 1, np, ndigit, | |
137 + call ivout (logfil, 1, [np], ndigit, | |
138 & '_naup2: Extend the Arnoldi factorization by') | |
139 end if | |
140 c | |
141 @@ -430,7 +430,7 @@ subroutine cnaup2 | |
142 update = .false. | |
143 c | |
144 if (msglvl .gt. 1) then | |
145 - call svout (logfil, 1, rnorm, ndigit, | |
146 + call svout (logfil, 1, [rnorm], ndigit, | |
147 & '_naup2: Corresponding B-norm of the residual') | |
148 end if | |
149 c | |
150 @@ -658,7 +658,7 @@ subroutine cnaup2 | |
151 end if | |
152 c | |
153 if (msglvl .gt. 0) then | |
154 - call ivout (logfil, 1, nconv, ndigit, | |
155 + call ivout (logfil, 1, [nconv], ndigit, | |
156 & '_naup2: no. of "converged" Ritz values at this iter.') | |
157 if (msglvl .gt. 1) then | |
158 kp(1) = nev | |
159 @@ -698,7 +698,7 @@ subroutine cnaup2 | |
160 end if | |
161 c | |
162 if (msglvl .gt. 2) then | |
163 - call ivout (logfil, 1, np, ndigit, | |
164 + call ivout (logfil, 1, [np], ndigit, | |
165 & '_naup2: The number of shifts to apply ') | |
166 call cvout (logfil, np, ritz, ndigit, | |
167 & '_naup2: values of the shifts') | |
168 @@ -762,7 +762,7 @@ subroutine cnaup2 | |
169 cnorm = .false. | |
170 c | |
171 if (msglvl .gt. 2) then | |
172 - call svout (logfil, 1, rnorm, ndigit, | |
173 + call svout (logfil, 1, [rnorm], ndigit, | |
174 & '_naup2: B-norm of residual for compressed factorization') | |
175 call cmout (logfil, nev, nev, h, ldh, ndigit, | |
176 & '_naup2: Compressed upper Hessenberg matrix H') | |
177 diff --git a/SRC/cnaupd.f b/SRC/cnaupd.f | |
178 index 7bf37fd1..57be328b 100644 | |
179 --- a/SRC/cnaupd.f | |
180 +++ b/SRC/cnaupd.f | |
181 @@ -601,9 +601,9 @@ subroutine cnaupd | |
182 if (info .eq. 2) info = 3 | |
183 c | |
184 if (msglvl .gt. 0) then | |
185 - call ivout (logfil, 1, mxiter, ndigit, | |
186 + call ivout (logfil, 1, [mxiter], ndigit, | |
187 & '_naupd: Number of update iterations taken') | |
188 - call ivout (logfil, 1, np, ndigit, | |
189 + call ivout (logfil, 1, [np], ndigit, | |
190 & '_naupd: Number of wanted "converged" Ritz values') | |
191 call cvout (logfil, np, workl(ritz), ndigit, | |
192 & '_naupd: The final Ritz values') | |
193 diff --git a/SRC/cneupd.f b/SRC/cneupd.f | |
194 index c557fa08..34a78f70 100644 | |
195 --- a/SRC/cneupd.f | |
196 +++ b/SRC/cneupd.f | |
197 @@ -536,9 +536,9 @@ subroutine cneupd(rvec , howmny, select, d , | |
198 c %-----------------------------------------------------------% | |
199 c | |
200 if (msglvl .gt. 2) then | |
201 - call ivout(logfil, 1, numcnv, ndigit, | |
202 + call ivout(logfil, 1, [numcnv], ndigit, | |
203 & '_neupd: Number of specified eigenvalues') | |
204 - call ivout(logfil, 1, nconv, ndigit, | |
205 + call ivout(logfil, 1, [nconv], ndigit, | |
206 & '_neupd: Number of "converged" eigenvalues') | |
207 end if | |
208 c | |
209 diff --git a/SRC/cngets.f b/SRC/cngets.f | |
210 index 7686e133..20626a2d 100644 | |
211 --- a/SRC/cngets.f | |
212 +++ b/SRC/cngets.f | |
213 @@ -161,8 +161,8 @@ subroutine cngets ( ishift, which, kev, np, ritz, bounds) | |
214 tcgets = tcgets + (t1 - t0) | |
215 c | |
216 if (msglvl .gt. 0) then | |
217 - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') | |
218 - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') | |
219 + call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') | |
220 + call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') | |
221 call cvout (logfil, kev+np, ritz, ndigit, | |
222 & '_ngets: Eigenvalues of current H matrix ') | |
223 call cvout (logfil, kev+np, bounds, ndigit, | |
224 diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f | |
225 index fbb4fe2a..1d6dc01b 100644 | |
226 --- a/SRC/dgetv0.f | |
227 +++ b/SRC/dgetv0.f | |
228 @@ -366,9 +366,9 @@ subroutine dgetv0 | |
229 c %--------------------------------------% | |
230 c | |
231 if (msglvl .gt. 2) then | |
232 - call dvout (logfil, 1, rnorm0, ndigit, | |
233 + call dvout (logfil, 1, [rnorm0], ndigit, | |
234 & '_getv0: re-orthonalization ; rnorm0 is') | |
235 - call dvout (logfil, 1, rnorm, ndigit, | |
236 + call dvout (logfil, 1, [rnorm], ndigit, | |
237 & '_getv0: re-orthonalization ; rnorm is') | |
238 end if | |
239 c | |
240 @@ -399,7 +399,7 @@ subroutine dgetv0 | |
241 50 continue | |
242 c | |
243 if (msglvl .gt. 0) then | |
244 - call dvout (logfil, 1, rnorm, ndigit, | |
245 + call dvout (logfil, 1, [rnorm], ndigit, | |
246 & '_getv0: B-norm of initial / restarted starting vector') | |
247 end if | |
248 if (msglvl .gt. 3) then | |
249 diff --git a/SRC/dnaitr.f b/SRC/dnaitr.f | |
250 index baaec038..c02cd390 100644 | |
251 --- a/SRC/dnaitr.f | |
252 +++ b/SRC/dnaitr.f | |
253 @@ -371,9 +371,9 @@ subroutine dnaitr | |
254 1000 continue | |
255 c | |
256 if (msglvl .gt. 1) then | |
257 - call ivout (logfil, 1, j, ndigit, | |
258 + call ivout (logfil, 1, [j], ndigit, | |
259 & '_naitr: generating Arnoldi vector number') | |
260 - call dvout (logfil, 1, rnorm, ndigit, | |
261 + call dvout (logfil, 1, [rnorm], ndigit, | |
262 & '_naitr: B-norm of the current residual is') | |
263 end if | |
264 c | |
265 @@ -393,7 +393,7 @@ subroutine dnaitr | |
266 c %---------------------------------------------------% | |
267 c | |
268 if (msglvl .gt. 0) then | |
269 - call ivout (logfil, 1, j, ndigit, | |
270 + call ivout (logfil, 1, [j], ndigit, | |
271 & '_naitr: ****** RESTART AT STEP ******') | |
272 end if | |
273 c | |
274 @@ -721,7 +721,7 @@ subroutine dnaitr | |
275 end if | |
276 c | |
277 if (msglvl .gt. 0 .and. iter .gt. 0) then | |
278 - call ivout (logfil, 1, j, ndigit, | |
279 + call ivout (logfil, 1, [j], ndigit, | |
280 & '_naitr: Iterative refinement for Arnoldi residual') | |
281 if (msglvl .gt. 2) then | |
282 xtemp(1) = rnorm | |
283 diff --git a/SRC/dnapps.f b/SRC/dnapps.f | |
284 index 872d35ae..7fb37d87 100644 | |
285 --- a/SRC/dnapps.f | |
286 +++ b/SRC/dnapps.f | |
287 @@ -266,11 +266,11 @@ subroutine dnapps | |
288 sigmai = shifti(jj) | |
289 c | |
290 if (msglvl .gt. 2 ) then | |
291 - call ivout (logfil, 1, jj, ndigit, | |
292 + call ivout (logfil, 1, [jj], ndigit, | |
293 & '_napps: shift number.') | |
294 - call dvout (logfil, 1, sigmar, ndigit, | |
295 + call dvout (logfil, 1, [sigmar], ndigit, | |
296 & '_napps: The real part of the shift ') | |
297 - call dvout (logfil, 1, sigmai, ndigit, | |
298 + call dvout (logfil, 1, [sigmai], ndigit, | |
299 & '_napps: The imaginary part of the shift ') | |
300 end if | |
301 c | |
302 @@ -335,9 +335,9 @@ subroutine dnapps | |
303 & tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl ) | |
304 if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then | |
305 if (msglvl .gt. 0) then | |
306 - call ivout (logfil, 1, i, ndigit, | |
307 + call ivout (logfil, 1, [i], ndigit, | |
308 & '_napps: matrix splitting at row/column no.') | |
309 - call ivout (logfil, 1, jj, ndigit, | |
310 + call ivout (logfil, 1, [jj], ndigit, | |
311 & '_napps: matrix splitting with shift number.') | |
312 call dvout (logfil, 1, h(i+1,i), ndigit, | |
313 & '_napps: off diagonal element.') | |
314 @@ -351,9 +351,9 @@ subroutine dnapps | |
315 40 continue | |
316 c | |
317 if (msglvl .gt. 2) then | |
318 - call ivout (logfil, 1, istart, ndigit, | |
319 + call ivout (logfil, 1, [istart], ndigit, | |
320 & '_napps: Start of current block ') | |
321 - call ivout (logfil, 1, iend, ndigit, | |
322 + call ivout (logfil, 1, [iend], ndigit, | |
323 & '_napps: End of current block ') | |
324 end if | |
325 c | |
326 @@ -627,7 +627,7 @@ subroutine dnapps | |
327 & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') | |
328 call dvout (logfil, 1, h(kev+1,kev), ndigit, | |
329 & '_napps: betak = e_{kev+1}^T*H*e_{kev}') | |
330 - call ivout (logfil, 1, kev, ndigit, | |
331 + call ivout (logfil, 1, [kev], ndigit, | |
332 & '_napps: Order of the final Hessenberg matrix ') | |
333 if (msglvl .gt. 2) then | |
334 call dmout (logfil, kev, kev, h, ldh, ndigit, | |
335 diff --git a/SRC/dnaup2.f b/SRC/dnaup2.f | |
336 index 4c9948d4..18ad20a0 100644 | |
337 --- a/SRC/dnaup2.f | |
338 +++ b/SRC/dnaup2.f | |
339 @@ -388,7 +388,7 @@ subroutine dnaup2 | |
340 iter = iter + 1 | |
341 c | |
342 if (msglvl .gt. 0) then | |
343 - call ivout (logfil, 1, iter, ndigit, | |
344 + call ivout (logfil, 1, [iter], ndigit, | |
345 & '_naup2: **** Start of major iteration number ****') | |
346 end if | |
347 c | |
348 @@ -401,9 +401,9 @@ subroutine dnaup2 | |
349 np = kplusp - nev | |
350 c | |
351 if (msglvl .gt. 1) then | |
352 - call ivout (logfil, 1, nev, ndigit, | |
353 + call ivout (logfil, 1, [nev], ndigit, | |
354 & '_naup2: The length of the current Arnoldi factorization') | |
355 - call ivout (logfil, 1, np, ndigit, | |
356 + call ivout (logfil, 1, [np], ndigit, | |
357 & '_naup2: Extend the Arnoldi factorization by') | |
358 end if | |
359 c | |
360 @@ -435,7 +435,7 @@ subroutine dnaup2 | |
361 update = .false. | |
362 c | |
363 if (msglvl .gt. 1) then | |
364 - call dvout (logfil, 1, rnorm, ndigit, | |
365 + call dvout (logfil, 1, [rnorm], ndigit, | |
366 & '_naup2: Corresponding B-norm of the residual') | |
367 end if | |
368 c | |
369 @@ -689,7 +689,7 @@ subroutine dnaup2 | |
370 end if | |
371 c | |
372 if (msglvl .gt. 0) then | |
373 - call ivout (logfil, 1, nconv, ndigit, | |
374 + call ivout (logfil, 1, [nconv], ndigit, | |
375 & '_naup2: no. of "converged" Ritz values at this iter.') | |
376 if (msglvl .gt. 1) then | |
377 kp(1) = nev | |
378 @@ -741,7 +741,7 @@ subroutine dnaup2 | |
379 end if | |
380 c | |
381 if (msglvl .gt. 2) then | |
382 - call ivout (logfil, 1, np, ndigit, | |
383 + call ivout (logfil, 1, [np], ndigit, | |
384 & '_naup2: The number of shifts to apply ') | |
385 call dvout (logfil, np, ritzr, ndigit, | |
386 & '_naup2: Real part of the shifts') | |
387 @@ -807,7 +807,7 @@ subroutine dnaup2 | |
388 cnorm = .false. | |
389 c | |
390 if (msglvl .gt. 2) then | |
391 - call dvout (logfil, 1, rnorm, ndigit, | |
392 + call dvout (logfil, 1, [rnorm], ndigit, | |
393 & '_naup2: B-norm of residual for compressed factorization') | |
394 call dmout (logfil, nev, nev, h, ldh, ndigit, | |
395 & '_naup2: Compressed upper Hessenberg matrix H') | |
396 diff --git a/SRC/dnaupd.f b/SRC/dnaupd.f | |
397 index 51d3018e..dcf1f77a 100644 | |
398 --- a/SRC/dnaupd.f | |
399 +++ b/SRC/dnaupd.f | |
400 @@ -628,9 +628,9 @@ subroutine dnaupd | |
401 if (info .eq. 2) info = 3 | |
402 c | |
403 if (msglvl .gt. 0) then | |
404 - call ivout (logfil, 1, mxiter, ndigit, | |
405 + call ivout (logfil, 1, [mxiter], ndigit, | |
406 & '_naupd: Number of update iterations taken') | |
407 - call ivout (logfil, 1, np, ndigit, | |
408 + call ivout (logfil, 1, [np], ndigit, | |
409 & '_naupd: Number of wanted "converged" Ritz values') | |
410 call dvout (logfil, np, workl(ritzr), ndigit, | |
411 & '_naupd: Real part of the final Ritz values') | |
412 diff --git a/SRC/dneupd.f b/SRC/dneupd.f | |
413 index 424ad2bf..9c2ece0e 100644 | |
414 --- a/SRC/dneupd.f | |
415 +++ b/SRC/dneupd.f | |
416 @@ -601,9 +601,9 @@ subroutine dneupd (rvec , howmny, select, dr , di, | |
417 c %-----------------------------------------------------------% | |
418 c | |
419 if (msglvl .gt. 2) then | |
420 - call ivout(logfil, 1, numcnv, ndigit, | |
421 + call ivout(logfil, 1, [numcnv], ndigit, | |
422 & '_neupd: Number of specified eigenvalues') | |
423 - call ivout(logfil, 1, nconv, ndigit, | |
424 + call ivout(logfil, 1, [nconv], ndigit, | |
425 & '_neupd: Number of "converged" eigenvalues') | |
426 end if | |
427 c | |
428 diff --git a/SRC/dngets.f b/SRC/dngets.f | |
429 index a3145506..47d3ac2c 100644 | |
430 --- a/SRC/dngets.f | |
431 +++ b/SRC/dngets.f | |
432 @@ -212,8 +212,8 @@ subroutine dngets ( ishift, which, kev, np, ritzr, ritzi, bounds, | |
433 tngets = tngets + (t1 - t0) | |
434 c | |
435 if (msglvl .gt. 0) then | |
436 - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') | |
437 - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') | |
438 + call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') | |
439 + call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') | |
440 call dvout (logfil, kev+np, ritzr, ndigit, | |
441 & '_ngets: Eigenvalues of current H matrix -- real part') | |
442 call dvout (logfil, kev+np, ritzi, ndigit, | |
443 diff --git a/SRC/dsaitr.f b/SRC/dsaitr.f | |
444 index 00dabfd2..3460d990 100644 | |
445 --- a/SRC/dsaitr.f | |
446 +++ b/SRC/dsaitr.f | |
447 @@ -364,9 +364,9 @@ subroutine dsaitr | |
448 1000 continue | |
449 c | |
450 if (msglvl .gt. 2) then | |
451 - call ivout (logfil, 1, j, ndigit, | |
452 + call ivout (logfil, 1, [j], ndigit, | |
453 & '_saitr: generating Arnoldi vector no.') | |
454 - call dvout (logfil, 1, rnorm, ndigit, | |
455 + call dvout (logfil, 1, [rnorm], ndigit, | |
456 & '_saitr: B-norm of the current residual =') | |
457 end if | |
458 c | |
459 @@ -384,7 +384,7 @@ subroutine dsaitr | |
460 c %---------------------------------------------------% | |
461 c | |
462 if (msglvl .gt. 0) then | |
463 - call ivout (logfil, 1, j, ndigit, | |
464 + call ivout (logfil, 1, [j], ndigit, | |
465 & '_saitr: ****** restart at step ******') | |
466 end if | |
467 c | |
468 @@ -735,7 +735,7 @@ subroutine dsaitr | |
469 end if | |
470 c | |
471 if (msglvl .gt. 0 .and. iter .gt. 0) then | |
472 - call ivout (logfil, 1, j, ndigit, | |
473 + call ivout (logfil, 1, [j], ndigit, | |
474 & '_saitr: Iterative refinement for Arnoldi residual') | |
475 if (msglvl .gt. 2) then | |
476 xtemp(1) = rnorm | |
477 diff --git a/SRC/dsapps.f b/SRC/dsapps.f | |
478 index 12108d0f..f84ef838 100644 | |
479 --- a/SRC/dsapps.f | |
480 +++ b/SRC/dsapps.f | |
481 @@ -261,9 +261,9 @@ subroutine dsapps | |
482 big = abs(h(i,2)) + abs(h(i+1,2)) | |
483 if (h(i+1,1) .le. epsmch*big) then | |
484 if (msglvl .gt. 0) then | |
485 - call ivout (logfil, 1, i, ndigit, | |
486 + call ivout (logfil, 1, [i], ndigit, | |
487 & '_sapps: deflation at row/column no.') | |
488 - call ivout (logfil, 1, jj, ndigit, | |
489 + call ivout (logfil, 1, [jj], ndigit, | |
490 & '_sapps: occurred before shift number.') | |
491 call dvout (logfil, 1, h(i+1,1), ndigit, | |
492 & '_sapps: the corresponding off diagonal element') | |
493 @@ -432,7 +432,7 @@ subroutine dsapps | |
494 big = abs(h(i,2)) + abs(h(i+1,2)) | |
495 if (h(i+1,1) .le. epsmch*big) then | |
496 if (msglvl .gt. 0) then | |
497 - call ivout (logfil, 1, i, ndigit, | |
498 + call ivout (logfil, 1, [i], ndigit, | |
499 & '_sapps: deflation at row/column no.') | |
500 call dvout (logfil, 1, h(i+1,1), ndigit, | |
501 & '_sapps: the corresponding off diagonal element') | |
502 diff --git a/SRC/dsaup2.f b/SRC/dsaup2.f | |
503 index f4c5f90c..f7d4a119 100644 | |
504 --- a/SRC/dsaup2.f | |
505 +++ b/SRC/dsaup2.f | |
506 @@ -402,13 +402,13 @@ subroutine dsaup2 | |
507 iter = iter + 1 | |
508 c | |
509 if (msglvl .gt. 0) then | |
510 - call ivout (logfil, 1, iter, ndigit, | |
511 + call ivout (logfil, 1, [iter], ndigit, | |
512 & '_saup2: **** Start of major iteration number ****') | |
513 end if | |
514 if (msglvl .gt. 1) then | |
515 - call ivout (logfil, 1, nev, ndigit, | |
516 + call ivout (logfil, 1, [nev], ndigit, | |
517 & '_saup2: The length of the current Lanczos factorization') | |
518 - call ivout (logfil, 1, np, ndigit, | |
519 + call ivout (logfil, 1, [np], ndigit, | |
520 & '_saup2: Extend the Lanczos factorization by') | |
521 end if | |
522 c | |
523 @@ -446,7 +446,7 @@ subroutine dsaup2 | |
524 update = .false. | |
525 c | |
526 if (msglvl .gt. 1) then | |
527 - call dvout (logfil, 1, rnorm, ndigit, | |
528 + call dvout (logfil, 1, [rnorm], ndigit, | |
529 & '_saup2: Current B-norm of residual for factorization') | |
530 end if | |
531 c | |
532 @@ -695,7 +695,7 @@ subroutine dsaup2 | |
533 end if | |
534 c | |
535 if (msglvl .gt. 0) then | |
536 - call ivout (logfil, 1, nconv, ndigit, | |
537 + call ivout (logfil, 1, [nconv], ndigit, | |
538 & '_saup2: no. of "converged" Ritz values at this iter.') | |
539 if (msglvl .gt. 1) then | |
540 kp(1) = nev | |
541 @@ -743,7 +743,7 @@ subroutine dsaup2 | |
542 if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) | |
543 c | |
544 if (msglvl .gt. 2) then | |
545 - call ivout (logfil, 1, np, ndigit, | |
546 + call ivout (logfil, 1, [np], ndigit, | |
547 & '_saup2: The number of shifts to apply ') | |
548 call dvout (logfil, np, workl, ndigit, | |
549 & '_saup2: shifts selected') | |
550 @@ -810,7 +810,7 @@ subroutine dsaup2 | |
551 130 continue | |
552 c | |
553 if (msglvl .gt. 2) then | |
554 - call dvout (logfil, 1, rnorm, ndigit, | |
555 + call dvout (logfil, 1, [rnorm], ndigit, | |
556 & '_saup2: B-norm of residual for NEV factorization') | |
557 call dvout (logfil, nev, h(1,2), ndigit, | |
558 & '_saup2: main diagonal of compressed H matrix') | |
559 diff --git a/SRC/dsaupd.f b/SRC/dsaupd.f | |
560 index bd4afc26..c5b08d6b 100644 | |
561 --- a/SRC/dsaupd.f | |
562 +++ b/SRC/dsaupd.f | |
563 @@ -628,9 +628,9 @@ subroutine dsaupd | |
564 if (info .eq. 2) info = 3 | |
565 c | |
566 if (msglvl .gt. 0) then | |
567 - call ivout (logfil, 1, mxiter, ndigit, | |
568 + call ivout (logfil, 1, [mxiter], ndigit, | |
569 & '_saupd: number of update iterations taken') | |
570 - call ivout (logfil, 1, np, ndigit, | |
571 + call ivout (logfil, 1, [np], ndigit, | |
572 & '_saupd: number of "converged" Ritz values') | |
573 call dvout (logfil, np, workl(Ritz), ndigit, | |
574 & '_saupd: final Ritz values') | |
575 diff --git a/SRC/dseupd.f b/SRC/dseupd.f | |
576 index e89fdccf..ae123a20 100644 | |
577 --- a/SRC/dseupd.f | |
578 +++ b/SRC/dseupd.f | |
579 @@ -513,9 +513,9 @@ subroutine dseupd (rvec , howmny, select, d , | |
580 c %-----------------------------------------------------------% | |
581 c | |
582 if (msglvl .gt. 2) then | |
583 - call ivout(logfil, 1, numcnv, ndigit, | |
584 + call ivout(logfil, 1, [numcnv], ndigit, | |
585 & '_seupd: Number of specified eigenvalues') | |
586 - call ivout(logfil, 1, nconv, ndigit, | |
587 + call ivout(logfil, 1, [nconv], ndigit, | |
588 & '_seupd: Number of "converged" eigenvalues') | |
589 end if | |
590 c | |
591 diff --git a/SRC/dsgets.f b/SRC/dsgets.f | |
592 index 800a02f4..436a4fe8 100644 | |
593 --- a/SRC/dsgets.f | |
594 +++ b/SRC/dsgets.f | |
595 @@ -202,8 +202,8 @@ subroutine dsgets ( ishift, which, kev, np, ritz, bounds, shifts ) | |
596 tsgets = tsgets + (t1 - t0) | |
597 c | |
598 if (msglvl .gt. 0) then | |
599 - call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') | |
600 - call ivout (logfil, 1, np, ndigit, '_sgets: NP is') | |
601 + call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is') | |
602 + call ivout (logfil, 1, [np], ndigit, '_sgets: NP is') | |
603 call dvout (logfil, kev+np, ritz, ndigit, | |
604 & '_sgets: Eigenvalues of current H matrix') | |
605 call dvout (logfil, kev+np, bounds, ndigit, | |
606 diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f | |
607 index c768daae..d861b2d6 100644 | |
608 --- a/SRC/sgetv0.f | |
609 +++ b/SRC/sgetv0.f | |
610 @@ -366,9 +366,9 @@ subroutine sgetv0 | |
611 c %--------------------------------------% | |
612 c | |
613 if (msglvl .gt. 2) then | |
614 - call svout (logfil, 1, rnorm0, ndigit, | |
615 + call svout (logfil, 1, [rnorm0], ndigit, | |
616 & '_getv0: re-orthonalization ; rnorm0 is') | |
617 - call svout (logfil, 1, rnorm, ndigit, | |
618 + call svout (logfil, 1, [rnorm], ndigit, | |
619 & '_getv0: re-orthonalization ; rnorm is') | |
620 end if | |
621 c | |
622 @@ -399,7 +399,7 @@ subroutine sgetv0 | |
623 50 continue | |
624 c | |
625 if (msglvl .gt. 0) then | |
626 - call svout (logfil, 1, rnorm, ndigit, | |
627 + call svout (logfil, 1, [rnorm], ndigit, | |
628 & '_getv0: B-norm of initial / restarted starting vector') | |
629 end if | |
630 if (msglvl .gt. 3) then | |
631 diff --git a/SRC/snaitr.f b/SRC/snaitr.f | |
632 index 5ecdebb7..8a5d795b 100644 | |
633 --- a/SRC/snaitr.f | |
634 +++ b/SRC/snaitr.f | |
635 @@ -371,9 +371,9 @@ subroutine snaitr | |
636 1000 continue | |
637 c | |
638 if (msglvl .gt. 1) then | |
639 - call ivout (logfil, 1, j, ndigit, | |
640 + call ivout (logfil, 1, [j], ndigit, | |
641 & '_naitr: generating Arnoldi vector number') | |
642 - call svout (logfil, 1, rnorm, ndigit, | |
643 + call svout (logfil, 1, [rnorm], ndigit, | |
644 & '_naitr: B-norm of the current residual is') | |
645 end if | |
646 c | |
647 @@ -393,7 +393,7 @@ subroutine snaitr | |
648 c %---------------------------------------------------% | |
649 c | |
650 if (msglvl .gt. 0) then | |
651 - call ivout (logfil, 1, j, ndigit, | |
652 + call ivout (logfil, 1, [j], ndigit, | |
653 & '_naitr: ****** RESTART AT STEP ******') | |
654 end if | |
655 c | |
656 @@ -721,7 +721,7 @@ subroutine snaitr | |
657 end if | |
658 c | |
659 if (msglvl .gt. 0 .and. iter .gt. 0) then | |
660 - call ivout (logfil, 1, j, ndigit, | |
661 + call ivout (logfil, 1, [j], ndigit, | |
662 & '_naitr: Iterative refinement for Arnoldi residual') | |
663 if (msglvl .gt. 2) then | |
664 xtemp(1) = rnorm | |
665 diff --git a/SRC/snapps.f b/SRC/snapps.f | |
666 index 914c9b8b..9b767285 100644 | |
667 --- a/SRC/snapps.f | |
668 +++ b/SRC/snapps.f | |
669 @@ -266,11 +266,11 @@ subroutine snapps | |
670 sigmai = shifti(jj) | |
671 c | |
672 if (msglvl .gt. 2 ) then | |
673 - call ivout (logfil, 1, jj, ndigit, | |
674 + call ivout (logfil, 1, [jj], ndigit, | |
675 & '_napps: shift number.') | |
676 - call svout (logfil, 1, sigmar, ndigit, | |
677 + call svout (logfil, 1, [sigmar], ndigit, | |
678 & '_napps: The real part of the shift ') | |
679 - call svout (logfil, 1, sigmai, ndigit, | |
680 + call svout (logfil, 1, [sigmai], ndigit, | |
681 & '_napps: The imaginary part of the shift ') | |
682 end if | |
683 c | |
684 @@ -335,9 +335,9 @@ subroutine snapps | |
685 & tst1 = slanhs( '1', kplusp-jj+1, h, ldh, workl ) | |
686 if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then | |
687 if (msglvl .gt. 0) then | |
688 - call ivout (logfil, 1, i, ndigit, | |
689 + call ivout (logfil, 1, [i], ndigit, | |
690 & '_napps: matrix splitting at row/column no.') | |
691 - call ivout (logfil, 1, jj, ndigit, | |
692 + call ivout (logfil, 1, [jj], ndigit, | |
693 & '_napps: matrix splitting with shift number.') | |
694 call svout (logfil, 1, h(i+1,i), ndigit, | |
695 & '_napps: off diagonal element.') | |
696 @@ -351,9 +351,9 @@ subroutine snapps | |
697 40 continue | |
698 c | |
699 if (msglvl .gt. 2) then | |
700 - call ivout (logfil, 1, istart, ndigit, | |
701 + call ivout (logfil, 1, [istart], ndigit, | |
702 & '_napps: Start of current block ') | |
703 - call ivout (logfil, 1, iend, ndigit, | |
704 + call ivout (logfil, 1, [iend], ndigit, | |
705 & '_napps: End of current block ') | |
706 end if | |
707 c | |
708 @@ -625,7 +625,7 @@ subroutine snapps | |
709 & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') | |
710 call svout (logfil, 1, h(kev+1,kev), ndigit, | |
711 & '_napps: betak = e_{kev+1}^T*H*e_{kev}') | |
712 - call ivout (logfil, 1, kev, ndigit, | |
713 + call ivout (logfil, 1, [kev], ndigit, | |
714 & '_napps: Order of the final Hessenberg matrix ') | |
715 if (msglvl .gt. 2) then | |
716 call smout (logfil, kev, kev, h, ldh, ndigit, | |
717 diff --git a/SRC/snaup2.f b/SRC/snaup2.f | |
718 index 53e39461..12b2cfed 100644 | |
719 --- a/SRC/snaup2.f | |
720 +++ b/SRC/snaup2.f | |
721 @@ -388,7 +388,7 @@ subroutine snaup2 | |
722 iter = iter + 1 | |
723 c | |
724 if (msglvl .gt. 0) then | |
725 - call ivout (logfil, 1, iter, ndigit, | |
726 + call ivout (logfil, 1, [iter], ndigit, | |
727 & '_naup2: **** Start of major iteration number ****') | |
728 end if | |
729 c | |
730 @@ -401,9 +401,9 @@ subroutine snaup2 | |
731 np = kplusp - nev | |
732 c | |
733 if (msglvl .gt. 1) then | |
734 - call ivout (logfil, 1, nev, ndigit, | |
735 + call ivout (logfil, 1, [nev], ndigit, | |
736 & '_naup2: The length of the current Arnoldi factorization') | |
737 - call ivout (logfil, 1, np, ndigit, | |
738 + call ivout (logfil, 1, [np], ndigit, | |
739 & '_naup2: Extend the Arnoldi factorization by') | |
740 end if | |
741 c | |
742 @@ -435,7 +435,7 @@ subroutine snaup2 | |
743 update = .false. | |
744 c | |
745 if (msglvl .gt. 1) then | |
746 - call svout (logfil, 1, rnorm, ndigit, | |
747 + call svout (logfil, 1, [rnorm], ndigit, | |
748 & '_naup2: Corresponding B-norm of the residual') | |
749 end if | |
750 c | |
751 @@ -690,7 +690,7 @@ subroutine snaup2 | |
752 end if | |
753 c | |
754 if (msglvl .gt. 0) then | |
755 - call ivout (logfil, 1, nconv, ndigit, | |
756 + call ivout (logfil, 1, [nconv], ndigit, | |
757 & '_naup2: no. of "converged" Ritz values at this iter.') | |
758 if (msglvl .gt. 1) then | |
759 kp(1) = nev | |
760 @@ -742,7 +742,7 @@ subroutine snaup2 | |
761 end if | |
762 c | |
763 if (msglvl .gt. 2) then | |
764 - call ivout (logfil, 1, np, ndigit, | |
765 + call ivout (logfil, 1, [np], ndigit, | |
766 & '_naup2: The number of shifts to apply ') | |
767 call svout (logfil, np, ritzr, ndigit, | |
768 & '_naup2: Real part of the shifts') | |
769 @@ -808,7 +808,7 @@ subroutine snaup2 | |
770 cnorm = .false. | |
771 c | |
772 if (msglvl .gt. 2) then | |
773 - call svout (logfil, 1, rnorm, ndigit, | |
774 + call svout (logfil, 1, [rnorm], ndigit, | |
775 & '_naup2: B-norm of residual for compressed factorization') | |
776 call smout (logfil, nev, nev, h, ldh, ndigit, | |
777 & '_naup2: Compressed upper Hessenberg matrix H') | |
778 diff --git a/SRC/snaupd.f b/SRC/snaupd.f | |
779 index 19284d06..e0be1bfd 100644 | |
780 --- a/SRC/snaupd.f | |
781 +++ b/SRC/snaupd.f | |
782 @@ -628,9 +628,9 @@ subroutine snaupd | |
783 if (info .eq. 2) info = 3 | |
784 c | |
785 if (msglvl .gt. 0) then | |
786 - call ivout (logfil, 1, mxiter, ndigit, | |
787 + call ivout (logfil, 1, [mxiter], ndigit, | |
788 & '_naupd: Number of update iterations taken') | |
789 - call ivout (logfil, 1, np, ndigit, | |
790 + call ivout (logfil, 1, [np], ndigit, | |
791 & '_naupd: Number of wanted "converged" Ritz values') | |
792 call svout (logfil, np, workl(ritzr), ndigit, | |
793 & '_naupd: Real part of the final Ritz values') | |
794 diff --git a/SRC/sneupd.f b/SRC/sneupd.f | |
795 index ecd8f164..4c472fef 100644 | |
796 --- a/SRC/sneupd.f | |
797 +++ b/SRC/sneupd.f | |
798 @@ -601,9 +601,9 @@ subroutine sneupd(rvec , howmny, select, dr , di, | |
799 c %-----------------------------------------------------------% | |
800 c | |
801 if (msglvl .gt. 2) then | |
802 - call ivout(logfil, 1, numcnv, ndigit, | |
803 + call ivout(logfil, 1, [numcnv], ndigit, | |
804 & '_neupd: Number of specified eigenvalues') | |
805 - call ivout(logfil, 1, nconv, ndigit, | |
806 + call ivout(logfil, 1, [nconv], ndigit, | |
807 & '_neupd: Number of "converged" eigenvalues') | |
808 end if | |
809 c | |
810 diff --git a/SRC/sngets.f b/SRC/sngets.f | |
811 index 800282f8..7e48c0bb 100644 | |
812 --- a/SRC/sngets.f | |
813 +++ b/SRC/sngets.f | |
814 @@ -212,8 +212,8 @@ subroutine sngets ( ishift, which, kev, np, ritzr, ritzi, bounds, | |
815 tngets = tngets + (t1 - t0) | |
816 c | |
817 if (msglvl .gt. 0) then | |
818 - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') | |
819 - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') | |
820 + call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') | |
821 + call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') | |
822 call svout (logfil, kev+np, ritzr, ndigit, | |
823 & '_ngets: Eigenvalues of current H matrix -- real part') | |
824 call svout (logfil, kev+np, ritzi, ndigit, | |
825 diff --git a/SRC/ssaitr.f b/SRC/ssaitr.f | |
826 index 721bdb58..a5df2c2e 100644 | |
827 --- a/SRC/ssaitr.f | |
828 +++ b/SRC/ssaitr.f | |
829 @@ -364,9 +364,9 @@ subroutine ssaitr | |
830 1000 continue | |
831 c | |
832 if (msglvl .gt. 2) then | |
833 - call ivout (logfil, 1, j, ndigit, | |
834 + call ivout (logfil, 1, [j], ndigit, | |
835 & '_saitr: generating Arnoldi vector no.') | |
836 - call svout (logfil, 1, rnorm, ndigit, | |
837 + call svout (logfil, 1, [rnorm], ndigit, | |
838 & '_saitr: B-norm of the current residual =') | |
839 end if | |
840 c | |
841 @@ -384,7 +384,7 @@ subroutine ssaitr | |
842 c %---------------------------------------------------% | |
843 c | |
844 if (msglvl .gt. 0) then | |
845 - call ivout (logfil, 1, j, ndigit, | |
846 + call ivout (logfil, 1, [j], ndigit, | |
847 & '_saitr: ****** restart at step ******') | |
848 end if | |
849 c | |
850 @@ -735,7 +735,7 @@ subroutine ssaitr | |
851 end if | |
852 c | |
853 if (msglvl .gt. 0 .and. iter .gt. 0) then | |
854 - call ivout (logfil, 1, j, ndigit, | |
855 + call ivout (logfil, 1, [j], ndigit, | |
856 & '_saitr: Iterative refinement for Arnoldi residual') | |
857 if (msglvl .gt. 2) then | |
858 xtemp(1) = rnorm | |
859 diff --git a/SRC/ssapps.f b/SRC/ssapps.f | |
860 index c8143111..77bd9d52 100644 | |
861 --- a/SRC/ssapps.f | |
862 +++ b/SRC/ssapps.f | |
863 @@ -261,9 +261,9 @@ subroutine ssapps | |
864 big = abs(h(i,2)) + abs(h(i+1,2)) | |
865 if (h(i+1,1) .le. epsmch*big) then | |
866 if (msglvl .gt. 0) then | |
867 - call ivout (logfil, 1, i, ndigit, | |
868 + call ivout (logfil, 1, [i], ndigit, | |
869 & '_sapps: deflation at row/column no.') | |
870 - call ivout (logfil, 1, jj, ndigit, | |
871 + call ivout (logfil, 1, [jj], ndigit, | |
872 & '_sapps: occurred before shift number.') | |
873 call svout (logfil, 1, h(i+1,1), ndigit, | |
874 & '_sapps: the corresponding off diagonal element') | |
875 @@ -432,7 +432,7 @@ subroutine ssapps | |
876 big = abs(h(i,2)) + abs(h(i+1,2)) | |
877 if (h(i+1,1) .le. epsmch*big) then | |
878 if (msglvl .gt. 0) then | |
879 - call ivout (logfil, 1, i, ndigit, | |
880 + call ivout (logfil, 1, [i], ndigit, | |
881 & '_sapps: deflation at row/column no.') | |
882 call svout (logfil, 1, h(i+1,1), ndigit, | |
883 & '_sapps: the corresponding off diagonal element') | |
884 diff --git a/SRC/ssaup2.f b/SRC/ssaup2.f | |
885 index a73c9a58..8cc04638 100644 | |
886 --- a/SRC/ssaup2.f | |
887 +++ b/SRC/ssaup2.f | |
888 @@ -402,13 +402,13 @@ subroutine ssaup2 | |
889 iter = iter + 1 | |
890 c | |
891 if (msglvl .gt. 0) then | |
892 - call ivout (logfil, 1, iter, ndigit, | |
893 + call ivout (logfil, 1, [iter], ndigit, | |
894 & '_saup2: **** Start of major iteration number ****') | |
895 end if | |
896 if (msglvl .gt. 1) then | |
897 - call ivout (logfil, 1, nev, ndigit, | |
898 + call ivout (logfil, 1, [nev], ndigit, | |
899 & '_saup2: The length of the current Lanczos factorization') | |
900 - call ivout (logfil, 1, np, ndigit, | |
901 + call ivout (logfil, 1, [np], ndigit, | |
902 & '_saup2: Extend the Lanczos factorization by') | |
903 end if | |
904 c | |
905 @@ -446,7 +446,7 @@ subroutine ssaup2 | |
906 update = .false. | |
907 c | |
908 if (msglvl .gt. 1) then | |
909 - call svout (logfil, 1, rnorm, ndigit, | |
910 + call svout (logfil, 1, [rnorm], ndigit, | |
911 & '_saup2: Current B-norm of residual for factorization') | |
912 end if | |
913 c | |
914 @@ -694,7 +694,7 @@ subroutine ssaup2 | |
915 end if | |
916 c | |
917 if (msglvl .gt. 0) then | |
918 - call ivout (logfil, 1, nconv, ndigit, | |
919 + call ivout (logfil, 1, [nconv], ndigit, | |
920 & '_saup2: no. of "converged" Ritz values at this iter.') | |
921 if (msglvl .gt. 1) then | |
922 kp(1) = nev | |
923 @@ -742,7 +742,7 @@ subroutine ssaup2 | |
924 if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1) | |
925 c | |
926 if (msglvl .gt. 2) then | |
927 - call ivout (logfil, 1, np, ndigit, | |
928 + call ivout (logfil, 1, [np], ndigit, | |
929 & '_saup2: The number of shifts to apply ') | |
930 call svout (logfil, np, workl, ndigit, | |
931 & '_saup2: shifts selected') | |
932 @@ -809,7 +809,7 @@ subroutine ssaup2 | |
933 130 continue | |
934 c | |
935 if (msglvl .gt. 2) then | |
936 - call svout (logfil, 1, rnorm, ndigit, | |
937 + call svout (logfil, 1, [rnorm], ndigit, | |
938 & '_saup2: B-norm of residual for NEV factorization') | |
939 call svout (logfil, nev, h(1,2), ndigit, | |
940 & '_saup2: main diagonal of compressed H matrix') | |
941 diff --git a/SRC/ssaupd.f b/SRC/ssaupd.f | |
942 index d139ac53..a8d2f2d5 100644 | |
943 --- a/SRC/ssaupd.f | |
944 +++ b/SRC/ssaupd.f | |
945 @@ -628,9 +628,9 @@ subroutine ssaupd | |
946 if (info .eq. 2) info = 3 | |
947 c | |
948 if (msglvl .gt. 0) then | |
949 - call ivout (logfil, 1, mxiter, ndigit, | |
950 + call ivout (logfil, 1, [mxiter], ndigit, | |
951 & '_saupd: number of update iterations taken') | |
952 - call ivout (logfil, 1, np, ndigit, | |
953 + call ivout (logfil, 1, [np], ndigit, | |
954 & '_saupd: number of "converged" Ritz values') | |
955 call svout (logfil, np, workl(Ritz), ndigit, | |
956 & '_saupd: final Ritz values') | |
957 diff --git a/SRC/sseupd.f b/SRC/sseupd.f | |
958 index 9b94ed7c..03ba7ac5 100644 | |
959 --- a/SRC/sseupd.f | |
960 +++ b/SRC/sseupd.f | |
961 @@ -513,9 +513,9 @@ subroutine sseupd(rvec , howmny, select, d , | |
962 c %-----------------------------------------------------------% | |
963 c | |
964 if (msglvl .gt. 2) then | |
965 - call ivout(logfil, 1, numcnv, ndigit, | |
966 + call ivout(logfil, 1, [numcnv], ndigit, | |
967 & '_seupd: Number of specified eigenvalues') | |
968 - call ivout(logfil, 1, nconv, ndigit, | |
969 + call ivout(logfil, 1, [nconv], ndigit, | |
970 & '_seupd: Number of "converged" eigenvalues') | |
971 end if | |
972 c | |
973 diff --git a/SRC/ssgets.f b/SRC/ssgets.f | |
974 index ce84d673..f40ca76a 100644 | |
975 --- a/SRC/ssgets.f | |
976 +++ b/SRC/ssgets.f | |
977 @@ -202,8 +202,8 @@ subroutine ssgets ( ishift, which, kev, np, ritz, bounds, shifts ) | |
978 tsgets = tsgets + (t1 - t0) | |
979 c | |
980 if (msglvl .gt. 0) then | |
981 - call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is') | |
982 - call ivout (logfil, 1, np, ndigit, '_sgets: NP is') | |
983 + call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is') | |
984 + call ivout (logfil, 1, [np], ndigit, '_sgets: NP is') | |
985 call svout (logfil, kev+np, ritz, ndigit, | |
986 & '_sgets: Eigenvalues of current H matrix') | |
987 call svout (logfil, kev+np, bounds, ndigit, | |
988 diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f | |
989 index d71f3c03..ff5c2b19 100644 | |
990 --- a/SRC/zgetv0.f | |
991 +++ b/SRC/zgetv0.f | |
992 @@ -361,9 +361,9 @@ subroutine zgetv0 | |
993 c %--------------------------------------% | |
994 c | |
995 if (msglvl .gt. 2) then | |
996 - call dvout (logfil, 1, rnorm0, ndigit, | |
997 + call dvout (logfil, 1, [rnorm0], ndigit, | |
998 & '_getv0: re-orthonalization ; rnorm0 is') | |
999 - call dvout (logfil, 1, rnorm, ndigit, | |
1000 + call dvout (logfil, 1, [rnorm], ndigit, | |
1001 & '_getv0: re-orthonalization ; rnorm is') | |
1002 end if | |
1003 c | |
1004 @@ -394,7 +394,7 @@ subroutine zgetv0 | |
1005 50 continue | |
1006 c | |
1007 if (msglvl .gt. 0) then | |
1008 - call dvout (logfil, 1, rnorm, ndigit, | |
1009 + call dvout (logfil, 1, [rnorm], ndigit, | |
1010 & '_getv0: B-norm of initial / restarted starting vector') | |
1011 end if | |
1012 if (msglvl .gt. 2) then | |
1013 diff --git a/SRC/znaitr.f b/SRC/znaitr.f | |
1014 index b8331c06..1c5aa57f 100644 | |
1015 --- a/SRC/znaitr.f | |
1016 +++ b/SRC/znaitr.f | |
1017 @@ -378,9 +378,9 @@ subroutine znaitr | |
1018 1000 continue | |
1019 c | |
1020 if (msglvl .gt. 1) then | |
1021 - call ivout (logfil, 1, j, ndigit, | |
1022 + call ivout (logfil, 1, [j], ndigit, | |
1023 & '_naitr: generating Arnoldi vector number') | |
1024 - call dvout (logfil, 1, rnorm, ndigit, | |
1025 + call dvout (logfil, 1, [rnorm], ndigit, | |
1026 & '_naitr: B-norm of the current residual is') | |
1027 end if | |
1028 c | |
1029 @@ -400,7 +400,7 @@ subroutine znaitr | |
1030 c %---------------------------------------------------% | |
1031 c | |
1032 if (msglvl .gt. 0) then | |
1033 - call ivout (logfil, 1, j, ndigit, | |
1034 + call ivout (logfil, 1, [j], ndigit, | |
1035 & '_naitr: ****** RESTART AT STEP ******') | |
1036 end if | |
1037 c | |
1038 @@ -729,7 +729,7 @@ subroutine znaitr | |
1039 end if | |
1040 c | |
1041 if (msglvl .gt. 0 .and. iter .gt. 0 ) then | |
1042 - call ivout (logfil, 1, j, ndigit, | |
1043 + call ivout (logfil, 1, [j], ndigit, | |
1044 & '_naitr: Iterative refinement for Arnoldi residual') | |
1045 if (msglvl .gt. 2) then | |
1046 rtemp(1) = rnorm | |
1047 diff --git a/SRC/znapps.f b/SRC/znapps.f | |
1048 index a1f116d3..6d8d12a8 100644 | |
1049 --- a/SRC/znapps.f | |
1050 +++ b/SRC/znapps.f | |
1051 @@ -268,9 +268,9 @@ subroutine znapps | |
1052 sigma = shift(jj) | |
1053 c | |
1054 if (msglvl .gt. 2 ) then | |
1055 - call ivout (logfil, 1, jj, ndigit, | |
1056 + call ivout (logfil, 1, [jj], ndigit, | |
1057 & '_napps: shift number.') | |
1058 - call zvout (logfil, 1, sigma, ndigit, | |
1059 + call zvout (logfil, 1, [sigma], ndigit, | |
1060 & '_napps: Value of the shift ') | |
1061 end if | |
1062 c | |
1063 @@ -291,9 +291,9 @@ subroutine znapps | |
1064 if ( abs(dble(h(i+1,i))) | |
1065 & .le. max(ulp*tst1, smlnum) ) then | |
1066 if (msglvl .gt. 0) then | |
1067 - call ivout (logfil, 1, i, ndigit, | |
1068 + call ivout (logfil, 1, [i], ndigit, | |
1069 & '_napps: matrix splitting at row/column no.') | |
1070 - call ivout (logfil, 1, jj, ndigit, | |
1071 + call ivout (logfil, 1, [jj], ndigit, | |
1072 & '_napps: matrix splitting with shift number.') | |
1073 call zvout (logfil, 1, h(i+1,i), ndigit, | |
1074 & '_napps: off diagonal element.') | |
1075 @@ -307,9 +307,9 @@ subroutine znapps | |
1076 40 continue | |
1077 c | |
1078 if (msglvl .gt. 2) then | |
1079 - call ivout (logfil, 1, istart, ndigit, | |
1080 + call ivout (logfil, 1, [istart], ndigit, | |
1081 & '_napps: Start of current block ') | |
1082 - call ivout (logfil, 1, iend, ndigit, | |
1083 + call ivout (logfil, 1, [iend], ndigit, | |
1084 & '_napps: End of current block ') | |
1085 end if | |
1086 c | |
1087 @@ -485,7 +485,7 @@ subroutine znapps | |
1088 & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') | |
1089 call zvout (logfil, 1, h(kev+1,kev), ndigit, | |
1090 & '_napps: betak = e_{kev+1}^T*H*e_{kev}') | |
1091 - call ivout (logfil, 1, kev, ndigit, | |
1092 + call ivout (logfil, 1, [kev], ndigit, | |
1093 & '_napps: Order of the final Hessenberg matrix ') | |
1094 if (msglvl .gt. 2) then | |
1095 call zmout (logfil, kev, kev, h, ldh, ndigit, | |
1096 diff --git a/SRC/znaup2.f b/SRC/znaup2.f | |
1097 index 469aafb2..b814cf15 100644 | |
1098 --- a/SRC/znaup2.f | |
1099 +++ b/SRC/znaup2.f | |
1100 @@ -389,7 +389,7 @@ subroutine znaup2 | |
1101 iter = iter + 1 | |
1102 c | |
1103 if (msglvl .gt. 0) then | |
1104 - call ivout (logfil, 1, iter, ndigit, | |
1105 + call ivout (logfil, 1, [iter], ndigit, | |
1106 & '_naup2: **** Start of major iteration number ****') | |
1107 end if | |
1108 c | |
1109 @@ -402,9 +402,9 @@ subroutine znaup2 | |
1110 np = kplusp - nev | |
1111 c | |
1112 if (msglvl .gt. 1) then | |
1113 - call ivout (logfil, 1, nev, ndigit, | |
1114 + call ivout (logfil, 1, [nev], ndigit, | |
1115 & '_naup2: The length of the current Arnoldi factorization') | |
1116 - call ivout (logfil, 1, np, ndigit, | |
1117 + call ivout (logfil, 1, [np], ndigit, | |
1118 & '_naup2: Extend the Arnoldi factorization by') | |
1119 end if | |
1120 c | |
1121 @@ -430,7 +430,7 @@ subroutine znaup2 | |
1122 update = .false. | |
1123 c | |
1124 if (msglvl .gt. 1) then | |
1125 - call dvout (logfil, 1, rnorm, ndigit, | |
1126 + call dvout (logfil, 1, [rnorm], ndigit, | |
1127 & '_naup2: Corresponding B-norm of the residual') | |
1128 end if | |
1129 c | |
1130 @@ -658,7 +658,7 @@ subroutine znaup2 | |
1131 end if | |
1132 c | |
1133 if (msglvl .gt. 0) then | |
1134 - call ivout (logfil, 1, nconv, ndigit, | |
1135 + call ivout (logfil, 1, [nconv], ndigit, | |
1136 & '_naup2: no. of "converged" Ritz values at this iter.') | |
1137 if (msglvl .gt. 1) then | |
1138 kp(1) = nev | |
1139 @@ -698,7 +698,7 @@ subroutine znaup2 | |
1140 end if | |
1141 c | |
1142 if (msglvl .gt. 2) then | |
1143 - call ivout (logfil, 1, np, ndigit, | |
1144 + call ivout (logfil, 1, [np], ndigit, | |
1145 & '_naup2: The number of shifts to apply ') | |
1146 call zvout (logfil, np, ritz, ndigit, | |
1147 & '_naup2: values of the shifts') | |
1148 @@ -762,7 +762,7 @@ subroutine znaup2 | |
1149 cnorm = .false. | |
1150 c | |
1151 if (msglvl .gt. 2) then | |
1152 - call dvout (logfil, 1, rnorm, ndigit, | |
1153 + call dvout (logfil, 1, [rnorm], ndigit, | |
1154 & '_naup2: B-norm of residual for compressed factorization') | |
1155 call zmout (logfil, nev, nev, h, ldh, ndigit, | |
1156 & '_naup2: Compressed upper Hessenberg matrix H') | |
1157 diff --git a/SRC/znaupd.f b/SRC/znaupd.f | |
1158 index 779eb2bc..c7d58aaa 100644 | |
1159 --- a/SRC/znaupd.f | |
1160 +++ b/SRC/znaupd.f | |
1161 @@ -601,9 +601,9 @@ subroutine znaupd | |
1162 if (info .eq. 2) info = 3 | |
1163 c | |
1164 if (msglvl .gt. 0) then | |
1165 - call ivout (logfil, 1, mxiter, ndigit, | |
1166 + call ivout (logfil, 1, [mxiter], ndigit, | |
1167 & '_naupd: Number of update iterations taken') | |
1168 - call ivout (logfil, 1, np, ndigit, | |
1169 + call ivout (logfil, 1, [np], ndigit, | |
1170 & '_naupd: Number of wanted "converged" Ritz values') | |
1171 call zvout (logfil, np, workl(ritz), ndigit, | |
1172 & '_naupd: The final Ritz values') | |
1173 diff --git a/SRC/zneupd.f b/SRC/zneupd.f | |
1174 index f1eb68a3..9889e30e 100644 | |
1175 --- a/SRC/zneupd.f | |
1176 +++ b/SRC/zneupd.f | |
1177 @@ -536,9 +536,9 @@ subroutine zneupd(rvec , howmny, select, d , | |
1178 c %-----------------------------------------------------------% | |
1179 c | |
1180 if (msglvl .gt. 2) then | |
1181 - call ivout(logfil, 1, numcnv, ndigit, | |
1182 + call ivout(logfil, 1, [numcnv], ndigit, | |
1183 & '_neupd: Number of specified eigenvalues') | |
1184 - call ivout(logfil, 1, nconv, ndigit, | |
1185 + call ivout(logfil, 1, [nconv], ndigit, | |
1186 & '_neupd: Number of "converged" eigenvalues') | |
1187 end if | |
1188 c | |
1189 diff --git a/SRC/zngets.f b/SRC/zngets.f | |
1190 index 27f25803..e7d24334 100644 | |
1191 --- a/SRC/zngets.f | |
1192 +++ b/SRC/zngets.f | |
1193 @@ -161,8 +161,8 @@ subroutine zngets ( ishift, which, kev, np, ritz, bounds) | |
1194 tcgets = tcgets + (t1 - t0) | |
1195 c | |
1196 if (msglvl .gt. 0) then | |
1197 - call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is') | |
1198 - call ivout (logfil, 1, np, ndigit, '_ngets: NP is') | |
1199 + call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') | |
1200 + call ivout (logfil, 1, [np], ndigit, '_ngets: NP is') | |
1201 call zvout (logfil, kev+np, ritz, ndigit, | |
1202 & '_ngets: Eigenvalues of current H matrix ') | |
1203 call zvout (logfil, kev+np, bounds, ndigit, | |
1204 | |
1205 | |
1 From ad82dcbc0beeed5616e2d5a28a089d9785f8b8b8 Mon Sep 17 00:00:00 2001 | 1206 From ad82dcbc0beeed5616e2d5a28a089d9785f8b8b8 Mon Sep 17 00:00:00 2001 |
2 From: dschwoerer <dschwoerer@users.noreply.github.com> | 1207 From: dschwoerer <dschwoerer@users.noreply.github.com> |
3 Date: Mon, 24 Feb 2020 09:05:43 +0000 | 1208 Date: Mon, 24 Feb 2020 09:05:43 +0000 |
4 Subject: [PATCH] gcc-10 (parpack) and mpich (#245) | 1209 Subject: [PATCH] gcc-10 (parpack) and mpich (#245) |
5 | 1210 |