psblas3:

base/modules/Makefile
 base/modules/psb_d_psblas_mod.f90
 prec/psb_c_bjacprec.f90
 prec/psb_c_prec_mod.f90
 prec/psb_d_prec_mod.f90
 prec/psb_s_bjacprec.f90
 prec/psb_s_prec_mod.f90
 prec/psb_z_bjacprec.f90
 prec/psb_z_prec_mod.f90

Fixes from cross-checks with Nag compiler

base/modules/Makefile

@@ -52,11 +52,11 @@ psb_error_mod.o: psb_const_mod.o
 psb_realloc_mod.o:  psb_error_mod.o
 $(UTILS_MODS): $(BASIC_MODS)
 
-
 psi_comm_buffers_mod.o: psb_const_mod.o
 psi_penv_mod.o: psi_comm_buffers_mod.o 
 psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o: psi_penv_mod.o	
 
+
 psb_ip_reord_mod.o psi_serial_mod.o psb_sort_mod.o: $(BASIC_MODS)
 psb_base_mat_mod.o: psi_serial_mod.o
 psb_s_base_mat_mod.o psb_d_base_mat_mod.o psb_c_base_mat_mod.o psb_z_base_mat_mod.o: psb_base_mat_mod.o
@@ -132,9 +132,25 @@ psb_z_comm_mod.o: psb_z_vect_mod.o psb_desc_type.o psb_mat_mod.o
 
 psb_base_mod.o: $(MODULES)
 
+psi_penv_mod.o: psi_penv_mod.F90 $(BASIC_MODS) 
+	$(F90) -c psi_penv_mod.F90  $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT)
+
 psb_penv_mod.o: psb_penv_mod.F90 $(COMMINT) $(BASIC_MODS)
 	$(F90) -c psb_penv_mod.F90  $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT)
 
+psi_comm_buffers_mod.o: psi_comm_buffers_mod.F90 $(BASIC_MODS)
+	$(F90) -c psi_comm_buffers_mod.F90  $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT)
+
+psi_p2p_mod.o: psi_p2p_mod.F90 $(BASIC_MODS) 
+	$(F90) -c psi_p2p_mod.F90  $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT)
+
+psi_bcast_mod.o: psi_bcast_mod.F90 $(BASIC_MODS) 
+	$(F90) -c psi_bcast_mod.F90  $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT)
+
+psi_reduce_mod.o: psi_reduce_mod.F90 $(BASIC_MODS)
+	$(F90) -c psi_reduce_mod.F90  $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT)
+
+
 
 clean:
 	/bin/rm -f $(MODULES) $(OBJS) $(MPFOBJS) *$(.mod)

prec/psb_c_bjacprec.f90

@@ -286,8 +286,11 @@ contains
              & trans=trans_,scale='U',choice=psb_none_,work=aux)
         
       case('C')
+!!$        call psb_spsm(cone,prec%av(psb_u_pr_),x,czero,ww,desc_data,info,&
+!!$             & trans=trans_,scale='L',diag=conjg(prec%dv%v%v),choice=psb_none_, work=aux)
         call psb_spsm(cone,prec%av(psb_u_pr_),x,czero,ww,desc_data,info,&
-             & trans=trans_,scale='L',diag=conjg(prec%dv%v%v),choice=psb_none_, work=aux)
+            & trans=trans_,scale='L',choice=psb_none_, work=aux)
+        ww(1:n_row) = ww(1:n_row)*conjg(prec%dv%v%v(1:n_row))
         if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),ww,&
              & beta,y,desc_data,info,&
              & trans=trans_,scale='U',choice=psb_none_,work=aux)

prec/psb_c_prec_mod.f90

@@ -34,9 +34,9 @@ module psb_c_prec_mod
   use psb_c_prec_type
 
   interface psb_precbld
-    subroutine psb_cprecbld(a,desc_a,prec,info,upd,mold,afmt)
+    subroutine psb_cprecbld(a,desc_a,prec,info,upd,amold,afmt,vmold)
       use psb_base_mod, only  : psb_desc_type, psb_cspmat_type,&
-           & psb_c_base_sparse_mat, psb_spk_
+           & psb_c_base_sparse_mat, psb_spk_, psb_c_base_vect_type
       use psb_prec_type, only : psb_cprec_type
       implicit none
       type(psb_cspmat_type), intent(in), target  :: a
@@ -45,7 +45,8 @@ module psb_c_prec_mod
       integer, intent(out)                       :: info
       character, intent(in),optional             :: upd
       character(len=*), intent(in), optional     :: afmt
-      class(psb_c_base_sparse_mat), intent(in), optional :: mold
+      class(psb_c_base_sparse_mat), intent(in), optional :: amold
+      class(psb_c_base_vect_type), intent(in), optional  :: vmold
     end subroutine psb_cprecbld
   end interface
 

prec/psb_d_prec_mod.f90

@@ -34,9 +34,9 @@ module psb_d_prec_mod
   use psb_d_prec_type
 
   interface psb_precbld
-    subroutine psb_dprecbld(a,desc_a,prec,info,upd,mold,afmt)
+    subroutine psb_dprecbld(a,desc_a,prec,info,upd,amold,afmt,vmold)
       use psb_base_mod, only  : psb_desc_type, psb_dspmat_type,&
-           & psb_d_base_sparse_mat, psb_dpk_
+           & psb_d_base_sparse_mat, psb_dpk_, psb_d_base_vect_type
       use psb_prec_type, only : psb_dprec_type
       implicit none
       type(psb_dspmat_type), intent(in), target  :: a
@@ -45,7 +45,8 @@ module psb_d_prec_mod
       integer, intent(out)                       :: info
       character, intent(in),optional             :: upd
       character(len=*), intent(in), optional     :: afmt
-      class(psb_d_base_sparse_mat), intent(in), optional :: mold
+      class(psb_d_base_sparse_mat), intent(in), optional :: amold
+      class(psb_d_base_vect_type), intent(in), optional  :: vmold
     end subroutine psb_dprecbld
   end interface
 

prec/psb_s_bjacprec.f90

@@ -143,6 +143,7 @@ contains
            & trans=trans_,scale='U',choice=psb_none_,work=aux)
         
       end select
+
       if (info /= psb_success_) then 
         ch_err="psb_spsm"
         goto 9999
@@ -278,7 +279,14 @@ contains
              & beta,y,desc_data,info,&
              & trans=trans_,scale='U',choice=psb_none_, work=aux)
         
-      case('T','C')
+      case('T')
+        call psb_spsm(sone,prec%av(psb_u_pr_),x,szero,ww,desc_data,info,&
+             & trans=trans_,scale='L',diag=prec%dv%v%v,choice=psb_none_, work=aux)
+        if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),ww,&
+             & beta,y,desc_data,info,&
+             & trans=trans_,scale='U',choice=psb_none_,work=aux)
+        
+      case('C')
         call psb_spsm(sone,prec%av(psb_u_pr_),x,szero,ww,desc_data,info,&
              & trans=trans_,scale='L',diag=prec%dv%v%v,choice=psb_none_, work=aux)
         if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),ww,&

prec/psb_s_prec_mod.f90

@@ -34,9 +34,9 @@ module psb_s_prec_mod
   use psb_s_prec_type
 
   interface psb_precbld
-    subroutine psb_sprecbld(a,desc_a,prec,info,upd,mold,afmt)
+    subroutine psb_sprecbld(a,desc_a,prec,info,upd,amold,afmt,vmold)
       use psb_base_mod, only  : psb_desc_type, psb_sspmat_type,&
-           & psb_s_base_sparse_mat, psb_spk_
+           & psb_s_base_sparse_mat, psb_spk_, psb_s_base_vect_type
       use psb_prec_type, only : psb_sprec_type
       implicit none
       type(psb_sspmat_type), intent(in), target  :: a
@@ -45,7 +45,9 @@ module psb_s_prec_mod
       integer, intent(out)                       :: info
       character, intent(in),optional             :: upd
       character(len=*), intent(in), optional     :: afmt
-      class(psb_s_base_sparse_mat), intent(in), optional :: mold
+      class(psb_s_base_sparse_mat), intent(in), optional :: amold
+      class(psb_s_base_vect_type), intent(in), optional  :: vmold
+
     end subroutine psb_sprecbld
   end interface
 

prec/psb_z_bjacprec.f90

@@ -276,8 +276,11 @@ contains
              & trans=trans_,scale='U',choice=psb_none_,work=aux)
         
       case('C')
+!!$        call psb_spsm(zone,prec%av(psb_u_pr_),x,zzero,ww,desc_data,info,&
+!!$             & trans=trans_,scale='L',diag=conjg(prec%dv%v%v),choice=psb_none_, work=aux)
         call psb_spsm(zone,prec%av(psb_u_pr_),x,zzero,ww,desc_data,info,&
-             & trans=trans_,scale='L',diag=conjg(prec%dv%v%v),choice=psb_none_, work=aux)
+             & trans=trans_,scale='L',choice=psb_none_, work=aux)
+        ww(1:n_row) = ww(1:n_row)*conjg(prec%dv%v%v(1:n_row))
         if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),ww,&
              & beta,y,desc_data,info,&
              & trans=trans_,scale='U',choice=psb_none_,work=aux)

prec/psb_z_prec_mod.f90

@@ -34,9 +34,9 @@ module psb_z_prec_mod
   use psb_z_prec_type
 
   interface psb_precbld
-    subroutine psb_zprecbld(a,desc_a,prec,info,upd,mold,afmt)
+    subroutine psb_zprecbld(a,desc_a,prec,info,upd,amold,afmt,vmold)
       use psb_base_mod, only  : psb_desc_type, psb_zspmat_type,&
-           & psb_z_base_sparse_mat, psb_dpk_
+           & psb_z_base_sparse_mat, psb_dpk_, psb_z_base_vect_type
       use psb_prec_type, only : psb_zprec_type
       implicit none
       type(psb_zspmat_type), intent(in), target  :: a
@@ -45,7 +45,8 @@ module psb_z_prec_mod
       integer, intent(out)                       :: info
       character, intent(in),optional             :: upd
       character(len=*), intent(in), optional     :: afmt
-      class(psb_z_base_sparse_mat), intent(in), optional :: mold
+      class(psb_z_base_sparse_mat), intent(in), optional :: amold
+      class(psb_z_base_vect_type), intent(in), optional  :: vmold
     end subroutine psb_zprecbld
   end interface