From 257fd0d00adc2dd6ed84b65b5a115d941bdbbb2c Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@uniroma2.it>
Date: Thu, 9 Jul 2020 11:23:53 +0200
Subject: [PATCH 1/2] Fix matrix assembly for REPL case.

---
 mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 | 4 ++--
 mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 | 4 ++--
 mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 | 4 ++--
 mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90
index 01d6e6e2..a98771e3 100644
--- a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90
+++ b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90
@@ -143,15 +143,15 @@ subroutine  mld_c_dec_aggregator_mat_asb(ag,parms,a,desc_a,&
     call op_prol%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_ncols(i_nr)
     call op_prol%mv_from(tmpcoo)
 
     call op_restr%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_nrows(i_nr)
     call op_restr%mv_from(tmpcoo)
 
-    call op_prol%set_ncols(i_nr)
-    call op_restr%set_nrows(i_nr)
 
     call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
          & dupl=psb_dupl_add_,keeploc=.false.)
diff --git a/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90
index 00ae22b0..61c2a1c3 100644
--- a/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90
+++ b/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90
@@ -143,15 +143,15 @@ subroutine  mld_d_dec_aggregator_mat_asb(ag,parms,a,desc_a,&
     call op_prol%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_ncols(i_nr)
     call op_prol%mv_from(tmpcoo)
 
     call op_restr%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_nrows(i_nr)
     call op_restr%mv_from(tmpcoo)
 
-    call op_prol%set_ncols(i_nr)
-    call op_restr%set_nrows(i_nr)
 
     call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
          & dupl=psb_dupl_add_,keeploc=.false.)
diff --git a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90
index 74bba297..8a7dab3e 100644
--- a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90
+++ b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90
@@ -143,15 +143,15 @@ subroutine  mld_s_dec_aggregator_mat_asb(ag,parms,a,desc_a,&
     call op_prol%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_ncols(i_nr)
     call op_prol%mv_from(tmpcoo)
 
     call op_restr%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_nrows(i_nr)
     call op_restr%mv_from(tmpcoo)
 
-    call op_prol%set_ncols(i_nr)
-    call op_restr%set_nrows(i_nr)
 
     call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
          & dupl=psb_dupl_add_,keeploc=.false.)
diff --git a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90
index d0c50884..133fe8a0 100644
--- a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90
+++ b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90
@@ -143,15 +143,15 @@ subroutine  mld_z_dec_aggregator_mat_asb(ag,parms,a,desc_a,&
     call op_prol%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_ncols(i_nr)
     call op_prol%mv_from(tmpcoo)
 
     call op_restr%mv_to(tmpcoo)
     nzl = tmpcoo%get_nzeros()
     call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I')
+    call tmpcoo%set_nrows(i_nr)
     call op_restr%mv_from(tmpcoo)
 
-    call op_prol%set_ncols(i_nr)
-    call op_restr%set_nrows(i_nr)
 
     call psb_gather(tmp_ac,ac,desc_ac,info,root=-ione,&
          & dupl=psb_dupl_add_,keeploc=.false.)

From 8e0f2c1ecdd5ee3d5c8675bc269d4f293caf9753 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@uniroma2.it>
Date: Thu, 16 Jul 2020 11:24:47 +0200
Subject: [PATCH 2/2] Silence warnings in PTAP when not necessary

---
 mlprec/impl/aggregator/mld_c_ptap.f90 | 20 ++++++++++----------
 mlprec/impl/aggregator/mld_d_ptap.f90 | 20 ++++++++++----------
 mlprec/impl/aggregator/mld_s_ptap.f90 | 20 ++++++++++----------
 mlprec/impl/aggregator/mld_z_ptap.f90 | 20 ++++++++++----------
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/mlprec/impl/aggregator/mld_c_ptap.f90 b/mlprec/impl/aggregator/mld_c_ptap.f90
index 97706e40..bc008cb8 100644
--- a/mlprec/impl/aggregator/mld_c_ptap.f90
+++ b/mlprec/impl/aggregator/mld_c_ptap.f90
@@ -125,11 +125,11 @@ subroutine mld_c_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_c_coo_glob_transpose(coo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call coo_restr%set_nrows(desc_ac%get_local_rows())
       call coo_restr%set_ncols(desc_ax%get_local_cols())
-!!$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-!!$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
     end block
     call csr_restr%cp_from_coo(coo_restr,info)
 
@@ -341,11 +341,11 @@ subroutine mld_c_lc_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_c_coo_glob_transpose(icoo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call icoo_restr%set_nrows(desc_ac%get_local_rows())
       call icoo_restr%set_ncols(desc_ax%get_local_cols())
-      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
       call coo_restr%cp_from_icoo(icoo_restr,info)
     end block
     call csr_restr%cp_from_lcoo(coo_restr,info)
diff --git a/mlprec/impl/aggregator/mld_d_ptap.f90 b/mlprec/impl/aggregator/mld_d_ptap.f90
index 5b3d5e91..e10fa86c 100644
--- a/mlprec/impl/aggregator/mld_d_ptap.f90
+++ b/mlprec/impl/aggregator/mld_d_ptap.f90
@@ -125,11 +125,11 @@ subroutine mld_d_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_d_coo_glob_transpose(coo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call coo_restr%set_nrows(desc_ac%get_local_rows())
       call coo_restr%set_ncols(desc_ax%get_local_cols())
-!!$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-!!$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
     end block
     call csr_restr%cp_from_coo(coo_restr,info)
 
@@ -341,11 +341,11 @@ subroutine mld_d_ld_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_d_coo_glob_transpose(icoo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call icoo_restr%set_nrows(desc_ac%get_local_rows())
       call icoo_restr%set_ncols(desc_ax%get_local_cols())
-      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
       call coo_restr%cp_from_icoo(icoo_restr,info)
     end block
     call csr_restr%cp_from_lcoo(coo_restr,info)
diff --git a/mlprec/impl/aggregator/mld_s_ptap.f90 b/mlprec/impl/aggregator/mld_s_ptap.f90
index e100274e..c18dbc51 100644
--- a/mlprec/impl/aggregator/mld_s_ptap.f90
+++ b/mlprec/impl/aggregator/mld_s_ptap.f90
@@ -125,11 +125,11 @@ subroutine mld_s_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_s_coo_glob_transpose(coo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call coo_restr%set_nrows(desc_ac%get_local_rows())
       call coo_restr%set_ncols(desc_ax%get_local_cols())
-!!$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-!!$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
     end block
     call csr_restr%cp_from_coo(coo_restr,info)
 
@@ -341,11 +341,11 @@ subroutine mld_s_ls_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_s_coo_glob_transpose(icoo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call icoo_restr%set_nrows(desc_ac%get_local_rows())
       call icoo_restr%set_ncols(desc_ax%get_local_cols())
-      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
       call coo_restr%cp_from_icoo(icoo_restr,info)
     end block
     call csr_restr%cp_from_lcoo(coo_restr,info)
diff --git a/mlprec/impl/aggregator/mld_z_ptap.f90 b/mlprec/impl/aggregator/mld_z_ptap.f90
index 7d4fdf34..41dd1aca 100644
--- a/mlprec/impl/aggregator/mld_z_ptap.f90
+++ b/mlprec/impl/aggregator/mld_z_ptap.f90
@@ -125,11 +125,11 @@ subroutine mld_z_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_z_coo_glob_transpose(coo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call coo_restr%set_nrows(desc_ac%get_local_rows())
       call coo_restr%set_ncols(desc_ax%get_local_cols())
-!!$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-!!$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),coo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
     end block
     call csr_restr%cp_from_coo(coo_restr,info)
 
@@ -341,11 +341,11 @@ subroutine mld_z_lz_ptap(a_csr,desc_a,nlaggr,parms,ac,&
       call psb_z_coo_glob_transpose(icoo_restr,desc_a,info,desc_c=desc_ac,desc_rx=desc_ax)
       call icoo_restr%set_nrows(desc_ac%get_local_rows())
       call icoo_restr%set_ncols(desc_ax%get_local_cols())
-      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
-           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
-      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
-        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
-      end if
+! !$      write(0,*) me,' ',trim(name),' check on glob_transpose 1: ',&
+! !$           & desc_a%get_local_cols(),desc_ax%get_local_cols(),icoo_restr%get_nzeros()
+! !$      if (desc_a%get_local_cols()<desc_ax%get_local_cols()) then
+! !$        write(0,*) me,' ',trim(name),' WARNING: GLOB_TRANSPOSE NEW INDICES '
+! !$      end if
       call coo_restr%cp_from_icoo(icoo_restr,info)
     end block
     call csr_restr%cp_from_lcoo(coo_restr,info)