MLPREC:

Changed naming scheme for bjac_bld into fact_bld.

mlprec/Makefile

@@ -11,13 +11,13 @@ MPFOBJS=mld_daggrmat_raw_asb.o mld_daggrmat_smth_asb.o \
 	mld_zaggrmat_raw_asb.o mld_zaggrmat_smth_asb.o 
 MPCOBJS=mld_slud_impl.o mld_zslud_impl.o
 F90OBJS=mld_das_bld.o mld_dslu_bld.o mld_dumf_bld.o mld_dilu0_fact.o\
-	mld_dmlprec_bld.o mld_dsp_renum.o mld_dbjac_bld.o mld_dilu_bld.o \
+	mld_dmlprec_bld.o mld_dsp_renum.o mld_dfact_bld.o mld_dilu_bld.o \
 	mld_dprecbld.o mld_dprecfree.o mld_dprecset.o mld_dprecinit.o\
 	mld_dbaseprec_bld.o mld_ddiag_bld.o mld_daggrmap_bld.o \
 	mld_dprec_aply.o mld_dmlprec_aply.o mld_dslud_bld.o\
 	mld_dbaseprec_aply.o mld_dbjac_aply.o mld_das_aply.o mld_daggrmat_asb.o \
 	mld_zas_bld.o mld_zslu_bld.o mld_zumf_bld.o mld_zilu0_fact.o\
-	mld_zmlprec_bld.o mld_zsp_renum.o mld_zbjac_bld.o mld_zilu_bld.o \
+	mld_zmlprec_bld.o mld_zsp_renum.o mld_zfact_bld.o mld_zilu_bld.o \
 	mld_zprecbld.o mld_zprecfree.o mld_zprecset.o mld_zprecinit.o \
 	mld_zbaseprec_bld.o mld_zdiag_bld.o mld_zaggrmap_bld.o \
 	mld_zprec_aply.o mld_zmlprec_aply.o  mld_zslud_bld.o\

mlprec/mld_das_bld.f90

@@ -144,11 +144,11 @@ subroutine mld_das_bld(a,desc_a,p,upd,info)
     blck%fida            = 'COO'
     blck%infoa(psb_nnz_) = 0
     
-    call mld_bjac_bld(a,p,upd,info,blck=blck)
+    call mld_fact_bld(a,p,upd,info,blck=blck)
 
     if (info /= 0) then
       info=4010
-      ch_err='mld_bjac_bld'
+      ch_err='mld_fact_bld'
       call psb_errpush(info,name,a_err=ch_err)
       goto 9999
     end if
@@ -248,11 +248,11 @@ subroutine mld_das_bld(a,desc_a,p,upd,info)
     End if
 
 
-    call mld_bjac_bld(a,p,upd,info,blck=blck)
+    call mld_fact_bld(a,p,upd,info,blck=blck)
 
     if (info /= 0) then
       info=4010
-      ch_err='mld_bjac_bld'
+      ch_err='mld_fact_bld'
       call psb_errpush(info,name,a_err=ch_err)
       goto 9999
     end if

mlprec/mld_dbaseprec_bld.f90

@@ -171,10 +171,10 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
     end if
 
     ! Build the local part of the base preconditioner/smoother
-    call mld_bjac_bld(a,p,iupd,info)
+    call mld_fact_bld(a,p,iupd,info)
     if(info /= 0) then
       info=4010
-      call psb_errpush(info,name,a_err='mld_bjac_bld')
+      call psb_errpush(info,name,a_err='mld_fact_bld')
       goto 9999
     end if
 
@@ -201,13 +201,13 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
 
     if (debug_level >= psb_debug_outer_) &
          & write(debug_unit,*) me,' ',trim(name),&
-         & ': Calling mld_bjac_bld'
+         & ': Calling mld_as_bld'
 
     ! Build the local part of the base preconditioner/smoother
     call mld_as_bld(a,desc_a,p,iupd,info)
     if(info /= 0) then
       info=4010
-      call psb_errpush(info,name,a_err='mld_bjac_bld')
+      call psb_errpush(info,name,a_err='mld_as_bld')
       goto 9999
     end if
 

mlprec/mld_dfact_bld.f90

@@ -34,9 +34,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$
-! File: mld_dbjac_bld.f90
+! File: mld_dfact_bld.f90
 !
-! Subroutine: mld_dbjac_bld
+! Subroutine: mld_dfact_bld
 ! Version:    real
 !
 !  This routine computes an LU or incomplete LU factorization of the input
@@ -102,10 +102,10 @@
 !               to build an Additive Schwarz base preconditioner with overlap
 !               greater than 0. If the overlap is 0 blck is empty.
 !  
-subroutine mld_dbjac_bld(a,p,upd,info,blck)
+subroutine mld_dfact_bld(a,p,upd,info,blck)
 
   use psb_base_mod
-  use mld_prec_mod, mld_protect_name => mld_dbjac_bld
+  use mld_prec_mod, mld_protect_name => mld_dfact_bld
 
   implicit none
 
@@ -127,7 +127,7 @@ subroutine mld_dbjac_bld(a,p,upd,info,blck)
 
   if(psb_get_errstatus().ne.0) return 
   info=0
-  name='mld_dbjac_bld'
+  name='mld_dfact_bld'
   call psb_erractionsave(err_act)
   debug_unit  = psb_get_debug_unit()
   debug_level = psb_get_debug_level()
@@ -476,6 +476,6 @@ subroutine mld_dbjac_bld(a,p,upd,info,blck)
   return
 
 
-end subroutine mld_dbjac_bld
+end subroutine mld_dfact_bld
 
 

mlprec/mld_prec_mod.f90

@@ -391,8 +391,8 @@ module mld_prec_mod
     end subroutine mld_zdiag_bld
   end interface
 
-  interface mld_bjac_bld
-    subroutine mld_dbjac_bld(a,p,upd,info,blck)
+  interface mld_fact_bld
+    subroutine mld_dfact_bld(a,p,upd,info,blck)
       use psb_base_mod
       use mld_prec_type
       type(psb_dspmat_type), intent(in), target :: a
@@ -400,8 +400,8 @@ module mld_prec_mod
       integer, intent(out)                      :: info
       character, intent(in)                     :: upd
       type(psb_dspmat_type), intent(in), target, optional  :: blck
-    end subroutine mld_dbjac_bld
-    subroutine mld_zbjac_bld(a,p,upd,info,blck)
+    end subroutine mld_dfact_bld
+    subroutine mld_zfact_bld(a,p,upd,info,blck)
       use psb_base_mod
       use mld_prec_type
       type(psb_zspmat_type), intent(in), target :: a
@@ -409,7 +409,7 @@ module mld_prec_mod
       integer, intent(out)                      :: info
       character, intent(in)                     :: upd
       type(psb_zspmat_type), intent(in), target, optional  :: blck
-    end subroutine mld_zbjac_bld
+    end subroutine mld_zfact_bld
   end interface
 
   interface mld_ilu_bld

mlprec/mld_zas_bld.f90

@@ -145,11 +145,11 @@ subroutine mld_zas_bld(a,desc_a,p,upd,info)
     blck%fida            = 'COO'
     blck%infoa(psb_nnz_) = 0
     
-    call mld_bjac_bld(a,p,upd,info,blck=blck)
+    call mld_fact_bld(a,p,upd,info,blck=blck)
 
     if (info /= 0) then
       info=4010
-      ch_err='mld_bjac_bld'
+      ch_err='mld_fact_bld'
       call psb_errpush(info,name,a_err=ch_err)
       goto 9999
     end if
@@ -249,11 +249,11 @@ subroutine mld_zas_bld(a,desc_a,p,upd,info)
     End if
 
 
-    call mld_bjac_bld(a,p,upd,info,blck=blck)
+    call mld_fact_bld(a,p,upd,info,blck=blck)
 
     if (info /= 0) then
       info=4010
-      ch_err='mld_bjac_bld'
+      ch_err='mld_fact_bld'
       call psb_errpush(info,name,a_err=ch_err)
       goto 9999
     end if

mlprec/mld_zbaseprec_bld.f90

@@ -170,10 +170,10 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
     end if
 
     ! Build the local part of the base preconditioner
-    call mld_bjac_bld(a,p,iupd,info)
+    call mld_fact_bld(a,p,iupd,info)
     if(info /= 0) then
       info=4010
-      call psb_errpush(info,name,a_err='mld_bjac_bld')
+      call psb_errpush(info,name,a_err='mld_fact_bld')
       goto 9999
     end if
 
@@ -200,13 +200,13 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
 
     if (debug_level >= psb_debug_outer_) &
          & write(debug_unit,*) me,' ',trim(name),&
-         & ': Calling mld_bjac_bld'
+         & ': Calling mld_as_bld'
 
     ! Build the local part of the base preconditioner
     call mld_as_bld(a,desc_a,p,iupd,info)
     if(info /= 0) then
       info=4010
-      call psb_errpush(info,name,a_err='mld_bjac_bld')
+      call psb_errpush(info,name,a_err='mld_as_bld')
       goto 9999
     end if
 

mlprec/mld_zfact_bld.f90

@@ -34,9 +34,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$
-! File: mld_zbjac_bld.f90
+! File: mld_zfact_bld.f90
 !
-! Subroutine: mld_zbjac_bld
+! Subroutine: mld_zfact_bld
 ! Version:    complex
 !
 !  This routine computes an LU or incomplete LU factorization of the input
@@ -103,10 +103,10 @@
 !               to build an Additive Schwarz base preconditioner with overlap
 !               greater than 0.  If the overlap is 0 blck is empty.
 !  
-subroutine mld_zbjac_bld(a,p,upd,info,blck)
+subroutine mld_zfact_bld(a,p,upd,info,blck)
 
   use psb_base_mod
-  use mld_prec_mod, mld_protect_name => mld_zbjac_bld
+  use mld_prec_mod, mld_protect_name => mld_zfact_bld
 
   implicit none
                                                                                
@@ -128,7 +128,7 @@ subroutine mld_zbjac_bld(a,p,upd,info,blck)
 
   if(psb_get_errstatus().ne.0) return 
   info=0
-  name='mld_zbjac_bld'
+  name='mld_zfact_bld'
   call psb_erractionsave(err_act)
   debug_unit  = psb_get_debug_unit()
   debug_level = psb_get_debug_level()
@@ -477,6 +477,6 @@ subroutine mld_zbjac_bld(a,p,upd,info,blck)
   return
 
 
-end subroutine mld_zbjac_bld
+end subroutine mld_zfact_bld