From ff1fb0cc8d820a2397441a7d763f32a66bb137c7 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 30 Jan 2012 17:53:31 +0000 Subject: [PATCH] psblas3-integer8: base/serial/aux/camsort_dw.f90 base/serial/aux/camsort_up.f90 base/serial/aux/dmsort_dw.f90 base/serial/aux/dmsort_up.f90 base/serial/aux/msort_dw.f90 base/serial/aux/msort_up.f90 base/serial/aux/smsort_dw.f90 base/serial/aux/smsort_up.f90 base/serial/aux/zamsort_dw.f90 base/serial/aux/zamsort_up.f90 Going forward. --- base/serial/aux/camsort_dw.f90 | 9 ++++----- base/serial/aux/camsort_up.f90 | 9 ++++----- base/serial/aux/dmsort_dw.f90 | 9 ++++----- base/serial/aux/dmsort_up.f90 | 9 ++++----- base/serial/aux/msort_dw.f90 | 9 ++++----- base/serial/aux/msort_up.f90 | 9 ++++----- base/serial/aux/smsort_dw.f90 | 9 ++++----- base/serial/aux/smsort_up.f90 | 9 ++++----- base/serial/aux/zamsort_dw.f90 | 9 ++++----- base/serial/aux/zamsort_up.f90 | 9 ++++----- 10 files changed, 40 insertions(+), 50 deletions(-) diff --git a/base/serial/aux/camsort_dw.f90 b/base/serial/aux/camsort_dw.f90 index 9bb075bc..25e4c762 100644 --- a/base/serial/aux/camsort_dw.f90 +++ b/base/serial/aux/camsort_dw.f90 @@ -76,7 +76,6 @@ subroutine camsort_dw(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine camsort_dw(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine camsort_dw(n,k,l,iret) if (k(p) < k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine camsort_dw(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine camsort_dw(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/camsort_up.f90 b/base/serial/aux/camsort_up.f90 index 7a7c3c1e..1289db21 100644 --- a/base/serial/aux/camsort_up.f90 +++ b/base/serial/aux/camsort_up.f90 @@ -76,7 +76,6 @@ subroutine camsort_up(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine camsort_up(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine camsort_up(n,k,l,iret) if (k(p) > k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine camsort_up(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine camsort_up(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/dmsort_dw.f90 b/base/serial/aux/dmsort_dw.f90 index 522dea92..5e418cbb 100644 --- a/base/serial/aux/dmsort_dw.f90 +++ b/base/serial/aux/dmsort_dw.f90 @@ -76,7 +76,6 @@ subroutine dmsort_dw(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine dmsort_dw(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine dmsort_dw(n,k,l,iret) if (k(p) < k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine dmsort_dw(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine dmsort_dw(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/dmsort_up.f90 b/base/serial/aux/dmsort_up.f90 index e5a143de..85f3dedd 100644 --- a/base/serial/aux/dmsort_up.f90 +++ b/base/serial/aux/dmsort_up.f90 @@ -76,7 +76,6 @@ subroutine dmsort_up(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine dmsort_up(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine dmsort_up(n,k,l,iret) if (k(p) > k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine dmsort_up(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine dmsort_up(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/msort_dw.f90 b/base/serial/aux/msort_dw.f90 index 3419229a..901fc2c7 100644 --- a/base/serial/aux/msort_dw.f90 +++ b/base/serial/aux/msort_dw.f90 @@ -75,7 +75,6 @@ subroutine msort_dw(n,k,l,iret) integer(psb_ipk_) :: k(n),l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -98,7 +97,7 @@ subroutine msort_dw(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -117,7 +116,7 @@ subroutine msort_dw(n,k,l,iret) if (k(p) < k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -138,7 +137,7 @@ subroutine msort_dw(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -163,7 +162,7 @@ subroutine msort_dw(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/msort_up.f90 b/base/serial/aux/msort_up.f90 index 0b878e17..04df135b 100644 --- a/base/serial/aux/msort_up.f90 +++ b/base/serial/aux/msort_up.f90 @@ -75,7 +75,6 @@ subroutine msort_up(n,k,l,iret) integer(psb_ipk_) :: k(n),l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -98,7 +97,7 @@ subroutine msort_up(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -117,7 +116,7 @@ subroutine msort_up(n,k,l,iret) if (k(p) > k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -138,7 +137,7 @@ subroutine msort_up(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -163,7 +162,7 @@ subroutine msort_up(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/smsort_dw.f90 b/base/serial/aux/smsort_dw.f90 index 338b2597..1a4918d0 100644 --- a/base/serial/aux/smsort_dw.f90 +++ b/base/serial/aux/smsort_dw.f90 @@ -76,7 +76,6 @@ subroutine smsort_dw(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine smsort_dw(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine smsort_dw(n,k,l,iret) if (k(p) < k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine smsort_dw(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine smsort_dw(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/smsort_up.f90 b/base/serial/aux/smsort_up.f90 index f56ec37f..948834c6 100644 --- a/base/serial/aux/smsort_up.f90 +++ b/base/serial/aux/smsort_up.f90 @@ -76,7 +76,6 @@ subroutine smsort_up(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine smsort_up(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine smsort_up(n,k,l,iret) if (k(p) > k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine smsort_up(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine smsort_up(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/zamsort_dw.f90 b/base/serial/aux/zamsort_dw.f90 index cefba1e3..4d022980 100644 --- a/base/serial/aux/zamsort_dw.f90 +++ b/base/serial/aux/zamsort_dw.f90 @@ -76,7 +76,6 @@ subroutine zamsort_dw(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine zamsort_dw(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine zamsort_dw(n,k,l,iret) if (k(p) < k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine zamsort_dw(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine zamsort_dw(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if diff --git a/base/serial/aux/zamsort_up.f90 b/base/serial/aux/zamsort_up.f90 index 0e26f42a..f9b44931 100644 --- a/base/serial/aux/zamsort_up.f90 +++ b/base/serial/aux/zamsort_up.f90 @@ -76,7 +76,6 @@ subroutine zamsort_up(n,k,l,iret) integer(psb_ipk_) :: l(0:n+1) ! integer(psb_ipk_) :: p,q,s,t - intrinsic iabs,isign ! .. iret = 0 ! first step: we are preparing ordered sublists, exploiting @@ -99,7 +98,7 @@ subroutine zamsort_up(n,k,l,iret) iret = 1 return else - l(n+1) = iabs(l(n+1)) + l(n+1) = abs(l(n+1)) end if mergepass: do @@ -118,7 +117,7 @@ subroutine zamsort_up(n,k,l,iret) if (k(p) > k(q)) then - l(s) = isign(q,l(s)) + l(s) = sign(q,l(s)) s = q q = l(q) if (q > 0) then @@ -139,7 +138,7 @@ subroutine zamsort_up(n,k,l,iret) else - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) s = p p = l(p) if (p>0) then @@ -164,7 +163,7 @@ subroutine zamsort_up(n,k,l,iret) p = -p q = -q if (q == 0) then - l(s) = isign(p,l(s)) + l(s) = sign(p,l(s)) l(t) = 0 exit outer end if