Changeset 32 for trunk/NEMO/OPA_SRC/OBC/obctra.F90

Timestamp:

2004-02-17T10:20:15+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/OBC/obctra.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/OBC/obctra.F90

@@ -20 +20 @@
    USE obc_oce         ! ocean open boundary conditions
    USE lib_mpp         ! ???
+   USE lbclnk          ! ???
    USE in_out_manager  ! I/O manager
 
@@ -29 +30 @@
 
    !! * Module variables
-   INTEGER ::   ji, jj, jk      ! dummy loop indices
-
    INTEGER ::      & ! ... boundary space indices 
       nib   = 1,   & ! nib   = boundary point
@@ -90 +89 @@
       END IF
 
-      ! 1. East open boundary
-      ! ---------------------
-
-      IF( lpeastobc )THEN
-         CALL obc_tra_east( kt )
-      END IF
-
-      ! 2. West open boundary
-      ! ---------------------
-
-      IF( lpwestobc )THEN
-         CALL obc_tra_west( kt )
-      END IF
-
-      ! 3. North open boundary
-      ! ---------------------
-
-      IF( lpnorthobc )THEN
-         CALL obc_tra_north( kt )
-      END IF
-
-      ! 4. South open boundary
-      ! ---------------------
-
-      IF( lpsouthobc )THEN
-         CALL obc_tra_south( kt )
-      END IF
-
-# if defined key_mpp
-      !! bug ???
-      IF( kt >= nit000+3 .AND. ln_rstart ) THEN
-         CALL mpp_lnk_3d( tb, 'T', 1. )
-         CALL mpp_lnk_3d( sb, 'T', 1. )
-      END IF
-      CALL mpp_lnk_3d( ta, 'T', 1. )
-      CALL mpp_lnk_3d( sa, 'T', 1. )
-# endif
+      IF( lpeastobc  )   CALL obc_tra_east ( kt )    ! East open boundary
+
+      IF( lpwestobc  )   CALL obc_tra_west ( kt )    ! West open boundary
+
+      IF( lpnorthobc )   CALL obc_tra_north( kt )    ! North open boundary
+
+      IF( lpsouthobc )   CALL obc_tra_south( kt )    ! South open boundary
+
+      IF( lk_mpp ) THEN                  !!bug ???
+         IF( kt >= nit000+3 .AND. ln_rstart ) THEN
+            CALL lbc_lnk( tb, 'T', 1. )
+            CALL lbc_lnk( sb, 'T', 1. )
+         END IF
+         CALL lbc_lnk( ta, 'T', 1. )
+         CALL lbc_lnk( sa, 'T', 1. )
+      ENDIF
 
    END SUBROUTINE obc_tra
@@ -151 +129 @@
 
       !! * Local declaration
+      INTEGER ::   ji, jj, jk      ! dummy loop indices
       REAL(wp) ::   z05cx, ztau, zin
-
-      !!------------------------------------------------------------------------------
-      !!  OPA 8.5, LODYC-IPSL (2002)
       !!------------------------------------------------------------------------------
 
@@ -253 +229 @@
 
       !! * Local declaration
+      INTEGER ::   ji, jj, jk      ! dummy loop indices
       REAL(wp) ::   z05cx, ztau, zin
       !!------------------------------------------------------------------------------
@@ -351 +328 @@
 
       !! * Local declaration
+      INTEGER ::   ji, jj, jk      ! dummy loop indices
       REAL(wp) ::   z05cx, ztau, zin
       !!------------------------------------------------------------------------------
@@ -452 +430 @@
 
       !! * Local declaration
+      INTEGER ::   ji, jj, jk      ! dummy loop indices
       REAL(wp) ::   z05cx, ztau, zin
       !!------------------------------------------------------------------------------