Changeset 9104 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90

Timestamp:

2017-12-15T18:56:13+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: ZDF: timing + lnk_multi + namelist cfg ctl

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfphy.F90 (modified) (4 diffs)

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

@@ -83 +83 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_timing )   CALL timing_start('zdf_phy_init')
-      !
       !                           !==  Namelist  ==!
       REWIND( numnam_ref )              ! Namelist namzdf in reference namelist : Vertical mixing parameters
@@ -92 +90 @@
       REWIND( numnam_cfg )              ! Namelist namzdf in reference namelist : Vertical mixing parameters
       READ  ( numnam_cfg, namzdf, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namzdf in configuration namelist', lwp )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namzdf in configuration namelist', lwp )
       IF(lwm)   WRITE ( numond, namzdf )
       !
@@ -206 +204 @@
       !!gm move it here ?
       !
-      IF( ln_timing )   CALL timing_stop('zdf_phy_init')
-      !
    END SUBROUTINE zdf_phy_init
 
@@ -293 +289 @@
       !                                         !* Lateral boundary conditions (sign unchanged)
       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  for calculation, kept here for output only
+         CALL lbc_lnk_multi( avm_k, 'W', 1. , avt_k, 'W', 1.   &
+            &                avm  , 'W', 1. , avt  , 'W', 1. , avs , 'W', 1. )
+      ELSE
+         CALL lbc_lnk( avm  , 'W', 1. , avt  , 'W', 1. , avs , 'W', 1. )
+      ENDIF
       !
       IF( l_zdfdrg ) THEN     ! drag  have been updated (non-linear cases)
-         IF( ln_isfcav )   CALL lbc_lnk( rCdU_top, 'T', 1. )   ! top    drag
-                           CALL lbc_lnk( rCdU_bot, 'T', 1. )   ! bottom drag
+         IF( ln_isfcav ) THEN   ;  CALL lbc_lnk_multi( rCdU_top, 'T', 1. , rCdU_bot, 'T', 1. )   ! top & bot drag
+         ELSE                   ;  CALL lbc_lnk      ( rCdU_bot, 'T', 1. )                       ! bottom drag only
       ENDIF
       !