Fixed base smoother descr.

mlprec/impl/smoother/mld_c_base_smoother_descr.f90

@@ -39,6 +39,7 @@ subroutine mld_c_base_smoother_descr(sm,info,iout,coarse)
   
   use psb_base_mod
   use mld_c_base_smoother_mod, mld_protect_name =>  mld_c_base_smoother_descr
+  use mld_c_id_solver
   Implicit None
 
   ! Arguments
@@ -69,16 +70,28 @@ subroutine mld_c_base_smoother_descr(sm,info,iout,coarse)
     iout_ = psb_out_unit
   end if
 
-  if (.not.coarse_) &
+  if (coarse_) then 
-       &  write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+    if (allocated(sm%sv)) call sm%sv%descr(info,iout,coarse)
-  if (allocated(sm%sv)) then 
+  else
-    call sm%sv%descr(info,iout,coarse)
+    if (allocated(sm%sv)) then
-    if (info /= psb_success_) then 
+      select type (sv => sm%sv) 
-      info = psb_err_from_subroutine_ 
+      class is (mld_c_id_solver_type)
-      call psb_errpush(info,name,a_err='Local solver')
+        write(iout_,*) 'No preconditioner/smoother'
-      goto 9999
+      class default
+        write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+        call sm%sv%descr(info,iout,coarse)
+      end select
+    else
+      write(iout_,*) 'No preconditioner/smoother'
     end if
   end if
+  
+  if (info /= psb_success_) then 
+    info = psb_err_from_subroutine_ 
+    call psb_errpush(info,name,a_err='Local solver')
+    goto 9999
+  end if
+  
   call psb_erractionrestore(err_act)
   return
 

mlprec/impl/smoother/mld_d_base_smoother_descr.f90

@@ -39,6 +39,7 @@ subroutine mld_d_base_smoother_descr(sm,info,iout,coarse)
   
   use psb_base_mod
   use mld_d_base_smoother_mod, mld_protect_name =>  mld_d_base_smoother_descr
+  use mld_d_id_solver
   Implicit None
 
   ! Arguments
@@ -69,16 +70,28 @@ subroutine mld_d_base_smoother_descr(sm,info,iout,coarse)
     iout_ = psb_out_unit
   end if
 
-  if (.not.coarse_) &
+  if (coarse_) then 
-       &  write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+    if (allocated(sm%sv)) call sm%sv%descr(info,iout,coarse)
-  if (allocated(sm%sv)) then 
+  else
-    call sm%sv%descr(info,iout,coarse)
+    if (allocated(sm%sv)) then
-    if (info /= psb_success_) then 
+      select type (sv => sm%sv) 
-      info = psb_err_from_subroutine_ 
+      class is (mld_d_id_solver_type)
-      call psb_errpush(info,name,a_err='Local solver')
+        write(iout_,*) 'No preconditioner/smoother'
-      goto 9999
+      class default
+        write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+        call sm%sv%descr(info,iout,coarse)
+      end select
+    else
+      write(iout_,*) 'No preconditioner/smoother'
     end if
   end if
+  
+  if (info /= psb_success_) then 
+    info = psb_err_from_subroutine_ 
+    call psb_errpush(info,name,a_err='Local solver')
+    goto 9999
+  end if
+  
   call psb_erractionrestore(err_act)
   return
 

mlprec/impl/smoother/mld_s_base_smoother_descr.f90

@@ -39,6 +39,7 @@ subroutine mld_s_base_smoother_descr(sm,info,iout,coarse)
   
   use psb_base_mod
   use mld_s_base_smoother_mod, mld_protect_name =>  mld_s_base_smoother_descr
+  use mld_s_id_solver
   Implicit None
 
   ! Arguments
@@ -69,16 +70,28 @@ subroutine mld_s_base_smoother_descr(sm,info,iout,coarse)
     iout_ = psb_out_unit
   end if
 
-  if (.not.coarse_) &
+  if (coarse_) then 
-       &  write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+    if (allocated(sm%sv)) call sm%sv%descr(info,iout,coarse)
-  if (allocated(sm%sv)) then 
+  else
-    call sm%sv%descr(info,iout,coarse)
+    if (allocated(sm%sv)) then
-    if (info /= psb_success_) then 
+      select type (sv => sm%sv) 
-      info = psb_err_from_subroutine_ 
+      class is (mld_s_id_solver_type)
-      call psb_errpush(info,name,a_err='Local solver')
+        write(iout_,*) 'No preconditioner/smoother'
-      goto 9999
+      class default
+        write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+        call sm%sv%descr(info,iout,coarse)
+      end select
+    else
+      write(iout_,*) 'No preconditioner/smoother'
     end if
   end if
+  
+  if (info /= psb_success_) then 
+    info = psb_err_from_subroutine_ 
+    call psb_errpush(info,name,a_err='Local solver')
+    goto 9999
+  end if
+  
   call psb_erractionrestore(err_act)
   return
 

mlprec/impl/smoother/mld_z_base_smoother_descr.f90

@@ -39,6 +39,7 @@ subroutine mld_z_base_smoother_descr(sm,info,iout,coarse)
   
   use psb_base_mod
   use mld_z_base_smoother_mod, mld_protect_name =>  mld_z_base_smoother_descr
+  use mld_z_id_solver
   Implicit None
 
   ! Arguments
@@ -69,16 +70,28 @@ subroutine mld_z_base_smoother_descr(sm,info,iout,coarse)
     iout_ = psb_out_unit
   end if
 
-  if (.not.coarse_) &
+  if (coarse_) then 
-       &  write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+    if (allocated(sm%sv)) call sm%sv%descr(info,iout,coarse)
-  if (allocated(sm%sv)) then 
+  else
-    call sm%sv%descr(info,iout,coarse)
+    if (allocated(sm%sv)) then
-    if (info /= psb_success_) then 
+      select type (sv => sm%sv) 
-      info = psb_err_from_subroutine_ 
+      class is (mld_z_id_solver_type)
-      call psb_errpush(info,name,a_err='Local solver')
+        write(iout_,*) 'No preconditioner/smoother'
-      goto 9999
+      class default
+        write(iout_,*) 'Decoupled preconditioner/smoother with local solver'
+        call sm%sv%descr(info,iout,coarse)
+      end select
+    else
+      write(iout_,*) 'No preconditioner/smoother'
     end if
   end if
+  
+  if (info /= psb_success_) then 
+    info = psb_err_from_subroutine_ 
+    call psb_errpush(info,name,a_err='Local solver')
+    goto 9999
+  end if
+  
   call psb_erractionrestore(err_act)
   return