resolve conflicts after rebasing

Author: mkrainiuk

SRC/cgedmd.f90

@@ -741,9 +741,9 @@ SUBROUTINE CGEDMD( JOBS, JOBZ, JOBR, JOBF, WHTSVD, &
  ELSE IF ( LQUERY ) THEN
 ! Return minimal and optimal workspace sizes
  IWORK(1) = IMINWR
- RWORK(1) = MLRWRK
- ZWORK(1) = MLWORK
- ZWORK(2) = OLWORK
+ RWORK(1) = REAL(MLRWRK)
+ ZWORK(1) = CMPLX(MLWORK)
+ ZWORK(2) = CMPLX(OLWORK)
  RETURN
  END IF
 !............................................................

SRC/cgedmdq.f90

@@ -762,10 +762,10 @@ SUBROUTINE CGEDMDQ( JOBS, JOBZ, JOBR, JOBQ, JOBT, JOBF, &
  ELSE IF ( LQUERY ) THEN
 ! Return minimal and optimal workspace sizes
  IWORK(1) = IMINWR
- ZWORK(1) = MLWORK
- ZWORK(2) = OLWORK
- WORK(1) = MLRWRK
- WORK(2) = MLRWRK
+ ZWORK(1) = CMPLX(MLWORK)
+ ZWORK(2) = CMPLX(OLWORK)
+ WORK(1) = REAL(MLRWRK)
+ WORK(2) = REAL(MLRWRK)
  RETURN
  END IF
 !.....

SRC/sgedmd.f90

@@ -763,8 +763,8 @@ SUBROUTINE SGEDMD( JOBS, JOBZ, JOBR, JOBF, WHTSVD, &
  ELSE IF ( LQUERY ) THEN
 ! Return minimal and optimal workspace sizes
  IWORK(1) = IMINWR
- WORK(1) = MLWORK
- WORK(2) = OLWORK
+ WORK(1) = REAL(MLWORK)
+ WORK(2) = REAL(OLWORK)
  RETURN
  END IF
 !............................................................

SRC/sgedmdq.f90

@@ -775,8 +775,8 @@ SUBROUTINE SGEDMDQ( JOBS, JOBZ, JOBR, JOBQ, JOBT, JOBF, &
  ELSE IF ( LQUERY ) THEN
 ! Return minimal and optimal workspace sizes
  IWORK(1) = IMINWR
- WORK(1) = MLWORK
- WORK(2) = OLWORK
+ WORK(1) = REAL(MLWORK)
+ WORK(2) = REAL(OLWORK)
  RETURN
  END IF
 !.....