Changeset 13497 for NEMO/trunk/src/ICE

Timestamp:

2020-09-21T14:37:46+02:00 (4 years ago)

Author:

techene

Message:

re-introduce comments that have been erased by loops transformation see #2525

Location:

NEMO/trunk/src/ICE

Files:

• icecor.F90 (modified) (1 diff)
• icedyn_adv_pra.F90 (modified) (9 diffs)
• icedyn_adv_umx.F90 (modified) (2 diffs)
• icedyn_rhg_evp.F90 (modified) (2 diffs)
• iceupdate.F90 (modified) (2 diffs)

NEMO/trunk/src/ICE/icecor.F90

@@ -105 +105 @@
       !                             !-----------------------------------------------------
       IF( kn == 2 ) THEN            !  Ice drift case: Corrections to avoid wrong values !
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )        !-----------------------------------------------------
             IF ( at_i(ji,jj) == 0._wp ) THEN    ! what to do if there is no ice
                IF ( at_i(ji+1,jj) == 0._wp )   u_ice(ji  ,jj) = 0._wp   ! right side

NEMO/trunk/src/ICE/icedyn_adv_pra.F90

@@ -383 +383 @@
 
          !  Calculate fluxes and moments between boxes i<-->i+1              
-         DO_2D( 0, 0, 1, 1 )
+         DO_2D( 0, 0, 1, 1 )                   !  Flux from i to i+1 WHEN u GT 0
             zbet(ji,jj)  =  MAX( 0._wp, SIGN( 1._wp, put(ji,jj) ) )
             zalf         =  MAX( 0._wp, put(ji,jj) ) * pdt / psm(ji,jj,jl)
@@ -408 +408 @@
          END_2D
 
-         DO_2D( 0, 0, 1, 0 )
+         DO_2D( 0, 0, 1, 0 )                   !  Flux from i+1 to i when u LT 0.
             zalf          = MAX( 0._wp, -put(ji,jj) ) * pdt / psm(ji+1,jj,jl) 
             zalg  (ji,jj) = zalf
@@ -427 +427 @@
          END_2D
 
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )                   !  Readjust moments remaining in the box.
             zbt  =       zbet(ji-1,jj)
             zbt1 = 1.0 - zbet(ji-1,jj)
@@ -441 +441 @@
 
          !   Put the temporary moments into appropriate neighboring boxes.    
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )                   !   Flux from i to i+1 IF u GT 0.
             zbt  =       zbet(ji-1,jj)
             zbt1 = 1.0 - zbet(ji-1,jj)
@@ -461 +461 @@
          END_2D
 
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )                   !  Flux from i+1 to i IF u LT 0.
             zbt  =       zbet(ji,jj)
             zbt1 = 1.0 - zbet(ji,jj)
@@ -540 +540 @@
  
          !  Calculate fluxes and moments between boxes j<-->j+1              
-         DO_2D( 1, 1, 0, 0 )
+         DO_2D( 1, 1, 0, 0 )                   !  Flux from j to j+1 WHEN v GT 0
             zbet(ji,jj)  =  MAX( 0._wp, SIGN( 1._wp, pvt(ji,jj) ) )
             zalf         =  MAX( 0._wp, pvt(ji,jj) ) * pdt / psm(ji,jj,jl)
@@ -565 +565 @@
          END_2D
          !
-         DO_2D( 1, 0, 0, 0 )
+         DO_2D( 1, 0, 0, 0 )                   !  Flux from j+1 to j when v LT 0.
             zalf          = MAX( 0._wp, -pvt(ji,jj) ) * pdt / psm(ji,jj+1,jl) 
             zalg  (ji,jj) = zalf
@@ -599 +599 @@
 
          !   Put the temporary moments into appropriate neighboring boxes.    
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )                   !  Flux from j to j+1 IF v GT 0.
             zbt  =       zbet(ji,jj-1)
             zbt1 = 1.0 - zbet(ji,jj-1)
@@ -620 +620 @@
          END_2D
 
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )                   !  Flux from j+1 to j IF v LT 0.
             zbt  =       zbet(ji,jj)
             zbt1 = 1.0 - zbet(ji,jj)

NEMO/trunk/src/ICE/icedyn_adv_umx.F90

@@ -1006 +1006 @@
       !                                                     !--  Laplacian in j-direction  --!
       DO jl = 1, jpl
-         DO_2D( 1, 0, 0, 0 )
+         DO_2D( 1, 0, 0, 0 )         ! First derivative (gradient)
             ztv1(ji,jj,jl) = ( pt(ji,jj+1,jl) - pt(ji,jj,jl) ) * r1_e2v(ji,jj) * vmask(ji,jj,1)
          END_2D
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )         ! Second derivative (Laplacian)
             ztv2(ji,jj,jl) = ( ztv1(ji,jj,jl) - ztv1(ji,jj-1,jl) ) * r1_e2t(ji,jj)
          END_2D
@@ -1017 +1017 @@
       !                                                     !--  BiLaplacian in j-direction  --!
       DO jl = 1, jpl
-         DO_2D( 1, 0, 0, 0 )
+         DO_2D( 1, 0, 0, 0 )         ! First derivative
             ztv3(ji,jj,jl) = ( ztv2(ji,jj+1,jl) - ztv2(ji,jj,jl) ) * r1_e2v(ji,jj) * vmask(ji,jj,1)
          END_2D
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )         ! Second derivative
             ztv4(ji,jj,jl) = ( ztv3(ji,jj,jl) - ztv3(ji,jj-1,jl) ) * r1_e2t(ji,jj)
          END_2D

NEMO/trunk/src/ICE/icedyn_rhg_evp.F90

@@ -370 +370 @@
          CALL lbc_lnk( 'icedyn_rhg_evp', zds, 'F', 1.0_wp )
 
-         DO_2D( 0, 1, 0, 1 )
+         DO_2D( 0, 1, 0, 1 )   ! loop to jpi,jpj to avoid making a communication for zs1,zs2,zs12 ! no vector loop
 
             ! shear**2 at T points (doc eq. A16)
@@ -704 +704 @@
       END_2D
       
-      DO_2D( 0, 0, 0, 0 )
+      DO_2D( 0, 0, 0, 0 )   ! no vector loop
          
          ! tension**2 at T points

NEMO/trunk/src/ICE/iceupdate.F90

@@ -332 +332 @@
       !
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN     !==  Ice time-step only  ==!   (i.e. surface module time-step)
-         DO_2D( 0, 0, 0, 0 )
+         DO_2D( 0, 0, 0, 0 )                          !* update the modulus of stress at ocean surface (T-point)
             !                                               ! 2*(U_ice-U_oce) at T-point
             zu_t = u_ice(ji,jj) + u_ice(ji-1,jj) - u_oce(ji,jj) - u_oce(ji-1,jj)   
@@ -358 +358 @@
       ENDIF
       !
-      DO_2D( 0, 0, 0, 0 )
+      DO_2D( 0, 0, 0, 0 )                             !* update the stress WITHOUT an ice-ocean rotation angle
          ! ice area at u and v-points 
          zat_u  = ( at_i(ji,jj) * tmask(ji,jj,1) + at_i (ji+1,jj    ) * tmask(ji+1,jj  ,1) )  &