From d864f5b60e28a4e776ecb4853a3d420f394e5b74 Mon Sep 17 00:00:00 2001
From: Thomas Amestoy <thomasamestoy@gmail.com>
Date: Mon, 28 Jul 2014 08:55:56 +0000
Subject: [PATCH] a

---
 test/kernel/Makefile        | 43 ++++++++++++++++++++++++++++++++-----
 test/kernel/pdgenspmv.f90   |  2 ++
 test/kernel/s_file_spmv.f90 |  2 +-
 test/pargen/runs/ppde.inp   |  2 +-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/test/kernel/Makefile b/test/kernel/Makefile
index 458c1139..b06e0c02 100644
--- a/test/kernel/Makefile
+++ b/test/kernel/Makefile
@@ -5,7 +5,7 @@ BASEDIR=../..
 INCDIR=$(BASEDIR)/include/
 include $(INCDIR)/Make.inc.psblas
 LIBDIR=$(BASEDIR)/lib/
-PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
+PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base 
 LDLIBS=$(PSBLDLIBS)
 
 FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
@@ -14,9 +14,14 @@ FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
 DTOBJS=d_file_spmv.o   	
 STOBJS=s_file_spmv.o   	
 DPGOBJS=pdgenspmv.o
+PWFOBJS = power_file.o
+PWFROBJS = power_file_real.o
+ARNOBJS =arnoldi_file.o
+ARNROBJS =arnoldi_file_real.o
+SIROBJS=shift_invert_real.o
 EXEDIR=./runs
 
-all: d_file_spmv s_file_spmv pdgenspmv
+all: d_file_spmv s_file_spmv pdgenspmv power_file power_file_real 
 
 
 d_file_spmv: $(DTOBJS)
@@ -27,18 +32,46 @@ pdgenspmv: $(DPGOBJS)
 	$(F90LINK) $(LOPT) $(DPGOBJS) -o pdgenspmv $(PSBLAS_LIB) $(LDLIBS) 
 	/bin/mv pdgenspmv $(EXEDIR) 
 
-
 s_file_spmv: $(STOBJS)
 	$(F90LINK) $(LOPT) $(STOBJS) -o s_file_spmv $(PSBLAS_LIB) $(LDLIBS) 
 	/bin/mv s_file_spmv $(EXEDIR) 
 
+power_file: $(PWFOBJS)
+	$(F90LINK) $(LOPT) $(PWFOBJS) -o power_file $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv power_file $(EXEDIR) 
+
+power_file_real: $(PWFROBJS)
+	$(F90LINK) $(LOPT) $(PWFROBJS) -o power_file_real $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv power_file_real $(EXEDIR) 
+
+arnoldi_file: $(ARNOBJS)
+	$(F90LINK) $(LOPT) $(ARNOBJS) -o arnoldi_file $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv arnoldi_file $(EXEDIR) 
+
+arnoldi_file_real: $(ARNROBJS)
+	$(F90LINK) $(LOPT) $(ARNROBJS) -o arnoldi_file_real $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv arnoldi_file_real $(EXEDIR) 
 
+shift_invert_real: $(SIROBJS)
+	$(F90LINK) $(LOPT) $(SIROBJS) -o shift_invert_real $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv shift_invert_real $(EXEDIR) 
+
+analyse: analyse.o
+	$(F90LINK) $(LOPT) analyse.o -o analyse $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv analyse /server/tamestoy/TEMP/MaxEigenAdj/ 
+
+laplacian: laplacian.o
+	$(F90LINK) $(LOPT) laplacian.o -o laplacian $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv laplacian $(EXEDIR) 
+
+test_chseqr: test_chseqr.o
+	$(F90LINK) $(LOPT) test_chseqr.o -o test_chseqr $(PSBLAS_LIB) $(LDLIBS)  
 
 clean: 
-	/bin/rm -f $(DBOBJSS) $(DBOBJS) $(DTOBJS) $(STOBJS)
+	/bin/rm -f *.o
+	#/bin/rm -f $(DBOBJSS) $(DBOBJS) $(PWOBJS) $(PWFOBJS) $(DTOBJS) $(STOBJS) $(ARNOBJS)
 
 lib:
 	(cd ../../; make library)
 verycleanlib:
 	(cd ../../; make veryclean)
-
diff --git a/test/kernel/pdgenspmv.f90 b/test/kernel/pdgenspmv.f90
index e252d5f5..7df36d37 100644
--- a/test/kernel/pdgenspmv.f90
+++ b/test/kernel/pdgenspmv.f90
@@ -114,9 +114,11 @@ program pdgenspmv
 
   call psb_barrier(ictxt)
   t1 = psb_wtime()
+
   do i=1,times 
     call psb_spmm(done,a,xv,dzero,bv,desc_a,info,'n')
   end do
+
   call psb_barrier(ictxt)
   t2 = psb_wtime() - t1
   call psb_amx(ictxt,t2)
diff --git a/test/kernel/s_file_spmv.f90 b/test/kernel/s_file_spmv.f90
index 51e1e523..fddff2e5 100644
--- a/test/kernel/s_file_spmv.f90
+++ b/test/kernel/s_file_spmv.f90
@@ -1,4 +1,4 @@
-!!$ 
+!$ 
 !!$              Parallel Sparse BLAS  version 3.1
 !!$    (C) Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013
 !!$                       Salvatore Filippone    University of Rome Tor Vergata
diff --git a/test/pargen/runs/ppde.inp b/test/pargen/runs/ppde.inp
index 41020e89..43bcb50d 100644
--- a/test/pargen/runs/ppde.inp
+++ b/test/pargen/runs/ppde.inp
@@ -1,6 +1,6 @@
 7                      Number of entries below this
 BICGSTAB               Iterative method BICGSTAB CGS  BICG BICGSTABL RGMRES
-DIAG                   Preconditioner NONE  DIAG  BJAC 
+NONE                   Preconditioner NONE  DIAG  BJAC 
 CSR                    Storage format for matrix A:  CSR COO JAD 
 050                    Domain size (acutal system is this**3)
 2                      Stopping criterion