Changeset 1158

Timestamp:

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

Author:

rblod

Message:

OBC corrections, see ticket #224

Location:

trunk/NEMO/OPA_SRC

Files:

• DYN/dynspg_flt.F90 (modified) (1 diff)
• OBC/obc_oce.F90 (modified) (2 diffs)

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

trunk/NEMO/OPA_SRC/OBC/obc_oce.F90

@@ -8 +8 @@
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    !!----------------------------------------------------------------------
-#if defined key_obc
    !!----------------------------------------------------------------------
    !!   'key_obc' :                                 Open Boundary Condition
@@ -21 +20 @@
    USE par_oce         ! ocean parameters
    USE obc_par         ! open boundary condition parameters
+
+#if defined key_obc
 
    IMPLICIT NONE