Final fixes for compilation with INTEL

base/modules/serial/psb_c_mat_mod.F90

@@ -78,6 +78,8 @@
 !
 module psb_c_mat_mod
 
+  use psb_c_vect_mod
+  use psb_i_vect_mod
   use psb_c_base_mat_mod
   use psb_c_csr_mat_mod,  only : psb_c_csr_sparse_mat, psb_lc_csr_sparse_mat,&
        & psb_c_ecsr_sparse_mat
@@ -661,9 +663,8 @@ module psb_c_mat_mod
 
   interface
     subroutine psb_c_csput_v(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
-      use psb_c_vect_mod, only : psb_c_vect_type
-      use psb_i_vect_mod, only : psb_i_vect_type
-      import :: psb_ipk_, psb_lpk_, psb_cspmat_type
+      import :: psb_ipk_, psb_lpk_, psb_cspmat_type, &
+           & psb_c_vect_type, psb_i_vect_type
       class(psb_cspmat_type), intent(inout) :: a
       type(psb_c_vect_type), intent(inout)  :: val
       type(psb_i_vect_type), intent(inout)  :: ia, ja

base/modules/serial/psb_c_serial_mod.f90

@@ -98,6 +98,16 @@ module psb_c_serial_mod
     end subroutine psb_cbase_numbmm
   end interface psb_numbmm
 
+  interface psb_aplusat
+    subroutine psb_caplusat(ain,aout,info)
+      use psb_c_mat_mod, only : psb_cspmat_type
+      import :: psb_ipk_
+      implicit none
+      type(psb_cspmat_type) :: ain, aout
+      integer(psb_ipk_) :: info
+    end subroutine psb_caplusat
+  end interface 
+
   interface psb_rwextd
     subroutine psb_crwextd(nr,a,info,b,rowscale)
       use psb_c_mat_mod, only : psb_cspmat_type

base/modules/serial/psb_d_mat_mod.F90

@@ -78,6 +78,8 @@
 !
 module psb_d_mat_mod
 
+  use psb_d_vect_mod
+  use psb_i_vect_mod
   use psb_d_base_mat_mod
   use psb_d_csr_mat_mod,  only : psb_d_csr_sparse_mat, psb_ld_csr_sparse_mat,&
        & psb_d_ecsr_sparse_mat
@@ -661,9 +663,8 @@ module psb_d_mat_mod
 
   interface
     subroutine psb_d_csput_v(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
-      use psb_d_vect_mod, only : psb_d_vect_type
-      use psb_i_vect_mod, only : psb_i_vect_type
-      import :: psb_ipk_, psb_lpk_, psb_dspmat_type
+      import :: psb_ipk_, psb_lpk_, psb_dspmat_type, &
+           & psb_d_vect_type, psb_i_vect_type
       class(psb_dspmat_type), intent(inout) :: a
       type(psb_d_vect_type), intent(inout)  :: val
       type(psb_i_vect_type), intent(inout)  :: ia, ja

base/modules/serial/psb_d_serial_mod.f90

@@ -98,6 +98,16 @@ module psb_d_serial_mod
     end subroutine psb_dbase_numbmm
   end interface psb_numbmm
 
+  interface psb_aplusat
+    subroutine psb_daplusat(ain,aout,info)
+      use psb_d_mat_mod, only : psb_dspmat_type
+      import :: psb_ipk_
+      implicit none
+      type(psb_dspmat_type) :: ain, aout
+      integer(psb_ipk_) :: info
+    end subroutine psb_daplusat
+  end interface 
+
   interface psb_rwextd
     subroutine psb_drwextd(nr,a,info,b,rowscale)
       use psb_d_mat_mod, only : psb_dspmat_type

base/modules/serial/psb_s_mat_mod.F90

@@ -78,6 +78,8 @@
 !
 module psb_s_mat_mod
 
+  use psb_s_vect_mod
+  use psb_i_vect_mod
   use psb_s_base_mat_mod
   use psb_s_csr_mat_mod,  only : psb_s_csr_sparse_mat, psb_ls_csr_sparse_mat,&
        & psb_s_ecsr_sparse_mat
@@ -661,9 +663,8 @@ module psb_s_mat_mod
 
   interface
     subroutine psb_s_csput_v(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
-      use psb_s_vect_mod, only : psb_s_vect_type
-      use psb_i_vect_mod, only : psb_i_vect_type
-      import :: psb_ipk_, psb_lpk_, psb_sspmat_type
+      import :: psb_ipk_, psb_lpk_, psb_sspmat_type, &
+           & psb_s_vect_type, psb_i_vect_type
       class(psb_sspmat_type), intent(inout) :: a
       type(psb_s_vect_type), intent(inout)  :: val
       type(psb_i_vect_type), intent(inout)  :: ia, ja

base/modules/serial/psb_s_serial_mod.f90

@@ -98,6 +98,16 @@ module psb_s_serial_mod
     end subroutine psb_sbase_numbmm
   end interface psb_numbmm
 
+  interface psb_aplusat
+    subroutine psb_saplusat(ain,aout,info)
+      use psb_s_mat_mod, only : psb_sspmat_type
+      import :: psb_ipk_
+      implicit none
+      type(psb_sspmat_type) :: ain, aout
+      integer(psb_ipk_) :: info
+    end subroutine psb_saplusat
+  end interface 
+
   interface psb_rwextd
     subroutine psb_srwextd(nr,a,info,b,rowscale)
       use psb_s_mat_mod, only : psb_sspmat_type

base/modules/serial/psb_z_mat_mod.F90

@@ -78,6 +78,8 @@
 !
 module psb_z_mat_mod
 
+  use psb_z_vect_mod
+  use psb_i_vect_mod
   use psb_z_base_mat_mod
   use psb_z_csr_mat_mod,  only : psb_z_csr_sparse_mat, psb_lz_csr_sparse_mat,&
        & psb_z_ecsr_sparse_mat
@@ -661,9 +663,8 @@ module psb_z_mat_mod
 
   interface
     subroutine psb_z_csput_v(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
-      use psb_z_vect_mod, only : psb_z_vect_type
-      use psb_i_vect_mod, only : psb_i_vect_type
-      import :: psb_ipk_, psb_lpk_, psb_zspmat_type
+      import :: psb_ipk_, psb_lpk_, psb_zspmat_type, &
+           & psb_z_vect_type, psb_i_vect_type
       class(psb_zspmat_type), intent(inout) :: a
       type(psb_z_vect_type), intent(inout)  :: val
       type(psb_i_vect_type), intent(inout)  :: ia, ja

base/modules/serial/psb_z_serial_mod.f90

@@ -98,6 +98,16 @@ module psb_z_serial_mod
     end subroutine psb_zbase_numbmm
   end interface psb_numbmm
 
+  interface psb_aplusat
+    subroutine psb_zaplusat(ain,aout,info)
+      use psb_z_mat_mod, only : psb_zspmat_type
+      import :: psb_ipk_
+      implicit none
+      type(psb_zspmat_type) :: ain, aout
+      integer(psb_ipk_) :: info
+    end subroutine psb_zaplusat
+  end interface 
+
   interface psb_rwextd
     subroutine psb_zrwextd(nr,a,info,b,rowscale)
       use psb_z_mat_mod, only : psb_zspmat_type