Changeset 8667 for branches/2017/dev_r8657_UKMO_OBSoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90

Timestamp:

2017-10-30T10:28:45+01:00 (6 years ago)

Author:

timgraham

Message:

Update of OBS code from local v3.6 branch to head of trunk

File:

• branches/2017/dev_r8657_UKMO_OBSoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90 (modified) (4 diffs)

branches/2017/dev_r8657_UKMO_OBSoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.F90

@@ -77 +77 @@
       CHARACTER(LEN=11), PARAMETER :: cpname='obs_rea_surf'
       CHARACTER(len=8) :: clrefdate
-      CHARACTER(len=6), DIMENSION(:), ALLOCATABLE :: clvars
+      CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvars
       INTEGER :: ji
       INTEGER :: jj
@@ -172 +172 @@
 
             !------------------------------------------------------------------
-            !  Read the profile file into inpfiles
+            !  Read the surface file into inpfiles
             !------------------------------------------------------------------
             CALL init_obfbdata( inpfiles(jj) )
@@ -296 +296 @@
                   ENDIF
                   llvalprof = .FALSE.
-                  IF ( ( inpfiles(jj)%ivlqc(1,ji,1) == 1 ) .OR. &
-                     & ( inpfiles(jj)%ivlqc(1,ji,1) == 2 ) ) THEN
+                  IF ( .NOT. BTEST(inpfiles(jj)%ivlqc(1,ji,1),2) ) THEN
                      iobs = iobs + 1
                   ENDIF
@@ -370 +369 @@
             ! Set observation information
 
-            IF ( ( inpfiles(jj)%ivlqc(1,ji,1) == 1 ) .OR. &
-               & ( inpfiles(jj)%ivlqc(1,ji,1) == 2 ) ) THEN
+            IF ( .NOT. BTEST(inpfiles(jj)%ivlqc(1,ji,1),2) ) THEN
 
                iobs = iobs + 1