Update edit descriptors for savetxt and loadtxt; Small fix in number_…

…of_rows() to make ifort happy

src/stdlib_io.fypp

@@ -22,12 +22,12 @@ module stdlib_io
   ! Format strings with edit descriptors for each type and kind
   character(*), parameter :: &
     FMT_INT = '(*(i0,1x))', &
-    FMT_REAL_SP = '(*(es15.8,1x))', &
-    FMT_REAL_DP = '(*(es23.16,1x))', &
-    FMT_REAL_QP = '(*(es42.35,1x))', &
-    FMT_COMPLEX_SP = '(*(es15.8,1x,es15.8))', &
-    FMT_COMPLEX_DP = '(*(es23.16,1x,es23.16))', &
-    FMT_COMPLEX_QP = '(*(es42.35,1x,es42.35))'
+    FMT_REAL_SP = '(*(es15.8e2,1x))', &
+    FMT_REAL_DP = '(*(es24.16e3,1x))', &
+    FMT_REAL_QP = '(*(es44.35e4,1x))', &
+    FMT_COMPLEX_SP = '(*(es15.8e2,1x,es15.8e2))', &
+    FMT_COMPLEX_DP = '(*(es24.16e3,1x,es24.16e3))', &
+    FMT_COMPLEX_QP = '(*(es44.35e4,1x,es44.35e4))'
 
   interface loadtxt
     !! version: experimental
@@ -93,7 +93,7 @@ contains
       #:endif
 
       ! determine number or rows
-      nrow = number_of_rows_numeric(s)
+      nrow = number_of_rows(s)
 
       allocate(d(nrow, ncol))
       do i = 1, nrow
@@ -174,36 +174,24 @@ contains
   end function number_of_columns
 
 
-  integer function number_of_rows_numeric(s) result(nrows)
+  integer function number_of_rows(s) result(nrows)
     !! version: experimental
     !!
-    !! determine number or rows
-    integer,intent(in)::s
+    !! Determine the number or rows in a file
+    integer, intent(in)::s
     integer :: ios
 
-    real :: r
-    complex :: z
-
     rewind(s)
     nrows = 0
     do
-      read(s, *, iostat=ios) r
+      read(s, *, iostat=ios)
       if (ios /= 0) exit
       nrows = nrows + 1
     end do
 
     rewind(s)
 
-    ! If there are no rows of real numbers, it may be that they are complex
-    if( nrows == 0) then
-      do
-        read(s, *, iostat=ios) z
-        if (ios /= 0) exit
-        nrows = nrows + 1
-      end do
-      rewind(s)
-    end if
-  end function number_of_rows_numeric
+  end function number_of_rows
 
 
   integer function open(filename, mode, iostat) result(u)
@@ -341,4 +329,4 @@ contains
 
   end function parse_mode
 
-end module
+end module stdlib_io