Skip to content

Commit 8a5fda6

Browse files
julielangoujulielangou
committed
small fixes
1 parent ef3b282 commit 8a5fda6

5 files changed

Lines changed: 70 additions & 62 deletions

File tree

‎TESTING/LIN/cchkhe_aa_2stage.f‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,14 @@ SUBROUTINE CCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
196196
* =====================================================================
197197
*
198198
* .. Parameters ..
199-
COMPLEX ZERO, ONE
200-
PARAMETER ( ZERO = ( 0.0E+0, 0.0E+0 ),
201-
$ ONE = ( 1.0E+0, 0.0E+0 ) )
202-
INTEGER NTYPES
203-
PARAMETER ( NTYPES = 10 )
204-
INTEGER NTESTS
205-
PARAMETER ( NTESTS = 9 )
199+
REAL ZERO
200+
PARAMETER ( ZERO = 0.0E+0 )
201+
COMPLEX CZERO
202+
PARAMETER ( CZERO = ( 0.0E+0, 0.0E+0 ) )
203+
INTEGER NTYPES
204+
PARAMETER ( NTYPES = 10 )
205+
INTEGER NTESTS
206+
PARAMETER ( NTESTS = 9 )
206207
* ..
207208
* .. Local Scalars ..
208209
LOGICAL ZEROT
@@ -356,22 +357,22 @@ SUBROUTINE CCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
356357
IF( IUPLO.EQ.1 ) THEN
357358
IOFF = ( IZERO-1 )*LDA
358359
DO 20 I = 1, IZERO - 1
359-
A( IOFF+I ) = ZERO
360+
A( IOFF+I ) = CZERO
360361
20 CONTINUE
361362
IOFF = IOFF + IZERO
362363
DO 30 I = IZERO, N
363-
A( IOFF ) = ZERO
364+
A( IOFF ) = CZERO
364365
IOFF = IOFF + LDA
365366
30 CONTINUE
366367
ELSE
367368
IOFF = IZERO
368369
DO 40 I = 1, IZERO - 1
369-
A( IOFF ) = ZERO
370+
A( IOFF ) = CZERO
370371
IOFF = IOFF + LDA
371372
40 CONTINUE
372373
IOFF = IOFF - IZERO
373374
DO 50 I = IZERO, N
374-
A( IOFF+I ) = ZERO
375+
A( IOFF+I ) = CZERO
375376
50 CONTINUE
376377
END IF
377378
ELSE
@@ -383,7 +384,7 @@ SUBROUTINE CCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
383384
DO 70 J = 1, N
384385
I2 = MIN( J, IZERO )
385386
DO 60 I = 1, I2
386-
A( IOFF+I ) = ZERO
387+
A( IOFF+I ) = CZERO
387388
60 CONTINUE
388389
IOFF = IOFF + LDA
389390
70 CONTINUE
@@ -396,7 +397,7 @@ SUBROUTINE CCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
396397
DO 90 J = 1, N
397398
I1 = MAX( J, IZERO )
398399
DO 80 I = I1, N
399-
A( IOFF+I ) = ZERO
400+
A( IOFF+I ) = CZERO
400401
80 CONTINUE
401402
IOFF = IOFF + LDA
402403
90 CONTINUE
@@ -406,7 +407,12 @@ SUBROUTINE CCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
406407
IZERO = 0
407408
END IF
408409
*
409-
* End generate the test matrix A.
410+
* End generate test matrix A.
411+
*
412+
*
413+
* Set the imaginary part of the diagonals.
414+
*
415+
CALL CLAIPD( N, A, LDA+1, 0 )
410416
*
411417
* Do for each value of NB in NBVAL
412418
*

‎TESTING/LIN/dchksy_aa_2stage.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ SUBROUTINE DCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
218218
* ..
219219
* .. External Subroutines ..
220220
EXTERNAL ALAERH, ALAHD, ALASUM, DERRSY, DLACPY, DLARHS,
221-
$ DLATB4, DLATMS, DPOT02, DSYT01,
222-
$ DSYTRF_AA_2STAGE, DSYTRS_AA_2STAGE, XLAENV
221+
$ DLATB4, DLATMS, DPOT02, DSYTRF_AA_2STAGE
222+
$ DSYTRS_AA_2STAGE, XLAENV
223223
* ..
224224
* .. Intrinsic Functions ..
225225
INTRINSIC MAX, MIN

‎TESTING/LIN/schksy_aa.f‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@
163163
*
164164
*> \date June 2017
165165
*
166-
* @precisions fortran d -> z c
167-
*
168166
*> \ingroup real_lin
169167
*
170168
* =====================================================================

‎TESTING/LIN/schksy_aa_2stage.f‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* IWORK, NOUT )
1515
*
1616
* .. Scalar Arguments ..
17-
* LOGICAL TSTERR
18-
* INTEGER NMAX, NN, NNB, NNS, NOUT
19-
* REAL THRESH
17+
* LOGICAL TSTERR
18+
* INTEGER NMAX, NN, NNB, NNS, NOUT
19+
* REAL THRESH
2020
* ..
2121
* .. Array Arguments ..
22-
* LOGICAL DOTYPE( * )
23-
* INTEGER IWORK( * ), NBVAL( * ), NSVAL( * ), NVAL( * )
24-
* REAL A( * ), AFAC( * ), AINV( * ), B( * ),
25-
* $ RWORK( * ), WORK( * ), X( * ), XACT( * )
22+
* LOGICAL DOTYPE( * )
23+
* INTEGER IWORK( * ), NBVAL( * ), NSVAL( * ), NVAL( * )
24+
* REAL A( * ), AFAC( * ), AINV( * ), B( * ),
25+
* $ RWORK( * ), WORK( * ), X( * ), XACT( * )
2626
* ..
2727
*
2828
*
@@ -164,8 +164,6 @@
164164
*
165165
*> \date June 2017
166166
*
167-
* @generated from dsytrf_aasen_2stage.f, fortran d -> s, Mon Oct 30 12:03:46 2017
168-
*
169167
*> \ingroup real_lin
170168
*
171169
* =====================================================================
@@ -181,40 +179,40 @@ SUBROUTINE SCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
181179
IMPLICIT NONE
182180
*
183181
* .. Scalar Arguments ..
184-
LOGICAL TSTERR
185-
INTEGER NN, NNB, NNS, NMAX, NOUT
186-
REAL THRESH
182+
LOGICAL TSTERR
183+
INTEGER NN, NNB, NNS, NMAX, NOUT
184+
REAL THRESH
187185
* ..
188186
* .. Array Arguments ..
189-
LOGICAL DOTYPE( * )
190-
INTEGER IWORK( * ), NBVAL( * ), NSVAL( * ), NVAL( * )
191-
REAL A( * ), AFAC( * ), AINV( * ), B( * ),
192-
$ RWORK( * ), WORK( * ), X( * ), XACT( * )
187+
LOGICAL DOTYPE( * )
188+
INTEGER IWORK( * ), NBVAL( * ), NSVAL( * ), NVAL( * )
189+
REAL A( * ), AFAC( * ), AINV( * ), B( * ),
190+
$ RWORK( * ), WORK( * ), X( * ), XACT( * )
193191
* ..
194192
*
195193
* =====================================================================
196194
*
197195
* .. Parameters ..
198-
REAL ZERO, ONE
199-
PARAMETER ( ZERO = 0.0E+0, ONE = 1.0E+0 )
200-
INTEGER NTYPES
201-
PARAMETER ( NTYPES = 10 )
202-
INTEGER NTESTS
203-
PARAMETER ( NTESTS = 9 )
196+
REAL ZERO
197+
PARAMETER ( ZERO = 0.0E+0 )
198+
INTEGER NTYPES
199+
PARAMETER ( NTYPES = 10 )
200+
INTEGER NTESTS
201+
PARAMETER ( NTESTS = 9 )
204202
* ..
205203
* .. Local Scalars ..
206-
LOGICAL ZEROT
207-
CHARACTER DIST, TYPE, UPLO, XTYPE
208-
CHARACTER*3 PATH, MATPATH
209-
INTEGER I, I1, I2, IMAT, IN, INB, INFO, IOFF, IRHS,
210-
$ IUPLO, IZERO, J, K, KL, KU, LDA, LWORK, MODE,
211-
$ N, NB, NERRS, NFAIL, NIMAT, NRHS, NRUN, NT
212-
REAL ANORM, CNDNUM
204+
LOGICAL ZEROT
205+
CHARACTER DIST, TYPE, UPLO, XTYPE
206+
CHARACTER*3 PATH, MATPATH
207+
INTEGER I, I1, I2, IMAT, IN, INB, INFO, IOFF, IRHS,
208+
$ IUPLO, IZERO, J, K, KL, KU, LDA, LWORK, MODE,
209+
$ N, NB, NERRS, NFAIL, NIMAT, NRHS, NRUN, NT
210+
REAL ANORM, CNDNUM
213211
* ..
214212
* .. Local Arrays ..
215-
CHARACTER UPLOS( 2 )
216-
INTEGER ISEED( 4 ), ISEEDY( 4 )
217-
REAL RESULT( NTESTS )
213+
CHARACTER UPLOS( 2 )
214+
INTEGER ISEED( 4 ), ISEEDY( 4 )
215+
REAL RESULT( NTESTS )
218216
* ..
219217
* .. External Subroutines ..
220218
EXTERNAL ALAERH, ALAHD, ALASUM, SERRSY, SLACPY, SLARHS,
@@ -223,25 +221,26 @@ SUBROUTINE SCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
223221
$ XLAENV
224222
* ..
225223
* .. Intrinsic Functions ..
226-
INTRINSIC MAX, MIN
224+
INTRINSIC MAX, MIN
227225
* ..
228226
* .. Scalars in Common ..
229-
LOGICAL LERR, OK
230-
CHARACTER*32 SRNAMT
231-
INTEGER INFOT, NUNIT
227+
LOGICAL LERR, OK
228+
CHARACTER*32 SRNAMT
229+
INTEGER INFOT, NUNIT
232230
* ..
233231
* .. Common blocks ..
234-
COMMON / INFOC / INFOT, NUNIT, OK, LERR
235-
COMMON / SRNAMC / SRNAMT
232+
COMMON / INFOC / INFOT, NUNIT, OK, LERR
233+
COMMON / SRNAMC / SRNAMT
236234
* ..
237235
* .. Data statements ..
238-
DATA ISEEDY / 1988, 1989, 1990, 1991 /
239-
DATA UPLOS / 'U', 'L' /
236+
DATA ISEEDY / 1988, 1989, 1990, 1991 /
237+
DATA UPLOS / 'U', 'L' /
240238
* ..
241239
* .. Executable Statements ..
242240
*
243241
* Initialize constants and the random number seed.
244242
*
243+
*
245244
* Test path
246245
*
247246
PATH( 1: 1 ) = 'Single precision'
@@ -524,16 +523,16 @@ SUBROUTINE SCHKSY_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
524523
END IF
525524
ELSE
526525
CALL SLACPY( 'Full', N, NRHS, B, LDA, WORK, LDA
527-
$ )
526+
$ )
528527
*
529528
* Compute the residual for the solution
530529
*
531530
CALL SPOT02( UPLO, N, NRHS, A, LDA, X, LDA,
532531
$ WORK, LDA, RWORK, RESULT( 2 ) )
533532
*
534533
*
535-
* Print information about the tests that did not pass
536-
* the threshold.
534+
* Print information about the tests that did not pass
535+
* the threshold.
537536
*
538537
DO 120 K = 2, 2
539538
IF( RESULT( K ).GE.THRESH ) THEN

‎TESTING/LIN/zchkhe_aa_2stage.f‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,12 @@ SUBROUTINE ZCHKHE_AA_2STAGE( DOTYPE, NN, NVAL, NNB, NBVAL, NNS,
404404
IZERO = 0
405405
END IF
406406
*
407-
* End generate the test matrix A.
407+
* End generate test matrix A.
408+
*
409+
*
410+
* Set the imaginary part of the diagonals.
411+
*
412+
CALL ZLAIPD( N, A, LDA+1, 0 )
408413
*
409414
* Do for each value of NB in NBVAL
410415
*

0 commit comments

Comments
 (0)