Changeset 1884 for branches/TAM_V3_0/NEMO/OPA_SRC/OBC/obcdyn.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/obcdyn.F90 (modified) (14 diffs)

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

@@ -47 +47 @@
    REAL(wp) ::   rtaue  , rtauw  , rtaun  , rtaus  ,  &
                  rtauein, rtauwin, rtaunin, rtausin
+
+   LOGICAL  ::   ll_fbc
 
    !!---------------------------------------------------------------------------------
@@ -102 +104 @@
       END IF
 
-      IF( lp_obc_east  )   CALL obc_dyn_east ( kt )
-      IF( lp_obc_west  )   CALL obc_dyn_west ( kt )
-      IF( lp_obc_north )   CALL obc_dyn_north( kt )
-      IF( lp_obc_south )   CALL obc_dyn_south( kt )
+      ll_fbc = ( ( ( kt < nit000+3  ) .AND. .NOT.  ln_rstart     ) .OR. lk_dynspg_exp ) 
+
+      IF ( cp_cfg == "indian" ) THEN
+         ll_fbc = ( ( ( kt < nit000+30 ) .AND. .NOT.  ln_obc_rstart ) .OR. lk_dynspg_exp ) 
+      ENDIF
+
+      IF( lp_obc_east  )   CALL obc_dyn_east !( kt )
+      IF( lp_obc_west  )   CALL obc_dyn_west !( kt )
+      IF( lp_obc_north )   CALL obc_dyn_north!( kt )
+      IF( lp_obc_south )   CALL obc_dyn_south!( kt )
 
       IF( lk_mpp ) THEN
@@ -119 +127 @@
 
 
-   SUBROUTINE obc_dyn_east ( kt )
+   SUBROUTINE obc_dyn_east
       !!------------------------------------------------------------------------------
       !!                  ***  SUBROUTINE obc_dyn_east  ***
@@ -137 +145 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -147 +154 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast .OR. lk_dynspg_exp ) THEN
+      IF ( ll_fbc .OR. lfbceast ) THEN
 
          ! 1.1 U zonal velocity    
@@ -282 +289 @@
 
 
-   SUBROUTINE obc_dyn_west ( kt )
+   SUBROUTINE obc_dyn_west
       !!------------------------------------------------------------------------------
       !!                  ***  SUBROUTINE obc_dyn_west  ***
@@ -300 +307 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -310 +316 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest .OR. lk_dynspg_exp ) THEN
+      IF ( ll_fbc .OR. lfbcwest ) THEN
 
          ! 1.1 U zonal velocity
@@ -443 +449 @@
    END SUBROUTINE obc_dyn_west
 
-   SUBROUTINE obc_dyn_north ( kt )
+   SUBROUTINE obc_dyn_north
       !!------------------------------------------------------------------------------
       !!                     SUBROUTINE obc_dyn_north
@@ -461 +467 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -471 +476 @@
       ! ---------------------------------------------------------
  
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth  .OR. lk_dynspg_exp ) THEN
-
+        IF ( ll_fbc .OR. lfbcnorth ) THEN
+    
          ! 1.1 U zonal velocity
          ! --------------------
@@ -611 +616 @@
          END DO
 # endif
+
+
       END IF
 
    END SUBROUTINE obc_dyn_north
 
-   SUBROUTINE obc_dyn_south ( kt )
+   SUBROUTINE obc_dyn_south
       !!------------------------------------------------------------------------------
       !!                     SUBROUTINE obc_dyn_south
@@ -633 +640 @@
       !!------------------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt
 
       !! * Local declaration
@@ -646 +652 @@
       ! ---------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth  .OR. lk_dynspg_exp ) THEN
-
+      IF ( ll_fbc .OR. lfbcsouth ) THEN
+      
          ! 1.1 U zonal velocity
          ! --------------------