Changeset 14072 for NEMO/trunk/src/OCE/ZDF/zdfphy.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/ZDF/zdfphy.F90 (modified) (12 diffs)

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

@@ -9 +9 @@
    !!----------------------------------------------------------------------
    !!   zdf_phy_init  : initialization of all vertical physics packages
-   !!   zdf_phy       : upadate at each time-step the vertical mixing coeff. 
+   !!   zdf_phy       : upadate at each time-step the vertical mixing coeff.
    !!----------------------------------------------------------------------
    USE oce            ! ocean dynamics and tracers variables
-   USE zdf_oce        ! vertical physics: shared variables         
+   USE zdf_oce        ! vertical physics: shared variables
    USE zdfdrg         ! vertical physics: top/bottom drag coef.
    USE zdfsh2         ! vertical physics: shear production term of TKE
-   USE zdfric         ! vertical physics: RIChardson dependent vertical mixing   
+   USE zdfric         ! vertical physics: RIChardson dependent vertical mixing
    USE zdftke         ! vertical physics: TKE vertical mixing
    USE zdfgls         ! vertical physics: GLS vertical mixing
    USE zdfosm         ! vertical physics: OSMOSIS vertical mixing
-   USE zdfddm         ! vertical physics: double diffusion mixing      
-   USE zdfevd         ! vertical physics: convection via enhanced vertical diffusion  
-   USE zdfmfc         ! vertical physics: Mass Flux Convection 
-   USE zdfiwm         ! vertical physics: internal wave-induced mixing  
+   USE zdfddm         ! vertical physics: double diffusion mixing
+   USE zdfevd         ! vertical physics: convection via enhanced vertical diffusion
+   USE zdfmfc         ! vertical physics: Mass Flux Convection
+   USE zdfiwm         ! vertical physics: internal wave-induced mixing
    USE zdfswm         ! vertical physics: surface  wave-induced mixing
    USE zdfmxl         ! vertical physics: mixed layer
    USE tranpc         ! convection: non penetrative adjustment
-   USE trc_oce        ! variables shared between passive tracer & ocean           
+   USE trc_oce        ! variables shared between passive tracer & ocean
    USE sbc_oce        ! surface module (only for nn_isf in the option compatibility test)
    USE sbcrnf         ! surface boundary condition: runoff variables
@@ -46 +46 @@
    PUBLIC   zdf_phy       ! called by step.F90
 
-   INTEGER ::   nzdf_phy   ! type of vertical closure used 
+   INTEGER ::   nzdf_phy   ! type of vertical closure used
    !                       ! associated indicators
    INTEGER, PARAMETER ::   np_CST = 1   ! Constant Kz
@@ -66 +66 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE zdf_phy_init  ***
-      !! 
+      !!
       !! ** Purpose :   initializations of the vertical ocean physics
       !!
-      !! ** Method  :   Read namelist namzdf, control logicals 
+      !! ** Method  :   Read namelist namzdf, control logicals
       !!                set horizontal shape and vertical profile of background mixing coef.
       !!----------------------------------------------------------------------
@@ -143 +143 @@
       IF( nn_avb == 0 ) THEN             ! Define avmb, avtb from namelist parameter
          avmb(:) = rn_avm0
-         avtb(:) = rn_avt0                     
+         avtb(:) = rn_avt0
       ELSE                               ! Background profile of avt (fit a theoretical/observational profile (Krauss 1990)
          avmb(:) = rn_avm0
@@ -150 +150 @@
       ENDIF
       !                                  ! 2D shape of the avtb
-      avtb_2d(:,:) = 1._wp                   ! uniform 
+      avtb_2d(:,:) = 1._wp                   ! uniform
       !
       IF( nn_havtb == 1 ) THEN               ! decrease avtb by a factor of ten in the equatorial band
@@ -198 +198 @@
 
       !                          !==  type of vertical turbulent closure  ==!    (set nzdf_phy)
-      ioptio = 0 
+      ioptio = 0
       IF( ln_zdfcst ) THEN   ;   ioptio = ioptio + 1   ;    nzdf_phy = np_CST   ;   ENDIF
       IF( ln_zdfric ) THEN   ;   ioptio = ioptio + 1   ;    nzdf_phy = np_RIC   ;   CALL zdf_ric_init          ;   ENDIF
@@ -236 +236 @@
       !! ** Purpose :  Update ocean physics at each time-step
       !!
-      !! ** Method  : 
+      !! ** Method  :
       !!
       !! ** Action  :   avm, avt vertical eddy viscosity and diffusivity at w-points
@@ -254 +254 @@
          !
          !                       !* bottom drag
-         CALL zdf_drg( kt, Kmm, mbkt , r_Cdmin_bot, r_Cdmax_bot,   &   ! <<== in 
+         CALL zdf_drg( kt, Kmm, mbkt , r_Cdmin_bot, r_Cdmax_bot,   &   ! <<== in
             &              r_z0_bot,   r_ke0_bot,    rCd0_bot,   &
             &                                        rCdU_bot  )     ! ==>> out : bottom drag [m/s]
          IF( ln_isfcav ) THEN    !* top drag   (ocean cavities)
-            CALL zdf_drg( kt, Kmm, mikt , r_Cdmin_top, r_Cdmax_top,   &   ! <<== in 
+            CALL zdf_drg( kt, Kmm, mikt , r_Cdmin_top, r_Cdmax_top,   &   ! <<== in
                &              r_z0_top,   r_ke0_top,    rCd0_top,   &
                &                                        rCdU_top  )     ! ==>> out : bottom drag [m/s]
@@ -273 +273 @@
       ENDIF
 #endif
-      ! 
+      !
       !                       !==  Kz from chosen turbulent closure  ==!   (avm_k, avt_k)
       !
@@ -290 +290 @@
 !!gm         avm(2:jpim1,2:jpjm1,1:jpkm1) = rn_avm0 * wmask(2:jpim1,2:jpjm1,1:jpkm1)
       END SELECT
-      !  
+      !
       !                          !==  ocean Kz  ==!   (avt, avs, avm)
       !
@@ -312 +312 @@
       ENDIF
       !
-      !                                         !* wave-induced mixing 
-      IF( ln_zdfswm )   CALL zdf_swm( kt, Kmm, avm, avt, avs )   ! surface  wave (Qiao et al. 2004) 
+      !                                         !* wave-induced mixing
+      IF( ln_zdfswm )   CALL zdf_swm( kt, Kmm, avm, avt, avs )   ! surface  wave (Qiao et al. 2004)
       IF( ln_zdfiwm )   CALL zdf_iwm( kt, Kmm, avm, avt, avs )   ! internal wave (de Lavergne et al 2017)
 
-#if defined key_agrif 
+#if defined key_agrif
       ! interpolation parent grid => child grid for avm_k ( ex : at west border: update column 1 and 2)
       IF( l_zdfsh2 )   CALL Agrif_avm
@@ -340 +340 @@
          IF( ln_zdftke )   CALL tke_rst( kt, 'WRITE' )
          IF( ln_zdfgls )   CALL gls_rst( kt, 'WRITE' )
-         IF( ln_zdfric )   CALL ric_rst( kt, 'WRITE' ) 
+         IF( ln_zdfric )   CALL ric_rst( kt, 'WRITE' )
          ! NB. OSMOSIS restart (osm_rst) will be called in step.F90 after ww has been updated
       ENDIF