Merge branch 'development' of https://github.com/sfilippone/mld2p4-2 into development

mlprec/mld_base_prec_type.F90

@@ -573,7 +573,7 @@ contains
            &   par_aggr_alg_names(pm%par_aggr_alg)
       write(iout,*) '  Aggregation type: ',&
            & aggr_type_names(pm%aggr_type)
-      if (pm%par_aggr_alg /= mld_ext_aggr_) then
+      !if (pm%par_aggr_alg /= mld_ext_aggr_) then
         if ( pm%aggr_ord /= mld_aggr_ord_nat_) &
              & write(iout,*) '               with initial ordering: ',&
              &   ord_names(pm%aggr_ord)
@@ -591,7 +591,7 @@ contains
             write(iout,*) '  Damping omega computation: unknown value in iprcparm!!'
           end if
         end if
-      end if
+      !end if
     else
       write(iout,*) '  Multilevel type: Unkonwn value. Something is amiss....',&
            & pm%ml_cycle           

tests/pdegen/mld_d_pde2d.f90

@@ -247,8 +247,8 @@ contains
 
     m   = idim*idim
     n   = m
-    nnz = ((n*7)/(np))
+    nnz = 7*((n+np-1)/np)
-    if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
+    if (iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
     t0 = psb_wtime()
     select case(partition_)
     case(1)

tests/pdegen/mld_d_pde3d.f90

@@ -263,7 +263,7 @@ contains
     
     m   = idim*idim*idim
     n   = m
-    nnz = ((n*7)/(np))
+    nnz = 7*((n+np-1)/np)
     if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
     t0 = psb_wtime()
     select case(partition_)

tests/pdegen/mld_s_pde2d.f90

@@ -247,8 +247,8 @@ contains
 
     m   = idim*idim
     n   = m
-    nnz = ((n*7)/(np))
+    nnz = 7*((n+np-1)/np)
-    if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
+    if (iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
     t0 = psb_wtime()
     select case(partition_)
     case(1)

tests/pdegen/mld_s_pde3d.f90

@@ -263,7 +263,7 @@ contains
     
     m   = idim*idim*idim
     n   = m
-    nnz = ((n*7)/(np))
+    nnz = 7*((n+np-1)/np)
     if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
     t0 = psb_wtime()
     select case(partition_)