mld2p4:

new data_input for examples/pdegen.
Fixed input file for fileread.

examples/pdegen/data_input.f90

@@ -40,52 +40,144 @@ module data_input
   
   interface read_data
     module procedure read_char, read_int,&
-         & read_double, read_single
+         & read_double, read_single,&
+         & string_read_char, string_read_int,&
+         & string_read_double, string_read_single
   end interface read_data
-  
+  interface trim_string
+    module procedure trim_string
+  end interface
+
+  character(len=4096), private  :: charbuf
+  character, private, parameter :: def_marker="!"
+
 contains
 
-  subroutine read_char(val,file)
+  subroutine read_char(val,file,marker)
     character(len=*), intent(out) :: val
     integer, intent(in)           :: file
+    character(len=1), optional, intent(in) :: marker
+
+    read(file,'(a)')charbuf
+    call read_data(val,charbuf,marker)
+
+  end subroutine read_char
+
+  subroutine read_int(val,file,marker)
+    integer, intent(out) :: val
+    integer, intent(in)  :: file
+    character(len=1), optional, intent(in) :: marker
+
+    read(file,'(a)')charbuf
+    call read_data(val,charbuf,marker)
+
+  end subroutine read_int
+  subroutine read_single(val,file,marker)
+    use psb_base_mod
+    real(psb_spk_), intent(out) :: val
+    integer, intent(in)         :: file
+    character(len=1), optional, intent(in) :: marker
+
+    read(file,'(a)')charbuf
+    call read_data(val,charbuf,marker)
+
+  end subroutine read_single
+  subroutine read_double(val,file,marker)
+    use psb_base_mod
+    real(psb_dpk_), intent(out) :: val
+    integer, intent(in)         :: file
+    character(len=1), optional, intent(in) :: marker
+
+    read(file,'(a)')charbuf
+    call read_data(val,charbuf,marker)
+
+  end subroutine read_double
+
+  subroutine string_read_char(val,file,marker)
+    character(len=*), intent(out) :: val
+    character(len=*), intent(in)  :: file
+    character(len=1), optional, intent(in) :: marker
+    character(len=1)    :: marker_
     character(len=1024) :: charbuf
     integer :: idx
+    if (present(marker)) then 
+      marker_ = marker
+    else
+      marker_ = def_marker
+    end if
     read(file,'(a)')charbuf
     charbuf = adjustl(charbuf)
-    idx=index(charbuf,"!")
+    idx=index(charbuf,marker_)
     read(charbuf(1:idx-1),'(a)') val
-  end subroutine read_char
-  subroutine read_int(val,file)
+  end subroutine string_read_char
+
+  subroutine string_read_int(val,file,marker)
     integer, intent(out) :: val
-    integer, intent(in)  :: file
+    character(len=*), intent(in)  :: file
+    character(len=1), optional, intent(in) :: marker
+    character(len=1)    :: marker_
     character(len=1024) :: charbuf
     integer :: idx
+    if (present(marker)) then 
+      marker_ = marker
+    else
+      marker_ = def_marker
+    end if
     read(file,'(a)')charbuf
     charbuf = adjustl(charbuf)
-    idx=index(charbuf,"!")
+    idx=index(charbuf,marker_)
     read(charbuf(1:idx-1),*) val
-  end subroutine read_int
-  subroutine read_single(val,file)
+  end subroutine string_read_int
+  subroutine string_read_single(val,file,marker)
     use psb_base_mod
     real(psb_spk_), intent(out) :: val
-    integer, intent(in)         :: file
+    character(len=*), intent(in)         :: file
+    character(len=1), optional, intent(in) :: marker
+    character(len=1)    :: marker_
     character(len=1024) :: charbuf
     integer :: idx
+    if (present(marker)) then 
+      marker_ = marker
+    else
+      marker_ = def_marker
+    end if
     read(file,'(a)')charbuf
     charbuf = adjustl(charbuf)
-    idx=index(charbuf,"!")
+    idx=index(charbuf,marker_)
     read(charbuf(1:idx-1),*) val
-  end subroutine read_single
-  subroutine read_double(val,file)
+  end subroutine string_read_single
+  subroutine string_read_double(val,file,marker)
     use psb_base_mod
     real(psb_dpk_), intent(out) :: val
-    integer, intent(in)         :: file
+    character(len=*), intent(in)         :: file
+    character(len=1), optional, intent(in) :: marker
+    character(len=1)    :: marker_
     character(len=1024) :: charbuf
     integer :: idx
+    if (present(marker)) then 
+      marker_ = marker
+    else
+      marker_ = def_marker
+    end if
     read(file,'(a)')charbuf
     charbuf = adjustl(charbuf)
-    idx=index(charbuf,"!")
+    idx=index(charbuf,marker_)
     read(charbuf(1:idx-1),*) val
-  end subroutine read_double
+  end subroutine string_read_double
+
+  function  trim_string(string,marker)
+    character(len=*), intent(in) :: string
+    character(len=1), optional, intent(in) :: marker
+    character(len=len(string))    :: trim_string
+    character(len=1)              :: marker_
+    integer :: idx
+    if (present(marker)) then 
+      marker_ = marker
+    else
+      marker_ = def_marker
+    end if
+    idx=index(string,marker_)
+    trim_string = adjustl(string(idx:))
+  end function trim_string
 end module data_input
 

tests/fileread/runs/dfs.inp

@@ -1,4 +1,4 @@
-young1r.mtx                 ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or 
+thm200x120.mtx              !young1r.mtx                 ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or 
 NONE                        ! rhs          | http://www.cise.ufl.edu/research/sparse/matrices/index.html
 MM                          ! File format: MM (Matrix Market)  HB (Harwell-Boeing).
 BICGSTAB                    ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG
@@ -24,7 +24,7 @@ MULT                        ! Type of multilevel correction: ADD MULT
 POST                        ! Side of multiplicative correction PRE POST BOTH (ignored for ADD)
 DIST                        ! Coarsest-level matrix distribution: DIST  REPL           
 BJAC                        ! Coarsest-level solver: BJAC UMF SLU SLUDIST
-ILU                         ! Coarsest-level subsolver: ILU UMF SLU SLUDIST
+UMF                         ! Coarsest-level subsolver: ILU UMF SLU SLUDIST
 0                           ! Coarsest-level fillin P for ILU(P) and ILU(T,P)
 1.d-4                       ! Coarsest-level threshold T for ILU(T,P) 
 4                           ! Number of Jacobi sweeps for BJAC coarsest-level solver