Ignore:
Timestamp:
2017-09-08T19:53:20+02:00 (3 years ago)
Author:
clem
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90

    r8514 r8516  
    3636   PUBLIC   ice_adv        ! called by icestp 
    3737   PUBLIC   ice_adv_init   ! called by icestp 
    38  
    39    INTEGER, PUBLIC ::              nice_dyn   !: choice of the type of advection scheme 
    40    !                                  ! associated indices: 
    41    INTEGER, PUBLIC, PARAMETER ::   np_dynNO   = 0   !: no ice dynamics and ice advection 
    42    INTEGER, PUBLIC, PARAMETER ::   np_dynFULL = 1   !: full ice dynamics  (rheology + advection + ridging/rafting + correction) 
    43    INTEGER, PUBLIC, PARAMETER ::   np_dyn     = 2   !: no ridging/rafting (rheology + advection                   + correction) 
    44    INTEGER, PUBLIC, PARAMETER ::   np_dynPURE = 3   !: pure dynamics      (rheology + advection)  
    4538 
    4639   !! * Substitution 
     
    250243      INTEGER ::   ios   ! Local integer output status for namelist read 
    251244      !! 
    252       NAMELIST/namice_adv/ ln_icedyn, nn_icedyn, rn_uice, rn_vice, ln_adv_Pra, ln_adv_UMx, nn_UMx 
     245      NAMELIST/namice_adv/ ln_adv_Pra, ln_adv_UMx, nn_UMx 
    253246      !!------------------------------------------------------------------- 
    254247      ! 
     
    267260         WRITE(numout,*) '~~~~~~~~~~~~' 
    268261         WRITE(numout,*) '   Namelist namice_adv' 
    269          WRITE(numout,*) '      Ice dynamics       (T) or not (F)                         ln_icedyn  = ', ln_icedyn 
    270          WRITE(numout,*) '         associated switch                                      nn_icedyn  = ', nn_icedyn 
    271          WRITE(numout,*) '            =2 all processes (default option)' 
    272          WRITE(numout,*) '            =1 advection only (no ridging/rafting)' 
    273          WRITE(numout,*) '            =0 advection only with prescribed velocity given by ' 
    274          WRITE(numout,*) '               a uniform field               (u,v)_ice = (rn_uice,rn_vice) = (', rn_uice,',', rn_vice,')' 
    275262         WRITE(numout,*) '      advection scheme for ice transport (limtrp)' 
    276263         WRITE(numout,*) '         type of advection scheme (Prather)                     ln_adv_Pra = ', ln_adv_Pra  
     
    279266      ENDIF 
    280267      ! 
    281       !                             ! set the choice of ice dynamics 
    282       IF( lk_c1d .OR. .NOT. ln_icedyn ) THEN 
    283          nice_dyn = np_dynNO                    !--- no dynamics 
    284       ELSE 
    285          SELECT CASE( nn_icedyn ) 
    286          CASE( 2 )                     
    287             IF( nn_monocat /= 2 ) THEN          !--- full dynamics (rheology + advection + ridging/rafting + correction) 
    288                nice_dyn = np_dynFULL 
    289             ELSE 
    290                nice_dyn = np_dyn                !--- dynamics without ridging/rafting 
    291             ENDIF 
    292          CASE( 0 , 1 )                          !--- dynamics without ridging/rafting and correction  
    293             nice_dyn = np_dynPURE 
    294          END SELECT 
    295       ENDIF 
    296       !                                         !--- simple conservative piling, comparable with LIM2 
    297       l_piling = nn_icedyn == 1 .OR. ( nn_monocat == 2  .AND.  jpl == 1 ) 
    298       ! 
    299268      IF ( ( ln_adv_Pra .AND. ln_adv_UMx ) .OR. ( .NOT.ln_adv_Pra .AND. .NOT.ln_adv_UMx ) ) THEN 
    300269         CALL ctl_stop( 'ice_adv_init: choose one and only one ice advection scheme (ln_adv_Pra or ln_adv_UMx)' ) 
Note: See TracChangeset for help on using the changeset viewer.