Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/BDY

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdy_oce.F90 (modified) (5 diffs, 1 prop)
• bdy_par.F90 (modified) (3 diffs, 1 prop)
• bdydta.F90 (modified) (60 diffs, 1 prop)
• bdydyn.F90 (modified) (6 diffs, 1 prop)
• bdyice.F90 (copied) (copied from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90)
• bdyini.F90 (modified) (20 diffs, 1 prop)
• bdytides.F90 (modified) (12 diffs, 1 prop)
• bdytra.F90 (modified) (4 diffs, 1 prop)
• bdyvol.F90 (modified) (8 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90

@@ -6 +6 @@
    !! History :  1.0  !  2001-05  (J. Chanut, A. Sellar)  Original code
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version     
+   !!            3.3  !  2010-09  (D. Storkey) add ice boundary conditions
    !!----------------------------------------------------------------------
 #if defined key_bdy 
@@ -20 +21 @@
    !! Namelist variables
    !!----------------------------------------------------------------------
-   CHARACTER(len=80) ::   filbdy_mask        !: Name of unstruct. bdy mask file
-   CHARACTER(len=80) ::   filbdy_data_T      !: Name of unstruct. bdy data file at T points
-   CHARACTER(len=80) ::   filbdy_data_U      !: Name of unstruct. bdy data file at U points
-   CHARACTER(len=80) ::   filbdy_data_V      !: Name of unstruct. bdy data file at V points
-   CHARACTER(len=80) ::   filbdy_data_bt_T   !: Name of unstruct. bdy data file at T points for barotropic variables
-   CHARACTER(len=80) ::   filbdy_data_bt_U   !: Name of unstruct. bdy data file at U points for barotropic variables
-   CHARACTER(len=80) ::   filbdy_data_bt_V   !: Name of unstruct. bdy data file at V points for barotropic variables
+   CHARACTER(len=80) ::   cn_mask        !: Name of unstruct. bdy mask file
+   CHARACTER(len=80) ::   cn_dta_frs_T   !: Name of unstruct. bdy data file at T points for FRS conditions
+   CHARACTER(len=80) ::   cn_dta_frs_U   !: Name of unstruct. bdy data file at U points for FRS conditions
+   CHARACTER(len=80) ::   cn_dta_frs_V   !: Name of unstruct. bdy data file at V points for FRS conditions
+   CHARACTER(len=80) ::   cn_dta_fla_T   !: Name of unstruct. bdy data file at T points for Flather scheme
+   CHARACTER(len=80) ::   cn_dta_fla_U   !: Name of unstruct. bdy data file at U points for Flather scheme
+   CHARACTER(len=80) ::   cn_dta_fla_V   !: Name of unstruct. bdy data file at V points for Flather scheme
    !
-   LOGICAL ::   ln_bdy_tides = .false.  !: =T apply tidal harmonic forcing along open boundaries
-   LOGICAL ::   ln_bdy_vol  = .false.   !: =T volume correction             
-   LOGICAL ::   ln_bdy_mask = .false.   !: =T read bdymask from file
-   LOGICAL ::   ln_bdy_clim = .false.   !: if true, we assume that bdy data files contain 
+   LOGICAL ::   ln_tides = .false.    !: =T apply tidal harmonic forcing along open boundaries
+   LOGICAL ::   ln_vol  = .false.     !: =T volume correction             
+   LOGICAL ::   ln_mask = .false.     !: =T read bdymask from file
+   LOGICAL ::   ln_clim = .false.     !: if true, we assume that bdy data files contain 
    !                                    !  1 time dump  (-->bdy forcing will be constant) 
    !                                    !  or 12 months (-->bdy forcing will be cyclic) 
-   LOGICAL ::   ln_bdy_dyn_fla  = .false. !: =T Flather boundary conditions on barotropic velocities
-   LOGICAL ::   ln_bdy_dyn_frs  = .false. !: =T FRS boundary conditions on velocities
-   LOGICAL ::   ln_bdy_tra_frs  = .false. !: =T FRS boundary conditions on tracers (T and S)
-   LOGICAL ::   ln_bdy_ice_frs  = .false. !: =T FRS boundary conditions on seaice (leads fraction, ice depth, snow depth)
+   LOGICAL ::   ln_dyn_fla  = .false. !: =T Flather boundary conditions on barotropic velocities
+   LOGICAL ::   ln_dyn_frs  = .false. !: =T FRS boundary conditions on velocities
+   LOGICAL ::   ln_tra_frs  = .false. !: =T FRS boundary conditions on tracers (T and S)
+   LOGICAL ::   ln_ice_frs  = .false. !: =T FRS boundary conditions on seaice (leads fraction, ice depth, snow depth)
    !
-   INTEGER ::   nb_rimwidth = 7         !: boundary rim width
-   INTEGER ::   nbdy_dta    = 1          !: = 0 use the initial state as bdy dta or = 1 read it in a NetCDF file
-   INTEGER ::   volbdy      = 1         !: = 0 the total volume will have the variability of the surface Flux E-P 
+   INTEGER ::   nn_rimwidth = 7         !: boundary rim width
+   INTEGER ::   nn_dtactl   = 1          !: = 0 use the initial state as bdy dta or = 1 read it in a NetCDF file
+   INTEGER ::   nn_volctl   = 1         !: = 0 the total volume will have the variability of the surface Flux E-P 
    !                                    !  = 1 the volume will be constant during all the integration.
 
@@ -54 +55 @@
    !! Unstructured open boundary data variables
    !!----------------------------------------------------------------------
-   INTEGER, DIMENSION(jpbgrd) ::   nblen                  !: Size of bdy data on a proc for each grid type
-   INTEGER, DIMENSION(jpbgrd) ::   nblenrim               !: Size of bdy data on a proc for first rim ind
-   INTEGER, DIMENSION(jpbgrd) ::   nblendta               !: Size of bdy data in file
+   INTEGER, DIMENSION(jpbgrd) ::   nblen    = 0           !: Size of bdy data on a proc for each grid type
+   INTEGER, DIMENSION(jpbgrd) ::   nblenrim = 0           !: Size of bdy data on a proc for first rim ind
+   INTEGER, DIMENSION(jpbgrd) ::   nblendta = 0           !: Size of bdy data in file
 
    INTEGER, DIMENSION(jpbdim,jpbgrd) ::   nbi, nbj        !: i and j indices of bdy dta
@@ -73 +74 @@
    REAL(wp), DIMENSION(jpbdim) ::   sshtide               !: Tidal boundary array : SSH
    REAL(wp), DIMENSION(jpbdim) ::   utide, vtide          !: Tidal boundary array : U and V
+#if defined key_lim2
+   REAL(wp), DIMENSION(jpbdim) ::  &
+      frld_bdy, hicif_bdy,  & !: Now clim of ice leads fraction, ice  
+      hsnif_bdy               !: thickness and snow thickness
+#endif
 
 #else
@@ -78 +84 @@
    !!   Dummy module                NO Unstructured Open Boundary Condition
    !!----------------------------------------------------------------------
-   LOGICAL ::   ln_bdy_tides = .false.  !: =T apply tidal harmonic forcing along open boundaries
+   LOGICAL ::   ln_tides = .false.  !: =T apply tidal harmonic forcing along open boundaries
 #endif
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!======================================================================
 END MODULE bdy_oce

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_par.F90

@@ -6 +6 @@
    !! History :  1.0  !  2005-01  (J. Chanut, A. Sellar)  Original code
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version
+   !!            3.3  !  2010-09  (D. Storkey and E. O'Dea) update for Shelf configurations
    !!----------------------------------------------------------------------
-#if defined key_bdy
+#if defined   key_bdy
    !!----------------------------------------------------------------------
    !!   'key_bdy' :                    Unstructured Open Boundary Condition
@@ -15 +16 @@
    PUBLIC
 
-
-   LOGICAL, PUBLIC, PARAMETER ::   lk_bdy  = .TRUE.  !: Unstructured Ocean Boundary Condition flag
-   INTEGER, PUBLIC, PARAMETER ::   jpbdta  = 5000    !: Max length of bdy field in file
-   INTEGER, PUBLIC, PARAMETER ::   jpbdim  = 5000    !: Max length of bdy field on a processor
-   INTEGER, PUBLIC, PARAMETER ::   jpbtime = 1000    !: Max number of time dumps per file
-   INTEGER, PUBLIC, PARAMETER ::   jpbgrd  = 3       !: Number of horizontal grid types used  (T, u, v, f)
+   LOGICAL, PUBLIC, PARAMETER ::   lk_bdy  = .TRUE.   !: Unstructured Ocean Boundary Condition flag
+   INTEGER, PUBLIC, PARAMETER ::   jpbdta  = 20000    !: Max length of bdy field in file
+   INTEGER, PUBLIC, PARAMETER ::   jpbdim  = 20000    !: Max length of bdy field on a processor
+   INTEGER, PUBLIC, PARAMETER ::   jpbtime = 1000     !: Max number of time dumps per file
+   INTEGER, PUBLIC, PARAMETER ::   jpbgrd  = 6        !: Number of horizontal grid types used  (T, u, v, f)
 #else
    !!----------------------------------------------------------------------
@@ -29 +29 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!======================================================================
 END MODULE bdy_par

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

@@ -6 +6 @@
    !! History :  1.0  !  2005-01  (J. Chanut, A. Sellar)  Original code
    !!             -   !  2007-01  (D. Storkey) Update to use IOM module
-   !!             -   !  2007-07  (D. Storkey) add bdy_dta_bt
+   !!             -   !  2007-07  (D. Storkey) add bdy_dta_fla
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version
+   !!            3.3  !  2010-09  (E.O'Dea) modifications for Shelf configurations 
+   !!            3.3  !  2010-09  (D.Storkey) add ice boundary conditions
    !!----------------------------------------------------------------------
 #if defined key_bdy
@@ -13 +15 @@
    !!   'key_bdy'                     Unstructured Open Boundary Conditions
    !!----------------------------------------------------------------------
-   !!   bdy_dta    : read u, v, t, s data along open boundaries
-   !!   bdy_dta_bt : read depth-mean velocities and elevation along open
-   !!                boundaries        
+   !!   bdy_dta_frs    : read u, v, t, s data along open boundaries
+   !!   bdy_dta_fla : read depth-mean velocities and elevation along open boundaries        
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
@@ -25 +26 @@
    USE ioipsl
    USE in_out_manager  ! I/O logical units
+#if defined key_lim2
+   USE ice_2
+#endif
 
    IMPLICIT NONE
    PRIVATE
 
-   PUBLIC   bdy_dta      ! routines called by step.F90
-   PUBLIC   bdy_dta_bt 
-
-   INTEGER ::   numbdyt, numbdyu, numbdyv                      !: logical units for T-, U-, & V-points data file, resp.
-   INTEGER ::   ntimes_bdy                                     !: exact number of time dumps in data files
-   INTEGER ::   nbdy_b, nbdy_a                                 !: record of bdy data file for before and after model time step
-   INTEGER ::   numbdyt_bt, numbdyu_bt, numbdyv_bt             !: logical unit for T-, U- & V-points data file, resp.
-   INTEGER ::   ntimes_bdy_bt                                  !: exact number of time dumps in data files
-   INTEGER ::   nbdy_b_bt, nbdy_a_bt                           !: record of bdy data file for before and after model time step
-
-   INTEGER, DIMENSION (jpbtime) ::   istep, istep_bt           !: time array in seconds in each data file
-
-   REAL(wp) ::  zoffset                                        !: time offset between time origin in file & start time of model run
-
-   REAL(wp), DIMENSION(jpbdim,jpk,2) ::   tbdydta, sbdydta     !: time interpolated values of T and S bdy data   
-   REAL(wp), DIMENSION(jpbdim,jpk,2) ::   ubdydta, vbdydta     !: time interpolated values of U and V bdy data 
-   REAL(wp), DIMENSION(jpbdim,2)     ::   ubtbdydta, vbtbdydta !: Arrays used for time interpolation of bdy data   
-   REAL(wp), DIMENSION(jpbdim,2)     ::   sshbdydta            !: bdy data of ssh
+   PUBLIC   bdy_dta_frs      ! routines called by step.F90
+   PUBLIC   bdy_dta_fla 
+
+   INTEGER ::   numbdyt, numbdyu, numbdyv                      ! logical units for T-, U-, & V-points data file, resp.
+   INTEGER ::   ntimes_bdy                                     ! exact number of time dumps in data files
+   INTEGER ::   nbdy_b, nbdy_a                                 ! record of bdy data file for before and after time step
+   INTEGER ::   numbdyt_bt, numbdyu_bt, numbdyv_bt             ! logical unit for T-, U- & V-points data file, resp.
+   INTEGER ::   ntimes_bdy_bt                                  ! exact number of time dumps in data files
+   INTEGER ::   nbdy_b_bt, nbdy_a_bt                           ! record of bdy data file for before and after time step
+
+   INTEGER, DIMENSION (jpbtime) ::   istep, istep_bt           ! time array in seconds in each data file
+
+   REAL(wp) ::  zoffset                                        ! time offset between time origin in file & start time of model run
+
+   REAL(wp), DIMENSION(jpbdim,jpk,2) ::   tbdydta, sbdydta     ! time interpolated values of T and S bdy data   
+   REAL(wp), DIMENSION(jpbdim,jpk,2) ::   ubdydta, vbdydta     ! time interpolated values of U and V bdy data 
+   REAL(wp), DIMENSION(jpbdim,2)     ::   ubtbdydta, vbtbdydta ! Arrays used for time interpolation of bdy data   
+   REAL(wp), DIMENSION(jpbdim,2)     ::   sshbdydta            ! bdy data of ssh
+
+#if defined key_lim2
+   REAL(wp), DIMENSION(jpbdim,2)     ::   frld_bdydta          ! }
+   REAL(wp), DIMENSION(jpbdim,2)     ::   hicif_bdydta         ! } Arrays used for time interp. of ice bdy data 
+   REAL(wp), DIMENSION(jpbdim,2)     ::   hsnif_bdydta         ! }
+#endif
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
-   SUBROUTINE bdy_dta( kt )
+   SUBROUTINE bdy_dta_frs( kt )
       !!----------------------------------------------------------------------
-      !!                   ***  SUBROUTINE bdy_dta  ***
+      !!                   ***  SUBROUTINE bdy_dta_frs  ***
       !!                    
       !! ** Purpose :   Read unstructured boundary data for FRS condition.
@@ -67 +76 @@
       !!                the file. If so read it in. Time interpolate.
       !!----------------------------------------------------------------------
-      INTEGER, INTENT( in ) ::   kt                             ! ocean time-step index (for timesplitting option, otherwise zero)
+      INTEGER, INTENT( in ) ::   kt   ! ocean time-step index (for timesplitting option, otherwise zero)
       !!
       CHARACTER(LEN=80), DIMENSION(3) ::   clfile               ! names of input files
@@ -79 +88 @@
       INTEGER ::   itimer, totime
       INTEGER ::   ii, ij                                       ! array addresses
-      INTEGER ::   ipi, ipj, ipk, inum                          ! temporary integers (NetCDF read)
+      INTEGER ::   ipi, ipj, ipk, inum                          ! local integers (NetCDF read)
       INTEGER ::   iyear0, imonth0, iday0
       INTEGER ::   ihours0, iminutes0, isec0
@@ -91 +100 @@
       !!---------------------------------------------------------------------------
 
-      IF( ln_bdy_dyn_frs .OR. ln_bdy_tra_frs ) THEN  ! If these are both false then this routine 
-                                                     ! does nothing.
+
+      IF( ln_dyn_frs .OR. ln_tra_frs    &
+         &               .OR. ln_ice_frs ) THEN  ! If these are both false then this routine does nothing
 
       ! -------------------- !
@@ -102 +112 @@
       ! Some time variables for monthly climatological forcing:
       ! *******************************************************
- !!gm  here  use directely daymod variables
+
+!!gm  here  use directely daymod calendar variables
  
       iman = INT( raamo )      ! Number of months in a year
@@ -121 +132 @@
          !                                             !-------------------!
          istep(:) = 0
-         nbdy_b    = 0
-         nbdy_a    = 0
+         nbdy_b   = 0
+         nbdy_a   = 0
 
          ! Get time information from bdy data file
@@ -128 +139 @@
 
          IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*)    'bdy_dta : Initialize unstructured boundary data'
+         IF(lwp) WRITE(numout,*)    'bdy_dta_frs : Initialize unstructured boundary data'
          IF(lwp) WRITE(numout,*)    '~~~~~~~' 
 
-         IF     ( nbdy_dta == 0 ) THEN
+         IF     ( nn_dtactl == 0 ) THEN
             !
             IF(lwp) WRITE(numout,*) '          Bdy data are taken from initial conditions'
             !
-         ELSEIF (nbdy_dta == 1) THEN
+         ELSEIF (nn_dtactl == 1) THEN
             !
             IF(lwp) WRITE(numout,*) '          Bdy data are read in netcdf files'
@@ -144 +155 @@
             !                                                 ! necessary time dumps in file are included
             !
-            clfile(1) = filbdy_data_T
-            clfile(2) = filbdy_data_U
-            clfile(3) = filbdy_data_V
+            clfile(1) = cn_dta_frs_T
+            clfile(2) = cn_dta_frs_U
+            clfile(3) = cn_dta_frs_V
             !                                                  
             ! how many files are we to read in?
             igrd_start = 1
             igrd_end   = 3
-            IF(.NOT. ln_bdy_tra_frs .AND. .NOT. ln_bdy_ice_frs) THEN
-               ! No T-grid file.
+            IF(.NOT. ln_tra_frs .AND. .NOT. ln_ice_frs) THEN       ! No T-grid file.
                igrd_start = 2
-            ELSEIF ( .NOT. ln_bdy_dyn_frs ) THEN
-               ! No U-grid or V-grid file.
+            ELSEIF ( .NOT. ln_dyn_frs ) THEN                           ! No U-grid or V-grid file.
                igrd_end   = 1         
             ENDIF
@@ -165 +174 @@
 
                SELECT CASE( igrd )
-                  CASE (1) 
-                     numbdyt = inum
-                  CASE (2) 
-                     numbdyu = inum
-                  CASE (3) 
-                     numbdyv = inum
+                  CASE (1)   ;   numbdyt = inum
+                  CASE (2)   ;   numbdyu = inum
+                  CASE (3)   ;   numbdyv = inum
                END SELECT
 
@@ -196 +202 @@
                IF(lwp) WRITE(numout,*) 'offset: ',zoffset
                IF(lwp) WRITE(numout,*) 'totime: ',totime
-               IF(lwp) WRITE(numout,*) 'zstepr: ',zstepr
+               IF(lwp) WRITE(numout,*) 'zstepr: ',zstepr(1:ntimes_bdy)
 
                ! Check that there are not too many times in the file. 
@@ -205 +211 @@
 
                ! Check that time array increases:
-        
                it = 1
-               DO WHILE( zstepr(it+1) > zstepr(it) .AND. it /= ntimes_bdy - 1 )
-                 it = it + 1
+               DO WHILE( zstepr(it+1) > zstepr(it) .AND. it /= ntimes_bdy - 1 ) 
+                  it = it + 1
                END DO
-
-               IF( it.NE.ntimes_bdy-1 .AND. ntimes_bdy > 1 ) THEN
+               !
+               IF( it /= ntimes_bdy-1 .AND. ntimes_bdy > 1 ) THEN
                      WRITE(ctmp1,*) 'Check file: ', clfile(igrd)
                      CALL ctl_stop( 'Time array in unstructured boundary data files',   &
@@ -227 +232 @@
                END IF
                !
-               IF    ( igrd == 1 ) THEN
-                 ntimes_bdyt = ntimes_bdy
-                 zoffsett = zoffset
-                 istept(:) = INT( zstepr(:) + zoffset )
-               ELSEIF(igrd == 2 ) THEN
-                 ntimes_bdyu = ntimes_bdy
-                 zoffsetu = zoffset
-                 istepu(:) = INT( zstepr(:) + zoffset )
-               ELSEIF(igrd == 3 ) THEN
-                 ntimes_bdyv = ntimes_bdy
-                 zoffsetv = zoffset
-                 istepv(:) = INT( zstepr(:) + zoffset )
-               ENDIF
+               SELECT CASE( igrd )
+                  CASE (1)
+                    ntimes_bdyt = ntimes_bdy
+                    zoffsett = zoffset
+                    istept(:) = INT( zstepr(:) + zoffset )
+                    numbdyt = inum
+                  CASE (2)
+                    ntimes_bdyu = ntimes_bdy
+                    zoffsetu = zoffset
+                    istepu(:) = INT( zstepr(:) + zoffset )
+                    numbdyu = inum
+                  CASE (3)
+                    ntimes_bdyv = ntimes_bdy
+                    zoffsetv = zoffset
+                    istepv(:) = INT( zstepr(:) + zoffset )
+                    numbdyv = inum
+               END SELECT
                !
             END DO                                         ! end loop over T, U & V grid 
@@ -259 +268 @@
             ENDIF
 
-            IF( igrd_start == 1 ) THEN
-               istep(:) = istept(:)
-            ELSE
-               istep(:) = istepu(:)
+            IF( igrd_start == 1 ) THEN   ;   istep(:) = istept(:)
+            ELSE                         ;   istep(:) = istepu(:)
             ENDIF
 
             ! Check number of time dumps:              
-            IF( ntimes_bdy == 1 .AND. .NOT. ln_bdy_clim ) THEN
+            IF( ntimes_bdy == 1 .AND. .NOT. ln_clim ) THEN
               CALL ctl_stop( 'There is only one time dump in data files',   &
-                 &           'Choose ln_bdy_clim=.true. in namelist for constant bdy forcing.' )
+                 &           'Choose ln_clim=.true. in namelist for constant bdy forcing.' )
             ENDIF
 
-            IF( ln_bdy_clim ) THEN
+            IF( ln_clim ) THEN
               IF( ntimes_bdy /= 1 .AND. ntimes_bdy /= 12 ) THEN
-                 CALL ctl_stop( 'For climatological boundary forcing (ln_bdy_clim=.true.),',   &
+                 CALL ctl_stop( 'For climatological boundary forcing (ln_clim=.true.),',   &
                     &           'bdy data files must contain 1 or 12 time dumps.' )
               ELSEIF( ntimes_bdy ==  1 ) THEN
@@ -287 +294 @@
             it = 1
             DO WHILE( istep(it+1) <= 0 .AND. it <= ntimes_bdy - 1 )
-              it = it + 1
+               it = it + 1
             END DO
             nbdy_b = it
             !
-            WRITE(numout,*) 'Time offset is ',zoffset
-            WRITE(numout,*) 'First record to read is ',nbdy_b
-
-         ENDIF ! endif (nbdy_dta == 1)
-
-
-         ! 1.2  Read first record in file if necessary (ie if nbdy_dta == 1)
+            IF(lwp) WRITE(numout,*) 'Time offset is ',zoffset
+            IF(lwp) WRITE(numout,*) 'First record to read is ',nbdy_b
+
+         ENDIF ! endif (nn_dtactl == 1)
+
+
+         ! 1.2  Read first record in file if necessary (ie if nn_dtactl == 1)
          ! *****************************************************************
 
-         IF( nbdy_dta == 0) THEN      ! boundary data arrays are filled with initial conditions
+         IF( nn_dtactl == 0 ) THEN      ! boundary data arrays are filled with initial conditions
             !
-            IF (ln_bdy_tra_frs) THEN
-              igrd = 1            ! T-points data 
-              DO ib = 1, nblen(igrd)
-                ii = nbi(ib,igrd)
-                ij = nbj(ib,igrd)
-                DO ik = 1, jpkm1
-                  tbdy(ib,ik) = tn(ii, ij, ik)
-                  sbdy(ib,ik) = sn(ii, ij, ik)
-                ENDDO
-              END DO
+            IF (ln_tra_frs) THEN
+               igrd = 1            ! T-points data 
+               DO ib = 1, nblen(igrd)
+                  ii = nbi(ib,igrd)
+                  ij = nbj(ib,igrd)
+                  DO ik = 1, jpkm1
+                     tbdy(ib,ik) = tn(ii,ij,ik)
+                     sbdy(ib,ik) = sn(ii,ij,ik)
+                  END DO
+               END DO
             ENDIF
 
-            IF(ln_bdy_dyn_frs) THEN
-              igrd = 2            ! U-points data 
-              DO ib = 1, nblen(igrd)
-                ii = nbi(ib,igrd)
-                ij = nbj(ib,igrd)
-                DO ik = 1, jpkm1
-                  ubdy(ib,ik) = un(ii, ij, ik)
-                ENDDO
-              END DO
-
-              igrd = 3            ! V-points data 
-              DO ib = 1, nblen(igrd)            
-                ii = nbi(ib,igrd)
-                ij = nbj(ib,igrd)
-                DO ik = 1, jpkm1
-                  vbdy(ib,ik) = vn(ii, ij, ik)
-                ENDDO
-              END DO
+            IF(ln_dyn_frs) THEN
+               igrd = 2            ! U-points data 
+               DO ib = 1, nblen(igrd)
+                  ii = nbi(ib,igrd)
+                  ij = nbj(ib,igrd)
+                  DO ik = 1, jpkm1
+                     ubdy(ib,ik) = un(ii, ij, ik)
+                  END DO
+               END DO
+               !
+               igrd = 3            ! V-points data 
+               DO ib = 1, nblen(igrd)            
+                  ii = nbi(ib,igrd)
+                  ij = nbj(ib,igrd)
+                  DO ik = 1, jpkm1
+                     vbdy(ib,ik) = vn(ii, ij, ik)
+                  END DO
+               END DO
             ENDIF
             !
-         ELSEIF( nbdy_dta == 1 ) THEN    ! Set first record in the climatological case:   
+#if defined key_lim2
+            IF( ln_ice_frs ) THEN
+               igrd = 1            ! T-points data
+               DO ib = 1, nblen(igrd)
+                  frld_bdy (ib) =  frld(nbi(ib,igrd), nbj(ib,igrd))
+                  hicif_bdy(ib) = hicif(nbi(ib,igrd), nbj(ib,igrd))
+                  hsnif_bdy(ib) = hsnif(nbi(ib,igrd), nbj(ib,igrd))
+               END DO
+            ENDIF
+#endif
+         ELSEIF( nn_dtactl == 1 ) THEN    ! Set first record in the climatological case:   
             !
-            IF( ln_bdy_clim .AND. ntimes_bdy == 1 ) THEN
+            IF( ln_clim .AND. ntimes_bdy == 1 ) THEN
                nbdy_a = 1
-            ELSEIF( ln_bdy_clim .AND. ntimes_bdy == iman ) THEN
+            ELSEIF( ln_clim .AND. ntimes_bdy == iman ) THEN
                nbdy_b = 0
                nbdy_a = imois
@@ -351 +368 @@
             ipi  = nblendta(igrd)
 
-            IF(ln_bdy_tra_frs) THEN
+            IF(ln_tra_frs) THEN
+               !
                igrd = 1                                           ! Temperature
                IF( nblendta(igrd) <=  0 ) THEN 
@@ -357 +375 @@
                   nblendta(igrd) = iom_file(numbdyt)%dimsz(1,idvar)
                ENDIF
-               WRITE(numout,*) 'Dim size for votemper is ', nblendta(igrd)
+               IF(lwp) WRITE(numout,*) 'Dim size for votemper is ', nblendta(igrd)
                ipi = nblendta(igrd)
                CALL iom_get ( numbdyt, jpdom_unknown, 'votemper', zdta(1:ipi,1:ipj,1:ipk), nbdy_a )
-
+               !
                DO ib = 1, nblen(igrd)
                   DO ik = 1, jpkm1
@@ -372 +390 @@
                   nblendta(igrd) = iom_file(numbdyt)%dimsz(1,idvar)
                ENDIF
-               WRITE(numout,*) 'Dim size for vosaline is ', nblendta(igrd)
+               IF(lwp) WRITE(numout,*) 'Dim size for vosaline is ', nblendta(igrd)
                ipi = nblendta(igrd)
                CALL iom_get ( numbdyt, jpdom_unknown, 'vosaline', zdta(1:ipi,1:ipj,1:ipk), nbdy_a )
-
+               !
                DO ib = 1, nblen(igrd)
                   DO ik = 1, jpkm1
@@ -381 +399 @@
                   END DO
                END DO
-            ENDIF  ! ln_bdy_tra_frs
+            ENDIF  ! ln_tra_frs
  
-            IF(ln_bdy_dyn_frs) THEN
-
+            IF( ln_dyn_frs ) THEN
+               !
                igrd = 2                                           ! u-velocity
                IF ( nblendta(igrd) .le. 0 ) THEN 
@@ -390 +408 @@
                  nblendta(igrd) = iom_file(numbdyu)%dimsz(1,idvar)
                ENDIF
-               WRITE(numout,*) 'Dim size for vozocrtx is ', nblendta(igrd)
+               IF(lwp) WRITE(numout,*) 'Dim size for vozocrtx is ', nblendta(igrd)
                ipi = nblendta(igrd)
                CALL iom_get ( numbdyu, jpdom_unknown,'vozocrtx',zdta(1:ipi,1:ipj,1:ipk),nbdy_a )
@@ -404 +422 @@
                  nblendta(igrd) = iom_file(numbdyv)%dimsz(1,idvar)
                ENDIF
-               WRITE(numout,*) 'Dim size for vomecrty is ', nblendta(igrd)
+               IF(lwp) WRITE(numout,*) 'Dim size for vomecrty is ', nblendta(igrd)
                ipi = nblendta(igrd)
                CALL iom_get ( numbdyv, jpdom_unknown,'vomecrty',zdta(1:ipi,1:ipj,1:ipk),nbdy_a )
@@ -412 +430 @@
                   END DO
                END DO
-            ENDIF ! ln_bdy_dyn_frs
-
-
-            IF ((.NOT.ln_bdy_clim) .AND. (istep(1) > 0)) THEN
-               ! First data time is after start of run
-               ! Put first value in both time levels
-               nbdy_b = nbdy_a
-               IF(ln_bdy_tra_frs) THEN
+            ENDIF ! ln_dyn_frs
+
+#if defined key_lim2
+            IF( ln_ice_frs ) THEN
+              !
+              igrd=1                                              ! leads fraction
+              IF(lwp) WRITE(numout,*) 'Dim size for ildsconc is ',nblendta(igrd)
+              ipi=nblendta(igrd)
+              CALL iom_get ( numbdyt, jpdom_unknown,'ildsconc',zdta(1:ipi,:,1),nbdy_a )
+              DO ib=1, nblen(igrd)
+                frld_bdydta(ib,2) =  zdta(nbmap(ib,igrd),1,1)
+              END DO
+              !
+              igrd=1                                              ! ice thickness
+              IF(lwp) WRITE(numout,*) 'Dim size for iicethic is ',nblendta(igrd)
+              ipi=nblendta(igrd)
+              CALL iom_get ( numbdyt, jpdom_unknown,'iicethic',zdta(1:ipi,:,1),nbdy_a )
+              DO ib=1, nblen(igrd)
+                hicif_bdydta(ib,2) =  zdta(nbmap(ib,igrd),1,1)
+              END DO
+              !
+              igrd=1                                              ! snow thickness
+              IF(lwp) WRITE(numout,*) 'Dim size for isnowthi is ',nblendta(igrd)
+              ipi=nblendta(igrd)
+              CALL iom_get ( numbdyt, jpdom_unknown,'isnowthi',zdta(1:ipi,:,1),nbdy_a )
+              DO ib=1, nblen(igrd)
+                hsnif_bdydta(ib,2) =  zdta(nbmap(ib,igrd),1,1)
+              END DO
+            ENDIF ! just if ln_ice_frs is set
+#endif
+
+            IF( .NOT.ln_clim .AND. istep(1) > 0 ) THEN     ! First data time is after start of run
+               nbdy_b = nbdy_a                                 ! Put first value in both time levels
+               IF( ln_tra_frs ) THEN
                  tbdydta(:,:,1) = tbdydta(:,:,2)
                  sbdydta(:,:,1) = sbdydta(:,:,2)
                ENDIF
-               IF(ln_bdy_dyn_frs) THEN
+               IF( ln_dyn_frs ) THEN
                  ubdydta(:,:,1) = ubdydta(:,:,2)
                  vbdydta(:,:,1) = vbdydta(:,:,2)
                ENDIF
+#if defined key_lim2
+               IF( ln_ice_frs ) THEN
+                  frld_bdydta (:,1) =  frld_bdydta(:,2)
+                  hicif_bdydta(:,1) = hicif_bdydta(:,2)
+                  hsnif_bdydta(:,1) = hsnif_bdydta(:,2)
+               ENDIF
+#endif
             END IF
-
-         END IF ! nbdy_dta == 0/1
+            !
+         END IF   ! nn_dtactl == 0/1
  
          ! In the case of constant boundary forcing fill bdy arrays once for all
-         IF ((ln_bdy_clim).AND.(ntimes_bdy==1)) THEN
-            IF(ln_bdy_tra_frs) THEN
-              tbdy  (:,:) = tbdydta  (:,:,2)
-              sbdy  (:,:) = sbdydta  (:,:,2)
+         IF( ln_clim .AND. ntimes_bdy == 1 ) THEN
+            IF( ln_tra_frs ) THEN
+               tbdy  (:,:) = tbdydta  (:,:,2)
+               sbdy  (:,:) = sbdydta  (:,:,2)
             ENDIF
-            IF(ln_bdy_dyn_frs) THEN
-              ubdy  (:,:) = ubdydta  (:,:,2)
-              vbdy  (:,:) = vbdydta  (:,:,2)
+            IF( ln_dyn_frs) THEN
+               ubdy  (:,:) = ubdydta  (:,:,2)
+               vbdy  (:,:) = vbdydta  (:,:,2)
             ENDIF
-
-            IF(ln_bdy_tra_frs .or. ln_bdy_ice_frs) CALL iom_close( numbdyt )
-            IF(ln_bdy_dyn_frs) CALL iom_close( numbdyu )
-            IF(ln_bdy_dyn_frs) CALL iom_close( numbdyv )
+#if defined key_lim2
+            IF( ln_ice_frs ) THEN
+               frld_bdy (:) = frld_bdydta (:,2)
+               hicif_bdy(:) = hicif_bdydta(:,2)
+               hsnif_bdy(:) = hsnif_bdydta(:,2)
+            ENDIF
+#endif
+
+            IF( ln_tra_frs .OR. ln_ice_frs) CALL iom_close( numbdyt )
+            IF( ln_dyn_frs                    ) CALL iom_close( numbdyu )
+            IF( ln_dyn_frs                    ) CALL iom_close( numbdyv )
          END IF
-
+         !
       ENDIF                                            ! End if nit000
 
 
       !                                                !---------------------!
-      !                                                !  at each time step  !
-      !                                                !---------------------!
-
-      IF( nbdy_dta == 1 .AND. ntimes_bdy > 1 ) THEN 
-         !
+      IF( nn_dtactl == 1 .AND. ntimes_bdy > 1 ) THEN    !  at each time step  !
+         !                                             !---------------------!
          ! Read one more record if necessary
          !**********************************
 
-        IF( ln_bdy_clim .AND. imois /= nbdy_b ) THEN      ! remember that nbdy_b=0 for kt=nit000
-           nbdy_b = imois
-           nbdy_a = imois + 1
-           nbdy_b = MOD( nbdy_b, iman )   ;   IF( nbdy_b == 0 ) nbdy_b = iman
-           nbdy_a = MOD( nbdy_a, iman )   ;   IF( nbdy_a == 0 ) nbdy_a = iman
-           lect=.true.
-        ELSEIF( .NOT.ln_bdy_clim .AND. itimer >= istep(nbdy_a) ) THEN
-
-           IF ( nbdy_a < ntimes_bdy ) THEN
-              nbdy_b = nbdy_a
-              nbdy_a = nbdy_a + 1
-              lect  =.true.
-           ELSE
-              ! We have reached the end of the file
-              ! put the last data time into both time levels
-              nbdy_b = nbdy_a
-              IF(ln_bdy_tra_frs) THEN
-                tbdydta(:,:,1) =  tbdydta(:,:,2)
-                sbdydta(:,:,1) =  sbdydta(:,:,2)
-              ENDIF
-              IF(ln_bdy_dyn_frs) THEN
-                ubdydta(:,:,1) =  ubdydta(:,:,2)
-                vbdydta(:,:,1) =  vbdydta(:,:,2)
-              ENDIF
+         IF( ln_clim .AND. imois /= nbdy_b ) THEN      ! remember that nbdy_b=0 for kt=nit000
+            nbdy_b = imois
+            nbdy_a = imois + 1
+            nbdy_b = MOD( nbdy_b, iman )   ;   IF( nbdy_b == 0 ) nbdy_b = iman
+            nbdy_a = MOD( nbdy_a, iman )   ;   IF( nbdy_a == 0 ) nbdy_a = iman
+            lect=.true.
+         ELSEIF( .NOT.ln_clim .AND. itimer >= istep(nbdy_a) ) THEN
+
+            IF( nbdy_a < ntimes_bdy ) THEN
+               nbdy_b = nbdy_a
+               nbdy_a = nbdy_a + 1
+               lect  =.true.
+            ELSE
+               ! We have reached the end of the file
+               ! put the last data time into both time levels
+               nbdy_b = nbdy_a
+               IF(ln_tra_frs) THEN
+                  tbdydta(:,:,1) =  tbdydta(:,:,2)
+                  sbdydta(:,:,1) =  sbdydta(:,:,2)
+               ENDIF
+               IF(ln_dyn_frs) THEN
+                  ubdydta(:,:,1) =  ubdydta(:,:,2)
+                  vbdydta(:,:,1) =  vbdydta(:,:,2)
+               ENDIF
+#if defined key_lim2
+               IF(ln_ice_frs) THEN
+                  frld_bdydta (:,1) =  frld_bdydta (:,2)
+                  hicif_bdydta(:,1) =  hicif_bdydta(:,2)
+                  hsnif_bdydta(:,1) =  hsnif_bdydta(:,2)
+               ENDIF
+#endif
             END IF ! nbdy_a < ntimes_bdy
-
+            !
         END IF
          
-        IF( lect ) THEN
-           ! Swap arrays
-           IF(ln_bdy_tra_frs) THEN
+        IF( lect ) THEN           ! Swap arrays
+           IF( ln_tra_frs ) THEN
              tbdydta(:,:,1) =  tbdydta(:,:,2)
              sbdydta(:,:,1) =  sbdydta(:,:,2)
            ENDIF
-           IF(ln_bdy_dyn_frs) THEN
+           IF( ln_dyn_frs ) THEN
              ubdydta(:,:,1) =  ubdydta(:,:,2)
              vbdydta(:,:,1) =  vbdydta(:,:,2)
            ENDIF
- 
+#if defined key_lim2
+           IF( ln_ice_frs ) THEN
+             frld_bdydta (:,1) =  frld_bdydta (:,2)
+             hicif_bdydta(:,1) =  hicif_bdydta(:,2)
+             hsnif_bdydta(:,1) =  hsnif_bdydta(:,2)
+           ENDIF
+#endif 
            ! read another set
            ipj  = 1
            ipk  = jpk
 
-           IF(ln_bdy_tra_frs) THEN
+           IF( ln_tra_frs ) THEN
               ! 
               igrd = 1                                   ! temperature
@@ -521 +588 @@
                  END DO
               END DO
-           ENDIF ! ln_bdy_tra_frs
-
-           IF(ln_bdy_dyn_frs) THEN
+           ENDIF ! ln_tra_frs
+
+           IF(ln_dyn_frs) THEN
               !
               igrd = 2                                   ! u-velocity
@@ -542 +609 @@
                  END DO
               END DO
-           ENDIF ! ln_bdy_dyn_frs
-
+           ENDIF ! ln_dyn_frs
            !
-           IF(lwp) WRITE(numout,*) 'bdy_dta : first record file used nbdy_b ',nbdy_b
+#if defined key_lim2
+           IF(ln_ice_frs) THEN
+             !
+             igrd = 1                                    ! ice concentration
+             ipi=nblendta(igrd)
+             CALL iom_get ( numbdyt, jpdom_unknown,'ildsconc',zdta(1:ipi,:,1),nbdy_a )
+             DO ib=1, nblen(igrd)
+               frld_bdydta(ib,2) =  zdta( nbmap(ib,igrd), 1, 1 )
+             END DO
+             !
+             igrd=1                                      ! ice thickness
+             ipi=nblendta(igrd)
+             CALL iom_get ( numbdyt, jpdom_unknown,'iicethic',zdta(1:ipi,:,1),nbdy_a )
+             DO ib=1, nblen(igrd)
+               hicif_bdydta(ib,2) =  zdta( nbmap(ib,igrd), 1, 1 )
+             END DO
+             !
+             igrd=1                                      ! snow thickness
+             ipi=nblendta(igrd)
+             CALL iom_get ( numbdyt, jpdom_unknown,'isnowthi',zdta(1:ipi,:,1),nbdy_a )
+             DO ib=1, nblen(igrd)
+               hsnif_bdydta(ib,2) =  zdta( nbmap(ib,igrd), 1, 1 )
+             END DO
+           ENDIF ! ln_ice_frs
+#endif
+           !
+           IF(lwp) WRITE(numout,*) 'bdy_dta_frs : first record file used nbdy_b ',nbdy_b
            IF(lwp) WRITE(numout,*) '~~~~~~~~  last  record file used nbdy_a ',nbdy_a
-           IF (.NOT.ln_bdy_clim) THEN
+           IF (.NOT.ln_clim) THEN
               IF(lwp) WRITE(numout,*) 'first  record time (s): ', istep(nbdy_b)
               IF(lwp) WRITE(numout,*) 'model time (s)        : ', itimer
@@ -559 +651 @@
        ! ********************
        ! 
-       IF( ln_bdy_clim ) THEN   ;   zxy = REAL( nday                  , wp ) / REAL( nmonth_len(nbdy_b), wp ) + 0.5 - i15
-       ELSE                     ;   zxy = REAL( istep(nbdy_b) - itimer, wp ) / REAL( istep(nbdy_b) - istep(nbdy_a), wp )
+       IF( ln_clim ) THEN   ;   zxy = REAL( nday                   ) / REAL( nmonth_len(nbdy_b) ) + 0.5 - i15
+       ELSEIF( istep(nbdy_b) == istep(nbdy_a) ) THEN 
+                                    zxy = 0.0_wp
+       ELSE                     ;   zxy = REAL( istep(nbdy_b) - itimer ) / REAL( istep(nbdy_b) - istep(nbdy_a) )
        END IF
 
-          IF(ln_bdy_tra_frs) THEN
+          IF(ln_tra_frs) THEN
              igrd = 1                                   ! temperature & salinity
              DO ib = 1, nblen(igrd)
@@ -573 +667 @@
           ENDIF
 
-          IF(ln_bdy_dyn_frs) THEN
+          IF(ln_dyn_frs) THEN
              igrd = 2                                   ! u-velocity
              DO ib = 1, nblen(igrd)
@@ -589 +683 @@
           ENDIF
 
-      END IF                       !end if ((nbdy_dta==1).AND.(ntimes_bdy>1))
+#if defined key_lim2
+          IF(ln_ice_frs) THEN
+            igrd=1
+            DO ib=1, nblen(igrd)
+               frld_bdy(ib) = zxy *  frld_bdydta(ib,2) + (1.-zxy) *  frld_bdydta(ib,1)
+              hicif_bdy(ib) = zxy * hicif_bdydta(ib,2) + (1.-zxy) * hicif_bdydta(ib,1)
+              hsnif_bdy(ib) = zxy * hsnif_bdydta(ib,2) + (1.-zxy) * hsnif_bdydta(ib,1)
+            END DO
+          ENDIF ! just if ln_ice_frs is true
+#endif
+
+      END IF                       !end if ((nn_dtactl==1).AND.(ntimes_bdy>1))
     
 
@@ -596 +701 @@
       !                                                !---------------------!
       IF( kt == nitend ) THEN
-          IF(ln_bdy_tra_frs .or. ln_bdy_ice_frs) CALL iom_close( numbdyt )              ! Closing of the 3 files
-          IF(ln_bdy_dyn_frs) CALL iom_close( numbdyu )
-          IF(ln_bdy_dyn_frs) CALL iom_close( numbdyv )
+          IF(ln_tra_frs .or. ln_ice_frs) CALL iom_close( numbdyt )              ! Closing of the 3 files
+          IF(ln_dyn_frs) CALL iom_close( numbdyu )
+          IF(ln_dyn_frs) CALL iom_close( numbdyv )
       ENDIF
       !
-      ENDIF ! ln_bdy_dyn_frs .OR. ln_bdy_tra_frs
-
-   END SUBROUTINE bdy_dta
-
-
-   SUBROUTINE bdy_dta_bt( kt, jit )
+      ENDIF ! ln_dyn_frs .OR. ln_tra_frs
+      !
+   END SUBROUTINE bdy_dta_frs
+
+
+   SUBROUTINE bdy_dta_fla( kt, jit, icycl )
       !!---------------------------------------------------------------------------
-      !!                      ***  SUBROUTINE bdy_dta_bt  ***
+      !!                      ***  SUBROUTINE bdy_dta_fla  ***
       !!                    
       !! ** Purpose :   Read unstructured boundary data for Flather condition
@@ -620 +725 @@
       INTEGER, INTENT( in ) ::   kt          ! ocean time-step index
       INTEGER, INTENT( in ) ::   jit         ! barotropic time step index
+      INTEGER, INTENT( in ) ::   icycl       ! number of cycles need for final file close
       !                                      ! (for timesplitting option, otherwise zero)
       !!
@@ -639 +745 @@
       REAL(wp), DIMENSION(jpbtime)      ::   zstepr             ! REAL time array from data files
       REAL(wp), DIMENSION(jpbdta,1)     ::   zdta               ! temporary array for data fields
-      CHARACTER(LEN=80), DIMENSION(3)   ::   clfile
+      CHARACTER(LEN=80), DIMENSION(6)   ::   clfile
       CHARACTER(LEN=70 )                ::   clunits            ! units attribute of time coordinate
       !!---------------------------------------------------------------------------
 
-!!gm   add here the same style as in bdy_dta
-!!gm      clearly bdy_dta_bt and bdy_dta  can be combined...   
+!!gm   add here the same style as in bdy_dta_frs
+!!gm      clearly bdy_dta_fla and bdy_dta_frs  can be combined...   
 !!gm      too many things duplicated in the read of data...   simplification can be done
 
@@ -671 +777 @@
       itimer = itimer + jit*rdt/REAL(nn_baro,wp)      ! in non-climatological case
 
-      IF ( ln_bdy_tides ) THEN
+      IF ( ln_tides ) THEN
 
          ! -------------------------------------!
@@ -681 +787 @@
       ENDIF
 
-      IF ( ln_bdy_dyn_fla ) THEN
+      IF ( ln_dyn_fla ) THEN
 
          ! -------------------------------------!
@@ -688 +794 @@
 
       !                                                !-------------------!
-      IF( kt == nit000 ) THEN                          !  First call only  !
+      IF( kt == nit000 .and. jit ==2 ) THEN            !  First call only  !
          !                                             !-------------------!
          istep_bt(:) = 0
@@ -698 +804 @@
 
         IF(lwp) WRITE(numout,*)
-        IF(lwp) WRITE(numout,*)    'bdy_dta_bt :Initialize unstructured boundary data for barotropic variables.'
+        IF(lwp) WRITE(numout,*)    'bdy_dta_fla :Initialize unstructured boundary data for barotropic variables.'
         IF(lwp) WRITE(numout,*)    '~~~~~~~' 
 
-        IF( nbdy_dta == 0 ) THEN
+        IF( nn_dtactl == 0 ) THEN
           IF(lwp) WRITE(numout,*)  'Bdy data are taken from initial conditions'
 
-        ELSEIF (nbdy_dta == 1) THEN
+        ELSEIF (nn_dtactl == 1) THEN
           IF(lwp) WRITE(numout,*)  'Bdy data are read in netcdf files'
 
@@ -712 +818 @@
                                                      ! necessary time dumps in file are included
 
-          clfile(1) = filbdy_data_bt_T
-          clfile(2) = filbdy_data_bt_U
-          clfile(3) = filbdy_data_bt_V
-
-          DO igrd = 1,3
+          clfile(4) = cn_dta_fla_T
+          clfile(5) = cn_dta_fla_U
+          clfile(6) = cn_dta_fla_V
+
+          DO igrd = 4,6
 
             CALL iom_open( clfile(igrd), inum )
-            CALL iom_gettime( inum, zstepr, kntime=ntimes_bdy, cdunits=clunits ) 
+            CALL iom_gettime( inum, zstepr, kntime=ntimes_bdy_bt, cdunits=clunits ) 
 
             SELECT CASE( igrd )
-               CASE (1) 
-                  numbdyt = inum
-               CASE (2) 
-                  numbdyu = inum
-               CASE (3) 
-                  numbdyv = inum
+               CASE (4) 
+                  numbdyt_bt = inum
+               CASE (5) 
+                  numbdyu_bt = inum
+               CASE (6) 
+                  numbdyv_bt = inum
             END SELECT
 
@@ -757 +863 @@
 
             ! Check that time array increases (or interp will fail):
-            DO it = 2, ntimes_bdy
+            DO it = 2, ntimes_bdy_bt
                IF ( zstepr(it-1) >= zstepr(it) ) THEN
                   CALL ctl_stop('Time array in unstructured boundary data file', &
@@ -766 +872 @@
             END DO
 
-            IF ( .NOT. ln_bdy_clim ) THEN
+            IF ( .NOT. ln_clim ) THEN
                ! Check that times in file span model run time:
 
@@ -778 +884 @@
                ! The same applies to the last time level: see setting of lect below.
 
-               IF ( ntimes_bdy == 1 ) CALL ctl_stop( &
+               IF ( ntimes_bdy_bt == 1 ) CALL ctl_stop( &
                     'There is only one time dump in data files', &
-                    'Set ln_bdy_clim=.true. in namelist for constant bdy forcing.' )
+                    'Set ln_clim=.true. in namelist for constant bdy forcing.' )
 
                zinterval_s = zstepr(2) - zstepr(1)
-               zinterval_e = zstepr(ntimes_bdy) - zstepr(ntimes_bdy-1)
-
-               IF ( zstepr(1) - zinterval_s / 2.0 > 0 ) THEN             
-                  IF(lwp) WRITE(numout,*) 'First bdy time relative to nit000:', zstepr(1)
-                  IF(lwp) WRITE(numout,*) 'Interval between first two times: ', zinterval_s
-                  CALL ctl_stop( 'First data time is after start of run', & 
-                       'by more than half a meaning period', &
-                       'Check file: ' // TRIM(clfile(igrd)) )
+               zinterval_e = zstepr(ntimes_bdy_bt) - zstepr(ntimes_bdy_bt-1)
+
+               IF( zstepr(1) + zoffset > 0 ) THEN
+                     WRITE(ctmp1,*) 'Check file: ', clfile(igrd)
+                     CALL ctl_stop( 'First time dump in bdy file is after model initial time', ctmp1 )
                END IF
-
-               IF ( zstepr(ntimes_bdy) + zinterval_e / 2.0 < totime ) THEN
-                  IF(lwp) WRITE(numout,*) 'Last bdy time relative to nit000:', zstepr(ntimes_bdy)
-                  IF(lwp) WRITE(numout,*) 'Interval between last two times: ', zinterval_e
-                  CALL ctl_stop( 'Last data time is before end of run', & 
-                       'by more than half a meaning period', &
-                       'Check file: ' // TRIM(clfile(igrd))  )
+               IF( zstepr(ntimes_bdy_bt) + zoffset < totime ) THEN
+                     WRITE(ctmp1,*) 'Check file: ', clfile(igrd)
+                     CALL ctl_stop( 'Last time dump in bdy file is before model final time', ctmp1 )
                END IF
-
-            END IF ! .NOT. ln_bdy_clim
-
-            IF ( igrd .EQ. 1) THEN
+            END IF ! .NOT. ln_clim
+
+            IF ( igrd .EQ. 4) THEN
               ntimes_bdyt = ntimes_bdy_bt
               zoffsett = zoffset
               istept(:) = INT( zstepr(:) + zoffset )
-            ELSE IF (igrd .EQ. 2) THEN
+            ELSE IF (igrd .EQ. 5) THEN
               ntimes_bdyu = ntimes_bdy_bt
               zoffsetu = zoffset
               istepu(:) = INT( zstepr(:) + zoffset )
-            ELSE IF (igrd .EQ. 3) THEN
+            ELSE IF (igrd .EQ. 6) THEN
               ntimes_bdyv = ntimes_bdy_bt
               zoffsetv = zoffset
@@ -840 +938 @@
 
       ! Check number of time dumps:              
-          IF (ln_bdy_clim) THEN
+          IF (ln_clim) THEN
             SELECT CASE ( ntimes_bdy_bt )
             CASE( 1 )
@@ -852 +950 @@
             CASE DEFAULT
               CALL ctl_stop( &
-                'For climatological boundary forcing (ln_bdy_clim=.true.),',&
+                'For climatological boundary forcing (ln_clim=.true.),',&
                 'bdy data files must contain 1 or 12 time dumps.' )
             END SELECT
@@ -865 +963 @@
           nbdy_b_bt = it
 
-          WRITE(numout,*) 'Time offset is ',zoffset
-          WRITE(numout,*) 'First record to read is ',nbdy_b_bt
-
-        ENDIF ! endif (nbdy_dta == 1)
-
-      ! 1.2  Read first record in file if necessary (ie if nbdy_dta == 1)
+          IF(lwp) WRITE(numout,*) 'Time offset is ',zoffset
+          IF(lwp) WRITE(numout,*) 'First record to read is ',nbdy_b_bt
+
+        ENDIF ! endif (nn_dtactl == 1)
+
+      ! 1.2  Read first record in file if necessary (ie if nn_dtactl == 1)
       ! *****************************************************************
 
-        IF ( nbdy_dta == 0) THEN
+        IF ( nn_dtactl == 0) THEN
           ! boundary data arrays are filled with initial conditions
-          igrd = 2            ! U-points data 
+          igrd = 5            ! U-points data 
           DO ib = 1, nblen(igrd)              
             ubtbdy(ib) = un(nbi(ib,igrd), nbj(ib,igrd), 1)
           END DO
 
-          igrd = 3            ! V-points data 
+          igrd = 6            ! V-points data 
           DO ib = 1, nblen(igrd)              
             vbtbdy(ib) = vn(nbi(ib,igrd), nbj(ib,igrd), 1)
           END DO
 
-          igrd = 1            ! T-points data 
+          igrd = 4            ! T-points data 
           DO ib = 1, nblen(igrd)              
             sshbdy(ib) = sshn(nbi(ib,igrd), nbj(ib,igrd))
           END DO
 
-        ELSEIF (nbdy_dta == 1) THEN
+        ELSEIF (nn_dtactl == 1) THEN
  
         ! Set first record in the climatological case:   
-          IF ((ln_bdy_clim).AND.(ntimes_bdy_bt==1)) THEN
+          IF ((ln_clim).AND.(ntimes_bdy_bt==1)) THEN
             nbdy_a_bt = 1
-          ELSEIF ((ln_bdy_clim).AND.(ntimes_bdy_bt==iman)) THEN
+          ELSEIF ((ln_clim).AND.(ntimes_bdy_bt==iman)) THEN
             nbdy_b_bt = 0
             nbdy_a_bt = imois
@@ -904 +1002 @@
          ! Open Netcdf files:
 
-          CALL iom_open ( filbdy_data_bt_T, numbdyt_bt )
-          CALL iom_open ( filbdy_data_bt_U, numbdyu_bt )
-          CALL iom_open ( filbdy_data_bt_V, numbdyv_bt )
+          CALL iom_open ( cn_dta_fla_T, numbdyt_bt )
+          CALL iom_open ( cn_dta_fla_U, numbdyu_bt )
+          CALL iom_open ( cn_dta_fla_V, numbdyv_bt )
 
          ! Read first record:
           ipj=1
-          igrd=1
+          igrd=4
           ipi=nblendta(igrd)
 
           ! ssh
-          igrd=1
+          igrd=4
           IF ( nblendta(igrd) .le. 0 ) THEN 
             idvar = iom_varid( numbdyt_bt,'sossheig' )
@@ -929 +1027 @@
  
           ! u-velocity
-          igrd=2
+          igrd=5
           IF ( nblendta(igrd) .le. 0 ) THEN 
             idvar = iom_varid( numbdyu_bt,'vobtcrtx' )
@@ -944 +1042 @@
 
           ! v-velocity
-          igrd=3
+          igrd=6
           IF ( nblendta(igrd) .le. 0 ) THEN 
             idvar = iom_varid( numbdyv_bt,'vobtcrty' )
@@ -961 +1059 @@
  
         ! In the case of constant boundary forcing fill bdy arrays once for all
-        IF ((ln_bdy_clim).AND.(ntimes_bdy_bt==1)) THEN
+        IF ((ln_clim).AND.(ntimes_bdy_bt==1)) THEN
 
           ubtbdy  (:) = ubtbdydta  (:,2)
@@ -979 +1077 @@
       ! -------------------- !
 
-      IF ((nbdy_dta==1).AND.(ntimes_bdy_bt>1)) THEN 
+      IF ((nn_dtactl==1).AND.(ntimes_bdy_bt>1)) THEN 
 
       ! 2.1 Read one more record if necessary
       !**************************************
 
-        IF ( (ln_bdy_clim).AND.(imois/=nbdy_b_bt) ) THEN ! remember that nbdy_b_bt=0 for kt=nit000
+        IF ( (ln_clim).AND.(imois/=nbdy_b_bt) ) THEN ! remember that nbdy_b_bt=0 for kt=nit000
          nbdy_b_bt = imois
          nbdy_a_bt = imois+1
@@ -993 +1091 @@
          lect=.true.
 
-        ELSEIF ((.NOT.ln_bdy_clim).AND.(itimer >= istep_bt(nbdy_a_bt))) THEN
+        ELSEIF ((.NOT.ln_clim).AND.(itimer >= istep_bt(nbdy_a_bt))) THEN
           nbdy_b_bt=nbdy_a_bt
           nbdy_a_bt=nbdy_a_bt+1
@@ -1010 +1108 @@
           ipj=1
           ipk=jpk
-          igrd=1
+          igrd=4
           ipi=nblendta(igrd)
 
           
           ! ssh
-          igrd=1
+          igrd=4
           ipi=nblendta(igrd)
 
@@ -1025 +1123 @@
 
           ! u-velocity
-          igrd=2
+          igrd=5
           ipi=nblendta(igrd)
 
@@ -1035 +1133 @@
 
           ! v-velocity
-          igrd=3
+          igrd=6
           ipi=nblendta(igrd)
 
@@ -1045 +1143 @@
 
 
-         IF(lwp) WRITE(numout,*) 'bdy_dta : first record file used nbdy_b_bt ',nbdy_b_bt
+         IF(lwp) WRITE(numout,*) 'bdy_dta_fla : first record file used nbdy_b_bt ',nbdy_b_bt
          IF(lwp) WRITE(numout,*) '~~~~~~~~  last  record file used nbdy_a_bt ',nbdy_a_bt
-         IF (.NOT.ln_bdy_clim) THEN
+         IF (.NOT.ln_clim) THEN
            IF(lwp) WRITE(numout,*) 'first  record time (s): ', istep_bt(nbdy_b_bt)
            IF(lwp) WRITE(numout,*) 'model time (s)        : ', itimer
@@ -1058 +1156 @@
       ! ***************************
     
-        IF (ln_bdy_clim) THEN
+        IF (ln_clim) THEN
           zxy = REAL( nday, wp ) / REAL( nmonth_len(nbdy_b_bt), wp ) + 0.5 - i15
         ELSE          
@@ -1064 +1162 @@
         END IF
 
-          igrd=1
+          igrd=4
           DO ib=1, nblen(igrd)
             sshbdy(ib) = zxy      * sshbdydta(ib,2) + &
@@ -1070 +1168 @@
           END DO
 
-          igrd=2
+          igrd=5
           DO ib=1, nblen(igrd)
             ubtbdy(ib) = zxy      * ubtbdydta(ib,2) + &
@@ -1076 +1174 @@
           END DO
 
-          igrd=3
+          igrd=6
           DO ib=1, nblen(igrd)
             vbtbdy(ib) = zxy      * vbtbdydta(ib,2) + &
@@ -1083 +1181 @@
 
 
-      END IF !end if ((nbdy_dta==1).AND.(ntimes_bdy_bt>1))
+      END IF !end if ((nn_dtactl==1).AND.(ntimes_bdy_bt>1))
     
       ! ------------------- !
@@ -1090 +1188 @@
 
       ! Closing of the 3 files
-      IF( kt == nitend ) THEN
+      IF( kt == nitend   .and. jit == icycl ) THEN
           CALL iom_close( numbdyt_bt )
           CALL iom_close( numbdyu_bt )
@@ -1096 +1194 @@
       ENDIF
 
-      ENDIF ! ln_bdy_dyn_frs
-
-      END SUBROUTINE bdy_dta_bt
+      ENDIF ! ln_dyn_frs
+
+      END SUBROUTINE bdy_dta_fla
 
 
@@ -1106 +1204 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE bdy_dta( kt )              ! Empty routine
-      WRITE(*,*) 'bdy_dta: You should not have seen this print! error?', kt
-   END SUBROUTINE bdy_dta
-   SUBROUTINE bdy_dta_bt( kt, kit )      ! Empty routine
-      WRITE(*,*) 'bdy_dta: You should not have seen this print! error?', kt, kit
-   END SUBROUTINE bdy_dta_bt
+   SUBROUTINE bdy_dta_frs( kt )              ! Empty routine
+      WRITE(*,*) 'bdy_dta_frs: You should not have seen this print! error?', kt
+   END SUBROUTINE bdy_dta_frs
+   SUBROUTINE bdy_dta_fla( kt, kit, icycle )      ! Empty routine
+      WRITE(*,*) 'bdy_dta_frs: You should not have seen this print! error?', kt, kit
+   END SUBROUTINE bdy_dta_fla
 #endif
 

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90

@@ -8 +8 @@
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version
    !!            3.2  !  2008-04  (R. Benshila) consider velocity instead of transport 
+   !!            3.3  !  2010-09  (E.O'Dea) modifications for Shelf configurations 
+   !!            3.3  !  2010-09  (D.Storkey) add ice boundary conditions
    !!----------------------------------------------------------------------
 #if defined key_bdy 
@@ -34 +36 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -54 +55 @@
       INTEGER, INTENT( in ) ::   kt   ! Main time step counter
       !!
-      INTEGER  ::   ib, ik, igrd      ! dummy loop indices
-      INTEGER  ::   ii, ij            ! 2D addresses
-      REAL(wp) ::   zwgt              ! boundary weight
+      INTEGER  ::   jb, jk         ! dummy loop indices
+      INTEGER  ::   ii, ij, igrd   ! local integers
+      REAL(wp) ::   zwgt           ! boundary weight
       !!----------------------------------------------------------------------
       !
-      IF(ln_bdy_dyn_frs) THEN ! If this is false, then this routine does nothing. 
-
+      IF(ln_dyn_frs) THEN       ! If this is false, then this routine does nothing. 
+         !
          IF( kt == nit000 ) THEN
             IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) 'bdy_dyn : Flow Relaxation Scheme on momentum'
+            IF(lwp) WRITE(numout,*) 'bdy_dyn_frs : Flow Relaxation Scheme on momentum'
             IF(lwp) WRITE(numout,*) '~~~~~~~'
          ENDIF
          !
          igrd = 2                      ! Relaxation of zonal velocity
-         DO ib = 1, nblen(igrd)
-            DO ik = 1, jpkm1
-               ii = nbi(ib,igrd)
-               ij = nbj(ib,igrd)
-               zwgt = nbw(ib,igrd)
-               ua(ii,ij,ik) = ( ua(ii,ij,ik) * ( 1.- zwgt ) + ubdy(ib,ik) * zwgt ) * umask(ii,ij,ik)
+         DO jb = 1, nblen(igrd)
+            DO jk = 1, jpkm1
+               ii   = nbi(jb,igrd)
+               ij   = nbj(jb,igrd)
+               zwgt = nbw(jb,igrd)
+               ua(ii,ij,jk) = ( ua(ii,ij,jk) * ( 1.- zwgt ) + ubdy(jb,jk) * zwgt ) * umask(ii,ij,jk)
             END DO
          END DO
          !
          igrd = 3                      ! Relaxation of meridional velocity
-         DO ib = 1, nblen(igrd)
-            DO ik = 1, jpkm1
-               ii = nbi(ib,igrd)
-               ij = nbj(ib,igrd)
-               zwgt = nbw(ib,igrd)
-               va(ii,ij,ik) = ( va(ii,ij,ik) * ( 1.- zwgt ) + vbdy(ib,ik) * zwgt ) * vmask(ii,ij,ik)
+         DO jb = 1, nblen(igrd)
+            DO jk = 1, jpkm1
+               ii   = nbi(jb,igrd)
+               ij   = nbj(jb,igrd)
+               zwgt = nbw(jb,igrd)
+               va(ii,ij,jk) = ( va(ii,ij,jk) * ( 1.- zwgt ) + vbdy(jb,jk) * zwgt ) * vmask(ii,ij,jk)
             END DO
          END DO 
+         CALL lbc_lnk( ua, 'U', -1. )   ;   CALL lbc_lnk( va, 'V', -1. )   ! Boundary points should be updated
          !
-         CALL lbc_lnk( ua, 'U', -1. )   ! Boundary points should be updated
-         CALL lbc_lnk( va, 'V', -1. )   !
-         !
-      ENDIF ! ln_bdy_dyn_frs
-
+      ENDIF ! ln_dyn_frs
+      !
    END SUBROUTINE bdy_dyn_frs
 
 
-#if defined key_dynspg_exp || defined key_dynspg_ts
+# if defined   key_dynspg_exp   ||   defined key_dynspg_ts
+   !!----------------------------------------------------------------------
+   !!   'key_dynspg_exp'        OR              explicit sea surface height
+   !!   'key_dynspg_ts '                  split-explicit sea surface height
+   !!----------------------------------------------------------------------
+   
 !! Option to use Flather with dynspg_flt not coded yet...
+
    SUBROUTINE bdy_dyn_fla( pssh )
       !!----------------------------------------------------------------------
@@ -102 +107 @@
       !!             
       !!              - Apply Flather boundary conditions on normal barotropic velocities 
-      !!                (ln_bdy_dyn_fla=.true. or ln_bdy_tides=.true.)
+      !!                (ln_dyn_fla=.true. or ln_tides=.true.)
       !!
       !! ** WARNINGS about FLATHER implementation:
@@ -119 +124 @@
       REAL(wp), DIMENSION(jpi,jpj), INTENT(in) ::   pssh
 
-      INTEGER  ::   ib, igrd                         ! dummy loop indices
+      INTEGER  ::   jb, igrd                         ! dummy loop indices
       INTEGER  ::   ii, ij, iim1, iip1, ijm1, ijp1   ! 2D addresses
       REAL(wp) ::   zcorr                            ! Flather correction
@@ -129 +134 @@
       ! ---------------------------------! 
      
-      IF(ln_bdy_dyn_fla .OR. ln_bdy_tides) THEN ! If these are both false, then this routine does nothing. 
+      IF(ln_dyn_fla .OR. ln_tides) THEN ! If these are both false, then this routine does nothing. 
 
          ! Fill temporary array with ssh data (here spgu):
-         igrd = 1
+         igrd = 4
          spgu(:,:) = 0.0
-         DO ib = 1, nblenrim(igrd)
-            ii = nbi(ib,igrd)
-            ij = nbj(ib,igrd)
-            IF( ln_bdy_dyn_fla ) spgu(ii, ij) = sshbdy(ib)
-            IF( ln_bdy_tides )   spgu(ii, ij) = spgu(ii, ij) + sshtide(ib)
+         DO jb = 1, nblenrim(igrd)
+            ii = nbi(jb,igrd)
+            ij = nbj(jb,igrd)
+            IF( ln_dyn_fla ) spgu(ii, ij) = sshbdy(jb)
+            IF( ln_tides )   spgu(ii, ij) = spgu(ii, ij) + sshtide(jb)
          END DO
          !
-         igrd = 2      ! Flather bc on u-velocity; 
+         igrd = 5      ! Flather bc on u-velocity; 
          !             ! remember that flagu=-1 if normal velocity direction is outward
          !             ! I think we should rather use after ssh ?
-         DO ib = 1, nblenrim(igrd)
-            ii  = nbi(ib,igrd)
-            ij  = nbj(ib,igrd) 
-            iim1 = ii + MAX( 0, INT( flagu(ib) ) )   ! T pts i-indice inside the boundary
-            iip1 = ii - MIN( 0, INT( flagu(ib) ) )   ! T pts i-indice outside the boundary 
+         DO jb = 1, nblenrim(igrd)
+            ii  = nbi(jb,igrd)
+            ij  = nbj(jb,igrd) 
+            iim1 = ii + MAX( 0, INT( flagu(jb) ) )   ! T pts i-indice inside the boundary
+            iip1 = ii - MIN( 0, INT( flagu(jb) ) )   ! T pts i-indice outside the boundary 
             !
-            zcorr = - flagu(ib) * SQRT( grav * hur_e(ii, ij) ) * ( pssh(iim1, ij) - spgu(iip1,ij) )
-            zforc = ubtbdy(ib) + utide(ib)
+            zcorr = - flagu(jb) * SQRT( grav * hur_e(ii, ij) ) * ( pssh(iim1, ij) - spgu(iip1,ij) )
+            zforc = ubtbdy(jb) + utide(jb)
             ua_e(ii,ij) = zforc + zcorr * umask(ii,ij,1) 
          END DO
          !
-         igrd = 3      ! Flather bc on v-velocity
+         igrd = 6      ! Flather bc on v-velocity
          !             ! remember that flagv=-1 if normal velocity direction is outward
-         DO ib = 1, nblenrim(igrd)
-            ii  = nbi(ib,igrd)
-            ij  = nbj(ib,igrd) 
-            ijm1 = ij + MAX( 0, INT( flagv(ib) ) )   ! T pts j-indice inside the boundary
-            ijp1 = ij - MIN( 0, INT( flagv(ib) ) )   ! T pts j-indice outside the boundary 
+         DO jb = 1, nblenrim(igrd)
+            ii  = nbi(jb,igrd)
+            ij  = nbj(jb,igrd) 
+            ijm1 = ij + MAX( 0, INT( flagv(jb) ) )   ! T pts j-indice inside the boundary
+            ijp1 = ij - MIN( 0, INT( flagv(jb) ) )   ! T pts j-indice outside the boundary 
             !
-            zcorr = - flagv(ib) * SQRT( grav * hvr_e(ii, ij) ) * ( pssh(ii, ijm1) - spgu(ii,ijp1) )
-            zforc = vbtbdy(ib) + vtide(ib)
+            zcorr = - flagv(jb) * SQRT( grav * hvr_e(ii, ij) ) * ( pssh(ii, ijm1) - spgu(ii,ijp1) )
+            zforc = vbtbdy(jb) + vtide(jb)
             va_e(ii,ij) = zforc + zcorr * vmask(ii,ij,1)
          END DO
+         CALL lbc_lnk( ua_e, 'U', -1. )   ! Boundary points should be updated
+         CALL lbc_lnk( va_e, 'V', -1. )   !
          !
-      ENDIF ! ln_bdy_dyn_fla .or. ln_bdy_tides
+      ENDIF ! ln_dyn_fla .or. ln_tides
       !
    END SUBROUTINE bdy_dyn_fla

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -8 +8 @@
    !!             -   !  2007-01  (D. Storkey) Tidal forcing
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version
+   !!            3.3  !  2010-09  (E.O'Dea) updates for Shelf configurations
+   !!            3.3  !  2010-09  (D.Storkey) add ice boundary conditions
    !!----------------------------------------------------------------------
 #if defined key_bdy
@@ -17 +19 @@
    USE oce             ! ocean dynamics and tracers variables
    USE dom_oce         ! ocean space and time domain
+   USE obc_par         ! ocean open boundary conditions
    USE bdy_oce         ! unstructured open boundary conditions
    USE bdytides        ! tides at open boundaries initialization (tide_init routine)
@@ -30 +33 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
-   !!---------------------------------------------------------------------------------
-
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
    
@@ -48 +50 @@
       !!
       !! ** Input   :  bdy_init.nc, input file for unstructured open boundaries
-      !!
       !!----------------------------------------------------------------------      
       INTEGER ::   ii, ij, ik, igrd, ib, ir   ! dummy loop indices
@@ -54 +55 @@
       INTEGER ::   ib_len, ibr_max
       INTEGER ::   iw, ie, is, in 
-      INTEGER ::   inum                 ! temporary logical unit
-      INTEGER ::   id_dummy             ! temporary integers
+      INTEGER ::   inum                 ! local logical unit
+      INTEGER ::   id_dummy             ! local integers
       INTEGER ::   igrd_start, igrd_end ! start and end of loops on igrd
       INTEGER, DIMENSION (2)             ::   kdimsz
@@ -63 +64 @@
       REAL(wp) , DIMENSION(jpidta,jpjdta) ::   zmask           ! global domain mask
       REAL(wp) , DIMENSION(jpbdta,1)      ::   zdta            ! temporary array 
-      CHARACTER(LEN=80),DIMENSION(3)      ::   clfile
+      CHARACTER(LEN=80),DIMENSION(6)      ::   clfile
       !!
-      NAMELIST/nambdy/filbdy_mask, filbdy_data_T, filbdy_data_U, filbdy_data_V,          &
-         &            ln_bdy_tides, ln_bdy_clim, ln_bdy_vol, ln_bdy_mask,                &
-         &            ln_bdy_dyn_fla, ln_bdy_dyn_frs, ln_bdy_tra_frs,                    &
-         &            nbdy_dta   , nb_rimwidth  , volbdy
+      NAMELIST/nambdy/cn_mask, cn_dta_frs_T, cn_dta_frs_U, cn_dta_frs_V,          &
+         &            cn_dta_fla_T, cn_dta_fla_U, cn_dta_fla_V,              &
+         &            ln_tides, ln_clim, ln_vol, ln_mask,                &
+         &            ln_dyn_fla, ln_dyn_frs, ln_tra_frs,ln_ice_frs,     &
+         &            nn_dtactl, nn_rimwidth, nn_volctl
       !!----------------------------------------------------------------------
 
@@ -75 +77 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~'
       !
-      IF( jperio /= 0 ) CALL ctl_stop( 'Cyclic or symmetric,',   &
-           ' and unstructured open boundary condition are not compatible' )
-
-#if defined key_obc
-      CALL ctl_stop( 'Straight open boundaries,',   &
-           ' and unstructured open boundaries are not compatible' )
-#endif
-
-      ! Read namelist parameters
+      IF( jperio /= 0 )   CALL ctl_stop( 'Cyclic or symmetric,',   &
+         &                               ' and unstructured open boundary condition are not compatible' )
+
+      IF( lk_obc      )   CALL ctl_stop( 'Straight open boundaries,',   &
+         &                               ' and unstructured open boundaries are not compatible' )
+
       ! ---------------------------
-      REWIND( numnam )
+      REWIND( numnam )                    ! Read namelist parameters
       READ  ( numnam, nambdy )
 
-      ! control prints
+      !                                   ! control prints
       IF(lwp) WRITE(numout,*) '         nambdy'
 
-      ! Check nbdy_dta value
-      IF(lwp) WRITE(numout,*) 'nbdy_dta =', nbdy_dta      
-      IF(lwp) WRITE(numout,*) ' '
-      SELECT CASE( nbdy_dta )
-      CASE( 0 )
-        IF(lwp) WRITE(numout,*) '         initial state used for bdy data'        
-      CASE( 1 )
-        IF(lwp) WRITE(numout,*) '         boundary data taken from file'
-      CASE DEFAULT
-        CALL ctl_stop( 'nbdy_dta must be 0 or 1' )
+      !                                         ! check type of data used (nn_dtactl value)
+      IF(lwp) WRITE(numout,*) 'nn_dtactl =', nn_dtactl      
+      IF(lwp) WRITE(numout,*)
+      SELECT CASE( nn_dtactl )                   ! 
+      CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for bdy data'        
+      CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file'
+      CASE DEFAULT   ;   CALL ctl_stop( 'nn_dtactl must be 0 or 1' )
       END SELECT
 
-      IF(lwp) WRITE(numout,*) ' '
-      IF(lwp) WRITE(numout,*) 'Boundary rim width for the FRS nb_rimwidth = ', nb_rimwidth
-
-      IF(lwp) WRITE(numout,*) ' '
-      IF(lwp) WRITE(numout,*) '         volbdy = ', volbdy
-
-      IF (ln_bdy_vol) THEN
-        SELECT CASE ( volbdy ) ! Check volbdy value
-        CASE( 1 )
-          IF(lwp) WRITE(numout,*) '         The total volume will be constant'
-        CASE( 0 )
-          IF(lwp) WRITE(numout,*) '         The total volume will vary according'
-          IF(lwp) WRITE(numout,*) '         to the surface E-P flux'
-        CASE DEFAULT
-          CALL ctl_stop( 'volbdy must be 0 or 1' )
-        END SELECT
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) 'Boundary rim width for the FRS nn_rimwidth = ', nn_rimwidth
+
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) '      nn_volctl = ', nn_volctl
+
+      IF( ln_vol ) THEN                     ! check volume conservation (nn_volctl value)
+         SELECT CASE ( nn_volctl )
+         CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      The total volume will be constant'
+         CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      The total volume will vary according to the surface E-P flux'
+         CASE DEFAULT   ;   CALL ctl_stop( 'nn_volctl must be 0 or 1' )
+         END SELECT
+         IF(lwp) WRITE(numout,*)
       ELSE
-        IF(lwp) WRITE(numout,*) 'No volume correction with unstructured open boundaries'
-        IF(lwp) WRITE(numout,*) ' '
-      ENDIF
-
-      IF (ln_bdy_tides) THEN
-        IF(lwp) WRITE(numout,*) ' '
+         IF(lwp) WRITE(numout,*) 'No volume correction with unstructured open boundaries'
+         IF(lwp) WRITE(numout,*)
+      ENDIF
+
+      IF( ln_tides ) THEN
         IF(lwp) WRITE(numout,*) 'Tidal harmonic forcing at unstructured open boundaries'
-        IF(lwp) WRITE(numout,*) ' '
-      ENDIF
-
-      IF (ln_bdy_dyn_fla) THEN
-        IF(lwp) WRITE(numout,*) ' '
+        IF(lwp) WRITE(numout,*)
+      ENDIF
+
+      IF( ln_dyn_fla ) THEN
         IF(lwp) WRITE(numout,*) 'Flather condition on U, V at unstructured open boundaries'
-        IF(lwp) WRITE(numout,*) ' '
-      ENDIF
-
-      IF (ln_bdy_dyn_frs) THEN
-        IF(lwp) WRITE(numout,*) ' '
+        IF(lwp) WRITE(numout,*)
+      ENDIF
+
+      IF( ln_dyn_frs ) THEN
         IF(lwp) WRITE(numout,*) 'FRS condition on U and V at unstructured open boundaries'
-        IF(lwp) WRITE(numout,*) ' '
-      ENDIF
-
-      IF (ln_bdy_tra_frs) THEN
-        IF(lwp) WRITE(numout,*) ' '
+        IF(lwp) WRITE(numout,*)
+      ENDIF
+
+      IF( ln_tra_frs ) THEN
         IF(lwp) WRITE(numout,*) 'FRS condition on T & S fields at unstructured open boundaries'
-        IF(lwp) WRITE(numout,*) ' '
-      ENDIF
-
-      ! Read tides namelist 
-      ! ------------------------
-      IF( ln_bdy_tides )   CALL tide_init
+        IF(lwp) WRITE(numout,*)
+      ENDIF
+
+      IF( ln_ice_frs ) THEN
+        IF(lwp) WRITE(numout,*) 'FRS condition on ice fields at unstructured open boundaries'
+        IF(lwp) WRITE(numout,*)
+      ENDIF
+
+      IF( ln_tides )   CALL tide_init      ! Read tides namelist 
+
 
       ! Read arrays defining unstructured open boundaries
@@ -160 +153 @@
       !          = 0  elsewhere   
  
-      IF( cp_cfg == "eel" .AND. jp_cfg == 5 ) THEN
+      IF( cp_cfg == "eel" .AND. jp_cfg == 5 ) THEN          ! EEL configuration at 5km resolution
          zmask(         :                ,:) = 0.e0
          zmask(jpizoom+1:jpizoom+jpiglo-2,:) = 1.e0          
-      ELSE IF ( ln_bdy_mask ) THEN
-         CALL iom_open( filbdy_mask, inum )
+      ELSE IF( ln_mask ) THEN
+         CALL iom_open( cn_mask, inum )
          CALL iom_get ( inum, jpdom_data, 'bdy_msk', zmask(:,:) )
          CALL iom_close( inum )
@@ -171 +164 @@
       ENDIF
 
-      ! Save mask over local domain      
-      DO ij = 1, nlcj
+      DO ij = 1, nlcj      ! Save mask over local domain      
          DO ii = 1, nlci
             bdytmask(ii,ij) = zmask( mig(ii), mjg(ij) )
@@ -187 +179 @@
          END DO
       END DO
-
-      ! Lateral boundary conditions
-      CALL lbc_lnk( bdyumask(:,:), 'U', 1. )
-      CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )
+      CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond.
+
 
       ! Read discrete distance and mapping indices
@@ -200 +190 @@
       IF( cp_cfg == "eel" .AND. jp_cfg == 5 ) THEN
          icount = 0
-         ! Define west boundary (from ii=2 to ii=1+nb_rimwidth):
-         DO ir = 1, nb_rimwidth         
+         DO ir = 1, nn_rimwidth                  ! Define west boundary (from ii=2 to ii=1+nn_rimwidth):
             DO ij = 3, jpjglo-2
-               icount=icount+1
+               icount = icount + 1
                nbidta(icount,:) = ir + 1 + (jpizoom-1)
-               nbjdta(icount,:) = ij + (jpjzoom-1) 
+               nbjdta(icount,:) = ij     + (jpjzoom-1) 
                nbrdta(icount,:) = ir
             END DO
          END DO
-
-         ! Define east boundary (from ii=jpiglo-1 to ii=jpiglo-nb_rimwidth):
-         DO ir=1,nb_rimwidth         
+         !
+         DO ir = 1, nn_rimwidth                  ! Define east boundary (from ii=jpiglo-1 to ii=jpiglo-nn_rimwidth):
             DO ij=3,jpjglo-2
-               icount=icount+1
+               icount = icount + 1
                nbidta(icount,:) = jpiglo-ir + (jpizoom-1)
                nbidta(icount,2) = jpiglo-ir-1 + (jpizoom-1) ! special case for u points
@@ -220 +208 @@
             END DO
          END DO
-            
+         !       
       ELSE            ! Read indices and distances in unstructured boundary data files 
-
-         IF( ln_bdy_tides ) THEN 
-            ! Read tides input files for preference in case there are
-            ! no bdydata files. 
-            clfile(1) = TRIM(filtide)//TRIM(tide_cpt(1))//'_grid_T.nc'
-            clfile(2) = TRIM(filtide)//TRIM(tide_cpt(1))//'_grid_U.nc'
-            clfile(3) = TRIM(filtide)//TRIM(tide_cpt(1))//'_grid_V.nc'
-         ELSE
-            clfile(1) = filbdy_data_T
-            clfile(2) = filbdy_data_U
-            clfile(3) = filbdy_data_V
+         !
+         IF( ln_tides ) THEN             ! Read tides input files for preference in case there are no bdydata files
+            clfile(4) = TRIM(filtide)//TRIM(tide_cpt(1))//'_grid_T.nc'
+            clfile(5) = TRIM(filtide)//TRIM(tide_cpt(1))//'_grid_U.nc'
+            clfile(6) = TRIM(filtide)//TRIM(tide_cpt(1))//'_grid_V.nc'
+         ENDIF
+         IF( ln_dyn_fla .AND. .NOT. ln_tides ) THEN 
+            clfile(4) = cn_dta_fla_T
+            clfile(5) = cn_dta_fla_U
+            clfile(6) = cn_dta_fla_V
+         ENDIF
+
+         IF( ln_tra_frs ) THEN 
+            clfile(1) = cn_dta_frs_T
+            IF( .NOT. ln_dyn_frs ) THEN 
+               clfile(2) = cn_dta_frs_T     ! Dummy read re read T file for sake of 6 files
+               clfile(3) = cn_dta_frs_T     !
+            ENDIF
          ENDIF          
-
-         ! how many files are we to read in?
-         igrd_start = 1
-         igrd_end   = 3
-         IF(.NOT. ln_bdy_tides ) THEN
-            IF(.NOT. (ln_bdy_dyn_fla) .AND..NOT. (ln_bdy_tra_frs)) THEN
-               ! No T-grid file.
-               igrd_start = 2
-            ELSEIF ( .NOT. ln_bdy_dyn_frs .AND..NOT. ln_bdy_dyn_fla ) THEN
-               ! No U-grid or V-grid file.
-               igrd_end   = 1         
-            ENDIF
+         IF( ln_dyn_frs ) THEN 
+            IF( .NOT. ln_tra_frs )   clfile(1) = cn_dta_frs_U      ! Dummy Read 
+            clfile(2) = cn_dta_frs_U
+            clfile(3) = cn_dta_frs_V 
+         ENDIF
+
+         !                                   ! how many files are we to read in?
+         IF(ln_tides .OR. ln_dyn_fla)   igrd_start = 4
+         !
+         IF(ln_tra_frs    ) THEN   ;   igrd_start = 1
+         ELSEIF(ln_dyn_frs) THEN   ;   igrd_start = 2
+         ENDIF
+         !
+         IF( ln_tra_frs   )   igrd_end = 1
+         !
+         IF(ln_dyn_fla .OR. ln_tides) THEN   ;   igrd_end = 6
+         ELSEIF( ln_dyn_frs             ) THEN   ;   igrd_end = 3
          ENDIF
 
@@ -251 +251 @@
             CALL iom_open( clfile(igrd), inum )
             id_dummy = iom_varid( inum, 'nbidta', kdimsz=kdimsz )  
-            WRITE(numout,*) 'kdimsz : ',kdimsz
+            IF(lwp) WRITE(numout,*) 'kdimsz : ',kdimsz
             ib_len = kdimsz(1)
-            IF( ib_len > jpbdta) CALL ctl_stop(          &
-                'Boundary data array in file too long.', &
-                'File :', TRIM(clfile(igrd)),            &
-                'increase parameter jpbdta.' )
+            IF( ib_len > jpbdta)   CALL ctl_stop(  'Boundary data array in file too long.',                  &
+                &                                  'File :', TRIM(clfile(igrd)),'increase parameter jpbdta.' )
 
             CALL iom_get( inum, jpdom_unknown, 'nbidta', zdta(1:ib_len,:) )
@@ -264 +262 @@
             CALL iom_get( inum, jpdom_unknown, 'nbjdta', zdta(1:ib_len,:) )
             DO ii = 1,ib_len
-              nbjdta(ii,igrd) = INT( zdta(ii,1) )
-            END DO
-            CALL iom_get ( inum, jpdom_unknown, 'nbrdta', zdta(1:ib_len,:) )
+               nbjdta(ii,igrd) = INT( zdta(ii,1) )
+            END DO
+            CALL iom_get( inum, jpdom_unknown, 'nbrdta', zdta(1:ib_len,:) )
             DO ii = 1,ib_len
-              nbrdta(ii,igrd) = INT( zdta(ii,1) )
+               nbrdta(ii,igrd) = INT( zdta(ii,1) )
             END DO
             CALL iom_close( inum )
 
-            ! Check that rimwidth in file is big enough:
-            ibr_max = MAXVAL( nbrdta(:,igrd) )
-            IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) ' Maximum rimwidth in file is ', ibr_max
-            IF(lwp) WRITE(numout,*) ' nb_rimwidth from namelist is ', nb_rimwidth
-            IF (ibr_max < nb_rimwidth) CALL ctl_stop( &
-                'nb_rimwidth is larger than maximum rimwidth in file' )
+            IF( igrd < 4) THEN            ! Check that rimwidth in file is big enough for Frs case(barotropic is one):
+               ibr_max = MAXVAL( nbrdta(:,igrd) )
+               IF(lwp) WRITE(numout,*)
+               IF(lwp) WRITE(numout,*) ' Maximum rimwidth in file is ', ibr_max
+               IF(lwp) WRITE(numout,*) ' nn_rimwidth from namelist is ', nn_rimwidth
+               IF (ibr_max < nn_rimwidth)   CALL ctl_stop( 'nn_rimwidth is larger than maximum rimwidth in file' )
+            ENDIF !Check igrd < 4
             !
          END DO
@@ -293 +291 @@
 
       DO igrd = igrd_start, igrd_end
-        icount  = 0
-        icountr = 0
-        nblen(igrd) = 0
-        nblenrim(igrd) = 0
-        nblendta(igrd) = 0
-        DO ir=1, nb_rimwidth
-          DO ib = 1, jpbdta
-          ! check if point is in local domain and equals ir
-            IF(  nbidta(ib,igrd) >= iw .AND. nbidta(ib,igrd) <= ie .AND.   &
-               & nbjdta(ib,igrd) >= is .AND. nbjdta(ib,igrd) <= in .AND.   &
-               & nbrdta(ib,igrd) == ir  ) THEN
-               !
-               icount = icount  + 1
-               !
-               IF( ir == 1 )   icountr = icountr+1
+         icount  = 0
+         icountr = 0
+         nblen   (igrd) = 0
+         nblenrim(igrd) = 0
+         nblendta(igrd) = 0
+         DO ir=1, nn_rimwidth
+            DO ib = 1, jpbdta
+               ! check if point is in local domain and equals ir
+               IF(  nbidta(ib,igrd) >= iw .AND. nbidta(ib,igrd) <= ie .AND.   &
+                  & nbjdta(ib,igrd) >= is .AND. nbjdta(ib,igrd) <= in .AND.   &
+                  & nbrdta(ib,igrd) == ir  ) THEN
+                  !
+                  icount = icount  + 1
+                  !
+                  IF( ir == 1 )   icountr = icountr+1
                   IF (icount > jpbdim) THEN
                      IF(lwp) WRITE(numout,*) 'bdy_ini: jpbdim too small'
@@ -328 +326 @@
       DO igrd = igrd_start, igrd_end
          DO ib = 1, nblen(igrd)
-            ! tanh formulation
-            nbw(ib,igrd) = 1.- TANH( FLOAT( nbr(ib,igrd) - 1 ) *0.5 )
-            ! quadratic
-!           nbw(ib,igrd) = (FLOAT(nb_rimwidth+1-nbr(ib,igrd))/FLOAT(nb_rimwidth))**2
-            ! linear
-!           nbw(ib,igrd) =  FLOAT(nb_rimwidth+1-nbr(ib,igrd))/FLOAT(nb_rimwidth)
+            nbw(ib,igrd) = 1.- TANH( FLOAT( nbr(ib,igrd) - 1 ) *0.5 )                     ! tanh formulation
+!           nbw(ib,igrd) = (FLOAT(nn_rimwidth+1-nbr(ib,igrd))/FLOAT(nn_rimwidth))**2      ! quadratic
+!           nbw(ib,igrd) =  FLOAT(nn_rimwidth+1-nbr(ib,igrd))/FLOAT(nn_rimwidth)          ! linear
          END DO
       END DO 
@@ -384 +379 @@
 
       ! Lateral boundary conditions
-      CALL lbc_lnk( fmask        , 'F', 1. )
-      CALL lbc_lnk( bdytmask(:,:), 'T', 1. )
-      CALL lbc_lnk( bdyumask(:,:), 'U', 1. )
-      CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )
-
-      IF( ln_bdy_vol .OR. ln_bdy_dyn_fla ) THEN      ! Indices and directions of rim velocity components
+      CALL lbc_lnk( fmask        , 'F', 1. )   ;   CALL lbc_lnk( bdytmask(:,:), 'T', 1. )
+      CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )
+
+      IF( ln_vol .OR. ln_dyn_fla ) THEN      ! Indices and directions of rim velocity components
          !
          !flagu = -1 : u component is normal to the dynamical boundary but its direction is outward
@@ -437 +430 @@
       ! Compute total lateral surface for volume correction:
       ! ----------------------------------------------------
- 
       bdysurftot = 0.e0 
-      IF( ln_bdy_vol ) THEN  
+      IF( ln_vol ) THEN  
          igrd = 2      ! Lateral surface at U-points
          DO ib = 1, nblenrim(igrd)
@@ -455 +447 @@
                &                    * tmask_i(nbi(ib,igrd),nbj(ib,igrd)+1)
          END DO
-
+         !
          IF( lk_mpp )   CALL mpp_sum( bdysurftot )      ! sum over the global domain
       END IF   
@@ -468 +460 @@
       ubtbdy(:) = 0.e0
       vbtbdy(:) = 0.e0
+#if defined key_lim2
+      frld_bdy(:) = 0.e0
+      hicif_bdy(:) = 0.e0
+      hsnif_bdy(:) = 0.e0
+#endif
 
       ! Read in tidal constituents and adjust for model start time
       ! ----------------------------------------------------------
-      IF( ln_bdy_tides )   CALL tide_data
+      IF( ln_tides )   CALL tide_data
       !
    END SUBROUTINE bdy_init

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90

@@ -7 +7 @@
    !!            2.3  !  2008-01  (J.Holt)  Add date correction. Origins POLCOMS v6.3 2007
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version
+   !!            3.3  !  2010-09  (D.Storkey and E.O'Dea)  bug fixes
    !!----------------------------------------------------------------------
 #if defined key_bdy
@@ -31 +32 @@
    USE bdy_par         ! Unstructured boundary parameters
    USE bdy_oce         ! ocean open boundary conditions
+   USE daymod          ! calendar
 
    IMPLICIT NONE
@@ -39 +41 @@
    PUBLIC   tide_update   ! routine called in bdydyn
 
-   LOGICAL, PUBLIC            ::   ln_tide_date            !: =T correct tide phases and amplitude for model start date
-
-   INTEGER, PARAMETER ::   jptides_max = 15      !: Max number of tidal contituents
-   INTEGER            ::   ntide                 !: Actual number of tidal constituents
+   LOGICAL, PUBLIC            ::   ln_tide_date          !: =T correct tide phases and amplitude for model start date
+   INTEGER, PUBLIC, PARAMETER ::   jptides_max = 15      !: Max number of tidal contituents
+   INTEGER, PUBLIC            ::   ntide                 !: Actual number of tidal constituents
 
    CHARACTER(len=80), PUBLIC                         ::   filtide    !: Filename root for tidal input files
    CHARACTER(len= 4), PUBLIC, DIMENSION(jptides_max) ::   tide_cpt   !: Names of tidal components used.
 
-   INTEGER , DIMENSION(jptides_max) ::   nindx        !: ???
-   REAL(wp), DIMENSION(jptides_max) ::   tide_speed   !: Phase speed of tidal constituent (deg/hr)
+   INTEGER , PUBLIC, DIMENSION(jptides_max) ::   nindx        !: ???
+   REAL(wp), PUBLIC, DIMENSION(jptides_max) ::   tide_speed   !: Phase speed of tidal constituent (deg/hr)
    
-   REAL(wp), DIMENSION(jpbdim,jptides_max)  ::   ssh1, ssh2   !: Tidal constituents : SSH
-   REAL(wp), DIMENSION(jpbdim,jptides_max)  ::   u1  , u2     !: Tidal constituents : U
-   REAL(wp), DIMENSION(jpbdim,jptides_max)  ::   v1  , v2     !: Tidal constituents : V
+   REAL(wp), DIMENSION(jpbdim,jptides_max)  ::   ssh1, ssh2   ! Tidal constituents : SSH
+   REAL(wp), DIMENSION(jpbdim,jptides_max)  ::   u1  , u2     ! Tidal constituents : U
+   REAL(wp), DIMENSION(jpbdim,jptides_max)  ::   v1  , v2     ! Tidal constituents : V
    
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -87 +87 @@
       !                                               ! Count number of components specified
       ntide = jptides_max
-      itide = 1
-      DO WHILE( tide_cpt(itide) /= '' )
-         ntide = itide
-         itide = itide + 1
+      DO itide = 1, jptides_max
+        IF( tide_cpt(itide) == '' ) THEN
+           ntide = itide-1
+           exit
+        ENDIF
       END DO
+
       !                                               ! find constituents in standard list
       DO itide = 1, ntide
@@ -145 +147 @@
       CHARACTER(len=80) :: clfile         ! full file name for tidal input file 
       INTEGER ::   ipi, ipj, inum, idvar  ! temporary integers (netcdf read)
-      INTEGER, DIMENSION(3) :: lendta=0   ! length of data in the file (note may be different from nblendta!)
+      INTEGER, DIMENSION(6) :: lendta=0   ! length of data in the file (note may be different from nblendta!)
       REAL(wp) ::  z_arg, z_atde, z_btde, z1t, z2t           
       REAL(wp), DIMENSION(jpbdta,1) ::   zdta   ! temporary array for data fields
@@ -161 +163 @@
          IF(lwp) WRITE(numout,*) 'Reading data from file ', clfile
          CALL iom_open( clfile, inum )
-         igrd = 1
+         igrd = 4
          IF( nblendta(igrd) <= 0 ) THEN 
             idvar = iom_varid( inum,'z1' )
@@ -183 +185 @@
          IF(lwp) WRITE(numout,*) 'Reading data from file ', clfile
          CALL iom_open( clfile, inum )
-         igrd = 2
+         igrd = 5
          IF( lendta(igrd) <= 0 ) THEN 
             idvar = iom_varid( inum,'u1' )
@@ -204 +206 @@
          if(lwp) write(numout,*) 'Reading data from file ', clfile
          CALL iom_open( clfile, inum )
-         igrd = 3
+         igrd = 6
          IF( lendta(igrd) <= 0 ) THEN 
             idvar = iom_varid( inum,'v1' )
@@ -252 +254 @@
             ENDIF
             !                                         !  elevation         
-            igrd = 1
+            igrd = 4
             DO ib = 1, nblenrim(igrd)                
                z1t = z_atde * ssh1(ib,itide) + z_btde * ssh2(ib,itide)
@@ -260 +262 @@
             END DO
             !                                         !  u       
-            igrd = 2
+            igrd = 5
             DO ib = 1, nblenrim(igrd)                
                z1t = z_atde * u1(ib,itide) + z_btde * u2(ib,itide)
@@ -268 +270 @@
             END DO
             !                                         !  v       
-            igrd = 3
+            igrd = 6
             DO ib = 1, nblenrim(igrd)                
                z1t = z_atde * v1(ib,itide) + z_btde * v2(ib,itide)
@@ -320 +322 @@
       !
       DO itide = 1, ntide
-         igrd=1                              ! SSH on tracer grid.
+         igrd=4                              ! SSH on tracer grid.
          DO ib = 1, nblenrim(igrd)
             sshtide(ib) =sshtide(ib)+ ssh1(ib,itide)*z_cost(itide) + ssh2(ib,itide)*z_sist(itide)
             !    if(lwp) write(numout,*) 'z',ib,itide,sshtide(ib), ssh1(ib,itide),ssh2(ib,itide)
          END DO
-         igrd=2                              ! U grid
+         igrd=5                              ! U grid
          DO ib=1, nblenrim(igrd)
             utide(ib) = utide(ib)+ u1(ib,itide)*z_cost(itide) + u2(ib,itide)*z_sist(itide)
             !    if(lwp) write(numout,*) 'u',ib,itide,utide(ib), u1(ib,itide),u2(ib,itide)
          END DO
-         igrd=3                              ! V grid
+         igrd=6                              ! V grid
          DO ib=1, nblenrim(igrd)
             vtide(ib) = vtide(ib)+ v1(ib,itide)*z_cost(itide) + v2(ib,itide)*z_sist(itide)

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90

@@ -11 +11 @@
    !!   'key_bdy'                     Unstructured Open Boundary Conditions
    !!----------------------------------------------------------------------
-   !!   bdy_tra        : Relaxation of tracers on unstructured open boundaries
+   !!   bdy_tra_frs        : Relaxation of tracers on unstructured open boundaries
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers variables
@@ -22 +22 @@
    PRIVATE
 
-   PUBLIC bdy_tra     ! routine called in tranxt.F90 
+   PUBLIC bdy_tra_frs     ! routine called in tranxt.F90 
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
-   SUBROUTINE bdy_tra( kt )
+   SUBROUTINE bdy_tra_frs( kt )
       !!----------------------------------------------------------------------
-      !!                 ***  SUBROUTINE bdy_tra  ***
+      !!                 ***  SUBROUTINE bdy_tra_frs  ***
       !!                    
       !! ** Purpose : Apply the Flow Relaxation Scheme for tracers in the  
@@ -48 +47 @@
       !!----------------------------------------------------------------------
       !
-      IF(ln_bdy_tra_frs) THEN ! If this is false, then this routine does nothing. 
-
-      IF( kt == nit000 ) THEN
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'bdy_tra : Flow Relaxation Scheme for tracers'
-         IF(lwp) WRITE(numout,*) '~~~~~~~'
-      ENDIF
+      IF(ln_tra_frs) THEN       ! If this is false, then this routine does nothing. 
+         !
+         IF( kt == nit000 ) THEN
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) 'bdy_tra_frs : Flow Relaxation Scheme for tracers'
+            IF(lwp) WRITE(numout,*) '~~~~~~~'
+         ENDIF
+         !
+         igrd = 1                       ! Everything is at T-points here
+         DO ib = 1, nblen(igrd)
+            DO ik = 1, jpkm1
+               ii = nbi(ib,igrd)
+               ij = nbj(ib,igrd)
+               zwgt = nbw(ib,igrd)
+               ta(ii,ij,ik) = ( ta(ii,ij,ik) * (1.-zwgt) + tbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)         
+               sa(ii,ij,ik) = ( sa(ii,ij,ik) * (1.-zwgt) + sbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)
+            END DO
+         END DO 
+         !
+         CALL lbc_lnk( ta, 'T', 1. )   ; CALL lbc_lnk( sa, 'T', 1. )    ! Boundary points should be updated
+         !
+      ENDIF ! ln_tra_frs
       !
-      igrd = 1                       ! Everything is at T-points here
-      DO ib = 1, nblen(igrd)
-         DO ik = 1, jpkm1
-            ii = nbi(ib,igrd)
-            ij = nbj(ib,igrd)
-            zwgt = nbw(ib,igrd)
-            ta(ii,ij,ik) = ( ta(ii,ij,ik) * (1.-zwgt) + tbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)         
-            sa(ii,ij,ik) = ( sa(ii,ij,ik) * (1.-zwgt) + sbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)
-        END DO
-      END DO 
-      !
-      CALL lbc_lnk( ta, 'T', 1. )   ! Boundary points should be updated
-      CALL lbc_lnk( sa, 'T', 1. )   !
-      !
-      ENDIF ! ln_bdy_tra_frs
-
-   END SUBROUTINE bdy_tra
+   END SUBROUTINE bdy_tra_frs
    
 #else
@@ -79 +77 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE bdy_tra(kt)      ! Empty routine
-      WRITE(*,*) 'bdy_tra: You should not have seen this print! error?', kt
-   END SUBROUTINE bdy_tra
+   SUBROUTINE bdy_tra_frs(kt)      ! Empty routine
+      WRITE(*,*) 'bdy_tra_frs: You should not have seen this print! error?', kt
+   END SUBROUTINE bdy_tra_frs
 #endif
 

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90

@@ -11 +11 @@
 #if   defined key_bdy   &&   defined key_dynspg_flt
    !!----------------------------------------------------------------------
-   !!   'key_bdy'            and      unstructured open boundary conditions
+   !!   'key_bdy'            AND      unstructured open boundary conditions
    !!   'key_dynspg_flt'                              filtered free surface
    !!----------------------------------------------------------------------
@@ -30 +30 @@
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -62 +61 @@
       !!            zero (z_cflxemp=0) to calculate the correction velocity. So
       !!            it will only balance the flux through open boundaries.
-      !!            (set volbdy to 0 in tne namelist for this option)
+      !!            (set nn_volctl to 0 in tne namelist for this option)
       !!         2/ The volume is constant even with E-P flux. In this case
       !!            the correction velocity must balance both the flux 
       !!            through open boundaries and the ones through the free
       !!            surface. 
-      !!            (set volbdy to 1 in tne namelist for this option)
+      !!            (set nn_volctl to 1 in tne namelist for this option)
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -73 +72 @@
       INTEGER  ::   ji, jj, jk, jb, jgrd
       INTEGER  ::   ii, ij
-      REAL(wp) ::   zubtpecor, z_cflxemp, ztranst, zraur
+      REAL(wp) ::   zubtpecor, z_cflxemp, ztranst
       !!-----------------------------------------------------------------------------
+
+      IF( ln_vol ) THEN
 
       IF( kt == nit000 ) THEN 
@@ -84 +85 @@
       ! Calculate the cumulate surface Flux z_cflxemp (m3/s) over all the domain
       ! -----------------------------------------------------------------------
-      z_cflxemp = 0.e0
-      zraur = 1.e0 / rau0
-      z_cflxemp = SUM ( emp(:,:) * bdytmask(:,:) * e1t(:,:) * e2t(:,:) * zraur )
-      IF( lk_mpp )   CALL mpp_sum( z_cflxemp )   ! sum over the global domain
+      z_cflxemp = SUM ( ( emp(:,:)-rnf(:,:) ) * bdytmask(:,:) * e1t(:,:) * e2t(:,:) ) / rau0
+      IF( lk_mpp )   CALL mpp_sum( z_cflxemp )     ! sum over the global domain
 
-      ! Barotropic velocity through the unstructured open boundary
-      ! ----------------------------------------------------------
+      ! Transport through the unstructured open boundary
+      ! ------------------------------------------------
       zubtpecor = 0.e0
       jgrd = 2                               ! cumulate u component contribution first 
@@ -112 +111 @@
       ! The normal velocity correction
       ! ------------------------------
-      IF (volbdy==1) THEN   ;   zubtpecor = ( zubtpecor - z_cflxemp) / bdysurftot 
-      ELSE                  ;   zubtpecor =   zubtpecor             / bdysurftot
+      IF( nn_volctl==1 ) THEN   ;   zubtpecor = ( zubtpecor - z_cflxemp) / bdysurftot 
+      ELSE                   ;   zubtpecor =   zubtpecor             / bdysurftot
       END IF
 
@@ -141 +140 @@
       ! Check the cumulated transport through unstructured OBC once barotropic velocities corrected
       ! ------------------------------------------------------
-
       IF( lwp .AND. MOD( kt, nwrite ) == 0) THEN
          IF(lwp) WRITE(numout,*)
@@ -152 +150 @@
       END IF 
       !
+      END IF ! ln_vol
+
    END SUBROUTINE bdy_vol