From 01c4bb031b7c45b2cfbc01259517e466c6e6ffc1 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Tue, 26 Oct 2010 08:55:32 +0000
Subject: [PATCH] psblas3:  configure.ac  configure  test/serial/d_matgen.f03

Changed to use mpi wrappers for all compilation in non-serial mode.
Changed to make the MOLD passed variable polymorphic.
---
 configure                | 3 +++
 configure.ac             | 3 +++
 test/serial/d_matgen.f03 | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index b73de166..794fa331 100755
--- a/configure
+++ b/configure
@@ -4486,6 +4486,9 @@ $as_echo "#define HAVE_MPI 1" >>confdefs.h
         :
 fi
 
+FC="$MPIFC" ;
+F77="$MPIF77";
+CC="$MPICC";
 fi
 
 # We leave a default language for the next checks.
diff --git a/configure.ac b/configure.ac
index 9b36483a..76789e9f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,9 @@ if test "X$MPIF77" = "X" ; then
     AC_CHECK_PROGS([MPIF77],[mpxlf mpf77 mpif77])
 fi
 ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran 77]])])
+FC="$MPIFC" ;
+F77="$MPIF77";
+CC="$MPICC";
 fi
 
 # We leave a default language for the next checks.
diff --git a/test/serial/d_matgen.f03 b/test/serial/d_matgen.f03
index 2eadbc6c..fffb5f89 100644
--- a/test/serial/d_matgen.f03
+++ b/test/serial/d_matgen.f03
@@ -156,9 +156,9 @@ contains
     integer, allocatable     :: irow(:),icol(:),myidx(:)
     real(psb_dpk_), allocatable :: val(:), diag(:)
     type(psb_d_sparse_mat)     :: a_n
-    type(psb_d_coo_sparse_mat) :: acoo
-    type(psb_d_csr_sparse_mat) :: acsr
-    type(psb_d_cxx_sparse_mat) :: acxx
+    class(psb_d_coo_sparse_mat), allocatable :: acoo
+    class(psb_d_csr_sparse_mat), allocatable :: acsr
+    class(psb_d_cxx_sparse_mat), allocatable :: acxx
     ! deltah dimension of each grid cell
     ! deltat discretization time
     real(psb_dpk_)         :: deltah, anorm
@@ -170,6 +170,8 @@ contains
 
     character(len=20)  :: name, ch_err
 
+    allocate(psb_d_cxx_sparse_mat :: acxx)
+    allocate(psb_d_csr_sparse_mat :: acsr)
     info = psb_success_
     name = 'create_matrix'
 !!$    call psb_erractionsave(err_act)
@@ -411,6 +413,7 @@ contains
       call a_n%get_diag(diag,info) 
     end if
 !!$
+    
     t1 = psb_wtime()
     call a_n%cscnv(info,mold=acsr)