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/icedia.F90

    r8522 r8531  
    4848   INTEGER FUNCTION ice_dia_alloc() 
    4949      !!---------------------------------------------------------------------! 
    50       !!                ***  ROUTINE ice_rdgrft_alloc *** 
     50      !!                ***  ROUTINE ice_dia_alloc *** 
    5151      !!---------------------------------------------------------------------! 
    5252      ALLOCATE( vol_loc_ini(jpi,jpj), sal_loc_ini(jpi,jpj), tem_loc_ini(jpi,jpj), STAT=ice_dia_alloc ) 
     
    175175      INTEGER            ::   ios, ierror   ! local integer 
    176176      !! 
    177       NAMELIST/namice_dia/ ln_icediachk, ln_icediahsb, ln_icectl, iiceprt, jiceprt   
     177      NAMELIST/namdia/ ln_icediachk, ln_icediahsb, ln_icectl, iiceprt, jiceprt   
    178178      !!---------------------------------------------------------------------- 
    179179      ! 
    180       REWIND( numnam_ice_ref )      ! Namelist namice_dia in reference namelist : Parameters for ice 
    181       READ  ( numnam_ice_ref, namice_dia, IOSTAT = ios, ERR = 901) 
    182 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_dia in reference namelist', lwp ) 
    183  
    184       REWIND( numnam_ice_cfg )      ! Namelist namice_dia in configuration namelist : Parameters for ice 
    185       READ  ( numnam_ice_cfg, namice_dia, IOSTAT = ios, ERR = 902 ) 
    186 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namice_dia in configuration namelist', lwp ) 
    187       IF(lwm) WRITE ( numoni, namice_dia ) 
     180      REWIND( numnam_ice_ref )      ! Namelist namdia in reference namelist : Parameters for ice 
     181      READ  ( numnam_ice_ref, namdia, IOSTAT = ios, ERR = 901) 
     182901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdia in reference namelist', lwp ) 
     183 
     184      REWIND( numnam_ice_cfg )      ! Namelist namdia in configuration namelist : Parameters for ice 
     185      READ  ( numnam_ice_cfg, namdia, IOSTAT = ios, ERR = 902 ) 
     186902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdia in configuration namelist', lwp ) 
     187      IF(lwm) WRITE ( numoni, namdia ) 
    188188      ! 
    189189      IF(lwp) THEN                  ! control print 
     
    191191         WRITE(numout,*) 'ice_dia_init: ice diagnostics' 
    192192         WRITE(numout,*) ' ~~~~~~~~~~~' 
    193          WRITE(numout,*) '   Namelist namice_dia : ' 
     193         WRITE(numout,*) '   Namelist namdia:' 
    194194         WRITE(numout,*) '      Diagnose online heat/mass/salt budget      ln_icediachk = ', ln_icediachk 
    195195         WRITE(numout,*) '      Output          heat/mass/salt budget      ln_icediahsb = ', ln_icediahsb 
    196          WRITE(numout,*) '      control prints for a given grid point         ln_icectl = ', ln_icectl 
     196         WRITE(numout,*) '      control prints for a given grid point      ln_icectl    = ', ln_icectl 
    197197         WRITE(numout,*) '         chosen grid point position         (iiceprt,jiceprt) = (', iiceprt,',', jiceprt,')' 
    198198      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.