Merge branch 'development' into mergeDev

base/modules/serial/psb_serial_mod.f90

@@ -68,6 +68,16 @@ module psb_serial_mod
     end subroutine psb_d_nspaxpby
   end interface psb_nspaxpby
 
+  interface symbmm
+    subroutine symbmm (n, m, l, ia, ja, diaga, &
+         & ib, jb, diagb, ic, jc, diagc, index)
+      import :: psb_ipk_
+      integer(psb_ipk_) :: n,m,l,  ia(*), ja(*), diaga, ib(*), jb(*), diagb,&
+           & diagc,  index(*)
+      integer(psb_ipk_), allocatable :: ic(:),jc(:)
+    end subroutine symbmm
+  end interface
+  
 
 contains
 

base/serial/psb_csymbmm.f90

@@ -153,15 +153,6 @@ contains
     type(psb_c_csr_sparse_mat), intent(out) :: c
     integer(psb_ipk_) :: itemp(:) 
     integer(psb_ipk_), intent(out)                    :: info
-    interface 
-      subroutine symbmm (n, m, l, ia, ja, diaga, &
-           & ib, jb, diagb, ic, jc, diagc, index)
-        import :: psb_ipk_
-        integer(psb_ipk_) :: n,m,l,  ia(*), ja(*), diaga, ib(*), jb(*), diagb,&
-             & diagc,  index(*)
-        integer(psb_ipk_), allocatable :: ic(:),jc(:)
-      end subroutine symbmm
-    end interface
     integer(psb_ipk_) :: nze, ma,na,mb,nb
 
     info = psb_success_

base/serial/psb_dsymbmm.f90

@@ -153,15 +153,6 @@ contains
     type(psb_d_csr_sparse_mat), intent(out) :: c
     integer(psb_ipk_) :: itemp(:) 
     integer(psb_ipk_), intent(out)                    :: info
-    interface 
-      subroutine symbmm (n, m, l, ia, ja, diaga, &
-           & ib, jb, diagb, ic, jc, diagc, index)
-        import :: psb_ipk_
-        integer(psb_ipk_) :: n,m,l,  ia(*), ja(*), diaga, ib(*), jb(*), diagb,&
-             & diagc,  index(*)
-        integer(psb_ipk_), allocatable :: ic(:),jc(:)
-      end subroutine symbmm
-    end interface
     integer(psb_ipk_) :: nze, ma,na,mb,nb
 
     info = psb_success_

base/serial/psb_ssymbmm.f90

@@ -153,15 +153,6 @@ contains
     type(psb_s_csr_sparse_mat), intent(out) :: c
     integer(psb_ipk_) :: itemp(:) 
     integer(psb_ipk_), intent(out)                    :: info
-    interface 
-      subroutine symbmm (n, m, l, ia, ja, diaga, &
-           & ib, jb, diagb, ic, jc, diagc, index)
-        import :: psb_ipk_
-        integer(psb_ipk_) :: n,m,l,  ia(*), ja(*), diaga, ib(*), jb(*), diagb,&
-             & diagc,  index(*)
-        integer(psb_ipk_), allocatable :: ic(:),jc(:)
-      end subroutine symbmm
-    end interface
     integer(psb_ipk_) :: nze, ma,na,mb,nb
 
     info = psb_success_

base/serial/psb_zsymbmm.f90

@@ -153,15 +153,6 @@ contains
     type(psb_z_csr_sparse_mat), intent(out) :: c
     integer(psb_ipk_) :: itemp(:) 
     integer(psb_ipk_), intent(out)                    :: info
-    interface 
-      subroutine symbmm (n, m, l, ia, ja, diaga, &
-           & ib, jb, diagb, ic, jc, diagc, index)
-        import :: psb_ipk_
-        integer(psb_ipk_) :: n,m,l,  ia(*), ja(*), diaga, ib(*), jb(*), diagb,&
-             & diagc,  index(*)
-        integer(psb_ipk_), allocatable :: ic(:),jc(:)
-      end subroutine symbmm
-    end interface
     integer(psb_ipk_) :: nze, ma,na,mb,nb
 
     info = psb_success_

test/fileread/psb_cf_sample.f90

@@ -267,7 +267,9 @@ program psb_cf_sample
     write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
     write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A           : ",a)')&
+    write(psb_out_unit,'("Storage format for A              : ",a)')&
+         &  a%get_fmt()
+    write(psb_out_unit,'("Storage format for DESC_A         : ",a)')&
          &  desc_a%get_fmt()
   end if
 

test/fileread/psb_df_sample.f90

@@ -269,7 +269,9 @@ program psb_df_sample
     write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
     write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A           : ",a)')&
+    write(psb_out_unit,'("Storage format for A              : ",a)')&
+         &  a%get_fmt()
+    write(psb_out_unit,'("Storage format for DESC_A         : ",a)')&
          &  desc_a%get_fmt()
   end if
 

test/fileread/psb_sf_sample.f90

@@ -269,7 +269,9 @@ program psb_sf_sample
     write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
     write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A           : ",a)')&
+    write(psb_out_unit,'("Storage format for A              : ",a)')&
+         &  a%get_fmt()
+    write(psb_out_unit,'("Storage format for DESC_A         : ",a)')&
          &  desc_a%get_fmt()
   end if
 

test/fileread/psb_zf_sample.f90

@@ -267,7 +267,9 @@ program psb_zf_sample
     write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
     write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A           : ",a)')&
+    write(psb_out_unit,'("Storage format for A              : ",a)')&
+         &  a%get_fmt()
+    write(psb_out_unit,'("Storage format for DESC_A         : ",a)')&
          &  desc_a%get_fmt()
   end if
 

test/pargen/psb_d_pde2d.f90

@@ -604,10 +604,11 @@ program psb_d_pde2d
     write(psb_out_unit,'("Number of iterations          : ",i0)')iter
     write(psb_out_unit,'("Convergence indicator on exit : ",es12.5)')err
     write(psb_out_unit,'("Info  on exit                 : ",i0)')info
-    write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
-    write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize    
+    write(psb_out_unit,'("Total memory occupation for      A: ",i12)')amatsize
+    write(psb_out_unit,'("Total memory occupation for   PREC: ",i12)')precsize    
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A: ",a)') desc_a%get_fmt()
+    write(psb_out_unit,'("Storage format for               A: ",a)') a%get_fmt()
+    write(psb_out_unit,'("Storage format for          DESC_A: ",a)') desc_a%get_fmt()
   end if
 
 

test/pargen/psb_d_pde3d.f90

@@ -632,10 +632,11 @@ program psb_d_pde3d
     write(psb_out_unit,'("Number of iterations          : ",i0)')iter
     write(psb_out_unit,'("Convergence indicator on exit : ",es12.5)')err
     write(psb_out_unit,'("Info  on exit                 : ",i0)')info
-    write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
-    write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize    
+    write(psb_out_unit,'("Total memory occupation for      A: ",i12)')amatsize
+    write(psb_out_unit,'("Total memory occupation for   PREC: ",i12)')precsize    
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A: ",a)') desc_a%get_fmt()
+    write(psb_out_unit,'("Storage format for               A: ",a)') a%get_fmt()
+    write(psb_out_unit,'("Storage format for          DESC_A: ",a)') desc_a%get_fmt()
   end if
 
 

test/pargen/psb_s_pde2d.f90

@@ -604,10 +604,11 @@ program psb_s_pde2d
     write(psb_out_unit,'("Number of iterations          : ",i0)')iter
     write(psb_out_unit,'("Convergence indicator on exit : ",es12.5)')err
     write(psb_out_unit,'("Info  on exit                 : ",i0)')info
-    write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
-    write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize    
+    write(psb_out_unit,'("Total memory occupation for      A: ",i12)')amatsize
+    write(psb_out_unit,'("Total memory occupation for   PREC: ",i12)')precsize    
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A: ",a)') desc_a%get_fmt()
+    write(psb_out_unit,'("Storage format for               A: ",a)') a%get_fmt()
+    write(psb_out_unit,'("Storage format for          DESC_A: ",a)') desc_a%get_fmt()
   end if
 
 

test/pargen/psb_s_pde3d.f90

@@ -632,10 +632,11 @@ program psb_s_pde3d
     write(psb_out_unit,'("Number of iterations          : ",i0)')iter
     write(psb_out_unit,'("Convergence indicator on exit : ",es12.5)')err
     write(psb_out_unit,'("Info  on exit                 : ",i0)')info
-    write(psb_out_unit,'("Total memory occupation for A:      ",i12)')amatsize
-    write(psb_out_unit,'("Total memory occupation for PREC:   ",i12)')precsize    
+    write(psb_out_unit,'("Total memory occupation for      A: ",i12)')amatsize
+    write(psb_out_unit,'("Total memory occupation for   PREC: ",i12)')precsize    
     write(psb_out_unit,'("Total memory occupation for DESC_A: ",i12)')descsize
-    write(psb_out_unit,'("Storage type for DESC_A: ",a)') desc_a%get_fmt()
+    write(psb_out_unit,'("Storage format for               A: ",a)') a%get_fmt()
+    write(psb_out_unit,'("Storage format for          DESC_A: ",a)') desc_a%get_fmt()
   end if