From 585cf6f735894a64c82bede0b6e565f149619d7b Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Tue, 7 Jul 2015 09:48:35 +0000
Subject: [PATCH] psblas3:  base/modules/Makefile 
 base/serial/psi_c_serial_impl.f90  base/serial/psi_d_serial_impl.f90 
 base/serial/psi_i_serial_impl.f90  base/serial/psi_s_serial_impl.f90

Fixed base/modules build order.
Fixed serial_impl: call correct version of AXPBY
---
 base/modules/Makefile             | 2 ++
 base/serial/psi_c_serial_impl.f90 | 4 ++--
 base/serial/psi_d_serial_impl.f90 | 4 ++--
 base/serial/psi_i_serial_impl.f90 | 4 ++--
 base/serial/psi_s_serial_impl.f90 | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/base/modules/Makefile b/base/modules/Makefile
index 5356395c..583a9d02 100644
--- a/base/modules/Makefile
+++ b/base/modules/Makefile
@@ -144,6 +144,8 @@ psb_sort_mod.o: psb_i_sort_mod.o psb_s_sort_mod.o psb_d_sort_mod.o \
 psi_serial_mod.o:  psi_i_serial_mod.o \
 	psi_s_serial_mod.o psi_d_serial_mod.o psi_c_serial_mod.o psi_z_serial_mod.o 
 
+psi_i_serial_mod.o psi_s_serial_mod.o psi_d_serial_mod.o psi_c_serial_mod.o psi_z_serial_mod.o: psb_const_mod.o
+
 psb_base_mod.o: $(MODULES)
 
 psi_penv_mod.o: psi_penv_mod.F90 $(BASIC_MODS) 
diff --git a/base/serial/psi_c_serial_impl.f90 b/base/serial/psi_c_serial_impl.f90
index 05924f59..793bab17 100644
--- a/base/serial/psi_c_serial_impl.f90
+++ b/base/serial/psi_c_serial_impl.f90
@@ -45,7 +45,7 @@ subroutine psi_caxpby(m,n,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if ((m>0).and.(n>0)) call zaxpby(m,n,alpha,x,lx,beta,y,ly,info)
+  if ((m>0).and.(n>0)) call caxpby(m,n,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return
@@ -96,7 +96,7 @@ subroutine psi_caxpbyv(m,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if (m>0) call zaxpby(m,ione,alpha,x,lx,beta,y,ly,info)
+  if (m>0) call caxpby(m,ione,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return
diff --git a/base/serial/psi_d_serial_impl.f90 b/base/serial/psi_d_serial_impl.f90
index 5e911cbe..7eae6fac 100644
--- a/base/serial/psi_d_serial_impl.f90
+++ b/base/serial/psi_d_serial_impl.f90
@@ -45,7 +45,7 @@ subroutine psi_daxpby(m,n,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if ((m>0).and.(n>0)) call zaxpby(m,n,alpha,x,lx,beta,y,ly,info)
+  if ((m>0).and.(n>0)) call daxpby(m,n,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return
@@ -96,7 +96,7 @@ subroutine psi_daxpbyv(m,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if (m>0) call zaxpby(m,ione,alpha,x,lx,beta,y,ly,info)
+  if (m>0) call daxpby(m,ione,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return
diff --git a/base/serial/psi_i_serial_impl.f90 b/base/serial/psi_i_serial_impl.f90
index 135c57cf..284f8c97 100644
--- a/base/serial/psi_i_serial_impl.f90
+++ b/base/serial/psi_i_serial_impl.f90
@@ -45,7 +45,7 @@ subroutine psi_iaxpby(m,n,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if ((m>0).and.(n>0)) call zaxpby(m,n,alpha,x,lx,beta,y,ly,info)
+  if ((m>0).and.(n>0)) call iaxpby(m,n,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return
@@ -96,7 +96,7 @@ subroutine psi_iaxpbyv(m,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if (m>0) call zaxpby(m,ione,alpha,x,lx,beta,y,ly,info)
+  if (m>0) call iaxpby(m,ione,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return
diff --git a/base/serial/psi_s_serial_impl.f90 b/base/serial/psi_s_serial_impl.f90
index 5e6fbac3..6137308b 100644
--- a/base/serial/psi_s_serial_impl.f90
+++ b/base/serial/psi_s_serial_impl.f90
@@ -45,7 +45,7 @@ subroutine psi_saxpby(m,n,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if ((m>0).and.(n>0)) call zaxpby(m,n,alpha,x,lx,beta,y,ly,info)
+  if ((m>0).and.(n>0)) call saxpby(m,n,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return
@@ -96,7 +96,7 @@ subroutine psi_saxpbyv(m,alpha, x, beta, y, info)
     goto 9999 
   end if
 
-  if (m>0) call zaxpby(m,ione,alpha,x,lx,beta,y,ly,info)
+  if (m>0) call saxpby(m,ione,alpha,x,lx,beta,y,ly,info)
 
   call psb_erractionrestore(err_act)
   return