From 485a94765bfc8c99f046481df362dd2a89c3910b Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@uniroma2.it>
Date: Thu, 19 May 2022 11:53:38 +0200
Subject: [PATCH] First round of fixes for precdescr

---
 amgprec/amg_base_prec_type.F90 | 30 +++++++++++++++++++++++++-----
 amgprec/amg_c_krm_solver.f90   |  8 +-------
 amgprec/amg_d_krm_solver.f90   |  8 +-------
 amgprec/amg_s_krm_solver.f90   |  8 +-------
 amgprec/amg_z_krm_solver.f90   |  8 +-------
 5 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/amgprec/amg_base_prec_type.F90 b/amgprec/amg_base_prec_type.F90
index d96cdccb..0fa19671 100644
--- a/amgprec/amg_base_prec_type.F90
+++ b/amgprec/amg_base_prec_type.F90
@@ -735,25 +735,45 @@ contains
          & matrix_names(pm%coarse_mat)
     select case(pm%coarse_solve)
     case (amg_bjac_,amg_as_)
-      write(iout,*) '  Number of sweeps : ',&
-           & pm%sweeps_pre
       write(iout,*) '  Coarse solver: ',&
            & 'Block Jacobi'
-    case (amg_l1_bjac_)
       write(iout,*) '  Number of sweeps : ',&
            & pm%sweeps_pre
+    case (amg_l1_bjac_)
       write(iout,*) '  Coarse solver: ',&
            & 'L1-Block Jacobi'
-    case (amg_jac_)
       write(iout,*) '  Number of sweeps : ',&
            & pm%sweeps_pre
+    case (amg_jac_)
       write(iout,*) '  Coarse solver: ',&
            & 'Point Jacobi'
+      write(iout,*) '  Number of sweeps : ',&
+           & pm%sweeps_pre
+    case (amg_l1_jac_)
+      write(iout,*) '  Coarse solver: ',&
+           & 'L1-Jacobi'
+      write(iout,*) '  Number of sweeps : ',&
+           & pm%sweeps_pre
+    case (amg_l1_fbgs_)
+      write(iout,*) '  Coarse solver: ',&
+           & 'L1 Forward-Backward Gauss-Seidel (Hybrid)'
+      write(iout,*) '  Number of sweeps : ',&
+           & pm%sweeps_pre
+    case (amg_l1_gs_)
+      write(iout,*) '  Coarse solver: ',&
+           & 'L1 Gauss-Seidel (Hybrid)'
+      write(iout,*) '  Number of sweeps : ',&
+           & pm%sweeps_pre
+    case (amg_fbgs_)
+      write(iout,*) '  Coarse solver: ',&
+           & 'Forward-Backward Gauss-Seidel (Hybrid)'
+      write(iout,*) '  Number of sweeps : ',&
+           & pm%sweeps_pre
     case default
       write(iout,*) '  Coarse solver: ',&
            & amg_fact_names(pm%coarse_solve)
     end select
-
+    
   end subroutine ml_parms_coarsedescr
 
   subroutine s_ml_parms_descr(pm,iout,info,coarse)
diff --git a/amgprec/amg_c_krm_solver.f90 b/amgprec/amg_c_krm_solver.f90
index 30473dbf..01c9f236 100644
--- a/amgprec/amg_c_krm_solver.f90
+++ b/amgprec/amg_c_krm_solver.f90
@@ -466,15 +466,9 @@ contains
     end if
     write(iout_,*) '    method: ',sv%method
     write(iout_,*) '     kprec: ',sv%kprec
-    if (sv%i_sub_solve > 0) then
-      write(iout_,*) ' sub_solve: ',amg_fact_names(sv%i_sub_solve)
-    else
-      write(iout_,*) ' sub_solve: ',sv%sub_solve
-    end if
+    call sv%prec%descr(iout_,info)
     write(iout_,*) '     itmax: ',sv%itmax
     write(iout_,*) '       eps: ',sv%eps
-    write(iout_,*) '    fillin: ',sv%fillin
-
 
     call psb_erractionrestore(err_act)
     return
diff --git a/amgprec/amg_d_krm_solver.f90 b/amgprec/amg_d_krm_solver.f90
index 0e76e97c..3be9df09 100644
--- a/amgprec/amg_d_krm_solver.f90
+++ b/amgprec/amg_d_krm_solver.f90
@@ -466,15 +466,9 @@ contains
     end if
     write(iout_,*) '    method: ',sv%method
     write(iout_,*) '     kprec: ',sv%kprec
-    if (sv%i_sub_solve > 0) then
-      write(iout_,*) ' sub_solve: ',amg_fact_names(sv%i_sub_solve)
-    else
-      write(iout_,*) ' sub_solve: ',sv%sub_solve
-    end if
+    call sv%prec%descr(iout_,info)
     write(iout_,*) '     itmax: ',sv%itmax
     write(iout_,*) '       eps: ',sv%eps
-    write(iout_,*) '    fillin: ',sv%fillin
-
 
     call psb_erractionrestore(err_act)
     return
diff --git a/amgprec/amg_s_krm_solver.f90 b/amgprec/amg_s_krm_solver.f90
index 06ab0649..a289476e 100644
--- a/amgprec/amg_s_krm_solver.f90
+++ b/amgprec/amg_s_krm_solver.f90
@@ -466,15 +466,9 @@ contains
     end if
     write(iout_,*) '    method: ',sv%method
     write(iout_,*) '     kprec: ',sv%kprec
-    if (sv%i_sub_solve > 0) then
-      write(iout_,*) ' sub_solve: ',amg_fact_names(sv%i_sub_solve)
-    else
-      write(iout_,*) ' sub_solve: ',sv%sub_solve
-    end if
+    call sv%prec%descr(iout_,info)
     write(iout_,*) '     itmax: ',sv%itmax
     write(iout_,*) '       eps: ',sv%eps
-    write(iout_,*) '    fillin: ',sv%fillin
-
 
     call psb_erractionrestore(err_act)
     return
diff --git a/amgprec/amg_z_krm_solver.f90 b/amgprec/amg_z_krm_solver.f90
index da17dac4..d557ca41 100644
--- a/amgprec/amg_z_krm_solver.f90
+++ b/amgprec/amg_z_krm_solver.f90
@@ -466,15 +466,9 @@ contains
     end if
     write(iout_,*) '    method: ',sv%method
     write(iout_,*) '     kprec: ',sv%kprec
-    if (sv%i_sub_solve > 0) then
-      write(iout_,*) ' sub_solve: ',amg_fact_names(sv%i_sub_solve)
-    else
-      write(iout_,*) ' sub_solve: ',sv%sub_solve
-    end if
+    call sv%prec%descr(iout_,info)
     write(iout_,*) '     itmax: ',sv%itmax
     write(iout_,*) '       eps: ',sv%eps
-    write(iout_,*) '    fillin: ',sv%fillin
-
 
     call psb_erractionrestore(err_act)
     return