From e59932e496c96f88319826f0246dc93749271447 Mon Sep 17 00:00:00 2001 From: Cirdans-Home Date: Fri, 21 Feb 2020 14:52:12 +0100 Subject: [PATCH] chagend name to acmp for the compare routines --- base/modules/serial/psb_c_base_vect_mod.f90 | 16 +++++++-------- base/modules/serial/psb_c_vect_mod.F90 | 22 ++++++++++----------- base/modules/serial/psb_d_base_vect_mod.f90 | 16 +++++++-------- base/modules/serial/psb_d_vect_mod.F90 | 22 ++++++++++----------- base/modules/serial/psb_i_vect_mod.F90 | 2 +- base/modules/serial/psb_l_vect_mod.F90 | 2 +- base/modules/serial/psb_s_base_vect_mod.f90 | 16 +++++++-------- base/modules/serial/psb_s_vect_mod.F90 | 22 ++++++++++----------- base/modules/serial/psb_z_base_vect_mod.f90 | 16 +++++++-------- base/modules/serial/psb_z_vect_mod.F90 | 22 ++++++++++----------- base/psblas/psb_ccmp_vect.f90 | 2 +- base/psblas/psb_dcmp_vect.f90 | 2 +- base/psblas/psb_scmp_vect.f90 | 2 +- base/psblas/psb_zcmp_vect.f90 | 2 +- 14 files changed, 82 insertions(+), 82 deletions(-) diff --git a/base/modules/serial/psb_c_base_vect_mod.f90 b/base/modules/serial/psb_c_base_vect_mod.f90 index d629256a..c67aa5d2 100644 --- a/base/modules/serial/psb_c_base_vect_mod.f90 +++ b/base/modules/serial/psb_c_base_vect_mod.f90 @@ -190,9 +190,9 @@ module psb_c_base_vect_mod ! ! Comparison and mask operation ! - procedure, pass(z) :: cmp_a2 => c_base_cmp_a2 - procedure, pass(z) :: cmp_v2 => c_base_cmp_v2 - generic, public :: cmp => cmp_a2,cmp_v2 + procedure, pass(z) :: acmp_a2 => c_base_acmp_a2 + procedure, pass(z) :: acmp_v2 => c_base_acmp_v2 + generic, public :: acmp => acmp_a2,acmp_v2 end type psb_c_base_vect_type @@ -1418,7 +1418,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine c_base_cmp_a2(x,c,z,info) + subroutine c_base_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_spk_), intent(in) :: c @@ -1439,7 +1439,7 @@ contains end do info = 0 - end subroutine c_base_cmp_a2 + end subroutine c_base_acmp_a2 ! !> Function base_cmp_v2 !! \memberof psb_c_base_vect_type @@ -1449,7 +1449,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine c_base_cmp_v2(x,c,z,info) + subroutine c_base_acmp_v2(x,c,z,info) use psi_serial_mod implicit none class(psb_c_base_vect_type), intent(inout) :: x @@ -1459,8 +1459,8 @@ contains info = 0 if (x%is_dev()) call x%sync() - call z%cmp(x%v,c,info) - end subroutine c_base_cmp_v2 + call z%acmp(x%v,c,info) + end subroutine c_base_acmp_v2 ! ! Simple scaling diff --git a/base/modules/serial/psb_c_vect_mod.F90 b/base/modules/serial/psb_c_vect_mod.F90 index 393cbaa8..192d94e4 100644 --- a/base/modules/serial/psb_c_vect_mod.F90 +++ b/base/modules/serial/psb_c_vect_mod.F90 @@ -114,9 +114,9 @@ module psb_c_vect_mod generic, public :: nrm2 => nrm2std, nrm2weight, nrm2weightmask procedure, pass(x) :: amax => c_vect_amax procedure, pass(x) :: asum => c_vect_asum - procedure, pass(z) :: cmp_a2 => c_vect_cmp_a2 - procedure, pass(z) :: cmp_v2 => c_vect_cmp_v2 - generic, public :: cmp => cmp_a2, cmp_v2 + procedure, pass(z) :: acmp_a2 => c_vect_acmp_a2 + procedure, pass(z) :: acmp_v2 => c_vect_acmp_v2 + generic, public :: acmp => acmp_a2, acmp_v2 end type psb_c_vect_type @@ -144,7 +144,7 @@ module psb_c_vect_mod ! @NOTCPLXS@ ! @NOTINTS@ -! private :: c_vect_cmp_a2, c_vect_cmp_v2 +! private :: c_vect_acmp_a2, c_vect_acmp_v2 ! @NOTINTE@ ! @NOTCPLXE@ @@ -867,7 +867,7 @@ contains end subroutine c_vect_inv_a2_check - subroutine c_vect_cmp_a2(x,c,z,info) + subroutine c_vect_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_spk_), intent(in) :: c @@ -877,11 +877,11 @@ contains info = 0 if (allocated(z%v)) & - & call z%cmp(x,c,info) + & call z%acmp(x,c,info) - end subroutine c_vect_cmp_a2 + end subroutine c_vect_acmp_a2 - subroutine c_vect_cmp_v2(x,c,z,info) + subroutine c_vect_acmp_v2(x,c,z,info) use psi_serial_mod implicit none real(psb_spk_), intent(in) :: c @@ -891,9 +891,9 @@ contains info = 0 if (allocated(x%v).and.allocated(z%v)) & - & call z%v%cmp(x%v,c,info) + & call z%v%acmp(x%v,c,info) - end subroutine c_vect_cmp_v2 + end subroutine c_vect_acmp_v2 subroutine c_vect_scal(alpha, x) use psi_serial_mod @@ -964,7 +964,7 @@ contains integer(psb_ipk_) :: info if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then - call w%v%cmp(id%v,szero,info) + call w%v%acmp(id%v,szero,info) call w%v%mlt(x%v,info) res = w%v%nrm2(n) else diff --git a/base/modules/serial/psb_d_base_vect_mod.f90 b/base/modules/serial/psb_d_base_vect_mod.f90 index 69241893..a1a47500 100644 --- a/base/modules/serial/psb_d_base_vect_mod.f90 +++ b/base/modules/serial/psb_d_base_vect_mod.f90 @@ -190,9 +190,9 @@ module psb_d_base_vect_mod ! ! Comparison and mask operation ! - procedure, pass(z) :: cmp_a2 => d_base_cmp_a2 - procedure, pass(z) :: cmp_v2 => d_base_cmp_v2 - generic, public :: cmp => cmp_a2,cmp_v2 + procedure, pass(z) :: acmp_a2 => d_base_acmp_a2 + procedure, pass(z) :: acmp_v2 => d_base_acmp_v2 + generic, public :: acmp => acmp_a2,acmp_v2 end type psb_d_base_vect_type @@ -1418,7 +1418,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine d_base_cmp_a2(x,c,z,info) + subroutine d_base_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_dpk_), intent(in) :: c @@ -1439,7 +1439,7 @@ contains end do info = 0 - end subroutine d_base_cmp_a2 + end subroutine d_base_acmp_a2 ! !> Function base_cmp_v2 !! \memberof psb_d_base_vect_type @@ -1449,7 +1449,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine d_base_cmp_v2(x,c,z,info) + subroutine d_base_acmp_v2(x,c,z,info) use psi_serial_mod implicit none class(psb_d_base_vect_type), intent(inout) :: x @@ -1459,8 +1459,8 @@ contains info = 0 if (x%is_dev()) call x%sync() - call z%cmp(x%v,c,info) - end subroutine d_base_cmp_v2 + call z%acmp(x%v,c,info) + end subroutine d_base_acmp_v2 ! ! Simple scaling diff --git a/base/modules/serial/psb_d_vect_mod.F90 b/base/modules/serial/psb_d_vect_mod.F90 index d897e784..18525b25 100644 --- a/base/modules/serial/psb_d_vect_mod.F90 +++ b/base/modules/serial/psb_d_vect_mod.F90 @@ -114,9 +114,9 @@ module psb_d_vect_mod generic, public :: nrm2 => nrm2std, nrm2weight, nrm2weightmask procedure, pass(x) :: amax => d_vect_amax procedure, pass(x) :: asum => d_vect_asum - procedure, pass(z) :: cmp_a2 => d_vect_cmp_a2 - procedure, pass(z) :: cmp_v2 => d_vect_cmp_v2 - generic, public :: cmp => cmp_a2, cmp_v2 + procedure, pass(z) :: acmp_a2 => d_vect_acmp_a2 + procedure, pass(z) :: acmp_v2 => d_vect_acmp_v2 + generic, public :: acmp => acmp_a2, acmp_v2 end type psb_d_vect_type @@ -144,7 +144,7 @@ module psb_d_vect_mod ! @NOTCPLXS@ ! @NOTINTS@ -! private :: d_vect_cmp_a2, d_vect_cmp_v2 +! private :: d_vect_acmp_a2, d_vect_acmp_v2 ! @NOTINTE@ ! @NOTCPLXE@ @@ -867,7 +867,7 @@ contains end subroutine d_vect_inv_a2_check - subroutine d_vect_cmp_a2(x,c,z,info) + subroutine d_vect_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_dpk_), intent(in) :: c @@ -877,11 +877,11 @@ contains info = 0 if (allocated(z%v)) & - & call z%cmp(x,c,info) + & call z%acmp(x,c,info) - end subroutine d_vect_cmp_a2 + end subroutine d_vect_acmp_a2 - subroutine d_vect_cmp_v2(x,c,z,info) + subroutine d_vect_acmp_v2(x,c,z,info) use psi_serial_mod implicit none real(psb_dpk_), intent(in) :: c @@ -891,9 +891,9 @@ contains info = 0 if (allocated(x%v).and.allocated(z%v)) & - & call z%v%cmp(x%v,c,info) + & call z%v%acmp(x%v,c,info) - end subroutine d_vect_cmp_v2 + end subroutine d_vect_acmp_v2 subroutine d_vect_scal(alpha, x) use psi_serial_mod @@ -964,7 +964,7 @@ contains integer(psb_ipk_) :: info if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then - call w%v%cmp(id%v,dzero,info) + call w%v%acmp(id%v,dzero,info) call w%v%mlt(x%v,info) res = w%v%nrm2(n) else diff --git a/base/modules/serial/psb_i_vect_mod.F90 b/base/modules/serial/psb_i_vect_mod.F90 index ca857109..8b4a21a7 100644 --- a/base/modules/serial/psb_i_vect_mod.F90 +++ b/base/modules/serial/psb_i_vect_mod.F90 @@ -101,7 +101,7 @@ module psb_i_vect_mod ! @NOTCPLXS@ ! @NOTINTS@ -! private :: i_vect_cmp_a2, i_vect_cmp_v2 +! private :: i_vect_acmp_a2, i_vect_acmp_v2 ! @NOTINTE@ ! @NOTCPLXE@ diff --git a/base/modules/serial/psb_l_vect_mod.F90 b/base/modules/serial/psb_l_vect_mod.F90 index 3472e1d8..629c843d 100644 --- a/base/modules/serial/psb_l_vect_mod.F90 +++ b/base/modules/serial/psb_l_vect_mod.F90 @@ -102,7 +102,7 @@ module psb_l_vect_mod ! @NOTCPLXS@ ! @NOTINTS@ -! private :: l_vect_cmp_a2, l_vect_cmp_v2 +! private :: l_vect_acmp_a2, l_vect_acmp_v2 ! @NOTINTE@ ! @NOTCPLXE@ diff --git a/base/modules/serial/psb_s_base_vect_mod.f90 b/base/modules/serial/psb_s_base_vect_mod.f90 index 1c7e7162..4ce6de51 100644 --- a/base/modules/serial/psb_s_base_vect_mod.f90 +++ b/base/modules/serial/psb_s_base_vect_mod.f90 @@ -190,9 +190,9 @@ module psb_s_base_vect_mod ! ! Comparison and mask operation ! - procedure, pass(z) :: cmp_a2 => s_base_cmp_a2 - procedure, pass(z) :: cmp_v2 => s_base_cmp_v2 - generic, public :: cmp => cmp_a2,cmp_v2 + procedure, pass(z) :: acmp_a2 => s_base_acmp_a2 + procedure, pass(z) :: acmp_v2 => s_base_acmp_v2 + generic, public :: acmp => acmp_a2,acmp_v2 end type psb_s_base_vect_type @@ -1418,7 +1418,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine s_base_cmp_a2(x,c,z,info) + subroutine s_base_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_spk_), intent(in) :: c @@ -1439,7 +1439,7 @@ contains end do info = 0 - end subroutine s_base_cmp_a2 + end subroutine s_base_acmp_a2 ! !> Function base_cmp_v2 !! \memberof psb_s_base_vect_type @@ -1449,7 +1449,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine s_base_cmp_v2(x,c,z,info) + subroutine s_base_acmp_v2(x,c,z,info) use psi_serial_mod implicit none class(psb_s_base_vect_type), intent(inout) :: x @@ -1459,8 +1459,8 @@ contains info = 0 if (x%is_dev()) call x%sync() - call z%cmp(x%v,c,info) - end subroutine s_base_cmp_v2 + call z%acmp(x%v,c,info) + end subroutine s_base_acmp_v2 ! ! Simple scaling diff --git a/base/modules/serial/psb_s_vect_mod.F90 b/base/modules/serial/psb_s_vect_mod.F90 index 8ae50c7d..4e24e726 100644 --- a/base/modules/serial/psb_s_vect_mod.F90 +++ b/base/modules/serial/psb_s_vect_mod.F90 @@ -114,9 +114,9 @@ module psb_s_vect_mod generic, public :: nrm2 => nrm2std, nrm2weight, nrm2weightmask procedure, pass(x) :: amax => s_vect_amax procedure, pass(x) :: asum => s_vect_asum - procedure, pass(z) :: cmp_a2 => s_vect_cmp_a2 - procedure, pass(z) :: cmp_v2 => s_vect_cmp_v2 - generic, public :: cmp => cmp_a2, cmp_v2 + procedure, pass(z) :: acmp_a2 => s_vect_acmp_a2 + procedure, pass(z) :: acmp_v2 => s_vect_acmp_v2 + generic, public :: acmp => acmp_a2, acmp_v2 end type psb_s_vect_type @@ -144,7 +144,7 @@ module psb_s_vect_mod ! @NOTCPLXS@ ! @NOTINTS@ -! private :: s_vect_cmp_a2, s_vect_cmp_v2 +! private :: s_vect_acmp_a2, s_vect_acmp_v2 ! @NOTINTE@ ! @NOTCPLXE@ @@ -867,7 +867,7 @@ contains end subroutine s_vect_inv_a2_check - subroutine s_vect_cmp_a2(x,c,z,info) + subroutine s_vect_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_spk_), intent(in) :: c @@ -877,11 +877,11 @@ contains info = 0 if (allocated(z%v)) & - & call z%cmp(x,c,info) + & call z%acmp(x,c,info) - end subroutine s_vect_cmp_a2 + end subroutine s_vect_acmp_a2 - subroutine s_vect_cmp_v2(x,c,z,info) + subroutine s_vect_acmp_v2(x,c,z,info) use psi_serial_mod implicit none real(psb_spk_), intent(in) :: c @@ -891,9 +891,9 @@ contains info = 0 if (allocated(x%v).and.allocated(z%v)) & - & call z%v%cmp(x%v,c,info) + & call z%v%acmp(x%v,c,info) - end subroutine s_vect_cmp_v2 + end subroutine s_vect_acmp_v2 subroutine s_vect_scal(alpha, x) use psi_serial_mod @@ -964,7 +964,7 @@ contains integer(psb_ipk_) :: info if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then - call w%v%cmp(id%v,szero,info) + call w%v%acmp(id%v,szero,info) call w%v%mlt(x%v,info) res = w%v%nrm2(n) else diff --git a/base/modules/serial/psb_z_base_vect_mod.f90 b/base/modules/serial/psb_z_base_vect_mod.f90 index f885c149..c73cdd65 100644 --- a/base/modules/serial/psb_z_base_vect_mod.f90 +++ b/base/modules/serial/psb_z_base_vect_mod.f90 @@ -190,9 +190,9 @@ module psb_z_base_vect_mod ! ! Comparison and mask operation ! - procedure, pass(z) :: cmp_a2 => z_base_cmp_a2 - procedure, pass(z) :: cmp_v2 => z_base_cmp_v2 - generic, public :: cmp => cmp_a2,cmp_v2 + procedure, pass(z) :: acmp_a2 => z_base_acmp_a2 + procedure, pass(z) :: acmp_v2 => z_base_acmp_v2 + generic, public :: acmp => acmp_a2,acmp_v2 end type psb_z_base_vect_type @@ -1418,7 +1418,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine z_base_cmp_a2(x,c,z,info) + subroutine z_base_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_dpk_), intent(in) :: c @@ -1439,7 +1439,7 @@ contains end do info = 0 - end subroutine z_base_cmp_a2 + end subroutine z_base_acmp_a2 ! !> Function base_cmp_v2 !! \memberof psb_z_base_vect_type @@ -1449,7 +1449,7 @@ contains !! \param c The comparison term !! \param info return code ! - subroutine z_base_cmp_v2(x,c,z,info) + subroutine z_base_acmp_v2(x,c,z,info) use psi_serial_mod implicit none class(psb_z_base_vect_type), intent(inout) :: x @@ -1459,8 +1459,8 @@ contains info = 0 if (x%is_dev()) call x%sync() - call z%cmp(x%v,c,info) - end subroutine z_base_cmp_v2 + call z%acmp(x%v,c,info) + end subroutine z_base_acmp_v2 ! ! Simple scaling diff --git a/base/modules/serial/psb_z_vect_mod.F90 b/base/modules/serial/psb_z_vect_mod.F90 index 7358fe44..b8a6de22 100644 --- a/base/modules/serial/psb_z_vect_mod.F90 +++ b/base/modules/serial/psb_z_vect_mod.F90 @@ -114,9 +114,9 @@ module psb_z_vect_mod generic, public :: nrm2 => nrm2std, nrm2weight, nrm2weightmask procedure, pass(x) :: amax => z_vect_amax procedure, pass(x) :: asum => z_vect_asum - procedure, pass(z) :: cmp_a2 => z_vect_cmp_a2 - procedure, pass(z) :: cmp_v2 => z_vect_cmp_v2 - generic, public :: cmp => cmp_a2, cmp_v2 + procedure, pass(z) :: acmp_a2 => z_vect_acmp_a2 + procedure, pass(z) :: acmp_v2 => z_vect_acmp_v2 + generic, public :: acmp => acmp_a2, acmp_v2 end type psb_z_vect_type @@ -144,7 +144,7 @@ module psb_z_vect_mod ! @NOTCPLXS@ ! @NOTINTS@ -! private :: z_vect_cmp_a2, z_vect_cmp_v2 +! private :: z_vect_acmp_a2, z_vect_acmp_v2 ! @NOTINTE@ ! @NOTCPLXE@ @@ -867,7 +867,7 @@ contains end subroutine z_vect_inv_a2_check - subroutine z_vect_cmp_a2(x,c,z,info) + subroutine z_vect_acmp_a2(x,c,z,info) use psi_serial_mod implicit none real(psb_dpk_), intent(in) :: c @@ -877,11 +877,11 @@ contains info = 0 if (allocated(z%v)) & - & call z%cmp(x,c,info) + & call z%acmp(x,c,info) - end subroutine z_vect_cmp_a2 + end subroutine z_vect_acmp_a2 - subroutine z_vect_cmp_v2(x,c,z,info) + subroutine z_vect_acmp_v2(x,c,z,info) use psi_serial_mod implicit none real(psb_dpk_), intent(in) :: c @@ -891,9 +891,9 @@ contains info = 0 if (allocated(x%v).and.allocated(z%v)) & - & call z%v%cmp(x%v,c,info) + & call z%v%acmp(x%v,c,info) - end subroutine z_vect_cmp_v2 + end subroutine z_vect_acmp_v2 subroutine z_vect_scal(alpha, x) use psi_serial_mod @@ -964,7 +964,7 @@ contains integer(psb_ipk_) :: info if (allocated(x%v).and.allocated(w%v).and.allocated(id%v)) then - call w%v%cmp(id%v,dzero,info) + call w%v%acmp(id%v,dzero,info) call w%v%mlt(x%v,info) res = w%v%nrm2(n) else diff --git a/base/psblas/psb_ccmp_vect.f90 b/base/psblas/psb_ccmp_vect.f90 index 27d4f989..e808836f 100644 --- a/base/psblas/psb_ccmp_vect.f90 +++ b/base/psblas/psb_ccmp_vect.f90 @@ -92,7 +92,7 @@ subroutine psb_ccmp_vect(x,c,z,desc_a,info) end if if(desc_a%get_local_rows() > 0) then - call z%cmp(x,c,info) + call z%acmp(x,c,info) end if call psb_erractionrestore(err_act) diff --git a/base/psblas/psb_dcmp_vect.f90 b/base/psblas/psb_dcmp_vect.f90 index bd5ae706..85113bcd 100644 --- a/base/psblas/psb_dcmp_vect.f90 +++ b/base/psblas/psb_dcmp_vect.f90 @@ -92,7 +92,7 @@ subroutine psb_dcmp_vect(x,c,z,desc_a,info) end if if(desc_a%get_local_rows() > 0) then - call z%cmp(x,c,info) + call z%acmp(x,c,info) end if call psb_erractionrestore(err_act) diff --git a/base/psblas/psb_scmp_vect.f90 b/base/psblas/psb_scmp_vect.f90 index 7aafd9ef..73865857 100644 --- a/base/psblas/psb_scmp_vect.f90 +++ b/base/psblas/psb_scmp_vect.f90 @@ -92,7 +92,7 @@ subroutine psb_scmp_vect(x,c,z,desc_a,info) end if if(desc_a%get_local_rows() > 0) then - call z%cmp(x,c,info) + call z%acmp(x,c,info) end if call psb_erractionrestore(err_act) diff --git a/base/psblas/psb_zcmp_vect.f90 b/base/psblas/psb_zcmp_vect.f90 index fc62d528..fa820d43 100644 --- a/base/psblas/psb_zcmp_vect.f90 +++ b/base/psblas/psb_zcmp_vect.f90 @@ -92,7 +92,7 @@ subroutine psb_zcmp_vect(x,c,z,desc_a,info) end if if(desc_a%get_local_rows() > 0) then - call z%cmp(x,c,info) + call z%acmp(x,c,info) end if call psb_erractionrestore(err_act)