Changeset 6301

Timestamp:

2016-02-10T06:08:29+01:00 (8 years ago)

Author:

djlea

Message:

Update to QC out observations which are caught by the strict bathymetry check in obs_oper. Reverting some changes to obs_prep which are no longer needed.

Location:

branches/UKMO/dev_r4650_general_vert_coord_obsoper/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• obs_oper.F90 (modified) (2 diffs)
• obs_prep.F90 (modified) (3 diffs)

branches/UKMO/dev_r4650_general_vert_coord_obsoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

@@ -884 +884 @@
                   CALL obs_int_h2d( 1, 1, l_zweig, interp_corner(:,:,ikn), & 
                   &          prodatqc%var(1)%vmod(iend:iend) ) 
+
+                  ! Set QC flag for any observations found below the bottom
+                  ! needed as the check here is more strict than that in obs_prep
+                  IF (sum(l_zweig) == 0.0_wp) prodatqc%var(1)%nvqc(iend:iend)=4
  
                ENDDO 
@@ -1018 +1022 @@
                   CALL obs_int_h2d( 1, 1, l_zweig, interp_corner(:,:,ikn), & 
                   &          prodatqc%var(2)%vmod(iend:iend) ) 
+
+                  ! Set QC flag for any observations found below the bottom
+                  ! needed as the check here is more strict than that in obs_prep
+                  IF (sum(l_zweig) == 0.0_wp) prodatqc%var(2)%nvqc(iend:iend)=4
  
                ENDDO 

branches/UKMO/dev_r4650_general_vert_coord_obsoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

@@ -1716 +1716 @@
          & ln_zps,        &
          & lk_vvl                        
+
       !! * Arguments
       INTEGER, INTENT(IN) :: kprofno      ! Number of profiles
@@ -1843 +1844 @@
                &  .OR. ( pobsphi(jobs) <  -90.         )       &
                &  .OR. ( pobsphi(jobs) >   90.         )       &
-               &  .OR. ( pobsdep(jobsp) < 0.0          )       ) THEN
+               &  .OR. ( pobsdep(jobsp) < 0.0          )       &
+               &  .OR. ( pobsdep(jobsp) > gdepw_1d(kpk)) ) THEN
                kobsqc(jobsp) = kobsqc(jobsp) + 11
                kosdobs = kosdobs + 1
@@ -1879 +1881 @@
                IF ( ANY( zgdepw(1:2,1:2,kpk,jobs) < pobsdep(jobsp) ) &
                   &     .OR. & 
-                  &  ( SUM( zgmsk(1,1,kobsk(jobsp)-1:kobsk(jobsp),jobs)) == 0.0_wp ) .OR. &
-                  &  ( SUM( zgmsk(1,2,kobsk(jobsp)-1:kobsk(jobsp),jobs)) == 0.0_wp ) .OR. &
-                  &  ( SUM( zgmsk(2,1,kobsk(jobsp)-1:kobsk(jobsp),jobs)) == 0.0_wp ) .OR. &
-                  &  ( SUM( zgmsk(2,2,kobsk(jobsp)-1:kobsk(jobsp),jobs)) == 0.0_wp ) ) THEN 
+                  &  ( SUM( zgmsk(1:2,1:2,kobsk(jobsp)-1:kobsk(jobsp),jobs) ) &
+                  &  == 0.0_wp) ) THEN
                   kobsqc(jobsp) = kobsqc(jobsp) + 12 
                   klanobs = klanobs + 1