Changeset 7412 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2016-12-01T11:30:29+01:00 (8 years ago)

Author:

lovato

Message:

Merge dev_NOC_CMCC_merge_2016 into branch

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (3 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -37 +37 @@
    USE ldftra          ! lateral physics on tracers
    USE ldfslp
-   USE bdy_oce         ! BDY open boundary condition variables
+   USE bdy_oce   , ONLY: ln_bdy
    USE bdytra          ! open boundary condition (bdy_tra routine)
    !
@@ -79 +79 @@
       !!              - Apply lateral boundary conditions on (ta,sa) 
       !!             at the local domain   boundaries through lbc_lnk call, 
-      !!             at the one-way open boundaries (lk_bdy=T), 
+      !!             at the one-way open boundaries (ln_bdy=T), 
       !!             at the AGRIF zoom   boundaries (lk_agrif=T)
       !!
@@ -111 +111 @@
       CALL lbc_lnk( tsa(:,:,:,jp_sal), 'T', 1._wp )
       !
-#if defined key_bdy 
-      IF( lk_bdy )   CALL bdy_tra( kt )  ! BDY open boundaries
-#endif
+      IF( ln_bdy )   CALL bdy_tra( kt )  ! BDY open boundaries
  
       ! set time step size (Euler/Leapfrog)