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

Timestamp:

2013-11-04T12:51:55+01:00 (11 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/limdia.F90 (modified) (5 diffs)

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

@@ -30 +30 @@
    PUBLIC lim_dia       ! called by ice_step
 
-   INTEGER, PUBLIC  ::   ntmoy   = 1   !: instantaneous values of ice evolution or averaging ntmoy
-   INTEGER, PUBLIC  ::   ninfo   = 1   !: frequency of ouputs on file ice_evolu in case of averaging
+   INTEGER, PUBLIC  ::   ntmoy    !: instantaneous values of ice evolution or averaging ntmoy
+   INTEGER, PUBLIC  ::   ninfo    !: frequency of ouputs on file ice_evolu in case of averaging
 
    !                                              !!! Parameters for outputs to files "evolu"
@@ -38 +38 @@
    INTEGER, PARAMETER ::   jpchsep = jpchinf + 2   ! ???
 
-   INTEGER  ::   nfrinf  = 4         ! number of variables written in one line 
+   INTEGER  ::   nfrinf    ! number of variables written in one line 
    INTEGER  ::   nferme              ! last time step at which the var. are written on file
    INTEGER  ::   nvinfo              ! number of total variables 
@@ -45 +45 @@
    REAL(wp) ::   epsi06 = 1.e-6_wp   ! small number
 
-   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
    CHARACTER(len=30) ::   fmtr                  ! ???
@@ -415 +415 @@
       INTEGER  ::   jv    ! dummy loop indice
       INTEGER  ::   ierr, ntot , ndeb , irecl   ! local integers
+      INTEGER  ::   ios                         ! Local integer output status for namelist read
       REAL(wp) ::   zxx0, zxx1    ! local scalars
       CHARACTER(len=jpchinf) ::   titinf
@@ -422 +423 @@
       !!-------------------------------------------------------------------
       !
-      REWIND( numnam_ice )             ! read namicedia namelist
-      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