Changeset 12554

Timestamp:

2020-03-13T17:22:06+01:00 (3 years ago)

Author:

jcastill

Message:

Fixes to the velocity limiter and vertical interpolation

File:

• NEMO/branches/UKMO/r12083_India_uncoupled/src/OCE/DYN/dynnxt.F90 (modified) (4 diffs)

NEMO/branches/UKMO/r12083_India_uncoupled/src/OCE/DYN/dynnxt.F90

@@ -58 +58 @@
    PUBLIC    dyn_nxt   ! routine called by step.F90
 
+   !! Substitution
+#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -406 +408 @@
  
       DO jk = 1, jpkm1 
-         DO jj = 1, jpjm1 
-            DO ji = 1, jpim1 
+         DO jj = 2, jpjm1 
+            DO ji = fs_2, fs_jpim1   ! vect. opt.
                ! U direction 
                zzu = un(ji,jj,jk) 
@@ -425 +427 @@
                ! limit currents 
                un(ji,jj,jk) = min ( zzu,zplim) * isp + max(zzu,zmlim) *ism 
+
                ! V  direction 
                zzu = vn(ji,jj,jk) 
@@ -439 +442 @@
                zmlim = -zzcn * (e3t_n(ji,jj+1,jk) * e1t(ji,jj+1) * e2t(ji,jj+1)) / & 
                                                (2.0*rdt * ze3e1)*vmask(ji,jj,jk) 
+               ! limit currents 
                vn(ji,jj,jk) = min ( zzu,zplim) * isp + max(zzu,zmlim) *ism 
             ENDDO 
          ENDDO 
       ENDDO 
+      CALL lbc_lnk_multi( 'dynnxt', un(:,:,:), 'U',  -1., vn(:,:,:), 'V',  -1. )
  
     END SUBROUTINE dyn_limit_velocity