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

Timestamp:

2016-10-20T15:19:01+02:00 (8 years ago)

Author:

lovato

Message:

#1783 - trunk: Generalize the open boundary schemes and revise TRA and TRC BDY wrappers

File:

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

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

@@ -499 +499 @@
       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
@@ -505 +506 @@
       CALL agrif_ssh( kt )
 #endif
-      IF( ln_bdy ) THEN
-         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
       !
       !                                           !------------------------------!