Changeset 15587

Timestamp:

2021-12-09T13:27:31+01:00 (2 years ago)

Author:

jcastill

Message:

Small change to allow merging to other branch

File:

• NEMO/branches/UKMO/r14075_India_uncoupled/src/OCE/stpctl.F90 (modified) (1 diff)

NEMO/branches/UKMO/r14075_India_uncoupled/src/OCE/stpctl.F90

@@ -192 +192 @@
          ELSE
             ih(1:2)= MAXLOC( ABS( sshn(:,:)   )                              ) + (/ nimpp - 1, njmpp - 1    /)   ;   ih(3) = 0
-            iu(:)  = MAXLOC( un(:,:,:)*un(:,:,:) + vn(:,:,:)*vn(:,:,:)       ) + (/ nimpp - 1, njmpp - 1, 0 /)
+            iu(:)  = MAXLOC( ABS( un  (:,:,:) )                              ) + (/ nimpp - 1, njmpp - 1, 0 /)
             is1(:) = MINLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /)
             is2(:) = MAXLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /)
             iareamin(:) = narea   ;   iareamax(:) = narea   ;   iareasum(:) = 1         ! this is local information
+            ! The following line could overwrite one of the lines above but it is here to allow merging another branch
+            iu(:)  = MAXLOC( un(:,:,:)*un(:,:,:) + vn(:,:,:)*vn(:,:,:)       ) + (/ nimpp - 1, njmpp - 1, 0 /)
          ENDIF
          !