From 9cd9ee71c5e9034e53262e76193b73d4fd34f4bc Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 5 Jun 2020 14:44:31 +0200 Subject: [PATCH] off-by-one issue fixed --- src/IO.f90 | 4 ++-- src/mesh/discretization_mesh.f90 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/IO.f90 b/src/IO.f90 index 8d56bdd70..608d70fba 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -94,7 +94,7 @@ function IO_readlines(fileName) result(fileContent) startPos = 1 l = 1 do while (l <= N_lines) - endPos = merge(startPos + scan(rawData(startPos:),IO_EOL) - 2,len(rawData),l /= N_lines) + endPos = merge(startPos + scan(rawData(startPos:),IO_EOL) - 2,len(rawData)-1,l /= N_lines) if (endPos - startPos > pStringLen-1) then line = rawData(startPos:startPos+pStringLen-1) if (.not. warned) then @@ -106,7 +106,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 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