From 26b2c95bc276dfdb8db513ffe79d16dd9bc6ded1 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 11 May 2012 17:54:38 +0000 Subject: [PATCH] psblas3: base/comm/psb_igather.f90 base/comm/psb_ihalo.f90 base/modules/Makefile Fixed interface mismatch --- base/comm/psb_igather.f90 | 4 ++-- base/comm/psb_ihalo.f90 | 4 ++-- base/modules/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/comm/psb_igather.f90 b/base/comm/psb_igather.f90 index a4cc936c..ca295279 100644 --- a/base/comm/psb_igather.f90 +++ b/base/comm/psb_igather.f90 @@ -51,7 +51,7 @@ subroutine psb_igatherm(globx, locx, desc_a, info, iroot) implicit none integer(psb_ipk_), intent(in) :: locx(:,:) - integer(psb_ipk_), intent(out) :: globx(:,:) + integer(psb_ipk_), intent(out), allocatable :: globx(:,:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: iroot @@ -222,7 +222,7 @@ subroutine psb_igatherv(globx, locx, desc_a, info, iroot) implicit none integer(psb_ipk_), intent(in) :: locx(:) - integer(psb_ipk_), intent(out) :: globx(:) + integer(psb_ipk_), intent(out), allocatable :: globx(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: iroot diff --git a/base/comm/psb_ihalo.f90 b/base/comm/psb_ihalo.f90 index 241e3c72..2da50fba 100644 --- a/base/comm/psb_ihalo.f90 +++ b/base/comm/psb_ihalo.f90 @@ -62,7 +62,7 @@ subroutine psb_ihalom(x,desc_a,info,alpha,jx,ik,work,tran,mode,data) integer(psb_ipk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info - real(psb_dpk_), intent(in), optional :: alpha + integer(psb_ipk_), intent(in), optional :: alpha integer(psb_ipk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: mode,jx,ik,data character, intent(in), optional :: tran @@ -287,7 +287,7 @@ subroutine psb_ihalov(x,desc_a,info,alpha,work,tran,mode,data) integer(psb_ipk_), intent(inout) :: x(:) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info - real(psb_dpk_), intent(in), optional :: alpha + integer(psb_ipk_), intent(in), optional :: alpha integer(psb_ipk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/Makefile b/base/modules/Makefile index 4d404e42..a0438b4c 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -33,7 +33,7 @@ UTIL_MODS = psb_string_mod.o psb_desc_const_mod.o psb_indx_map_mod.o\ MODULES=$(BASIC_MODS) $(UTIL_MODS) -OBJS = error.o psb_base_mod.o $(EXTRA_COBJS) cutil.o +OBJS = error.o psb_base_mod.o $(EXTRA_COBJS) cutil.o LIBDIR=.. CINCLUDES=-I. FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG).