Index: NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/C1D_PAPA/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -30,6 +30,4 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/ablmod.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/ablmod.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/ablmod.F90	(revision 12353)
@@ -32,5 +32,4 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ustar2
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
 
@@ -1002,42 +1001,32 @@
       smth_b = 1._wp / 4._wp
       !
-      DO jj=1,jpj
-         DO ji=1,jpi-1
-            zumsk = msk(ji,jj) * msk(ji+1,jj)
-            zdX ( ji, jj ) = ( pvar2d( ji+1,jj ) - pvar2d( ji  ,jj ) ) * zumsk
-         END DO
-      END DO	  
+      DO_2D_11_10
+         zumsk = msk(ji,jj) * msk(ji+1,jj)
+         zdX ( ji, jj ) = ( pvar2d( ji+1,jj ) - pvar2d( ji  ,jj ) ) * zumsk
+      END_2D
       
-	  DO jj=1,jpj-1
-         DO ji=1,jpi
-            zvmsk = msk(ji,jj) * msk(ji,jj+1)
-            zdY ( ji, jj ) = ( pvar2d( ji, jj+1 ) - pvar2d( ji  ,jj ) ) * zvmsk
-         END DO
-      END DO
+	  DO_2D_10_11
+         zvmsk = msk(ji,jj) * msk(ji,jj+1)
+         zdY ( ji, jj ) = ( pvar2d( ji, jj+1 ) - pvar2d( ji  ,jj ) ) * zvmsk
+	  END_2D
       
-	  DO jj=1,jpj-1
-         DO ji=2,jpi-1
-            zFY ( ji, jj  ) =   zdY ( ji, jj   )                        &
-               & +  smth_a*  ( (zdX ( ji, jj+1 ) - zdX( ji-1, jj+1 ))   &
-               &            -  (zdX ( ji, jj   ) - zdX( ji-1, jj   ))  )
-         END DO
-      END DO
-
-      DO jj=2,jpj-1
-         DO ji=1,jpi-1
-            zFX( ji, jj  ) =    zdX( ji, jj   )                         &
-              &    + smth_a*(  (zdY( ji+1, jj ) - zdY( ji+1, jj-1))     &
-              &             -  (zdY( ji  , jj ) - zdY( ji  , jj-1)) )
-         END DO
-      END DO	  
-
-      DO jj = 2, jpj-1
-         DO ji = 2,jpi-1
-            pvar2d( ji  ,jj ) = pvar2d( ji  ,jj )              &
-     &         + msk(ji,jj) * smth_b * (                       &
-     &                  zFX( ji, jj ) - zFX( ji-1, jj )        &
-     &                 +zFY( ji, jj ) - zFY( ji, jj-1 )  )
-         END DO
-      END DO  
+	  DO_2D_10_00
+         zFY ( ji, jj  ) =   zdY ( ji, jj   )                        &
+            & +  smth_a*  ( (zdX ( ji, jj+1 ) - zdX( ji-1, jj+1 ))   &
+            &            -  (zdX ( ji, jj   ) - zdX( ji-1, jj   ))  )
+	  END_2D
+
+      DO_2D_00_10
+         zFX( ji, jj  ) =    zdX( ji, jj   )                         &
+           &    + smth_a*(  (zdY( ji+1, jj ) - zdY( ji+1, jj-1))     &
+           &             -  (zdY( ji  , jj ) - zdY( ji  , jj-1)) )
+      END_2D
+
+      DO_2D_00_00
+         pvar2d( ji  ,jj ) = pvar2d( ji  ,jj )              &
+  &         + msk(ji,jj) * smth_b * (                       &
+  &                  zFX( ji, jj ) - zFX( ji-1, jj )        &
+  &                 +zFY( ji, jj ) - zFY( ji, jj-1 )  )
+      END_2D
 	  !!
 !---------------------------------------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/sbcabl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/sbcabl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/sbcabl.F90	(revision 12353)
@@ -45,6 +45,4 @@
    PUBLIC   sbc_abl            ! routine called in sbcmod module
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.7 , NEMO-consortium (2014)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icecor.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icecor.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icecor.F90	(revision 12353)
@@ -35,5 +35,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icectl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icectl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icectl.F90	(revision 12353)
@@ -51,5 +51,4 @@
    
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedia.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedia.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedia.F90	(revision 12353)
@@ -38,6 +38,4 @@
    REAL(wp)                              ::   frc_sal, frc_voltop, frc_volbot, frc_temtop, frc_tembot  ! global forcing trends
    
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/ICE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn.F90	(revision 12353)
@@ -52,5 +52,4 @@
    
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv.F90	(revision 12353)
@@ -42,6 +42,4 @@
    INTEGER         ::   nn_UMx       ! order of the UMx advection scheme   
    !
-   !! * Substitution
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/ICE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_pra.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_pra.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_pra.F90	(revision 12353)
@@ -46,5 +46,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_umx.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_umx.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_umx.F90	(revision 12353)
@@ -51,5 +51,4 @@
    !
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -816,9 +815,9 @@
       DO jl = 1, jpl
          DO jj = 2, jpjm1         ! First derivative (gradient)
-            DO ji = 1, fs_jpim1
+            DO ji = 1, jpim1
                ztu1(ji,jj,jl) = ( pt(ji+1,jj,jl) - pt(ji,jj,jl) ) * r1_e1u(ji,jj) * umask(ji,jj,1)
             END DO
             !                     ! Second derivative (Laplacian)
-            DO ji = fs_2, fs_jpim1
+            DO ji = 2, jpim1
                ztu2(ji,jj,jl) = ( ztu1(ji,jj,jl) - ztu1(ji-1,jj,jl) ) * r1_e1t(ji,jj)
             END DO
@@ -830,9 +829,9 @@
       DO jl = 1, jpl
          DO jj = 2, jpjm1         ! Third derivative
-            DO ji = 1, fs_jpim1
+            DO ji = 1, jpim1
                ztu3(ji,jj,jl) = ( ztu2(ji+1,jj,jl) - ztu2(ji,jj,jl) ) * r1_e1u(ji,jj) * umask(ji,jj,1)
             END DO
             !                     ! Fourth derivative
-            DO ji = fs_2, fs_jpim1
+            DO ji = 2, jpim1
                ztu4(ji,jj,jl) = ( ztu3(ji,jj,jl) - ztu3(ji-1,jj,jl) ) * r1_e1t(ji,jj)
             END DO
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg.F90	(revision 12353)
@@ -38,6 +38,4 @@
    LOGICAL ::   ln_rhg_EVP       ! EVP rheology
    !
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/ICE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg_evp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg_evp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_rhg_evp.F90	(revision 12353)
@@ -48,5 +48,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icesbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icesbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icesbc.F90	(revision 12353)
@@ -37,5 +37,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icestp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icestp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icestp.F90	(revision 12353)
@@ -86,6 +86,4 @@
    PUBLIC   ice_init   ! called by sbcmod.F90
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/ICE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icethd.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icethd.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icethd.F90	(revision 12353)
@@ -53,5 +53,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icethd_pnd.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icethd_pnd.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icethd_pnd.F90	(revision 12353)
@@ -38,6 +38,4 @@
    INTEGER, PARAMETER ::   np_pndH12 = 2   ! Evolutive pond scheme (Holland et al. 2012)
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/ICE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/iceupdate.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/iceupdate.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/iceupdate.F90	(revision 12353)
@@ -44,5 +44,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_oce_interp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_oce_interp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_oce_interp.F90	(revision 12353)
@@ -49,5 +49,4 @@
    INTEGER ::   bdy_tinterp = 0
 
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ASM/asminc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ASM/asminc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ASM/asminc.F90	(revision 12353)
@@ -94,5 +94,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyncor_c1d.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyncor_c1d.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyncor_c1d.F90	(revision 12353)
@@ -31,5 +31,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyndmp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyndmp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/C1D/dyndmp.F90	(revision 12353)
@@ -43,5 +43,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsdomwri.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsdomwri.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsdomwri.F90	(revision 12353)
@@ -155,5 +155,5 @@
       DO jk = 1,jpk   
          DO jj = 1, jpj_crsm1   
-            DO ji = 1, jpi_crsm1  ! jes what to do for fs_jpim1??vector opt.
+            DO ji = 1, jpi_crsm1  ! jes what to do for jpim1??vector opt.
                zdepu(ji,jj,jk) = MIN( gdept_crs(ji,jj,jk) , gdept_crs(ji+1,jj  ,jk) ) * umask_crs(ji,jj,jk)
                zdepv(ji,jj,jk) = MIN( gdept_crs(ji,jj,jk) , gdept_crs(ji  ,jj+1,jk) ) * vmask_crs(ji,jj,jk)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsfld.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsfld.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/CRS/crsfld.F90	(revision 12353)
@@ -32,5 +32,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaar5.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaar5.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaar5.F90	(revision 12353)
@@ -39,5 +39,4 @@
       
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diacfl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diacfl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diacfl.F90	(revision 12353)
@@ -33,5 +33,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diahsb.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diahsb.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diahsb.F90	(revision 12353)
@@ -50,6 +50,4 @@
    REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   tmask_ini
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaptr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaptr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaptr.F90	(revision 12353)
@@ -61,5 +61,4 @@
    LOGICAL ::   ll_init = .TRUE.        !: tracers  trend flag (set from namelist in trdini)
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diawri.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diawri.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diawri.F90	(revision 12353)
@@ -84,5 +84,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/diu_coolskin.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/diu_coolskin.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/diu_coolskin.F90	(revision 12353)
@@ -41,5 +41,4 @@
 
       !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/closea.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/closea.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/closea.F90	(revision 12353)
@@ -51,6 +51,4 @@
    INTEGER, PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:) :: mask_csemp , mask_csgrpemp !: mask of integers defining closed seas empmr mappings
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/depth_e3.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/depth_e3.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/depth_e3.F90	(revision 12353)
@@ -36,6 +36,4 @@
    PUBLIC   e3_to_depth        ! called by domzgr.F90
       
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/dommsk.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/dommsk.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/dommsk.F90	(revision 12353)
@@ -44,5 +44,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -164,5 +163,5 @@
       DO jk = 1, jpk
          DO jj = 1, jpjm1
-            DO ji = 1, fs_jpim1   ! vector loop
+            DO ji = 1, jpim1   ! vector loop
                umask(ji,jj,jk) = tmask(ji,jj  ,jk) * tmask(ji+1,jj  ,jk)
                vmask(ji,jj,jk) = tmask(ji,jj  ,jk) * tmask(ji  ,jj+1,jk)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domvvl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domvvl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domvvl.F90	(revision 12353)
@@ -64,5 +64,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domwri.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domwri.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domwri.F90	(revision 12353)
@@ -33,5 +33,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domzgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domzgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/domzgr.F90	(revision 12353)
@@ -44,5 +44,4 @@
 
   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/istate.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/istate.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/istate.F90	(revision 12353)
@@ -42,5 +42,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/divhor.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/divhor.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/divhor.F90	(revision 12353)
@@ -39,5 +39,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv.F90	(revision 12353)
@@ -44,6 +44,4 @@
    INTEGER, PUBLIC, PARAMETER ::   np_FLX_ubs = 3   ! flux   form : 3rd order Upstream Biased Scheme
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_cen2.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_cen2.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_cen2.F90	(revision 12353)
@@ -27,5 +27,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_ubs.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_ubs.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynadv_ubs.F90	(revision 12353)
@@ -33,5 +33,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynhpg.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynhpg.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynhpg.F90	(revision 12353)
@@ -75,5 +75,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynkeg.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynkeg.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynkeg.F90	(revision 12353)
@@ -36,5 +36,4 @@
    
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf.F90	(revision 12353)
@@ -34,6 +34,4 @@
    PUBLIC   dyn_ldf_init  ! called by opa  module 
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_iso.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_iso.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_iso.F90	(revision 12353)
@@ -41,5 +41,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_lap_blp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_lap_blp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynldf_lap_blp.F90	(revision 12353)
@@ -27,5 +27,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg.F90	(revision 12353)
@@ -46,5 +46,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_exp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_exp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_exp.F90	(revision 12353)
@@ -30,5 +30,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90	(revision 12353)
@@ -86,5 +86,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynvor.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynvor.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynvor.F90	(revision 12353)
@@ -88,5 +88,4 @@
    
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -619,5 +618,5 @@
          END DO
          DO jj = 3, jpj
-            DO ji = fs_2, jpi   ! vector opt. ok because we start at jj = 3
+            DO ji = 2, jpi   ! vector opt. ok because we start at jj = 3
                ztne(ji,jj) = zwz(ji-1,jj  ,jk) + zwz(ji  ,jj  ,jk) + zwz(ji  ,jj-1,jk)
                ztnw(ji,jj) = zwz(ji-1,jj-1,jk) + zwz(ji-1,jj  ,jk) + zwz(ji  ,jj  ,jk)
@@ -741,5 +740,5 @@
          END DO
          DO jj = 3, jpj
-            DO ji = fs_2, jpi   ! vector opt. ok because we start at jj = 3
+            DO ji = 2, jpi   ! vector opt. ok because we start at jj = 3
                z1_e3t = 1._wp / e3t(ji,jj,jk,Kmm)
                ztne(ji,jj) = ( zwz(ji-1,jj  ,jk) + zwz(ji  ,jj  ,jk) + zwz(ji  ,jj-1,jk) ) * z1_e3t
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzad.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzad.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzad.F90	(revision 12353)
@@ -28,5 +28,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzdf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzdf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynzdf.F90	(revision 12353)
@@ -37,5 +37,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/sshwzv.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/sshwzv.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/sshwzv.F90	(revision 12353)
@@ -49,5 +49,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/wet_dry.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/wet_dry.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/wet_dry.F90	(revision 12353)
@@ -63,5 +63,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
 CONTAINS
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/restart.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/restart.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/IOM/restart.F90	(revision 12353)
@@ -38,6 +38,4 @@
    PUBLIC   rst_read_open   ! routine called in rst_read and (possibly) in dom_vvl_init
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfcpl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfcpl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfcpl.F90	(revision 12353)
@@ -177,20 +177,18 @@
          !
          zdssmask(:,:) = ssmask(:,:) - zssmask0(:,:)
-         DO jj = 2,jpj-1
-            DO ji = 2,jpi-1
-               jip1=ji+1; jim1=ji-1;
-               jjp1=jj+1; jjm1=jj-1;
-               !
-               zsummsk = zssmask0(jip1,jj) + zssmask0(jim1,jj) + zssmask0(ji,jjp1) + zssmask0(ji,jjm1)
-               !
-               IF (zdssmask(ji,jj) == 1._wp .AND. zsummsk /= 0._wp) THEN
-                  ssh(ji,jj,Kmm)=( zssh(jip1,jj)*zssmask0(jip1,jj)     &
-                  &           + zssh(jim1,jj)*zssmask0(jim1,jj)     &
-                  &           + zssh(ji,jjp1)*zssmask0(ji,jjp1)     &
-                  &           + zssh(ji,jjm1)*zssmask0(ji,jjm1)) / zsummsk
-                  zssmask_b(ji,jj) = 1._wp
-               ENDIF
-            END DO
-         END DO
+         DO_2D_00_00
+            jip1=ji+1; jim1=ji-1;
+            jjp1=jj+1; jjm1=jj-1;
+            !
+            zsummsk = zssmask0(jip1,jj) + zssmask0(jim1,jj) + zssmask0(ji,jjp1) + zssmask0(ji,jjm1)
+            !
+            IF (zdssmask(ji,jj) == 1._wp .AND. zsummsk /= 0._wp) THEN
+               ssh(ji,jj,Kmm)=( zssh(jip1,jj)*zssmask0(jip1,jj)     &
+               &           + zssh(jim1,jj)*zssmask0(jim1,jj)     &
+               &           + zssh(ji,jjp1)*zssmask0(ji,jjp1)     &
+               &           + zssh(ji,jjm1)*zssmask0(ji,jjm1)) / zsummsk
+               zssmask_b(ji,jj) = 1._wp
+            ENDIF
+         END_2D
          !
          zssh(:,:) = ssh(:,:,Kmm)
@@ -300,50 +298,48 @@
             zdmask(:,:) = tmask(:,:,jk) - ztmask0(:,:,jk);
             !
-            DO jj = 2,jpj-1
-               DO ji = 2,jpi-1
-                  jip1=ji+1; jim1=ji-1;
-                  jjp1=jj+1; jjm1=jj-1;
+            DO_2D_00_00
+               jip1=ji+1; jim1=ji-1;
+               jjp1=jj+1; jjm1=jj-1;
+               !
+               ! check if a wet neigbourg cell is present
+               zsummsk = ztmask0(jip1,jj  ,jk) + ztmask0(jim1,jj  ,jk) &
+                       + ztmask0(ji  ,jjp1,jk) + ztmask0(ji  ,jjm1,jk)
+               !
+               ! if neigbourg wet cell available at the same level
+               IF ( zdmask(ji,jj) == 1._wp  .AND. zsummsk /= 0._wp ) THEN
+                  !
+                  ! horizontal basic extrapolation
+                  ts(ji,jj,jk,1,Kmm)=( zts0(jip1,jj  ,jk,1) * ztmask0(jip1,jj  ,jk) &
+                  &               + zts0(jim1,jj  ,jk,1) * ztmask0(jim1,jj  ,jk) &
+                  &               + zts0(ji  ,jjp1,jk,1) * ztmask0(ji  ,jjp1,jk) &
+                  &               + zts0(ji  ,jjm1,jk,1) * ztmask0(ji  ,jjm1,jk) ) / zsummsk
+                  ts(ji,jj,jk,2,Kmm)=( zts0(jip1,jj  ,jk,2) * ztmask0(jip1,jj  ,jk) &
+                  &               + zts0(jim1,jj  ,jk,2) * ztmask0(jim1,jj  ,jk) &
+                  &               + zts0(ji  ,jjp1,jk,2) * ztmask0(ji  ,jjp1,jk) &
+                  &               + zts0(ji  ,jjm1,jk,2) * ztmask0(ji  ,jjm1,jk) ) / zsummsk
+                  !
+                  ! update mask for next pass
+                  ztmask1(ji,jj,jk)=1
+                  !
+               ! in case no neigbourg wet cell available at the same level
+               ! check if a wet cell is available below
+               ELSEIF (zdmask(ji,jj) == 1._wp .AND. zsummsk == 0._wp) THEN
+                  !
+                  ! vertical extrapolation if horizontal extrapolation failed
+                  jkm1=max(1,jk-1) ; jkp1=min(jpk,jk+1)
                   !
                   ! check if a wet neigbourg cell is present
-                  zsummsk = ztmask0(jip1,jj  ,jk) + ztmask0(jim1,jj  ,jk) &
-                          + ztmask0(ji  ,jjp1,jk) + ztmask0(ji  ,jjm1,jk)
-                  !
-                  ! if neigbourg wet cell available at the same level
-                  IF ( zdmask(ji,jj) == 1._wp  .AND. zsummsk /= 0._wp ) THEN
-                     !
-                     ! horizontal basic extrapolation
-                     ts(ji,jj,jk,1,Kmm)=( zts0(jip1,jj  ,jk,1) * ztmask0(jip1,jj  ,jk) &
-                     &               + zts0(jim1,jj  ,jk,1) * ztmask0(jim1,jj  ,jk) &
-                     &               + zts0(ji  ,jjp1,jk,1) * ztmask0(ji  ,jjp1,jk) &
-                     &               + zts0(ji  ,jjm1,jk,1) * ztmask0(ji  ,jjm1,jk) ) / zsummsk
-                     ts(ji,jj,jk,2,Kmm)=( zts0(jip1,jj  ,jk,2) * ztmask0(jip1,jj  ,jk) &
-                     &               + zts0(jim1,jj  ,jk,2) * ztmask0(jim1,jj  ,jk) &
-                     &               + zts0(ji  ,jjp1,jk,2) * ztmask0(ji  ,jjp1,jk) &
-                     &               + zts0(ji  ,jjm1,jk,2) * ztmask0(ji  ,jjm1,jk) ) / zsummsk
+                  zsummsk = ztmask0(ji,jj,jkm1) + ztmask0(ji,jj,jkp1)
+                  IF (zdmask(ji,jj) == 1._wp .AND. zsummsk /= 0._wp ) THEN
+                     ts(ji,jj,jk,1,Kmm)=( zts0(ji,jj,jkp1,1)*ztmask0(ji,jj,jkp1)     &
+                     &               + zts0(ji,jj,jkm1,1)*ztmask0(ji,jj,jkm1)) / zsummsk
+                     ts(ji,jj,jk,2,Kmm)=( zts0(ji,jj,jkp1,2)*ztmask0(ji,jj,jkp1)     &
+                     &               + zts0(ji,jj,jkm1,2)*ztmask0(ji,jj,jkm1)) / zsummsk
                      !
                      ! update mask for next pass
-                     ztmask1(ji,jj,jk)=1
-                     !
-                  ! in case no neigbourg wet cell available at the same level
-                  ! check if a wet cell is available below
-                  ELSEIF (zdmask(ji,jj) == 1._wp .AND. zsummsk == 0._wp) THEN
-                     !
-                     ! vertical extrapolation if horizontal extrapolation failed
-                     jkm1=max(1,jk-1) ; jkp1=min(jpk,jk+1)
-                     !
-                     ! check if a wet neigbourg cell is present
-                     zsummsk = ztmask0(ji,jj,jkm1) + ztmask0(ji,jj,jkp1)
-                     IF (zdmask(ji,jj) == 1._wp .AND. zsummsk /= 0._wp ) THEN
-                        ts(ji,jj,jk,1,Kmm)=( zts0(ji,jj,jkp1,1)*ztmask0(ji,jj,jkp1)     &
-                        &               + zts0(ji,jj,jkm1,1)*ztmask0(ji,jj,jkm1)) / zsummsk
-                        ts(ji,jj,jk,2,Kmm)=( zts0(ji,jj,jkp1,2)*ztmask0(ji,jj,jkp1)     &
-                        &               + zts0(ji,jj,jkm1,2)*ztmask0(ji,jj,jkm1)) / zsummsk
-                        !
-                        ! update mask for next pass
-                        ztmask1(ji,jj,jk)=1._wp
-                     END IF
+                     ztmask1(ji,jj,jk)=1._wp
                   END IF
-               END DO
-            END DO
+               END IF
+            END_2D
          END DO
          !
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfdyn.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfdyn.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfdyn.F90	(revision 12353)
@@ -73,5 +73,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfslp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfslp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldfslp.F90	(revision 12353)
@@ -74,5 +74,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -242,5 +241,5 @@
          END_2D
          DO jj = 3, jpj-2                               ! other rows
-            DO ji = fs_2, fs_jpim1   ! vector opt.
+            DO ji = 2, jpim1   ! vector opt.
                uslp(ji,jj,jk) = z1_16 * (        zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk)      &
                   &                       +      zwz(ji-1,jj+1,jk) + zwz(ji+1,jj+1,jk)      &
@@ -318,5 +317,5 @@
          END_2D
          DO jj = 3, jpj-2                               ! other rows
-            DO ji = fs_2, fs_jpim1   ! vector opt.
+            DO ji = 2, jpim1   ! vector opt.
                zcofw = wmask(ji,jj,jk) * z1_16
                wslpi(ji,jj,jk) = (         zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk)     &
@@ -745,5 +744,5 @@
 !            DO jk = 1, jpk
 !               DO jj = 2, jpjm1
-!                  DO ji = fs_2, fs_jpim1   ! vector opt.
+!                  DO ji = 2, jpim1   ! vector opt.
 !                     uslp (ji,jj,jk) = - ( gdept(ji+1,jj,jk,Kmm) - gdept(ji ,jj ,jk,Kmm) ) * r1_e1u(ji,jj) * umask(ji,jj,jk)
 !                     vslp (ji,jj,jk) = - ( gdept(ji,jj+1,jk,Kmm) - gdept(ji ,jj ,jk,Kmm) ) * r1_e2v(ji,jj) * vmask(ji,jj,jk)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldftra.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldftra.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LDF/ldftra.F90	(revision 12353)
@@ -94,5 +94,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/cyclone.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/cyclone.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/cyclone.F90	(revision 12353)
@@ -37,5 +37,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/geo2ocean.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/geo2ocean.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/geo2ocean.F90	(revision 12353)
@@ -43,5 +43,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbc_oce.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbc_oce.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbc_oce.F90	(revision 12353)
@@ -159,5 +159,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcabl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcabl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcabl.F90	(revision 12353)
@@ -16,6 +16,4 @@
    PUBLIC   sbc_abl            ! routine called in sbcmod module
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.7 , NEMO-consortium (2014)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90	(revision 12353)
@@ -128,5 +128,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbccpl.F90	(revision 12353)
@@ -198,5 +198,4 @@
 
    !! Substitution
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcflx.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcflx.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcflx.F90	(revision 12353)
@@ -38,5 +38,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcfwb.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcfwb.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcfwb.F90	(revision 12353)
@@ -39,6 +39,4 @@
    REAL(wp) ::   area      ! global mean ocean surface (interior domain)
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcwave.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcwave.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcwave.F90	(revision 12353)
@@ -72,5 +72,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/STO/stopts.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/STO/stopts.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/STO/stopts.F90	(revision 12353)
@@ -26,5 +26,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/eosbn2.F90	(revision 12353)
@@ -179,5 +179,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv.F90	(revision 12353)
@@ -66,6 +66,4 @@
    INTEGER, PARAMETER ::   np_QCK     = 5   ! QUICK scheme
    
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_cen.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_cen.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_cen.F90	(revision 12353)
@@ -36,5 +36,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_fct.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_fct.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_fct.F90	(revision 12353)
@@ -45,5 +45,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_mus.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_mus.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_mus.F90	(revision 12353)
@@ -46,5 +46,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_qck.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_qck.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_qck.F90	(revision 12353)
@@ -40,5 +40,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_ubs.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_ubs.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_ubs.F90	(revision 12353)
@@ -38,5 +38,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90	(revision 12353)
@@ -57,5 +57,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trabbl.F90	(revision 12353)
@@ -67,5 +67,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tradmp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tradmp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tradmp.F90	(revision 12353)
@@ -52,5 +52,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traisf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traisf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traisf.F90	(revision 12353)
@@ -22,5 +22,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf.F90	(revision 12353)
@@ -38,6 +38,4 @@
    PUBLIC   tra_ldf_init   ! called by nemogcm.F90 
    
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_iso.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_iso.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_iso.F90	(revision 12353)
@@ -40,5 +40,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -262,6 +261,4 @@
          !!   III - vertical trend (full)
          !!----------------------------------------------------------------------
-         !
-         ztfw(fs_2:1,:,:) = 0._wp     ;     ztfw(jpi:fs_jpim1,:,:) = 0._wp   ! avoid to potentially manipulate NaN values
          !
          ! Vertical fluxes
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_lap_blp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_lap_blp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_lap_blp.F90	(revision 12353)
@@ -37,5 +37,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_triad.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_triad.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traldf_triad.F90	(revision 12353)
@@ -40,5 +40,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tramle.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tramle.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tramle.F90	(revision 12353)
@@ -48,5 +48,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tranpc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tranpc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/tranpc.F90	(revision 12353)
@@ -34,5 +34,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traqsr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traqsr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traqsr.F90	(revision 12353)
@@ -67,5 +67,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -170,5 +169,5 @@
             DO jk = 1, nksr + 1
                DO jj = 2, jpjm1                       ! Separation in R-G-B depending of the surface Chl
-                  DO ji = fs_2, fs_jpim1
+                  DO ji = 2, jpim1
                      zchl    = MIN( 10. , MAX( 0.03, sf_chl(1)%fnow(ji,jj,1) ) )
                      zCtot   = 40.6  * zchl**0.459
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trasbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trasbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trasbc.F90	(revision 12353)
@@ -42,5 +42,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trazdf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trazdf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/trazdf.F90	(revision 12353)
@@ -36,5 +36,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/zpshde.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/zpshde.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/zpshde.F90	(revision 12353)
@@ -31,5 +31,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trddyn.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trddyn.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trddyn.F90	(revision 12353)
@@ -36,5 +36,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdglo.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdglo.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdglo.F90	(revision 12353)
@@ -51,5 +51,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdini.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdini.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdini.F90	(revision 12353)
@@ -25,6 +25,4 @@
    PUBLIC   trd_init   ! called by nemogcm.F90 module
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdken.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdken.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdken.F90	(revision 12353)
@@ -40,5 +40,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdpen.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdpen.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdpen.F90	(revision 12353)
@@ -35,6 +35,4 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::   rab_pe   ! partial derivatives of PE anomaly with respect to T and S
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdtra.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdtra.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdtra.F90	(revision 12353)
@@ -41,5 +41,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdvor.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdvor.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdvor.F90	(revision 12353)
@@ -56,5 +56,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_fmask.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_fmask.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_fmask.F90	(revision 12353)
@@ -26,6 +26,4 @@
    PUBLIC   usr_def_fmask    ! routine called by dommsk.F90
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_sbc.F90	(revision 12353)
@@ -31,5 +31,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/USR/usrdef_zgr.F90	(revision 12353)
@@ -29,6 +29,4 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfddm.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfddm.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfddm.F90	(revision 12353)
@@ -30,5 +30,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfdrg.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfdrg.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfdrg.F90	(revision 12353)
@@ -73,5 +73,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfgls.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfgls.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfgls.F90	(revision 12353)
@@ -104,5 +104,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfiwm.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfiwm.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfiwm.F90	(revision 12353)
@@ -49,5 +49,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfric.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfric.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfric.F90	(revision 12353)
@@ -50,5 +50,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdftke.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdftke.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdftke.F90	(revision 12353)
@@ -89,5 +89,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/do_loop_substitute.h90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/do_loop_substitute.h90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/do_loop_substitute.h90	(revision 12353)
@@ -1,3 +1,3 @@
-#ifdef show_comments
+#if defined show_comments
 ! These comments are not intended to be retained during preprocessing; i.e. do not define "show_comments"
 !!----------------------------------------------------------------------
@@ -50,36 +50,37 @@
 ! includes the possibility of strides for which an extra set of DO_3DS macros are defined.
 !
-! In the definitions below the inner PE domain is defined by start indices of (kIs, kJs) and end indices of (kIe, KJe)
+! In the following definitions the inner PE domain is defined by start indices of (___kIs_, __kJs_) and end indices of (__kIe_, __kJe_)
+! The following macros are defined just below: ___kIs_, __kJs_, ___kIsm1_, __kJsm1_, ___kIe_, __kJe_, ___kIep1_, __kJep1_. 
+! These names are chosen to, hopefully, avoid any future, unintended matches elsewhere in the code.
 !
 #endif
-#define kIs     2
-#define kJs     2
-#define kIsm1   1
-#define kJsm1   1
+#define __kIs_     2
+#define __kJs_     2
+#define __kIsm1_   1
+#define __kJsm1_   1
 
-#define kIe     jpim1
-#define kJe     jpjm1
-#define kIep1   jpi
-#define kJep1   jpj
+#define __kIe_     jpim1
+#define __kJe_     jpjm1
+#define __kIep1_   jpi
+#define __kJep1_   jpj
 
-#define DO_2D_00_00   DO jj = kJs, kJe   ;   DO ji = kIs, kIe
-#define DO_2D_00_01   DO jj = kJs, kJe   ;   DO ji = kIs, kIep1
-#define DO_2D_00_10   DO jj = kJs, kJe   ;   DO ji = kIsm1, kIe
-#define DO_2D_00_11   DO jj = kJs, kJe   ;   DO ji = kIsm1, kIep1
+#define DO_2D_00_00   DO jj = __kJs_, __kJe_   ;   DO ji = __kIs_, __kIe_
+#define DO_2D_00_01   DO jj = __kJs_, __kJe_   ;   DO ji = __kIs_, __kIep1_
+#define DO_2D_00_10   DO jj = __kJs_, __kJe_   ;   DO ji = __kIsm1_, __kIe_
+#define DO_2D_00_11   DO jj = __kJs_, __kJe_   ;   DO ji = __kIsm1_, __kIep1_
  
-#define DO_2D_01_00   DO jj = kJs, kJep1   ;   DO ji = kIs, kIe
-#define DO_2D_01_01   DO jj = kJs, kJep1   ;   DO ji = kIs, kIep1
-#define DO_2D_01_10   DO jj = kJs, kJep1   ;   DO ji = kIsm1, kIe
-#define DO_2D_01_11   DO jj = kJs, kJep1   ;   DO ji = kIsm1, kIep1
+#define DO_2D_01_00   DO jj = __kJs_, __kJep1_   ;   DO ji = __kIs_, __kIe_
+#define DO_2D_01_01   DO jj = __kJs_, __kJep1_   ;   DO ji = __kIs_, __kIep1_
+#define DO_2D_01_10   DO jj = __kJs_, __kJep1_   ;   DO ji = __kIsm1_, __kIe_
+#define DO_2D_01_11   DO jj = __kJs_, __kJep1_   ;   DO ji = __kIsm1_, __kIep1_
  
-#define DO_2D_10_00   DO jj = kJsm1, kJe   ;   DO ji = kIs, kIe
-#define DO_2D_10_10   DO jj = kJsm1, kJe   ;   DO ji = kIsm1, kIe
-#define DO_2D_10_11   DO jj = kJsm1, kJe   ;   DO ji = kIsm1, kIep1
+#define DO_2D_10_00   DO jj = __kJsm1_, __kJe_   ;   DO ji = __kIs_, __kIe_
+#define DO_2D_10_10   DO jj = __kJsm1_, __kJe_   ;   DO ji = __kIsm1_, __kIe_
+#define DO_2D_10_11   DO jj = __kJsm1_, __kJe_   ;   DO ji = __kIsm1_, __kIep1_
  
-#define DO_2D_11_00   DO jj = kJsm1, kJep1   ;   DO ji = kIs, kIe
-#define DO_2D_11_01   DO jj = kJsm1, kJep1   ;   DO ji = kIs, kIep1
-#define DO_2D_11_10   DO jj = kJsm1, kJep1   ;   DO ji = kIsm1, kIe
-#define DO_2D_11_11   DO jj = kJsm1, kJep1   ;   DO ji = kIsm1, kIep1
-
+#define DO_2D_11_00   DO jj = __kJsm1_, __kJep1_   ;   DO ji = __kIs_, __kIe_
+#define DO_2D_11_01   DO jj = __kJsm1_, __kJep1_   ;   DO ji = __kIs_, __kIep1_
+#define DO_2D_11_10   DO jj = __kJsm1_, __kJep1_   ;   DO ji = __kIsm1_, __kIe_
+#define DO_2D_11_11   DO jj = __kJsm1_, __kJep1_   ;   DO ji = __kIsm1_, __kIep1_
 
 #define DO_3D_00_00(ks,ke)   DO jk = ks, ke   ;   DO_2D_00_00
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/vectopt_loop_substitute.h90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/vectopt_loop_substitute.h90	(revision 12351)
+++ 	(revision )
@@ -1,18 +1,0 @@
-   !!----------------------------------------------------------------------
-   !!                   ***  vectopt_loop_substitute  ***
-   !!----------------------------------------------------------------------
-   !! ** purpose :   substitute the inner loop start/end indices with CPP macro
-   !!                allow unrolling of do-loop (useful with vector processors)
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !! NEMO/OCE 4.0 , NEMO Consortium (2018)
-   !! $Id$ 
-   !! Software governed by the CeCILL license (see ./LICENSE)
-   !!----------------------------------------------------------------------
-#if defined key_vectopt_loop
-#  define   fs_2       1
-#  define   fs_jpim1   jpi
-#else
-#  define   fs_2       2
-#  define   fs_jpim1   jpim1
-#endif
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/diawri.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/diawri.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/SAS/diawri.F90	(revision 12353)
@@ -64,6 +64,4 @@
    INTEGER, SAVE, ALLOCATABLE, DIMENSION(:) :: ndex_hA, ndex_A ! ABL
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/SAS 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zbio.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zbio.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zbio.F90	(revision 12353)
@@ -57,5 +57,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zexp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zexp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P2Z/p2zexp.F90	(revision 12353)
@@ -38,5 +38,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/P4Z/p4zbc.F90	(revision 12353)
@@ -47,5 +47,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/trcdmp_sed.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/trcdmp_sed.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/PISCES/SED/trcdmp_sed.F90	(revision 12353)
@@ -35,5 +35,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcadv.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcadv.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcadv.F90	(revision 12353)
@@ -59,6 +59,4 @@
    INTEGER, PARAMETER ::   np_QCK     = 5   ! QUICK scheme
    
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/TOP 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcdmp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcdmp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcdmp.F90	(revision 12353)
@@ -44,5 +44,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcldf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcldf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcldf.F90	(revision 12353)
@@ -43,5 +43,4 @@
    
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcsbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcsbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/TRP/trcsbc.F90	(revision 12353)
@@ -29,5 +29,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/src/TOP/trcbc.F90	(revision 12353)
@@ -47,5 +47,4 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/diawri.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/diawri.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/diawri.F90	(revision 12353)
@@ -77,6 +77,4 @@
    INTEGER, SAVE, ALLOCATABLE, DIMENSION(:) :: ndex_bT
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -30,6 +30,4 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO Consortium (2016)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/zdfiwm.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/zdfiwm.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/zdfiwm.F90	(revision 12353)
@@ -48,6 +48,4 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hcri_iwm   ! decay scale for low-mode critical slope dissipation (m)
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/diawri.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/diawri.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/diawri.F90	(revision 12353)
@@ -76,6 +76,4 @@
    INTEGER, SAVE, ALLOCATABLE, DIMENSION(:) :: ndex_bT
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/domvvl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/domvvl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/domvvl.F90	(revision 12353)
@@ -62,6 +62,4 @@
    REAL(wp)        , ALLOCATABLE, SAVE, DIMENSION(:,:)   :: frq_rst_hdv                 ! retoring period for low freq. divergence
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/trazdf.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/trazdf.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/trazdf.F90	(revision 12353)
@@ -35,6 +35,4 @@
    PUBLIC   tra_zdf_imp   ! called by trczdf.F90
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -31,6 +31,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -31,6 +31,4 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -33,6 +33,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -25,6 +25,4 @@
    PUBLIC   usr_def_zgr   ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -33,6 +33,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -25,6 +25,4 @@
    PUBLIC   usr_def_zgr   ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -33,6 +33,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -25,6 +25,4 @@
    PUBLIC   usr_def_zgr   ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/eosbn2.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/eosbn2.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/eosbn2.F90	(revision 12353)
@@ -180,6 +180,4 @@
    REAL(wp) ::   BPE002
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/istate.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/istate.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/istate.F90	(revision 12353)
@@ -41,6 +41,4 @@
    PUBLIC   istate_init   ! routine called by step.F90
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/sbcfwb.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/sbcfwb.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/sbcfwb.F90	(revision 12353)
@@ -39,6 +39,4 @@
    REAL(wp) ::   area      ! global mean ocean surface (interior domain)
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/tradmp.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/tradmp.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/tradmp.F90	(revision 12353)
@@ -51,6 +51,4 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   resto    !: restoring coeff. on T and S (s-1)
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -32,6 +32,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -32,6 +32,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -30,6 +30,4 @@
    PUBLIC   usr_def_zgr   ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -31,6 +31,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -27,6 +27,4 @@
    PUBLIC   usr_def_zgr   ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -31,6 +31,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -29,6 +29,4 @@
    PUBLIC   usr_def_zgr   ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/diawri.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/diawri.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/diawri.F90	(revision 12353)
@@ -55,6 +55,4 @@
    INTEGER, SAVE, ALLOCATABLE, DIMENSION(:) :: ndex_hT, ndex_hU, ndex_hV
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/SAS 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/domvvl.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/domvvl.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/domvvl.F90	(revision 12353)
@@ -63,6 +63,4 @@
    REAL(wp)        , ALLOCATABLE, SAVE, DIMENSION(:,:)   :: frq_rst_hdv                 ! retoring period for low freq. divergence
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -415,5 +413,5 @@
          DO jk = 1, jpkm1        ! a - first derivative: diffusive fluxes
             DO jj = 1, jpjm1
-               DO ji = 1, fs_jpim1   ! vector opt.
+               DO ji = 1, jpim1   ! vector opt.
                   un_td(ji,jj,jk) = rn_ahe3 * umask(ji,jj,jk) * e2_e1u(ji,jj)           &
                      &            * ( tilde_e3t_b(ji,jj,jk) - tilde_e3t_b(ji+1,jj  ,jk) )
@@ -433,5 +431,5 @@
          DO jk = 1, jpkm1        ! c - second derivative: divergence of diffusive fluxes
             DO jj = 2, jpjm1
-               DO ji = fs_2, fs_jpim1   ! vector opt.
+               DO ji = 2, jpim1   ! vector opt.
                   tilde_e3t_a(ji,jj,jk) = tilde_e3t_a(ji,jj,jk) + (   un_td(ji-1,jj  ,jk) - un_td(ji,jj,jk)    &
                      &                                          +     vn_td(ji  ,jj-1,jk) - vn_td(ji,jj,jk)    &
@@ -731,5 +729,5 @@
          DO jk = 1, jpk
             DO jj = 1, jpjm1
-               DO ji = 1, fs_jpim1   ! vector opt.
+               DO ji = 1, jpim1   ! vector opt.
                   pe3_out(ji,jj,jk) = 0.5_wp * (  umask(ji,jj,jk) * (1.0_wp - zlnwd) + zlnwd ) * r1_e1e2u(ji,jj)   &
                      &                       * (   e1e2t(ji  ,jj) * ( pe3_in(ji  ,jj,jk) - e3t_0(ji  ,jj,jk) )     &
@@ -744,5 +742,5 @@
          DO jk = 1, jpk
             DO jj = 1, jpjm1
-               DO ji = 1, fs_jpim1   ! vector opt.
+               DO ji = 1, jpim1   ! vector opt.
                   pe3_out(ji,jj,jk) = 0.5_wp * ( vmask(ji,jj,jk)  * (1.0_wp - zlnwd) + zlnwd ) * r1_e1e2v(ji,jj)   &
                      &                       * (   e1e2t(ji,jj  ) * ( pe3_in(ji,jj  ,jk) - e3t_0(ji,jj  ,jk) )     &
@@ -757,5 +755,5 @@
          DO jk = 1, jpk
             DO jj = 1, jpjm1
-               DO ji = 1, fs_jpim1   ! vector opt.
+               DO ji = 1, jpim1   ! vector opt.
                   pe3_out(ji,jj,jk) = 0.5_wp * (  umask(ji,jj,jk) * umask(ji,jj+1,jk) * (1.0_wp - zlnwd) + zlnwd ) &
                      &                       *    r1_e1e2f(ji,jj)                                                  &
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -30,6 +30,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -29,6 +29,4 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
-  !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_sbc.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_sbc.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_sbc.F90	(revision 12353)
@@ -31,6 +31,4 @@
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Index: NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_zgr.F90
===================================================================
--- NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_zgr.F90	(revision 12351)
+++ NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_zgr.F90	(revision 12353)
@@ -29,6 +29,4 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
