Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90

@@ -1409 +1409 @@
       !! ** input   :   Namelist namiceitdme
       !!-------------------------------------------------------------------
+      INTEGER :: ios                 ! Local integer output status for namelist read
       NAMELIST/namiceitdme/ ridge_scheme_swi, Cs, Cf, fsnowrdg, fsnowrft,& 
          Gstar, astar,                                &
@@ -1416 +1417 @@
       !!-------------------------------------------------------------------
       !
-      REWIND( numnam_ice )                   ! read namiceitdme namelist
-      READ  ( numnam_ice , namiceitdme)
+      REWIND( numnam_ice_ref )              ! Namelist namicetdme in reference namelist : Ice mechanical ice redistribution
+      READ  ( numnam_ice_ref, namiceitdme, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceitdme in reference namelist', lwp )
+
+      REWIND( numnam_ice_cfg )              ! Namelist namiceitdme in configuration namelist : Ice mechanical ice redistribution
+      READ  ( numnam_ice_cfg, namiceitdme, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceitdme in configuration namelist', lwp )
+      WRITE ( numoni, namiceitdme )
       !
       IF (lwp) THEN                          ! control print