mld2p4-2:

mlprec/mld_c_move_alloc_mod.f90
 mlprec/mld_c_prec_type.f90
 mlprec/mld_cmlprec_bld.f90
 mlprec/mld_d_move_alloc_mod.f90
 mlprec/mld_d_prec_type.f90
 mlprec/mld_s_move_alloc_mod.f90
 mlprec/mld_s_prec_type.f90
 mlprec/mld_smlprec_bld.f90
 mlprec/mld_z_move_alloc_mod.f90
 mlprec/mld_z_prec_type.f90
 mlprec/mld_zmlprec_bld.f90

Fixed internal docs, also preprocessed.

mlprec/mld_c_move_alloc_mod.f90

@@ -36,9 +36,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$
-! File: mld_move_alloc_mod.f90
+! File: mld_c_move_alloc_mod.f90
 !
-! Module: mld_move_alloc_mod
+! Module: mld_c_move_alloc_mod
 !
 !  This module defines move_alloc-like routines, and related interfaces,
 !  for the preconditioner data structures. .   
@@ -61,7 +61,7 @@ contains
     type(mld_conelev_type), intent(inout) :: a, b
     integer, intent(out) :: info 
     
-    call mld_precfree(b,info)
+    call b%free(info)
     call move_alloc(a%sm,b%sm)
     if (info == psb_success_) call psb_move_alloc(a%ac,b%ac,info) 
     if (info == psb_success_) call psb_move_alloc(a%desc_ac,b%desc_ac,info) 

mlprec/mld_cmlprec_bld.f90

@@ -86,7 +86,7 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info,amold,vmold)
   integer      :: ipv(mld_ifpsz_), val
   integer      :: int_err(5)
   character    :: upd_
-  type(mld_dml_parms) :: prm
+  type(mld_sml_parms) :: prm
   integer            :: debug_level, debug_unit
   character(len=20)  :: name, ch_err
 
@@ -249,7 +249,7 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info,amold,vmold)
         end do
         call mld_move_alloc(p%precv(iszv),t_prec%precv(newsz),info)
         do i=newsz+1, iszv
-          call mld_precfree(p%precv(i),info)
+          call p%precv(i)%free(info)
         end do
         call mld_move_alloc(t_prec,p,info) 
         ! Ignore errors from transfer
@@ -293,13 +293,13 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info,amold,vmold)
            & 'Jacobi sweeps',1,is_legal_jac_sweeps)
 
       if (.not.allocated(p%precv(i)%sm)) then 
-        !! Error: should have called mld_cprecinit
+        !! Error: should have called mld_dprecinit
         info=3111
         call psb_errpush(info,name)
         goto 9999
       end if
       if (.not.allocated(p%precv(i)%sm%sv)) then 
-        !! Error: should have called mld_cprecinit
+        !! Error: should have called mld_dprecinit
         info=3111
         call psb_errpush(info,name)
         goto 9999

mlprec/mld_d_move_alloc_mod.f90

@@ -36,9 +36,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$
-! File: mld_move_alloc_mod.f90
+! File: mld_d_move_alloc_mod.f90
 !
-! Module: mld_move_alloc_mod
+! Module: mld_d_move_alloc_mod
 !
 !  This module defines move_alloc-like routines, and related interfaces,
 !  for the preconditioner data structures. .   

mlprec/mld_d_prec_type.f90

@@ -36,17 +36,16 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$
-! File: mld_prec_type.f90
+! File: mld_d_prec_type.f90
 !
-! Module: mld_prec_type
+! Module: mld_d_prec_type
 !
 !  This module defines: 
-!  - the mld_prec_type data structure containing the preconditioner and related
+!  - the mld_d_prec_type data structure containing the preconditioner and related
 !    data structures;
 !
 !  It contains routines for
-!  - converting character constants defining the preconditioner into integer
+!  - Building and applying; 
-!    constants; 
 !  - checking if the preconditioner is correctly defined;
 !  - printing a	description of the preconditioner;
 !  - deallocating the preconditioner data structure.  
@@ -644,7 +643,7 @@ contains
 
   !
   ! Subroutines: mld_Tbase_precfree, mld_T_onelev_precfree, mld_Tprec_free
-  ! Version: real/complex
+  ! Version: real
   !
   !  These routines deallocate the mld_Tbaseprec_type, mld_Tonelev_type and
   !  mld_Tprec_type data structures.

mlprec/mld_s_move_alloc_mod.f90

@@ -36,9 +36,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$
-! File: mld_move_alloc_mod.f90
+! File: mld_s_move_alloc_mod.f90
 !
-! Module: mld_move_alloc_mod
+! Module: mld_s_move_alloc_mod
 !
 !  This module defines move_alloc-like routines, and related interfaces,
 !  for the preconditioner data structures. .   
@@ -61,7 +61,7 @@ contains
     type(mld_sonelev_type), intent(inout) :: a, b
     integer, intent(out) :: info 
     
-    call mld_precfree(b,info)
+    call b%free(info)
     call move_alloc(a%sm,b%sm)
     if (info == psb_success_) call psb_move_alloc(a%ac,b%ac,info) 
     if (info == psb_success_) call psb_move_alloc(a%desc_ac,b%desc_ac,info) 

mlprec/mld_smlprec_bld.f90

@@ -249,7 +249,7 @@ subroutine mld_smlprec_bld(a,desc_a,p,info,amold,vmold)
         end do
         call mld_move_alloc(p%precv(iszv),t_prec%precv(newsz),info)
         do i=newsz+1, iszv
-          call mld_precfree(p%precv(i),info)
+          call p%precv(i)%free(info)
         end do
         call mld_move_alloc(t_prec,p,info) 
         ! Ignore errors from transfer
@@ -293,13 +293,13 @@ subroutine mld_smlprec_bld(a,desc_a,p,info,amold,vmold)
            & 'Jacobi sweeps',1,is_legal_jac_sweeps)
 
       if (.not.allocated(p%precv(i)%sm)) then 
-        !! Error: should have called mld_sprecinit
+        !! Error: should have called mld_dprecinit
         info=3111
         call psb_errpush(info,name)
         goto 9999
       end if
       if (.not.allocated(p%precv(i)%sm%sv)) then 
-        !! Error: should have called mld_sprecinit
+        !! Error: should have called mld_dprecinit
         info=3111
         call psb_errpush(info,name)
         goto 9999

mlprec/mld_z_move_alloc_mod.f90

@@ -36,9 +36,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$
-! File: mld_move_alloc_mod.f90
+! File: mld_z_move_alloc_mod.f90
 !
-! Module: mld_move_alloc_mod
+! Module: mld_z_move_alloc_mod
 !
 !  This module defines move_alloc-like routines, and related interfaces,
 !  for the preconditioner data structures. .   
@@ -61,7 +61,7 @@ contains
     type(mld_zonelev_type), intent(inout) :: a, b
     integer, intent(out) :: info 
     
-    call mld_precfree(b,info)
+    call b%free(info)
     call move_alloc(a%sm,b%sm)
     if (info == psb_success_) call psb_move_alloc(a%ac,b%ac,info) 
     if (info == psb_success_) call psb_move_alloc(a%desc_ac,b%desc_ac,info) 

mlprec/mld_zmlprec_bld.f90

@@ -249,7 +249,7 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info,amold,vmold)
         end do
         call mld_move_alloc(p%precv(iszv),t_prec%precv(newsz),info)
         do i=newsz+1, iszv
-          call mld_precfree(p%precv(i),info)
+          call p%precv(i)%free(info)
         end do
         call mld_move_alloc(t_prec,p,info) 
         ! Ignore errors from transfer
@@ -293,13 +293,13 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info,amold,vmold)
            & 'Jacobi sweeps',1,is_legal_jac_sweeps)
 
       if (.not.allocated(p%precv(i)%sm)) then 
-        !! Error: should have called mld_zprecinit
+        !! Error: should have called mld_dprecinit
         info=3111
         call psb_errpush(info,name)
         goto 9999
       end if
       if (.not.allocated(p%precv(i)%sm%sv)) then 
-        !! Error: should have called mld_zprecinit
+        !! Error: should have called mld_dprecinit
         info=3111
         call psb_errpush(info,name)
         goto 9999