Changeset 1158 for trunk/NEMO/OPA_SRC/DYN

Timestamp:

2008-06-27T10:24:52+02:00 (16 years ago)

Author:

rblod

Message:

OBC corrections, see ticket #224

File:

• trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -433 +433 @@
          zssha(:,:) = sshb(:,:) + z2dt * ( wn(:,:,1) - emp(:,:) * zraur ) * tmask(:,:,1)
       ENDIF
-
-#if defined key_agrif
-      IF (lk_obc .AND. Agrif_Root() ) THEN
-#else
-      IF (lk_obc) THEN
-#endif
+#if defined key_obc
+# if defined key_agrif
+      IF ( Agrif_Root() ) THEN
+# endif
          zssha(:,:)=zssha(:,:)*obctmsk(:,:)
          CALL lbc_lnk(zssha,'T',1.)  ! absolutly compulsory !! (jmm)
-      ENDIF
+# if defined key_agrif
+      ENDIF
+# endif
+#endif
 
       IF( neuler == 0 .AND. kt == nit000 ) THEN      ! Euler (forward) time stepping, no time filter