diff --git a/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90 index 37529504..22bc1cc3 100644 --- a/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90 +++ b/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90 @@ -178,8 +178,9 @@ subroutine mld_c_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if ( res < sm%tol*resdenum ) then + if( (sm%printres).and.(mod(sm%printiter,sm%checkiter)/=0) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if @@ -269,8 +270,9 @@ subroutine mld_c_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if (res < sm%tol*resdenum ) then + if( (sm%printres).and.( mod(sm%printiter,sm%checkiter) /=0 ) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if diff --git a/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90 index a50ff90d..e9740f40 100644 --- a/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90 +++ b/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90 @@ -178,8 +178,9 @@ subroutine mld_d_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if ( res < sm%tol*resdenum ) then + if( (sm%printres).and.(mod(sm%printiter,sm%checkiter)/=0) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if @@ -269,8 +270,9 @@ subroutine mld_d_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if (res < sm%tol*resdenum ) then + if( (sm%printres).and.( mod(sm%printiter,sm%checkiter) /=0 ) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if diff --git a/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90 index 3da8b8b3..3d864606 100644 --- a/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90 +++ b/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90 @@ -178,8 +178,9 @@ subroutine mld_s_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if ( res < sm%tol*resdenum ) then + if( (sm%printres).and.(mod(sm%printiter,sm%checkiter)/=0) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if @@ -269,8 +270,9 @@ subroutine mld_s_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if (res < sm%tol*resdenum ) then + if( (sm%printres).and.( mod(sm%printiter,sm%checkiter) /=0 ) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if diff --git a/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90 index 68d9eb7d..cd957f41 100644 --- a/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90 +++ b/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90 @@ -178,8 +178,9 @@ subroutine mld_z_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if ( res < sm%tol*resdenum ) then + if( (sm%printres).and.(mod(sm%printiter,sm%checkiter)/=0) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if @@ -269,8 +270,9 @@ subroutine mld_z_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,& if( sm%printres ) then call log_conv("BJAC",me,i,sm%printiter,res,resdenum,sm%tol) end if - if (res/resdenum < sm%tol) then - if( sm%printres ) call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) + if (res < sm%tol*resdenum ) then + if( (sm%printres).and.( mod(sm%printiter,sm%checkiter) /=0 ) ) & + & call log_conv("BJAC",me,i,1,res,resdenum,sm%tol) exit end if end if