Changeset 4486 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2014-02-05T12:23:56+01:00 (10 years ago)

Author:

jchanut

Message:

Finalize Time split and AGRIF (tickets #106 and #107) + ticket #1240

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (2 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -113 +113 @@
       ssha(:,:) = (  sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1)
 
+#if ! defined key_dynspg_ts
+      ! These lines are not necessary with time splitting since
+      ! boundary condition on sea level is set during ts loop
 #if defined key_agrif
       CALL agrif_ssh( kt )
 #endif
 #if defined key_bdy
-      ! bg jchanut tschanges
-      ! These lines are not necessary with time splitting since
-      ! boundary condition on sea level is set during ts loop
       IF (lk_bdy) THEN
          CALL lbc_lnk( ssha, 'T', 1. ) ! Not sure that's necessary
@@ -125 +125 @@
       ENDIF
 #endif
-      ! end jchanut tschanges
+#endif
+
 #if defined key_asminc
       !                                                ! Include the IAU weighted SSH increment