added NaN check to prevent NaN's from being skipped in accumulation

diff --git a/SRC/classq.f b/SRC/classq.f
index af027f9dac7dfff22c2cbbc4cb09288d2d268b26..2b8a5033ae0e4f2da135b46131fc781c21fadc38 100644 (file)
--- a/SRC/classq.f
+++ b/SRC/classq.f
@@ -129,6 +129,10 @@
       INTEGER            IX
       REAL               TEMP1
 *     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      EXTERNAL           SISNAN
+*     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, AIMAG, REAL
 *     ..
@@ -136,8 +140,8 @@
 *
       IF( N.GT.0 ) THEN
          DO 10 IX = 1, 1 + ( N-1 )*INCX, INCX
-            IF( REAL( X( IX ) ).NE.ZERO ) THEN
-               TEMP1 = ABS( REAL( X( IX ) ) )
+            TEMP1 = ABS( REAL( X( IX ) ) )
+            IF( TEMP1.GT.ZERO.OR.SISNAN( TEMP1 ) ) THEN
                IF( SCALE.LT.TEMP1 ) THEN
                   SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
                   SCALE = TEMP1
@@ -145,9 +149,9 @@
                   SUMSQ = SUMSQ + ( TEMP1 / SCALE )**2
                END IF
             END IF
-            IF( AIMAG( X( IX ) ).NE.ZERO ) THEN
-               TEMP1 = ABS( AIMAG( X( IX ) ) )
-               IF( SCALE.LT.TEMP1 ) THEN
+            TEMP1 = ABS( AIMAG( X( IX ) ) )
+            IF( TEMP1.GT.ZERO.OR.SISNAN( TEMP1 ) ) THEN
+               IF( SCALE.LT.TEMP1 .OR. SISNAN( TEMP1 ) ) THEN
                   SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
                   SCALE = TEMP1
                ELSE

diff --git a/SRC/dlassq.f b/SRC/dlassq.f
index db5b5946daa97590aa11700ba09ff18710007d03..ee039b93d5c4eaf83fbf07b11c9cd5b71a9d81ec 100644 (file)
--- a/SRC/dlassq.f
+++ b/SRC/dlassq.f
@@ -126,6 +126,10 @@
       INTEGER            IX
       DOUBLE PRECISION   ABSXI
 *     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      EXTERNAL           DISNAN
+*     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS
 *     ..
@@ -133,8 +137,8 @@
 *
       IF( N.GT.0 ) THEN
          DO 10 IX = 1, 1 + ( N-1 )*INCX, INCX
-            IF( X( IX ).NE.ZERO ) THEN
-               ABSXI = ABS( X( IX ) )
+            ABSXI = ABS( X( IX ) )
+            IF( ABSXI.GT.ZERO.OR.DISNAN( ABSXI ) ) THEN
                IF( SCALE.LT.ABSXI ) THEN
                   SUMSQ = 1 + SUMSQ*( SCALE / ABSXI )**2
                   SCALE = ABSXI

diff --git a/SRC/slassq.f b/SRC/slassq.f
index 8e87380843b5bb35e76c20e38179a0f265d4166e..f8af90493dccc150c931747f0e7a38e5a24027e2 100644 (file)
--- a/SRC/slassq.f
+++ b/SRC/slassq.f
@@ -126,6 +126,10 @@
       INTEGER            IX
       REAL               ABSXI
 *     ..
+*     .. External Functions ..
+      LOGICAL            SISNAN
+      EXTERNAL           SISNAN
+*     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS
 *     ..
@@ -133,8 +137,8 @@
 *
       IF( N.GT.0 ) THEN
          DO 10 IX = 1, 1 + ( N-1 )*INCX, INCX
-            IF( X( IX ).NE.ZERO ) THEN
-               ABSXI = ABS( X( IX ) )
+            ABSXI = ABS( X( IX ) )
+            IF( ABSXI.GT.ZERO.OR.SISNAN( ABSXI ) ) THEN
                IF( SCALE.LT.ABSXI ) THEN
                   SUMSQ = 1 + SUMSQ*( SCALE / ABSXI )**2
                   SCALE = ABSXI

diff --git a/SRC/zlassq.f b/SRC/zlassq.f
index d69b5ba3ba775dcd006b5233785bb2baaf7c7f0f..59ad6966327d8053990e28fab43755e30d7265ec 100644 (file)
--- a/SRC/zlassq.f
+++ b/SRC/zlassq.f
@@ -129,6 +129,10 @@
       INTEGER            IX
       DOUBLE PRECISION   TEMP1
 *     ..
+*     .. External Functions ..
+      LOGICAL            DISNAN
+      EXTERNAL           DISNAN
+*     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, DBLE, DIMAG
 *     ..
@@ -136,8 +140,8 @@
 *
       IF( N.GT.0 ) THEN
          DO 10 IX = 1, 1 + ( N-1 )*INCX, INCX
-            IF( DBLE( X( IX ) ).NE.ZERO ) THEN
-               TEMP1 = ABS( DBLE( X( IX ) ) )
+            TEMP1 = ABS( DBLE( X( IX ) ) )
+            IF( TEMP1.GT.ZERO.OR.DISNAN( TEMP1 ) ) THEN
                IF( SCALE.LT.TEMP1 ) THEN
                   SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
                   SCALE = TEMP1
@@ -145,8 +149,8 @@
                   SUMSQ = SUMSQ + ( TEMP1 / SCALE )**2
                END IF
             END IF
-            IF( DIMAG( X( IX ) ).NE.ZERO ) THEN
-               TEMP1 = ABS( DIMAG( X( IX ) ) )
+            TEMP1 = ABS( DIMAG( X( IX ) ) )
+            IF( TEMP1.GT.ZERO.OR.DISNAN( TEMP1 ) ) THEN
                IF( SCALE.LT.TEMP1 ) THEN
                   SUMSQ = 1 + SUMSQ*( SCALE / TEMP1 )**2
                   SCALE = TEMP1