Merge branch 'master' of https://github.com/sfilippone/mld2p4-2

7 years ago · c758ee13ba
parent d2ebac6a77 4c70174c9f
commit c758ee13ba
4 changed files with 8 additions and 4 deletions
--- a/mlprec/impl/smoother/mld_c_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_apply_vect.f90
@ -126,7 +126,8 @@ subroutine mld_c_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
    !
    call psb_geasb(tx,sm%desc_data,info,mold=x%v,scratch=.true.) 
    call psb_geasb(ty,sm%desc_data,info,mold=x%v,scratch=.true.) 
-    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.) 
+    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.)
+    ! Need to zero tx because of the apply_restr call.
    call tx%zero()
    !
    !  Unroll  the first iteration and fold it inside SELECT CASE
--- a/mlprec/impl/smoother/mld_d_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_apply_vect.f90
@ -126,7 +126,8 @@ subroutine mld_d_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
    !
    call psb_geasb(tx,sm%desc_data,info,mold=x%v,scratch=.true.) 
    call psb_geasb(ty,sm%desc_data,info,mold=x%v,scratch=.true.) 
-    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.) 
+    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.)
+    ! Need to zero tx because of the apply_restr call.
    call tx%zero()
    !
    !  Unroll  the first iteration and fold it inside SELECT CASE
--- a/mlprec/impl/smoother/mld_s_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_apply_vect.f90
@ -126,7 +126,8 @@ subroutine mld_s_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
    !
    call psb_geasb(tx,sm%desc_data,info,mold=x%v,scratch=.true.) 
    call psb_geasb(ty,sm%desc_data,info,mold=x%v,scratch=.true.) 
-    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.) 
+    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.)
+    ! Need to zero tx because of the apply_restr call.
    call tx%zero()
    !
    !  Unroll  the first iteration and fold it inside SELECT CASE
--- a/mlprec/impl/smoother/mld_z_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_apply_vect.f90
@ -126,7 +126,8 @@ subroutine mld_z_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
    !
    call psb_geasb(tx,sm%desc_data,info,mold=x%v,scratch=.true.) 
    call psb_geasb(ty,sm%desc_data,info,mold=x%v,scratch=.true.) 
-    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.) 
+    call psb_geasb(ww,sm%desc_data,info,mold=x%v,scratch=.true.)
+    ! Need to zero tx because of the apply_restr call.
    call tx%zero()
    !
    !  Unroll  the first iteration and fold it inside SELECT CASE