Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.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_2/limtrp_2.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90

@@ -38 +38 @@
    PUBLIC   lim_trp_2   ! called by sbc_ice_lim_2
 
-   REAL(wp), PUBLIC ::   bound  = 0.e0          !: boundary condit. (0.0 no-slip, 1.0 free-slip)
+   REAL(wp), PUBLIC ::   bound      !: boundary condit. (0.0 no-slip, 1.0 free-slip)
 
    REAL(wp)  ::   epsi06 = 1.e-06   ! constant values
@@ -297 +297 @@
       !! ** input   :   Namelist namicetrp
       !!-------------------------------------------------------------------
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
       NAMELIST/namicetrp/ bound
       !!-------------------------------------------------------------------
-      !
-      REWIND ( numnam_ice )      ! Read Namelist namicetrp
-      READ   ( numnam_ice  , namicetrp )
+                    
+      REWIND( numnam_ice_ref )              ! Namelist namicetrp in reference namelist : Ice advection
+      READ  ( numnam_ice_ref, namicetrp, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicetrp in reference namelist', lwp )
+
+      REWIND( numnam_ice_cfg )              ! Namelist namicetrp in configuration namelist : Ice advection
+      READ  ( numnam_ice_cfg, namicetrp, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicetrp in configuration namelist', lwp )
+      WRITE ( numoni, namicetrp )
+
       IF(lwp) THEN
          WRITE(numout,*)