Changeset 1884 for branches/TAM_V3_0/NEMO/OPA_SRC/OBC/obctra.F90

Timestamp:

2010-05-27T11:26:52+02:00 (14 years ago)

Author:

rblod

Message:

Light adaptation of NEMO direct model routine to handle TAM

File:

• branches/TAM_V3_0/NEMO/OPA_SRC/OBC/obctra.F90 (modified) (14 diffs)

branches/TAM_V3_0/NEMO/OPA_SRC/OBC/obctra.F90

@@ -43 +43 @@
       rtauein, rtauwin, rtaunin, rtausin      ! Boundary restoring coefficient for inflow 
 
+   LOGICAL  ::   ll_fbc
+   
    !! * Substitutions
 #  include "obc_vectopt_loop_substitute.h90"
@@ -91 +93 @@
       END IF
 
-      IF( lp_obc_east  )   CALL obc_tra_east ( kt )    ! East open boundary
-
-      IF( lp_obc_west  )   CALL obc_tra_west ( kt )    ! West open boundary
-
-      IF( lp_obc_north )   CALL obc_tra_north( kt )    ! North open boundary
-
-      IF( lp_obc_south )   CALL obc_tra_south( kt )    ! South open boundary
+      ll_fbc = ( ( kt < nit000+3 ) .AND. .NOT. ln_rstart )
+      
+      IF ( cp_cfg == "indian" ) THEN
+         ll_fbc = ( ( kt < nit000+30 ) .AND. .NOT. ln_obc_rstart )
+      ENDIF
+
+      IF( lp_obc_east  )   CALL obc_tra_east     ! East open boundary
+
+      IF( lp_obc_west  )   CALL obc_tra_west     ! West open boundary
+
+      IF( lp_obc_north )   CALL obc_tra_north    ! North open boundary
+
+      IF( lp_obc_south )   CALL obc_tra_south    ! South open boundary
+
 
       IF( lk_mpp ) THEN                  !!bug ???
@@ -111 +120 @@
 
 
-   SUBROUTINE obc_tra_east ( kt )
+   SUBROUTINE obc_tra_east
       !!------------------------------------------------------------------------------
       !!                ***  SUBROUTINE obc_tra_east  ***
@@ -128 +137 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -139 +147 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast ) THEN
-         DO ji = fs_nie0+1, fs_nie1+1 ! Vector opt.
+      IF ( ll_fbc .OR. lfbceast ) THEN
+
+        DO ji = fs_nie0+1, fs_nie1+1 ! Vector opt.
             DO jk = 1, jpkm1
                DO jj = 1, jpj
@@ -211 +220 @@
 
 
-   SUBROUTINE obc_tra_west ( kt )
+   SUBROUTINE obc_tra_west
       !!------------------------------------------------------------------------------
       !!                 ***  SUBROUTINE obc_tra_west  ***
@@ -228 +237 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -239 +247 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest ) THEN
+      IF ( ll_fbc .OR. lfbcwest ) THEN
 
          DO ji = fs_niw0, fs_niw1 ! Vector opt.
@@ -310 +318 @@
 
 
-   SUBROUTINE obc_tra_north ( kt )
+   SUBROUTINE obc_tra_north
       !!------------------------------------------------------------------------------
       !!                 ***  SUBROUTINE obc_tra_north  ***
@@ -327 +335 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -338 +345 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth ) THEN
+      IF ( ll_fbc .OR. lfbcnorth ) THEN
 
          DO jj = fs_njn0+1, fs_njn1+1  ! Vector opt.
@@ -412 +419 @@
 
 
-   SUBROUTINE obc_tra_south ( kt )
+   SUBROUTINE obc_tra_south
       !!------------------------------------------------------------------------------
       !!                ***  SUBROUTINE obc_tra_south  ***
@@ -429 +436 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -440 +446 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth ) THEN
+      IF ( ll_fbc .OR. lfbcsouth ) THEN
 
          DO jj = fs_njs0, fs_njs1  ! Vector opt.