Changeset 9526 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP

Timestamp:

2018-04-30T12:22:35+02:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: rename ln_...NONE as ln_...OFF (CONFIG, OPA_SRC, TOP_SRC) ; agrif zoom now only in AGRIF_NORDIC configuration

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP

Files:

• trcadv.F90 (modified) (4 diffs)
• trcldf.F90 (modified) (5 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -39 +39 @@
 
    !                            !!* Namelist namtrc_adv *
-   LOGICAL ::   ln_trcadv_NONE   ! no advection on passive tracers
+   LOGICAL ::   ln_trcadv_OFF    ! no advection on passive tracers
    LOGICAL ::   ln_trcadv_cen    ! centered scheme flag
    INTEGER ::      nn_cen_h, nn_cen_v   ! =2/4 : horizontal and vertical choices of the order of CEN scheme
@@ -155 +155 @@
       INTEGER ::   ioptio, ios   ! Local integer
       !!
-      NAMELIST/namtrc_adv/ ln_trcadv_NONE,                       &   ! No advection
+      NAMELIST/namtrc_adv/ ln_trcadv_OFF,                        &   ! No advection
          &                 ln_trcadv_cen, nn_cen_h, nn_cen_v,    &   ! CEN
          &                 ln_trcadv_fct, nn_fct_h, nn_fct_v,    &   ! FCT
@@ -177 +177 @@
          WRITE(numout,*) '~~~~~~~~~~~'
          WRITE(numout,*) '   Namelist namtrc_adv : chose a advection scheme for tracers'
-         WRITE(numout,*) '      No advection on passive tracers           ln_trcadv_NONE= ', ln_trcadv_NONE
+         WRITE(numout,*) '      No advection on passive tracers           ln_trcadv_OFF = ', ln_trcadv_OFF
          WRITE(numout,*) '      centered scheme                           ln_trcadv_cen = ', ln_trcadv_cen
          WRITE(numout,*) '            horizontal 2nd/4th order               nn_cen_h   = ', nn_fct_h
@@ -193 +193 @@
       !                                !==  Parameter control & set nadv ==!
       ioptio = 0
-      IF( ln_trcadv_NONE ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_NO_adv   ;   ENDIF
-      IF( ln_trcadv_cen  ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_CEN      ;   ENDIF
-      IF( ln_trcadv_fct  ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_FCT      ;   ENDIF
-      IF( ln_trcadv_mus  ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_MUS      ;   ENDIF
-      IF( ln_trcadv_ubs  ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_UBS      ;   ENDIF
-      IF( ln_trcadv_qck  ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_QCK      ;   ENDIF
+      IF( ln_trcadv_OFF ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_NO_adv   ;   ENDIF
+      IF( ln_trcadv_cen ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_CEN      ;   ENDIF
+      IF( ln_trcadv_fct ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_FCT      ;   ENDIF
+      IF( ln_trcadv_mus ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_MUS      ;   ENDIF
+      IF( ln_trcadv_ubs ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_UBS      ;   ENDIF
+      IF( ln_trcadv_qck ) THEN   ;   ioptio = ioptio + 1   ;   nadv = np_QCK      ;   ENDIF
       !
       IF( ioptio /= 1 )   CALL ctl_stop( 'trc_adv_ini: Choose ONE advection option in namelist namtrc_adv' )

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90

@@ -34 +34 @@
    !
    !                                      !!: ** lateral mixing namelist (nam_trcldf) **
-   LOGICAL , PUBLIC ::   ln_trcldf_NONE    !: No operator (no explicit lateral diffusion)
+   LOGICAL , PUBLIC ::   ln_trcldf_OFF     !: No operator (no explicit lateral diffusion)
    LOGICAL , PUBLIC ::   ln_trcldf_tra     !: use active tracer operator
    REAL(wp), PUBLIC ::      rn_ldf_multi      !: multiplier of T-S eddy diffusivity to obtain the passive tracer one
@@ -67 +67 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_trcldf_NONE )   RETURN       ! not lateral diffusion applied on passive tracers
+      IF( ln_trcldf_OFF )   RETURN        ! not lateral diffusion applied on passive tracers
       !
       IF( ln_timing )   CALL timing_start('trc_ldf')
@@ -127 +127 @@
       !! ** Purpose :   Define the operator for the lateral diffusion
       !!
-      !! ** Method  : - ln_trcldf_tra =T : use nldf_tra set in ldftra module 
+      !! ** Method  : - ln_trcldf_tra=T : use nldf_tra set in ldftra module 
       !!              to defined the passive tracer lateral diffusive operator
-      !!              - ln_trcldf_NONE=T : no explicit diffusion used
+      !!              - ln_trcldf_OFF=T : no explicit diffusion used
       !!----------------------------------------------------------------------
       INTEGER ::   ios, ioptio   ! local integers
       !!
-      NAMELIST/namtrc_ldf/ ln_trcldf_NONE, ln_trcldf_tra,   &   ! operator & direction
+      NAMELIST/namtrc_ldf/ ln_trcldf_OFF , ln_trcldf_tra,   &   ! operator & direction
          &                 rn_ldf_multi  , rn_fact_lap          ! coefficient
       !!----------------------------------------------------------------------
@@ -154 +154 @@
       IF(lwp) THEN                     ! Namelist print
          WRITE(numout,*) '   Namelist namtrc_ldf : set lateral mixing parameters (type, direction, coefficients)'
-         WRITE(numout,*) '      no explicit diffusion                 ln_trcldf_NONE  = ', ln_trcldf_NONE
+         WRITE(numout,*) '      no explicit diffusion                 ln_trcldf_OFF   = ', ln_trcldf_OFF
          WRITE(numout,*) '      use active tracer operator            ln_trcldf_tra   = ', ln_trcldf_tra
          WRITE(numout,*) '      diffusivity coefficient :'
-         WRITE(numout,*) '         multiplier of TRA coef. for TRC          rn_ldf_multi = ', rn_ldf_multi
-         WRITE(numout,*) '         enhanced zonal Eq. laplacian coef.       rn_fact_lap  = ', rn_fact_lap
+         WRITE(numout,*) '         multiplier of TRA coef. for TRC       rn_ldf_multi = ', rn_ldf_multi
+         WRITE(numout,*) '         enhanced zonal Eq. laplacian coef.    rn_fact_lap  = ', rn_fact_lap
 
       ENDIF
@@ -165 +165 @@
       nldf_trc = np_ERROR
       ioptio   = 0
-      IF( ln_trcldf_NONE ) THEN   ;   nldf_trc = np_no_ldf   ;   ioptio = ioptio + 1   ;   ENDIF
+      IF( ln_trcldf_OFF  ) THEN   ;   nldf_trc = np_no_ldf   ;   ioptio = ioptio + 1   ;   ENDIF
       IF( ln_trcldf_tra  ) THEN   ;   nldf_trc = nldf_tra    ;   ioptio = ioptio + 1   ;   ENDIF
       IF( ioptio /=  1   )   CALL ctl_stop( 'trc_ldf_ini: use ONE of the 2 operator options (NONE/tra)' )