Skip to content

Commit d052a77

Browse files
authored
Merge pull request Reference-ScaLAPACK#93 from cniethammer/fix_fortran_2018_deleted_feature_DO_termination
Fix gcc warnings about Fortran 2018 deleted features
2 parents 8435bf3 + 3949e1c commit d052a77

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

BLACS/TESTING/blacstest.f

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6471,10 +6471,11 @@ SUBROUTINE IGENMAT( M, N, A, LDA, TESTNUM, MYROW, MYCOL )
64716471
ISEED(3) = MOD( 1234 + TESTNUM + SRC*3, 4096 )
64726472
ISEED(4) = MOD( 4311 + TESTNUM*10 + SRC*2, 4096 )
64736473
*
6474-
DO 10 J = 1, N
6475-
DO 10 I = 1, M
6474+
DO J = 1, N
6475+
DO I = 1, M
64766476
A(I, J) = IBTRAN( ISEED )
6477-
10 CONTINUE
6477+
END DO
6478+
END DO
64786479
*
64796480
RETURN
64806481
*
@@ -7540,10 +7541,11 @@ SUBROUTINE SGENMAT( M, N, A, LDA, TESTNUM, MYROW, MYCOL )
75407541
ISEED(3) = MOD( 1234 + TESTNUM + SRC*3, 4096 )
75417542
ISEED(4) = MOD( 4311 + TESTNUM*10 + SRC*2, 4096 )
75427543
*
7543-
DO 10 J = 1, N
7544-
DO 10 I = 1, M
7544+
DO J = 1, N
7545+
DO I = 1, M
75457546
A(I, J) = SBTRAN( ISEED )
7546-
10 CONTINUE
7547+
END DO
7548+
END DO
75477549
*
75487550
RETURN
75497551
*
@@ -8604,10 +8606,11 @@ SUBROUTINE DGENMAT( M, N, A, LDA, TESTNUM, MYROW, MYCOL )
86048606
ISEED(3) = MOD( 1234 + TESTNUM + SRC*3, 4096 )
86058607
ISEED(4) = MOD( 4311 + TESTNUM*10 + SRC*2, 4096 )
86068608
*
8607-
DO 10 J = 1, N
8608-
DO 10 I = 1, M
8609+
DO J = 1, N
8610+
DO I = 1, M
86098611
A(I, J) = DBTRAN( ISEED )
8610-
10 CONTINUE
8612+
END DO
8613+
END DO
86118614
*
86128615
RETURN
86138616
*
@@ -9668,10 +9671,11 @@ SUBROUTINE CGENMAT( M, N, A, LDA, TESTNUM, MYROW, MYCOL )
96689671
ISEED(3) = MOD( 1234 + TESTNUM + SRC*3, 4096 )
96699672
ISEED(4) = MOD( 4311 + TESTNUM*10 + SRC*2, 4096 )
96709673
*
9671-
DO 10 J = 1, N
9672-
DO 10 I = 1, M
9674+
DO J = 1, N
9675+
DO I = 1, M
96739676
A(I, J) = CBTRAN( ISEED )
9674-
10 CONTINUE
9677+
END DO
9678+
END DO
96759679
*
96769680
RETURN
96779681
*
@@ -9761,30 +9765,30 @@ SUBROUTINE CPADMAT( UPLO, DIAG, M, N, MEM, LDA, IPRE, IPOST,
97619765
* Put check buffer in front of A
97629766
*
97639767
IF( IPRE .GT. 0 ) THEN
9764-
DO 10 I = 1, IPRE
9768+
DO I = 1, IPRE
97659769
MEM( I ) = CHECKVAL
9766-
10 CONTINUE
9770+
END DO
97679771
END IF
97689772
*
97699773
* Put check buffer in back of A
97709774
*
97719775
IF( IPOST .GT. 0 ) THEN
97729776
J = IPRE + LDA*N + 1
9773-
DO 20 I = J, J+IPOST-1
9777+
DO I = J, J+IPOST-1
97749778
MEM( I ) = CHECKVAL
9775-
20 CONTINUE
9779+
END DO
97769780
END IF
97779781
*
97789782
* Put check buffer in all (LDA-M) gaps
97799783
*
97809784
IF( LDA .GT. M ) THEN
97819785
K = IPRE + M + 1
9782-
DO 40 J = 1, N
9783-
DO 30 I = K, K+LDA-M-1
9786+
DO J = 1, N
9787+
DO I = K, K+LDA-M-1
97849788
MEM( I ) = CHECKVAL
9785-
30 CONTINUE
9789+
END DO
97869790
K = K + LDA
9787-
40 CONTINUE
9791+
END DO
97889792
END IF
97899793
*
97909794
* If the matrix is upper or lower trapezoidal, calculate the
@@ -10736,10 +10740,11 @@ SUBROUTINE ZGENMAT( M, N, A, LDA, TESTNUM, MYROW, MYCOL )
1073610740
ISEED(3) = MOD( 1234 + TESTNUM + SRC*3, 4096 )
1073710741
ISEED(4) = MOD( 4311 + TESTNUM*10 + SRC*2, 4096 )
1073810742
*
10739-
DO 10 J = 1, N
10740-
DO 10 I = 1, M
10743+
DO J = 1, N
10744+
DO I = 1, M
1074110745
A(I, J) = ZBTRAN( ISEED )
10742-
10 CONTINUE
10746+
END DO
10747+
END DO
1074310748
*
1074410749
RETURN
1074510750
*

0 commit comments

Comments
 (0)