Changeset 9490 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

Timestamp:

2018-04-23T10:44:07+02:00 (6 years ago)

Author:

gm

Message:

#2075 - dev_merge_2017: scale-aware setting of lateral viscous and diffusive coefficient

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -22 +22 @@
    USE oce            ! ocean dynamics and tracers
    USE dom_oce        ! ocean space and time domain
-   USE ldfdyn         ! lateral diffusion: eddy viscosity coef.
+!   USE ldfdyn         ! lateral diffusion: eddy viscosity coef.
    USE phycst         ! physical constants
    USE zdfmxl         ! mixed layer depth
@@ -43 +43 @@
    LOGICAL , PUBLIC ::   l_ldfslp = .FALSE.     !: slopes flag
 
-   LOGICAL , PUBLIC ::   ln_traldf_iso   = .TRUE.       !: iso-neutral direction
-   LOGICAL , PUBLIC ::   ln_traldf_triad = .FALSE.      !: griffies triad scheme
-
-   LOGICAL , PUBLIC ::   ln_triad_iso    = .FALSE.      !: pure horizontal mixing in ML
-   LOGICAL , PUBLIC ::   ln_botmix_triad = .FALSE.      !: mixing on bottom
-   REAL(wp), PUBLIC ::   rn_sw_triad     = 1._wp        !: =1 switching triads ; =0 all four triads used 
-   REAL(wp), PUBLIC ::   rn_slpmax       = 0.01_wp      !: slope limit
+   LOGICAL , PUBLIC ::   ln_traldf_iso   = .TRUE.       !: iso-neutral direction                           (nam_traldf namelist)
+   LOGICAL , PUBLIC ::   ln_traldf_triad = .FALSE.      !: griffies triad scheme                           (nam_traldf namelist)
+   LOGICAL , PUBLIC ::   ln_dynldf_iso                  !: iso-neutral direction                           (nam_dynldf namelist)
+
+   LOGICAL , PUBLIC ::   ln_triad_iso    = .FALSE.      !: pure horizontal mixing in ML                    (nam_traldf namelist)
+   LOGICAL , PUBLIC ::   ln_botmix_triad = .FALSE.      !: mixing on bottom                                (nam_traldf namelist)
+   REAL(wp), PUBLIC ::   rn_sw_triad     = 1._wp        !: =1 switching triads ; =0 all four triads used   (nam_traldf namelist)
+   REAL(wp), PUBLIC ::   rn_slpmax       = 0.01_wp      !: slope limit                                     (nam_traldf namelist)
 
    LOGICAL , PUBLIC ::   l_grad_zps = .FALSE.           !: special treatment for Horz Tgradients w partial steps (triad operator)
@@ -749 +750 @@
       !
       IF( ln_traldf_triad ) THEN        ! Griffies operator : triad of slopes
-         IF(lwp) WRITE(numout,*) '              Griffies (triad) operator initialisation'
+         IF(lwp) WRITE(numout,*) '   ==>>>   triad) operator (Griffies)'
          ALLOCATE( triadi_g(jpi,jpj,jpk,0:1,0:1) , triadj_g(jpi,jpj,jpk,0:1,0:1) ,     &
             &      triadi  (jpi,jpj,jpk,0:1,0:1) , triadj  (jpi,jpj,jpk,0:1,0:1) ,     &
@@ -757 +758 @@
          !
       ELSE                             ! Madec operator : slopes at u-, v-, and w-points
-         IF(lwp) WRITE(numout,*) '              Madec operator initialisation'
+         IF(lwp) WRITE(numout,*) '   ==>>>   iso operator (Madec)'
          ALLOCATE( omlmask(jpi,jpj,jpk) ,                                                                        &
             &      uslp(jpi,jpj,jpk) , uslpml(jpi,jpj) , wslpi(jpi,jpj,jpk) , wslpiml(jpi,jpj) ,     &