Changeset 7412 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/trcsub.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/TOP_SRC/trcsub.F90 (modified) (4 diffs)

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

@@ -20 +20 @@
    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
@@ -493 +493 @@
       z1_rau0 = 0.5 / rau0
       ssha(:,:) = (  sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1)
-#if ! defined key_dynspg_ts
+
+      IF( .NOT.ln_dynspg_ts ) THEN
       ! These lines are not necessary with time splitting since
       ! boundary condition on sea level is set during ts loop
@@ -499 +500 @@
       CALL agrif_ssh( kt )
 #endif
-#if defined key_bdy
-      ssha(:,:) = ssha(:,:) * bdytmask(:,:)
-      CALL lbc_lnk( ssha, 'T', 1. ) 
-#endif
-#endif
+         IF( ln_bdy ) THEN
+            ssha(:,:) = ssha(:,:) * bdytmask(:,:)
+            CALL lbc_lnk( ssha, 'T', 1. ) 
+         ENDIF
+      ENDIF
       !
       !                                           !------------------------------!
@@ -514 +515 @@
             &                      - ( 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
       !