--- rpl/lapack/lapack/dlantr.f 2020/05/21 21:45:59 1.18 +++ rpl/lapack/lapack/dlantr.f 2023/08/07 08:38:55 1.19 @@ -133,20 +133,16 @@ *> \author Univ. of Colorado Denver *> \author NAG Ltd. * -*> \date December 2016 -* *> \ingroup doubleOTHERauxiliary * * ===================================================================== DOUBLE PRECISION FUNCTION DLANTR( NORM, UPLO, DIAG, M, N, A, LDA, $ WORK ) * -* -- LAPACK auxiliary routine (version 3.7.0) -- +* -- LAPACK auxiliary routine -- * -- LAPACK is a software package provided by Univ. of Tennessee, -- * -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..-- -* December 2016 * - IMPLICIT NONE * .. Scalar Arguments .. CHARACTER DIAG, NORM, UPLO INTEGER LDA, M, N @@ -164,18 +160,15 @@ * .. Local Scalars .. LOGICAL UDIAG INTEGER I, J - DOUBLE PRECISION SUM, VALUE + DOUBLE PRECISION SCALE, SUM, VALUE * .. -* .. Local Arrays .. - DOUBLE PRECISION SSQ( 2 ), COLSSQ( 2 ) +* .. External Subroutines .. + EXTERNAL DLASSQ * .. * .. External Functions .. LOGICAL LSAME, DISNAN EXTERNAL LSAME, DISNAN * .. -* .. External Subroutines .. - EXTERNAL DLASSQ, DCOMBSSQ -* .. * .. Intrinsic Functions .. INTRINSIC ABS, MIN, SQRT * .. @@ -285,7 +278,7 @@ END IF ELSE IF( LSAME( DIAG, 'U' ) ) THEN - DO 210 I = 1, N + DO 210 I = 1, MIN( M, N ) WORK( I ) = ONE 210 CONTINUE DO 220 I = N + 1, M @@ -315,56 +308,38 @@ ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN * * Find normF(A). -* SSQ(1) is scale -* SSQ(2) is sum-of-squares -* For better accuracy, sum each column separately. * IF( LSAME( UPLO, 'U' ) ) THEN IF( LSAME( DIAG, 'U' ) ) THEN - SSQ( 1 ) = ONE - SSQ( 2 ) = MIN( M, N ) + SCALE = ONE + SUM = MIN( M, N ) DO 290 J = 2, N - COLSSQ( 1 ) = ZERO - COLSSQ( 2 ) = ONE - CALL DLASSQ( MIN( M, J-1 ), A( 1, J ), 1, - $ COLSSQ( 1 ), COLSSQ( 2 ) ) - CALL DCOMBSSQ( SSQ, COLSSQ ) + CALL DLASSQ( MIN( M, J-1 ), A( 1, J ), 1, SCALE, SUM ) 290 CONTINUE ELSE - SSQ( 1 ) = ZERO - SSQ( 2 ) = ONE + SCALE = ZERO + SUM = ONE DO 300 J = 1, N - COLSSQ( 1 ) = ZERO - COLSSQ( 2 ) = ONE - CALL DLASSQ( MIN( M, J ), A( 1, J ), 1, - $ COLSSQ( 1 ), COLSSQ( 2 ) ) - CALL DCOMBSSQ( SSQ, COLSSQ ) + CALL DLASSQ( MIN( M, J ), A( 1, J ), 1, SCALE, SUM ) 300 CONTINUE END IF ELSE IF( LSAME( DIAG, 'U' ) ) THEN - SSQ( 1 ) = ONE - SSQ( 2 ) = MIN( M, N ) + SCALE = ONE + SUM = MIN( M, N ) DO 310 J = 1, N - COLSSQ( 1 ) = ZERO - COLSSQ( 2 ) = ONE - CALL DLASSQ( M-J, A( MIN( M, J+1 ), J ), 1, - $ COLSSQ( 1 ), COLSSQ( 2 ) ) - CALL DCOMBSSQ( SSQ, COLSSQ ) + CALL DLASSQ( M-J, A( MIN( M, J+1 ), J ), 1, SCALE, + $ SUM ) 310 CONTINUE ELSE - SSQ( 1 ) = ZERO - SSQ( 2 ) = ONE + SCALE = ZERO + SUM = ONE DO 320 J = 1, N - COLSSQ( 1 ) = ZERO - COLSSQ( 2 ) = ONE - CALL DLASSQ( M-J+1, A( J, J ), 1, - $ COLSSQ( 1 ), COLSSQ( 2 ) ) - CALL DCOMBSSQ( SSQ, COLSSQ ) + CALL DLASSQ( M-J+1, A( J, J ), 1, SCALE, SUM ) 320 CONTINUE END IF END IF - VALUE = SSQ( 1 )*SQRT( SSQ( 2 ) ) + VALUE = SCALE*SQRT( SUM ) END IF * DLANTR = VALUE