Changeset 12353 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL

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.

Location:

NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL

Files:

• ablmod.F90 (modified) (2 diffs)
• sbcabl.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/ablmod.F90

@@ -32 +32 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ustar2
    !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
 #  include "do_loop_substitute.h90"
 
@@ -1002 +1001 @@
       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
      !!
 !---------------------------------------------------------------------------------------------------

NEMO/branches/2019/dev_r11943_MERGE_2019/src/ABL/sbcabl.F90

@@ -45 +45 @@
    PUBLIC   sbc_abl            ! routine called in sbcmod module
 
-   !! * Substitutions
-#  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.7 , NEMO-consortium (2014)