mld2p4-2:

tests/fileread/Makefile
 tests/fileread/runs/dfs.inp
leftovers

tests/fileread/Makefile

@@ -16,8 +16,7 @@ ZFSOBJS=zf_sample.o data_input.o
 
 EXEDIR=./runs
 
-all: sf_sample df_sample cf_sample zf_sample
-#df_sample_alya
+all: sf_sample df_sample cf_sample zf_sample 
 
 df-sample_aya: df-sample_aya.o
 	$(F90LINK) $(LINKOPT) $(DFSAYAOBJS) -o df-sample_aya \

tests/fileread/runs/dfs.inp

@@ -1,7 +1,7 @@
-DATIAMBRA/matrix.mm         ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or 
-DATIAMBRA/rhs.mm            ! rhs          | http://www.cise.ufl.edu/research/sparse/matrices/index.html
+pressmat.mtx                ! This matrix (and others) from: http://math.nist.gov/MatrixMarket/ or 
+pressrhs.mtx                ! rhs          | http://www.cise.ufl.edu/research/sparse/matrices/index.html
 MM                          ! 
-CG                           ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG
+BICGSTAB                    ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTABL CG
 CSR                         ! Storage format: CSR COO JAD 
 0                           ! IPART (partition method): 0 (block)  2 (graph, with Metis) 
 2                           ! ISTOPC
@@ -20,14 +20,14 @@ GS                          ! AS subdomain solver: DSCALE ILU MILU ILUT UMF SLU
 4                           ! Number of Jacobi sweeps for base smoother
 4                           ! Number of levels in a multilevel preconditioner
 BJAC                        ! Smoother type  JACOBI BJAC AS ignored for non-ML
-SMOOTHED                    ! Type of aggregation: SMOOTHED NONSMOOTHED
+NONSMOOTHED                    ! Type of aggregation: SMOOTHED NONSMOOTHED
 DEC                         ! Type of aggregation: DEC
 NATURAL                     ! Ordering of aggregation NATURAL DEGREE
 MULT                        ! Type of multilevel correction: ADD MULT
 POST                        ! Side of multiplicative correction PRE POST TWOSIDE (ignored for ADD)
 REPL                        ! Coarsest-level matrix distribution: DIST  REPL           
 BJAC                        ! Coarsest-level solver: JACOBI BJAC UMF SLU SLUDIST MUMPS
-ILU                         ! Coarsest-level subsolver: ILU UMF SLU MUMPS SLUDIST (DSCALE for JACOBI)
+ILU                         ! Coarsest-level subsolver: ILU UMF SLU MUMPS 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/PJAC coarsest-level solver