Changeset 9526 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

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

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (modified) (4 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' )