223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enable strings > 2Gb

This commit is contained in:
Martin Diehl 2023-02-09 23:34:45 +01:00
parent a2bde4a0f0
commit 3e439503fe
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/IO.f90
View File

@ -136,7 +136,7 @@ function IO_read(fileName) result(fileContent)
if (myStat /= 0) call IO_error(102,trim(fileName)) if (myStat /= 0) call IO_error(102,trim(fileName))
close(fileUnit) close(fileUnit)
if (index(fileContent,CR//LF) /= 0) fileContent = CRLF2LF(fileContent) if (index(fileContent,CR//LF,kind=pI64) /= 0) fileContent = CRLF2LF(fileContent)
if (fileContent(fileLength:fileLength) /= IO_EOL) fileContent = fileContent//IO_EOL ! ensure EOL@EOF if (fileContent(fileLength:fileLength) /= IO_EOL) fileContent = fileContent//IO_EOL ! ensure EOL@EOF
end function IO_read end function IO_read
@ -607,17 +607,17 @@ pure function CRLF2LF(string)
character(len=*), intent(in) :: string character(len=*), intent(in) :: string
character(len=:), allocatable :: CRLF2LF character(len=:), allocatable :: CRLF2LF
integer :: c,n integer(pI64) :: c,n
allocate(character(len=len_trim(string))::CRLF2LF) allocate(character(len=len_trim(string,pI64))::CRLF2LF)
if (len(CRLF2LF) == 0) return if (len(CRLF2LF,pI64) == 0) return
n = 0 n = 0_pI64
do c=1, len_trim(string) do c=1_pI64, len_trim(string,pI64)
CRLF2LF(c-n:c-n) = string(c:c) CRLF2LF(c-n:c-n) = string(c:c)
if (c == len_trim(string)) exit if (c == len_trim(string,pI64)) exit
if (string(c:c+1) == CR//LF) n = n + 1 if (string(c:c+1_pI64) == CR//LF) n = n + 1_pI64
end do end do
CRLF2LF = CRLF2LF(:c-n) CRLF2LF = CRLF2LF(:c-n)

2
src/YAML_parse.f90
View File

@ -221,7 +221,7 @@ function to_flow(mixed) result(flow)
call to_flow_C(str_ptr,strlen,f_c_string(mixed)) call to_flow_C(str_ptr,strlen,f_c_string(mixed))
if (strlen < 1) call IO_error(703,ext_msg='libyfaml') if (strlen < 1_C_LONG) call IO_error(703,ext_msg='libyfaml')
allocate(character(len=strlen,kind=c_char) :: flow) allocate(character(len=strlen,kind=c_char) :: flow)
block block

14
src/system_routines.f90
View File

@ -181,15 +181,15 @@ pure function c_f_string(c_string) result(f_string)
character(kind=C_CHAR), dimension(:), intent(in) :: c_string character(kind=C_CHAR), dimension(:), intent(in) :: c_string
character(len=:), allocatable :: f_string character(len=:), allocatable :: f_string
integer :: i integer(pI64) :: i
allocate(character(len=size(c_string))::f_string) allocate(character(len=size(c_string,kind=pI64))::f_string)
arrayToString: do i=1,len(f_string) arrayToString: do i=1_pI64,len(f_string,pI64)
if (c_string(i) /= C_NULL_CHAR) then if (c_string(i) /= C_NULL_CHAR) then
f_string(i:i)=c_string(i) f_string(i:i)=c_string(i)
else else
f_string = f_string(:i-1) f_string = f_string(:i-1_pI64)
exit exit
end if end if
end do arrayToString end do arrayToString
@ -203,11 +203,11 @@ end function c_f_string
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
pure function f_c_string(f_string) result(c_string) pure function f_c_string(f_string) result(c_string)
character(len=*), intent(in) :: f_string character(len=*), intent(in) :: f_string
character(kind=C_CHAR), dimension(len_trim(f_string)+1) :: c_string character(kind=C_CHAR), dimension(len_trim(f_string,pI64)+1_pI64) :: c_string
c_string = transfer(trim(f_string)//C_NULL_CHAR,c_string,size=size(c_string)) c_string = transfer(trim(f_string)//C_NULL_CHAR,c_string,size=size(c_string,kind=pI64))
end function f_c_string end function f_c_string