From 408fe763509bec3336a2542a84ae977132482ab2 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 17 Jul 2015 15:37:40 +0000 Subject: [PATCH] psblas-3.3-maint: Changelog base/tools/psb_ccdbldext.F90 base/tools/psb_dcdbldext.F90 base/tools/psb_scdbldext.F90 base/tools/psb_zcdbldext.F90 Fix bug in cdbldext: must call indxmap%reinit. --- Changelog | 1 + base/tools/psb_ccdbldext.F90 | 5 +++-- base/tools/psb_dcdbldext.F90 | 5 +++-- base/tools/psb_scdbldext.F90 | 5 +++-- base/tools/psb_zcdbldext.F90 | 5 +++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Changelog b/Changelog index 9ce188d8..ac85f89d 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ Changelog. A lot less detailed than usual, at least for past history. +2015/07/17: Fix bug in cdbldext. 2015/04/18: Fix bug in spmv transpose case. 2015/03/28: Fix bug in transpose. 2015/03/20: Introduce some optimizations for conversions to/from. diff --git a/base/tools/psb_ccdbldext.F90 b/base/tools/psb_ccdbldext.F90 index a8898f23..ba54d5f2 100644 --- a/base/tools/psb_ccdbldext.F90 +++ b/base/tools/psb_ccdbldext.F90 @@ -177,8 +177,9 @@ Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - - call psb_cd_set_ovl_bld(desc_ov,info) + if (info == 0) call desc_ov%indxmap%reinit(info) + if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) + if (info /= 0) goto 9999 If (debug_level >= psb_debug_outer_)then Write(debug_unit,*) me,' ',trim(name),& diff --git a/base/tools/psb_dcdbldext.F90 b/base/tools/psb_dcdbldext.F90 index b1a549e0..9da792a0 100644 --- a/base/tools/psb_dcdbldext.F90 +++ b/base/tools/psb_dcdbldext.F90 @@ -177,8 +177,9 @@ Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - - call psb_cd_set_ovl_bld(desc_ov,info) + if (info == 0) call desc_ov%indxmap%reinit(info) + if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) + if (info /= 0) goto 9999 If (debug_level >= psb_debug_outer_)then Write(debug_unit,*) me,' ',trim(name),& diff --git a/base/tools/psb_scdbldext.F90 b/base/tools/psb_scdbldext.F90 index dc85bfa9..46afc061 100644 --- a/base/tools/psb_scdbldext.F90 +++ b/base/tools/psb_scdbldext.F90 @@ -177,8 +177,9 @@ Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - - call psb_cd_set_ovl_bld(desc_ov,info) + if (info == 0) call desc_ov%indxmap%reinit(info) + if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) + if (info /= 0) goto 9999 If (debug_level >= psb_debug_outer_)then Write(debug_unit,*) me,' ',trim(name),& diff --git a/base/tools/psb_zcdbldext.F90 b/base/tools/psb_zcdbldext.F90 index fb87466d..306cb512 100644 --- a/base/tools/psb_zcdbldext.F90 +++ b/base/tools/psb_zcdbldext.F90 @@ -177,8 +177,9 @@ Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) ! in a separate method. call psb_cd_switch_ovl_indxmap(desc_ov,info) end if - - call psb_cd_set_ovl_bld(desc_ov,info) + if (info == 0) call desc_ov%indxmap%reinit(info) + if (info == 0) call psb_cd_set_ovl_bld(desc_ov,info) + if (info /= 0) goto 9999 If (debug_level >= psb_debug_outer_)then Write(debug_unit,*) me,' ',trim(name),&