fixed an issue with reading integers.

switch to ifort for now to avoid gfortran bugs.

Author: jacobwilliams

build.sh

@@ -17,8 +17,10 @@ FORDMD='fortran-csv-module.md'      # FORD config file name
 
 #compiler flags:
 
-FCOMPILER='gnu' #Set compiler to gfortran
-FCOMPILERFLAGS='-c -O2 -std=f2008'
+#FCOMPILER='gnu' #Set compiler to gfortran
+#FCOMPILERFLAGS='-c -O2 -std=f2008'
+FCOMPILER='intel' #Set compiler to intel
+FCOMPILERFLAGS='-c -O2 -warn -stand f08 -traceback'
 
 #build using FoBiS:
 

fortran-csv-module.md

@@ -11,6 +11,7 @@ docmark_alt:
 docmark: !
 display: public
          protected
+         private
 source: true
 graph: true
 extra_mods: iso_fortran_env:https://gcc.gnu.org/onlinedocs/gfortran/ISO_005fFORTRAN_005fENV.html

src/csv_module.f90

@@ -433,6 +433,8 @@ end subroutine add_cell
 !*****************************************************************************************
 !>
 !  Add a vector to a CSV file. Each element is added as a cell to the current line.
+!
+!@warning There is some bug here with GFortran 6.1 when `val` is a character string.
 
     subroutine add_vector(me,val,int_fmt,real_fmt,trim_str)
 
@@ -652,7 +654,7 @@ pure elemental subroutine to_integer(str,val,status_ok)
 
     integer :: istat  !! read `iostat` error code
 
-    read(str,fmt=*,iostat=istat) val
+    read(str,fmt=default_int_fmt,iostat=istat) val
     if (istat==0) then
         status_ok = .true.
     else
@@ -896,8 +898,6 @@ subroutine get_real_column(me,icol,r,status_ok)
     real(wp),dimension(:),allocatable,intent(out) :: r
     logical,intent(out) :: status_ok
 
-    integer :: i  !! counter
-
     if (allocated(me%csv_data)) then
         allocate(r(me%n_rows))  ! size the output vector
         call me%get_column(icol,r,status_ok)
@@ -922,8 +922,6 @@ subroutine get_integer_column(me,icol,r,status_ok)
     integer(ip),dimension(:),allocatable,intent(out) :: r
     logical,intent(out) :: status_ok
 
-    integer :: i  !! counter
-
     if (allocated(me%csv_data)) then
         allocate(r(me%n_rows))  ! size the output vector
         call me%get_column(icol,r,status_ok)
@@ -948,8 +946,6 @@ subroutine get_logical_column(me,icol,r,status_ok)
     logical,dimension(:),allocatable,intent(out) :: r
     logical,intent(out) :: status_ok
 
-    integer :: i  !! counter
-
     if (allocated(me%csv_data)) then
         allocate(r(me%n_rows))  ! size the output vector
         call me%get_column(icol,r,status_ok)
@@ -974,8 +970,6 @@ subroutine get_character_column(me,icol,r,status_ok)
     character(len=*),dimension(:),allocatable,intent(out) :: r
     logical,intent(out) :: status_ok
 
-    integer :: i  !! counter
-
     if (allocated(me%csv_data)) then
         allocate(r(me%n_rows))  ! size the output vector
         call me%get_column(icol,r,status_ok)
@@ -1000,8 +994,6 @@ subroutine get_csv_string_column(me,icol,r,status_ok)
     type(csv_string),dimension(:),allocatable,intent(out) :: r
     logical,intent(out) :: status_ok
 
-    integer :: i  !! counter
-
     if (allocated(me%csv_data)) then
         allocate(r(me%n_rows))  ! size the output vector
         call me%get_column(icol,r,status_ok)
@@ -1164,7 +1156,6 @@ pure subroutine split(str,token,chunk_size,vals)
     integer :: j          !! counters
     character(len=:),allocatable :: temp
     integer,dimension(:),allocatable :: itokens
-    logical :: finished  !! if we are finished counting the tokens
 
     temp      = str         ! make a copy of the string
     len_token = len(token)  ! length of the token

src/tests/csv_test.f90

@@ -61,14 +61,16 @@ program csv_test
     write(*,*) ''
 
     ! now test creating a CSV:
-    call f2%open('test2.csv',n_cols=3,status_ok=status_ok)
-    call f2%add(['x','y','z'])    ! add header as vector
+    call f2%open('test2.csv',n_cols=4,status_ok=status_ok)
+    call f2%add(['x','y','z','t'])    ! add header as vector
     call f2%next_row()
     call f2%add(1.0_wp)  ! add as scalars
     call f2%add(2.0_wp)
     call f2%add(3.0_wp)
+    call f2%add(.true.)
     call f2%next_row()
     call f2%add([4.0_wp,5.0_wp,6.0_wp]) ! add as vectors
+    call f2%add(.false.)
     call f2%next_row()
     call f2%close(status_ok)
 

src/utilities_module.f90

@@ -11,9 +11,9 @@ module utilities_module
 
     integer,parameter :: max_size_for_insertion_sort = 20 !! max size for using insertion sort.
 
-    character(len=*),parameter,public :: default_real_fmt = '(ss,E27.17E4)'
+    character(len=*),parameter,public :: default_real_fmt = '(E27.17E4)'
         !! default real number format statement (for writing real values to strings and files).
-    character(len=*),parameter,public :: default_int_fmt  = '(ss,I0)'
+    character(len=*),parameter,public :: default_int_fmt  = '(I256)'
         !! minimum width format for integers
     integer(ip),parameter :: rp_safety_factor = 1_ip
     integer(ip),parameter :: rp_addl_safety = 2_ip