From b704d50df1dfec55c48a0479ade748cfed8b797f Mon Sep 17 00:00:00 2001 From: sfilippone Date: Wed, 30 Oct 2024 10:49:05 +0100 Subject: [PATCH] Fix dump of TPROL and POLY smoother --- amgprec/impl/level/amg_c_base_onelev_dump.f90 | 6 ++---- amgprec/impl/level/amg_d_base_onelev_dump.f90 | 6 ++---- amgprec/impl/level/amg_s_base_onelev_dump.f90 | 6 ++---- amgprec/impl/level/amg_z_base_onelev_dump.f90 | 6 ++---- amgprec/impl/smoother/amg_d_poly_smoother_dmp.f90 | 4 +--- amgprec/impl/smoother/amg_s_poly_smoother_dmp.f90 | 4 +--- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/amgprec/impl/level/amg_c_base_onelev_dump.f90 b/amgprec/impl/level/amg_c_base_onelev_dump.f90 index 14b4c9b6..60e43280 100644 --- a/amgprec/impl/level/amg_c_base_onelev_dump.f90 +++ b/amgprec/impl/level/amg_c_base_onelev_dump.f90 @@ -127,8 +127,7 @@ subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head,ivr=ivr) + call lv%tprol%print(fname,head=head,ivr=ivr) end if end if else @@ -151,8 +150,7 @@ subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& if (tprol_) then write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head) + call lv%tprol%print(fname,head=head) end if end if end if diff --git a/amgprec/impl/level/amg_d_base_onelev_dump.f90 b/amgprec/impl/level/amg_d_base_onelev_dump.f90 index c1013d41..0b3e15f6 100644 --- a/amgprec/impl/level/amg_d_base_onelev_dump.f90 +++ b/amgprec/impl/level/amg_d_base_onelev_dump.f90 @@ -127,8 +127,7 @@ subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head,ivr=ivr) + call lv%tprol%print(fname,head=head,ivr=ivr) end if end if else @@ -151,8 +150,7 @@ subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& if (tprol_) then write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head) + call lv%tprol%print(fname,head=head) end if end if end if diff --git a/amgprec/impl/level/amg_s_base_onelev_dump.f90 b/amgprec/impl/level/amg_s_base_onelev_dump.f90 index d30c0bf7..6fb3454e 100644 --- a/amgprec/impl/level/amg_s_base_onelev_dump.f90 +++ b/amgprec/impl/level/amg_s_base_onelev_dump.f90 @@ -127,8 +127,7 @@ subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head,ivr=ivr) + call lv%tprol%print(fname,head=head,ivr=ivr) end if end if else @@ -151,8 +150,7 @@ subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& if (tprol_) then write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head) + call lv%tprol%print(fname,head=head) end if end if end if diff --git a/amgprec/impl/level/amg_z_base_onelev_dump.f90 b/amgprec/impl/level/amg_z_base_onelev_dump.f90 index 5d0b8f27..49e8eb98 100644 --- a/amgprec/impl/level/amg_z_base_onelev_dump.f90 +++ b/amgprec/impl/level/amg_z_base_onelev_dump.f90 @@ -127,8 +127,7 @@ subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head,ivr=ivr) + call lv%tprol%print(fname,head=head,ivr=ivr) end if end if else @@ -151,8 +150,7 @@ subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,& if (tprol_) then write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' ! - ! This is not implemented yet. - !call lv%tprol%print(fname,head=head) + call lv%tprol%print(fname,head=head) end if end if end if diff --git a/amgprec/impl/smoother/amg_d_poly_smoother_dmp.f90 b/amgprec/impl/smoother/amg_d_poly_smoother_dmp.f90 index 19144f07..296ce7e6 100644 --- a/amgprec/impl/smoother/amg_d_poly_smoother_dmp.f90 +++ b/amgprec/impl/smoother/amg_d_poly_smoother_dmp.f90 @@ -77,11 +77,9 @@ subroutine amg_d_poly_smoother_dmp(sm,desc,level,info,prefix,head,smoother,solve end if lname = len_trim(prefix_) fname = trim(prefix_) - write(fname(lname+1:lname+5),'(a,i3.3)') '_poly',iam + write(fname(lname+1:lname+8),'(a,i3.3)') '_poly',iam lname = lname + 8 ! to be completed - - ! At base level do nothing for the smoother if (allocated(sm%sv)) & diff --git a/amgprec/impl/smoother/amg_s_poly_smoother_dmp.f90 b/amgprec/impl/smoother/amg_s_poly_smoother_dmp.f90 index f6fa2f8a..da16b187 100644 --- a/amgprec/impl/smoother/amg_s_poly_smoother_dmp.f90 +++ b/amgprec/impl/smoother/amg_s_poly_smoother_dmp.f90 @@ -77,11 +77,9 @@ subroutine amg_s_poly_smoother_dmp(sm,desc,level,info,prefix,head,smoother,solve end if lname = len_trim(prefix_) fname = trim(prefix_) - write(fname(lname+1:lname+5),'(a,i3.3)') '_poly',iam + write(fname(lname+1:lname+8),'(a,i3.3)') '_poly',iam lname = lname + 8 ! to be completed - - ! At base level do nothing for the smoother if (allocated(sm%sv)) &