Skip to content

Commit bc5d836

Browse files
committed
resolve conflicts after rebasing
1 parent 15d05b4 commit bc5d836

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

SRC/cgedmd.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -741,9 +741,9 @@ SUBROUTINE CGEDMD( JOBS, JOBZ, JOBR, JOBF, WHTSVD, &
741741
ELSE IF ( LQUERY ) THEN
742742
! Return minimal and optimal workspace sizes
743743
IWORK(1) = IMINWR
744-
RWORK(1) = MLRWRK
745-
ZWORK(1) = MLWORK
746-
ZWORK(2) = OLWORK
744+
RWORK(1) = REAL(MLRWRK)
745+
ZWORK(1) = CMPLX(MLWORK)
746+
ZWORK(2) = CMPLX(OLWORK)
747747
RETURN
748748
END IF
749749
!............................................................

SRC/cgedmdq.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -762,10 +762,10 @@ SUBROUTINE CGEDMDQ( JOBS, JOBZ, JOBR, JOBQ, JOBT, JOBF, &
762762
ELSE IF ( LQUERY ) THEN
763763
! Return minimal and optimal workspace sizes
764764
IWORK(1) = IMINWR
765-
ZWORK(1) = MLWORK
766-
ZWORK(2) = OLWORK
767-
WORK(1) = MLRWRK
768-
WORK(2) = MLRWRK
765+
ZWORK(1) = CMPLX(MLWORK)
766+
ZWORK(2) = CMPLX(OLWORK)
767+
WORK(1) = REAL(MLRWRK)
768+
WORK(2) = REAL(MLRWRK)
769769
RETURN
770770
END IF
771771
!.....

SRC/sgedmd.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,8 +763,8 @@ SUBROUTINE SGEDMD( JOBS, JOBZ, JOBR, JOBF, WHTSVD, &
763763
ELSE IF ( LQUERY ) THEN
764764
! Return minimal and optimal workspace sizes
765765
IWORK(1) = IMINWR
766-
WORK(1) = MLWORK
767-
WORK(2) = OLWORK
766+
WORK(1) = REAL(MLWORK)
767+
WORK(2) = REAL(OLWORK)
768768
RETURN
769769
END IF
770770
!............................................................

SRC/sgedmdq.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,8 @@ SUBROUTINE SGEDMDQ( JOBS, JOBZ, JOBR, JOBQ, JOBT, JOBF, &
775775
ELSE IF ( LQUERY ) THEN
776776
! Return minimal and optimal workspace sizes
777777
IWORK(1) = IMINWR
778-
WORK(1) = MLWORK
779-
WORK(2) = OLWORK
778+
WORK(1) = REAL(MLWORK)
779+
WORK(2) = REAL(OLWORK)
780780
RETURN
781781
END IF
782782
!.....

0 commit comments

Comments
 (0)