Skip to content

Commit 1a5d08a

Browse files
langoulangou
authored
Merge pull request #160 from kyungminlee/fix-row-tracking
Fix process row tracking for Hessenberg matrices in `p*lanhs` and `p*lascl`
2 parents 60fdb19 + 8ac9b55 commit 1a5d08a

8 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎SRC/pclanhs.f‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
274274
IF( MYROW.EQ.IAROW )
275275
$ II = II + JB
276276
IAROW = INXTROW
277-
IAROW = MOD( IAROW+1, NPROW )
277+
INXTROW = MOD( IAROW+1, NPROW )
278278
IACOL = MOD( IACOL+1, NPCOL )
279279
*
280280
* Loop over remaining block of columns
@@ -307,7 +307,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
307307
IF( MYROW.EQ.IAROW )
308308
$ II = II + JB
309309
IAROW = INXTROW
310-
IAROW = MOD( IAROW+1, NPROW )
310+
INXTROW = MOD( IAROW+1, NPROW )
311311
IACOL = MOD( IACOL+1, NPCOL )
312312
*
313313
140 CONTINUE
@@ -404,7 +404,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
404404
IF( MYROW.EQ.IAROW )
405405
$ II = II + JB
406406
IAROW = INXTROW
407-
IAROW = MOD( IAROW+1, NPROW )
407+
INXTROW = MOD( IAROW+1, NPROW )
408408
IACOL = MOD( IACOL+1, NPCOL )
409409
*
410410
* Loop over remaining block of columns
@@ -441,7 +441,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
441441
IF( MYROW.EQ.IAROW )
442442
$ II = II + JB
443443
IAROW = INXTROW
444-
IAROW = MOD( IAROW+1, NPROW )
444+
INXTROW = MOD( IAROW+1, NPROW )
445445
IACOL = MOD( IACOL+1, NPCOL )
446446
*
447447
280 CONTINUE
@@ -550,7 +550,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
550550
IF( MYROW.EQ.IAROW )
551551
$ II = II + JB
552552
IAROW = INXTROW
553-
IAROW = MOD( IAROW+1, NPROW )
553+
INXTROW = MOD( IAROW+1, NPROW )
554554
IACOL = MOD( IACOL+1, NPCOL )
555555
*
556556
* Loop over remaining block of columns
@@ -585,7 +585,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
585585
IF( MYROW.EQ.IAROW )
586586
$ II = II + JB
587587
IAROW = INXTROW
588-
IAROW = MOD( IAROW+1, NPROW )
588+
INXTROW = MOD( IAROW+1, NPROW )
589589
IACOL = MOD( IACOL+1, NPCOL )
590590
*
591591
430 CONTINUE
@@ -684,7 +684,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
684684
IF( MYROW.EQ.IAROW )
685685
$ II = II + JB
686686
IAROW = INXTROW
687-
IAROW = MOD( IAROW+1, NPROW )
687+
INXTROW = MOD( IAROW+1, NPROW )
688688
IACOL = MOD( IACOL+1, NPCOL )
689689
*
690690
* Loop over remaining block of columns
@@ -715,7 +715,7 @@ REAL FUNCTION PCLANHS( NORM, N, A, IA, JA, DESCA,
715715
IF( MYROW.EQ.IAROW )
716716
$ II = II + JB
717717
IAROW = INXTROW
718-
IAROW = MOD( IAROW+1, NPROW )
718+
INXTROW = MOD( IAROW+1, NPROW )
719719
IACOL = MOD( IACOL+1, NPCOL )
720720
*
721721
510 CONTINUE

‎SRC/pclascl.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ SUBROUTINE PCLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
477477
IF( MYROW.EQ.ICURROW )
478478
$ II = II + JB
479479
ICURROW = INXTROW
480-
ICURROW = MOD( ICURROW+1, NPROW )
480+
INXTROW = MOD( ICURROW+1, NPROW )
481481
ICURCOL = MOD( ICURCOL+1, NPCOL )
482482
*
483483
* Loop over remaining block of columns
@@ -510,7 +510,7 @@ SUBROUTINE PCLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
510510
IF( MYROW.EQ.ICURROW )
511511
$ II = II + JB
512512
ICURROW = INXTROW
513-
ICURROW = MOD( ICURROW+1, NPROW )
513+
INXTROW = MOD( ICURROW+1, NPROW )
514514
ICURCOL = MOD( ICURCOL+1, NPCOL )
515515
*
516516
350 CONTINUE

‎SRC/pdlanhs.f‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
273273
IF( MYROW.EQ.IAROW )
274274
$ II = II + JB
275275
IAROW = INXTROW
276-
IAROW = MOD( IAROW+1, NPROW )
276+
INXTROW = MOD( IAROW+1, NPROW )
277277
IACOL = MOD( IACOL+1, NPCOL )
278278
*
279279
* Loop over remaining block of columns
@@ -306,7 +306,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
306306
IF( MYROW.EQ.IAROW )
307307
$ II = II + JB
308308
IAROW = INXTROW
309-
IAROW = MOD( IAROW+1, NPROW )
309+
INXTROW = MOD( IAROW+1, NPROW )
310310
IACOL = MOD( IACOL+1, NPCOL )
311311
*
312312
140 CONTINUE
@@ -403,7 +403,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
403403
IF( MYROW.EQ.IAROW )
404404
$ II = II + JB
405405
IAROW = INXTROW
406-
IAROW = MOD( IAROW+1, NPROW )
406+
INXTROW = MOD( IAROW+1, NPROW )
407407
IACOL = MOD( IACOL+1, NPCOL )
408408
*
409409
* Loop over remaining block of columns
@@ -440,7 +440,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
440440
IF( MYROW.EQ.IAROW )
441441
$ II = II + JB
442442
IAROW = INXTROW
443-
IAROW = MOD( IAROW+1, NPROW )
443+
INXTROW = MOD( IAROW+1, NPROW )
444444
IACOL = MOD( IACOL+1, NPCOL )
445445
*
446446
280 CONTINUE
@@ -549,7 +549,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
549549
IF( MYROW.EQ.IAROW )
550550
$ II = II + JB
551551
IAROW = INXTROW
552-
IAROW = MOD( IAROW+1, NPROW )
552+
INXTROW = MOD( IAROW+1, NPROW )
553553
IACOL = MOD( IACOL+1, NPCOL )
554554
*
555555
* Loop over remaining block of columns
@@ -584,7 +584,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
584584
IF( MYROW.EQ.IAROW )
585585
$ II = II + JB
586586
IAROW = INXTROW
587-
IAROW = MOD( IAROW+1, NPROW )
587+
INXTROW = MOD( IAROW+1, NPROW )
588588
IACOL = MOD( IACOL+1, NPCOL )
589589
*
590590
430 CONTINUE
@@ -683,7 +683,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
683683
IF( MYROW.EQ.IAROW )
684684
$ II = II + JB
685685
IAROW = INXTROW
686-
IAROW = MOD( IAROW+1, NPROW )
686+
INXTROW = MOD( IAROW+1, NPROW )
687687
IACOL = MOD( IACOL+1, NPCOL )
688688
*
689689
* Loop over remaining block of columns
@@ -714,7 +714,7 @@ DOUBLE PRECISION FUNCTION PDLANHS( NORM, N, A, IA, JA, DESCA,
714714
IF( MYROW.EQ.IAROW )
715715
$ II = II + JB
716716
IAROW = INXTROW
717-
IAROW = MOD( IAROW+1, NPROW )
717+
INXTROW = MOD( IAROW+1, NPROW )
718718
IACOL = MOD( IACOL+1, NPCOL )
719719
*
720720
510 CONTINUE

‎SRC/pdlascl.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ SUBROUTINE PDLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
477477
IF( MYROW.EQ.ICURROW )
478478
$ II = II + JB
479479
ICURROW = INXTROW
480-
ICURROW = MOD( ICURROW+1, NPROW )
480+
INXTROW = MOD( ICURROW+1, NPROW )
481481
ICURCOL = MOD( ICURCOL+1, NPCOL )
482482
*
483483
* Loop over remaining block of columns
@@ -510,7 +510,7 @@ SUBROUTINE PDLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
510510
IF( MYROW.EQ.ICURROW )
511511
$ II = II + JB
512512
ICURROW = INXTROW
513-
ICURROW = MOD( ICURROW+1, NPROW )
513+
INXTROW = MOD( ICURROW+1, NPROW )
514514
ICURCOL = MOD( ICURCOL+1, NPCOL )
515515
*
516516
350 CONTINUE

‎SRC/pslanhs.f‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
273273
IF( MYROW.EQ.IAROW )
274274
$ II = II + JB
275275
IAROW = INXTROW
276-
IAROW = MOD( IAROW+1, NPROW )
276+
INXTROW = MOD( IAROW+1, NPROW )
277277
IACOL = MOD( IACOL+1, NPCOL )
278278
*
279279
* Loop over remaining block of columns
@@ -306,7 +306,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
306306
IF( MYROW.EQ.IAROW )
307307
$ II = II + JB
308308
IAROW = INXTROW
309-
IAROW = MOD( IAROW+1, NPROW )
309+
INXTROW = MOD( IAROW+1, NPROW )
310310
IACOL = MOD( IACOL+1, NPCOL )
311311
*
312312
140 CONTINUE
@@ -403,7 +403,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
403403
IF( MYROW.EQ.IAROW )
404404
$ II = II + JB
405405
IAROW = INXTROW
406-
IAROW = MOD( IAROW+1, NPROW )
406+
INXTROW = MOD( IAROW+1, NPROW )
407407
IACOL = MOD( IACOL+1, NPCOL )
408408
*
409409
* Loop over remaining block of columns
@@ -440,7 +440,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
440440
IF( MYROW.EQ.IAROW )
441441
$ II = II + JB
442442
IAROW = INXTROW
443-
IAROW = MOD( IAROW+1, NPROW )
443+
INXTROW = MOD( IAROW+1, NPROW )
444444
IACOL = MOD( IACOL+1, NPCOL )
445445
*
446446
280 CONTINUE
@@ -549,7 +549,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
549549
IF( MYROW.EQ.IAROW )
550550
$ II = II + JB
551551
IAROW = INXTROW
552-
IAROW = MOD( IAROW+1, NPROW )
552+
INXTROW = MOD( IAROW+1, NPROW )
553553
IACOL = MOD( IACOL+1, NPCOL )
554554
*
555555
* Loop over remaining block of columns
@@ -584,7 +584,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
584584
IF( MYROW.EQ.IAROW )
585585
$ II = II + JB
586586
IAROW = INXTROW
587-
IAROW = MOD( IAROW+1, NPROW )
587+
INXTROW = MOD( IAROW+1, NPROW )
588588
IACOL = MOD( IACOL+1, NPCOL )
589589
*
590590
430 CONTINUE
@@ -683,7 +683,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
683683
IF( MYROW.EQ.IAROW )
684684
$ II = II + JB
685685
IAROW = INXTROW
686-
IAROW = MOD( IAROW+1, NPROW )
686+
INXTROW = MOD( IAROW+1, NPROW )
687687
IACOL = MOD( IACOL+1, NPCOL )
688688
*
689689
* Loop over remaining block of columns
@@ -714,7 +714,7 @@ REAL FUNCTION PSLANHS( NORM, N, A, IA, JA, DESCA,
714714
IF( MYROW.EQ.IAROW )
715715
$ II = II + JB
716716
IAROW = INXTROW
717-
IAROW = MOD( IAROW+1, NPROW )
717+
INXTROW = MOD( IAROW+1, NPROW )
718718
IACOL = MOD( IACOL+1, NPCOL )
719719
*
720720
510 CONTINUE

‎SRC/pslascl.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ SUBROUTINE PSLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
477477
IF( MYROW.EQ.ICURROW )
478478
$ II = II + JB
479479
ICURROW = INXTROW
480-
ICURROW = MOD( ICURROW+1, NPROW )
480+
INXTROW = MOD( ICURROW+1, NPROW )
481481
ICURCOL = MOD( ICURCOL+1, NPCOL )
482482
*
483483
* Loop over remaining block of columns
@@ -510,7 +510,7 @@ SUBROUTINE PSLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
510510
IF( MYROW.EQ.ICURROW )
511511
$ II = II + JB
512512
ICURROW = INXTROW
513-
ICURROW = MOD( ICURROW+1, NPROW )
513+
INXTROW = MOD( ICURROW+1, NPROW )
514514
ICURCOL = MOD( ICURCOL+1, NPCOL )
515515
*
516516
350 CONTINUE

‎SRC/pzlanhs.f‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
274274
IF( MYROW.EQ.IAROW )
275275
$ II = II + JB
276276
IAROW = INXTROW
277-
IAROW = MOD( IAROW+1, NPROW )
277+
INXTROW = MOD( IAROW+1, NPROW )
278278
IACOL = MOD( IACOL+1, NPCOL )
279279
*
280280
* Loop over remaining block of columns
@@ -307,7 +307,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
307307
IF( MYROW.EQ.IAROW )
308308
$ II = II + JB
309309
IAROW = INXTROW
310-
IAROW = MOD( IAROW+1, NPROW )
310+
INXTROW = MOD( IAROW+1, NPROW )
311311
IACOL = MOD( IACOL+1, NPCOL )
312312
*
313313
140 CONTINUE
@@ -404,7 +404,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
404404
IF( MYROW.EQ.IAROW )
405405
$ II = II + JB
406406
IAROW = INXTROW
407-
IAROW = MOD( IAROW+1, NPROW )
407+
INXTROW = MOD( IAROW+1, NPROW )
408408
IACOL = MOD( IACOL+1, NPCOL )
409409
*
410410
* Loop over remaining block of columns
@@ -441,7 +441,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
441441
IF( MYROW.EQ.IAROW )
442442
$ II = II + JB
443443
IAROW = INXTROW
444-
IAROW = MOD( IAROW+1, NPROW )
444+
INXTROW = MOD( IAROW+1, NPROW )
445445
IACOL = MOD( IACOL+1, NPCOL )
446446
*
447447
280 CONTINUE
@@ -550,7 +550,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
550550
IF( MYROW.EQ.IAROW )
551551
$ II = II + JB
552552
IAROW = INXTROW
553-
IAROW = MOD( IAROW+1, NPROW )
553+
INXTROW = MOD( IAROW+1, NPROW )
554554
IACOL = MOD( IACOL+1, NPCOL )
555555
*
556556
* Loop over remaining block of columns
@@ -585,7 +585,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
585585
IF( MYROW.EQ.IAROW )
586586
$ II = II + JB
587587
IAROW = INXTROW
588-
IAROW = MOD( IAROW+1, NPROW )
588+
INXTROW = MOD( IAROW+1, NPROW )
589589
IACOL = MOD( IACOL+1, NPCOL )
590590
*
591591
430 CONTINUE
@@ -684,7 +684,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
684684
IF( MYROW.EQ.IAROW )
685685
$ II = II + JB
686686
IAROW = INXTROW
687-
IAROW = MOD( IAROW+1, NPROW )
687+
INXTROW = MOD( IAROW+1, NPROW )
688688
IACOL = MOD( IACOL+1, NPCOL )
689689
*
690690
* Loop over remaining block of columns
@@ -715,7 +715,7 @@ DOUBLE PRECISION FUNCTION PZLANHS( NORM, N, A, IA, JA, DESCA,
715715
IF( MYROW.EQ.IAROW )
716716
$ II = II + JB
717717
IAROW = INXTROW
718-
IAROW = MOD( IAROW+1, NPROW )
718+
INXTROW = MOD( IAROW+1, NPROW )
719719
IACOL = MOD( IACOL+1, NPCOL )
720720
*
721721
510 CONTINUE

‎SRC/pzlascl.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ SUBROUTINE PZLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
477477
IF( MYROW.EQ.ICURROW )
478478
$ II = II + JB
479479
ICURROW = INXTROW
480-
ICURROW = MOD( ICURROW+1, NPROW )
480+
INXTROW = MOD( ICURROW+1, NPROW )
481481
ICURCOL = MOD( ICURCOL+1, NPCOL )
482482
*
483483
* Loop over remaining block of columns
@@ -510,7 +510,7 @@ SUBROUTINE PZLASCL( TYPE, CFROM, CTO, M, N, A, IA, JA, DESCA,
510510
IF( MYROW.EQ.ICURROW )
511511
$ II = II + JB
512512
ICURROW = INXTROW
513-
ICURROW = MOD( ICURROW+1, NPROW )
513+
INXTROW = MOD( ICURROW+1, NPROW )
514514
ICURCOL = MOD( ICURCOL+1, NPCOL )
515515
*
516516
350 CONTINUE

0 commit comments

Comments
 (0)