namsbc_fwb

@@ -2,4 +2,10 @@
 &namsbc_fwb    !   freshwater-budget adjustment                         (nn_fwb > 0)
 !-----------------------------------------------------------------------
    rn_fwb0     = 0.0          ! Initial freshwater adjustment flux [kg/m2/s] (nn_fwb = 2)
+   nn_fwb_voltype = 1         ! = 1 : Control ICE+OCEAN volume
+      !                       ! = 2 : Control     OCEAN volume
+   ln_hvolg_var = .false.     ! = T : Set an analytical variation of volume:
+      rn_hvolg_amp = 17.e-3      ! Peak to peak seasonnal variation (m)
+      rn_hvolg_trd =  0.0        ! Trend (m/s)
+      nn_hvolg_mth = 8           ! Month when volume anomaly crosses 0 (1-12)
 /

namtra_adv

@@ -8,6 +8,7 @@
    ln_traadv_fct = .false. !  FCT scheme
       nn_fct_h   =  2            !  =2/4, horizontal 2nd / 4th order
       nn_fct_v   =  2            !  =2/4, vertical   2nd / COMPACT 4th order
+      nn_fct_imp =  1            !  =1/2, optimized / accurate treatment of implicit part
    ln_traadv_mus = .false. !  MUSCL scheme
       ln_mus_ups = .false.       !  use upstream scheme near river mouths
    ln_traadv_ubs = .false. !  UBS scheme

namtra_eiv

@@ -11,9 +11,11 @@
       !                             !   = 20 F(i,j)    =ldf_c2d
       !                             !   = 21 F(i,j,t)  =Treguier et al. JPO 1997 formulation
       !                             !   = 30 F(i,j,k)  =ldf_c2d * ldf_c1d
+      !                             !   = 32 F(i,j,t)  = GEOMETRIC parameterization        (=> fill namldf_eke)
       !                        !  time invariant coefficients:  aei0 = 1/2  Ue*Le
       rn_Ue        = 0.02           !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
       rn_Le        = 200.e+3        !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
       !
-      ln_ldfeiv_dia =.false.   ! diagnose eiv stream function and velocities
+      ln_eke_equ    =.false.   ! switch on update of GEOMETRIC eddy energy equation        (=> fill namldf_eke)
+                               ! forced to be true if nn_aei_ijk_t = 32
 /

namtra_qsr

@@ -6,14 +6,14 @@
    ln_qsr_2bd  = .false.      !  2BD light penetration (two bands)
    ln_qsr_5bd  = .false.      !  5BD light penetration (IR-Red-Green-Blue-UV)
    ln_qsr_bio  = .false.      !  bio-model light penetration
-   !                       !  RGB & 2BD choices:
+   !                       !  RGB, 2BD & 5BD choices:
    rn_abs      =   0.58       !  RGB & 2BD: fraction absorbed in the very near surface
    rn_si0      =   0.35       !  RGB & 2BD: shortess depth of extinction
-   nn_chldta   =      0       !  RGB : Chl data (=1) or cst value (=0)
+   nn_chldta   =      0       !  RGB : 3D Chl data (=2), Surface Chl data (=1) or Cst value (=0)
    rn_si1      =   23.0       !  2BD : longest depth of extinction
    rn_par      =   0.47       !  5BD : fraction of photosynthetically active radiation
 
-   cn_dir      = './'      !  root directory for the chlorophyl data location
+   cn_dir      = './'      !  root directory for the chlorophyll data location
    !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
    !           !  file name              ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
    !           !                         !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !