Changeset 10 for trunk

Timestamp:

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

Author:

cholod

Message:

allow to start without obc restart

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/OBC

Files:

• obc_oce.F90 (modified) (1 diff)
• obcdyn.F90 (modified) (7 diffs)
• obcini.F90 (modified) (3 diffs)
• obctra.F90 (modified) (7 diffs)

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

@@ -64 +64 @@
    !                                    !  These logical flags are set to 'true' if damping time 
    !                                    !  scale are set to 0 in the namelist, for both inflow and outflow).
+
+!--> IND4 Begin
+!     Logical for restarting with radiative OBCs, but without an OBC restart restart.obc.output file.
+!     During the first 30 time steps, used FIXED boundary conditions.
+!     We modify : obcini, obctra, obcdyn
+   LOGICAL :: ln_obc_rstart = .TRUE. !: radiative OBCs, but do not read restart.obc.output
+!<-- IND4 End
 
    REAL(wp), PUBLIC ::   obcsurftot       !: Total lateral surface of open boundaries

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

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

@@ -63 +63 @@
          &             rn_dpeob, rn_dpwob, rn_dpnob, rn_dpsob,       &
          &             rn_volemp, nn_obcdta, cn_obcdta,    &
-         &             ln_obc_clim, ln_vol_cst, ln_obc_fla
+         &             ln_obc_clim, ln_vol_cst, ln_obc_fla,ln_obc_rstart
       !!----------------------------------------------------------------------
 
@@ -582 +582 @@
       ! --------------------------------------------------------------
       !   only if at least one boundary is  radiative 
-      IF ( inumfbc < nbobc .AND.  ln_rstart ) THEN
-         !  Restart from restart.obc
-         CALL obc_rst_read
-      ELSE
+! IND4      IF ( inumfbc < nbobc .AND.  ln_rstart ) THEN
+! IND4         !  Restart from restart.obc
+! IND4         CALL obc_rst_read
+
+! IND4
+       IF(lwp) WRITE(numout,*)
+       IF(lwp) WRITE(numout,*) ' obcini : '
+       IF(lwp) WRITE(numout,*) '   ln_rstart     : ', ln_rstart
+       IF(lwp) WRITE(numout,*) '   ln_obc_rstart : ', ln_obc_rstart
+       
+       IF ( .NOT. ln_rstart .AND. ln_obc_rstart ) THEN
+          IF(lwp) WRITE(numout,*) ' obcini : Warning!! ln_rstart = .F. => we force ln_obc_rstart =.F. '
+          ln_obc_rstart = .FALSE.
+       ENDIF 
+
+       IF ( ln_rstart .AND. ln_obc_rstart ) THEN
+          IF  ( inumfbc < nbobc ) THEN
+             IF(lwp) WRITE(numout,*) '   => We read the OBC restart file '
+             CALL obc_rst_read
+          ELSE
+             IF(lwp) WRITE(numout,*) '   => We DO NOT read the OBC restart file (since all OBCs are fixed) '
+          ENDIF         
+! IND4          
+       ELSE
 
 !         ! ... Initialization to zero of radiation arrays.
@@ -600 +620 @@
           swbnd(:,:,:,:) = 0.e0   ;   ssbnd(:,:,:,:) = 0.e0
 
-      END IF
+       END IF
 
       ! 7. Control print

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

@@ -43 +43 @@
       rtauein, rtauwin, rtaunin, rtausin      ! Boundary restoring coefficient for inflow 
 
+! IND4
+   LOGICAL  ::   ll_fbc
+! IND4
+
    !! * Substitutions
 #  include "obc_vectopt_loop_substitute.h90"
@@ -91 +95 @@
       END IF
 
+! IND4
+!     ll_fbc = ( ( kt < nit000+3  ) .AND. .NOT.  ln_rstart     )
+!     IF ( cp_cfg == "indian" .OR. cp_cfg == "bengal" ) THEN
+      ll_fbc = ( ( kt < nit000+30 ) .AND. .NOT.  ln_obc_rstart )
+!     ENDIF
+! IND4
+
       IF( lp_obc_east  )   CALL obc_tra_east ( kt )    ! East open boundary
 
@@ -100 +111 @@
 
       IF( lk_mpp ) THEN                  !!bug ???
-         IF( kt >= nit000+3 .AND. ln_rstart ) THEN
+! IND4 BUG OBC_RADIA
+!        IF( kt >= nit000+3 .AND. ln_rstart ) THEN
             CALL lbc_lnk( tsb(:,:,:,jp_tem), 'T', 1. )
             CALL lbc_lnk( tsb(:,:,:,jp_sal), 'T', 1. )
-         END IF
+!        END IF
          CALL lbc_lnk( tsa(:,:,:,jp_tem), 'T', 1. )
          CALL lbc_lnk( tsa(:,:,:,jp_sal), 'T', 1. )
@@ -139 +151 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbceast ) THEN
+      IF ( ll_fbc .OR. lfbceast ) THEN
+! IND4
          DO ji = fs_nie0+1, fs_nie1+1 ! Vector opt.
             DO jk = 1, jpkm1
@@ -239 +254 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcwest ) THEN
+      IF ( ll_fbc .OR. lfbcwest ) THEN
+! IND4
 
          DO ji = fs_niw0, fs_niw1 ! Vector opt.
@@ -338 +356 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcnorth ) THEN
+      IF ( ll_fbc .OR. lfbcnorth ) THEN
+! IND4
 
          DO jj = fs_njn0+1, fs_njn1+1  ! Vector opt.
@@ -440 +461 @@
       ! --------------------------------------------------------
 
-      IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth ) THEN
+! IND4
+!     IF( ( kt < nit000+3 .AND. .NOT.ln_rstart ) .OR. lfbcsouth ) THEN
+      IF ( ll_fbc .OR. lfbcsouth ) THEN
+! IND4
 
          DO jj = fs_njs0, fs_njs1  ! Vector opt.