Merge pull request #14 from arinrb/patch-1

Update src/sorting.f90
certik · Jan 31, 2013 · e6f0f45 · e6f0f45
2 parents 11454ca + f1a9672
commit e6f0f45
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/sorting.f90 b/src/sorting.f90
@@ -156,7 +156,7 @@ function iargsort(a) result(b)
 ! iargsort([10, 9, 8, 7, 6])   ! Returns [5, 4, 3, 2, 1]
 
 integer :: N                           ! number of numbers/vectors
-integer :: i,imin,relimin(1)           ! indices: i, i of smallest, relative imin
+integer :: i,imin                      ! indices: i, i of smallest
 integer :: temp                        ! temporary
 integer :: a2(size(a))
 a2 = a
@@ -166,8 +166,8 @@ function iargsort(a) result(b)
 end do
 do i = 1, N-1
     ! find ith smallest in 'a'
-    relimin = minloc(a2(i:))
-    imin = relimin(1) + i - 1
+    imin = minloc(a2(i:),1) + i - 1
+
     ! swap to position i in 'a' and 'b', if not already there
     if (imin /= i) then
         temp = a2(i); a2(i) = a2(imin); a2(imin) = temp
@@ -191,8 +191,8 @@ function rargsort(a) result(b)
 ! rargsort([4.1_dp, 2.1_dp, 2.05_dp, -1.5_dp, 4.2_dp]) ! Returns [4, 3, 2, 1, 5]
 
 integer :: N                           ! number of numbers/vectors
-integer :: i,imin,relimin(1)           ! indices: i, i of smallest, relative imin
-integer :: temp1                        ! temporary
+integer :: i,imin                      ! indices: i, i of smallest
+integer :: temp1                       ! temporary
 real(dp) :: temp2
 real(dp) :: a2(size(a))
 a2 = a
@@ -202,8 +202,7 @@ function rargsort(a) result(b)
 end do
 do i = 1, N-1
     ! find ith smallest in 'a'
-    relimin = minloc(a2(i:))
-    imin = relimin(1) + i - 1
+    imin = minloc(a2(i:),1) + i - 1
     ! swap to position i in 'a' and 'b', if not already there
     if (imin /= i) then
         temp2 = a2(i); a2(i) = a2(imin); a2(imin) = temp2