Ignore:
Timestamp:
2017-09-15T20:07:33+02:00 (3 years ago)
Author:
clem
Message:

changes in style - part6 - more clarity (still not finished)

File:
1 edited

Legend:

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

    r8518 r8531  
    4242   INTEGER, PARAMETER ::   np_advUMx = 2   ! Ultimate-Macho scheme 
    4343   ! 
    44    ! ** namelist (namice_adv) ** 
     44   ! ** namelist (namdyn_adv) ** 
    4545   LOGICAL ::   ln_adv_Pra   ! Prather        advection scheme 
    4646   LOGICAL ::   ln_adv_UMx   ! Ultimate-Macho advection scheme 
     
    132132      !!      dynamics 
    133133      !! 
    134       !! ** Method  :  Read the namice_adv namelist and check the ice-dynamic 
     134      !! ** Method  :  Read the namdyn_adv namelist and check the ice-dynamic 
    135135      !!       parameter values called at the first timestep (nit000) 
    136136      !! 
    137       !! ** input   :   Namelist namice_adv 
     137      !! ** input   :   Namelist namdyn_adv 
    138138      !!------------------------------------------------------------------- 
    139139      INTEGER ::   ios, ioptio   ! Local integer output status for namelist read 
    140140      !! 
    141       NAMELIST/namice_adv/ ln_adv_Pra, ln_adv_UMx, nn_UMx 
     141      NAMELIST/namdyn_adv/ ln_adv_Pra, ln_adv_UMx, nn_UMx 
    142142      !!------------------------------------------------------------------- 
    143143      ! 
    144       REWIND( numnam_ice_ref )         ! Namelist namice_adv in reference namelist : Ice dynamics 
    145       READ  ( numnam_ice_ref, namice_adv, IOSTAT = ios, ERR = 901) 
    146 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_adv in reference namelist', lwp ) 
     144      REWIND( numnam_ice_ref )         ! Namelist namdyn_adv in reference namelist : Ice dynamics 
     145      READ  ( numnam_ice_ref, namdyn_adv, IOSTAT = ios, ERR = 901) 
     146901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_adv in reference namelist', lwp ) 
    147147      ! 
    148       REWIND( numnam_ice_cfg )         ! Namelist namice_adv in configuration namelist : Ice dynamics 
    149       READ  ( numnam_ice_cfg, namice_adv, IOSTAT = ios, ERR = 902 ) 
    150 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_adv in configuration namelist', lwp ) 
    151       IF(lwm) WRITE ( numoni, namice_adv ) 
     148      REWIND( numnam_ice_cfg )         ! Namelist namdyn_adv in configuration namelist : Ice dynamics 
     149      READ  ( numnam_ice_cfg, namdyn_adv, IOSTAT = ios, ERR = 902 ) 
     150902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_adv in configuration namelist', lwp ) 
     151      IF(lwm) WRITE ( numoni, namdyn_adv ) 
    152152      ! 
    153153      IF(lwp) THEN                     ! control print 
     
    155155         WRITE(numout,*) 'ice_adv_init: ice parameters for ice dynamics ' 
    156156         WRITE(numout,*) '~~~~~~~~~~~~' 
    157          WRITE(numout,*) '   Namelist namice_adv' 
    158          WRITE(numout,*) '      type of advection scheme (Prather)                     ln_adv_Pra = ', ln_adv_Pra  
    159          WRITE(numout,*) '      type of advection scheme (Ulimate-Macho)               ln_adv_UMx = ', ln_adv_UMx  
    160          WRITE(numout,*) '         order of the Ultimate-Macho scheme                      nn_UMx = ', nn_UMx 
     157         WRITE(numout,*) '   Namelist namdyn_adv:' 
     158         WRITE(numout,*) '      type of advection scheme (Prather)             ln_adv_Pra = ', ln_adv_Pra  
     159         WRITE(numout,*) '      type of advection scheme (Ulimate-Macho)       ln_adv_UMx = ', ln_adv_UMx  
     160         WRITE(numout,*) '         order of the Ultimate-Macho scheme          nn_UMx    = ', nn_UMx 
    161161      ENDIF 
    162162      ! 
Note: See TracChangeset for help on using the changeset viewer.