Changeset 8516 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90

Timestamp:

2017-09-08T19:53:20+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part5 - I think I can see the end of the tunnel

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90

@@ -36 +36 @@
    PUBLIC   ice_adv        ! called by icestp
    PUBLIC   ice_adv_init   ! called by icestp
-
-   INTEGER, PUBLIC ::              nice_dyn   !: choice of the type of advection scheme
-   !                                  ! associated indices:
-   INTEGER, PUBLIC, PARAMETER ::   np_dynNO   = 0   !: no ice dynamics and ice advection
-   INTEGER, PUBLIC, PARAMETER ::   np_dynFULL = 1   !: full ice dynamics  (rheology + advection + ridging/rafting + correction)
-   INTEGER, PUBLIC, PARAMETER ::   np_dyn     = 2   !: no ridging/rafting (rheology + advection                   + correction)
-   INTEGER, PUBLIC, PARAMETER ::   np_dynPURE = 3   !: pure dynamics      (rheology + advection) 
 
    !! * Substitution
@@ -250 +243 @@
       INTEGER ::   ios   ! Local integer output status for namelist read
       !!
-      NAMELIST/namice_adv/ ln_icedyn, nn_icedyn, rn_uice, rn_vice, ln_adv_Pra, ln_adv_UMx, nn_UMx
+      NAMELIST/namice_adv/ ln_adv_Pra, ln_adv_UMx, nn_UMx
       !!-------------------------------------------------------------------
       !
@@ -267 +260 @@
          WRITE(numout,*) '~~~~~~~~~~~~'
          WRITE(numout,*) '   Namelist namice_adv'
-         WRITE(numout,*) '      Ice dynamics       (T) or not (F)                         ln_icedyn  = ', ln_icedyn
-         WRITE(numout,*) '         associated switch                                      nn_icedyn  = ', nn_icedyn
-         WRITE(numout,*) '            =2 all processes (default option)'
-         WRITE(numout,*) '            =1 advection only (no ridging/rafting)'
-         WRITE(numout,*) '            =0 advection only with prescribed velocity given by '
-         WRITE(numout,*) '               a uniform field               (u,v)_ice = (rn_uice,rn_vice) = (', rn_uice,',', rn_vice,')'
          WRITE(numout,*) '      advection scheme for ice transport (limtrp)'
          WRITE(numout,*) '         type of advection scheme (Prather)                     ln_adv_Pra = ', ln_adv_Pra 
@@ -279 +266 @@
       ENDIF
       !
-      !                             ! set the choice of ice dynamics
-      IF( lk_c1d .OR. .NOT. ln_icedyn ) THEN
-         nice_dyn = np_dynNO                    !--- no dynamics
-      ELSE
-         SELECT CASE( nn_icedyn )
-         CASE( 2 )                    
-            IF( nn_monocat /= 2 ) THEN          !--- full dynamics (rheology + advection + ridging/rafting + correction)
-               nice_dyn = np_dynFULL
-            ELSE
-               nice_dyn = np_dyn                !--- dynamics without ridging/rafting
-            ENDIF
-         CASE( 0 , 1 )                          !--- dynamics without ridging/rafting and correction 
-            nice_dyn = np_dynPURE
-         END SELECT
-      ENDIF
-      !                                         !--- simple conservative piling, comparable with LIM2
-      l_piling = nn_icedyn == 1 .OR. ( nn_monocat == 2  .AND.  jpl == 1 )
-      !
       IF ( ( ln_adv_Pra .AND. ln_adv_UMx ) .OR. ( .NOT.ln_adv_Pra .AND. .NOT.ln_adv_UMx ) ) THEN
          CALL ctl_stop( 'ice_adv_init: choose one and only one ice advection scheme (ln_adv_Pra or ln_adv_UMx)' )