Changeset 8866 for branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90

Timestamp:

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

Author:

gm

Message:

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

File:

• branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) (3 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' )