Changeset 13470 for NEMO/branches/2020/temporary_r4_trunk/src/ICE/icectl.F90

Timestamp:

2020-09-15T12:56:56+02:00 (4 years ago)

Author:

smasson

Message:

r4_trunk: second change of DO loops for routines to be merged, see #2523

File:

• NEMO/branches/2020/temporary_r4_trunk/src/ICE/icectl.F90 (modified) (9 diffs)

NEMO/branches/2020/temporary_r4_trunk/src/ICE/icectl.F90

@@ -366 +366 @@
       cl_alname(ialert_id) = ' Very high salinity ' ! name of the alert
       DO jl = 1, jpl
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             IF( v_i(ji,jj,jl) > epsi10  ) THEN
                IF( sv_i(ji,jj,jl) / v_i(ji,jj,jl) > rn_simax ) THEN
@@ -381 +381 @@
       cl_alname(ialert_id) = ' Very low salinity ' ! name of the alert
       DO jl = 1, jpl
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             IF( v_i(ji,jj,jl) > epsi10  ) THEN
                IF( sv_i(ji,jj,jl) / v_i(ji,jj,jl) < rn_simin ) THEN
@@ -396 +396 @@
       cl_alname(ialert_id) = ' Very cold ice ' ! name of the alert
       DO jl = 1, jpl
-         DO_3D_11_11( 1, nlay_i )
+         DO_3D( 1, 1, 1, 1, 1, nlay_i )
             ztmelts    =  -rTmlt * sz_i(ji,jj,jk,jl) + rt0
             IF( t_i(ji,jj,jk,jl) < -50.+rt0  .AND.  v_i(ji,jj,jl) > epsi10 ) THEN
@@ -410 +410 @@
       cl_alname(ialert_id) = ' Very warm ice ' ! name of the alert
       DO jl = 1, jpl
-         DO_3D_11_11( 1, nlay_i )
+         DO_3D( 1, 1, 1, 1, 1, nlay_i )
             ztmelts    =  -rTmlt * sz_i(ji,jj,jk,jl) + rt0
             IF( t_i(ji,jj,jk,jl) > ztmelts  .AND.  v_i(ji,jj,jl) > epsi10 ) THEN
@@ -424 +424 @@
       cl_alname(ialert_id) = ' Very thick ice ' ! name of the alert
       jl = jpl 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          IF( h_i(ji,jj,jl) > 50._wp ) THEN
             WRITE(numout,*) ' ALERTE :   Very thick ice ',h_i(ji,jj,jl)
@@ -436 +436 @@
       cl_alname(ialert_id) = ' Very thin ice ' ! name of the alert
       jl = 1 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          IF( h_i(ji,jj,jl) < rn_himin ) THEN
             WRITE(numout,*) ' ALERTE :   Very thin ice ',h_i(ji,jj,jl)
@@ -447 +447 @@
       ialert_id = ialert_id + 1 ! reference number of this alert
       cl_alname(ialert_id) = ' Very fast ice ' ! name of the alert
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          IF( MAX( ABS( u_ice(ji,jj) ), ABS( v_ice(ji,jj) ) ) > 2. ) THEN
             WRITE(numout,*) ' ALERTE :   Very fast ice ',MAX( ABS( u_ice(ji,jj) ), ABS( v_ice(ji,jj) ) )
@@ -458 +458 @@
       ialert_id = ialert_id + 1 ! reference number of this alert
       cl_alname(ialert_id) = ' Ice on continents ' ! name of the alert
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          IF( tmask(ji,jj,1) == 0._wp .AND. ( at_i(ji,jj) > 0._wp .OR. vt_i(ji,jj) > 0._wp ) ) THEN 
             WRITE(numout,*) ' ALERTE :   Ice on continents ',at_i(ji,jj),vt_i(ji,jj)
@@ -469 +469 @@
       ialert_id = ialert_id + 1 ! reference number of this alert
       cl_alname(ialert_id) = ' Incompatible ice conc and vol ' ! name of the alert
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          IF(  ( vt_i(ji,jj) == 0._wp .AND. at_i(ji,jj) >  0._wp ) .OR. &
             & ( vt_i(ji,jj) >  0._wp .AND. at_i(ji,jj) == 0._wp ) ) THEN