diff --git a/base/psblas/pdtreecomb.F b/base/psblas/pdtreecomb.F index b95a5475..bb454e92 100644 --- a/base/psblas/pdtreecomb.F +++ b/base/psblas/pdtreecomb.F @@ -106,8 +106,8 @@ C #endif * .. * .. External Functions .. - LOGICAL LSAME - EXTERNAL LSAME + LOGICAL PSB_LSAME + EXTERNAL PSB_LSAME * .. * .. Intrinsic Functions .. INTRINSIC MOD @@ -133,8 +133,8 @@ C * * Figure scope-dependant variables, or report illegal scope * - RSCOPE = LSAME( SCOPE, 'R' ) - CSCOPE = LSAME( SCOPE, 'C' ) + RSCOPE = PSB_LSAME( SCOPE, 'R' ) + CSCOPE = PSB_LSAME( SCOPE, 'C' ) * IF( RSCOPE ) THEN IF( BCAST ) THEN @@ -152,7 +152,7 @@ C END IF NP = NPROW MYDIST = MOD( NPROW + MYROW - TRDEST, NPROW ) - ELSE IF( LSAME( SCOPE, 'A' ) ) THEN + ELSE IF( PSB_LSAME( SCOPE, 'A' ) ) THEN NP = NPROW * NPCOL IAM = MYROW*NPCOL + MYCOL DEST = TRDEST*NPCOL + TCDEST diff --git a/base/serial/Makefile b/base/serial/Makefile index b5130cd2..4c8f94af 100644 --- a/base/serial/Makefile +++ b/base/serial/Makefile @@ -6,7 +6,7 @@ FOBJS = psb_cest.o psb_dcoins.o psb_dcsmm.o psb_dcsmv.o \ psb_dfixcoo.o psb_dipcoo2csr.o psb_dipcsr2coo.o psb_dneigh.o \ psb_dnumbmm.o psb_drwextd.o psb_dspgtdiag.o psb_dspgtblk.o \ psb_dspscal.o psb_dsymbmm.o psb_dtransp.o psb_dspclip.o psb_dspcnv.o\ - psb_regen_mod.o psb_dipcoo2csc.o psb_dspgetrow.o lsame.o psb_zspgetrow.o\ + psb_regen_mod.o psb_dipcoo2csc.o psb_dspgetrow.o psb_lsame.o psb_zspgetrow.o\ psb_zcsmm.o psb_zcsmv.o psb_zspgtdiag.o psb_zspgtblk.o\ psb_zcsnmi.o psb_zcsrws.o psb_zcssm.o psb_zcssv.o psb_zspcnv.o\ psb_zfixcoo.o psb_zipcoo2csr.o psb_zipcsr2coo.o psb_zipcoo2csc.o \ diff --git a/base/serial/coo/dcoorws.f b/base/serial/coo/dcoorws.f index ae2e03fb..eb49f132 100644 --- a/base/serial/coo/dcoorws.f +++ b/base/serial/coo/dcoorws.f @@ -41,11 +41,11 @@ C .. Array Arguments .. C .. Local scalars .. INTEGER I, J, NNZ, K DOUBLE PRECISION SUM - logical lsame - external lsame + logical psb_lsame + external psb_lsame NNZ = INFOA(1) - IF (lsame(TRANS,'N')) THEN + IF (psb_lsame(TRANS,'N')) THEN DO I=1, M ROWSUM(I) = 0.0D0 ENDDO @@ -66,7 +66,7 @@ C .. Local scalars .. I = J ENDDO - ELSE IF (lsame(TRANS,'T').OR.lsame(TRANS,'C')) THEN + ELSE IF (psb_lsame(TRANS,'T').OR.psb_lsame(TRANS,'C')) THEN DO J = 1, N ROWSUM(J) = 0.0D0 ENDDO diff --git a/base/serial/coo/zcoorws.f b/base/serial/coo/zcoorws.f index d237cad2..e332e7b3 100644 --- a/base/serial/coo/zcoorws.f +++ b/base/serial/coo/zcoorws.f @@ -11,11 +11,11 @@ C .. Array Arguments .. C .. Local scalars .. INTEGER I, J, NNZ, K DOUBLE PRECISION SUM - logical lsame - external lsame + logical psb_lsame + external psb_lsame NNZ = INFOA(1) - IF (lsame(TRANS,'N')) THEN + IF (psb_lsame(TRANS,'N')) THEN DO I=1, M ROWSUM(I) = 0.0D0 ENDDO @@ -36,7 +36,7 @@ C .. Local scalars .. I = J ENDDO - ELSE IF (lsame(TRANS,'T').OR.lsame(TRANS,'C')) THEN + ELSE IF (psb_lsame(TRANS,'T').OR.psb_lsame(TRANS,'C')) THEN DO J = 1, N ROWSUM(J) = 0.0D0 ENDDO diff --git a/base/serial/f77/dgelp.f b/base/serial/f77/dgelp.f index 1b88de1c..b21ef369 100644 --- a/base/serial/f77/dgelp.f +++ b/base/serial/f77/dgelp.f @@ -104,8 +104,8 @@ C .. Local Arrays.. INTEGER INT_VAL C .. Intrinsic Functions .. INTRINSIC DBLE - logical lsame - external lsame + logical psb_lsame + external psb_lsame character*20 name c @@ -118,8 +118,8 @@ C IERROR = 0 CALL FCPSB_ERRACTIONSAVE(ERR_ACT) - isnotran = lsame(trans,'N') - istran = lsame(trans,'T') .or. lsame(trans,'C') + isnotran = psb_lsame(trans,'N') + istran = psb_lsame(trans,'T') .or. psb_lsame(trans,'C') IF (M.LT.0) THEN IERROR = 7 ELSE IF(N.LT.0) THEN diff --git a/base/serial/f77/zgelp.f b/base/serial/f77/zgelp.f index 891b6c81..2ca382a1 100644 --- a/base/serial/f77/zgelp.f +++ b/base/serial/f77/zgelp.f @@ -104,8 +104,8 @@ C .. Local Arrays.. INTEGER INT_VAL C .. Intrinsic Functions .. INTRINSIC DBLE - logical lsame - external lsame + logical psb_lsame + external psb_lsame character*20 name c @@ -118,8 +118,8 @@ C IERROR = 0 CALL FCPSB_ERRACTIONSAVE(ERR_ACT) - isnotran = lsame(trans,'N') - istran = lsame(trans,'T') .or. lsame(trans,'C') + isnotran = psb_lsame(trans,'N') + istran = psb_lsame(trans,'T') .or. psb_lsame(trans,'C') IF (M.LT.0) THEN IERROR = 7 ELSE IF(N.LT.0) THEN diff --git a/base/serial/lsame.f90 b/base/serial/psb_lsame.f90 similarity index 94% rename from base/serial/lsame.f90 rename to base/serial/psb_lsame.f90 index fe515d7f..0df2862f 100644 --- a/base/serial/lsame.f90 +++ b/base/serial/psb_lsame.f90 @@ -28,10 +28,10 @@ !!$ POSSIBILITY OF SUCH DAMAGE. !!$ !!$ -function lsame(a,b) +function psb_lsame(a,b) use psb_string_mod - logical :: lsame + logical :: psb_lsame character(len=1) :: a, b - lsame = (tolower(a) == tolower(b)) -end function lsame + psb_lsame = (tolower(a) == tolower(b)) +end function psb_lsame