review response - use select case (this%grid_type)

COSIMA · Nov 4, 2024 · f7d11bd · f7d11bd
1 parent cb68a69
commit f7d11bd
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/topography.f90 b/src/topography.f90
@@ -340,17 +340,17 @@ subroutine topography_number_seas(this, sea_number, number_of_seas, silent)
           im = i - 1
           ip = i + 1
           if (sea(i, j) < land .and. sea(i, j) > 0) then
-            if ( this%grid_type == 'C' ) then
-              new_sea = min(sea(i, j), sea(im, j), sea(ip, j), sea(i, jm), sea(i, jp))
-            else
-              ! get chokes, assuming B-grid connectivity rules
+            select case (this%grid_type)
+            case ('B')
               choke_east = .not. (any(sea(i:ip, jp) == land) .and. any(sea(i:ip, jm) == land))
               choke_west = .not. (any(sea(im:i, jp) == land) .and. any(sea(im:i, jm) == land))
               choke_south = .not. (any(sea(im, jm:j) == land) .and. any(sea(ip, jm:j) == land))
               choke_north = .not. (any(sea(im, j:jp) == land) .and. any(sea(ip, j:jp) == land))
               new_sea = min(sea(i, j), minval([sea(im, j), sea(ip, j), sea(i, jm), sea(i, jp)], &
                 mask=[choke_west, choke_east, choke_south, choke_north]))
-            end if
+            case ('C')
+              new_sea = min(sea(i, j), sea(im, j), sea(ip, j), sea(i, jm), sea(i, jp))
+            end select
             if (sea(i, j) /= new_sea) then
               sea(i, j) = new_sea
               counter = counter + 1
@@ -387,17 +387,17 @@ subroutine topography_number_seas(this, sea_number, number_of_seas, silent)
           im = i - 1
           ip = i + 1
           if (sea(i, j) < land .and. sea(i, j) > 0) then
-            if ( this%grid_type == 'C' ) then
-              new_sea = min(sea(i, j), sea(i, j), sea(im, j), sea(ip, j), sea(i, jm), sea(i, jp))
-            else
-              ! get chokes, assuming B-grid connectivity rules
+            select case (this%grid_type)
+            case ('B')
               choke_east = .not. (any(sea(i:ip, jp) == land) .and. any(sea(i:ip, jm) == land))
               choke_west = .not. (any(sea(im:i, jp) == land) .and. any(sea(im:i, jm) == land))
               choke_south = .not. (any(sea(im, jm:j) == land) .and. any(sea(ip, jm:j) == land))
               choke_north = .not. (any(sea(im, j:jp) == land) .and. any(sea(ip, j:jp) == land))
               new_sea = min(sea(i, j), minval([sea(im, j), sea(ip, j), sea(i, jm), sea(i, jp)], &
                 mask=[choke_west, choke_east, choke_south, choke_north]))
-            end if
+            case ('C')
+              new_sea = min(sea(i, j), sea(im, j), sea(ip, j), sea(i, jm), sea(i, jp))
+            end select
             if (sea(i, j) /= new_sea) then
               sea(i, j) = new_sea
               counter = counter + 1