Changeset 1528 for trunk/NEMO/OPA_SRC/OBC/obcdta.F90

Timestamp:

2009-07-23T16:38:47+02:00 (15 years ago)

Author:

rblod

Message:

Suppress rigid-lid option, see ticket #486

File:

• trunk/NEMO/OPA_SRC/OBC/obcdta.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/OBC/obcdta.F90

@@ -9 +9 @@
   !!------------------------------------------------------------------------------
   !!   obc_dta           : read u, v, t, s data along each open boundary
-  !!   obc_dta_psi       : read psi data along each open boundary (rigid lid only)
   !!------------------------------------------------------------------------------
   !! * Modules used
@@ -23 +22 @@
   USE ioipsl          ! now only for  ymds2ju function 
   USE iom             ! 
-  USE obccli          ! used when dynspg_rl
 
   IMPLICIT NONE
@@ -120 +118 @@
 
     !!---------------------------------------------------------------------------
-    IF( lk_dynspg_rl )  THEN
-       CALL obc_dta_psi( kt )     ! update bsf data at open boundaries
-       IF ( nobc_dta == 1 .AND. kt == nit000 ) CALL ctl_stop( 'obcdta : time-variable psi boundary data not allowed yet' )
-    ENDIF
 
     ! 0.  initialisation :
@@ -505 +499 @@
   END SUBROUTINE obc_dta_chktime
 
-# if defined key_dynspg_rl
-  !!-----------------------------------------------------------------------------
-  !!   Rigid-lid
-  !!-----------------------------------------------------------------------------
-
-  SUBROUTINE obc_dta_psi ( kt )
-    !!-----------------------------------------------------------------------------
-    !!                       ***  SUBROUTINE obc_dta_psi  ***
-    !!
-    !! ** Purpose :
-    !!      Update the climatological streamfunction OBC at each time step.
-    !!      Depends on the user's configuration.  Here data are read only once
-    !!      at the beginning of the run.
-    !!
-    !! ** Method :
-    !!      1. initialization
-    !!         kbsfstart: number of time steps over which increase bsf
-    !!         during initialization. This is provided for a smooth start
-    !!         in cases where the transport is large (like on the Antarctic
-    !!         continent). also note that when kbfstart=1, the transport
-    !!         increases a lot in one time step and the precision usually
-    !!         required for the solver may not be enough.
-    !!      2. set the time evolution of the climatological barotropic streamfunction
-    !!         along the isolated coastlines ( gcbic(jnic) ). 
-    !!      3. set the climatological barotropic streamfunction at the boundary.
-    !!
-    !!      The last two steps are done only at first step (nit000) or if kt <= kbfstart
-    !!
-    !! History :
-    !!        ! 97-08 (G. Madec, J.M. Molines)
-    !!   8.5  ! 02-10 (C. Talandier, A-M. Treguier) Free surface, F90
-    !!----------------------------------------------------------------------------
-    !! * Arguments
-    INTEGER, INTENT( in ) ::   kt          ! ocean time-step index
-
-    !! * Local declarations
-    INTEGER ::   ji, jj, jnic, jip         ! dummy loop indices
-    INTEGER ::   inum = 11                 ! temporary logical unit
-    INTEGER ::   ip, ii, ij, iii, ijj
-    INTEGER ::   kbsfstart
-    REAL(wp) ::   zsver1, zsver2, zsver3, z2dtr, zcoef
-    !!----------------------------------------------------------------------------
-
-    ! 1. initialisation
-    ! -----------------
-    kbsfstart =  1
-    zsver1 =  bsfic0(1)
-    zsver2 =  zsver1
-    IF( kt <= kbsfstart ) THEN
-       zcoef = float(kt)/float(kbsfstart)
-    ELSE
-       zcoef = 1.
-    END IF
-    bsfic(1) = zsver1*zcoef
-    IF( lwp .AND. ( kt <= kbsfstart ) ) THEN
-       IF(lwp) WRITE(numout,*)'            '
-       IF(lwp) WRITE(numout,*)'obcdta: spinup phase in obc_dta_psi routine'
-       IF(lwp) WRITE(numout,*)'~~~~~~  it=',kt,'  OBC: spinup coef: ', &
-            zcoef, ' and transport: ',bsfic(1)
-    END IF
-
-    zsver2 =  bsfic(1)-bsfic(2)
-    zsver3 =  bsfic(2)
-
-    ! 2. Right hand side of the barotropic elliptic equation (isolated coastlines)
-    ! ----------------------------------------------------------------------------
-
-    IF( ( neuler == 0 ) .AND. ( kt == nit000 ) ) THEN
-       z2dtr = 1./rdt
-    ELSE
-       z2dtr = 1./2./rdt
-    END IF
-    ! ... bsfb(ii,ij) should be constant but due to the Asselin filter it
-    ! ... converges asymptotically towards bsfic(jnic)
-    ! ... However, bsfb(ii,ij) is constant along the same coastlines
-    ! ... ---> can be improved using an extra array for storing bsficb (before)
-    IF( nbobc > 1 ) THEN
-       DO jnic = 1,nbobc - 1
-          gcbic(jnic) = 0.
-          ip=mnic(0,jnic)
-          DO jip = 1,ip
-             ii = miic(jip,0,jnic) 
-             ij = mjic(jip,0,jnic) 
-             IF( ii >= nldi+ nimpp - 1 .AND. ii <= nlei+ nimpp - 1 .AND. &
-                  ij >= nldj+ njmpp - 1 .AND. ij <= nlej+ njmpp - 1 ) THEN
-                iii=ii-nimpp+1
-                ijj=ij-njmpp+1
-                gcbic(jnic) = ( bsfic(jnic) - bsfb(iii,ijj) ) * z2dtr
-             END IF
-          END DO
-       END DO
-    END IF
-
-    IF( lk_mpp )   CALL mpp_isl( gcbic, 3 )
-
-    ! 3. Update the climatological barotropic function at the boundary 
-    ! ----------------------------------------------------------------
-
-    IF( lpeastobc ) THEN
-
-       IF( kt == nit000 .OR. kt <= kbsfstart ) THEN
-          OPEN(inum,file='obceastbsf.dta')
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*) (bfoe(jj),jj=jpjed, jpjef)
-          CLOSE(inum)
-       END IF
-       DO jj=jpjed, jpjefm1
-          bfoe(jj)=bfoe(jj)*zcoef
-       END DO
-
-    END IF
-
-    IF( lpwestobc) THEN
-
-       IF( kt == nit000 .OR. kt <= kbsfstart ) THEN
-          OPEN(inum,file='obcwestbsf.dta')
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*) (bfow(jj),jj=jpjwd, jpjwf)
-          CLOSE(inum)
-       END IF
-       DO jj=jpjwd, jpjwfm1
-          bfow(jj)=bfow(jj)*zcoef
-       END DO
-
-    END IF
-
-    IF( lpsouthobc) THEN
-
-       IF( kt == nit000.OR.kt <= kbsfstart ) THEN
-          OPEN(inum,file='obcsouthbsf.dta')
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*) (bfos(jj),jj=jpisd, jpisf)
-          CLOSE(inum)
-       END IF
-       DO ji=jpisd, jpisfm1
-          bfos(ji)=bfos(ji)*zcoef
-       END DO
-
-    END IF
-
-    IF( lpnorthobc) THEN
-       IF( kt == nit000.OR.kt <= kbsfstart ) THEN
-          OPEN(inum,file='obcnorthbsf.dta')
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*)
-          READ(inum,*) (bfon(jj),jj=jpind, jpinf)
-          CLOSE(inum)
-       END IF
-       DO ji=jpind, jpinfm1
-          bfon(ji)=bfon(ji)*zcoef
-       END DO
-
-    END IF
-  END SUBROUTINE obc_dta_psi
-
-#else
-  !!-----------------------------------------------------------------------------
-  !!   'key_dynspg_rl not defined ( dynspg_flt or dynspg_exp or dynspg_ts  )
-  !!-----------------------------------------------------------------------------
-  SUBROUTINE obc_dta_psi ( kt )       ! Empty routine
-    !! * Arguments
-    INTEGER,INTENT(in) :: kt 
-    WRITE(*,*) 'obc_dta_psi: You should not have seen this print! error?', kt
-    STOP
-  END SUBROUTINE obc_dta_psi
-# endif
 
 #if defined key_dynspg_ts || defined key_dynspg_exp