New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 4897 for branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3 – NEMO

Ignore:
Timestamp:
2014-11-27T16:08:14+01:00 (10 years ago)
Author:
cetlod
Message:

2014/dev_CNRS_2014 : Merge in the trunk changes between 4615 and 4674, see ticket #1415

Location:
branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3/iceini.F90

    r4333 r4897  
    7474      CALL ctl_opn( numnam_ice_ref, 'namelist_ice_ref',    'OLD',     'FORMATTED', 'SEQUENTIAL', -1, numout, lwp )  
    7575      CALL ctl_opn( numnam_ice_cfg, 'namelist_ice_cfg',    'OLD',     'FORMATTED', 'SEQUENTIAL', -1, numout, lwp ) 
    76       CALL ctl_opn( numoni,        'output.namelist.ice', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, 1 ) 
     76      IF(lwm) CALL ctl_opn( numoni, 'output.namelist.ice', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, 1 ) 
    7777      ! 
    7878      CALL ice_run                     ! set some ice run parameters 
    … …  
    141141      READ  ( numnam_ice_cfg, namicerun, IOSTAT = ios, ERR = 902 ) 
    142142902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicerun in configuration namelist', lwp ) 
    143       WRITE ( numoni, namicerun ) 
     143      IF(lwm) WRITE ( numoni, namicerun ) 
    144144      ! 
    145145      !IF( lk_mpp .AND. ln_nicep ) THEN 

  • branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90

    r4161 r4897  
    282282      READ  ( numnam_ice_cfg, namicedyn, IOSTAT = ios, ERR = 902 ) 
    283283902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicedyn in configuration namelist', lwp ) 
    284       WRITE ( numoni, namicedyn ) 
     284      IF(lwm) WRITE ( numoni, namicedyn ) 
    285285       
    286286      IF(lwp) THEN                        ! control print 

  • branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

    r4896 r4897  
    505505      READ  ( numnam_ice_cfg, namiceini, IOSTAT = ios, ERR = 902 ) 
    506506902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp ) 
    507       WRITE ( numoni, namiceini ) 
     507      IF(lwm) WRITE ( numoni, namiceini ) 
    508508 
    509509      ! Define the initial parameters 

  • branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90

    r4346 r4897  
    14181418      READ  ( numnam_ice_cfg, namiceitdme, IOSTAT = ios, ERR = 902 ) 
    14191419902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceitdme in configuration namelist', lwp ) 
    1420       WRITE ( numoni, namiceitdme ) 
     1420      IF(lwm) WRITE ( numoni, namiceitdme ) 
    14211421      ! 
    14221422      IF (lwp) THEN                          ! control print 

  • branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

    r4333 r4897  
    837837      READ  ( numnam_ice_cfg, namicethd, IOSTAT = ios, ERR = 902 ) 
    838838902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicethd in configuration namelist', lwp ) 
    839       WRITE ( numoni, namicethd ) 
     839      IF(lwm) WRITE ( numoni, namicethd ) 
    840840      ! 
    841841      IF(lwp) THEN                          ! control print 

  • branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90

    r4161 r4897  
    193193      READ  ( numnam_ice_cfg, namicesal, IOSTAT = ios, ERR = 902 ) 
    194194902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicesal in configuration namelist', lwp ) 
    195       WRITE ( numoni, namicesal ) 
     195      IF(lwm) WRITE ( numoni, namicesal ) 
    196196      ! 
    197197      IF(lwp) THEN                           ! control print 

  • branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

    r4333 r4897  
    469469      READ  ( numnam_ice_cfg, namiceout, IOSTAT = ios, ERR = 902 ) 
    470470902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceout in configuration namelist', lwp ) 
    471       WRITE ( numoni, namiceout ) 
     471      IF(lwm) WRITE ( numoni, namiceout ) 
    472472 
    473473      zfield(1)  = field_1 
Note: See TracChangeset for help on using the changeset viewer.