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

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

@@ -29 +29 @@
    PRIVATE
 
-   PUBLIC               lim_dia_2          ! called by sbc_ice_lim_2
-
-   INTEGER, PUBLIC ::   ntmoy   = 1 ,   &  !: instantaneous values of ice evolution or averaging ntmoy
-      &                 ninfo   = 1        !: frequency of ouputs on file ice_evolu in case of averaging
+   PUBLIC               lim_dia_2     ! called by sbc_ice_lim_2
+
+   INTEGER, PUBLIC ::   ntmoy  ,   &  !: instantaneous values of ice evolution or averaging ntmoy
+      &                 ninfo         !: frequency of ouputs on file ice_evolu in case of averaging
 
    INTEGER, PARAMETER ::   &  ! Parameters for outputs to files "evolu"
@@ -40 +40 @@
 
    INTEGER ::   &
-      nfrinf  = 4 ,     &  ! number of variables written in one line 
+      nfrinf ,          &  ! number of variables written in one line 
       nferme ,          &  ! last time step at which the var. are written on file
       nvinfo ,          &  ! number of total variables 
@@ -46 +46 @@
       naveg                ! number of step for accumulation before averaging
 
-   CHARACTER(len= 8) ::   fmtinf  = '1PE13.5 ' ! format of the output values  
+   CHARACTER(len= 8) ::   fmtinf   ! format of the output values  
    CHARACTER(len=30) ::   fmtw  ,           &  ! formats
       &                   fmtr  ,           &  ! ???
@@ -176 +176 @@
        INTEGER  ::   jv   ! dummy loop indice
        INTEGER  ::   ntot , ndeb, nv, ierr   ! local integer
+       INTEGER  ::   ios                     ! Local integer output status for namelist read
        REAL(wp) ::   zxx0, zxx1              ! local scalars
 
        NAMELIST/namicedia/fmtinf, nfrinf, ninfo, ntmoy
        !!-------------------------------------------------------------------
-
-       REWIND( numnam_ice )                     ! Read Namelist namicedia
-       READ  ( numnam_ice  , namicedia )
+                    
+       REWIND( numnam_ice_ref )              ! Namelist namicedia in reference namelist : Ice diagnostics in ice_evolu
+       READ  ( numnam_ice_ref, namicedia, IOSTAT = ios, ERR = 901)
+901    IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicedia in reference namelist', lwp )
+
+       REWIND( numnam_ice_cfg )              ! Namelist namicedia in configuration namelist : Ice diagnostics in ice_evolu 
+       READ  ( numnam_ice_cfg, namicedia, IOSTAT = ios, ERR = 902 )
+902    IF( ios /= 0 ) CALL ctl_nam ( ios , 'namicedia in configuration namelist', lwp )
+       WRITE ( numoni, namicedia )
        
        IF(lwp) THEN                             ! control print