Changeset 12353 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/dommsk.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/OCE/DOM/dommsk.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DOM/dommsk.F90

@@ -44 +44 @@
 
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
@@ -164 +163 @@
       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)