Changeset 6862 for branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

Timestamp:

2016-08-12T15:16:24+02:00 (8 years ago)

Author:

lovato

Message:

#1729 - trunk: removed key_bdy from the code and set usage of ln_bdy. Tested with SETTE.

File:

• branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) (4 diffs)

branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -20 +20 @@
 #endif
 #if defined key_zdfgls
-   USE zdfgls, ONLY: en
+   USE zdfgls    , ONLY: en
 #endif
    USE trabbl
@@ -26 +26 @@
    USE domvvl
    USE divhor          ! horizontal divergence            (div_hor routine)
-   USE sbcrnf, ONLY: h_rnf, nk_rnf   ! River runoff 
-   USE bdy_oce
+   USE sbcrnf    , ONLY: h_rnf, nk_rnf    ! River runoff
+   USE bdy_oce   , ONLY: ln_bdy, bdytmask ! BDY
 #if defined key_agrif
    USE agrif_opa_update
@@ -505 +505 @@
       CALL agrif_ssh( kt )
 #endif
-#if defined key_bdy
-      ssha(:,:) = ssha(:,:) * bdytmask(:,:)
-      CALL lbc_lnk( ssha, 'T', 1. ) 
-#endif
+      IF( ln_bdy ) THEN
+         ssha(:,:) = ssha(:,:) * bdytmask(:,:)
+         CALL lbc_lnk( ssha, 'T', 1. ) 
+      ENDIF
 #endif
       !
@@ -520 +520 @@
             &                      - ( e3t_a(:,:,jk) - e3t_b(:,:,jk) )    &
             &                         * tmask(:,:,jk) * z1_2dt
-#if defined key_bdy
-         wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
-#endif
+         IF( ln_bdy ) wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
       END DO
       !