Ignore:
Timestamp:
2017-09-08T17:09:25+02:00 (3 years ago)
Author:
clem
Message:

changes in style - part5 - almost done

File:
1 edited

Legend:

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

    r8512 r8514  
    3737   PUBLIC   ice_adv_init   ! called by icestp 
    3838 
    39    INTEGER, PUBLIC ::              nice_dyn   ! choice of the type of advection scheme 
     39   INTEGER, PUBLIC ::              nice_dyn   !: choice of the type of advection scheme 
    4040   !                                  ! 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)  
     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)  
    4545 
    4646   !! * Substitution 
     
    9090 
    9191      ! conservation test 
    92       IF( ln_limdiachk )   CALL ice_cons_hsm(0, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 
     92      IF( ln_icediachk )   CALL ice_cons_hsm(0, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 
    9393       
    9494      ! store old values for diag 
     
    224224       
    225225      ! conservation test 
    226       IF( ln_limdiachk )   CALL ice_cons_hsm(1, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 
     226      IF( ln_icediachk )   CALL ice_cons_hsm(1, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 
    227227         
    228228      ! -------------- 
    229229      ! control prints 
    230230      ! -------------- 
    231       IF( ln_limctl )   CALL ice_prt( kt, iiceprt, jiceprt,-1, ' - ice dyn & trp - ' ) 
     231      IF( ln_icectl )   CALL ice_prt( kt, iiceprt, jiceprt,-1, ' - ice dyn & trp - ' ) 
    232232      ! 
    233233      IF( nn_timing == 1 )  CALL timing_stop('iceadv') 
     
    264264      IF(lwp) THEN                     ! control print 
    265265         WRITE(numout,*) 
    266          WRITE(numout,*) 'ice_adv_init : ice parameters for ice dynamics ' 
     266         WRITE(numout,*) 'ice_adv_init: ice parameters for ice dynamics ' 
    267267         WRITE(numout,*) '~~~~~~~~~~~~' 
    268268         WRITE(numout,*) '   Namelist namice_adv' 
Note: See TracChangeset for help on using the changeset viewer.