Skip to content

Commit 20318b7

Browse files
authored
Merge pull request #1238 from nakatamaho/cleanup/pttrs-lsame-uplo
SRC: use LSAME for UPLO checks in pttrs
2 parents 20044bb + 6a1be42 commit 20318b7

15 files changed

Lines changed: 43 additions & 39 deletions

File tree

SRC/cpttrs.f

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ SUBROUTINE CPTTRS( UPLO, N, NRHS, D, E, B, LDB, INFO )
139139
* ..
140140
* .. External Functions ..
141141
INTEGER ILAENV
142-
EXTERNAL ILAENV
142+
LOGICAL LSAME
143+
EXTERNAL ILAENV, LSAME
143144
* ..
144145
* .. External Subroutines ..
145146
EXTERNAL CPTTS2, XERBLA
@@ -152,8 +153,8 @@ SUBROUTINE CPTTRS( UPLO, N, NRHS, D, E, B, LDB, INFO )
152153
* Test the input arguments.
153154
*
154155
INFO = 0
155-
UPPER = ( UPLO.EQ.'U' .OR. UPLO.EQ.'u' )
156-
IF( .NOT.UPPER .AND. .NOT.( UPLO.EQ.'L' .OR. UPLO.EQ.'l' ) ) THEN
156+
UPPER = LSAME( UPLO, 'U' )
157+
IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
157158
INFO = -1
158159
ELSE IF( N.LT.0 ) THEN
159160
INFO = -2

SRC/zpttrs.f

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ SUBROUTINE ZPTTRS( UPLO, N, NRHS, D, E, B, LDB, INFO )
139139
* ..
140140
* .. External Functions ..
141141
INTEGER ILAENV
142-
EXTERNAL ILAENV
142+
LOGICAL LSAME
143+
EXTERNAL ILAENV, LSAME
143144
* ..
144145
* .. External Subroutines ..
145146
EXTERNAL XERBLA, ZPTTS2
@@ -152,8 +153,8 @@ SUBROUTINE ZPTTRS( UPLO, N, NRHS, D, E, B, LDB, INFO )
152153
* Test the input arguments.
153154
*
154155
INFO = 0
155-
UPPER = ( UPLO.EQ.'U' .OR. UPLO.EQ.'u' )
156-
IF( .NOT.UPPER .AND. .NOT.( UPLO.EQ.'L' .OR. UPLO.EQ.'l' ) ) THEN
156+
UPPER = LSAME( UPLO, 'U' )
157+
IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
157158
INFO = -1
158159
ELSE IF( N.LT.0 ) THEN
159160
INFO = -2

TESTING/EIG/cerrec.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ SUBROUTINE CERREC( PATH, NUNIT )
6969
* .. Parameters ..
7070
INTEGER NMAX, LW
7171
PARAMETER ( NMAX = 4, LW = NMAX*( NMAX+2 ) )
72-
REAL ONE, ZERO
73-
PARAMETER ( ONE = 1.0E0, ZERO = 0.0E0 )
72+
REAL ZERO, ONE
73+
PARAMETER ( ZERO = 0.0E0, ONE = 1.0E0 )
7474
* ..
7575
* .. Local Scalars ..
7676
INTEGER I, IFST, ILST, INFO, J, M, NT

TESTING/EIG/cerred.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ SUBROUTINE CERRED( PATH, NUNIT )
8383
* .. Parameters ..
8484
INTEGER NMAX, LW
8585
PARAMETER ( NMAX = 4, LW = 5*NMAX )
86-
REAL ONE, ZERO
87-
PARAMETER ( ONE = 1.0E0, ZERO = 0.0E0 )
86+
REAL ZERO, ONE
87+
PARAMETER ( ZERO = 0.0E0, ONE = 1.0E0 )
8888
* ..
8989
* .. Local Scalars ..
9090
CHARACTER*2 C2

TESTING/EIG/cerrgg.f

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ SUBROUTINE CERRGG( PATH, NUNIT )
7070
* .. Parameters ..
7171
INTEGER NMAX, LW
7272
PARAMETER ( NMAX = 3, LW = 6*NMAX )
73-
REAL ONE, ZERO
74-
PARAMETER ( ONE = 1.0E+0, ZERO = 0.0E+0 )
73+
REAL ZERO, ONE
74+
PARAMETER ( ZERO = 0.0E+0, ONE = 1.0E+0 )
7575
* ..
7676
* .. Local Scalars ..
7777
CHARACTER*2 C2
@@ -129,8 +129,8 @@ SUBROUTINE CERRGG( PATH, NUNIT )
129129
B( I, I ) = ONE
130130
30 CONTINUE
131131
OK = .TRUE.
132-
TOLA = 1.0E0
133-
TOLB = 1.0E0
132+
TOLA = ONE
133+
TOLB = ONE
134134
IFST = 1
135135
ILST = 1
136136
NT = 0

TESTING/EIG/derrec.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ SUBROUTINE DERREC( PATH, NUNIT )
6868
*
6969
* .. Parameters ..
7070
INTEGER NMAX
71-
DOUBLE PRECISION ONE, ZERO
72-
PARAMETER ( NMAX = 4, ONE = 1.0D0, ZERO = 0.0D0 )
71+
DOUBLE PRECISION ZERO, ONE
72+
PARAMETER ( NMAX = 4, ZERO = 0.0D0, ONE = 1.0D0 )
7373
* ..
7474
* .. Local Scalars ..
7575
INTEGER I, IFST, ILST, INFO, J, M, NT

TESTING/EIG/derred.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ SUBROUTINE DERRED( PATH, NUNIT )
8282
*
8383
* .. Parameters ..
8484
INTEGER NMAX
85-
DOUBLE PRECISION ONE, ZERO
86-
PARAMETER ( NMAX = 4, ONE = 1.0D0, ZERO = 0.0D0 )
85+
DOUBLE PRECISION ZERO, ONE
86+
PARAMETER ( NMAX = 4, ZERO = 0.0D0, ONE = 1.0D0 )
8787
* ..
8888
* .. Local Scalars ..
8989
CHARACTER*2 C2

TESTING/EIG/derrgg.f

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ SUBROUTINE DERRGG( PATH, NUNIT )
7070
* .. Parameters ..
7171
INTEGER NMAX, LW
7272
PARAMETER ( NMAX = 3, LW = 6*NMAX )
73-
DOUBLE PRECISION ONE, ZERO
74-
PARAMETER ( ONE = 1.0D+0, ZERO = 0.0D+0 )
73+
DOUBLE PRECISION ZERO, ONE
74+
PARAMETER ( ZERO = 0.0D+0, ONE = 1.0D+0 )
7575
* ..
7676
* .. Local Scalars ..
7777
CHARACTER*2 C2
@@ -128,8 +128,8 @@ SUBROUTINE DERRGG( PATH, NUNIT )
128128
B( I, I ) = ONE
129129
30 CONTINUE
130130
OK = .TRUE.
131-
TOLA = 1.0D0
132-
TOLB = 1.0D0
131+
TOLA = ONE
132+
TOLB = ONE
133133
IFST = 1
134134
ILST = 1
135135
NT = 0

TESTING/EIG/serrec.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ SUBROUTINE SERREC( PATH, NUNIT )
6868
*
6969
* .. Parameters ..
7070
INTEGER NMAX
71-
REAL ONE, ZERO
72-
PARAMETER ( NMAX = 4, ONE = 1.0E0, ZERO = 0.0E0 )
71+
REAL ZERO, ONE
72+
PARAMETER ( NMAX = 4, ZERO = 0.0E0, ONE = 1.0E0 )
7373
* ..
7474
* .. Local Scalars ..
7575
INTEGER I, IFST, ILST, INFO, J, M, NT

TESTING/EIG/serred.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ SUBROUTINE SERRED( PATH, NUNIT )
8282
*
8383
* .. Parameters ..
8484
INTEGER NMAX
85-
REAL ONE, ZERO
86-
PARAMETER ( NMAX = 4, ONE = 1.0E0, ZERO = 0.0E0 )
85+
REAL ZERO, ONE
86+
PARAMETER ( NMAX = 4, ZERO = 0.0E0, ONE = 1.0E0 )
8787
* ..
8888
* .. Local Scalars ..
8989
CHARACTER*2 C2

0 commit comments

Comments
 (0)