psblas3:

Makefile
 psb_base_mod.f90
 psb_c_mat_mod.f03
 psb_c_tools_mod.f90
 psb_d_mat_mod.f03
 psb_psblas_mod.f90
 psb_s_mat_mod.f03
 psb_sparse_mod.f90
 psb_z_mat_mod.f03
 psb_z_tools_mod.f90
 psi_mod.f90

Renamed psb_base_mod into psb_sparse_mod.
Workaround for ICE in XLF: ONLY on USEing psb_X_csY_mat_mod.

base/modules/Makefile

@@ -19,8 +19,8 @@ UTIL_MODS = psb_string_mod.o \
 
 MODULES=$(BASIC_MODS) $(UTIL_MODS)
 
-LIBMOD=psb_base_mod$(.mod)
-OBJS = error.o psb_base_mod.o $(EXTRA_COBJS) cutil.o
+LIBMOD=psb_sparse_mod$(.mod)
+OBJS = error.o psb_sparse_mod.o $(EXTRA_COBJS) cutil.o
 LIBDIR=..
 CINCLUDES=-I. 
 FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG).
@@ -67,7 +67,7 @@ psb_psblas_mod.o: psb_mat_mod.o psb_desc_type.o
 psb_gps_mod.o:	psb_realloc_mod.o
 psb_hash_mod.o: psb_const_mod.o psb_realloc_mod.o
 
-psb_base_mod.o: $(MODULES)
+psb_sparse_mod.o: $(MODULES)
 
 newmods: $(BASIC_MODS)
 	(cd ../newserial; make lib LIBNAME=$(LIBNAME))

base/modules/psb_c_mat_mod.f03

@@ -1,8 +1,8 @@
 module psb_c_mat_mod
 
   use psb_c_base_mat_mod
-  use psb_c_csr_mat_mod
-  use psb_c_csc_mat_mod
+  use psb_c_csr_mat_mod, only : psb_c_csr_sparse_mat
+  use psb_c_csc_mat_mod, only : psb_c_csc_sparse_mat
 
   type :: psb_c_sparse_mat
 

base/modules/psb_c_tools_mod.f90

@@ -38,14 +38,14 @@ Module psb_c_tools_mod
       implicit none
       complex(psb_spk_), allocatable, intent(out)    :: x(:,:)
       type(psb_desc_type), intent(in) :: desc_a
-      integer                         :: info
+      integer, intent(out)            :: info
       integer, optional, intent(in)   :: n, lb
     end subroutine psb_calloc
     subroutine psb_callocv(x, desc_a,info,n)
       use psb_descriptor_type
       complex(psb_spk_), allocatable, intent(out)    :: x(:)
       type(psb_desc_type), intent(in) :: desc_a
-      integer                         :: info
+      integer, intent(out)            :: info
       integer, optional, intent(in)   :: n
     end subroutine psb_callocv
   end interface

base/modules/psb_d_mat_mod.f03

@@ -1,8 +1,8 @@
 module psb_d_mat_mod
 
   use psb_d_base_mat_mod
-  use psb_d_csr_mat_mod
-  use psb_d_csc_mat_mod
+  use psb_d_csr_mat_mod, only : psb_d_csr_sparse_mat
+  use psb_d_csc_mat_mod, only : psb_d_csc_sparse_mat
 
   type :: psb_d_sparse_mat
 

base/modules/psb_psblas_mod.f90

@@ -170,9 +170,9 @@ module psb_psblas_mod
       real(psb_spk_), intent (in)       ::  x(:,:)
       real(psb_spk_), intent (inout)    ::  y(:,:)
       real(psb_spk_), intent (in)       ::  alpha, beta
-      type(psb_desc_type), intent (in)    :: desc_a
-      integer, optional :: n, jx, jy
-      integer, intent(out)                :: info
+      type(psb_desc_type), intent (in)  :: desc_a
+      integer, optional, intent(in)     :: n, jx, jy
+      integer, intent(out)              :: info
     end subroutine psb_saxpby
     subroutine psb_daxpbyv(alpha, x, beta, y,&
          & desc_a, info)
@@ -190,7 +190,7 @@ module psb_psblas_mod
       real(psb_dpk_), intent (inout)    ::  y(:,:)
       real(psb_dpk_), intent (in)       ::  alpha, beta
       type(psb_desc_type), intent (in)    :: desc_a
-      integer, optional :: n, jx, jy
+      integer, optional, intent(in)     :: n, jx, jy
       integer, intent(out)                :: info
     end subroutine psb_daxpby
     subroutine psb_caxpbyv(alpha, x, beta, y,&
@@ -209,7 +209,7 @@ module psb_psblas_mod
       complex(psb_spk_), intent (inout)    ::  y(:,:)
       complex(psb_spk_), intent (in)       ::  alpha, beta
       type(psb_desc_type), intent (in)    :: desc_a
-      integer, optional :: n, jx, jy
+      integer, optional, intent(in) :: n, jx, jy
       integer, intent(out)                :: info
     end subroutine psb_caxpby
     subroutine psb_zaxpbyv(alpha, x, beta, y,&
@@ -228,7 +228,7 @@ module psb_psblas_mod
       complex(psb_dpk_), intent (inout)    ::  y(:,:)
       complex(psb_dpk_), intent (in)       ::  alpha, beta
       type(psb_desc_type), intent (in)    :: desc_a
-      integer, optional :: n, jx, jy
+      integer, optional, intent(in) :: n, jx, jy
       integer, intent(out)                :: info
     end subroutine psb_zaxpby
   end interface
@@ -310,7 +310,7 @@ module psb_psblas_mod
       real(psb_spk_), intent (in)       :: x(:,:)
       type(psb_desc_type), intent (in)    :: desc_a
       integer, intent(out)                :: info
-      integer, optional                   :: jx
+      integer, optional, intent(in)       :: jx
     end subroutine psb_smamaxs
     subroutine  psb_damaxvs(res,x,desc_a,info)
       use psb_descriptor_type
@@ -325,7 +325,7 @@ module psb_psblas_mod
       real(psb_dpk_), intent (in)       :: x(:,:)
       type(psb_desc_type), intent (in)    :: desc_a
       integer, intent(out)                :: info
-      integer, optional                   :: jx
+      integer, optional, intent(in)       :: jx
     end subroutine psb_dmamaxs
     subroutine  psb_camaxvs(res,x,desc_a,info)
       use psb_descriptor_type
@@ -336,26 +336,26 @@ module psb_psblas_mod
     end subroutine psb_camaxvs
     subroutine  psb_cmamaxs(res,x,desc_a,info,jx)
       use psb_descriptor_type
-      real(psb_spk_), intent (out)      :: res(:)
-      complex(psb_spk_), intent (in)       :: x(:,:)
+      real(psb_spk_), intent (out)        :: res(:)
+      complex(psb_spk_), intent (in)      :: x(:,:)
       type(psb_desc_type), intent (in)    :: desc_a
       integer, intent(out)                :: info
-      integer, optional                   :: jx
+      integer, optional, intent(in)       :: jx
     end subroutine psb_cmamaxs
     subroutine  psb_zamaxvs(res,x,desc_a,info)
       use psb_descriptor_type
       real(psb_dpk_), intent (out)      :: res
-      complex(psb_dpk_), intent (in)       :: x(:)
-      type(psb_desc_type), intent (in) :: desc_a
-      integer, intent(out)               :: info
+      complex(psb_dpk_), intent (in)    :: x(:)
+      type(psb_desc_type), intent (in)  :: desc_a
+      integer, intent(out)              :: info
     end subroutine psb_zamaxvs
     subroutine  psb_zmamaxs(res,x,desc_a,info,jx)
       use psb_descriptor_type
-      real(psb_dpk_), intent (out)      :: res(:)
-      complex(psb_dpk_), intent (in)       :: x(:,:)
-      type(psb_desc_type), intent (in)    :: desc_a
-      integer, intent(out)                :: info
-      integer, optional                   :: jx
+      real(psb_dpk_), intent (out)       :: res(:)
+      complex(psb_dpk_), intent (in)     :: x(:,:)
+      type(psb_desc_type), intent (in)   :: desc_a
+      integer, intent(out)               :: info
+      integer, optional, intent(in)      :: jx
     end subroutine psb_zmamaxs
   end interface
 
@@ -758,7 +758,8 @@ module psb_psblas_mod
       character, optional, intent(in)      :: trans, scale
       integer, optional, intent(in)        :: n, jx, jy
       integer, optional, intent(in)        :: choice
-      real(psb_spk_), optional, intent(in),target :: work(:), diag(:)
+      real(psb_spk_), optional, intent(in),target :: diag(:)
+      real(psb_spk_), optional, intent(inout),target :: work(:)
       integer, intent(out)               :: info
     end subroutine psb_sspsm
     subroutine psb_sspsv(alpha, t, x, beta, y,&
@@ -774,7 +775,8 @@ module psb_psblas_mod
       type(psb_desc_type), intent(in)      :: desc_a
       character, optional, intent(in)      :: trans, scale
       integer, optional, intent(in)        :: choice
-      real(psb_spk_), optional, intent(in),target :: work(:), diag(:)
+      real(psb_spk_), optional, intent(in), target :: diag(:)
+      real(psb_spk_), optional, intent(inout), target :: work(:)
       integer, intent(out)                   :: info
     end subroutine psb_sspsv
     subroutine psb_dspsm(alpha, t, x, beta, y,&
@@ -791,7 +793,8 @@ module psb_psblas_mod
       character, optional, intent(in)      :: trans, scale
       integer, optional, intent(in)        :: n, jx, jy
       integer, optional, intent(in)        :: choice
-      real(psb_dpk_), optional, intent(in),target :: work(:), diag(:)
+      real(psb_dpk_), optional, intent(in), target :: diag(:)
+      real(psb_dpk_), optional, intent(inout), target :: work(:)
       integer, intent(out)               :: info
     end subroutine psb_dspsm
     subroutine psb_dspsv(alpha, t, x, beta, y,&
@@ -807,7 +810,8 @@ module psb_psblas_mod
       type(psb_desc_type), intent(in)        :: desc_a
       character, optional, intent(in)        :: trans, scale
       integer, optional, intent(in)          :: choice
-      real(psb_dpk_), optional, intent(in),target :: work(:), diag(:)
+      real(psb_dpk_), optional, intent(in), target :: diag(:)
+      real(psb_dpk_), optional, intent(inout), target :: work(:)
       integer, intent(out)                   :: info
     end subroutine psb_dspsv
     subroutine psb_cspsm(alpha, t, x, beta, y,&
@@ -824,7 +828,8 @@ module psb_psblas_mod
       character, optional, intent(in)        :: trans, scale
       integer, optional, intent(in)          :: n, jx, jy
       integer, optional, intent(in)          :: choice
-      complex(psb_spk_), optional, intent(in),target :: work(:), diag(:)
+      complex(psb_spk_), optional, intent(in), target :: diag(:)
+      complex(psb_spk_), optional, intent(inout), target :: work(:)
       integer, intent(out)               :: info
     end subroutine psb_cspsm
     subroutine psb_cspsv(alpha, t, x, beta, y,&
@@ -840,7 +845,8 @@ module psb_psblas_mod
       type(psb_desc_type), intent(in)        :: desc_a
       character, optional, intent(in)        :: trans, scale
       integer, optional, intent(in)          :: choice
-      complex(psb_spk_), optional, intent(in),target :: work(:), diag(:)
+      complex(psb_spk_), optional, intent(in), target :: diag(:)
+      complex(psb_spk_), optional, intent(inout), target :: work(:)
       integer, intent(out)                   :: info
     end subroutine psb_cspsv
     subroutine psb_zspsm(alpha, t, x, beta, y,&
@@ -857,7 +863,8 @@ module psb_psblas_mod
       character, optional, intent(in)        :: trans, scale
       integer, optional, intent(in)          :: n, jx, jy
       integer, optional, intent(in)          :: choice
-      complex(psb_dpk_), optional, intent(in),target :: work(:), diag(:)
+      complex(psb_dpk_), optional, intent(in), target :: diag(:)
+      complex(psb_dpk_), optional, intent(inout), target :: work(:)
       integer, intent(out)               :: info
     end subroutine psb_zspsm
     subroutine psb_zspsv(alpha, t, x, beta, y,&
@@ -873,7 +880,8 @@ module psb_psblas_mod
       type(psb_desc_type), intent(in)        :: desc_a
       character, optional, intent(in)        :: trans, scale
       integer, optional, intent(in)          :: choice
-      complex(psb_dpk_), optional, intent(in),target :: work(:), diag(:)
+      complex(psb_dpk_), optional, intent(in), target :: diag(:)
+      complex(psb_dpk_), optional, intent(inout), target :: work(:)
       integer, intent(out)                   :: info
     end subroutine psb_zspsv
   end interface

base/modules/psb_s_mat_mod.f03

@@ -1,8 +1,8 @@
 module psb_s_mat_mod
 
   use psb_s_base_mat_mod
-  use psb_s_csr_mat_mod
-  use psb_s_csc_mat_mod
+  use psb_s_csr_mat_mod, only : psb_s_csr_sparse_mat
+  use psb_s_csc_mat_mod, only : psb_s_csc_sparse_mat
 
   type :: psb_s_sparse_mat
 

base/modules/psb_sparse_mod.f90

@@ -29,7 +29,7 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-module psb_base_mod
+module psb_sparse_mod
   use psb_string_mod
   use psb_error_mod
   use psb_penv_mod
@@ -42,4 +42,4 @@ module psb_base_mod
   use psb_psblas_mod
   use psb_gps_mod
   use psb_tools_mod
-end module psb_base_mod
+end module psb_sparse_mod

base/modules/psb_z_mat_mod.f03

@@ -1,8 +1,8 @@
 module psb_z_mat_mod
 
   use psb_z_base_mat_mod
-  use psb_z_csr_mat_mod
-  use psb_z_csc_mat_mod
+  use psb_z_csr_mat_mod, only : psb_z_csr_sparse_mat
+  use psb_z_csc_mat_mod, only : psb_z_csc_sparse_mat
 
   type :: psb_z_sparse_mat
 

base/modules/psb_z_tools_mod.f90

@@ -37,14 +37,14 @@ Module psb_z_tools_mod
       implicit none
       complex(psb_dpk_), allocatable, intent(out)    :: x(:,:)
       type(psb_desc_type), intent(in) :: desc_a
-      integer                         :: info
+      integer, intent(out)            :: info
       integer, optional, intent(in)   :: n, lb
     end subroutine psb_zalloc
     subroutine psb_zallocv(x, desc_a,info,n)
       use psb_descriptor_type
       complex(psb_dpk_), allocatable, intent(out)    :: x(:)
       type(psb_desc_type), intent(in) :: desc_a
-      integer                         :: info
+      integer, intent(out)            :: info
       integer, optional, intent(in)   :: n
     end subroutine psb_zallocv
   end interface

base/modules/psi_mod.f90

@@ -473,14 +473,6 @@ module psi_mod
     end subroutine psi_ldsc_pre_halo
   end interface
 
-!!$  interface psi_bld_hash
-!!$    subroutine psi_bld_hash(desc,info)
-!!$      use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_
-!!$      type(psb_desc_type), intent(inout) :: desc
-!!$      integer, intent(out) :: info
-!!$    end subroutine psi_bld_hash
-!!$  end interface
-
   interface psi_bld_g2lmap
     subroutine psi_bld_g2lmap(desc,info)
       use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_