Changeset 4844 for branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO

Timestamp:

2014-11-12T12:58:36+01:00 (9 years ago)

Author:

andrewryan

Message:

upgraded namelist reads to conform to NEMO standards

File:

• branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/OOO_SRC/ooo_data.F90 (modified) (3 diffs)

branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/OOO_SRC/ooo_data.F90

@@ -4 +4 @@
    !! =================================================================
    USE par_kind, ONLY: lc
+   USE lib_mpp         ! distributed memory computing
 
    IMPLICIT NONE
@@ -53 +54 @@
       LOGICAL :: lmask(MaxNumFiles)     !: Logical mask used for counting
       LOGICAL, INTENT(IN) :: ld_cl4     !: Logical class 4 on/off
+      INTEGER :: ios
 
       ! Standard offline obs_oper information
@@ -85 +87 @@
 
       ! Standard offline obs_oper settings
-      READ(numnam_ref, namooo)
+      REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints & Benchmark
+      READ  ( numnam_ref, namooo, IOSTAT = ios, ERR = 901 )
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namooo in reference namelist', .TRUE. )
+
+      REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist : Control prints & Benchmark
+      READ  ( numnam_cfg, namooo, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namooo in configuration namelist', .TRUE. )
 
       ! Read class 4 output settings
       IF (ld_cl4) THEN
-         READ(numnam_ref, namcl4)
+         REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints & Benchmark
+         READ  ( numnam_ref, namcl4, IOSTAT = ios, ERR = 903 )
+903      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcl4 in reference namelist', .TRUE. )
+
+         REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist : Control prints & Benchmark
+         READ  ( numnam_cfg, namcl4, IOSTAT = ios, ERR = 904 )
+904      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcl4 in configuration namelist', .TRUE. )
       ENDIF