mld2p4-2:

tests/fileread/mld_cf_sample.f90
 tests/fileread/mld_df_sample.f90
 tests/fileread/mld_sf_sample.f90
 tests/fileread/mld_zf_sample.f90
 tests/pdegen/mld_d_pde2d.f90
 tests/pdegen/mld_d_pde3d.f90
 tests/pdegen/mld_s_pde2d.f90
 tests/pdegen/mld_s_pde3d.f90

Make calls to hierarchy_bld and ml_prec_bld generic.

tests/fileread/mld_cf_sample.f90

@@ -262,7 +262,7 @@ program mld_cf_sample
     call mld_precset(prec,'aggr_ord',        prec_choice%aggr_ord,info)
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_c_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     thier = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
@@ -290,7 +290,7 @@ program mld_cf_sample
     ! building the preconditioner
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_c_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     tprec = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')

tests/fileread/mld_df_sample.f90

@@ -262,7 +262,7 @@ program mld_df_sample
     call mld_precset(prec,'aggr_ord',        prec_choice%aggr_ord,info)
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_d_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     thier = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
@@ -290,7 +290,7 @@ program mld_df_sample
     ! building the preconditioner
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_d_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     tprec = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')

tests/fileread/mld_sf_sample.f90

@@ -262,7 +262,7 @@ program mld_sf_sample
     call mld_precset(prec,'aggr_ord',        prec_choice%aggr_ord,info)
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_s_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     thier = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
@@ -290,7 +290,7 @@ program mld_sf_sample
     ! building the preconditioner
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_s_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     tprec = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')

tests/fileread/mld_zf_sample.f90

@@ -262,7 +262,7 @@ program mld_zf_sample
     call mld_precset(prec,'aggr_ord',        prec_choice%aggr_ord,info)
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_z_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     thier = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')
@@ -290,7 +290,7 @@ program mld_zf_sample
     ! building the preconditioner
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_z_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     tprec = psb_wtime()-t1
     if (info /= psb_success_) then
       call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_precbld')

tests/pdegen/mld_d_pde2d.f90

@@ -249,7 +249,7 @@ program mld_d_pde2d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_d_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'
@@ -279,7 +279,7 @@ program mld_d_pde2d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_d_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'

tests/pdegen/mld_d_pde3d.f90

@@ -261,7 +261,7 @@ program mld_d_pde3d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_d_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'
@@ -291,7 +291,7 @@ program mld_d_pde3d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_d_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'

tests/pdegen/mld_s_pde2d.f90

@@ -249,7 +249,7 @@ program mld_s_pde2d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_s_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'
@@ -279,7 +279,7 @@ program mld_s_pde2d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_s_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'

tests/pdegen/mld_s_pde3d.f90

@@ -261,7 +261,7 @@ program mld_s_pde3d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_s_hierarchy_bld(a,desc_a,prec,info)
+    call mld_hierarchy_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'
@@ -291,7 +291,7 @@ program mld_s_pde3d
 
     call psb_barrier(ictxt)
     t1 = psb_wtime()
-    call mld_s_ml_prec_bld(a,desc_a,prec,info)
+    call mld_ml_prec_bld(a,desc_a,prec,info)
     if(info /= psb_success_) then
       info=psb_err_from_subroutine_
       ch_err='psb_precbld'