mld2p4-2:

examples/fileread/Makefile examples/fileread/mld_cexample_1lev.f90 examples/fileread/mld_cexample_ml.f90 examples/fileread/mld_dexample_1lev.f90 examples/fileread/mld_dexample_ml.f90 examples/fileread/mld_sexample_1lev.f90 examples/fileread/mld_sexample_ml.f90 examples/fileread/mld_zexample_1lev.f90 examples/fileread/mld_zexample_ml.f90 examples/fileread/runs/1lev.inp examples/fileread/runs/ml.inp examples/pdegen/Makefile examples/pdegen/mld_dexample_1lev.f90 examples/pdegen/mld_dexample_ml.f90 examples/pdegen/mld_sexample_1lev.f90 examples/pdegen/mld_sexample_ml.f90 examples/pdegen/runs/1lev.inp examples/pdegen/runs/ml.inp Fix example programs.
14 years ago · 905b5f72cf
parent eed800dbb4
commit 905b5f72cf
18 changed files with 40 additions and 20 deletions
--- a/examples/fileread/Makefile
+++ b/examples/fileread/Makefile
@ -1,10 +1,11 @@
 MLDDIR=../..
 include $(MLDDIR)/Make.inc
-PSBDIR=$(PSBLASDIR)/lib/
+PSBLIBDIR=$(PSBLASDIR)/lib/
+PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
-MLD_LIB=-L$(MLDLIBDIR) -lmld_krylov -lmld_prec
-PSBLAS_LIB= -L$(PSBDIR)  -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBDIR) $(FIFLAG).
+MLD_LIB=-L$(MLDLIBDIR)  -lmld_prec
+PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util  -lpsb_base
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).

 DMOBJS=mld_dexample_ml.o data_input.o
 D1OBJS=mld_dexample_1lev.o data_input.o
--- a/examples/fileread/mld_cexample_1lev.f90
+++ b/examples/fileread/mld_cexample_1lev.f90
@ -149,7 +149,7 @@ program mld_cexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/mld_cexample_ml.f90
+++ b/examples/fileread/mld_cexample_ml.f90
@ -153,7 +153,7 @@ program mld_cexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/mld_dexample_1lev.f90
+++ b/examples/fileread/mld_dexample_1lev.f90
@ -148,7 +148,7 @@ program mld_dexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/mld_dexample_ml.f90
+++ b/examples/fileread/mld_dexample_ml.f90
@ -152,7 +152,7 @@ program mld_dexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/mld_sexample_1lev.f90
+++ b/examples/fileread/mld_sexample_1lev.f90
@ -149,7 +149,7 @@ program mld_sexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/mld_sexample_ml.f90
+++ b/examples/fileread/mld_sexample_ml.f90
@ -153,7 +153,7 @@ program mld_sexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/mld_zexample_1lev.f90
+++ b/examples/fileread/mld_zexample_1lev.f90
@ -148,7 +148,7 @@ program mld_zexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/mld_zexample_ml.f90
+++ b/examples/fileread/mld_zexample_ml.f90
@ -152,7 +152,7 @@ program mld_zexample_ml
      call psb_abort(ictxt)
    end if

-    m_problem = aux_a%m
+    m_problem = aux_a%get_nrows()
    call psb_bcast(ictxt,m_problem)

    ! At this point aux_b may still be unallocated
--- a/examples/fileread/runs/1lev.inp
+++ b/examples/fileread/runs/1lev.inp
@ -0,0 +1,5 @@
+sherman3.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).
+01000                       ! ITMAX
+1.d-5                       ! EPS
--- a/examples/fileread/runs/ml.inp
+++ b/examples/fileread/runs/ml.inp
@ -0,0 +1,6 @@
+sherman3.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).
+1                           ! Preconditioner choice 
+01000                       ! ITMAX
+1.d-5                       ! EPS
--- a/examples/pdegen/Makefile
+++ b/examples/pdegen/Makefile
@ -1,10 +1,11 @@
 MLDDIR=../..
 include $(MLDDIR)/Make.inc
-PSBDIR=$(PSBLASDIR)/lib/
+PSBLIBDIR=$(PSBLASDIR)/lib/
+PSBINCDIR=$(PSBLASDIR)/include
 MLDLIBDIR=$(MLDDIR)/lib
-MLD_LIB=-L$(MLDLIBDIR) -lmld_krylov -lmld_prec
-PSBLAS_LIB= -L$(PSBDIR)  -lpsb_util  -lpsb_base
-FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBDIR) $(FIFLAG).
+MLD_LIB=-L$(MLDLIBDIR)  -lmld_prec
+PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util  -lpsb_base
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR)  $(FMFLAG)$(PSBINCDIR) $(FIFLAG).

 DMOBJS=mld_dexample_ml.o data_input.o
 D1OBJS=mld_dexample_1lev.o data_input.o
--- a/examples/pdegen/mld_dexample_1lev.f90
+++ b/examples/pdegen/mld_dexample_1lev.f90
@ -554,7 +554,7 @@ contains
    call psb_amx(ictxt,ttot)
    if(iam == psb_root_) then
      write(*,'("The matrix has been generated and assembled in ",a3," format.")')&
-           &   a%fida(1:3)
+           &   a%get_fmt()
      write(*,'("-allocation  time : ",es12.5)') talc
      write(*,'("-coeff. gen. time : ",es12.5)') tgen
      write(*,'("-assembly    time : ",es12.5)') tasb
--- a/examples/pdegen/mld_dexample_ml.f90
+++ b/examples/pdegen/mld_dexample_ml.f90
@ -592,7 +592,7 @@ contains
    call psb_amx(ictxt,ttot)
    if(iam == psb_root_) then
      write(*,'("The matrix has been generated and assembled in ",a3," format.")')&
-           &   a%fida(1:3)
+           &   a%get_fmt()
      write(*,'("-allocation  time : ",es12.5)') talc
      write(*,'("-coeff. gen. time : ",es12.5)') tgen
      write(*,'("-assembly    time : ",es12.5)') tasb
--- a/examples/pdegen/mld_sexample_1lev.f90
+++ b/examples/pdegen/mld_sexample_1lev.f90
@ -555,7 +555,7 @@ contains
    call psb_amx(ictxt,ttot)
    if(iam == psb_root_) then
      write(*,'("The matrix has been generated and assembled in ",a3," format.")')&
-           &   a%fida(1:3)
+           &   a%get_fmt()
      write(*,'("-allocation  time : ",es12.5)') talc
      write(*,'("-coeff. gen. time : ",es12.5)') tgen
      write(*,'("-assembly    time : ",es12.5)') tasb
--- a/examples/pdegen/mld_sexample_ml.f90
+++ b/examples/pdegen/mld_sexample_ml.f90
@ -593,7 +593,7 @@ contains
    call psb_amx(ictxt,ttot)
    if(iam == psb_root_) then
      write(*,'("The matrix has been generated and assembled in ",a3," format.")')&
-           &   a%fida(1:3)
+           &   a%get_fmt()
      write(*,'("-allocation  time : ",es12.5)') talc
      write(*,'("-coeff. gen. time : ",es12.5)') tgen
      write(*,'("-assembly    time : ",es12.5)') tasb
--- a/examples/pdegen/runs/1lev.inp
+++ b/examples/pdegen/runs/1lev.inp
@ -0,0 +1,3 @@
+40            ! IDIM; domain size is idim**3
+0100          ! ITMAX
+1.d-6         ! EPS
--- a/examples/pdegen/runs/ml.inp
+++ b/examples/pdegen/runs/ml.inp
@ -0,0 +1,4 @@
+1             ! Preconditioner choice 
+40            ! IDIM; domain size is idim**3
+0100          ! ITMAX
+1.d-6         ! EPS