Changeset 9526 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.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/OPA_SRC/ZDF/zdfdrg.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90

@@ -41 +41 @@
 
    !                                 !!* Namelist namdrg: nature of drag coefficient namelist *
-   LOGICAL          ::   ln_NONE      ! free-slip       : Cd = 0
+   LOGICAL          ::   ln_OFF       ! free-slip       : Cd = 0
    LOGICAL          ::   ln_lin       !     linear  drag: Cd = Cd0_lin
    LOGICAL          ::   ln_non_lin   ! non-linear  drag: Cd = Cd0_nl |U|
@@ -61 +61 @@
    INTEGER ::              ndrg       ! choice of the type of drag coefficient
    !                                  ! associated indices:
-   INTEGER, PARAMETER ::   np_NONE     = 0   ! free-slip: drag set to zero
+   INTEGER, PARAMETER ::   np_OFF      = 0   ! free-slip: drag set to zero
    INTEGER, PARAMETER ::   np_lin      = 1   !     linear drag: Cd = Cd0_lin
    INTEGER, PARAMETER ::   np_non_lin  = 2   ! non-linear drag: Cd = Cd0_nl |U|
@@ -231 +231 @@
       INTEGER   ::   ios, ioptio   ! local integers
       !!
-      NAMELIST/namdrg/ ln_NONE, ln_lin, ln_non_lin, ln_loglayer, ln_drgimp
+      NAMELIST/namdrg/ ln_OFF, ln_lin, ln_non_lin, ln_loglayer, ln_drgimp
       !!----------------------------------------------------------------------
       !
@@ -249 +249 @@
          WRITE(numout,*) '~~~~~~~~~~~~'
          WRITE(numout,*) '   Namelist namdrg : top/bottom friction choices'
-         WRITE(numout,*) '      free-slip       : Cd = 0                  ln_NONE     = ', ln_NONE
+         WRITE(numout,*) '      free-slip       : Cd = 0                  ln_OFF      = ', ln_OFF 
          WRITE(numout,*) '      linear  drag    : Cd = Cd0                ln_lin      = ', ln_lin
          WRITE(numout,*) '      non-linear  drag: Cd = Cd0_nl |U|         ln_non_lin  = ', ln_non_lin
@@ -257 +257 @@
       !
       ioptio = 0                       ! set ndrg and control check
-      IF( ln_NONE     ) THEN   ;   ndrg = np_NONE       ;   ioptio = ioptio + 1   ;   ENDIF
+      IF( ln_OFF      ) THEN   ;   ndrg = np_OFF        ;   ioptio = ioptio + 1   ;   ENDIF
       IF( ln_lin      ) THEN   ;   ndrg = np_lin        ;   ioptio = ioptio + 1   ;   ENDIF
       IF( ln_non_lin  ) THEN   ;   ndrg = np_non_lin    ;   ioptio = ioptio + 1   ;   ENDIF
@@ -386 +386 @@
       SELECT CASE( ndrg )
       !
-      CASE( np_NONE )            !==  No top/bottom friction  ==!   (pCdU = 0)
+      CASE( np_OFF  )            !==  No top/bottom friction  ==!   (pCdU = 0)
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '   ==>>>   ',TRIM(cd_topbot),' free-slip, friction set to zero'