diff --git a/base/modules/psblas/psb_c_psblas_mod.F90 b/base/modules/psblas/psb_c_psblas_mod.F90 index b4f1fe28..98deebd8 100644 --- a/base/modules/psblas/psb_c_psblas_mod.F90 +++ b/base/modules/psblas/psb_c_psblas_mod.F90 @@ -296,7 +296,7 @@ module psb_c_psblas_mod integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global end function psb_cnrm2_vect - function psb_cnrm2_weight_vect(x,w, desc_a, info,global) result(res) + function psb_cnrm2_weight_vect(x,w, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_spk_, psb_ipk_, & & psb_c_vect_type, psb_cspmat_type real(psb_spk_) :: res @@ -305,8 +305,9 @@ module psb_c_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_c_vect_type), intent (inout), optional :: aux end function psb_cnrm2_weight_vect - function psb_cnrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) + function psb_cnrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_spk_, psb_ipk_, & & psb_c_vect_type, psb_cspmat_type real(psb_spk_) :: res @@ -316,6 +317,7 @@ module psb_c_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_c_vect_type), intent (inout), optional :: aux end function psb_cnrm2_weightmask_vect end interface diff --git a/base/modules/psblas/psb_d_psblas_mod.F90 b/base/modules/psblas/psb_d_psblas_mod.F90 index a7748116..e4988387 100644 --- a/base/modules/psblas/psb_d_psblas_mod.F90 +++ b/base/modules/psblas/psb_d_psblas_mod.F90 @@ -307,7 +307,7 @@ module psb_d_psblas_mod integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global end function psb_dnrm2_vect - function psb_dnrm2_weight_vect(x,w, desc_a, info,global) result(res) + function psb_dnrm2_weight_vect(x,w, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_dpk_, psb_ipk_, & & psb_d_vect_type, psb_dspmat_type real(psb_dpk_) :: res @@ -316,8 +316,9 @@ module psb_d_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_d_vect_type), intent (inout), optional :: aux end function psb_dnrm2_weight_vect - function psb_dnrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) + function psb_dnrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_dpk_, psb_ipk_, & & psb_d_vect_type, psb_dspmat_type real(psb_dpk_) :: res @@ -327,6 +328,7 @@ module psb_d_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_d_vect_type), intent (inout), optional :: aux end function psb_dnrm2_weightmask_vect end interface diff --git a/base/modules/psblas/psb_s_psblas_mod.F90 b/base/modules/psblas/psb_s_psblas_mod.F90 index 803c7328..93fe74b9 100644 --- a/base/modules/psblas/psb_s_psblas_mod.F90 +++ b/base/modules/psblas/psb_s_psblas_mod.F90 @@ -307,7 +307,7 @@ module psb_s_psblas_mod integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global end function psb_snrm2_vect - function psb_snrm2_weight_vect(x,w, desc_a, info,global) result(res) + function psb_snrm2_weight_vect(x,w, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_spk_, psb_ipk_, & & psb_s_vect_type, psb_sspmat_type real(psb_spk_) :: res @@ -316,8 +316,9 @@ module psb_s_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_s_vect_type), intent (inout), optional :: aux end function psb_snrm2_weight_vect - function psb_snrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) + function psb_snrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_spk_, psb_ipk_, & & psb_s_vect_type, psb_sspmat_type real(psb_spk_) :: res @@ -327,6 +328,7 @@ module psb_s_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_s_vect_type), intent (inout), optional :: aux end function psb_snrm2_weightmask_vect end interface diff --git a/base/modules/psblas/psb_z_psblas_mod.F90 b/base/modules/psblas/psb_z_psblas_mod.F90 index 60a373e4..06be1b82 100644 --- a/base/modules/psblas/psb_z_psblas_mod.F90 +++ b/base/modules/psblas/psb_z_psblas_mod.F90 @@ -296,7 +296,7 @@ module psb_z_psblas_mod integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global end function psb_znrm2_vect - function psb_znrm2_weight_vect(x,w, desc_a, info,global) result(res) + function psb_znrm2_weight_vect(x,w, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_dpk_, psb_ipk_, & & psb_z_vect_type, psb_zspmat_type real(psb_dpk_) :: res @@ -305,8 +305,9 @@ module psb_z_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_z_vect_type), intent (inout), optional :: aux end function psb_znrm2_weight_vect - function psb_znrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) + function psb_znrm2_weightmask_vect(x,w,idv, desc_a, info, global, aux) result(res) import :: psb_desc_type, psb_dpk_, psb_ipk_, & & psb_z_vect_type, psb_zspmat_type real(psb_dpk_) :: res @@ -316,6 +317,7 @@ module psb_z_psblas_mod type(psb_desc_type), intent (in) :: desc_a integer(psb_ipk_), intent(out) :: info logical, intent(in), optional :: global + type(psb_z_vect_type), intent (inout), optional :: aux end function psb_znrm2_weightmask_vect end interface diff --git a/base/modules/serial/psb_c_vect_mod.F90 b/base/modules/serial/psb_c_vect_mod.F90 index 0edb7245..55ea3902 100644 --- a/base/modules/serial/psb_c_vect_mod.F90 +++ b/base/modules/serial/psb_c_vect_mod.F90 @@ -1033,7 +1033,7 @@ contains ! Temp vectors type(psb_c_vect_type) :: wtemp - info = 0 + info = 0 if( allocated(w%v) ) then if (.not.present(aux)) then allocate(wtemp%v, mold=w%v) diff --git a/base/modules/serial/psb_d_vect_mod.F90 b/base/modules/serial/psb_d_vect_mod.F90 index ec928584..8712566e 100644 --- a/base/modules/serial/psb_d_vect_mod.F90 +++ b/base/modules/serial/psb_d_vect_mod.F90 @@ -1040,7 +1040,7 @@ contains ! Temp vectors type(psb_d_vect_type) :: wtemp - info = 0 + info = 0 if( allocated(w%v) ) then if (.not.present(aux)) then allocate(wtemp%v, mold=w%v) diff --git a/base/modules/serial/psb_s_vect_mod.F90 b/base/modules/serial/psb_s_vect_mod.F90 index 8f378c6d..c978dcc4 100644 --- a/base/modules/serial/psb_s_vect_mod.F90 +++ b/base/modules/serial/psb_s_vect_mod.F90 @@ -1040,7 +1040,7 @@ contains ! Temp vectors type(psb_s_vect_type) :: wtemp - info = 0 + info = 0 if( allocated(w%v) ) then if (.not.present(aux)) then allocate(wtemp%v, mold=w%v) diff --git a/base/modules/serial/psb_z_vect_mod.F90 b/base/modules/serial/psb_z_vect_mod.F90 index 60c5b6f0..67adc272 100644 --- a/base/modules/serial/psb_z_vect_mod.F90 +++ b/base/modules/serial/psb_z_vect_mod.F90 @@ -1033,7 +1033,7 @@ contains ! Temp vectors type(psb_z_vect_type) :: wtemp - info = 0 + info = 0 if( allocated(w%v) ) then if (.not.present(aux)) then allocate(wtemp%v, mold=w%v)