Changeset 12353 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_umx.F90

Timestamp:

2020-01-29T17:15:37+01:00 (4 years ago)

Author:

acc

Message:

Branch 2019/dev_r11943_MERGE_2019. Additions to the do loop macro implementation: converted a few loops previously missed because they used jpi-1 instead of jpim1 etc.; changed internal macro names in do_loop_substitute.h90 to strings that are much more unlikely to appear in any future code elsewhere and removed the key_vectopt_loop option (and all related code) since the do loop macros have suppressed this option. These changes have been fully SETTE-tested and this branch should now be ready to go back to the trunk.

File:

• NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_umx.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/ICE/icedyn_adv_umx.F90

@@ -51 +51 @@
    !
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -816 +815 @@
       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 +829 @@
       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