fix: shift tests

Author: gha3mi

src/forcolormap.f90

@@ -1038,7 +1038,7 @@ pure subroutine shift(self, sh)
         class(Colormap), intent(inout) :: self
         integer, intent(in) :: sh   !! The shift
 
-        self%map = cshift(self%map, sh)
+        self%map = cshift(self%map, sh, dim=1)
     end subroutine
 
     !> Extracts colors from the colormap based on specified number of levels (extractedLevels).

test/check.f90

@@ -960,34 +960,30 @@ subroutine test_043(id, nfail)
       call report_test(name, ok, id, nfail)
    end subroutine test_043
 
-   !> shift(+1) should match the intrinsic circular shift `cshift(map, +1)`.
+   !> shift(+1) should match the intrinsic circular shift `cshift(map, +1, dim=1)`.
    subroutine test_044(id, nfail)
       use forcolormap, only: Colormap, wp
       integer, intent(inout) :: id, nfail
       character(len=*), parameter :: name = "Colormap%shift: matches cshift for sh=+1"
       logical :: ok
       type(Colormap) :: cm
-      integer :: map(3,3)
-      integer :: ref(3,3)
-      integer :: i
-      integer :: r, g, b, rr, gg, bb
+      integer :: map(0:2,3)
+      integer :: ref(0:2,3)
+      integer :: i, r, g, b
 
-      map(1,:) = [ 10, 20, 30 ]
-      map(2,:) = [ 40, 50, 60 ]
-      map(3,:) = [ 70, 80, 90 ]
+      map(0,:) = [ 10, 20, 30 ]
+      map(1,:) = [ 40, 50, 60 ]
+      map(2,:) = [ 70, 80, 90 ]
 
       call cm%create("custom", 0.0_wp, 2.0_wp, map)
 
-      ref = cshift(map, 1)
+      ref = cshift(map, 1, dim=1)
       call cm%shift(1)
 
       ok = .true.
       do i = 0, cm%get_levels()-1
          call cm%get_RGB(i, r, g, b)
-         rr = ref(i+1, 1)
-         gg = ref(i+1, 2)
-         bb = ref(i+1, 3)
-         ok = ok .and. (r == rr) .and. (g == gg) .and. (b == bb)
+         ok = ok .and. (r == ref(i,1)) .and. (g == ref(i,2)) .and. (b == ref(i,3))
       end do
 
       call report_test(name, ok, id, nfail)
@@ -1086,34 +1082,30 @@ subroutine test_048(id, nfail)
       call report_test(name, ok, id, nfail)
    end subroutine test_048
 
-   !> shift(-1) should match the intrinsic circular shift `cshift(map, -1)`.
+   !> shift(-1) should match the intrinsic circular shift `cshift(map, -1, dim=1)`.
    subroutine test_049(id, nfail)
       use forcolormap, only: Colormap, wp
       integer, intent(inout) :: id, nfail
       character(len=*), parameter :: name = "Colormap%shift: matches cshift for sh=-1"
       logical :: ok
       type(Colormap) :: cm
-      integer :: map(3,3)
-      integer :: ref(3,3)
-      integer :: i
-      integer :: r, g, b, rr, gg, bb
+      integer :: map(0:2,3)
+      integer :: ref(0:2,3)
+      integer :: i, r, g, b
 
-      map(1,:) = [ 10, 20, 30 ]
-      map(2,:) = [ 40, 50, 60 ]
-      map(3,:) = [ 70, 80, 90 ]
+      map(0,:) = [ 10, 20, 30 ]
+      map(1,:) = [ 40, 50, 60 ]
+      map(2,:) = [ 70, 80, 90 ]
 
       call cm%create("custom", 0.0_wp, 2.0_wp, map)
 
-      ref = cshift(map, -1)
+      ref = cshift(map, -1, dim=1)
       call cm%shift(-1)
 
       ok = .true.
       do i = 0, cm%get_levels()-1
          call cm%get_RGB(i, r, g, b)
-         rr = ref(i+1, 1)
-         gg = ref(i+1, 2)
-         bb = ref(i+1, 3)
-         ok = ok .and. (r == rr) .and. (g == gg) .and. (b == bb)
+         ok = ok .and. (r == ref(i,1)) .and. (g == ref(i,2)) .and. (b == ref(i,3))
       end do
 
       call report_test(name, ok, id, nfail)
@@ -1260,22 +1252,22 @@ subroutine test_054(id, nfail)
 
       call cmap%create("discrete", 0.0_wp, 2.0_wp, test_colormap)
 
-      ref = cshift(test_colormap, 2)
+      ref = cshift(test_colormap, 2, dim=1)
       call cmap%shift(2)
       ok = .true.
       do i = 0, 6
          call cmap%get_RGB(i, r, g, b)
          ok = ok .and. (r == ref(i,1)) .and. (g == ref(i,2)) .and. (b == ref(i,3))
       end do
 
-      ref = cshift(ref, -1)
+      ref = cshift(ref, -1, dim=1)
       call cmap%shift(-1)
       do i = 0, 6
          call cmap%get_RGB(i, r, g, b)
          ok = ok .and. (r == ref(i,1)) .and. (g == ref(i,2)) .and. (b == ref(i,3))
       end do
 
-      ref = cshift(ref, -1)
+      ref = cshift(ref, -1, dim=1)
       call cmap%shift(-1)
       do i = 0, 6
          call cmap%get_RGB(i, r, g, b)
@@ -1576,7 +1568,7 @@ subroutine test_067(id, nfail)
 
       sh    = 100
       shmod = modulo(sh, cm%get_levels())
-      ref   = cshift(test_colormap, shmod)
+      ref   = cshift(test_colormap, shmod, dim=1)
 
       call cm%shift(sh)