From 72f98f8f3afec849daffcaf9e07394e65be2f5ef Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Fri, 18 Jan 2008 16:49:02 +0000
Subject: [PATCH] MLPREC: merged bjac_aply inside as_aply, and updated
 baseprec_aply accordingly.

---
 mlprec/mld_das_aply.f90       | 11 ++++++++++-
 mlprec/mld_dbaseprec_aply.f90 | 14 +-------------
 mlprec/mld_zas_aply.f90       | 11 ++++++++++-
 mlprec/mld_zbaseprec_aply.f90 | 14 +-------------
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/mlprec/mld_das_aply.f90 b/mlprec/mld_das_aply.f90
index 62c5c4ec..651e3999 100644
--- a/mlprec/mld_das_aply.f90
+++ b/mlprec/mld_das_aply.f90
@@ -108,6 +108,15 @@ subroutine mld_das_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
 
   select case(prec%iprcparm(mld_prec_type_))
 
+  case(mld_bjac_)
+    
+    call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans_,work,info)
+    if (info /= 0) then
+      info=4010
+      ch_err='mld_bjac_aply'
+      goto 9999
+    end if
+    
   case(mld_as_)
     !
     ! Additive Schwarz preconditioner
@@ -120,7 +129,7 @@ subroutine mld_das_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
       call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans_,work,info)
       if(info /= 0) then
         info=4010
-        ch_err='psb_bjac_aply'
+        ch_err='mld_bjac_aply'
         goto 9999
       end if
 
diff --git a/mlprec/mld_dbaseprec_aply.f90 b/mlprec/mld_dbaseprec_aply.f90
index 06ceb7b7..1cb25e03 100644
--- a/mlprec/mld_dbaseprec_aply.f90
+++ b/mlprec/mld_dbaseprec_aply.f90
@@ -155,19 +155,7 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
       end if
     end if
 
-  case(mld_bjac_)
-    !
-    ! Block-Jacobi preconditioner
-    !
-
-    call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans_,work,info)
-    if(info /= 0) then
-      info=4010
-      ch_err='mld_bjac_aply'
-      goto 9999
-    end if
-
-  case(mld_as_)
+  case(mld_bjac_,mld_as_)
     !
     ! Additive Schwarz preconditioner
     !
diff --git a/mlprec/mld_zas_aply.f90 b/mlprec/mld_zas_aply.f90
index ae734c7e..7f10dcf9 100644
--- a/mlprec/mld_zas_aply.f90
+++ b/mlprec/mld_zas_aply.f90
@@ -108,6 +108,15 @@ subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
 
   select case(prec%iprcparm(mld_prec_type_))
 
+  case(mld_bjac_)
+    
+    call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans_,work,info)
+    if (info /= 0) then
+      info=4010
+      ch_err='mld_bjac_aply'
+      goto 9999
+    end if
+    
   case(mld_as_)
     !
     ! Additive Schwarz preconditioner
@@ -120,7 +129,7 @@ subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
       call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans_,work,info)
       if(info /= 0) then
         info=4010
-        ch_err='psb_bjac_aply'
+        ch_err='mld_bjac_aply'
         goto 9999
       end if
 
diff --git a/mlprec/mld_zbaseprec_aply.f90 b/mlprec/mld_zbaseprec_aply.f90
index fde649b8..c282b4ea 100644
--- a/mlprec/mld_zbaseprec_aply.f90
+++ b/mlprec/mld_zbaseprec_aply.f90
@@ -159,19 +159,7 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
       end if
     end if
 
-  case(mld_bjac_)
-    !
-    ! Block-Jacobi preconditioner
-    !
-
-    call mld_bjac_aply(alpha,prec,x,beta,y,desc_data,trans_,work,info)
-    if(info /= 0) then
-      info=4010
-      ch_err='mld_bjac_aply'
-      goto 9999
-    end if
-
-  case(mld_as_)
+  case(mld_bjac_,mld_as_)
     !
     ! Additive Schwarz preconditioner
     !