Changeset 13295 for NEMO/trunk/src/ICE/iceistate.F90

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

File:

• NEMO/trunk/src/ICE/iceistate.F90 (modified) (4 diffs)

NEMO/trunk/src/ICE/iceistate.F90

@@ -288 +288 @@
             ! select ice covered grid points
             npti = 0 ; nptidx(:) = 0
-            DO_2D_11_11
+            DO_2D( 1, 1, 1, 1 )
                IF ( zht_i_ini(ji,jj) > 0._wp ) THEN
                   npti         = npti  + 1
@@ -338 +338 @@
             CALL ice_var_salprof ! for sz_i
             DO jl = 1, jpl
-               DO_2D_11_11
+               DO_2D( 1, 1, 1, 1 )
                   v_i (ji,jj,jl) = h_i(ji,jj,jl) * a_i(ji,jj,jl)
                   v_s (ji,jj,jl) = h_s(ji,jj,jl) * a_i(ji,jj,jl)
@@ -346 +346 @@
             !
             DO jl = 1, jpl
-               DO_3D_11_11( 1, nlay_s )
+               DO_3D( 1, 1, 1, 1, 1, nlay_s )
                   t_s(ji,jj,jk,jl) = zts_3d(ji,jj,jl)
                   e_s(ji,jj,jk,jl) = zswitch(ji,jj) * v_s(ji,jj,jl) * r1_nlay_s * &
@@ -354 +354 @@
             !
             DO jl = 1, jpl
-               DO_3D_11_11( 1, nlay_i )
+               DO_3D( 1, 1, 1, 1, 1, nlay_i )
                   t_i (ji,jj,jk,jl) = zti_3d(ji,jj,jl) 
                   ztmelts          = - rTmlt * sz_i(ji,jj,jk,jl) + rt0 ! melting temperature in K