Changeset 6403 for trunk/NEMOGCM/CONFIG

Timestamp:

2016-03-25T17:24:35+01:00 (8 years ago)

Author:

cetlod

Message:

trunk:new developments already included in 3.6 stable, see points 1, 2 and 4 of ticket #1678

Location:

trunk/NEMOGCM/CONFIG

Files:

• SHARED/namelist_ice_lim3_ref (modified) (1 diff)
• SHARED/namelist_top_ref (modified) (1 diff)
• cfg.txt (modified) (1 diff)

trunk/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref

@@ -21 +21 @@
    cn_icerst_outdir = "."          !  directory in which to write output ice restarts
    ln_limdyn     = .true.          !  ice dynamics (T) or thermodynamics only (F)
-   rn_amax       = 0.999           !  maximum tolerated ice concentration 
+   rn_amax_n     = 0.999           !  maximum tolerated ice concentration (NH)
+   rn_amax_s     = 0.999           !  maximum tolerated ice concentration (SH)
    ln_limdiahsb  = .false.         !  check the heat and salt budgets (T) or not (F)
    ln_limdiaout  = .true.          !  output the heat and salt budgets (T) or not (F)

trunk/NEMOGCM/CONFIG/SHARED/namelist_top_ref

@@ -68 +68 @@
    rn_ahtrc_0      = 2000.       !  lateral eddy diffusivity   (lap. operator) [m2/s]
    rn_bhtrc_0      = 1.e+12      !  lateral eddy diffusivity (bilap. operator) [m4/s]
+   !
+   rn_fact_lap      =     1.     !     enhanced zonal eddy diffusivity
 /
 !-----------------------------------------------------------------------

trunk/NEMOGCM/CONFIG/cfg.txt

@@ -6 +6 @@
 GYRE_BFM OPA_SRC TOP_SRC
 AMM12 OPA_SRC
-ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
 ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC
 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
 GYRE OPA_SRC
+ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC