From 5315dd2875cd60a814164cca0ce07dc89bc82dc3 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 22 Oct 2018 11:58:53 +0100 Subject: [PATCH] Remove obsolete as_smoother%csetr. --- mlprec/impl/smoother/Makefile | 4 -- .../impl/smoother/mld_c_as_smoother_csetr.f90 | 69 ------------------- .../impl/smoother/mld_d_as_smoother_csetr.f90 | 69 ------------------- .../impl/smoother/mld_s_as_smoother_csetr.f90 | 69 ------------------- .../impl/smoother/mld_z_as_smoother_csetr.f90 | 69 ------------------- mlprec/mld_c_as_smoother.f90 | 12 ---- mlprec/mld_d_as_smoother.f90 | 12 ---- mlprec/mld_s_as_smoother.f90 | 12 ---- mlprec/mld_z_as_smoother.f90 | 12 ---- 9 files changed, 328 deletions(-) delete mode 100644 mlprec/impl/smoother/mld_c_as_smoother_csetr.f90 delete mode 100644 mlprec/impl/smoother/mld_d_as_smoother_csetr.f90 delete mode 100644 mlprec/impl/smoother/mld_s_as_smoother_csetr.f90 delete mode 100644 mlprec/impl/smoother/mld_z_as_smoother_csetr.f90 diff --git a/mlprec/impl/smoother/Makefile b/mlprec/impl/smoother/Makefile index 89dbf942..75fad885 100644 --- a/mlprec/impl/smoother/Makefile +++ b/mlprec/impl/smoother/Makefile @@ -15,7 +15,6 @@ mld_c_as_smoother_clone.o \ mld_c_as_smoother_cnv.o \ mld_c_as_smoother_csetc.o \ mld_c_as_smoother_cseti.o \ -mld_c_as_smoother_csetr.o \ mld_c_as_smoother_dmp.o \ mld_c_as_smoother_free.o \ mld_c_as_smoother_prol_a.o \ @@ -49,7 +48,6 @@ mld_d_as_smoother_clone.o \ mld_d_as_smoother_cnv.o \ mld_d_as_smoother_csetc.o \ mld_d_as_smoother_cseti.o \ -mld_d_as_smoother_csetr.o \ mld_d_as_smoother_dmp.o \ mld_d_as_smoother_free.o \ mld_d_as_smoother_prol_a.o \ @@ -83,7 +81,6 @@ mld_s_as_smoother_clone.o \ mld_s_as_smoother_cnv.o \ mld_s_as_smoother_csetc.o \ mld_s_as_smoother_cseti.o \ -mld_s_as_smoother_csetr.o \ mld_s_as_smoother_dmp.o \ mld_s_as_smoother_free.o \ mld_s_as_smoother_prol_a.o \ @@ -117,7 +114,6 @@ mld_z_as_smoother_clone.o \ mld_z_as_smoother_cnv.o \ mld_z_as_smoother_csetc.o \ mld_z_as_smoother_cseti.o \ -mld_z_as_smoother_csetr.o \ mld_z_as_smoother_dmp.o \ mld_z_as_smoother_free.o \ mld_z_as_smoother_prol_a.o \ diff --git a/mlprec/impl/smoother/mld_c_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_c_as_smoother_csetr.f90 deleted file mode 100644 index cdc2abe8..00000000 --- a/mlprec/impl/smoother/mld_c_as_smoother_csetr.f90 +++ /dev/null @@ -1,69 +0,0 @@ -! -! -! MLD2P4 version 2.2 -! MultiLevel Domain Decomposition Parallel Preconditioners Package -! based on PSBLAS (Parallel Sparse BLAS version 3.5) -! -! (C) Copyright 2008-2018 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Daniela di Serafino -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the MLD2P4 group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -! -subroutine mld_c_as_smoother_csetr(sm,what,val,info,idx) - - use psb_base_mod - use mld_c_as_smoother, mld_protect_nam => mld_c_as_smoother_csetr - Implicit None - ! Arguments - class(mld_c_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_spk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_), intent(in), optional :: idx - integer(psb_ipk_) :: err_act - character(len=20) :: name='c_as_smoother_csetr' - - call psb_erractionsave(err_act) - info = psb_success_ - - - if (allocated(sm%sv)) then - call sm%sv%set(what,val,info,idx=idx) - else -!!$ write(0,*) trim(name),' Missing component, not setting!' -!!$ info = 1121 - end if - - call psb_erractionrestore(err_act) - return - -9999 call psb_error_handler(err_act) - - return -end subroutine mld_c_as_smoother_csetr diff --git a/mlprec/impl/smoother/mld_d_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_d_as_smoother_csetr.f90 deleted file mode 100644 index 11547d4f..00000000 --- a/mlprec/impl/smoother/mld_d_as_smoother_csetr.f90 +++ /dev/null @@ -1,69 +0,0 @@ -! -! -! MLD2P4 version 2.2 -! MultiLevel Domain Decomposition Parallel Preconditioners Package -! based on PSBLAS (Parallel Sparse BLAS version 3.5) -! -! (C) Copyright 2008-2018 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Daniela di Serafino -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the MLD2P4 group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -! -subroutine mld_d_as_smoother_csetr(sm,what,val,info,idx) - - use psb_base_mod - use mld_d_as_smoother, mld_protect_nam => mld_d_as_smoother_csetr - Implicit None - ! Arguments - class(mld_d_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_dpk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_), intent(in), optional :: idx - integer(psb_ipk_) :: err_act - character(len=20) :: name='d_as_smoother_csetr' - - call psb_erractionsave(err_act) - info = psb_success_ - - - if (allocated(sm%sv)) then - call sm%sv%set(what,val,info,idx=idx) - else -!!$ write(0,*) trim(name),' Missing component, not setting!' -!!$ info = 1121 - end if - - call psb_erractionrestore(err_act) - return - -9999 call psb_error_handler(err_act) - - return -end subroutine mld_d_as_smoother_csetr diff --git a/mlprec/impl/smoother/mld_s_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_s_as_smoother_csetr.f90 deleted file mode 100644 index d0d3445a..00000000 --- a/mlprec/impl/smoother/mld_s_as_smoother_csetr.f90 +++ /dev/null @@ -1,69 +0,0 @@ -! -! -! MLD2P4 version 2.2 -! MultiLevel Domain Decomposition Parallel Preconditioners Package -! based on PSBLAS (Parallel Sparse BLAS version 3.5) -! -! (C) Copyright 2008-2018 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Daniela di Serafino -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the MLD2P4 group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -! -subroutine mld_s_as_smoother_csetr(sm,what,val,info,idx) - - use psb_base_mod - use mld_s_as_smoother, mld_protect_nam => mld_s_as_smoother_csetr - Implicit None - ! Arguments - class(mld_s_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_spk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_), intent(in), optional :: idx - integer(psb_ipk_) :: err_act - character(len=20) :: name='s_as_smoother_csetr' - - call psb_erractionsave(err_act) - info = psb_success_ - - - if (allocated(sm%sv)) then - call sm%sv%set(what,val,info,idx=idx) - else -!!$ write(0,*) trim(name),' Missing component, not setting!' -!!$ info = 1121 - end if - - call psb_erractionrestore(err_act) - return - -9999 call psb_error_handler(err_act) - - return -end subroutine mld_s_as_smoother_csetr diff --git a/mlprec/impl/smoother/mld_z_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_z_as_smoother_csetr.f90 deleted file mode 100644 index 84aa75d9..00000000 --- a/mlprec/impl/smoother/mld_z_as_smoother_csetr.f90 +++ /dev/null @@ -1,69 +0,0 @@ -! -! -! MLD2P4 version 2.2 -! MultiLevel Domain Decomposition Parallel Preconditioners Package -! based on PSBLAS (Parallel Sparse BLAS version 3.5) -! -! (C) Copyright 2008-2018 -! -! Salvatore Filippone -! Pasqua D'Ambra -! Daniela di Serafino -! -! Redistribution and use in source and binary forms, with or without -! modification, are permitted provided that the following conditions -! are met: -! 1. Redistributions of source code must retain the above copyright -! notice, this list of conditions and the following disclaimer. -! 2. Redistributions in binary form must reproduce the above copyright -! notice, this list of conditions, and the following disclaimer in the -! documentation and/or other materials provided with the distribution. -! 3. The name of the MLD2P4 group or the names of its contributors may -! not be used to endorse or promote products derived from this -! software without specific written permission. -! -! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS -! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGE. -! -! -subroutine mld_z_as_smoother_csetr(sm,what,val,info,idx) - - use psb_base_mod - use mld_z_as_smoother, mld_protect_nam => mld_z_as_smoother_csetr - Implicit None - ! Arguments - class(mld_z_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_dpk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_), intent(in), optional :: idx - integer(psb_ipk_) :: err_act - character(len=20) :: name='z_as_smoother_csetr' - - call psb_erractionsave(err_act) - info = psb_success_ - - - if (allocated(sm%sv)) then - call sm%sv%set(what,val,info,idx=idx) - else -!!$ write(0,*) trim(name),' Missing component, not setting!' -!!$ info = 1121 - end if - - call psb_erractionrestore(err_act) - return - -9999 call psb_error_handler(err_act) - - return -end subroutine mld_z_as_smoother_csetr diff --git a/mlprec/mld_c_as_smoother.f90 b/mlprec/mld_c_as_smoother.f90 index dcf26369..117a5b01 100644 --- a/mlprec/mld_c_as_smoother.f90 +++ b/mlprec/mld_c_as_smoother.f90 @@ -277,18 +277,6 @@ module mld_c_as_smoother end subroutine mld_c_as_smoother_csetc end interface - interface - subroutine mld_c_as_smoother_csetr(sm,what,val,info) - import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, & - & psb_spk_, mld_c_as_smoother_type, psb_long_int_k_, psb_desc_type, psb_ipk_ - implicit none - class(mld_c_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_spk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - end subroutine mld_c_as_smoother_csetr - end interface - interface subroutine mld_c_as_smoother_free(sm,info) import :: psb_cspmat_type, psb_c_vect_type, psb_c_base_vect_type, & diff --git a/mlprec/mld_d_as_smoother.f90 b/mlprec/mld_d_as_smoother.f90 index 44d57ea4..a5c3ce37 100644 --- a/mlprec/mld_d_as_smoother.f90 +++ b/mlprec/mld_d_as_smoother.f90 @@ -277,18 +277,6 @@ module mld_d_as_smoother end subroutine mld_d_as_smoother_csetc end interface - interface - subroutine mld_d_as_smoother_csetr(sm,what,val,info) - import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, & - & psb_dpk_, mld_d_as_smoother_type, psb_long_int_k_, psb_desc_type, psb_ipk_ - implicit none - class(mld_d_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_dpk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - end subroutine mld_d_as_smoother_csetr - end interface - interface subroutine mld_d_as_smoother_free(sm,info) import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, & diff --git a/mlprec/mld_s_as_smoother.f90 b/mlprec/mld_s_as_smoother.f90 index 0f3ec7d7..f7fb219a 100644 --- a/mlprec/mld_s_as_smoother.f90 +++ b/mlprec/mld_s_as_smoother.f90 @@ -277,18 +277,6 @@ module mld_s_as_smoother end subroutine mld_s_as_smoother_csetc end interface - interface - subroutine mld_s_as_smoother_csetr(sm,what,val,info) - import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, & - & psb_spk_, mld_s_as_smoother_type, psb_long_int_k_, psb_desc_type, psb_ipk_ - implicit none - class(mld_s_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_spk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - end subroutine mld_s_as_smoother_csetr - end interface - interface subroutine mld_s_as_smoother_free(sm,info) import :: psb_sspmat_type, psb_s_vect_type, psb_s_base_vect_type, & diff --git a/mlprec/mld_z_as_smoother.f90 b/mlprec/mld_z_as_smoother.f90 index 63de5ba3..e3433a2c 100644 --- a/mlprec/mld_z_as_smoother.f90 +++ b/mlprec/mld_z_as_smoother.f90 @@ -277,18 +277,6 @@ module mld_z_as_smoother end subroutine mld_z_as_smoother_csetc end interface - interface - subroutine mld_z_as_smoother_csetr(sm,what,val,info) - import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, & - & psb_dpk_, mld_z_as_smoother_type, psb_long_int_k_, psb_desc_type, psb_ipk_ - implicit none - class(mld_z_as_smoother_type), intent(inout) :: sm - character(len=*), intent(in) :: what - real(psb_dpk_), intent(in) :: val - integer(psb_ipk_), intent(out) :: info - end subroutine mld_z_as_smoother_csetr - end interface - interface subroutine mld_z_as_smoother_free(sm,info) import :: psb_zspmat_type, psb_z_vect_type, psb_z_base_vect_type, &