Changeset 1537 for trunk/NEMO/OPA_SRC/ZDF/zdf_oce.F90

Timestamp:

2009-07-24T16:22:23+02:00 (15 years ago)

Author:

ctlod

Message:

ensure the restartability of the 2nd order advection scheme,see ticket: 489

File:

• trunk/NEMO/OPA_SRC/ZDF/zdf_oce.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdf_oce.F90

@@ -6 +6 @@
    !! history :  1.0  !  2002-06  (G. Madec) Original code
    !!            3.2  !  2009-07  (G.Madec) addition of avm
-   !!----------------------------------------------------------------------
-
    !!----------------------------------------------------------------------
    USE par_oce         ! ocean parameters
@@ -20 +18 @@
 #endif
 
-   !                                          !!* namelist namzdf: vertical diffusion
-   LOGICAL , PUBLIC ::   ln_zdfexp = .FALSE.   !: explicit vertical diffusion scheme flag
-   LOGICAL , PUBLIC ::   ln_zdfevd = .TRUE.    !: convection: enhanced vertical diffusion flag
-   LOGICAL , PUBLIC ::   ln_zdfnpc = .FALSE.   !: convection: non-penetrative convection flag
-   INTEGER , PUBLIC ::   n_zdfexp = 3          !: number of sub-time step (explicit time stepping)
-   INTEGER , PUBLIC ::   n_evdm   = 1          !: =0/1 flag to apply enhanced avm or not
-   REAL(wp), PUBLIC ::   avm0  = 1.e-4_wp      !: vertical eddy viscosity (m2/s)
-   REAL(wp), PUBLIC ::   avt0  = 1.e-5_wp      !: vertical eddy diffusivity (m2/s)
-   REAL(wp), PUBLIC ::   avevd = 1._wp         !: vertical eddy coeff. for enhanced vert. diff. (m2/s)
+   !                                           !!* namelist nam_zdf: vertical diffusion *
+   REAL(wp), PUBLIC ::   rn_avm0   = 1.e-4_wp   !: vertical eddy viscosity (m2/s)
+   REAL(wp), PUBLIC ::   rn_avt0   = 1.e-5_wp   !: vertical eddy diffusivity (m2/s)
+   INTEGER , PUBLIC ::   nn_avb    =  0         !: constant or profile background on avt (=0/1)
+   INTEGER , PUBLIC ::   nn_havtb  = 1          !: horizontal shape or not for avtb (=0/1)
+   LOGICAL , PUBLIC ::   ln_zdfexp = .FALSE.    !: explicit vertical diffusion scheme flag
+   INTEGER , PUBLIC ::   nn_zdfexp = 3          !: number of sub-time step (explicit time stepping)
+   LOGICAL , PUBLIC ::   ln_zdfevd = .TRUE.     !: convection: enhanced vertical diffusion flag
+   INTEGER , PUBLIC ::   nn_evdm   = 1          !: =0/1 flag to apply enhanced avm or not
+   REAL(wp), PUBLIC ::   rn_avevd  = 1._wp      !: vertical eddy coeff. for enhanced vert. diff. (m2/s)
+   LOGICAL , PUBLIC ::   ln_zdfnpc = .FALSE.    !: convection: non-penetrative convection flag
+   INTEGER , PUBLIC ::   nn_npc    =   1        !: non penetrative convective scheme call  frequency
+   INTEGER , PUBLIC ::   nn_npcp   =  15        !: non penetrative convective scheme print frequency
+
 
    REAL(wp), PUBLIC, DIMENSION        (jpk) ::   avmb, avtb   !: background profile of avm and avt
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)     ::   avtb_2d      !: set in tke_init, for other modif than ice
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   avmu, avmv   !: vertical viscosity coeff. at uw- & vw-points   [m2/s]
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   avm , avt    !: vertical viscosity & diffusivity coeff. at  w-point   [m2/s]