Merge pull request #73 from mgates3/latb4

make SY/HE imat match LAWN 41 (different than PO)

4 files changed, 159 insertions, 17 deletions

diff --git a/TESTING/LIN/clatb4.f b/TESTING/LIN/clatb4.f
index 274179b6..c936f908 100644
--- a/TESTING/LIN/clatb4.f
+++ b/TESTING/LIN/clatb4.f
@@ -340,12 +340,10 @@
             ANORM = ONE
          END IF
 *
-      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR.
-     $         LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR.
-     $         LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN
 *
-*        xPO, xPP, xHE, xHP, xSY, xSP: Set parameters to generate a
-*        symmetric or Hermitian matrix.
+*        xPO, xPP: Set parameters to generate a
+*        symmetric or Hermitian positive definite matrix.
 *
 *        Set TYPE, the type of matrix to be generated.
 *
@@ -378,6 +376,43 @@
             ANORM = ONE
          END IF
 *
+      ELSE IF( LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR.
+     $         LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+*
+*        xHE, xHP, xSY, xSP: Set parameters to generate a
+*        symmetric or Hermitian matrix.
+*
+*        Set TYPE, the type of matrix to be generated.
+*
+         TYPE = C2( 1: 1 )
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.1 ) THEN
+            KL = 0
+         ELSE
+            KL = MAX( N-1, 0 )
+         END IF
+         KU = KL
+*
+*        Set the condition number and norm.
+*
+         IF( IMAT.EQ.7 ) THEN
+            CNDNUM = BADC1
+         ELSE IF( IMAT.EQ.8 ) THEN
+            CNDNUM = BADC2
+         ELSE
+            CNDNUM = TWO
+         END IF
+*
+         IF( IMAT.EQ.9 ) THEN
+            ANORM = SMALL
+         ELSE IF( IMAT.EQ.10 ) THEN
+            ANORM = LARGE
+         ELSE
+            ANORM = ONE
+         END IF
+*
       ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN
 *
 *        xPB:  Set parameters to generate a symmetric band matrix.
diff --git a/TESTING/LIN/dlatb4.f b/TESTING/LIN/dlatb4.f
index e1638b08..7eb1fa43 100644
--- a/TESTING/LIN/dlatb4.f
+++ b/TESTING/LIN/dlatb4.f
@@ -339,11 +339,10 @@
             ANORM = ONE
          END IF
 *
-      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR.
-     $         LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN
 *
-*        xPO, xPP, xSY, xSP: Set parameters to generate a
-*        symmetric matrix.
+*        xPO, xPP: Set parameters to generate a
+*        symmetric positive definite matrix.
 *
 *        Set TYPE, the type of matrix to be generated.
 *
@@ -376,6 +375,43 @@
             ANORM = ONE
          END IF
 *
+*
+      ELSE IF( LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+*
+*        xSY, xSP: Set parameters to generate a
+*        symmetric matrix.
+*
+*        Set TYPE, the type of matrix to be generated.
+*
+         TYPE = C2( 1: 1 )
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.1 ) THEN
+            KL = 0
+         ELSE
+            KL = MAX( N-1, 0 )
+         END IF
+         KU = KL
+*
+*        Set the condition number and norm.
+*
+         IF( IMAT.EQ.7 ) THEN
+            CNDNUM = BADC1
+         ELSE IF( IMAT.EQ.8 ) THEN
+            CNDNUM = BADC2
+         ELSE
+            CNDNUM = TWO
+         END IF
+*
+         IF( IMAT.EQ.9 ) THEN
+            ANORM = SMALL
+         ELSE IF( IMAT.EQ.10 ) THEN
+            ANORM = LARGE
+         ELSE
+            ANORM = ONE
+         END IF
+*
       ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN
 *
 *        xPB:  Set parameters to generate a symmetric band matrix.
diff --git a/TESTING/LIN/slatb4.f b/TESTING/LIN/slatb4.f
index 4ead31d1..145c65df 100644
--- a/TESTING/LIN/slatb4.f
+++ b/TESTING/LIN/slatb4.f
@@ -339,11 +339,10 @@
             ANORM = ONE
          END IF
 *
-      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR.
-     $         LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN
 *
 *        xPO, xPP, xSY, xSP: Set parameters to generate a
-*        symmetric matrix.
+*        symmetric positive definite matrix.
 *
 *        Set TYPE, the type of matrix to be generated.
 *
@@ -376,6 +375,43 @@
             ANORM = ONE
          END IF
 *
+*
+      ELSE IF( LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+*
+*        xSY, xSP: Set parameters to generate a
+*        symmetric matrix.
+*
+*        Set TYPE, the type of matrix to be generated.
+*
+         TYPE = C2( 1: 1 )
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.1 ) THEN
+            KL = 0
+         ELSE
+            KL = MAX( N-1, 0 )
+         END IF
+         KU = KL
+*
+*        Set the condition number and norm.
+*
+         IF( IMAT.EQ.7 ) THEN
+            CNDNUM = BADC1
+         ELSE IF( IMAT.EQ.8 ) THEN
+            CNDNUM = BADC2
+         ELSE
+            CNDNUM = TWO
+         END IF
+*
+         IF( IMAT.EQ.9 ) THEN
+            ANORM = SMALL
+         ELSE IF( IMAT.EQ.10 ) THEN
+            ANORM = LARGE
+         ELSE
+            ANORM = ONE
+         END IF
+*
       ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN
 *
 *        xPB:  Set parameters to generate a symmetric band matrix.
diff --git a/TESTING/LIN/zlatb4.f b/TESTING/LIN/zlatb4.f
index bcfa2344..de266379 100644
--- a/TESTING/LIN/zlatb4.f
+++ b/TESTING/LIN/zlatb4.f
@@ -340,12 +340,10 @@
             ANORM = ONE
          END IF
 *
-      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR.
-     $         LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR.
-     $         LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+      ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN
 *
-*        xPO, xPP, xHE, xHP, xSY, xSP: Set parameters to generate a
-*        symmetric or Hermitian matrix.
+*        xPO, xPP: Set parameters to generate a
+*        symmetric or Hermitian positive definite matrix.
 *
 *        Set TYPE, the type of matrix to be generated.
 *
@@ -378,6 +376,43 @@
             ANORM = ONE
          END IF
 *
+      ELSE IF( LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR.
+     $         LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN
+*
+*        xHE, xHP, xSY, xSP: Set parameters to generate a
+*        symmetric or Hermitian matrix.
+*
+*        Set TYPE, the type of matrix to be generated.
+*
+         TYPE = C2( 1: 1 )
+*
+*        Set the lower and upper bandwidths.
+*
+         IF( IMAT.EQ.1 ) THEN
+            KL = 0
+         ELSE
+            KL = MAX( N-1, 0 )
+         END IF
+         KU = KL
+*
+*        Set the condition number and norm.
+*
+         IF( IMAT.EQ.7 ) THEN
+            CNDNUM = BADC1
+         ELSE IF( IMAT.EQ.8 ) THEN
+            CNDNUM = BADC2
+         ELSE
+            CNDNUM = TWO
+         END IF
+*
+         IF( IMAT.EQ.9 ) THEN
+            ANORM = SMALL
+         ELSE IF( IMAT.EQ.10 ) THEN
+            ANORM = LARGE
+         ELSE
+            ANORM = ONE
+         END IF
+*
       ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN
 *
 *        xPB:  Set parameters to generate a symmetric band matrix.