Changeset 11634

Timestamp:

2019-10-02T10:50:10+02:00 (5 years ago)

Author:

rrenshaw

Message:

Add Rob's change ticket 246 to use surface data at coorect depth

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis3/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90 (modified) (3 diffs)

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

@@ -1747 +1747 @@
       REAL(KIND=wp), DIMENSION(2,2,kpk,kprofno) :: &
          & zgmsk              ! Grid mask
+      ! RJR: Rob's change https://code.metoffice.gov.uk/trac/utils/ticket/246
+      REAL(KIND=wp), DIMENSION(2,2,kpk,kprofno) :: &
+         & zgdept, &
+         & zgdepw
       REAL(KIND=wp), DIMENSION(2,2,kprofno) :: &
          & zglam, &           ! Model longitude at grid points
@@ -1792 +1796 @@
       CALL obs_int_comm_2d( 2, 2, kprofno, igrdi, igrdj, plam, zglam )
       CALL obs_int_comm_2d( 2, 2, kprofno, igrdi, igrdj, pphi, zgphi )
+      ! RJR: Rob's change https://code.metoffice.gov.uk/trac/utils/ticket/246
+      ! Need to know the bathy depth for each observation for sco
+      CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, fsdepw(:,:,:), &
+                           zgdepw )
+      CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, fsdept(:,:,:), &
+                           zgdept )
 
       DO jobs = 1, kprofno
@@ -1858 +1868 @@
             ENDIF
 
+            ! RJR: Rob's change https://code.metoffice.gov.uk/trac/utils/ticket/246
             ! Set observation depth equal to that of the first model depth
-            IF ( pobsdep(jobsp) <= pdep(1) ) THEN
-               pobsdep(jobsp) = pdep(1)  
+            IF ( pobsdep(jobsp) < MINVAL(zgdept(1:2,1:2,1,jobs) ) ) THEN
+               pobsdep(jobsp) = MINVAL(zgdept(1:2,1:2,1,jobs))
             ENDIF