Merge pull request #794 from thijssteel/multishiftqz-fix-shiftpos

langou · web-flow · commit b1e25a3b6700 · 2023-02-10T20:24:38.000-07:00
don't subtract N_DEFLATED from istop twice
diff --git a/SRC/claqz0.f b/SRC/claqz0.f
@@ -644,7 +644,7 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 
          IF ( MOD( LD, 6 ) .EQ. 0 ) THEN
 * 
diff --git a/SRC/dlaqz0.f b/SRC/dlaqz0.f
@@ -678,7 +678,7 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 *
 *        Shuffle shifts to put double shifts in front
 *        This ensures that we don't split up a double shift
diff --git a/SRC/slaqz0.f b/SRC/slaqz0.f
@@ -675,7 +675,7 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 *
 *        Shuffle shifts to put double shifts in front
 *        This ensures that we don't split up a double shift
diff --git a/SRC/zlaqz0.f b/SRC/zlaqz0.f
@@ -646,7 +646,7 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,
 
          NS = MIN( NSHIFTS, ISTOP-ISTART2 )
          NS = MIN( NS, N_UNDEFLATED )
-         SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1
+         SHIFTPOS = ISTOP-N_UNDEFLATED+1
 
          IF ( MOD( LD, 6 ) .EQ. 0 ) THEN
 * 

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ RECURSIVE SUBROUTINE CLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,`
`644`	`644`
`645`	`645`	`NS = MIN( NSHIFTS, ISTOP-ISTART2 )`
`646`	`646`	`NS = MIN( NS, N_UNDEFLATED )`
`647`		`- SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1`
	`647`	`+ SHIFTPOS = ISTOP-N_UNDEFLATED+1`
`648`	`648`
`649`	`649`	`IF ( MOD( LD, 6 ) .EQ. 0 ) THEN`
`650`	`650`	`*`
Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ RECURSIVE SUBROUTINE DLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,`
`678`	`678`
`679`	`679`	`NS = MIN( NSHIFTS, ISTOP-ISTART2 )`
`680`	`680`	`NS = MIN( NS, N_UNDEFLATED )`
`681`		`- SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1`
	`681`	`+ SHIFTPOS = ISTOP-N_UNDEFLATED+1`
`682`	`682`	`*`
`683`	`683`	`* Shuffle shifts to put double shifts in front`
`684`	`684`	`* This ensures that we don't split up a double shift`
Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ RECURSIVE SUBROUTINE SLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,`
`675`	`675`
`676`	`676`	`NS = MIN( NSHIFTS, ISTOP-ISTART2 )`
`677`	`677`	`NS = MIN( NS, N_UNDEFLATED )`
`678`		`- SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1`
	`678`	`+ SHIFTPOS = ISTOP-N_UNDEFLATED+1`
`679`	`679`	`*`
`680`	`680`	`* Shuffle shifts to put double shifts in front`
`681`	`681`	`* This ensures that we don't split up a double shift`
Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@ RECURSIVE SUBROUTINE ZLAQZ0( WANTS, WANTQ, WANTZ, N, ILO, IHI, A,`
`646`	`646`
`647`	`647`	`NS = MIN( NSHIFTS, ISTOP-ISTART2 )`
`648`	`648`	`NS = MIN( NS, N_UNDEFLATED )`
`649`		`- SHIFTPOS = ISTOP-N_DEFLATED-N_UNDEFLATED+1`
	`649`	`+ SHIFTPOS = ISTOP-N_UNDEFLATED+1`
`650`	`650`
`651`	`651`	`IF ( MOD( LD, 6 ) .EQ. 0 ) THEN`
`652`	`652`	`*`