From 5214b93342b38838ffd71806361bebd5dfff5d1b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 6 Nov 2012 17:16:01 +0000 Subject: [PATCH] fixed bug when reading in geometry for spectral solver --- code/IO.f90 | 6 +++--- code/mesh.f90 | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/IO.f90 b/code/IO.f90 index ecf9a6261..8eb4c77f6 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -800,13 +800,13 @@ pure function IO_stringPos(line,N) implicit none integer(pInt), intent(in) :: N - integer(pInt) :: IO_stringPos(1_pInt+N*2_pInt) + integer(pInt) :: IO_stringPos(1_pInt+N*2_pInt) character(len=*), intent(in) :: line - character(len=*), parameter :: sep=achar(44)//achar(32)//achar(9)//achar(10)//achar(13) ! comma and whitespaces + character(len=*), parameter :: sep=achar(44)//achar(32)//achar(9)//achar(10)//achar(13) ! comma and whitespaces - integer :: left, right !no pInt (verify and scan return default integer) + integer :: left, right !no pInt (verify and scan return default integer) IO_stringPos = -1_pInt diff --git a/code/mesh.f90 b/code/mesh.f90 index 871c04b05..b9bd2b528 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -741,7 +741,7 @@ function mesh_spectral_getResolution(fileUnit) call IO_checkAndRewind(myUnit) read(myUnit,'(a1024)') line - positions = IO_stringPos(line,2_pInt) + positions = IO_stringPos(line,7_pInt) keyword = IO_lc(IO_StringValue(line,positions,2_pInt)) if (keyword(1:4) == 'head') then headerLength = IO_intValue(line,positions,1_pInt) + 1_pInt @@ -822,7 +822,7 @@ function mesh_spectral_getDimension(fileUnit) call IO_checkAndRewind(myUnit) read(myUnit,'(a1024)') line - positions = IO_stringPos(line,2_pInt) + positions = IO_stringPos(line,7_pInt) keyword = IO_lc(IO_StringValue(line,positions,2_pInt)) if (keyword(1:4) == 'head') then headerLength = IO_intValue(line,positions,1_pInt) + 1_pInt @@ -896,7 +896,7 @@ function mesh_spectral_getHomogenization(fileUnit) call IO_checkAndRewind(myUnit) read(myUnit,'(a1024)') line - positions = IO_stringPos(line,2_pInt) + positions = IO_stringPos(line,7_pInt) keyword = IO_lc(IO_StringValue(line,positions,2_pInt)) if (keyword(1:4) == 'head') then headerLength = IO_intValue(line,positions,1_pInt) + 1_pInt @@ -1053,8 +1053,7 @@ subroutine mesh_spectral_build_elements(myUnit) implicit none integer(pInt), intent(in) :: myUnit - integer(pInt), parameter :: maxNchunks = 7_pInt - integer(pInt), dimension (1_pInt+2_pInt*maxNchunks) :: myPos + integer(pInt), dimension (1_pInt+7_pInt*2_pInt) :: myPos integer(pInt) :: e, i, headerLength = 0_pInt, maxIntCount integer(pInt), dimension(:), allocatable :: microstructures integer(pInt), dimension(1,1) :: dummySet = 0_pInt @@ -1064,7 +1063,7 @@ subroutine mesh_spectral_build_elements(myUnit) call IO_checkAndRewind(myUnit) read(myUnit,'(a65536)') line - myPos = IO_stringPos(line,2_pInt) + myPos = IO_stringPos(line,7_pInt) keyword = IO_lc(IO_StringValue(line,myPos,2_pInt)) if (keyword(1:4) == 'head') then headerLength = IO_intValue(line,myPos,1_pInt) + 1_pInt