Merge branch 'development' into MixedI8

# Conflicts:
#	Changelog
#	base/internals/psi_crea_index.f90
#	base/internals/psi_desc_index.F90
#	base/modules/desc/psb_desc_mod.F90
#	base/modules/psi_i_mod.f90
#	base/modules/serial/psb_c_base_mat_mod.f90
#	base/modules/serial/psb_c_base_vect_mod.f90
#	base/modules/serial/psb_c_csc_mat_mod.f90
#	base/modules/serial/psb_c_csr_mat_mod.f90
#	base/modules/serial/psb_c_mat_mod.f90
#	base/modules/serial/psb_c_vect_mod.F90
#	base/modules/serial/psb_d_base_mat_mod.f90
#	base/modules/serial/psb_d_base_vect_mod.f90
#	base/modules/serial/psb_d_csc_mat_mod.f90
#	base/modules/serial/psb_d_csr_mat_mod.f90
#	base/modules/serial/psb_d_mat_mod.f90
#	base/modules/serial/psb_d_vect_mod.F90
#	base/modules/serial/psb_i_base_vect_mod.f90
#	base/modules/serial/psb_i_vect_mod.F90
#	base/modules/serial/psb_s_base_mat_mod.f90
#	base/modules/serial/psb_s_base_vect_mod.f90
#	base/modules/serial/psb_s_csc_mat_mod.f90
#	base/modules/serial/psb_s_csr_mat_mod.f90
#	base/modules/serial/psb_s_mat_mod.f90
#	base/modules/serial/psb_s_vect_mod.F90
#	base/modules/serial/psb_z_base_mat_mod.f90
#	base/modules/serial/psb_z_base_vect_mod.f90
#	base/modules/serial/psb_z_csc_mat_mod.f90
#	base/modules/serial/psb_z_csr_mat_mod.f90
#	base/modules/serial/psb_z_mat_mod.f90
#	base/modules/serial/psb_z_vect_mod.F90
#	base/psblas/psb_camax.f90
#	base/psblas/psb_casum.f90
#	base/psblas/psb_cdot.f90
#	base/psblas/psb_cnrm2.f90
#	base/psblas/psb_cnrmi.f90
#	base/psblas/psb_cspnrm1.f90
#	base/psblas/psb_damax.f90
#	base/psblas/psb_dasum.f90
#	base/psblas/psb_ddot.f90
#	base/psblas/psb_dnrm2.f90
#	base/psblas/psb_dnrmi.f90
#	base/psblas/psb_dspnrm1.f90
#	base/psblas/psb_samax.f90
#	base/psblas/psb_sasum.f90
#	base/psblas/psb_sdot.f90
#	base/psblas/psb_snrm2.f90
#	base/psblas/psb_snrmi.f90
#	base/psblas/psb_sspnrm1.f90
#	base/psblas/psb_zamax.f90
#	base/psblas/psb_zasum.f90
#	base/psblas/psb_zdot.f90
#	base/psblas/psb_znrm2.f90
#	base/psblas/psb_znrmi.f90
#	base/psblas/psb_zspnrm1.f90
#	base/serial/impl/psb_c_base_mat_impl.F90
#	base/serial/impl/psb_c_csr_impl.f90
#	base/serial/impl/psb_d_base_mat_impl.F90
#	base/serial/impl/psb_d_csr_impl.f90
#	base/serial/impl/psb_s_base_mat_impl.F90
#	base/serial/impl/psb_s_csr_impl.f90
#	base/serial/impl/psb_z_base_mat_impl.F90
#	base/serial/impl/psb_z_csr_impl.f90
#	base/tools/psb_ccdbldext.F90
#	base/tools/psb_cd_inloc.f90
#	base/tools/psb_cdals.f90
#	base/tools/psb_csphalo.F90
#	base/tools/psb_dcdbldext.F90
#	base/tools/psb_dsphalo.F90
#	base/tools/psb_scdbldext.F90
#	base/tools/psb_ssphalo.F90
#	base/tools/psb_zcdbldext.F90
#	base/tools/psb_zsphalo.F90
#	cbind/krylov/psb_ckrylov_cbind_mod.f90
#	cbind/krylov/psb_dkrylov_cbind_mod.f90
#	cbind/krylov/psb_skrylov_cbind_mod.f90
#	cbind/krylov/psb_zkrylov_cbind_mod.f90
#	cbind/prec/psb_cprec_cbind_mod.f90
#	cbind/prec/psb_dprec_cbind_mod.f90
#	cbind/prec/psb_sprec_cbind_mod.f90
#	cbind/prec/psb_zprec_cbind_mod.f90
#	configure
#	docs/html/img100.png
#	docs/html/img101.png
#	docs/html/img102.png
#	docs/html/img103.png
#	docs/html/img104.png
#	docs/html/img105.png
#	docs/html/img106.png
#	docs/html/img107.png
#	docs/html/img108.png
#	docs/html/img109.png
#	docs/html/img110.png
#	docs/html/img111.png
#	docs/html/img112.png
#	docs/html/img113.png
#	docs/html/img114.png
#	docs/html/img115.png
#	docs/html/img116.png
#	docs/html/img117.png
#	docs/html/img118.png
#	docs/html/img119.png
#	docs/html/img120.png
#	docs/html/img121.png
#	docs/html/img122.png
#	docs/html/img123.png
#	docs/html/img124.png
#	docs/html/img125.png
#	docs/html/img126.png
#	docs/html/img127.png
#	docs/html/img128.png
#	docs/html/img129.png
#	docs/html/img130.png
#	docs/html/img131.png
#	docs/html/img132.png
#	docs/html/img133.png
#	docs/html/img134.png
#	docs/html/img135.png
#	docs/html/img136.png
#	docs/html/img137.png
#	docs/html/img138.png
#	docs/html/img139.png
#	docs/html/img140.png
#	docs/html/img142.png
#	docs/html/img144.png
#	docs/html/img145.png
#	docs/html/img146.png
#	docs/html/img147.png
#	docs/html/img148.png
#	docs/html/img149.png
#	docs/html/img150.png
#	docs/html/img151.png
#	docs/html/img152.png
#	docs/html/img153.png
#	docs/html/img154.png
#	docs/html/img155.png
#	docs/html/img156.png
#	docs/html/img157.png
#	docs/html/img158.png
#	docs/html/img159.png
#	docs/html/img160.png
#	docs/html/img161.png
#	docs/html/img162.png
#	docs/html/img163.png
#	docs/html/img164.png
#	docs/html/img165.png
#	docs/html/img166.png
#	docs/html/img167.png
#	docs/html/img168.png
#	docs/html/img27.png
#	docs/html/img28.png
#	docs/html/img29.png
#	docs/html/img30.png
#	docs/html/img31.png
#	docs/html/img32.png
#	docs/html/img33.png
#	docs/html/img34.png
#	docs/html/img35.png
#	docs/html/img36.png
#	docs/html/img37.png
#	docs/html/img38.png
#	docs/html/img39.png
#	docs/html/img40.png
#	docs/html/img41.png
#	docs/html/img42.png
#	docs/html/img43.png
#	docs/html/img44.png
#	docs/html/img45.png
#	docs/html/img46.png
#	docs/html/img47.png
#	docs/html/img48.png
#	docs/html/img49.png
#	docs/html/img50.png
#	docs/html/img51.png
#	docs/html/img52.png
#	docs/html/img53.png
#	docs/html/img54.png
#	docs/html/img55.png
#	docs/html/img56.png
#	docs/html/img57.png
#	docs/html/img58.png
#	docs/html/img59.png
#	docs/html/img60.png
#	docs/html/img61.png
#	docs/html/img62.png
#	docs/html/img63.png
#	docs/html/img64.png
#	docs/html/img65.png
#	docs/html/img66.png
#	docs/html/img67.png
#	docs/html/img68.png
#	docs/html/img69.png
#	docs/html/img70.png
#	docs/html/img71.png
#	docs/html/img72.png
#	docs/html/img73.png
#	docs/html/img74.png
#	docs/html/img75.png
#	docs/html/img76.png
#	docs/html/img77.png
#	docs/html/img78.png
#	docs/html/img79.png
#	docs/html/img80.png
#	docs/html/img81.png
#	docs/html/img82.png
#	docs/html/img83.png
#	docs/html/img84.png
#	docs/html/img85.png
#	docs/html/img86.png
#	docs/html/img87.png
#	docs/html/img88.png
#	docs/html/img89.png
#	docs/html/img90.png
#	docs/html/img91.png
#	docs/html/img92.png
#	docs/html/img93.png
#	docs/html/img94.png
#	docs/html/img95.png
#	docs/html/img96.png
#	docs/html/img97.png
#	docs/html/img98.png
#	docs/html/img99.png
#	docs/html/index.html
#	docs/html/node104.html
#	docs/html/node114.html
#	docs/html/node115.html
#	docs/html/node116.html
#	docs/html/node118.html
#	docs/html/node119.html
#	docs/html/node120.html
#	docs/html/node121.html
#	docs/html/node122.html
#	docs/html/node123.html
#	docs/html/node132.html
#	docs/html/node54.html
#	docs/html/node55.html
#	docs/html/node56.html
#	docs/html/node57.html
#	docs/html/node58.html
#	docs/html/node59.html
#	docs/html/node6.html
#	docs/html/node60.html
#	docs/html/node61.html
#	docs/html/node62.html
#	docs/html/node63.html
#	docs/html/node64.html
#	docs/html/node65.html
#	docs/html/node67.html
#	docs/html/node68.html
#	docs/html/node69.html
#	docs/html/node70.html
#	docs/html/node72.html
#	docs/html/node73.html
#	docs/html/node78.html
#	docs/html/node79.html
#	docs/html/node84.html
#	docs/html/node96.html
#	docs/html/userhtml.html
#	docs/psblas-3.6.pdf
#	docs/src/intro.tex
#	docs/src/userguide.tex
#	docs/src/userhtml.tex
#	test/hello/Makefile
#	test/pargen/psb_d_pde2d.f90
#	test/pargen/psb_d_pde3d.f90
#	test/pargen/psb_s_pde2d.f90
#	test/pargen/psb_s_pde3d.f90
#	util/psb_partidx_mod.F90

base/internals/psi_desc_index.F90

@@ -38,9 +38,9 @@
 !    See below for a description of the formats.
 !
 ! Arguments:
-! desc_a       - type(psb_desc_type)   The descriptor; in this context only the index 
-!                                       mapping parts are used.
-! index_in(:)  - integer               The index list, build format  
+! desc_a       - type(psb_desc_type) The descriptor; in this context only the index 
+!                                     mapping parts are used.
+! index_in(:)  - integer             The index list, build format  
 ! index_out(:) - integer(psb_ipk_), allocatable  The index list, assembled format
 ! nxch         - integer             The number of data exchanges on the calling process
 ! nsnd         - integer             Total send buffer size       on the calling process

base/modules/desc/psb_desc_mod.F90

@@ -1,4 +1,4 @@
-!   
+   
 !                Parallel Sparse BLAS  version 3.5
 !      (C) Copyright 2006-2018
 !        Salvatore Filippone    

base/tools/psb_cd_inloc.f90

@@ -89,7 +89,6 @@ subroutine psb_cd_inloc(v, ictxt, desc, info, globalcheck,idx)
     call psb_barrier(ictxt)
     t0 = psb_wtime()
   end if
-  
   loc_row = size(v)
   m = maxval(v)
   nrt = loc_row

base/tools/psb_cdprt.f90

@@ -93,7 +93,11 @@ subroutine psb_cdprt(iout,desc_p,glob,short, verbosity)
     if (me == i)  then
       write(iout,*) me,': Local descriptor data: points:',local_points,&
            & ' halo:',local_halo
-      write(iout,*) me,': Volume to surface ratio:',real(local_points,psb_dpk_)/real(local_halo,psb_dpk_)
+      if (local_halo>0) then 
+        write(iout,*) me,': Volume to surface ratio:',real(local_points,psb_dpk_)/real(local_halo,psb_dpk_)
+      else
+        write(iout,*) me,': Volume to surface ratio:',0.0_psb_dpk_
+      end if
     end if
     call psb_barrier(ictxt)
   end do

cbind/base/psb_c_base.h

@@ -1,3 +1,4 @@
+
 #ifndef PSB_C_BASE__
 #define PSB_C_BASE__
 #ifdef __cplusplus

cbind/prec/psb_c_cprec.h

@@ -8,15 +8,15 @@
 extern "C" {
 #endif
 
-typedef struct PSB_C_CPREC {
-  void *cprec;
-} psb_c_cprec; 
-
-psb_c_cprec* psb_c_new_cprec(); 
-
-psb_i_t  psb_c_cprecinit(psb_c_cprec *ph, const char *ptype);
-psb_i_t  psb_c_cprecbld(psb_c_cspmat *ah, psb_c_descriptor *cdh, psb_c_cprec *ph);
-psb_i_t  psb_c_cprecfree(psb_c_cprec *ph);
+  typedef struct PSB_C_CPREC {
+    void *cprec;
+  } psb_c_cprec; 
+  
+  psb_c_cprec* psb_c_new_cprec(); 
+  
+  psb_i_t  psb_c_cprecinit(psb_i_t ictxt,psb_c_cprec *ph, const char *ptype);
+  psb_i_t  psb_c_cprecbld(psb_c_cspmat *ah, psb_c_descriptor *cdh, psb_c_cprec *ph);
+  psb_i_t  psb_c_cprecfree(psb_c_cprec *ph);
 #ifdef __cplusplus
 }
 #endif

cbind/prec/psb_c_dprec.h

@@ -8,15 +8,15 @@
 extern "C" {
 #endif
 
-typedef struct PSB_C_DPREC {
-  void *dprec;
-} psb_c_dprec; 
-
-psb_c_dprec* psb_c_new_dprec();
-
-psb_i_t  psb_c_dprecinit(psb_c_dprec *ph, const char *ptype);
-psb_i_t  psb_c_dprecbld(psb_c_dspmat *ah, psb_c_descriptor *cdh, psb_c_dprec *ph);
-psb_i_t  psb_c_dprecfree(psb_c_dprec *ph);
+  typedef struct PSB_C_DPREC {
+    void *dprec;
+  } psb_c_dprec; 
+  
+  psb_c_dprec* psb_c_new_dprec();
+  
+  psb_i_t  psb_c_dprecinit(psb_i_t ictxt, psb_c_dprec *ph, const char *ptype);
+  psb_i_t  psb_c_dprecbld(psb_c_dspmat *ah, psb_c_descriptor *cdh, psb_c_dprec *ph);
+  psb_i_t  psb_c_dprecfree(psb_c_dprec *ph);
 #ifdef __cplusplus
 }
 #endif

cbind/prec/psb_c_sprec.h

@@ -8,15 +8,15 @@
 extern "C" {
 #endif
 
-typedef struct PSB_C_SPREC {
-  void *sprec;
-} psb_c_sprec; 
-
-psb_c_sprec* psb_c_new_sprec();
-
-psb_i_t  psb_c_sprecinit(psb_c_sprec *ph, const char *ptype);
-psb_i_t  psb_c_sprecbld(psb_c_sspmat *ah, psb_c_descriptor *cdh, psb_c_sprec *ph);
-psb_i_t  psb_c_sprecfree(psb_c_sprec *ph);
+  typedef struct PSB_C_SPREC {
+    void *sprec;
+  } psb_c_sprec; 
+  
+  psb_c_sprec* psb_c_new_sprec();
+  
+  psb_i_t  psb_c_sprecinit(psb_i_t ictxt, psb_c_sprec *ph, const char *ptype);
+  psb_i_t  psb_c_sprecbld(psb_c_sspmat *ah, psb_c_descriptor *cdh, psb_c_sprec *ph);
+  psb_i_t  psb_c_sprecfree(psb_c_sprec *ph);
 #ifdef __cplusplus
 }
 #endif

cbind/prec/psb_c_zprec.h

@@ -8,15 +8,15 @@
 extern "C" {
 #endif
 
-typedef struct PSB_C_ZPREC {
-  void *zprec;
-} psb_c_zprec; 
-
-psb_c_zprec* psb_c_new_zprec();
-
-psb_i_t  psb_c_zprecinit(psb_c_zprec *ph, const char *ptype);
-psb_i_t  psb_c_zprecbld(psb_c_zspmat *ah, psb_c_descriptor *cdh, psb_c_zprec *ph);
-psb_i_t  psb_c_zprecfree(psb_c_zprec *ph);
+  typedef struct PSB_C_ZPREC {
+    void *zprec;
+  } psb_c_zprec; 
+  
+  psb_c_zprec* psb_c_new_zprec();
+  
+  psb_i_t  psb_c_zprecinit(psb_i_t ictxt, psb_c_zprec *ph, const char *ptype);
+  psb_i_t  psb_c_zprecbld(psb_c_zspmat *ah, psb_c_descriptor *cdh, psb_c_zprec *ph);
+  psb_i_t  psb_c_zprecfree(psb_c_zprec *ph);
 #ifdef __cplusplus
 }
 #endif

cbind/test/pargen/ppdec.c

@@ -326,7 +326,7 @@ int main(int argc, char *argv[])
   psb_c_barrier(ictxt);
   /* Set up the preconditioner */ 
   ph  = psb_c_new_dprec();
-  psb_c_dprecinit(ph,ptype);
+  psb_c_dprecinit(ictxt,ph,ptype);
   ret=psb_c_dprecbld(ah,cdh,ph);
   //fprintf(stderr,"From psb_c_dprecbld: %d\n",ret); 
 

configure

@@ -3929,7 +3929,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test "X$MPICC" = "X" ; then
     # This is our MPICC compiler preference: it will override ACX_MPI's first try.
-    for ac_prog in mpxlc mpcc mpiicc mpicc cc
+    for ac_prog in mpxlc mpiicc mpcc mpicc cc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -6541,8 +6541,8 @@ if test "X$FCOPT" == "X" ; then
    FCOPT="-g -O3  $FCOPT"
  elif test "X$psblas_cv_fc" == X"xlf" ; then
    # XL compiler : consider using -qarch=auto
-     FCOPT="-O3 -qarch=auto  -qfixed -qsuffix=f=f:cpp=F -qlanglvl=extended $FCOPT"
-     FCFLAGS="-qhalt=e $FCFLAGS"
+     FCOPT="-O3 -qarch=auto  -qlanglvl=extended -qxlf2003=polymorphic:autorealloc $FCOPT"
+     FCFLAGS="-qhalt=e -qlanglvl=extended -qxlf2003=polymorphic:autorealloc $FCFLAGS"
  elif test "X$psblas_cv_fc" == X"ifc" ; then
    # other compilers ..
      FCOPT="-O3 $FCOPT"

configure.ac

@@ -144,7 +144,7 @@ else
 AC_LANG([C])
 if test "X$MPICC" = "X" ; then
     # This is our MPICC compiler preference: it will override ACX_MPI's first try.
-    AC_CHECK_PROGS([MPICC],[mpxlc mpcc mpiicc mpicc cc])
+    AC_CHECK_PROGS([MPICC],[mpxlc mpiicc mpcc mpicc cc])
 fi
 ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for C]])])
 AC_PROG_CC_STDC
@@ -380,8 +380,8 @@ if test "X$FCOPT" == "X" ; then
    FCOPT="-g -O3  $FCOPT"
  elif test "X$psblas_cv_fc" == X"xlf" ; then
    # XL compiler : consider using -qarch=auto
-     FCOPT="-O3 -qarch=auto  -qfixed -qsuffix=f=f:cpp=F -qlanglvl=extended $FCOPT"
-     FCFLAGS="-qhalt=e $FCFLAGS"
+     FCOPT="-O3 -qarch=auto  -qlanglvl=extended -qxlf2003=polymorphic:autorealloc $FCOPT"
+     FCFLAGS="-qhalt=e -qlanglvl=extended -qxlf2003=polymorphic:autorealloc $FCFLAGS"
  elif test "X$psblas_cv_fc" == X"ifc" ; then
    # other compilers ..
      FCOPT="-O3 $FCOPT"

docs/html/footnode.html

@@ -14,7 +14,7 @@
 
 <LINK REL="STYLESHEET" HREF="userhtml.css">
 
-<LINK REL="previous" HREF="node133.html">
+<LINK REL="previous" HREF="node134.html">
 <LINK REL="up" HREF="userhtml.html">
 </HEAD>
 
@@ -137,8 +137,8 @@ sample scatter/gather routines.
 .
 </PRE>
 </DD>
-<DT><A NAME="foot7637">... follows</A><A
- HREF="node125.html#tex2html31"><SUP><SPAN CLASS="arabic">4</SPAN></SUP></A></DT>
+<DT><A NAME="foot7826">... follows</A><A
+ HREF="node126.html#tex2html31"><SUP><SPAN CLASS="arabic">4</SPAN></SUP></A></DT>
 <DD>The string is case-insensitive
 
 <PRE>.
@@ -173,12 +173,12 @@ sample scatter/gather routines.
 .
 </PRE>
 </DD>
-<DT><A NAME="foot8086">... method</A><A
- HREF="node132.html#tex2html32"><SUP><SPAN CLASS="arabic">5</SPAN></SUP></A></DT>
+<DT><A NAME="foot8281">... method</A><A
+ HREF="node133.html#tex2html32"><SUP><SPAN CLASS="arabic">5</SPAN></SUP></A></DT>
 <DD>Note:
       the implementation is for <SPAN CLASS="MATH"><IMG
- WIDTH="62" HEIGHT="32" ALIGN="MIDDLE" BORDER="0"
- SRC="img163.png"
+ WIDTH="61" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
+ SRC="img169.png"
  ALT="$FCG(1)$"></SPAN>.
 
 <PRE>.