mld2p4-2:

tests/fileread/data_input.f90
 tests/fileread/mld_cf_sample.f90
 tests/fileread/mld_df_sample.f90
 tests/fileread/mld_sf_sample.f90
 tests/fileread/mld_zf_sample.f90
 tests/fileread/runs/cfs.inp
 tests/fileread/runs/dfs.inp
 tests/fileread/runs/sfs.inp
 tests/fileread/runs/zfs.inp

Fixed new Xf_sample.
This commit is contained in:
Salvatore Filippone
2017-05-30 13:42:58 +00:00
parent 9761a6e854
commit a29a7f5dcf
9 changed files with 2109 additions and 907 deletions
+95 -5
View File
@@ -41,10 +41,12 @@ module data_input
use psb_base_mod, only : psb_spk_, psb_dpk_, psb_ipk_
interface read_data
module procedure read_char, read_int,&
& read_double, read_single, read_logical,&
& string_read_char, string_read_int,&
& string_read_double, string_read_single, &
module procedure read_char, read_int, read_int_array,&
& read_double, read_double_array, &
& read_single, read_single_array, read_logical,&
& string_read_char, string_read_int, string_read_int_array,&
& string_read_double, string_read_double_array,&
& string_read_single, string_read_single_array, &
& string_read_logical
end interface read_data
interface trim_string
@@ -85,6 +87,17 @@ contains
call read_data(val,charbuf,marker)
end subroutine read_int
subroutine read_int_array(val,file,marker)
integer(psb_ipk_), intent(out) :: val(:)
integer(psb_ipk_), intent(in) :: file
character(len=1), optional, intent(in) :: marker
read(file,'(a)')charbuf
call read_data(val,charbuf,marker)
end subroutine read_int_array
subroutine read_single(val,file,marker)
real(psb_spk_), intent(out) :: val
integer(psb_ipk_), intent(in) :: file
@@ -94,6 +107,17 @@ contains
call read_data(val,charbuf,marker)
end subroutine read_single
subroutine read_single_array(val,file,marker)
real(psb_spk_), intent(out) :: val(:)
integer(psb_ipk_), intent(in) :: file
character(len=1), optional, intent(in) :: marker
read(file,'(a)')charbuf
call read_data(val,charbuf,marker)
end subroutine read_single_array
subroutine read_double(val,file,marker)
real(psb_dpk_), intent(out) :: val
integer(psb_ipk_), intent(in) :: file
@@ -104,6 +128,16 @@ contains
end subroutine read_double
subroutine read_double_array(val,file,marker)
real(psb_dpk_), intent(out) :: val(:)
integer(psb_ipk_), intent(in) :: file
character(len=1), optional, intent(in) :: marker
read(file,'(a)')charbuf
call read_data(val,charbuf,marker)
end subroutine read_double_array
subroutine string_read_char(val,file,marker)
character(len=*), intent(out) :: val
character(len=*), intent(in) :: file
@@ -142,6 +176,25 @@ contains
read(charbuf(1:idx-1),*) val
end subroutine string_read_int
subroutine string_read_int_array(val,file,marker)
integer(psb_ipk_), intent(out) :: val(:)
character(len=*), intent(in) :: file
character(len=1), optional, intent(in) :: marker
character(len=1) :: marker_
character(len=1024) :: charbuf
integer(psb_ipk_) :: idx
if (present(marker)) then
marker_ = marker
else
marker_ = def_marker
end if
read(file,'(a)')charbuf
charbuf = adjustl(charbuf)
idx=index(charbuf,marker_)
if (idx == 0) idx = len(charbuf)+1
read(charbuf(1:idx-1),*) val(:)
end subroutine string_read_int_array
subroutine string_read_single(val,file,marker)
real(psb_spk_), intent(out) :: val
character(len=*), intent(in) :: file
@@ -161,6 +214,25 @@ contains
read(charbuf(1:idx-1),*) val
end subroutine string_read_single
subroutine string_read_single_array(val,file,marker)
real(psb_spk_), intent(out) :: val(:)
character(len=*), intent(in) :: file
character(len=1), optional, intent(in) :: marker
character(len=1) :: marker_
character(len=1024) :: charbuf
integer(psb_ipk_) :: idx
if (present(marker)) then
marker_ = marker
else
marker_ = def_marker
end if
read(file,'(a)')charbuf
charbuf = adjustl(charbuf)
idx=index(charbuf,marker_)
if (idx == 0) idx = len(charbuf)+1
read(charbuf(1:idx-1),*) val(:)
end subroutine string_read_single_array
subroutine string_read_double(val,file,marker)
real(psb_dpk_), intent(out) :: val
character(len=*), intent(in) :: file
@@ -180,6 +252,25 @@ contains
read(charbuf(1:idx-1),*) val
end subroutine string_read_double
subroutine string_read_double_array(val,file,marker)
real(psb_dpk_), intent(out) :: val(:)
character(len=*), intent(in) :: file
character(len=1), optional, intent(in) :: marker
character(len=1) :: marker_
character(len=1024) :: charbuf
integer(psb_ipk_) :: idx
if (present(marker)) then
marker_ = marker
else
marker_ = def_marker
end if
read(file,'(a)')charbuf
charbuf = adjustl(charbuf)
idx=index(charbuf,marker_)
if (idx == 0) idx = len(charbuf)+1
read(charbuf(1:idx-1),*) val(:)
end subroutine string_read_double_array
subroutine string_read_logical(val,file,marker)
logical, intent(out) :: val
character(len=*), intent(in) :: file
@@ -196,7 +287,6 @@ contains
charbuf = adjustl(charbuf)
idx=index(charbuf,marker_)
if (idx == 0) idx = len(charbuf)+1
write(0,*) ' From string_read_logical: ',idx
read(charbuf(1:idx-1),*) val
end subroutine string_read_logical