Changeset 2865 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obc_oce.F90

Timestamp:

2011-09-27T14:33:01+02:00 (13 years ago)

Author:

davestorkey

Message:

1. Updates for dynspg_exp option.
2. Implement time_offset functionality in obc_dta.
3. Add option to specify boundaries in the namelist.
4. Re-activate obc_vol option.
5. Update to namelist control of tidal harmonics.

File:

• branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obc_oce.F90 (modified) (2 diffs)

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obc_oce.F90

@@ -57 +57 @@
    LOGICAL                    ::   ln_mask_file             !: =T read obcmask from file
    LOGICAL                    ::   ln_vol                   !: =T volume correction             
-   LOGICAL, DIMENSION(jp_obc) ::   ln_clim                  !: =T obc data files contain climatological data (time-cyclic)
    !
    INTEGER                    ::   nb_obc                   !: number of open boundary sets
-   INTEGER, DIMENSION(jp_obc) ::   nn_rimwidth              !: boundary rim width
-   INTEGER, DIMENSION(jp_obc) ::   nn_dtactl           !: = 0 use the initial state as obc dta ; 
-                                                            !: = 1 read it in a NetCDF file
-   INTEGER, DIMENSION(jp_obc) ::   nn_tides                 !: = 0 no tidal harmonic forcing
-                                                            !: = 1 apply ONLY tidal harmonic forcing for barotropic solution
-                                                            !: = 2 ADD tidal harmonic forcing to other barotropic boundary data
+   INTEGER, DIMENSION(jp_obc) ::   nn_rimwidth              !: boundary rim width for Flow Relaxation Scheme
    INTEGER                    ::   nn_volctl                !: = 0 the total volume will have the variability of the surface Flux E-P 
    !                                                        !  = 1 the volume will be constant during all the integration.
@@ -71 +65 @@
    INTEGER, DIMENSION(jp_obc) ::   nn_dyn2d_dta           !: = 0 use the initial state as obc dta ; 
                                                             !: = 1 read it in a NetCDF file
+                                                            !: = 2 read tidal harmonic forcing from a NetCDF file
+                                                            !: = 3 read external data AND tidal harmonic forcing from NetCDF files
    INTEGER, DIMENSION(jp_obc) ::   nn_dyn3d                 ! Choice of boundary condition for baroclinic velocities 
    INTEGER, DIMENSION(jp_obc) ::   nn_dyn3d_dta           !: = 0 use the initial state as obc dta ;