Changeset 13530

Timestamp:

2020-09-28T11:16:49+02:00 (3 years ago)

Author:

clem

Message:

remove duplicated lines

File:

• NEMO/trunk/src/OCE/ZDF/zdftke.F90 (modified) (4 diffs)

NEMO/trunk/src/OCE/ZDF/zdftke.F90

@@ -52 +52 @@
 #endif
    !
-#if defined key_si3
-   USE ice, ONLY: hm_i, h_i
-#endif
-#if defined key_cice
-   USE sbc_ice, ONLY: h_i
-#endif
    USE in_out_manager ! I/O manager
    USE iom            ! I/O manager library
@@ -382 +376 @@
 !!gm BUG : in the exp  remove the depth of ssh !!!
 !!gm       i.e. use gde3w in argument (gdepw(:,:,:,Kmm))
-      
-      
+      !
+      ! penetration is partly switched off below sea-ice if nn_eice/=0
+      !
       IF( nn_etau == 1 ) THEN           !* penetration below the mixed layer (rn_efr fraction)
-         DO_3D( 0, 0, 0, 0, 2, jpkm1 )     ! nn_eice=0 : ON below sea-ice ; nn_eice>0 : partly OFF 
+         DO_3D( 0, 0, 0, 0, 2, jpkm1 ) 
             en(ji,jj,jk) = en(ji,jj,jk) + rn_efr * en(ji,jj,1) * EXP( -gdepw(ji,jj,jk,Kmm) / htau(ji,jj) )   &
                &                                 * MAX( 0._wp, 1._wp - zice_fra(ji,jj) ) * wmask(ji,jj,jk) * tmask(ji,jj,1)
@@ -396 +391 @@
          END_2D
       ELSEIF( nn_etau == 3 ) THEN       !* penetration belox the mixed layer (HF variability)
-         DO_3D( 0, 0, 0, 0, 2, jpkm1 )         ! nn_eice=0 : ON below sea-ice ; nn_eice>0 : partly OFF
+         DO_3D( 0, 0, 0, 0, 2, jpkm1 )
             ztx2 = utau(ji-1,jj  ) + utau(ji,jj)
             zty2 = vtau(ji  ,jj-1) + vtau(ji,jj)
@@ -655 +650 @@
          WRITE(numout,*) '      mixing length type                          nn_mxl    = ', nn_mxl
          WRITE(numout,*) '         surface mixing length = F(stress) or not    ln_mxl0   = ', ln_mxl0
-         IF( ln_mxl0 ) THEN
-            WRITE(numout,*) '      type of scaling under sea-ice               nn_mxlice = ', nn_mxlice
-            IF( nn_mxlice == 1 ) &
-            WRITE(numout,*) '      ice thickness when scaling under sea-ice    rn_mxlice = ', rn_mxlice
-         ENDIF         
          WRITE(numout,*) '         surface  mixing length minimum value        rn_mxl0   = ', rn_mxl0
          IF( ln_mxl0 ) THEN