Changeset 13295 for NEMO/trunk/src/OCE/DIU

Timestamp:

2020-07-10T20:24:21+02:00 (4 years ago)

Author:

acc

Message:

Replace do-loop macros in the trunk with alternative forms with greater flexibility for extra halo applications. This alters a lot of routines but does not change any behaviour or results. do_loop_substitute.h90 is greatly simplified by this change. SETTE results are identical to those with the previous revision

Location:

NEMO/trunk/src/OCE/DIU

Files:

• diu_bulk.F90 (modified) (2 diffs)
• diu_coolskin.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/DIU/diu_bulk.F90

@@ -130 +130 @@
       ! If not done already, calculate the solar fraction
       IF ( kt==nit000 ) THEN
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             IF(  ( x_solfrac(ji,jj) == 0._wp ) .AND. ( tmask(ji,jj,1) == 1._wp ) ) &
                &   x_solfrac(ji,jj) = solfrac( zcoolthick(ji,jj),zthick(ji,jj) )
@@ -199 +199 @@
       INTEGER :: ji,jj
                      
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          
          ! Only calculate outside tmask

NEMO/trunk/src/OCE/DIU/diu_coolskin.F90

@@ -97 +97 @@
       IF( .NOT. ln_blk )   CALL ctl_stop("diu_coolskin.f90: diurnal flux processing only implemented for bulk forcing")
       !
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !
          ! Calcualte wind speed from wind stress and friction velocity