From a72690f9c3184ec182c675488db81baa93993f75 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 9 Jun 2020 11:56:33 +0200 Subject: [PATCH] Fix jac%pa handling --- mlprec/impl/smoother/mld_c_jac_smoother_bld.f90 | 2 +- mlprec/impl/smoother/mld_c_l1_jac_smoother_bld.f90 | 3 +-- mlprec/impl/smoother/mld_d_jac_smoother_bld.f90 | 2 +- mlprec/impl/smoother/mld_d_l1_jac_smoother_bld.f90 | 3 +-- mlprec/impl/smoother/mld_s_jac_smoother_bld.f90 | 2 +- mlprec/impl/smoother/mld_s_l1_jac_smoother_bld.f90 | 3 +-- mlprec/impl/smoother/mld_z_jac_smoother_bld.f90 | 2 +- mlprec/impl/smoother/mld_z_l1_jac_smoother_bld.f90 | 3 +-- 8 files changed, 8 insertions(+), 12 deletions(-) diff --git a/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90 index 81c1feb8..e7089ae4 100644 --- a/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90 @@ -76,7 +76,7 @@ subroutine mld_c_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) select type (smsv => sm%sv) class is (mld_c_diag_solver_type) call sm%nd%free() - sm%nd_nnz_tot = nztota + sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot) call sm%sv%build(a,desc_a,info,amold=amold,vmold=vmold) diff --git a/mlprec/impl/smoother/mld_c_l1_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_c_l1_jac_smoother_bld.f90 index 2c27b0e7..63fb6231 100644 --- a/mlprec/impl/smoother/mld_c_l1_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_c_l1_jac_smoother_bld.f90 @@ -72,12 +72,11 @@ subroutine mld_c_l1_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) nrow_a = a%get_nrows() nztota = a%get_nzeros() - if( sm%checkres ) sm%pa => a + sm%pa => a select type (smsv => sm%sv) class is (mld_c_diag_solver_type) call sm%nd%free() - sm%pa => a sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot) diff --git a/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90 index b84396a6..7c68beb1 100644 --- a/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90 @@ -76,7 +76,7 @@ subroutine mld_d_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) select type (smsv => sm%sv) class is (mld_d_diag_solver_type) call sm%nd%free() - sm%nd_nnz_tot = nztota + sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot) call sm%sv%build(a,desc_a,info,amold=amold,vmold=vmold) diff --git a/mlprec/impl/smoother/mld_d_l1_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_d_l1_jac_smoother_bld.f90 index efa5932c..eaca790d 100644 --- a/mlprec/impl/smoother/mld_d_l1_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_d_l1_jac_smoother_bld.f90 @@ -72,12 +72,11 @@ subroutine mld_d_l1_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) nrow_a = a%get_nrows() nztota = a%get_nzeros() - if( sm%checkres ) sm%pa => a + sm%pa => a select type (smsv => sm%sv) class is (mld_d_diag_solver_type) call sm%nd%free() - sm%pa => a sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot) diff --git a/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90 index deedaaa6..d25d68c8 100644 --- a/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90 @@ -76,7 +76,7 @@ subroutine mld_s_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) select type (smsv => sm%sv) class is (mld_s_diag_solver_type) call sm%nd%free() - sm%nd_nnz_tot = nztota + sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot) call sm%sv%build(a,desc_a,info,amold=amold,vmold=vmold) diff --git a/mlprec/impl/smoother/mld_s_l1_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_s_l1_jac_smoother_bld.f90 index 116a01e1..dc5290fd 100644 --- a/mlprec/impl/smoother/mld_s_l1_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_s_l1_jac_smoother_bld.f90 @@ -72,12 +72,11 @@ subroutine mld_s_l1_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) nrow_a = a%get_nrows() nztota = a%get_nzeros() - if( sm%checkres ) sm%pa => a + sm%pa => a select type (smsv => sm%sv) class is (mld_s_diag_solver_type) call sm%nd%free() - sm%pa => a sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot) diff --git a/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90 index b52b7b62..fc8d5f68 100644 --- a/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90 @@ -76,7 +76,7 @@ subroutine mld_z_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) select type (smsv => sm%sv) class is (mld_z_diag_solver_type) call sm%nd%free() - sm%nd_nnz_tot = nztota + sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot) call sm%sv%build(a,desc_a,info,amold=amold,vmold=vmold) diff --git a/mlprec/impl/smoother/mld_z_l1_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_z_l1_jac_smoother_bld.f90 index 9a467f9e..0b4fea6c 100644 --- a/mlprec/impl/smoother/mld_z_l1_jac_smoother_bld.f90 +++ b/mlprec/impl/smoother/mld_z_l1_jac_smoother_bld.f90 @@ -72,12 +72,11 @@ subroutine mld_z_l1_jac_smoother_bld(a,desc_a,sm,info,amold,vmold,imold) nrow_a = a%get_nrows() nztota = a%get_nzeros() - if( sm%checkres ) sm%pa => a + sm%pa => a select type (smsv => sm%sv) class is (mld_z_diag_solver_type) call sm%nd%free() - sm%pa => a sm%nd_nnz_tot = nztota call psb_sum(ictxt,sm%nd_nnz_tot)