Merge branch 'repackage' into repack-csga

base/modules/desc/psb_desc_mod.F90

@@ -409,7 +409,7 @@ contains
     ! 
     ! Since the hashed lists take up (somewhat) more than 2*N_COL integers,
     ! it makes no sense to use them if you don't have at least 
-    ! 3 processes, no matter what the size of the process. 
+    ! 3 processes, no matter what the size of the index space. 
     !
     val = psb_cd_is_large_size(m) .and. (np > 2)
   end function psb_cd_choose_large_state

base/serial/impl/psb_c_base_mat_impl.F90

@@ -2060,6 +2060,8 @@ subroutine psb_c_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
     goto 9999
   end if
 
+  if (x%is_dev()) call x%sync()
+  if (y%is_dev()) call y%sync()
   if (present(d)) then
     call d%sync()
     if (present(scale)) then
@@ -2080,6 +2082,7 @@ subroutine psb_c_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
       if (info == psb_success_)&
            & call a%inner_spsm(alpha,tmpv,beta,y,info,trans)
 
+      call y%set_host()
       if (info == psb_success_) then
         call tmpv%free(info)
         if (info == psb_success_) deallocate(tmpv,stat=info)

base/serial/impl/psb_d_base_mat_impl.F90

@@ -2060,6 +2060,8 @@ subroutine psb_d_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
     goto 9999
   end if
 
+  if (x%is_dev()) call x%sync()
+  if (y%is_dev()) call y%sync()
   if (present(d)) then
     call d%sync()
     if (present(scale)) then
@@ -2080,6 +2082,7 @@ subroutine psb_d_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
       if (info == psb_success_)&
            & call a%inner_spsm(alpha,tmpv,beta,y,info,trans)
 
+      call y%set_host()
       if (info == psb_success_) then
         call tmpv%free(info)
         if (info == psb_success_) deallocate(tmpv,stat=info)

base/serial/impl/psb_s_base_mat_impl.F90

@@ -2060,6 +2060,8 @@ subroutine psb_s_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
     goto 9999
   end if
 
+  if (x%is_dev()) call x%sync()
+  if (y%is_dev()) call y%sync()
   if (present(d)) then
     call d%sync()
     if (present(scale)) then
@@ -2080,6 +2082,7 @@ subroutine psb_s_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
       if (info == psb_success_)&
            & call a%inner_spsm(alpha,tmpv,beta,y,info,trans)
 
+      call y%set_host()
       if (info == psb_success_) then
         call tmpv%free(info)
         if (info == psb_success_) deallocate(tmpv,stat=info)

base/serial/impl/psb_z_base_mat_impl.F90

@@ -2060,6 +2060,8 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
     goto 9999
   end if
 
+  if (x%is_dev()) call x%sync()
+  if (y%is_dev()) call y%sync()
   if (present(d)) then
     call d%sync()
     if (present(scale)) then
@@ -2080,6 +2082,7 @@ subroutine psb_z_base_vect_cssv(alpha,a,x,beta,y,info,trans,scale,d)
       if (info == psb_success_)&
            & call a%inner_spsm(alpha,tmpv,beta,y,info,trans)
 
+      call y%set_host()
       if (info == psb_success_) then
         call tmpv%free(info)
         if (info == psb_success_) deallocate(tmpv,stat=info)