Changeset 10 for trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90

Timestamp:

02/09/12 19:18:51 (12 years ago)

Author:

cholod

Message:

allow to start without obc restart

File:

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

trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90

@@ -45 +45 @@
    REAL(wp) ::   rtaue  , rtauw  , rtaun  , rtaus  ,  &
                  rtauein, rtauwin, rtaunin, rtausin
+
+! IND4
+   LOGICAL  ::   ll_fbc
+! IND4
 
    !!---------------------------------------------------------------------------------
@@ -97 +101 @@
          rtausin = 2. * rdt / rdpsin 
       END IF
+! IND4
+!     ll_fbc = ( ( ( kt < nit000+3  ) .AND. .NOT.  ln_rstart     ) .OR. lk_dynspg_exp ) 
+!     IF ( cp_cfg == "indian" .OR. cp_cfg == "bengal" ) THEN
+         ll_fbc = ( ( ( kt < nit000+30 ) .AND. .NOT.  ln_obc_rstart ) .OR. lk_dynspg_exp ) 
+!     ENDIF
+! IND4
+
 
       IF( lp_obc_east  )   CALL obc_dyn_east ( kt )
@@ -104 +115 @@
 
       IF( lk_mpp ) THEN
-         IF( kt >= nit000+3 .AND. ln_rstart ) THEN
+! IND4 BUG OBC_RADIA
+       ! IF( kt >= nit000+3 .AND. ln_rstart ) THEN
             CALL lbc_lnk( ub, 'U', -1. )
             CALL lbc_lnk( vb, 'V', -1. )
-         END IF
+!        END IF
+! IND4
          CALL lbc_lnk( ua, 'U', -1. )
          CALL lbc_lnk( va, 'V', -1. )
@@ -143 +156 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast .OR. lk_dynspg_exp ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast .OR. lk_dynspg_exp ) THEN
+      IF ( ll_fbc .OR. lfbceast ) THEN
+! IND4
 
          ! 1.1 U zonal velocity    
@@ -285 +301 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest .OR. lk_dynspg_exp ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest .OR. lk_dynspg_exp ) THEN
+      IF ( ll_fbc .OR. lfbcwest ) THEN
+! IND4
 
          ! 1.1 U zonal velocity
@@ -424 +443 @@
       ! ---------------------------------------------------------
  
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth  .OR. lk_dynspg_exp ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth  .OR. lk_dynspg_exp ) THEN
+      IF ( ll_fbc .OR. lfbcnorth ) THEN
+! IND4
 
          ! 1.1 U zonal velocity
@@ -575 +597 @@
       ! ---------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth  .OR. lk_dynspg_exp ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth  .OR. lk_dynspg_exp ) THEN
+      IF ( ll_fbc .OR. lfbcsouth ) THEN
+! IND4
 
          ! 1.1 U zonal velocity