Changeset 4353

Timestamp:

2014-01-17T16:30:02+01:00 (10 years ago)

Author:

acc

Message:

Branch 2013/dev_ECMWF_waves ticket #1216. Update namelist handling to v3.6 standard

File:

• branches/2013/dev_ECMWF_waves/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave_ecmwf.F90 (modified) (4 diffs)

branches/2013/dev_ECMWF_waves/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave_ecmwf.F90

@@ -59 +59 @@
       !!               
       !!---------------------------------------------------------------------
-      INTEGER, INTENT( in  ) ::  kt   ! ocean time step
+      INTEGER, INTENT( in  ) ::  kt       ! ocean time step
       INTEGER                ::  ierror   ! return error code
+      INTEGER                ::  ios      ! io return code
       CHARACTER(len=100)     ::  cn_dir_cdg                      ! Root directory for location of drag coefficient files
       TYPE(FLD_N)            ::  sn_cdg                          ! informations about the fields to be read
@@ -81 +82 @@
          
 
-!!ACC    REWIND( numnam )                             !* read in namlist namsbc_wave_ecmwf
-!!ACC    READ  ( numnam, namsbc_wave_ecmwf ) 
+         REWIND( numnam_ref )              !  Namelist namsbc_wavepar in reference namelist 
+         READ  ( numnam_ref, namsbc_wave_ecmwf, IOSTAT = ios, ERR = 901)
+901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_wave_ecmwf in reference namelist', lwp )
+
+         REWIND( numnam_cfg )              !  Namelist namsbc_wave_ecmwf in configuration namelist
+         READ  ( numnam_cfg, namsbc_wave_ecmwf, IOSTAT = ios, ERR = 902 )
+902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_wave_ecmwf in configuration namelist', lwp )
+         WRITE ( numond, namsbc_wave_ecmwf )
          !
 
@@ -122 +129 @@
       INTEGER  ::   ji      ! dummy loop index
       INTEGER  ::   jfld    ! dummy loop arguments
+      INTEGER  ::   ios     ! io return code
       !!
       CHARACTER(len=100)     ::  cn_dir_wavepar ! Root directory for location of ECWAM wave parameter fields
@@ -154 +162 @@
          cn_dir_wavepar = './'          ! directory in which the wave data are found
 
-!!ACC    REWIND( numnam )                             !* read in namlist namsbc_wavepar
-!!ACC    READ  ( numnam, namsbc_wavepar ) 
+         REWIND( numnam_ref )              !  Namelist namsbc_wavepar in reference namelist 
+         READ  ( numnam_ref, namsbc_wavepar, IOSTAT = ios, ERR = 901)
+901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_wavepar in reference namelist', lwp )
+
+         REWIND( numnam_cfg )              !  Namelist namsbc_wavepar in configuration namelist
+         READ  ( numnam_cfg, namsbc_wavepar, IOSTAT = ios, ERR = 902 )
+902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_wavepar in configuration namelist', lwp )
+         WRITE ( numond, namsbc_wavepar )
          !
          slf_i(jp_ust) = sn_ust