Changeset 8866 for branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2017-12-01T07:22:09+01:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-09): Agrif: remove Agrif_update_tke + style cleaning

Location:

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF

Files:

• zdfphy.F90 (modified) (3 diffs)
• zdftke.F90 (modified) (9 diffs)

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90

@@ -28 +28 @@
    USE sbcrnf         ! surface boundary condition: runoff variables
 #if defined key_agrif
-   USE agrif_opa_interp
+   USE agrif_opa_interp   ! interpavm
 #endif
    !
@@ -279 +279 @@
 
 #if defined key_agrif 
-      ! interpolation parent grid => child grid for avm_k ( ex : at west border:
-      ! update column 1 and 2)
-      CALL Agrif_tke
+      ! interpolation parent grid => child grid for avm_k ( ex : at west border: update column 1 and 2)
+      IF( l_zdfsh2 )   CALL Agrif_avm
 #endif
 
       !                                         !* Lateral boundary conditions (sign unchanged)
-      CALL lbc_lnk( avm_k, 'W', 1. )                  ! needed to compute the shear production term
-      CALL lbc_lnk( avt_k, 'W', 1. )                  !!gm a priori useless ==>> to be tested
+      IF( l_zdfsh2 ) THEN
+         CALL lbc_lnk( avm_k, 'W', 1. )               ! needed to compute the shear production term
+         CALL lbc_lnk( avt_k, 'W', 1. )               !!gm a priori useless ==>> to be tested
+      ENDIF
       CALL lbc_lnk( avm  , 'W', 1. )                  ! needed to compute avm at u- and v-points
       CALL lbc_lnk( avt  , 'W', 1. )                  !!gm  a priori only avm_k and avm are required
-      CALL lbc_lnk( avs  , 'W', 1. )                  !!gm  To be tested
+      CALL lbc_lnk( avs  , 'W', 1. )                  !!gm  for calculation, keeped here for output only
       !
       IF( l_zdfdrg ) THEN     ! drag  have been updated (non-linear cases)
@@ -297 +298 @@
       !
       CALL zdf_mxl( kt )                        !* mixed layer depth, and level
-
+      !
       IF( lrst_oce ) THEN                       !* write TKE, GLS or RIC fields in the restart file
          IF( ln_zdftke )   CALL tke_rst( kt, 'WRITE' )

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -46 +46 @@
    USE zdfdrg         ! vertical physics: top/bottom drag coef.
    USE zdfmxl         ! vertical physics: mixed layer
-#if defined key_agrif
-   USE agrif_opa_interp
-   USE agrif_opa_update
-#endif
    !
    USE in_out_manager ! I/O manager
@@ -107 +103 @@
       !!----------------------------------------------------------------------
       ALLOCATE( htau(jpi,jpj) , dissl(jpi,jpj,jpk) , apdlr(jpi,jpj,jpk) ,   STAT= zdf_tke_alloc )
-         !
+      !
       IF( lk_mpp             )   CALL mpp_sum ( zdf_tke_alloc )
       IF( zdf_tke_alloc /= 0 )   CALL ctl_warn('zdf_tke_alloc: failed to allocate arrays')
@@ -171 +167 @@
 
 
-   SUBROUTINE tke_tke( pdepw, p_e3t, p_e3w, p_sh2    &
-      &                            , p_avm, p_avt )
+   SUBROUTINE tke_tke( pdepw, p_e3t, p_e3w, p_sh2, p_avm, p_avt )
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE tke_tke  ***
@@ -217 +212 @@
       zfact3 = 0.5_wp       * rn_ediss
       !
-      !
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !                     !  Surface/top/bottom boundary condition on tke
@@ -234 +228 @@
          END DO
       ENDIF
-      
+      !
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !                     !  Bottom boundary condition on tke
@@ -395 +389 @@
          END DO
       END DO
-
+      !
       !                            !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !                            !  TKE due to surface and internal wave breaking
@@ -483 +477 @@
       REAL(wp) ::   zdku,   zdkv, zsqen       !   -      -
       REAL(wp) ::   zemxl, zemlm, zemlp       !   -      -
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zmxlm, zmxld
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zmxlm, zmxld   ! 3D workspace
       !!--------------------------------------------------------------------
       !
       IF( ln_timing )   CALL timing_start('tke_avn')
-
+      !
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !                     !  Mixing length
@@ -597 +591 @@
       END SELECT
       !
-
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !                     !  Vertical eddy viscosity and diffusivity  (avm and avt)
@@ -623 +616 @@
          END DO
       ENDIF
-
+      !
       IF(ln_ctl) THEN
          CALL prt_ctl( tab3d_1=en , clinfo1=' tke  - e: ', tab3d_2=avt, clinfo2=' t: ', ovlap=1, kdim=jpk)