diff --git a/VERSION b/VERSION index a8b8fd56d..4a0b49cc6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3-2636-g45878b9f +v2.0.3-2654-g5c544a6e diff --git a/src/IO.f90 b/src/IO.f90 index e6e3d4a60..362f4a8d5 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -11,7 +11,6 @@ module IO implicit none private character(len=*), parameter, public :: & - IO_EOF = '#EOF#', & !< end of file string IO_WHITESPACE = achar(44)//achar(32)//achar(9)//achar(10)//achar(13) !< whitespace characters character, parameter, public :: & IO_EOL = new_line('DAMASK'), & !< end of line character @@ -106,7 +105,7 @@ function IO_readlines(fileName) result(fileContent) endif startPos = endPos + 2 ! jump to next line start - fileContent(l) = line + fileContent(l) = trim(line)//'' l = l + 1 enddo @@ -114,7 +113,8 @@ end function IO_readlines !-------------------------------------------------------------------------------------------------- -!> @brief reads an entire ASCII file into a string +!> @brief read ASCII file into a string +!> @details ensures that the string ends with a new line (expected UNIX behavior) !-------------------------------------------------------------------------------------------------- function IO_read(fileName) result(fileContent) @@ -130,10 +130,14 @@ function IO_read(fileName) result(fileContent) status='old', position='rewind', action='read',iostat=myStat) if(myStat /= 0) call IO_error(100,ext_msg=trim(fileName)) allocate(character(len=fileLength)::fileContent) + if(fileLength==0) return + read(fileUnit,iostat=myStat) fileContent - if(myStat > 0) call IO_error(102,ext_msg=trim(fileName)) ! <0 for ifort (https://software.intel.com/en-us/comment/1960081) + if(myStat /= 0) call IO_error(102,ext_msg=trim(fileName)) close(fileUnit) + if(fileContent(fileLength:fileLength) /= IO_EOL) fileContent = fileContent//IO_EOL ! ensure EOL@EOF + end function IO_read diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 7b3265740..8e57a56af 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -140,7 +140,8 @@ program DAMASK_grid !-------------------------------------------------------------------------------------------------- ! reading information from load case file and to sanity checks - fileContent = IO_read_ASCII(trim(loadCaseFile)) + fileContent = IO_readlines(trim(loadCaseFile)) + if(size(fileContent) == 0) call IO_error(307,ext_msg='No load case specified') allocate (loadCases(0)) ! array of load cases do currentLoadCase = 1, size(fileContent) diff --git a/src/mesh/discretization_mesh.f90 b/src/mesh/discretization_mesh.f90 index 0880de115..80db37e8d 100644 --- a/src/mesh/discretization_mesh.f90 +++ b/src/mesh/discretization_mesh.f90 @@ -119,7 +119,7 @@ subroutine discretization_mesh_init(restart) call MPI_Bcast(mesh_boundaries,mesh_Nboundaries,MPI_INTEGER,0,PETSC_COMM_WORLD,ierr) if (worldrank == 0) then - fileContent = IO_read_ASCII(geometryFile) + fileContent = IO_readlines(geometryFile) l = 0 do l = l + 1